@saltcorn/server 0.6.1-beta.1 → 0.6.2-beta.0

package/serve.js

@@ -33,11 +33,14 @@ const { setTenant, getSessionStore } = require("./routes/utils");
 const passport = require("passport");
 const { authenticate } = require("passport");
 const View = require("@saltcorn/data/models/view");
+const {
+  listenForChanges,
+  getRelevantPackages,
+  getPluginDirectories,
+} = require("./restart_watcher");
 
 // helpful https://gist.github.com/jpoehls/2232358
-
 /**
- * @param {object} opts
  * @param {object} opts
  * @param {boolean} opts.disableMigrate
  * @param {boolean} [useClusterAdaptor = true]
@@ -74,9 +77,9 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
 };
 
 /**
- * @param {object} opts 
- * @param {object} opts.tenant 
- * @param {...*} opts.msg 
+ * @param {object} opts
+ * @param {object} opts.tenant
+ * @param {...*} opts.msg
  * @returns {void}
  */
 const workerDispatchMsg = ({ tenant, ...msg }) => {
@@ -90,8 +93,12 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
     });
   }
   if (msg.refresh) getState()[`refresh_${msg.refresh}`](true);
-  if (msg.createTenant)
+  if (msg.createTenant) {
     create_tenant(msg.createTenant, loadAllPlugins, "", true);
+    db.runWithTenant(msg.createTenant, async () => {
+      getState().refresh(true);
+    });
+  }
   if (msg.installPlugin) {
     loadAndSaveNewPlugin(msg.installPlugin, msg.force, true);
   }
