@xuda.io/xuda-worker-bundle-min 1.3.678 → 1.3.680

package/index.js

@@ -5133,9 +5133,9 @@ func.utils.job_worker = function (session_id) {
     if (
       !_session.WORKER_OBJ.jobs[_session.WORKER_OBJ.stat] ||
       _session.WORKER_OBJ.jobs[_session.WORKER_OBJ.stat].typeP ===
-      "system_interval" ||
+        "system_interval" ||
       _session.WORKER_OBJ.jobs[_session.WORKER_OBJ.stat].typeP ===
-      "system event"
+        "system event"
     ) {
       return;
     }
@@ -5501,10 +5501,10 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "DATASOURCE EXECUTION DONE " +
-        ret.dsSessionP +
-        " " +
-        _session.DS_GLB[ret.dsSessionP]?.tree_obj?.menuName ||
-        "" + " SESSION_ID: " + SESSION_ID,
+          ret.dsSessionP +
+          " " +
+          _session.DS_GLB[ret.dsSessionP]?.tree_obj?.menuName ||
+          "" + " SESSION_ID: " + SESSION_ID,
         APP_OBJ[_session.app_id].app_name
       );
     var obj = func.utils.clean_returned_datasource(SESSION_ID, ret.dsSessionP);
@@ -5856,9 +5856,9 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "DATASOURCE RETURN TO DATASOURCE " +
-        params.dssession +
-        " SESSION_ID: " +
-        SESSION_ID,
+          params.dssession +
+          " SESSION_ID: " +
+          SESSION_ID,
         APP_OBJ[_session.app_id].app_name
       );
     _session.DS_GLB[params.dssession].v.onscreen_events_active =
@@ -5871,9 +5871,9 @@ func.utils.ws_worker.functions = {
       if (show_log)
         console.log(
           "DATASOURCE RETURN TO DATASOURCE DONE " +
-          DS +
-          " SESSION_ID: " +
-          SESSION_ID,
+            DS +
+            " SESSION_ID: " +
+            SESSION_ID,
           APP_OBJ[_session.app_id].app_name
         );
       var obj = func.utils.clean_returned_datasource(SESSION_ID, DS);
@@ -5901,9 +5901,9 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "UPDATE CHANGE EVENT DONE TO DATASOURCE " +
-        params.dssession +
-        " SESSION_ID: " +
-        SESSION_ID,
+          params.dssession +
+          " SESSION_ID: " +
+          SESSION_ID,
         APP_OBJ[_session.app_id].app_name
       );
     ds.eventChangesResults_done = true;
@@ -5915,9 +5915,9 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "RETURN FROM DB_QUERY " +
-        params.dssession +
-        " SESSION_ID: " +
-        SESSION_ID,
+          params.dssession +
+          " SESSION_ID: " +
+          SESSION_ID,
         APP_OBJ[_session.app_id].app_name
       );
     debugger;
@@ -5934,9 +5934,9 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "RETURN FROM SAVE_DATA " +
-        params.dssession +
-        " SESSION_ID: " +
-        SESSION_ID,
+          params.dssession +
+          " SESSION_ID: " +
+          SESSION_ID,
         APP_OBJ[_session.app_id].app_name
       );
     func.utils.get_callback_queue(SESSION_ID, params.callback_id)();
@@ -6038,7 +6038,7 @@ func.utils.ws_worker.functions = {
           const couch = await __.rpi.get_app_couch(req.body.app_id);
           const session_doc = await couch.get(req.body.app_token);
           ret.session_stat = session_doc.stat;
-        } catch (error) { }
+        } catch (error) {}
       }
     } catch (error) {
       debugger;
@@ -6149,27 +6149,46 @@ func.utils.remove_js_css_file = function (filename, filetype) {
   }
 };
 
