Skip to content

Commit eea1e43

Browse files
author
nicola
committed
refactoring including: new post handler, new error function and code style
1 parent 58d9c95 commit eea1e43

12 files changed

Lines changed: 471 additions & 706 deletions

File tree

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ default settings.
196196
mount: '/', // Where to mount Linked Data Platform
197197
webid: false, // Enable WebID+TLS authentication
198198
suffixAcl: '.acl', // Suffix for acl files
199-
suffixSSE: '.events', // Suffix for SSE files
200199
proxy: false, // Where to mount the proxy
201200
errorHandler: false, // function(err, req, res, next) to have a custom error handler
202201
errorPages: false // specify a path where the error pages are

‎bin/ldnode.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@ var argv = require('nomnom')
8484
help: 'Suffix for metadata files (default: \'.meta\')',
8585
abbr: 'sM'
8686
})
87-
.option('suffixSSE', {
88-
full: 'suffix-sse',
89-
help: 'Suffix for SSE files (default: \'.events\')',
90-
abbr: 'sE'
91-
})
9287
.option('noErrorPages', {
9388
full: 'no-error-pages',
9489
flag: true,

‎lib/debug.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var debug = require('debug');
22

33
exports.handlers = debug('ldnode:handlers');
4+
exports.errors = debug('ldnode:errors');
45
exports.ACL = debug('ldnode:ACL');
56
exports.parse = debug('ldnode:parse');
67
exports.metadata = debug('ldnode:metadata');

‎lib/handlers/error.js‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,38 @@
1-
/*jslint node: true*/
2-
"use strict";
3-
4-
var debug = require('../debug').server
1+
exports.handler = errorPageHandler;
52

3+
var debug = require('../debug').server;
64
var fs = require('fs');
75

8-
function errorPageHandler(err, req, res, next) {
9-
debug("Error page because of "+ err.message);
10-
11-
var ldp = req.app.locals.ldp;
12-
13-
// If the user specifies this function
14-
// then, they can customize the error programmatically
15-
if (ldp.errorHandler) {
16-
return ldp.errorHandler(err, req, res, next);
6+
function errorPageHandler (err, req, res, next) {
7+
debug('Error page because of ' + err.message);
8+
9+
var ldp = req.app.locals.ldp;
10+
11+
// If the user specifies this function
12+
// then, they can customize the error programmatically
13+
if (ldp.errorHandler) {
14+
return ldp.errorHandler(err, req, res, next);
15+
}
16+
17+
// If noErrorPages is set,
18+
// then use built-in express default error handler
19+
if (ldp.noErrorPages) {
20+
return res
21+
.status(err.status)
22+
.send(err.message);
23+
}
24+
25+
// Check if error page exists
26+
var errorPage = ldp.errorPages + err.status.toString() + '.html';
27+
fs.readFile(errorPage, 'utf8', function (readErr, text) {
28+
if (readErr) {
29+
return res
30+
.status(err.status)
31+
.send(err.message);
1732
}
1833

19-
// If noErrorPages is set,
20-
// then use built-in express default error handler
21-
if (ldp.noErrorPages) {
22-
return res
23-
.status(err.status)
24-
.send(err.message);
25-
}
26-
27-
// Check if error page exists
28-
var errorPage = ldp.errorPages + err.status.toString() + '.html';
29-
fs.readFile(errorPage, 'utf8', function(readErr, text) {
30-
if (readErr) {
31-
return res
32-
.status(err.status)
33-
.send(err.message);
34-
}
35-
36-
res.status(err.status);
37-
res.header('Content-Type', 'text/html');
38-
res.send(text);
39-
});
34+
res.status(err.status);
35+
res.header('Content-Type', 'text/html');
36+
res.send(text);
37+
});
4038
}
41-
42-
exports.handler = errorPageHandler;

‎lib/handlers/get.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ function get (req, res, next) {
9595
return next(err);
9696
}
9797

98-
9998
// Translate from the contentType found to the possibleRDFType desired
10099
translate(stream, baseUri, contentType, possibleRDFType, function (err, data) {
101100
if (err) {

‎lib/handlers/post.js‎

Lines changed: 37 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1,153 +1,54 @@
1-
/*jslint node: true*/
2-
"use strict";
3-
4-
var path = require('path');
5-
var $rdf = require('rdflib');
6-
var S = require('string');
1+
exports.handler = handler;
72

83
var debug = require('../debug').handlers;
94
var utils = require('../utils.js');
105
var header = require('../header.js');
11-
var metadata = require('../metadata.js');
126
var patch = require('./patch.js');
7+
var error = require('../http-error');
138

14-
var ldpVocab = require('../vocab/ldp.js');
15-
var rdfVocab = require('../vocab/rdf.js');
16-
var HttpError = require('../http-error');
17-
18-
function handler(req, res, next) {
19-
var ldp = req.app.locals.ldp;
20-
var contentType = req.get('content-type');
21-
22-
// Handle SPARQL query
23-
if (contentType === 'application/sparql') {
24-
debug("POST -- Handling sparql query");
25-
return patch.handler(req, res, next);
26-
}
27-
28-
// Handle SPARQL-update query
29-
if (contentType === 'application/sparql-update') {
30-
debug("POST -- Handling sparql-update query");
31-
return patch.handler(req, res, next);
32-
}
33-
34-
// Error on invalid content-type
35-
if (contentType != 'text/turtle' &&
36-
contentType != 'text/n3' &&
37-
contentType != 'application/rdf+xml' &&
38-
contentType != 'application/ld+json' &&
39-
contentType != 'application/nquads' &&
40-
contentType != 'application/n-quads') {
41-
debug("POST -- Invalid Content Type: " + contentType);
42-
43-
return next(new HttpError({
44-
status: 415,
45-
message: "Invalid Content Type"
46-
}));
47-
}
48-
49-
var root = !ldp.idp ? ldp.root : ldp.root + req.hostname + '/';
50-
var containerPath = utils.uriToFilename(req.path, root);
51-
debug("POST -- Container path: " + containerPath);
9+
function handler (req, res, next) {
10+
var ldp = req.app.locals.ldp;
11+
var contentType = req.get('content-type');
5212

53-
// Not a container
54-
if (containerPath[containerPath.length - 1] != '/') {
55-
debug("POST -- Requested resource is not a container");
56-
res.set('Allow', 'GET,HEAD,PUT,DELETE');
13+
// Handle SPARQL(-update?) query
14+
if (contentType === 'application/sparql' ||
15+
contentType === 'application/sparql-update') {
5716

58-
return next(new HttpError({
59-
status: 405,
60-
message: "Requested resource is not a container"
61-
}));
62-
}
17+
debug('POST -- Handling sparql query via PATCH');
18+
return patch.handler(req, res, next);
19+
}
6320

64-
debug("POST -- Content Type: " + contentType);
21+
var containerPath = req.path;
22+
debug('POST -- On parent: ' + containerPath);
6523

66-
var resourceMetadata = header.parseMetadataFromHeader(req.get('Link'));
24+
// Not a container
25+
if (containerPath[containerPath.length - 1] !== '/') {
26+
debug('POST -- Path is not a container');
27+
res.set('Allow', 'GET,HEAD,PUT,DELETE');
28+
return next(error(405, 'Requested resource is not a container'));
29+
}
6730

68-
// Create resource URI
69-
var resourcePath = ldp.createResourceUri(
70-
containerPath,
71-
req.get('Slug'),
72-
resourceMetadata.isBasicContainer);
31+
debug('POST -- Content Type: ' + contentType);
7332

74-
// Check if URI is already in use
75-
if (resourcePath === null) {
76-
ldp.releaseResourceUri(resourcePath);
77-
debug("POST -- URI already exists or in use");
33+
var linkHeader = header.parseMetadataFromHeader(req.get('Link'));
7834

79-
return next(new HttpError({
80-
status: 400,
81-
message: "URI already exists or in use"
82-
}));
35+
// TODO: possibly package this in ldp.post
36+
ldp.getAvailablePath(req.hostname, containerPath, req.get('Slug'), function (resourcePath) {
37+
debug('POST -- Will create at: ' + resourcePath);
38+
var meta = '';
39+
if (linkHeader.isBasicContainer) {
40+
resourcePath += '/';
41+
meta = ldp.suffixMeta;
8342
}
8443

85-
// Creating a graph and add the req text
86-
var resourceGraph = $rdf.graph();
87-
var requestText = req.convertedText || req.text;
88-
var uri = utils.uriBase(req);
89-
var resourceBaseUri = utils.filenameToBaseUri(
90-
resourcePath,
91-
uri,
92-
root);
44+
ldp.put(req.hostname, resourcePath + meta, req.text, function (err) {
45+
if (err) {
46+
next(err);
47+
}
9348

94-
try {
95-
$rdf.parse(
96-
requestText,
97-
resourceGraph,
98-
resourceBaseUri,
99-
contentType);
100-
} catch (parseErr) {
101-
debug("POST -- Error parsing resource: " + parseErr);
102-
ldp.releaseResourceUri(resourcePath);
103-
return next(new HttpError({
104-
status: 400,
105-
message: "Error parsing resource"
106-
}));
107-
}
108-
109-
// Add header link to the resource
110-
header.addLinks(res, resourceMetadata);
111-
112-
// Finally, either create the new resource or container
113-
if (resourceMetadata.isBasicContainer) {
114-
resourcePath += '/';
115-
resourceBaseUri += '/';
116-
ldp.createNewContainer(
117-
uri,
118-
resourcePath,
119-
resourceGraph,
120-
containerCallback);
121-
} else {
122-
ldp.createNewResource(
123-
req.hostname,
124-
uri,
125-
resourcePath,
126-
resourceGraph,
127-
resourceCallback);
128-
}
129-
130-
function containerCallback(err) {
131-
if (err) {
132-
debug("POST -- Error creating new container: " + err.message);
133-
return next(err);
134-
}
135-
136-
debug("POST -- Created new container " + resourceBaseUri);
137-
res.set('Location', resourceBaseUri);
138-
res.sendStatus(201);
139-
return next();
140-
}
141-
142-
function resourceCallback(err) {
143-
if (err) {
144-
debug("POST -- Error creating resource: " + err.message);
145-
return next(err);
146-
}
147-
res.set('Location', resourceBaseUri);
148-
res.sendStatus(201);
149-
return next();
150-
}
49+
header.addLinks(res, linkHeader);
50+
res.set('Location', resourcePath);
51+
res.sendStatus(201);
52+
});
53+
});
15154
}
152-
153-
exports.handler = handler;

‎lib/handlers/put.js‎

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,22 @@
1-
/*jslint node: true*/
2-
"use strict";
3-
4-
var mime = require('mime');
5-
var path = require('path');
6-
var $rdf = require('rdflib');
7-
var path = require('path')
1+
exports.handler = handler;
82

93
var debug = require('../debug').handlers;
10-
var utils = require('../utils.js');
11-
var header = require('../header.js');
12-
13-
function handler(req, res, next) {
14-
var ldp = req.app.locals.ldp;
15-
debug("PUT -- Request path: " + req.originalUrl);
16-
debug("PUT -- Text length: " + (req.text ? req.text.length : 'undefined'));
17-
res.header('MS-Author-Via' , 'SPARQL' );
184

5+
function handler (req, res, next) {
6+
var ldp = req.app.locals.ldp;
7+
debug('PUT -- originalUrl: ' + req.originalUrl);
8+
res.header('MS-Author-Via', 'SPARQL');
199

20-
ldp.put(req.hostname, req.path, req.text, function(err) {
21-
if (err) {
22-
debug("PUT -- Write error: " + err.message);
23-
err.message = "Can't write file: " + err.message;
24-
return next(err);
25-
}
10+
ldp.put(req.hostname, req.path, req.text, function (err) {
11+
if (err) {
12+
debug('PUT -- Write error: ' + err.message);
13+
err.message = 'Can\'t write file: ' + err.message;
14+
return next(err);
15+
}
2616

27-
debug("PUT -- Write Ok. Bytes written: " + req.text.length);
17+
debug('PUT -- Write Ok. Bytes written: ' + req.text.length);
2818

29-
res.sendStatus(201);
30-
return next();
31-
});
19+
res.sendStatus(201);
20+
return next();
21+
});
3222
}
33-
34-
exports.handler = handler;

‎lib/http-error.js‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
module.exports = HTTPError;
22

3-
function HTTPError(opts) {
3+
var extend = require('extend');
4+
var debug = require('./debug').errors;
5+
6+
function HTTPError (status, message) {
7+
if (!(this instanceof HTTPError)) {
8+
return new HTTPError(status, message);
9+
}
10+
411
// Error.captureStackTrace(this, this.constructor);
512
this.name = this.constructor.name;
6-
this.message = opts.message;
7-
this.status = opts.status;
8-
};
913

14+
// If status is an object it will be of the form:
15+
// {status: , message: }
16+
if (typeof status === 'number') {
17+
this.message = message || 'Error occurred';
18+
this.status = status;
19+
debug(this.status + ': ' + this.message);
20+
} else {
21+
var err = status;
22+
this.message = message || err.message;
23+
this.status = err.status || err.code === 'ENOENT' ? 404 : 500;
24+
debug(this.status + ': ' + this.message + ', originally ' + err);
25+
}
26+
}
1027
require('util').inherits(module.exports, Error);

0 commit comments

Comments
 (0)