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

package/docs/variables/_saltcorn_db_common.multi_tenant.tenantNamespace.html

@@ -19,7 +19,7 @@
 <h1>Variable tenantNamespace<code class="tsd-tag ts-flagConst">Const</code> </h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">tenant<wbr/>Namespace</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type ">AsyncLocalStorage</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type ">RequestContext</span><span class="tsd-signature-symbol">&gt;</span><span class="tsd-signature-symbol"> = ...</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/af484534de/packages/db-common/multi-tenant.ts#L17">db-common/multi-tenant.ts:17</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/e533183df2/packages/db-common/multi-tenant.ts#L17">db-common/multi-tenant.ts:17</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.3.1-beta.10",
+  "version": "1.3.1-beta.11",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "1.15.0",
-    "@saltcorn/admin-models": "1.3.1-beta.10",
-    "@saltcorn/base-plugin": "1.3.1-beta.10",
-    "@saltcorn/builder": "1.3.1-beta.10",
-    "@saltcorn/data": "1.3.1-beta.10",
-    "@saltcorn/filemanager": "1.3.1-beta.10",
-    "@saltcorn/markup": "1.3.1-beta.10",
-    "@saltcorn/plugins-loader": "1.3.1-beta.10",
-    "@saltcorn/sbadmin2": "1.3.1-beta.10",
+    "@saltcorn/admin-models": "1.3.1-beta.11",
+    "@saltcorn/base-plugin": "1.3.1-beta.11",
+    "@saltcorn/builder": "1.3.1-beta.11",
+    "@saltcorn/data": "1.3.1-beta.11",
+    "@saltcorn/filemanager": "1.3.1-beta.11",
+    "@saltcorn/markup": "1.3.1-beta.11",
+    "@saltcorn/plugins-loader": "1.3.1-beta.11",
+    "@saltcorn/sbadmin2": "1.3.1-beta.11",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/saltcorn-common.js

