Skip to content

Commit 0a58dcb

Browse files
nicolanicola
committed
first attempt
1 parent 7a6b793 commit 0a58dcb

9 files changed

Lines changed: 24 additions & 33 deletions

File tree

‎bin/ldnode.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ try {
129129
app = ldnode.createServer(argv);
130130
} catch(e) {
131131
console.log(e.message);
132+
console.log(e.stack)
132133
return 1;
133134
}
134135
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: 11 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,13 @@ 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+
SolidWs(server, app)
6574
}
6675

67-
return app;
76+
return server
6877
}

‎lib/handlers/delete.js‎

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

2222
debug("DELETE -- Ok.");
23+
if (ldp.live) ldp.live(req.originalUrl)
2324
return res.sendStatus(200);
24-
2525
});
2626

2727
}

‎lib/handlers/get.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ function get(req, res, next, includeBody) {
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+
// // 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+
// }
3434

3535
// Parse accept mime types into a priority (q) ordered array
3636
res.acceptTypes = header.negotiateContentType(req) || 'text/turtle';
@@ -45,7 +45,7 @@ function get(req, res, next, includeBody) {
4545
header.addLink(res, req.originalUrl + ldp.suffixChanges, 'changes');
4646
// res.header('Link' , '' + req.path + ldp.suffixSSE + ' ; rel=events' );
4747
// overwrites the pevious
48-
res.header('Updates-Via', req.originalUrl + ldp.suffixChanges);
48+
res.header('Updates-Via', utils.uriBase(req));
4949
}
5050

5151
if (includeBody) {

‎lib/handlers/patch.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ function handler(req, res, next) {
4040
}
4141

4242
if (ldp.live) {
43-
subscription.publishDelta(req, res, patchKB, targetURI);
43+
ldp.live(req.originalUrl)
44+
// subscription.publishDelta(req, res, patchKB, targetURI);
4445
}
4546
debug("PATCH -- applied OK (sync)");
4647
res.send("Patch applied OK\n");

‎lib/handlers/put.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ function handler(req, res, next) {
2525
}
2626

2727
debug("PUT -- Write Ok. Bytes written: " + req.text.length);
28+
29+
if (ldp.live) ldp.live(req.originalUrl)
2830
return res.sendStatus(201);
2931
});
3032
}

‎lib/ldp.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ function LDP(argv) {
5151

5252
// Cache of usedURIs
5353
ldp.usedURIs = {};
54-
ldp.SSEsubscriptions = {};
55-
ldp.subscriptions = {};
5654

5755
// Error pages folder
5856
ldp.noErrorPages = argv.noErrorPages;

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"debug": "^2.2.0",
3131
"express": "^4.13.1",
3232
"express-session": "^1.11.3",
33-
"express-ws": "^0.2.6",
3433
"fs-extra": "^0.21.0",
3534
"glob": "^5.0.13",
3635
"http-delayed-response": "0.0.4",

0 commit comments

Comments
 (0)