@xuda.io/xuda-worker-bundle-min 1.3.653 → 1.3.655

package/index.js

@@ -188,7 +188,7 @@ func.common.get_custom_icon = async function (
         if (get_image_onlyP) {
           return tree_ret2.rPTH;
         } else {
-          const app_obj = APP_OBJ[SESSION_OBJ[SESSION_ID].APP_ID];
+          const app_obj = APP_OBJ[SESSION_OBJ[SESSION_ID].app_id];
           const url = func.common.get_url(
             SESSION_ID,
             "studio-drive",
@@ -217,7 +217,7 @@ func.common.db = async function (
 ) {
   return new Promise(async function (resolve, reject) {
     var _session = SESSION_OBJ[SESSION_ID];
-    const app_id = _session.APP_ID;
+    const app_id = _session.app_id;
 
     var data = {
       app_id: app_id,
@@ -1092,7 +1092,7 @@ func.common.perform_rpi_request = async function (
 
     var url = func.common.get_url(SESSION_ID, "rpi", "");
     var _session = SESSION_OBJ[SESSION_ID];
-    const app_id = _session.APP_ID;
+    const app_id = _session.app_id;
 
     if (
       APP_OBJ[app_id].is_deployment &&
@@ -1116,12 +1116,22 @@ func.common.perform_rpi_request = async function (
       });
 
       if (!response.ok) {
-        throw "";
+        throw response.status;
       }
       const json = await response.json();
       return json;
     } catch (err) {
       console.error(err);
+      if (err === 503) {
+        _this.func.UI.utils.progressScreen.show(
+          SESSION_ID,
+          `Error code ${err}, reloading in 5 sec`
+        );
+        setTimeout(async () => {
+          await func.index.delete_pouch(SESSION_ID);
+          location.reload();
+        }, 5000);
+      }
       return {};
     }
   };
@@ -1395,7 +1405,7 @@ glb.lifecycle = {
     var params = {
       SESSION_ID,
       session_data: _session,
-      app_obj: APP_OBJ[_session.APP_ID],
+      app_obj: APP_OBJ[_session.app_id],
       xu_api,
     };
 
@@ -1728,19 +1738,19 @@ func.datasource.prepare = async function (
   const build_GLOBAL_SYS_fields = function () {
     if (!_ds.data_system) _ds.data_system = {};
     _ds.data_system["SYS_GLOBAL_UTC"] = -new Date().getTimezoneOffset() / 60;
-    _ds.data_system["SYS_GLOBAL_STR_APP_ID"] = APP_OBJ[_session.APP_ID]._id;
+    _ds.data_system["SYS_GLOBAL_STR_APP_ID"] = APP_OBJ[_session.app_id]._id;
     _ds.data_system["SYS_GLOBAL_STR_SESSION_ID"] = SESSION_ID;
     _ds.data_system["SYS_GLOBAL_STR_LOGIN_USER_ID"] = _session.USR_OBJ._id;
 
     if (
       _session.engine_mode !== "live_preview" &&
-      PROJECT_OBJ[_session.APP_ID].info
+      PROJECT_OBJ[_session.app_id].info
     ) {
       _ds.data_system["SYS_GLOBAL_OBJ_APP_INFO"] = {
-        build: PROJECT_OBJ[_session.APP_ID].info.build_id,
-        author: PROJECT_OBJ[_session.APP_ID].info.author,
-        date: PROJECT_OBJ[_session.APP_ID].info.build_date,
-        name: APP_OBJ[_session.APP_ID].app_name,
+        build: PROJECT_OBJ[_session.app_id].info.build_id,
+        author: PROJECT_OBJ[_session.app_id].info.author,
+        date: PROJECT_OBJ[_session.app_id].info.build_date,
+        name: APP_OBJ[_session.app_id].app_name,
       };
     }
     _ds.data_system["SYS_GLOBAL_OBJ_LOGIN_USER_INFO"] = {
@@ -4850,7 +4860,7 @@ func.utils.DOCS_OBJ.get = async function (SESSION_ID, idP) {
   if (!idP || idP === "0") return;
 
   var _session = SESSION_OBJ[SESSION_ID];
-  const _app_id = _session.APP_ID;
+  const _app_id = _session.app_id;
   if (!DOCS_OBJ[_app_id]) {
     DOCS_OBJ[_app_id] = {};
   }
@@ -5372,21 +5382,21 @@ func.utils.ws_worker.functions = {
   init: async function (data) {
     var SESSION_ID = data.SESSION_ID;
 
-    APP_OBJ[data.APP_ID] = data.APP_OBJ;
-    PROJECT_OBJ[data.APP_ID] = data.PROJECT_OBJ;
+    APP_OBJ[data.app_id] = data.APP_OBJ;
+    PROJECT_OBJ[data.app_id] = data.PROJECT_OBJ;
 
     if (data.SESSION_INFO.engine_mode === "live_preview") {
-      DOCS_OBJ[data.APP_ID] = data.DOCS_OBJ;
+      DOCS_OBJ[data.app_id] = data.DOCS_OBJ;
     } else if (
       typeof IS_DOCKER === "undefined" &&
       typeof IS_PROCESS_SERVER === "undefined"
     ) {
-      if (!DOCS_OBJ[data.APP_ID]) {
-        DOCS_OBJ[data.APP_ID] = {};
+      if (!DOCS_OBJ[data.app_id]) {
+        DOCS_OBJ[data.app_id] = {};
       }
     }
 
-    glb.APP_INFO[data.APP_ID] = data.APP_INFO;
+    glb.APP_INFO[data.app_id] = data.APP_INFO;
     glb.DEBUG_MODE = data.DEBUG_MODE;
     glb.DEBUG_INFO_OBJ = data.DEBUG_INFO_OBJ;
 
@@ -5420,7 +5430,7 @@ func.utils.ws_worker.functions = {
     _session.WORKER_OBJ.fx = new func.utils.job_worker(SESSION_ID);
     _session.WORKER_OBJ.fx.init();
 
-    if (_session.APP_ID === "unknown") {
+    if (_session.app_id === "unknown") {
       worker_post_message({
         fx_to_execute: "init_done",
         worker_id: ws_worker_id,
@@ -5451,7 +5461,7 @@ func.utils.ws_worker.functions = {
     if (show_log) {
       console.log(
         "DATASOURCE EXECUTING SESSION_ID: " + SESSION_ID,
-        APP_OBJ[_session.APP_ID].app_name
+        APP_OBJ[_session.app_id].app_name
       );
     }
     if (
@@ -5488,7 +5498,7 @@ func.utils.ws_worker.functions = {
           " " +
           _session.DS_GLB[ret.dsSessionP]?.tree_obj?.menuName ||
           "" + " SESSION_ID: " + SESSION_ID,
-        APP_OBJ[_session.APP_ID].app_name
+        APP_OBJ[_session.app_id].app_name
       );
     var obj = func.utils.clean_returned_datasource(SESSION_ID, ret.dsSessionP);
     obj.dataSourceSessionGlobal = _session.dataSourceSessionGlobal;
@@ -5515,7 +5525,7 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "DATASOURCE DELETE SESSION_ID: " + SESSION_ID,
-        APP_OBJ[_session.APP_ID].app_name,
+        APP_OBJ[_session.app_id].app_name,
         params.dssession
       );
     // debugger;
@@ -5536,14 +5546,14 @@ func.utils.ws_worker.functions = {
     var _session = SESSION_OBJ[SESSION_ID];
     if (!_session) {
       _session = {};
-      _session.APP_ID = params.app_id;
+      _session.app_id = params.app_id;
       _session.dataSourceSessionGlobal = -1;
       _session.DS_GLB = {};
     }
     if (show_log)
       console.log(
         "DATASOURCE UPDATE SESSION_ID: " + SESSION_ID,
-        APP_OBJ[_session.APP_ID].app_name,
+        APP_OBJ[_session.app_id].app_name,
         params.dssession
       );
 
@@ -5722,7 +5732,7 @@ func.utils.ws_worker.functions = {
       if (typeof show_log !== "undefined" && show_log)
         console.log(
           "DATASOURCE GET GRID TOTALS SESSION_ID: " + SESSION_ID,
-          APP_OBJ[_session.APP_ID].app_name,
+          APP_OBJ[_session.app_id].app_name,
           params.dssession
         );
 
@@ -5809,7 +5819,7 @@ func.utils.ws_worker.functions = {
   //   if (show_log)
   //     console.log(
   //       "DATASOURCE GET VALUE SESSION_ID: " + SESSION_ID,
-  //       APP_OBJ[_session.APP_ID].app_name,
+  //       APP_OBJ[_session.app_id].app_name,
   //       params.dssession
   //     );
   //   const ret = await func.datasource.get_value(
@@ -5842,7 +5852,7 @@ func.utils.ws_worker.functions = {
           params.dssession +
           " SESSION_ID: " +
           SESSION_ID,
-        APP_OBJ[_session.APP_ID].app_name
+        APP_OBJ[_session.app_id].app_name
       );
     _session.DS_GLB[params.dssession].v.onscreen_events_active =
       params.onscreen_events_active;
@@ -5857,7 +5867,7 @@ func.utils.ws_worker.functions = {
             DS +
             " SESSION_ID: " +
             SESSION_ID,
-          APP_OBJ[_session.APP_ID].app_name
+          APP_OBJ[_session.app_id].app_name
         );
       var obj = func.utils.clean_returned_datasource(SESSION_ID, DS);
       obj.dataSourceSessionGlobal = _session.dataSourceSessionGlobal;
@@ -5887,7 +5897,7 @@ func.utils.ws_worker.functions = {
           params.dssession +
           " SESSION_ID: " +
           SESSION_ID,
-        APP_OBJ[_session.APP_ID].app_name
+        APP_OBJ[_session.app_id].app_name
       );
     ds.eventChangesResults_done = true;
   },
@@ -5901,7 +5911,7 @@ func.utils.ws_worker.functions = {
           params.dssession +
           " SESSION_ID: " +
           SESSION_ID,
-        APP_OBJ[_session.APP_ID].app_name
+        APP_OBJ[_session.app_id].app_name
       );
     debugger;
     var callback = func.utils.get_callback_queue(
@@ -5920,7 +5930,7 @@ func.utils.ws_worker.functions = {
           params.dssession +
           " SESSION_ID: " +
           SESSION_ID,
-        APP_OBJ[_session.APP_ID].app_name
+        APP_OBJ[_session.app_id].app_name
       );
     func.utils.get_callback_queue(SESSION_ID, params.callback_id)();
   },
@@ -6137,7 +6147,7 @@ func.utils.get_drive_url = function (SESSION_ID, val, wrap) {
 
   var _session = SESSION_OBJ[SESSION_ID];
   function replaceFiletoURL(fileString) {
-    const _app = APP_OBJ[_session.APP_ID];
+    const _app = APP_OBJ[_session.app_id];
     let _domain = _session.domain;
     if (_session.is_deployment) {
       _domain =
@@ -6153,7 +6163,7 @@ func.utils.get_drive_url = function (SESSION_ID, val, wrap) {
     const FILE_REPLACE_URL = `${url}${val}?token=${_session.app_token}`;
 
     let match = `drv_${
-      _app.app_replicate || _session.APP_ID
+      _app.app_replicate || _session.app_id
     }_[0-9a-f\\-]+\\.[a-zA-Z0-9]+`;
 
     let pat = new RegExp(match, "g");
@@ -6243,7 +6253,7 @@ func.utils.debug_report = async function (
       typeof IS_PROCESS_SERVER !== "undefined"
     ) {
       return __.rpi.write_log(
-        SESSION_OBJ[SESSION_ID].APP_ID,
+        SESSION_OBJ[SESSION_ID].app_id,
         "error",
         "worker",
         "runtime",
@@ -6262,7 +6272,7 @@ func.utils.debug_report = async function (
         id: STUDIO_WEBSOCKET_CONNECTION_ID,
         uid: _session.USR_OBJ._id,
         source: "runtime",
-        app_id: _session.APP_ID,
+        app_id: _session.app_id,
         gtp_token: _session.gtp_token,
         app_token: _session.app_token,
       };
@@ -7178,7 +7188,7 @@ func.utils.get_plugin_setup = function (SESSION_ID, plugin_name) {
 };
 
 func.utils.connect_pouchdb = async function (SESSION_ID) {
-  const app_id = SESSION_OBJ[SESSION_ID].APP_ID;
+  const app_id = SESSION_OBJ[SESSION_ID].app_id;
   return new PouchDB("xuda_rt_" + app_id);
 };
 
@@ -7200,7 +7210,7 @@ func.utils.call_plugin_api = function (SESSION_ID, plugin_nameP, dataP) {
   };
   return new Promise(async (resolve) => {
     var data = {
-      app_id: APP_OBJ[_session.APP_ID]._id,
+      app_id: APP_OBJ[_session.app_id]._id,
       debug: glb.DEBUG_MODE,
       uid: _session.USR_OBJ._id,
       gtp_token: _session.gtp_token,
@@ -7261,9 +7271,9 @@ func.utils.get_plugin_resource = function (
       return `../../plugins/${plugin_name}/${resource}`;
     }
     if (typeof IS_PROCESS_SERVER !== "undefined") {
-      return `${_conf.plugins_drive_path}/${_session.APP_ID}/node_modules/${plugin_name}/${resource}`;
+      return `${_conf.plugins_drive_path}/${_session.app_id}/node_modules/${plugin_name}/${resource}`;
     } else {
-      return `https://${_session.domain}/plugins/${plugin_name}/${resource}?app_id=${_session.APP_ID}`;
+      return `https://${_session.domain}/plugins/${plugin_name}/${resource}?app_id=${_session.app_id}`;
     }
   };
 
@@ -7333,7 +7343,7 @@ func.utils.get_plugin_npm_cdn = async function (
       return `../../plugins/${plugin_name}/${resource}`;
     }
 
-    return `https://${_session.domain}/plugins/${plugin_name}/${resource}?app_id=${_session.APP_ID}`;
+    return `https://${_session.domain}/plugins/${plugin_name}/${resource}?app_id=${_session.app_id}`;
   };
 
   return get_path(resource);
@@ -7353,7 +7363,7 @@ func.utils.write_log = async function (
     typeof IS_DOCKER !== "undefined" ||
     typeof IS_PROCESS_SERVER !== "undefined"
   ) {
-    return __.rpi.write_log(_session.APP_ID, log_type, source, msg, details);
+    return __.rpi.write_log(_session.app_id, log_type, source, msg, details);
   }
 
   await func.common.db(SESSION_ID, "write_log", {
@@ -8832,7 +8842,7 @@ func.events.execute_PENDING_OPEN_URL_EVENTS = async function () {
           "pendingUrlEvent_embed"
         );
       } else {
-        console.error("Program not exist", params_obj.run_prog);
+        console.error("Program not exist", params_obj.prog_id);
         func.UI.utils.progressScreen.show(
           SESSION_ID,
           "Program not exist",
@@ -9523,7 +9533,7 @@ func.expression.secure_eval = async function (
       ) {
         if (SESSION_OBJ[SESSION_ID].crawler) return;
         return __.rpi.write_log(
-          SESSION_OBJ[SESSION_ID].APP_ID,
+          SESSION_OBJ[SESSION_ID].app_id,
           "error",
           "worker",
           "vm error",
@@ -9537,7 +9547,7 @@ func.expression.secure_eval = async function (
     try {
       const dir = path.join(
         _conf.studio_drive_path,
-        SESSION_OBJ[SESSION_ID].APP_ID,
+        SESSION_OBJ[SESSION_ID].app_id,
         "node_modules",
         "/"
       );
@@ -9574,7 +9584,7 @@ func.expression.secure_eval = async function (
 
       if (typeof IS_PROCESS_SERVER !== "undefined") {
         func.events.delete_job(SESSION_ID, jobNo);
-        return __.db.add_error_log(SESSION_OBJ[SESSION_ID].APP_ID, "api", err);
+        return __.db.add_error_log(SESSION_OBJ[SESSION_ID].app_id, "api", err);
       }
     }
   } else {

package/package.json

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