@@ -2137,12 +2137,17 @@ function init_collab_room(viewname, eventCfgs) {
 }
 
 function init_dynamic_update_room() {
+  const isNode = getIsNode();
   if (
     !window.io ||
     navigator.userAgent.includes("jsdom") ||
-    !dynamic_updates_cfg?.enabled
+    (isNode && !dynamic_updates_cfg?.enabled)
   )
     return;
+  if (!isNode) {
+    const state = parent.saltcorn.data.state.getState();
+    if (!state.getConfig("enable_dynamic_updates", true)) return;
+  }
   let socket = get_shared_socket();
   socket.on("dynamic_update", async (data) => {
     await common_done(data);

package/public/saltcorn.js

@@ -1129,12 +1129,42 @@ function check_capacitor_builder() {
     success: function (res) {
       window.capacitorBuilderAvailable = !!res.installed;
       if (window.capacitorBuilderAvailable) {
-        $("#dockerBuilderStatusId").html(
-          `<span>
-            installed<i class="ps-2 fas fa-check text-success"></i>
-          </span>
-          `
-        );
+        if (res.version !== res.sc_version) {
+          $("#dockerBuilderStatusId").html(`
+    <div
+      id="mismatchBoxId" class="mt-3 p-3 border rounded bg-light"
+    >
+      <div
+        class="d-flex align-items-center mb-2"
+      >
+        installed<i title="Information" class="ps-2 fas fa-info-circle text-warning"></i>
+      </div>
+      <div
+        class="fw-bold text-danger mb-1"
+      >
+        Version Mismatch:
+      </div>
+      <ul
+        class="list-unstyled mb-0"
+      >
+        <li>
+          <span class="fw-semibold text-muted">Docker tag:</span>1.3.1-beta.0
+        </li>
+        <li>
+          <span class="fw-semibold text-muted">SC version:</span>1.3.1-beta.10
+        </li>
+      </ul>
+    </div>`);
+          $("#dockerBuilderVersionBoxId").removeClass("d-none");
+          $("#dockerBuilderVersionId").html(` ${res.version}`);
+        } else {
+          $("#dockerBuilderStatusId").html(
+            `<span>
+              installed<i class="ps-2 fas fa-check text-success"></i>
+            </span>
+            `
+          );
+        }
       } else {
         $("#dockerBuilderStatusId").html(
           `<span>

package/routes/admin.js

@@ -2269,7 +2269,7 @@ router.get(
 );
 const buildDialogScript = (capacitorBuilderAvailable, isSbadmin2) =>
   `<script>
-  var capacitorBuilderAvailable = ${capacitorBuilderAvailable};
+  var capacitorBuilderAvailable = ${capacitorBuilderAvailable.installed};
   var isSbadmin2 = ${isSbadmin2};
   function showEntrySelect(type) {
     for( const currentType of ["view", "page", "pagegroup"]) {
@@ -2308,16 +2308,22 @@ const buildDialogScript = (capacitorBuilderAvailable, isSbadmin2) =>
 `)}
   </script>`;
 
-const imageAvailable = async () => {
+const imageAvailable = async (preferedVersion) => {
+  const docker = new Docker();
   try {
-    const state = getState();
-    const image = new Docker().getImage(
-      `saltcorn/capacitor-builder:${state.scVersion}`
+    const image = docker.getImage(
+      `saltcorn/capacitor-builder:${preferedVersion}`
     );
     await image.inspect();
-    return true;
+    return { installed: true, version: preferedVersion };
   } catch (e) {
-    return false;
+    const images = await docker.listImages({
+      filters: { reference: ["saltcorn/capacitor-builder:*"] },
+    });
+    const tags = images.flatMap((img) => img.RepoTags || []);
+    if (tags.length > 0)
+      return { installed: true, version: tags[0].split(":")[1] };
+    return { installed: false };
   }
 };
 
@@ -2373,7 +2379,8 @@ router.get(
       .map((plugin) => plugin.name);
     const builderSettings =
       getState().getConfig("mobile_builder_settings") || {};
-    const dockerAvailable = await imageAvailable();
+    const scVersion = getState().scVersion;
+    const dockerAvailable = await imageAvailable(scVersion);
     const xcodeCheckRes = await checkXcodebuild();
     const xcodebuildAvailable = xcodeCheckRes.installed;
     const xcodebuildVersion = xcodeCheckRes.version;
@@ -3133,15 +3140,58 @@ router.get(
                               id: "dockerBuilderStatusId",
                               class: "",
                             },
-                            dockerAvailable
+                            dockerAvailable.installed &&
+                              dockerAvailable.version === scVersion
                               ? span(
                                   req.__("installed"),
                                   i({ class: "ps-2 fas fa-check text-success" })
                                 )
-                              : span(
-                                  req.__("not available"),
-                                  i({ class: "ps-2 fas fa-times text-danger" })
-                                )
+                              : dockerAvailable.installed
+                                ? div(
+                                    {
+                                      id: "mismatchBoxId",
+                                      class: "mt-3 p-3 border rounded bg-light",
+                                    },
+                                    div(
+                                      {
+                                        class: "d-flex align-items-center mb-2",
+                                      },
+                                      req.__("installed"),
+                                      i({
+                                        title: req.__("Information"),
+                                        class:
+                                          "ps-2 fas fa-info-circle text-warning",
+                                      })
+                                    ),
+                                    div(
+                                      { class: "fw-bold text-danger mb-1" },
+                                      "Version Mismatch:"
+                                    ),
+
+                                    ul(
+                                      { class: "list-unstyled mb-0" },
+                                      li(
+                                        span(
+                                          { class: "fw-semibold text-muted" },
+                                          req.__("Docker tag:")
+                                        ),
+                                        dockerAvailable.version
+                                      ),
+                                      li(
+                                        span(
+                                          { class: "fw-semibold text-muted" },
+                                          req.__("SC version:")
+                                        ),
+                                        scVersion
+                                      )
+                                    )
+                                  )
+                                : span(
+                                    req.__("not available"),
+                                    i({
+                                      class: "ps-2 fas fa-times text-danger",
+                                    })
+                                  )
                           )
                         ),
                         div(
@@ -3997,8 +4047,9 @@ router.get(
   "/mobile-app/check-capacitor-builder",
   isAdmin,
   error_catcher(async (req, res) => {
-    const installed = await imageAvailable();
-    res.json({ installed });
+    const state = getState();
+    const { installed, version } = await imageAvailable(state.scVersion);
+    res.json({ installed, version, sc_version: state.scVersion });
   })
 );
 

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,17 +80,6 @@ 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
@@ -205,12 +195,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 +218,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 +311,6 @@ module.exports =
   } = {}) => {
     if (cluster.isMaster) {
       ensureJwtSecret();
-      await ensureEnginesCache();
       await ensurePluginsFolder();
       await ensureNotificationSubscriptions();
     }
@@ -525,6 +512,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 +580,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 +600,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 +630,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 });
@@ -658,8 +653,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);
@@ -680,8 +674,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 () => {
         const state = getState();
         if (state) {
@@ -706,8 +699,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 +778,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/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}"` : ""