Skip to content

Commit 3cd7c54

Browse files
author
nicola
committed
Merge branch 'master' of https://github.com/linkeddata/ldnode into solid-acl
2 parents e6b6840 + 5affce2 commit 3cd7c54

19 files changed

Lines changed: 60 additions & 282 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You can run ldnode as a [command-line tool](https://github.com/linkeddata/ldnode
1616
- [x] WebID+TLS Authentication
1717
- [x] Mount as express' router
1818
- [x] Command line tool
19-
- [x] Real-time live updates (using websokets)
19+
- [x] Real-time live updates (using WebSockets)
2020

2121

2222
## Command line tool

‎bin/ldnode.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
var fs = require('fs');
44
var path = require('path');
5-
65
var argv = require('nomnom')
76
.script('ldnode')
87
.option('verbose', {
@@ -118,7 +117,7 @@ if (process.platform !== 'win32') {
118117
}
119118

120119
// Finally starting ldnode
121-
var ldnode = require('../index');
120+
var ldnode = require('../');
122121
var app;
123122
try {
124123
app = ldnode.createServer(argv);

‎examples/ldp-with-webid.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ var path = require('path')
44
ldnode
55
.createServer({
66
webid: true,
7-
cert: path.resolve('./test/keys/cert.pem'),
8-
key: path.resolve('./test/keys/key.pem')
7+
cert: path.resolve('../test/keys/cert.pem'),
8+
key: path.resolve('../test/keys/key.pem')
99
})
1010
.listen(3456, function() {
1111
console.log('started ldp with webid on port ' + 3456)

‎index.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
"use strict";
2-
3-
var ldnode = require('./lib/create-app');
4-
ldnode.createServer = require('./lib/create-server');
5-
6-
module.exports = ldnode;
1+
module.exports = require('./lib/create-app');
2+
module.exports.createServer = require('./lib/create-server');

‎lib/create-app.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ var express = require('express');
44
var session = require('express-session');
55
var uuid = require('node-uuid');
66
var cors = require('cors');
7-
87
var debug = require('./debug');
98
var LDP = require('./ldp');
109
var LdpMiddleware = require('./ldp-middleware');
11-
1210
var proxy = require('./handlers/proxy')
13-
1411
var corsSettings = cors({
1512
methods: [
1613
'OPTIONS', 'HEAD', 'GET',

‎lib/create-server.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,22 @@ var fs = require('fs');
55
var https = require('https');
66
var http = require('http');
77
var SolidWs = require('solid-ws');
8-
98
var debug = require('./debug');
109
var createApp = require('./create-app');
1110

1211
function createServer(argv) {
12+
argv = argv || {};
1313
var app = express();
1414
var ldpApp = createApp(argv);
1515
var ldp = ldpApp.locals.ldp;
16-
17-
// Mount path
1816
var mount = argv.mount || '/';
1917
// Removing ending '/'
2018
if (mount.length > 1 &&
2119
mount[mount.length - 1] === '/') {
2220
mount = mount.slice(0, -1);
2321
}
24-
2522
app.use(mount, ldpApp);
2623
debug.settings('mount: ' + mount);
27-
2824
var server = http.createServer(app);
2925

3026
if (ldp && (ldp.webid || argv.key || argv.cert) ) {
@@ -64,7 +60,6 @@ function createServer(argv) {
6460
};
6561

6662
debug.settings("Certificate: " + credentials.cert);
67-
6863
server = https.createServer(credentials, app);
6964
}
7065

‎lib/handlers/get.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ var header = require('../header.js');
1515
var metadata = require('../metadata.js');
1616
var ns = require('../vocab/ns.js').ns;
1717
var utils = require('../utils.js');
18-
var subscription = require('../subscription.js');
1918
var HttpError = require('../http-error');
2019

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

‎lib/handlers/patch.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ var $rdf = require('rdflib');
77

88
var debug = require('../debug').handlers;
99
var utils = require('../utils.js');
10-
var subscription = require('../subscription.js');
1110
var HttpError = require('../http-error');
1211

1312
function handler(req, res, next) {

‎lib/handlers/proxy.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ function addProxy (app, path) {
2525
}
2626

2727
debug.settings('Proxy destination URI: ' + uri);
28-
request.get(uri).pipe(res);
28+
29+
request
30+
.get(uri)
31+
.on('error', function (err) {
32+
var status = err.code === 'ENOTFOUND' ? 404 : 500
33+
res.sendStatus(status)
34+
})
35+
.pipe(res)
36+
2937
});
3038
}

‎lib/http-error.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
module.exports = function HTTPError(opts) {
1+
module.exports = HTTPError;
2+
3+
function HTTPError(opts) {
24
// Error.captureStackTrace(this, this.constructor);
35
this.name = this.constructor.name;
46
this.message = opts.message;
57
this.status = opts.status;
68
};
79

8-
require('util').inherits(module.exports, Error);
10+
require('util').inherits(module.exports, Error);

0 commit comments

Comments
 (0)