code cleaning · solid-server/node-solid-server@b2dad60 · GitHub
Skip to content

Commit b2dad60

Browse files
nicolanicola
committed
code cleaning
1 parent 4fcf261 commit b2dad60

14 files changed

Lines changed: 35 additions & 269 deletions

‎bin/ldnode.js‎

Lines changed: 3 additions & 2 deletions

‎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: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,21 @@ 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) {
1312
var app = express();
1413
var ldpApp = createApp(argv);
1514
var ldp = ldpApp.locals.ldp;
16-
17-
// Mount path
1815
var mount = argv.mount || '/';
1916
// Removing ending '/'
2017
if (mount.length > 1 &&
2118
mount[mount.length - 1] === '/') {
2219
mount = mount.slice(0, -1);
2320
}
24-
2521
app.use(mount, ldpApp);
2622
debug.settings('mount: ' + mount);
27-
2823
var server = http.createServer(app);
2924

3025
if (ldp && (ldp.webid || argv.key || argv.cert) ) {
@@ -64,7 +59,6 @@ function createServer(argv) {
6459
};
6560

6661
debug.settings("Certificate: " + credentials.cert);
67-
6862
server = https.createServer(credentials, app);
6963
}
7064

‎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/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);

‎lib/ldp-middleware.js‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,35 @@ module.exports = LdpMiddleware
33
var express = require('express');
44
var getRawBody = require('raw-body');
55
var responseTime = require('response-time');
6-
76
var header = require('./header');
87
var parse = require('./parse');
98
var acl = require('./acl');
109
var login = require('./login');
11-
12-
// Request handlers
1310
var getHandler = require('./handlers/get.js');
1411
var postHandler = require('./handlers/post.js');
1512
var putHandler = require('./handlers/put.js');
1613
var deleteHandler = require('./handlers/delete.js');
1714
var patchHandler = require('./handlers/patch.js');
18-
19-
// Error page handler
2015
var errorHandler = require('./handlers/error.js');
2116

22-
2317
function LdpMiddleware (corsSettings) {
2418
var router = express.Router('/');
2519

2620
// Add Link headers
2721
router.use(header.linksHandler);
2822
if (corsSettings) router.use(corsSettings)
2923
router.use('/*', function(req, res, next) {
30-
getRawBody(req,
31-
{
32-
length: req.headers['content-length'],
33-
encoding: 'utf-8' // typer.parse(req.headers['content-type']).parameters.charset
34-
},
35-
function(err, string) {
36-
if (err) {
37-
return next(err);
38-
}
39-
req.text = string;
40-
next();
41-
});
24+
getRawBody(req,{
25+
length: req.headers['content-length'],
26+
encoding: 'utf-8' // typer.parse(req.headers['content-type']).parameters.charset
27+
},
28+
function(err, string) {
29+
if (err) {
30+
return next(err);
31+
}
32+
req.text = string;
33+
next();
34+
});
4235
});
4336

4437
router.use('/*', login.loginHandler);

‎lib/ldp.js‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/*jslint node: true*/
2-
"use strict";
1+
module.exports = LDP;
32

43
var path = require('path');
54
var regexp = require('node-regexp');
@@ -10,20 +9,15 @@ var async = require('async');
109
var fs = require('fs');
1110
var mkdirp = require('fs-extra').mkdirp;
1211
var uuid = require('node-uuid');
13-
1412
var debug = require('./debug');
15-
1613
var utils = require('./utils.js');
1714
var ns = require('./vocab/ns.js').ns;
1815
var HttpError = require('./http-error');
1916
var turtleExtension = '.ttl'
2017

21-
module.exports = LDP;
22-
2318
function LDP(argv) {
2419
argv = argv || {};
2520
var ldp = this;
26-
2721
// From input
2822
ldp.cache = argv.cache;
2923
ldp.live = argv.live;
@@ -35,22 +29,16 @@ function LDP(argv) {
3529
ldp.port = argv.port;
3630
ldp.secret = argv.secret;
3731
ldp.cert = argv.cert;
38-
3932
ldp.verbose = argv.verbose;
4033
ldp.webid = argv.webid;
41-
42-
// Processed
4334
ldp.leavePatchConnectionOpen = false;
4435
ldp.suffixAcl = argv.suffixAcl || ".acl";
4536
ldp.suffixMeta = argv.suffixMeta || ".meta";
4637
ldp.suffixSSE = argv.suffixSSE || '.events';
4738
ldp.turtleExtensions = ['.ttl', ldp.suffixAcl, ldp.suffixMeta, ldp.suffixSSE]
48-
4939
ldp.proxy = argv.proxy;
50-
5140
// Cache of usedURIs
5241
ldp.usedURIs = {};
53-
5442
// Error pages folder
5543
ldp.noErrorPages = argv.noErrorPages;
5644
if (!ldp.noErrorPages) {
@@ -63,12 +51,10 @@ function LDP(argv) {
6351
}
6452
}
6553
ldp.errorHandler = argv.errorHandler;
66-
6754
// argv.skin is false when --no-skin is passed
6855
if (argv.skin !== false) {
6956
ldp.skin = argv.skin || 'https://linkeddata.github.io/warp/#/list/';
7057
}
71-
7258
debug.settings("root: " + ldp.root);
7359
debug.settings("URI path filter regexp: " + ldp.pathFilter);
7460
debug.settings("Verbose: " + !!ldp.verbose);
@@ -297,12 +283,12 @@ LDP.prototype.listContainer = function (filename, uri, containerData, callback)
297283
ns.rdf('type'),
298284
ns.ldp('BasicContainer'));
299285

300-
resourceGraph.add(
286+
resourceGraph.add(
301287
resourceGraph.sym(''),
302288
ns.rdf('type'),
303289
ns.ldp('Container'));
304290

305-
resourceGraph.add(
291+
resourceGraph.add(
306292
resourceGraph.sym(''),
307293
ns.rdf('type'),
308294
ns.stat('Directory'));

‎lib/login.js‎

Lines changed: 1 addition & 4 deletions

0 commit comments

Comments
 (0)