@saltcorn/server 0.6.0-beta.3 → 0.6.0-beta.4

package/app.js

@@ -112,6 +112,12 @@ const getApp = async (opts = {}) => {
     )
   );
 
+  if (process.env.SALTCORN_SERVE_ADDITIONAL_DIR)
+    app.use(
+      express.static(process.env.SALTCORN_SERVE_ADDITIONAL_DIR, {
+        maxAge: development_mode ? 0 : 1000 * 60 * 15,
+      })
+    );
   let version_tag = db.connectObj.version_tag;
 
   app.use(

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.0-beta.3",
+  "version": "0.6.0-beta.4",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.6.0-beta.3",
-    "@saltcorn/builder": "0.6.0-beta.3",
-    "@saltcorn/data": "0.6.0-beta.3",
+    "@saltcorn/base-plugin": "0.6.0-beta.4",
+    "@saltcorn/builder": "0.6.0-beta.4",
+    "@saltcorn/data": "0.6.0-beta.4",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.0-beta.3",
-    "@saltcorn/sbadmin2": "0.6.0-beta.3",
+    "@saltcorn/markup": "0.6.0-beta.4",
+    "@saltcorn/sbadmin2": "0.6.0-beta.4",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",

package/routes/admin.js

@@ -393,11 +393,12 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     if (db.getTenantSchema() === db.connectObj.default_schema) {
-      process.send("RestartServer");
-      //process.exit(0);
+      if (process.send) process.send("RestartServer");
+      else process.exit(0);
     } else {
       await restart_tenant(loadAllPlugins);
-      process.send({ restart_tenant: true, tenant: db.getTenantSchema() });
+      process.send &&
+        process.send({ restart_tenant: true, tenant: db.getTenantSchema() });
       req.flash("success", req.__("Restart complete"));
       res.redirect("/admin");
     }

package/routes/utils.js

@@ -9,6 +9,8 @@ const { get_base_url } = require("@saltcorn/data/models/config");
 const { input } = require("@saltcorn/markup/tags");
 const session = require("express-session");
 const cookieSession = require("cookie-session");
+const is = require("contractis/is");
+
 function loggedIn(req, res, next) {
   if (req.user && req.user.id && req.user.tenant === db.getTenantSchema()) {
     next();

package/serve.js

@@ -35,7 +35,7 @@ const View = require("@saltcorn/data/models/view");
 
 // helpful https://gist.github.com/jpoehls/2232358
 
-const initMaster = async ({ disableMigrate }) => {
+const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
   let sql_log;
   try {
     sql_log = await getConfig("log_sql");
@@ -63,7 +63,7 @@ const initMaster = async ({ disableMigrate }) => {
   if (db.is_it_multi_tenant()) {
     await init_multi_tenant(loadAllPlugins, disableMigrate);
   }
-  setupPrimary();
+  if (useClusterAdaptor) setupPrimary();
 };
 
 const workerDispatchMsg = ({ tenant, ...msg }) => {
@@ -177,7 +177,7 @@ module.exports = async ({
           httpsServer.setTimeout(timeout * 1000);
           process.on("message", workerDispatchMsg);
           glx.serveApp(app);
-          process.send("Start");
+          process.send && process.send("Start");
         })
         .master(() => {
           initMaster(appargs).then(initMasterListeners);
@@ -189,60 +189,67 @@ module.exports = async ({
   // No greenlock!
 
   if (cluster.isMaster) {
-    await initMaster(appargs);
+    const forkAnyWorkers = useNCpus > 1 && process.platform !== "win32";
+    await initMaster(appargs, forkAnyWorkers);
 
-    for (let i = 0; i < useNCpus; i++) addWorker(cluster.fork());
+    if (forkAnyWorkers) {
+      for (let i = 0; i < useNCpus; i++) addWorker(cluster.fork());
 
+      cluster.on("exit", (worker, code, signal) => {
+        console.log(`worker ${worker.process.pid} died`);
+        addWorker(cluster.fork());
+      });
+    } else {
+      await nonGreenlockWorkerSetup(appargs, port);
+    }
     Trigger.emitEvent("Startup");
-
-    cluster.on("exit", (worker, code, signal) => {
-      console.log(`worker ${worker.process.pid} died`);
-      addWorker(cluster.fork());
-    });
   } else {
-    process.on("message", workerDispatchMsg);
+    await nonGreenlockWorkerSetup(appargs, port);
+  }
+};
 
-    const app = await getApp(appargs);
+const nonGreenlockWorkerSetup = async (appargs, port) => {
+  process.send && process.on("message", workerDispatchMsg);
 
-    const cert = getState().getConfig("custom_ssl_certificate", "");
-    const key = getState().getConfig("custom_ssl_private_key", "");
-    const timeout = +getState().getConfig("timeout", 120);
+  const app = await getApp(appargs);
 
-    // Server with http on port 80 / https on 443
-    // todo  resolve hardcode
-    if (port === 80 && cert && key) {
-      const https = require("https");
-      const http = require("http");
-      const httpServer = http.createServer(app);
-      const httpsServer = https.createServer({ key, cert }, app);
-      // todo timeout to config
-      httpServer.setTimeout(timeout * 1000);
-      httpsServer.setTimeout(timeout * 1000);
-      setupSocket(httpServer, httpsServer);
-      httpServer.listen(port, () => {
-        console.log("HTTP Server running on port 80");
-      });
+  const cert = getState().getConfig("custom_ssl_certificate", "");
+  const key = getState().getConfig("custom_ssl_private_key", "");
+  const timeout = +getState().getConfig("timeout", 120);
+  // Server with http on port 80 / https on 443
+  // todo  resolve hardcode
+  if (port === 80 && cert && key) {
+    const https = require("https");
+    const http = require("http");
+    const httpServer = http.createServer(app);
+    const httpsServer = https.createServer({ key, cert }, app);
+    // todo timeout to config
+    httpServer.setTimeout(timeout * 1000);
+    httpsServer.setTimeout(timeout * 1000);
+    setupSocket(httpServer, httpsServer);
+    httpServer.listen(port, () => {
+      console.log("HTTP Server running on port 80");
+    });
 
-      // todo port to config
-      httpsServer.listen(443, () => {
-        console.log("HTTPS Server running on port 443");
-      });
-    } else {
-      // server with http only
-      const http = require("http");
-      const httpServer = http.createServer(app);
-      setupSocket(httpServer);
+    // todo port to config
+    httpsServer.listen(443, () => {
+      console.log("HTTPS Server running on port 443");
+    });
+  } else {
+    // server with http only
+    const http = require("http");
+    const httpServer = http.createServer(app);
+    setupSocket(httpServer);
 
-      // todo timeout to config
-      // todo refer in doc to httpserver doc
-      // todo there can be added other parameters for httpserver
-      httpServer.setTimeout(timeout * 1000);
-      httpServer.listen(port, () => {
-        console.log(`Saltcorn listening on http://localhost:${port}/`);
-      });
-    }
-    process.send("Start");
+    // todo timeout to config
+    // todo refer in doc to httpserver doc
+    // todo there can be added other parameters for httpserver
+    httpServer.setTimeout(timeout * 1000);
+    httpServer.listen(port, () => {
+      console.log(`Saltcorn listening on http://localhost:${port}/`);
+    });
   }
+  process.send && process.send("Start");
 };
 const setupSocket = (...servers) => {
   // https://socket.io/docs/v4/middlewares/
@@ -258,7 +265,7 @@ const setupSocket = (...servers) => {
   io.use(wrap(getSessionStore()));
   io.use(wrap(passport.initialize()));
   io.use(wrap(passport.session()));
-  io.adapter(createAdapter());
+  if (process.send) io.adapter(createAdapter());
   getState().setRoomEmitter((viewname, room_id, msg) => {
     io.to(`${viewname}_${room_id}`).emit("message", msg);
   });