@xuda.io/xuda-worker-bundle-min 1.3.534 → 1.3.536

package/index.js

@@ -1057,7 +1057,7 @@ func.api.call_api_program = async function (prog_id, params) {
 
   return await api_utils.call_api_program(prog_id, params, null);
 };
-
+glb.rpi_request_queue_num = 0;
 func.common.perform_rpi_request = async function (
   SESSION_ID,
   serviceP,
@@ -1065,6 +1065,11 @@ func.common.perform_rpi_request = async function (
   data
 ) {
   var _session = SESSION_OBJ[SESSION_ID];
+  var _data_system = _session?.DS_GLB?.[0]?.data_system;
+  if (_data_system) {
+    _data_system.SYS_GLOBAL_BOL_AJAX_BUSY = 1;
+  }
+
   const http = async function () {
     const fetchWithTimeout = (url, options = {}, timeout = 600000) => {
       // 100 seconds
@@ -1121,36 +1126,31 @@ func.common.perform_rpi_request = async function (
       return {};
     }
   };
-  // const ws = async function () {
-  //   glb.websocket_queue_num++;
-  //   RUNTIME_SERVER_WEBSOCKET.emit("message", {
-  //     service: serviceP,
-  //     data,
-  //     websocket_queue_num: glb.websocket_queue_num,
-  //   });
-  //   throw new Error("fail to fetch from ws");
-  // };
 
   try {
     if (_session.engine_mode === "live_preview") {
       throw new Error("live_preview");
     }
-    if (
-      // RUNTIME_SERVER_WEBSOCKET &&
-      // RUNTIME_SERVER_WEBSOCKET_CONNECTED &&
-      SESSION_OBJ?.[SESSION_ID]?.rpi_http_methods?.includes(serviceP)
-    ) {
-      // return await ws();
-      return await func.common.get_data_from_websocket(
+
+    if (SESSION_OBJ?.[SESSION_ID]?.rpi_http_methods?.includes(serviceP)) {
+      const ret = await func.common.get_data_from_websocket(
         SESSION_ID,
         serviceP,
         data
       );
+      if (_data_system) {
+        _data_system.SYS_GLOBAL_BOL_AJAX_BUSY = 0;
+      }
+      return ret;
     } else {
       throw new Error("method not found in rpi_http_methods");
     }
   } catch (err) {
-    return await http();
+    const ret = await http();
+    if (_data_system) {
+      _data_system.SYS_GLOBAL_BOL_AJAX_BUSY = 0;
+    }
+    return ret;
   }
 };
 
@@ -1724,6 +1724,7 @@ func.datasource.prepare = async function (
 
     _ds.data_system["SYS_GLOBAL_BOL_ONLINE"] = 0;
     _ds.data_system["SYS_GLOBAL_BOL_REPLICATION_STAT"] = 0;
+    _ds.data_system["SYS_GLOBAL_BOL_AJAX_BUSY"] = 0;
 
     _ds.data_system["SYS_GLOBAL_STR_FIREBASE_TOKEN_ID"] = 0;
 
@@ -5116,7 +5117,7 @@ func.utils.job_worker = function (session_id) {
       }, 310);
     } else {
       if (!glb.IS_WORKER) {
-        func.UI.screen.garbage_collector(SESSION_ID);
+        // func.UI.screen.garbage_collector(SESSION_ID);
       }
     }
   };

package/package.json

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