Skip to content

Commit 6242fae

Browse files
author
Andrei
committed
Merge pull request #144 from nicola/solid-ws
Adding web socket support
2 parents 7a6b793 + 0a540b8 commit 6242fae

12 files changed

Lines changed: 48 additions & 81 deletions

File tree

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ Options:
4343
--no-live Disable live support through WebSockets
4444
-sA, --suffix-acl Suffix for acl files (default: '.acl')
4545
-sM, --suffix-meta Suffix for metadata files (default: '.meta')
46-
-sC, --suffix-changes Suffix for acl files (default: '.changes')
4746
-sE, --suffix-sse Suffix for SSE files (default: '.events')
4847
4948
```
@@ -83,7 +82,6 @@ In case the `settings` is not passed, then it will start with the following defa
8382
mount: '/', // Where to mount Linked Data Platform
8483
webid: false, // Enable WebID+TLS authentication
8584
suffixAcl: '.acl', // Suffix for acl files
86-
suffixChanges: '.changes', // Suffix for acl files
8785
suffixSSE: '.events', // Suffix for SSE files
8886
proxy: false, // Where to mount the proxy
8987
errorHandler: false, // function(err, req, res, next) to have a custom error handler

‎bin/ldnode.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ var argv = require('nomnom')
7474
help: 'Suffix for metadata files (default: \'.meta\')',
7575
abbr: 'sM'
7676
})
77-
.option('suffixChanges', {
78-
full: 'suffix-changes',
79-
help: 'Suffix for acl files (default: \'.changes\')',
80-
abbr: 'sC'
81-
})
8277
.option('suffixSSE', {
8378
full: 'suffix-sse',
8479
help: 'Suffix for SSE files (default: \'.events\')',
@@ -129,6 +124,7 @@ try {
129124
app = ldnode.createServer(argv);
130125
} catch(e) {
131126
console.log(e.message);
127+
console.log(e.stack)
132128
return 1;
133129
}
134130
app.listen(argv.port, function() {

‎lib/create-app.js‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module.exports = createApp;
22

33
var express = require('express');
4-
var expressWs = require('express-ws');
54
var session = require('express-session');
65
var uuid = require('node-uuid');
76
var cors = require('cors');
@@ -23,19 +22,6 @@ var corsSettings = cors({
2322
origin: true
2423
});
2524

26-
function ws (app) {
27-
expressWs(app);
28-
app.mountpath = ''; // needs to be set for addSocketRoute aka .ws()
29-
// was options.pathFilter
30-
app.ws('/', function(socket, res) {
31-
debug.subscription("incoming on " + socket.path);
32-
socket.on('message', function(msg) {
33-
debug.subscription("message = " + msg);
34-
// subscribeToChanges(socket, res);
35-
});
36-
});
37-
}
38-
3925
function createApp (argv) {
4026
var ldp = new LDP(argv);
4127
var app = express();
@@ -58,10 +44,5 @@ function createApp (argv) {
5844
// Setting up routes
5945
app.use('/', LdpMiddleware(corsSettings));
6046

61-
// Setup Express app
62-
if (ldp.live) {
63-
ws(app);
64-
}
65-
6647
return app;
6748
}

‎lib/create-server.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ module.exports = createServer;
33
var express = require('express');
44
var fs = require('fs');
55
var https = require('https');
6+
var http = require('http');
7+
var SolidWs = require('solid-ws');
68

79
var debug = require('./debug');
810
var createApp = require('./create-app');
@@ -23,6 +25,8 @@ function createServer(argv) {
2325
app.use(mount, ldpApp);
2426
debug.settings('mount: ' + mount);
2527

28+
var server = http.createServer(app);
29+
2630
if (ldp && (ldp.webid || argv.key || argv.cert) ) {
2731
debug.settings("SSL Private Key path: " + argv.key);
2832
debug.settings("SSL Certificate path: " + argv.cert);
@@ -61,8 +65,14 @@ function createServer(argv) {
6165

6266
debug.settings("Certificate: " + credentials.cert);
6367

64-
return https.createServer(credentials, app);
68+
server = https.createServer(credentials, app);
69+
}
70+
71+
// Setup Express app
72+
if (ldp.live) {
73+
var solidWs = SolidWs(server, ldpApp)
74+
ldpApp.locals.ldp.live = solidWs.publish.bind(solidWs)
6575
}
6676

67-
return app;
77+
return server
6878
}

‎lib/handlers/delete.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ function handler(req, res, next) {
2020
}
2121

2222
debug("DELETE -- Ok.");
23-
return res.sendStatus(200);
2423

24+
res.sendStatus(200);
25+
return next();
2526
});
2627

2728
}

‎lib/handlers/get.js‎

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,12 @@ var HttpError = require('../http-error');
2020

2121
var ldpVocab = require('../vocab/ldp.js');
2222

23-
function get(req, res, next, includeBody) {
23+
function get(req, res, next) {
2424
var ldp = req.app.locals.ldp;
2525
var uri = utils.uriBase(req);
2626
var filename = utils.uriToFilename(req.path, ldp.root);
2727

28-
// Add request to subscription service
29-
if (req.path.slice(-ldp.suffixChanges.length) ===
30-
ldp.suffixChanges) {
31-
debug("GET -- Subscribed to " + req.originalUrl);
32-
return subscription.subscribeToChanges(req, res);
33-
}
28+
var includeBody = req.method === 'GET'
3429

3530
// Parse accept mime types into a priority (q) ordered array
3631
res.acceptTypes = header.negotiateContentType(req) || 'text/turtle';
@@ -40,19 +35,10 @@ function get(req, res, next, includeBody) {
4035

4136
// Set live updates
4237
if (ldp.live) {
43-
// Note not yet in
44-
// http://www.iana.org/assignments/link-relations/link-relations.xhtml
45-
header.addLink(res, req.originalUrl + ldp.suffixChanges, 'changes');
46-
// res.header('Link' , '' + req.path + ldp.suffixSSE + ' ; rel=events' );
47-
// overwrites the pevious
48-
res.header('Updates-Via', req.originalUrl + ldp.suffixChanges);
38+
res.header('Updates-Via', utils.uriBase(req));
4939
}
5040

51-
if (includeBody) {
52-
debug('GET -- ' + req.originalUrl);
53-
} else {
54-
debug('HEAD -- ' + req.originalUrl);
55-
}
41+
debug(req.method + ' -- ' + req.originalUrl);
5642

5743
// Get resource or container
5844
ldp.get(filename, uri, includeBody, function(err, data, container) {
@@ -72,7 +58,8 @@ function get(req, res, next, includeBody) {
7258
// Just return that file exists
7359
// data is of `typeof 'string'` if file is empty, but exists!
7460
if (data === undefined) {
75-
return res.sendStatus(200);
61+
res.sendStatus(200);
62+
return next();
7663
}
7764

7865
// Container/resource retrieved
@@ -87,9 +74,10 @@ function get(req, res, next, includeBody) {
8774

8875
// if data is not text/turtle, just send it
8976
if (contentType !== 'text/turtle') {
90-
return res
77+
res
9178
.status(200)
9279
.send(data);
80+
return next();
9381
}
9482
}
9583

@@ -192,9 +180,10 @@ function parseLinkedData(req, res, next) {
192180
accept === 'text/n3' ||
193181
accept === 'application/turtle' ||
194182
accept === 'application/n3') {
195-
return res.status(200)
183+
res.status(200)
196184
.set('content-type', accept)
197185
.send(turtleData);
186+
return next();
198187
}
199188

200189
//Handle other file types
@@ -219,21 +208,13 @@ function parseLinkedData(req, res, next) {
219208
status: 500
220209
}));
221210
}
222-
223-
return res
211+
res
224212
.status(200)
225213
.set('content-type', accept)
226214
.send(result);
227-
});
228-
}
229-
230-
function getHandler(req, res, next) {
231-
get(req, res, next, true);
232-
}
233215

234-
function headHandler(req, res, next) {
235-
get(req, res, next, false);
216+
return next();
217+
});
236218
}
237219

238-
exports.handler = getHandler;
239-
exports.headHandler = headHandler;
220+
exports.handler = get;

‎lib/handlers/patch.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ function handler(req, res, next) {
2727
if (patchContentType === 'application/sparql') {
2828
sparql(filename, targetURI, req.text, function(err, result) {
2929
if (err) {
30-
next(err);
30+
return next(err);
3131
}
3232

33-
return res.json(result);
33+
res.json(result);
34+
return next();
3435
});
3536
} else
3637
if (patchContentType === 'application/sparql-update') {
@@ -39,11 +40,10 @@ function handler(req, res, next) {
3940
return next(err);
4041
}
4142

42-
if (ldp.live) {
43-
subscription.publishDelta(req, res, patchKB, targetURI);
44-
}
43+
// subscription.publishDelta(req, res, patchKB, targetURI);
4544
debug("PATCH -- applied OK (sync)");
4645
res.send("Patch applied OK\n");
46+
return next()
4747
});
4848
} else {
4949
return next(new HttpError({

‎lib/handlers/post.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ function handler(req, res, next) {
2222
// Handle SPARQL query
2323
if (contentType === 'application/sparql') {
2424
debug("POST -- Handling sparql query");
25-
return patch.handler(req, res);
25+
return patch.handler(req, res, next);
2626
}
2727

2828
// Handle SPARQL-update query
2929
if (contentType === 'application/sparql-update') {
3030
debug("POST -- Handling sparql-update query");
31-
return patch.handler(req, res);
31+
return patch.handler(req, res, next);
3232
}
3333

3434
// Error on invalid content-type
@@ -133,7 +133,8 @@ function handler(req, res, next) {
133133

134134
debug("POST -- Created new container " + resourceBaseUri);
135135
res.set('Location', resourceBaseUri);
136-
return res.sendStatus(201);
136+
res.sendStatus(201);
137+
return next();
137138
}
138139

139140
function resourceCallback(err) {
@@ -142,7 +143,8 @@ function handler(req, res, next) {
142143
return next(err);
143144
}
144145
res.set('Location', resourceBaseUri);
145-
return res.sendStatus(201);
146+
res.sendStatus(201);
147+
return next();
146148
}
147149
}
148150

‎lib/handlers/put.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
var mime = require('mime');
55
var path = require('path');
66
var $rdf = require('rdflib');
7+
var path = require('path')
78

89
var debug = require('../debug').handlers;
910
var utils = require('../utils.js');
@@ -25,7 +26,9 @@ function handler(req, res, next) {
2526
}
2627

2728
debug("PUT -- Write Ok. Bytes written: " + req.text.length);
28-
return res.sendStatus(201);
29+
30+
res.sendStatus(201);
31+
return next();
2932
});
3033
}
3134

‎lib/ldp-middleware.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ function LdpMiddleware (corsSettings) {
4545

4646
//ACL handlers
4747
router.get("/*", acl.allowReadHandler);
48-
router.head("/*", acl.allowReadHandler);
4948
router.post("/*", acl.allowAppendThenWriteHandler);
5049
router.patch("/*", acl.allowAppendThenWriteHandler);
5150
router.put("/*", acl.allowAppendThenWriteHandler);
@@ -59,7 +58,6 @@ function LdpMiddleware (corsSettings) {
5958

6059
// HTTP methods handlers
6160
router.get('/*', getHandler.handler);
62-
router.head('/*', getHandler.headHandler);
6361
router.put('/*', putHandler.handler);
6462
router.delete('/*', deleteHandler.handler);
6563
router.post('/*', postHandler.handler);

0 commit comments

Comments
 (0)