@saltcorn/server 1.6.0-alpha.5 → 1.6.0-alpha.7

package/routes/packs.js

@@ -5,7 +5,7 @@
  */
 
 const Router = require("express-promise-router");
-const { isAdmin, error_catcher, setTenant } = require("./utils.js");
+const { isAdmin, error_catcher, setTenant, is_relative_url } = require("./utils.js");
 const { renderForm } = require("@saltcorn/markup");
 const Table = require("@saltcorn/data/models/table");
 const Form = require("@saltcorn/data/models/form");
@@ -56,6 +56,16 @@ const fs = require("fs");
 const router = new Router();
 module.exports = router;
 
+const getOnDoneRedirect = (req, fallback = "/plugins") => {
+  if (
+    req.query.on_done_redirect &&
+    is_relative_url("/" + req.query.on_done_redirect)
+  ) {
+    return `/${req.query.on_done_redirect}`;
+  }
+  return fallback;
+};
+
 /**
  * @name get
  * @function
@@ -473,14 +483,14 @@ router.post(
     const pack = await fetch_pack_by_name(name);
     if (!pack) {
       req.flash("error", req.__(`Pack %s not found`, text(name)));
-      res.redirect(`/plugins`);
+      res.redirect(getOnDoneRedirect(req, "/plugins"));
       return;
     }
     const can_install = await can_install_pack(pack.pack);
 
     if (can_install.error) {
       req.flash("error", can_install.error);
-      res.redirect(`/plugins`);
+      res.redirect(getOnDoneRedirect(req, "/plugins"));
       return;
     } else if (can_install.warning) {
       req.flash("warning", can_install.warning);
@@ -492,7 +502,7 @@ router.post(
     });
     await getState().refresh();
     req.flash("success", req.__(`Pack %s installed`, text(name)));
-    res.redirect(`/`);
+    res.redirect(getOnDoneRedirect(req, "/"));
   })
 );
 
@@ -511,7 +521,7 @@ router.post(
     const pack = await fetch_pack_by_name(name);
     if (!pack) {
       req.flash("error", req.__(`Pack %s not found`, text(name)));
-      res.redirect(`/plugins`);
+      res.redirect(getOnDoneRedirect(req, "/plugins"));
       return;
     }
     await db.withTransaction(async () => {
@@ -521,6 +531,6 @@ router.post(
 
     req.flash("success", req.__(`Pack %s uninstalled`, text(name)));
 
-    res.redirect(`/`);
+    res.redirect(getOnDoneRedirect(req, "/"));
   })
 );

package/routes/pageedit.js

@@ -202,6 +202,20 @@ const pageBuilderData = async (req, context) => {
       });
     }
   }
+  const workflowActions = Trigger.trigger_actions({
+    apiNeverTriggers: true,
+    onlyWorkflows: true,
+  });
+  for (const name of workflowActions) {
+    actionConfigForms[name] = [
+      {
+        name: "initial_context",
+        label: "Initial context",
+        type: "String",
+        class: "validate-expression",
+      },
+    ];
+  }
   const actionsNotRequiringRow = Trigger.action_options({
     notRequireRow: true,
     apiNeverTriggers: true,

package/routes/plugins.js

@@ -6,7 +6,13 @@
  */
 
 const Router = require("express-promise-router");