+func.utils.replace_studio_drive_url = function (SESSION_ID, val) {
+  var _session = SESSION_OBJ[SESSION_ID];
+  if (!_session.is_deployment) return val;
+
+  return val.replaceAll(
+    `https://xuda.io/studio-drive/${APP_OBJ[_session.app_id].app_replicate}`,
+    `https://${_session.domain}/studio-drive/${
+      APP_OBJ[_session.app_id].app_replicate
+    }`
+  );
+};
+
 func.utils.get_drive_url = function (SESSION_ID, val, wrap) {
   // wrap = false; // tbd bypass
 
   var _session = SESSION_OBJ[SESSION_ID];
   function replaceFiletoURL(fileString) {
     const _app = APP_OBJ[_session.app_id];
-    let _domain = _session.domain;
-    if (_session.is_deployment) {
-      _domain =
-        _session.opt.regional_server === "dev.xuda.io"
-          ? "dev.xuda.io"
-          : "xuda.io";
-    }
+    // let _domain = _session.domain;
+    // if (_session.is_deployment) {
+    //   _domain =
+    //     _session.opt.regional_server === "dev.xuda.io"
+    //       ? "dev.xuda.io"
+    //       : "xuda.io";
+    // }
 
-    let url = `https://${_domain}/workspace-drive/${_app.is_deployment ? _app.app_datacenter_id : _app.app_id_reference
-      }/`;
+    let url = `https://${_session.domain}/workspace-drive/${
+      _app.is_deployment ? _app.app_datacenter_id : _app.app_id_reference
+    }/`;
 
-    const FILE_REPLACE_URL = `${url}${val}?app_token=${_session.app_token}`;
+    let FILE_REPLACE_URL = `${url}${val}`;
 
-    let match = `drv_${_app.app_replicate || _session.app_id
-      }_[0-9a-f\\-]+\\.[a-zA-Z0-9]+`;
+    if (!_app.is_deployment) {
+      // the deployment server will handle the app_token
+      FILE_REPLACE_URL += `?app_token=${_session.app_token}`;
+    }
+
+    let match = `drv_${
+      _app.app_replicate || _session.app_id
+    }_[0-9a-f\\-]+\\.[a-zA-Z0-9]+`;
 
     let pat = new RegExp(match, "g");
     let URLString = fileString.replace(pat, function (match, idx) {
@@ -6312,7 +6331,8 @@ func.utils.request_error = function (SESSION_ID, type, e) {
     func.utils.debug_report(SESSION_ID, type, e, "E");
     setTimeout(function () {
       if (!glb.debug_js) {
-        location.reload();
+        // location.reload();
+        console.warn("** reload request");
       }
     }, 2000);
   } else {
@@ -6547,8 +6567,8 @@ func.utils.alerts.execute = function (
         alert_type === "success"
           ? "log"
           : alert_type === "warning"
-            ? "warn"
-            : alert_type
+          ? "warn"
+          : alert_type
       ](alert_type, title, message);
       ALERT_IS_ACTIVE = false;
       break;
@@ -8273,7 +8293,6 @@ func.events.execute = async function (
     },
 
     call_native_javascript: async function () {
-      // const module = await import("./modules/xuda-event-javascript-module.mjs");
       const module = await func.common.get_module(
         SESSION_ID,
         "xuda-event-javascript-module.mjs"
@@ -8286,7 +8305,6 @@ func.events.execute = async function (
       );
     },
     call_evaluate_javascript: async function () {
-      // const module = await import("./modules/xuda-event-javascript-module.mjs");
       const module = await func.common.get_module(
         SESSION_ID,
         "xuda-event-javascript-module.mjs"
@@ -8300,7 +8318,6 @@ func.events.execute = async function (
       );
     },
     execute_native_javascript: async function () {
-      // const module = await import("./modules/xuda-event-javascript-module.mjs");
       const module = await func.common.get_module(
         SESSION_ID,
         "xuda-event-javascript-module.mjs"
@@ -8308,7 +8325,6 @@ func.events.execute = async function (
       return await module.run_javascript(SESSION_ID, jobNoP, refIdP, dsSession);
     },
     execute_evaluate_javascript: async function () {
-      // const module = await import("./modules/xuda-event-javascript-module.mjs");
       const module = await func.common.get_module(
         SESSION_ID,
         "xuda-event-javascript-module.mjs"
@@ -8940,6 +8956,8 @@ func.expression.get = async function (
       }
 
       ret = ret.replace(/\&/g, "&");
+      ret = func.utils.replace_studio_drive_url(SESSION_ID, ret);
+
       const end_results = function () {
         const replace_quotes = function (ret) {
           for (const [key, val] of Object.entries(fields)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-worker-bundle-min",
-  "version": "1.3.678",
+  "version": "1.3.680",
   "description": "xuda framework min",
   "main": "index.js",
   "scripts": {