More server cleanup:

* make the websocket port configurable
* reorder some tasks at launch time to use more consistent logging
* relaunch http workers if they crash
* refuse to launch if httpUnsafeOrigin cannot be parsed as a URL
* fix a path issue reintroduced by a git merge

config/config.example.js

@@ -92,6 +92,19 @@ module.exports = {
  */
     //httpSafePort: 3001,
 
+/*  Websockets need to be exposed on a separate port from the rest of
+ *  the platform's HTTP traffic. Port 3003 is used by default.
+ *  You can change this to a different port if it is in use by a
+ *  different service, but under most circumstances you can leave this
+ *  commented and it will work.
+ *
+ *  In production environments, your reverse proxy (usually NGINX)
+ *  will need to forward websocket traffic (/cryptpad_websocket)
+ *  to this port.
+ *
+ */
+    // websocketPort: 3003,
+
 /*  CryptPad will launch a child process for every core available
  *  in order to perform CPU-intensive tasks in parallel.
  *  Some host environments may have a very large number of cores available

lib/env.js

@@ -65,6 +65,10 @@ module.exports.create = function (config) {
         httpSafeOrigin = canonicalizeOrigin(config.httpSafeOrigin);
     }
 
+    if (typeof(config.websocketPort) !== 'number') {
+        config.websocketPort = 3003;
+    }
+
     var permittedEmbedders = config.permittedEmbedders;
     if (typeof(permittedEmbedders) === 'string') {
         permittedEmbedders = permittedEmbedders.trim();
@@ -79,6 +83,8 @@ module.exports.create = function (config) {
         fileHost: config.fileHost || undefined,
         NO_SANDBOX: NO_SANDBOX,
         httpSafePort: httpSafePort,
+        websocketPort: config.websocketPort,
+
         accounts_api: config.accounts_api || undefined, // this simplifies integration with an accounts page
 
         shouldUpdateNode: !isRecentVersion(),

server.js

@@ -4,11 +4,9 @@
 var Express = require('express');
 var Http = require('http');
 var Fs = require('fs');
-//var Path = require("path");
 var nThen = require("nthen");
 var Util = require("./lib/common-util");
 
-//var Keys = require("./lib/keys");
 var OS = require("node:os");
 var Cluster = require("node:cluster");
 
@@ -51,19 +49,43 @@ COMMANDS.GET_PROFILING_DATA = function (msg, cb) {
 };
 
 nThen(function (w) {
-    Fs.exists(__dirname + "/customize", w(function (e) {
-        if (e) { return; }
-        console.log("CryptPad is customizable, see customize.dist/readme.md for details");
-    }));
-}).nThen(function (w) {
     require("./lib/log").create(config, w(function (_log) {
         Env.Log = _log;
         config.log = _log;
     }));
+}).nThen(function (w) {
+    Fs.exists("customize", w(function (e) {
+        if (e) { return; }
+        Env.Log.info('NO_CUSTOMIZE_FOLDER', {
+            message: "CryptPad is customizable, see customize.dist/readme.md for details",
+        });
+    }));
+}).nThen(function () {
+    // check that a valid origin was provided in the config
+    try {
+        var url = new URL('', Env.httpUnsafeOrigin).href;
+        Env.Log.info("WEBSERVER_LISTENING", {
+            origin: url,
+        });
+
+        if (!Env.admins.length) {
+            Env.Log.info('NO_ADMIN_CONFIGURED', {
+                message: `Your instance is not correctly configured for production usage. Review its checkup page for more information.`,
+                details: new URL('/checkup/', Env.httpUnsafeOrigin).href,
+            });
+        }
+    } catch (err) {
+        Env.Log.error("INVALID_ORIGIN", {
+            httpUnsafeOrigin: Env.httpUnsafeOrigin,
+        });
+        process.exit(1);
+    }
 }).nThen(function (w) {
     Env.httpServer = Http.createServer(app);
-    Env.httpServer.listen(3003, '::', w(function () { // XXX 3003 should not be hardcoded
-        console.log("Socket server is listening on 3003"); // XXX
+    Env.httpServer.listen(Env.websocketPort, '::', w(function () {
+        Env.Log.info('WEBSOCKET_LISTENING', {
+            port: Env.websocketPort,
+        });
     }));
 }).nThen(function (w) {
     var limit = Env.maxWorkers;
@@ -106,6 +128,20 @@ nThen(function (w) {
 
             command(content, cb);
         });
+
+        worker.on('exit', (code, signal) => {
+            if (!signal && code === 0) { return; }
+            // relaunch http workers if they crash
+            Env.Log.error('HTTP_WORKER_EXIT', {
+                signal,
+                code,
+            });
+            // update the environment with the latest state before relaunching
+            workerState.Env = Environment.serialize(Env);
+            launchWorker(function () {
+                Env.Log.info('HTTP_WORKER_RELAUNCH', {});
+            });
+        });
     };
 
     var txids = {};
@@ -127,12 +163,12 @@ nThen(function (w) {
     };
 
     var throttledEnvChange = Util.throttle(function () {
-        Env.Log.info('WORKER_ENV_UPDATE', 'Updating HTTP workers with latest state'); // XXX
-        broadcast('ENV_UPDATE', Environment.serialize(Env)); //JSON.stringify(Env));
+        Env.Log.info('WORKER_ENV_UPDATE', 'Updating HTTP workers with latest state');
+        broadcast('ENV_UPDATE', Environment.serialize(Env));
     }, 250);
 
     var throttledCacheFlush = Util.throttle(function () {
-        Env.Log.info('WORKER_CACHE_FLUSH', 'Instructing HTTP workers to flush cache'); // XXX
+        Env.Log.info('WORKER_CACHE_FLUSH', 'Instructing HTTP workers to flush cache');
         broadcast('FLUSH_CACHE', Env.FRESH_KEY);
     }, 250);
 
@@ -145,36 +181,6 @@ nThen(function (w) {
         }
         launchWorker(w());
     });
-}).nThen(function () {
-    // Nothing async happens here but I'm using this function scope
-    // as a logical grouping for readability
-    var fancyURL = function (domain, path) {
-        try {
-            if (domain && path) { return new URL(path, domain).href; }
-            return new URL(domain);
-        } catch (err) {}
-        return false;
-    };
-
-    var host = Env.httpAddress;
-    var hostName = !host.indexOf(':') ? '[' + host + ']' : host;
-
-    var port = Env.httpPort;
-    var ps = port === 80? '': ':' + port;
-
-    var roughAddress = 'http://' + hostName + ps;
-    var betterAddress = fancyURL(Env.httpUnsafeOrigin);
-
-    if (betterAddress) {
-        console.log('Serving content for %s via %s.\n', betterAddress, roughAddress);
-    } else {
-        console.log('Serving content via %s.\n', roughAddress);
-    }
-    if (!Env.admins.length) {
-        console.log("Your instance is not correctly configured for safe use in production.\nSee %s for more information.\n",
-            fancyURL(Env.httpUnsafeOrigin, '/checkup/') || 'https://your-domain.com/checkup/'
-        );
-    }
 }).nThen(function () {
     if (Env.shouldUpdateNode) {
         Env.Log.warn("NODEJS_OLD_VERSION", {