Update dependencies

Switch from the unmaintained node-static to serve-static.

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10-alpine
+FROM node:12-alpine
 
 COPY . /opt/app
 WORKDIR /opt/app

package-lock.json

@@ -1,6 +1,6 @@
 {
    "name": "whitebophir",
-   "version": "1.0.24",
+   "version": "1.1.0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
@@ -322,7 +322,8 @@
       "colors": {
          "version": "1.3.2",
          "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.2.tgz",
-         "integrity": "sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ=="
+         "integrity": "sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==",
+         "dev": true
       },
       "combined-stream": {
          "version": "1.0.8",
@@ -469,6 +470,16 @@
          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
          "dev": true
       },
+      "depd": {
+         "version": "1.1.2",
+         "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+         "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+      },
+      "destroy": {
+         "version": "1.0.4",
+         "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+         "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      },
       "ecc-jsbn": {
          "version": "0.1.2",
          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -479,6 +490,16 @@
             "safer-buffer": "^2.1.0"
          }
       },
+      "ee-first": {
+         "version": "1.1.1",
+         "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+         "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      },
+      "encodeurl": {
+         "version": "1.0.2",
+         "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+         "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      },
       "end-of-stream": {
          "version": "1.4.4",
          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -568,12 +589,22 @@
             "has-binary2": "~1.0.2"
          }
       },
+      "escape-html": {
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+         "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      },
       "escape-string-regexp": {
          "version": "1.0.5",
          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
          "dev": true
       },
+      "etag": {
+         "version": "1.8.1",
+         "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+         "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      },
       "extend": {
          "version": "3.0.2",
          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -621,6 +652,11 @@
             "mime-types": "^2.1.12"
          }
       },
+      "fresh": {
+         "version": "0.5.2",
+         "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+         "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      },
       "fs-constants": {
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -734,6 +770,18 @@
          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
          "dev": true
       },
