@saltcorn/server 0.8.6-beta.1 → 0.8.6-beta.2

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.6-beta.1",
+  "version": "0.8.6-beta.2",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.6-beta.1",
-    "@saltcorn/builder": "0.8.6-beta.1",
-    "@saltcorn/data": "0.8.6-beta.1",
-    "@saltcorn/admin-models": "0.8.6-beta.1",
-    "@saltcorn/filemanager": "0.8.6-beta.1",
-    "@saltcorn/markup": "0.8.6-beta.1",
-    "@saltcorn/sbadmin2": "0.8.6-beta.1",
+    "@saltcorn/base-plugin": "0.8.6-beta.2",
+    "@saltcorn/builder": "0.8.6-beta.2",
+    "@saltcorn/data": "0.8.6-beta.2",
+    "@saltcorn/admin-models": "0.8.6-beta.2",
+    "@saltcorn/filemanager": "0.8.6-beta.2",
+    "@saltcorn/markup": "0.8.6-beta.2",
+    "@saltcorn/sbadmin2": "0.8.6-beta.2",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -1006,12 +1006,15 @@ function room_older(viewname, room_id, btn) {
 }
 
 function init_room(viewname, room_id) {
-  const socket = parent?.config?.server_path
-    ? io(parent.config.server_path, {
-        query: `jwt=${localStorage.getItem("auth_jwt")}`,
-        transports: ["websocket"],
-      })
-    : io({ transports: ["websocket"] });
+  let socket = null;
+  if (parent?.saltcorn?.data?.state) {
+    const { server_path, jwt } =
+      parent.saltcorn.data.state.getState().mobileConfig;
+    socket = io(server_path, {
+      query: `jwt=${jwt}`,
+      transports: ["websocket"],
+    });
+  } else socket = io({ transports: ["websocket"] });
 
   socket.emit("join_room", [viewname, room_id]);
   socket.on("message", (msg) => {

package/public/saltcorn.js

@@ -599,11 +599,11 @@ function poll_mobile_build_finished(outDirName, pollCount, orginalBtnHtml) {
     data: { build_dir: outDirName },
     success: function (res) {
       if (!res.finished) {
-        if (pollCount >= 50) {
+        if (pollCount >= 100) {
           removeSpinner("buildMobileAppBtnId", orginalBtnHtml);
           notifyAlert({
             type: "danger",
-            text: "unable to get the build results",
+            text: "Unable to get the build results",
           });
         } else {
           setTimeout(() => {