@saltcorn/server 1.3.1-beta.10 → 1.3.1-beta.12

package/serve.js

@@ -14,6 +14,7 @@ const {
   init_multi_tenant,
   restart_tenant,
   add_tenant,
+  get_other_domain_tenant,
 } = require("@saltcorn/data/db/state");
 const { create_tenant } = require("@saltcorn/admin-models/models/tenant");
 
@@ -79,24 +80,18 @@ const ensureJwtSecret = () => {
   }
 };
 
-/**
- * Ensure the engines cache is up to date with the current sc version
- */
-const ensureEnginesCache = async () => {
-  const cacheScVersion = await getConfig("engines_cache_sc_version", "");
-  if (!cacheScVersion || cacheScVersion !== getState().scVersion) {
-    await setConfig("engines_cache", {});
-    await setConfig("engines_cache_sc_version", getState().scVersion);
-  }
-};
-
 /**
  * validate all plugins folders and remove invalid entries
  * A folder is invalid when it has dependencies but not node_modules directory
  */
 const ensurePluginsFolder = async () => {
   const rootFolder = envPaths("saltcorn", { suffix: "plugins" }).data;
-  const staticDeps = ["@saltcorn/markup", "@saltcorn/data", "jest"];
+  const staticDeps = [
+    "@saltcorn/markup",
+    "@saltcorn/data",
+    "@saltcorn/postgres",
+    "jest",
+  ];
   const allPluginFolders = new Set();
   await eachTenant(async () => {
     try {
@@ -205,12 +200,6 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
     const tenants = await getAllTenants();
     await init_multi_tenant(loadAllPlugins, disableMigrate, tenants);
   }
-  eachTenant(async () => {
-    const state = getState();
-    if (state) {
-      await state.setConfig("joined_log_socket_ids", []);
-    }
-  });
   if (useClusterAdaptor) setupPrimary();
 };
 
@@ -234,7 +223,11 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
     console.error("no State for tenant", tenant);
     return;
   }
-  if (msg.refresh) getState()[`refresh_${msg.refresh}`](true);
+  if (msg.refresh) {
+    if (msg.refresh === "ephemeral_config")
+      getState().refresh_ephemeral_config(msg.key, msg.value);
+    else getState()[`refresh_${msg.refresh}`](true);
+  }
   if (msg.createTenant) {
     const tenant_template = getState().getConfig("tenant_template");
     add_tenant(msg.createTenant);
@@ -323,7 +316,6 @@ module.exports =
   } = {}) => {
     if (cluster.isMaster) {
       ensureJwtSecret();
-      await ensureEnginesCache();
       await ensurePluginsFolder();
       await ensureNotificationSubscriptions();
     }
@@ -525,6 +517,16 @@ const nonGreenlockWorkerSetup = async (appargs, port, host) => {
   getState().processSend("Start");
 };
 
+const tenantFromSocket = (socket, hostPartOffset) => {
+  const header = socket.request.headers.host;
+  const hostOnly = header?.split(":")[0];
+  if (hostOnly) {
+    const tenant = get_other_domain_tenant(hostOnly);
+    if (tenant) return tenant;
+  }
+  return get_tenant_from_req(socket.request, hostPartOffset);
+};
+
 /**
  *
  * @param  {...*} servers
@@ -583,7 +585,7 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
 
   io.of("/").on("connection", (socket) => {
     socket.on("join_room", ([viewname, room_id]) => {
-      const ten = get_tenant_from_req(socket.request) || "public";
+      const ten = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = () => {
         try {
           const view = View.findOne({ name: viewname });
@@ -603,8 +605,7 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
     });
 
     socket.on("join_log_room", async (callback) => {
-      const tenant =
-        get_tenant_from_req(socket.request, subdomainOffset) || "public";
+      const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = async () => {
         try {
           const user = socket.request.user;
@@ -634,8 +635,7 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
 
     // or join the room more generally and later register views ??
     socket.on("join_collab_room", async (viewname, callback) => {
-      const tenant =
-        get_tenant_from_req(socket.request, subdomainOffset) || "public";
+      const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = async () => {
         try {
           const view = View.findOne({ name: viewname });
@@ -644,8 +644,20 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
           const role_id = user ? user.role_id : 100;
           if (view.min_role < role_id)
             throw new Error("Not authorized to join collaboration room");
-          socket.join(`_${tenant}_collab_room_`);
-          if (typeof callback === "function") callback({ status: "ok" });
+          const roomName = `_${tenant}_collab_room_`;
+          if (!socket.rooms.has(roomName)) {
+            socket.join(`_${tenant}_collab_room_`);
+            if (typeof callback === "function") callback({ status: "ok" });
+            const socketIds = await getState().getConfig(
+              "joined_real_time_socket_ids",
+              []
+            );
+            socketIds.push(socket.id);
+            await getState().setConfig("joined_real_time_socket_ids", [
+              ...new Set(socketIds),
+            ]);
+          } else if (typeof callback === "function")
+            callback({ status: "already_joined" });
         } catch (err) {
           getState().log(1, `Socket join_collab_room: ${err.stack}`);
           if (typeof callback === "function")
@@ -658,8 +670,7 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
 
     // join_dynamic_update_room for events emitted from run_js_actions
     socket.on("join_dynamic_update_room", async (callback) => {
-      const tenant =
-        get_tenant_from_req(socket.request, subdomainOffset) || "public";
+      const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = async () => {
         try {
           const enabled = getState().getConfig("enable_dynamic_updates", true);
@@ -668,6 +679,14 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
           if (!user) throw new Error("Not authorized");
           socket.join(`_${tenant}_dynamic_update_room`);
           socket.join(`_${tenant}:${user.id}_dynamic_update_room`);
+          const socketIds = await getState().getConfig(
+            "joined_dynamic_update_socket_ids",
+            []
+          );
+          socketIds.push(socket.id);
+          await getState().setConfig("joined_dynamic_update_socket_ids", [
+            ...new Set(socketIds),
+          ]);
           if (typeof callback === "function") callback({ status: "ok" });
         } catch (err) {
           getState().log(1, `Socket join_dynamic_update_room: ${err.stack}`);
@@ -680,14 +699,37 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
     });
 
     socket.on("disconnect", async () => {
-      const tenant =
-        get_tenant_from_req(socket.request, subdomainOffset) || "public";
+      const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = async () => {
         const state = getState();
         if (state) {
           const socketIds = state.getConfig("joined_log_socket_ids");
           const newSocketIds = socketIds.filter((id) => id !== socket.id);
           await state.setConfig("joined_log_socket_ids", newSocketIds);
+
+          const dynamicSocketIds = state.getConfig(
+            "joined_dynamic_update_socket_ids",
+            []
+          );
+          const newDynamicSocketIds = dynamicSocketIds.filter(
+            (id) => id !== socket.id
+          );
+          await state.setConfig(
+            "joined_dynamic_update_socket_ids",
+            newDynamicSocketIds
+          );
+
+          const realTimeSocketIds = state.getConfig(
+            "joined_real_time_socket_ids",
+            []
+          );
+          const newRealTimeSocketIds = realTimeSocketIds.filter(
+            (id) => id !== socket.id
+          );
+          await state.setConfig(
+            "joined_real_time_socket_ids",
+            newRealTimeSocketIds
+          );
         } else {
           console.error("No state found in socket disconnect");
           console.error("The current tenantSchema is:", db.getTenantSchema());
@@ -706,8 +748,7 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
     socket.on(
       "open_data_stream",
       async ([viewName, id, fieldName, fieldView, targetOpts], callback) => {
-        const tenant =
-          get_tenant_from_req(socket.request, subdomainOffset) || "public";
+        const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
         const f = async () => {
           try {
             const user = socket.request.user;
@@ -786,8 +827,7 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
     });
 
     socket.on("disconnect", async () => {
-      const tenant =
-        get_tenant_from_req(socket.request, subdomainOffset) || "public";
+      const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = async () => {
         if (dataStream)
           dataStream.close((err) => {

package/tests/admin.test.js

@@ -387,7 +387,7 @@ describe("actions", () => {
       .send("table_id=2")
       .send("name=mynewaction")
       .send("when_trigger=Insert")
-      .expect(toRedirect("/actions/configure/7"));
+      .expect(toRedirect("/actions/configure/8"));
   });
   it("show edit", async () => {
     const app = await getApp({ disableCsrf: true });
@@ -451,9 +451,9 @@ describe("actions", () => {
       .send("action=run_js_code")
       .send("when_trigger=API+call")
       .send("min_role=1")
-      .expect(toRedirect("/actions/configure/8"));
+      .expect(toRedirect("/actions/configure/9"));
     await request(app)
-      .post("/actions/configure/8")
+      .post("/actions/configure/9")
       .set("Cookie", loginCookie)
       .send("code=return 27")
       .expect(toRedirect("/actions/"));

package/tests/auth.test.js

@@ -21,8 +21,12 @@ const { get_reset_link, generate_email } = require("../auth/resetpw");
 const i18n = require("i18n");
 const path = require("path");
 const fs = require("fs");
+const { sleep } = require("@saltcorn/data/utils");
 
-afterAll(db.close);
+afterAll(async () => {
+  await sleep(100);
+  db.close();
+});
 beforeAll(async () => {
   await resetToFixtures();
 });

package/wrapper.js

@@ -91,7 +91,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
   const locale = req.getLocale();
   const stdHeaders = [
     {
-      headerTag: `<script>const _sc_loglevel = ${
+      headerTag: `<script>var _sc_loglevel = ${
         state.logLevel
       }, _sc_globalCsrf = "${req.csrfToken()}", _sc_version_tag = "${version_tag}"${
         locale ? `, _sc_locale = "${locale}"` : ""
@@ -158,7 +158,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
   }
   from_cfg.push({
     scriptBody: `var dynamic_updates_cfg = ${JSON.stringify({
-      enabled: dynamic_updates_enabled,
+      enabled: dynamic_updates_enabled && req.user?.id,
     })}`,
   });
   return [