+      "http-errors": {
+         "version": "1.7.3",
+         "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
+         "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+         "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.1.1",
+            "statuses": ">= 1.5.0 < 2",
+            "toidentifier": "1.0.0"
+         }
+      },
       "http-signature": {
          "version": "1.2.0",
          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -775,8 +823,7 @@
       "inherits": {
          "version": "2.0.4",
          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-         "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-         "dev": true
+         "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
       },
       "is-extglob": {
          "version": "2.1.1",
@@ -978,7 +1025,8 @@
       "minimist": {
          "version": "0.0.10",
          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-         "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
+         "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
+         "dev": true
       },
       "mkdirp": {
          "version": "0.5.5",
@@ -1025,16 +1073,6 @@
          "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
          "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
       },
-      "node-static": {
-         "version": "0.7.11",
-         "resolved": "https://registry.npmjs.org/node-static/-/node-static-0.7.11.tgz",
-         "integrity": "sha512-zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ==",
-         "requires": {
-            "colors": ">=0.6.0",
-            "mime": "^1.2.9",
-            "optimist": ">=0.3.4"
-         }
-      },
       "normalize-path": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -1052,6 +1090,14 @@
          "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
          "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
       },
+      "on-finished": {
+         "version": "2.3.0",
+         "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+         "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+         "requires": {
+            "ee-first": "1.1.1"
+         }
+      },
       "once": {
          "version": "1.4.0",
          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1102,6 +1148,7 @@
          "version": "0.6.1",
          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+         "dev": true,
          "requires": {
             "minimist": "~0.0.1",
             "wordwrap": "~0.0.2"
@@ -1175,6 +1222,11 @@
             "better-assert": "~1.0.0"
          }
       },
+      "parseurl": {
+         "version": "1.3.3",
+         "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+         "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+      },
       "path-is-absolute": {
          "version": "1.0.1",
          "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -1231,6 +1283,11 @@
          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
          "dev": true
       },
+      "range-parser": {
+         "version": "1.2.1",
+         "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+         "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+      },
       "read": {
          "version": "1.0.7",
          "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
@@ -1316,6 +1373,64 @@
          "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
          "dev": true
       },
+      "send": {
+         "version": "0.17.1",
+         "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+         "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+         "requires": {
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "destroy": "~1.0.4",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "~1.7.2",
+            "mime": "1.6.0",
+            "ms": "2.1.1",
+            "on-finished": "~2.3.0",
+            "range-parser": "~1.2.1",
+            "statuses": "~1.5.0"
+         },
+         "dependencies": {
+            "debug": {
+               "version": "2.6.9",
+               "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+               "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+               "requires": {
+                  "ms": "2.0.0"
+               },
+               "dependencies": {
+                  "ms": {
+                     "version": "2.0.0",
+                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                     "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+                  }
+               }
+            },
+            "ms": {
+               "version": "2.1.1",
+               "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+               "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+            }
+         }
+      },
+      "serve-static": {
+         "version": "1.14.1",
+         "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+         "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+         "requires": {
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "parseurl": "~1.3.3",
+            "send": "0.17.1"
+         }
+      },
+      "setprototypeof": {
+         "version": "1.1.1",
+         "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+         "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+      },
       "sha1-file": {
          "version": "1.0.4",
          "resolved": "https://registry.npmjs.org/sha1-file/-/sha1-file-1.0.4.tgz",
@@ -1538,6 +1653,11 @@
          "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
          "dev": true
       },
+      "statuses": {
+         "version": "1.5.0",
+         "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+         "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+      },
       "string_decoder": {
          "version": "1.1.1",
          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -1583,6 +1703,11 @@
          "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
          "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
       },
+      "toidentifier": {
+         "version": "1.0.0",
+         "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+         "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+      },
       "tough-cookie": {
          "version": "2.5.0",
          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
@@ -1719,7 +1844,8 @@
       "wordwrap": {
          "version": "0.0.3",
          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-         "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+         "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+         "dev": true
       },
       "wrappy": {
          "version": "1.0.2",

package.json

@@ -3,16 +3,16 @@
       "collaborative",
       "whiteboard"
    ],
-   "version": "1.0.24",
+   "version": "1.1.0",
    "license": "AGPL-3.0-or-later",
    "dependencies": {
       "handlebars": "^4.7.6",
-      "node-static": "^0.7.11",
+      "serve-static": "^1.14.1",
       "socket.io": "^2.3.0"
    },
    "scripts": {
       "start": "node ./server/server.js",
-      "deploy": "openode sync && openode restart"
+      "deploy": "openode deploy"
    },
    "name": "whitebophir",
    "description": "Online collaborative whiteboard",

server/server.js

@@ -5,7 +5,7 @@ var app = require('http').createServer(handler)
 	, url = require('url')
 	, fs = require("fs")
 	, crypto = require("crypto")
-	, nodestatic = require("node-static")
+	, serveStatic = require("serve-static")
 	, createSVG = require("./createSVG.js")
 	, handlebars = require("handlebars");
 
@@ -38,16 +38,21 @@ log("server started", { port: PORT });
 
 var CSP = "default-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' ws: wss:";
 
-var fileserver = new nodestatic.Server(WEBROOT, {
-	"headers": {
-		"X-UA-Compatible": "IE=Edge",
-		"Content-Security-Policy": CSP,
+var fileserver = serveStatic(WEBROOT, {
+	maxAge: 2 * 3600 * 1000,
+	setHeaders: function (res) {
+		res.setHeader("X-UA-Compatible", "IE=Edge");
+		res.setHeader("Content-Security-Policy", CSP);
 	}
 });
 
-function serveError(request, response, err) {
-	console.warn("Error serving '" + request.url + "' : " + err.status + " " + err.message);
-	fileserver.serveFile('error.html', err.status, {}, request, response);
+var errorPage = fs.readFileSync(path.join(WEBROOT, "error.html"));
+function serveError(request, response) {
+	return function (err) {
+		log("error", { "error": err, "url": request.url });
+		response.writeHead(err ? 500 : 404, { "Content-Length": errorPage.length });
+		response.end(errorPage);
+	}
 }
 
 function logRequest(request) {
@@ -126,26 +131,23 @@ function handleRequest(request, response) {
 			response.end(body);
 		} else { // Else, it's a resource
 			request.url = "/" + parts.slice(1).join('/');
-			fileserver.serve(request, response, function (err, res) {
-				if (err) serveError(request, response, err);
-			});
+			fileserver(request, response, serveError(request, response));
 		}
 	} else if (parts[0] === "download") {
 		var boardName = encodeURIComponent(parts[1]),
-			history_file = "../server-data/board-" + boardName + ".json",
-			headers = {
-				"Content-Type": "application/json",
-				"Content-Disposition": 'attachment; filename="' + boardName + '.wbo"'
-			};
+			history_file = "server-data/board-" + boardName + ".json";
 		if (parts.length > 2 && !isNaN(Date.parse(parts[2]))) {
 			history_file += '.' + parts[2] + '.bak';
 		}
-		log("Downloading " + history_file);
-		var promise = fileserver.serveFile(history_file, 200, headers, request, response);
-		promise.on("error", function (err) {
-			console.error("Error while downloading history", err);
-			response.statusCode = 404;
-			response.end("ERROR: Unable to serve history file\n");
+		log("download", { "file": history_file });
+		fs.readFile(history_file, function (err, data) {
+			if (err) return serveError(request, response)(err);
+			response.writeHead(200, {
+				"Content-Type": "application/json",
+				"Content-Disposition": 'attachment; filename="' + boardName + '.wbo"',
+				"Content-Length": data.length,
+			});
+			response.end(data);
 		});
 	} else if (parts[0] === "preview") {
 		var boardName = encodeURIComponent(parts[1]),
@@ -169,12 +171,7 @@ function handleRequest(request, response) {
 		response.end(name);
 	} else {
 		if (parts[0] === '') logRequest(request);
-		fileserver.serve(request, response, function (err, res) {
-			if (err) {
-				logRequest(request);
-				serveError(request, response, err);
-			}
-		});
+		fileserver(request, response, serveError(request, response));
 	}
 }