@@ -100,11 +107,11 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
 };
 
 /**
- * 
- * @param {*} masterState 
- * @param {object} opts 
- * @param {string} opts.port 
- * @param {boolean} opts.watchReaper 
+ *
+ * @param {*} masterState
+ * @param {object} opts
+ * @param {string} opts.port
+ * @param {boolean} opts.watchReaper
  * @param {boolean} opts.disableScheduler
  * @param {number} opts.pid
  * @returns {function}
@@ -133,120 +140,125 @@ const onMessageFromWorker = (
   }
 };
 
-module.exports = 
-/**
- * @function
- * @name "module.exports function"
- * @param {object} [opts = {}]
- * @param {number} [opts.port = 3000]
- * @param {boolean} opts.watchReaper
- * @param {boolean} opts.disableScheduler
- * @param {number} opts.defaultNCPUs 
- * @param {...*} opts.appargs 
- * @returns {Promise<void>}
- */
-async ({
-  port = 3000,
-  watchReaper,
-  disableScheduler,
-  defaultNCPUs,
-  ...appargs
-} = {}) => {
-  const useNCpus = process.env.SALTCORN_NWORKERS
-    ? +process.env.SALTCORN_NWORKERS
-    : defaultNCPUs;
+module.exports =
+  /**
+   * @function
+   * @name "module.exports function"
+   * @param {object} [opts = {}]
+   * @param {number} [opts.port = 3000]
+   * @param {boolean} opts.watchReaper
+   * @param {boolean} opts.disableScheduler
+   * @param {number} opts.defaultNCPUs
+   * @param {boolean} opts.dev
+   * @param {...*} opts.appargs
+   * @returns {Promise<void>}
+   */
+  async ({
+    port = 3000,
+    watchReaper,
+    disableScheduler,
+    defaultNCPUs,
+    dev,
+    ...appargs
+  } = {}) => {
+    if (dev && cluster.isMaster) {
+      listenForChanges(getRelevantPackages(), await getPluginDirectories());
+    }
+    const useNCpus = process.env.SALTCORN_NWORKERS
+      ? +process.env.SALTCORN_NWORKERS
+      : defaultNCPUs;
 
-  const letsEncrypt = await getConfig("letsencrypt", false);
-  const masterState = {
-    started: false,
-    listeningTo: new Set([]),
-  };
+    const letsEncrypt = await getConfig("letsencrypt", false);
+    const masterState = {
+      started: false,
+      listeningTo: new Set([]),
+    };
 
-  const addWorker = (worker) => {
-    worker.on(
-      "message",
-      onMessageFromWorker(masterState, {
-        port,
-        watchReaper,
-        disableScheduler,
-        pid: worker.process.pid,
-      })
-    );
-  };
+    const addWorker = (worker) => {
+      worker.on(
+        "message",
+        onMessageFromWorker(masterState, {
+          port,
+          watchReaper,
+          disableScheduler,
+          pid: worker.process.pid,
+        })
+      );
+    };
 
-  if (port === 80 && letsEncrypt) {
-    const admin_users = await User.find({ role_id: 1 }, { orderBy: "id" });
-    const file_store = db.connectObj.file_store;
-    const Greenlock = require("greenlock");
-    const greenlock = Greenlock.create({
-      packageRoot: __dirname,
-      configDir: path.join(file_store, "greenlock.d"),
-      maintainerEmail: admin_users[0].email,
-    });
-    const certs = await greenlock._find({});
-    console.log("Certificates:", certs);
+    if (port === 80 && letsEncrypt) {
+      const admin_users = await User.find({ role_id: 1 }, { orderBy: "id" });
+      const file_store = db.connectObj.file_store;
+      const Greenlock = require("greenlock");
+      const greenlock = Greenlock.create({
+        packageRoot: __dirname,
+        configDir: path.join(file_store, "greenlock.d"),
+        maintainerEmail: admin_users[0].email,
+      });
+      const certs = await greenlock._find({});
+      console.log("Certificates:", certs);
 
-    if (certs && certs.length > 0) {
-      const app = await getApp(appargs);
-      const timeout = +getState().getConfig("timeout", 120);
-      const initMasterListeners = () => {
-        Object.entries(cluster.workers).forEach(([id, w]) => {
-          if (!masterState.listeningTo.has(id)) {
-            addWorker(w);
-            masterState.listeningTo.add(id);
-          }
-        });
-        if (masterState.listeningTo.size < useNCpus)
-          setTimeout(initMasterListeners, 250);
-      };
-      require("greenlock-express")
-        .init({
-          packageRoot: __dirname,
-          configDir: path.join(file_store, "greenlock.d"),
-          maintainerEmail: admin_users[0].email,
-          cluster: true,
-          workers: useNCpus,
-        })
-        .ready((glx) => {
-          const httpsServer = glx.httpsServer();
-          setupSocket(httpsServer);
-          httpsServer.setTimeout(timeout * 1000);
-          process.on("message", workerDispatchMsg);
-          glx.serveApp(app);
-          process.send && process.send("Start");
-        })
-        .master(() => {
-          initMaster(appargs).then(initMasterListeners);
-        });
+      if (certs && certs.length > 0) {
+        const app = await getApp(appargs);
+        const timeout = +getState().getConfig("timeout", 120);
+        const initMasterListeners = () => {
+          Object.entries(cluster.workers).forEach(([id, w]) => {
+            if (!masterState.listeningTo.has(id)) {
+              addWorker(w);
+              masterState.listeningTo.add(id);
+            }
+          });
+          if (masterState.listeningTo.size < useNCpus)
+            setTimeout(initMasterListeners, 250);
+        };
+        require("greenlock-express")
+          .init({
+            packageRoot: __dirname,
+            configDir: path.join(file_store, "greenlock.d"),
+            maintainerEmail: admin_users[0].email,
+            cluster: true,
+            workers: useNCpus,
+          })
+          .ready((glx) => {
+            const httpsServer = glx.httpsServer();
+            setupSocket(httpsServer);
+            httpsServer.setTimeout(timeout * 1000);
+            process.on("message", workerDispatchMsg);
+            glx.serveApp(app);
+            process.send && process.send("Start");
+          })
+          .master(() => {
+            initMaster(appargs).then(initMasterListeners);
+          });
 
-      return; // none of stuff below will execute
+        return; // none of stuff below will execute
+      }
     }
-  }
-  // No greenlock!
+    // No greenlock!
 
-  if (cluster.isMaster) {
-    const forkAnyWorkers = useNCpus > 1 && process.platform !== "win32";
-    await initMaster(appargs, forkAnyWorkers);
+    if (cluster.isMaster) {
+      const forkAnyWorkers = useNCpus > 1 && process.platform !== "win32";
+      await initMaster(appargs, forkAnyWorkers);
 
-    if (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());
-      });
+        cluster.on("exit", (worker, code, signal) => {
+          console.log(`worker ${worker.process.pid} died`);
+          addWorker(cluster.fork());
+        });
+      } else {
+        await nonGreenlockWorkerSetup(appargs, port);
+      }
+      Trigger.emitEvent("Startup");
     } else {
       await nonGreenlockWorkerSetup(appargs, port);
     }
-    Trigger.emitEvent("Startup");
-  } else {
-    await nonGreenlockWorkerSetup(appargs, port);
-  }
-};
+  };
 
 /**
- * @param {*} appargs 
- * @param {*} port 
+ * @param {*} appargs
+ * @param {*} port
  * @returns {Promise<void>}
  */
 const nonGreenlockWorkerSetup = async (appargs, port) => {
@@ -294,8 +306,8 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
 };
 
 /**
- * 
- * @param  {...*} servers 
+ *
+ * @param  {...*} servers
  */
 const setupSocket = (...servers) => {
   // https://socket.io/docs/v4/middlewares/