-const { isAdmin, loggedIn, error_catcher } = require("./utils.js");
+const {
+  isAdmin,
+  loggedIn,
+  error_catcher,
+  addOnDoneRedirect,
+  is_relative_url,
+} = require("./utils.js");
 const { renderForm, link, post_btn } = require("@saltcorn/markup");
 const {
   getState,
@@ -70,6 +76,16 @@ const {
   isVersionSupported,
 } = require("@saltcorn/plugins-loader/stable_versioning");
 
+const getOnDoneRedirect = (req, fallback = "/plugins") => {
+  if (
+    req.query.on_done_redirect &&
+    is_relative_url("/" + req.query.on_done_redirect)
+  ) {
+    return `/${req.query.on_done_redirect}`;
+  }
+  return fallback;
+};
+
 /**
  * @type {object}
  * @const
@@ -791,7 +807,7 @@ router.get(
     const plugin = await Plugin.findOne({ name: decodeURIComponent(name) });
     if (!plugin) {
       req.flash("warning", req.__("Module not found"));
-      res.redirect("/plugins");
+      res.redirect(getOnDoneRedirect(req));
       return;
     }
     let module = getState().plugins[plugin.name];
@@ -800,9 +816,15 @@ router.get(
     }
     const flow = module.configuration_workflow();
     flow.modifyForm = remove_fixed_fields(name);
-    flow.action = `/plugins/configure/${encodeURIComponent(plugin.name)}`;
+    const configurePath = `/plugins/configure/${encodeURIComponent(
+      plugin.name
+    )}`;
+    flow.action = addOnDoneRedirect(configurePath, req);
     flow.autoSave = true;
-    flow.saveURL = `/plugins/saveconfig/${encodeURIComponent(plugin.name)}`;
+    flow.saveURL = addOnDoneRedirect(
+      `/plugins/saveconfig/${encodeURIComponent(plugin.name)}`,
+      req
+    );
     const wfres = await flow.run(plugin.configuration || {});
 
     if (module.layout) {
@@ -872,9 +894,15 @@ router.post(
     const flow = module.configuration_workflow();
     flow.modifyForm = remove_fixed_fields(name);
 
-    flow.action = `/plugins/configure/${encodeURIComponent(plugin.name)}`;
+    const configurePath = `/plugins/configure/${encodeURIComponent(
+      plugin.name
+    )}`;
+    flow.action = addOnDoneRedirect(configurePath, req);
     flow.autoSave = true;
-    flow.saveURL = `/plugins/saveconfig/${encodeURIComponent(plugin.name)}`;
+    flow.saveURL = addOnDoneRedirect(
+      `/plugins/saveconfig/${encodeURIComponent(plugin.name)}`,
+      req
+    );
     const wfres = await flow.run(req.body || {});
     if (wfres.renderForm) {
       if (module.layout) {
@@ -913,7 +941,7 @@ router.post(
       });
       if (module.layout) await sleep(500); // Allow other workers to reload this plugin
       if (wfres.cleanup) await wfres.cleanup();
-      res.redirect("/plugins");
+      res.redirect(getOnDoneRedirect(req));
     }
   })
 );
@@ -1535,7 +1563,7 @@ router.post(
     const plugin = await Plugin.findOne({ name: decodeURIComponent(name) });
     if (!plugin) {
       req.flash("warning", req.__("Module not found"));
-      res.redirect("/plugins");
+      res.redirect(getOnDoneRedirect(req));
       return;
     }
     const depviews = await plugin.dependant_views();
@@ -1552,7 +1580,7 @@ router.post(
         req.__(`Cannot remove module: views %s depend on it`, depviews.join())
       );
     }
-    res.redirect(`/plugins`);
+    res.redirect(getOnDoneRedirect(req));
   })
 );
 
@@ -1591,7 +1619,7 @@ router.post(
         "error",
         req.__(`Module %s not found`, text(decodeURIComponent(name)))
       );
-      res.redirect(`/plugins`);
+      res.redirect(getOnDoneRedirect(req));
       return;
     }
     let forceReInstall =
@@ -1605,7 +1633,7 @@ router.post(
         "error",
         req.__("Cannot install unsafe modules on subdomain tenants")
       );
-      res.redirect(`/plugins`);
+      res.redirect(getOnDoneRedirect(req));
       return;
     }
 
@@ -1623,7 +1651,7 @@ router.post(
         "error",
         e.message || req.__("Error installing module %s", plugin.name)
       );
-      res.redirect(`/plugins`);
+      res.redirect(getOnDoneRedirect(req));
       return;
     }
     const plugin_module = getState().plugins[name];
@@ -1640,11 +1668,14 @@ router.post(
         )
       );
       if (msgs?.length > 0) req.flash("warning", msgs.join("<br>"));
-      res.redirect(`/plugins/configure/${plugin_db.name}`);
+      const configurePath = `/plugins/configure/${encodeURIComponent(
+        plugin_db.name
+      )}`;
+      res.redirect(addOnDoneRedirect(configurePath, req));
     } else {
       req.flash("success", req.__(`Module %s installed`, plugin.name));
       if (msgs?.length > 0) req.flash("warning", msgs.join("<br>"));
-      res.redirect(`/plugins`);
+      res.redirect(getOnDoneRedirect(req));
     }
   })
 );

package/routes/utils.js

@@ -383,7 +383,8 @@ const getSessionStore = (pruneInterval) => {
 const addOnDoneRedirect = (oldPath, req) => {
   const separator = oldPath.indexOf("?") > -1 ? "&" : "?";
   if (req.query.on_done_redirect) {
-    return `${oldPath}${separator}on_done_redirect=${req.query.on_done_redirect}`;
+    const encoded = encodeURIComponent(req.query.on_done_redirect);
+    return `${oldPath}${separator}on_done_redirect=${encoded}`;
   }
   return oldPath;
 };

package/routes/viewedit.js

@@ -560,11 +560,14 @@ router.post(
           }
 
         const v = result.success;
+        const vt = getState().viewtemplates[v.viewtemplate];
         if (v.table_name) {
           const table = Table.findOne({ name: v.table_name });
           if (table && table.id) {
             v.table_id = table.id;
           } else if (table && table.external) v.exttable_name = v.table_name;
+        } else if (vt?.table_optional) {
+          v.table_id = null;
         }
         if (v.table_id) {
           const table = Table.findOne({ id: v.table_id });
@@ -577,7 +580,6 @@ router.post(
         if ((req.body || {}).id) {
           await View.update(v, +(req.body || {}).id);
         } else {
-          const vt = getState().viewtemplates[v.viewtemplate];
           if (vt.initial_config) v.configuration = await vt.initial_config(v);
           else v.configuration = {};
           //console.log(v);

package/serve.js

@@ -342,23 +342,18 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
  * @returns {function}
  */
 const onMessageFromWorker =
-  (
-    masterState,
-    { port, host, watchReaper, disableScheduler, pid, nodesDispatchMsg }
-  ) =>
+  (masterState, { port, pid, nodesDispatchMsg, scheduleHelper, isLeader }) =>
   (msg) => {
     //console.log("worker msg", typeof msg, msg);
     if (msg === "Start" && !masterState.started) {
       masterState.started = true;
-      runScheduler({
-        port,
-        host,
-        watchReaper,
-        disableScheduler,
-        eachTenant,
-        auto_backup_now,
-        take_snapshot,
-      });
+      if (isLeader) scheduleHelper.start();
+      if (db.connectObj.multi_node) {
+        startLeadershipMonitor({
+          scheduleHelper,
+          wasLeader: isLeader,
+        });
+      }
       require("./systemd")({ port });
       return true;
     } else if (msg === "RestartServer") {
@@ -409,6 +404,54 @@ const initOfflineStoreCfg = async () => {
   }
 };
 
+/**
+ * returns a function that checks if current node is leader
+ * uses a dedicated pg connection that holds an advisory lock
+ */
+const getIsLeaderFn = async () => {
+  const electLeaderConn = await db.getClient();
+  const isSqlite = db.isSQLite;
+  return async () => {
+    if (isSqlite) return true;
+    const lockId = 11565;
+    const result = await electLeaderConn.query(
+      "SELECT pg_try_advisory_lock($1) AS is_leader",
+      [lockId]
+    );
+    if (result.rows[0].is_leader) return true;
+    else return false;
+  };
+};
+
+/**
+ * check periodically if the current node is leader and start/stop scheduler accordingly
+ * @param options - Options object
+ * @param options.scheduleHelper - Helper with start/stop and checkIsLeader function.
+ * @param options.wasLeader - flag if it was previously the leader.
+ * @param options.intervalMs - Monitor interval, Defaults to `5000`.
+ */
+const startLeadershipMonitor = ({
+  scheduleHelper,
+  wasLeader,
+  intervalMs = 5000,
+}) => {
+  let schedulerStarted = wasLeader;
+  setInterval(async () => {
+    try {
+      const isLeader = await scheduleHelper.isLeaderFn();
+      if (isLeader && !schedulerStarted) {
+        scheduleHelper.start();
+        schedulerStarted = true;
+      } else if (!isLeader && schedulerStarted) {
+        scheduleHelper.stop();
+        schedulerStarted = false;
+      }
+    } catch (e) {
+      console.log(`Error checking leadership: ${e.message}`);
+    }
+  }, intervalMs);
+};
+
 module.exports =
   /**
    * @function
@@ -460,8 +503,14 @@ module.exports =
 
     let nodesDispatchMsg = null;
     let multiNodeClient = null;
+    let isLeaderFn = null;
+    let isLeader = true;
     if (db.connectObj.multi_node) {
       multiNodeClient = await db.getClient();
+      if (cluster.isMaster) {
+        isLeaderFn = await getIsLeaderFn();
+        isLeader = await isLeaderFn();
+      }
       nodesDispatchMsg = async ({ tenant, ...msg }) => {
         if (tenant) {
           db.runWithTenant(tenant, () => nodesDispatchMsg(msg));
@@ -494,16 +543,36 @@ module.exports =
       };
     }
 
+    const scheduleHelper = {
+      stopScheduler: false,
+      start: () => {
+        this.stopScheduler = false;
+        runScheduler({
+          stop_when: () => this.stopScheduler,
+          port,
+          host,
+          watchReaper,
+          disableScheduler,
+          eachTenant,
+          auto_backup_now,
+          take_snapshot,
+        });
+      },
+      stop: () => {
+        this.stopScheduler = true;
+      },
+      isLeaderFn,
+    };
+
     const addWorker = (worker) => {
       worker.on(
         "message",
         onMessageFromWorker(masterState, {
           port,
-          host,
-          watchReaper,
-          disableScheduler,
           pid: worker.process.pid,
           nodesDispatchMsg,
+          scheduleHelper,
+          isLeader,
         })
       );
     };
@@ -608,15 +677,13 @@ module.exports =
             });
         };
         await nonGreenlockWorkerSetup(appargs, port, host);
-        runScheduler({
-          port,
-          host,
-          watchReaper,
-          disableScheduler,
-          eachTenant,
-          auto_backup_now,
-          take_snapshot,
-        });
+        if (isLeader) scheduleHelper.start();
+        if (db.connectObj.multi_node) {
+          startLeadershipMonitor({
+            scheduleHelper,
+            wasLeader: isLeader,
+          });
+        }
         require("./systemd")({ port });
       }
       Trigger.emitEvent("Startup");