@xuda.io/xuda-worker-bundle-min 1.3.515 → 1.3.517

package/index.js

@@ -873,6 +873,7 @@ var RUNTIME_SERVER_WEBSOCKET_CONNECTED = null;
 var WEBSOCKET_PROCESS_PID = null;
 
 glb.worker_queue_num = 0;
+glb.websocket_queue_num = 0;
 
 func.common.get_module = async function (SESSION_ID, module, paramsP = {}) {
   let ret;
@@ -1120,27 +1121,74 @@ func.common.perform_rpi_request = async function (
     }
   };
   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 (
-      RUNTIME_SERVER_WEBSOCKET &&
-      RUNTIME_SERVER_WEBSOCKET_CONNECTED &&
+      // RUNTIME_SERVER_WEBSOCKET &&
+      // RUNTIME_SERVER_WEBSOCKET_CONNECTED &&
       SESSION_OBJ?.[SESSION_ID]?.rpi_http_methods?.includes(serviceP)
     ) {
-      return await ws();
+      // return await ws();
+      return await func.common.get_data_from_websocket(
+        SESSION_ID,
+        serviceP,
+        data
+      );
     } else {
-      throw new Error("fail to fetch from ws websocket inactive");
+      throw new Error("method not found in rpi_http_methods");
     }
   } catch (err) {
     return await http();
   }
 };
+
+func.common.get_data_from_websocket = async function (
+  SESSION_ID,
+  serviceP,
+  data
+) {
+  var _session = _this.SESSION_OBJ[SESSION_ID];
+  return new Promise(function (resolve, reject) {
+    glb.websocket_queue_num++;
+    if (glb.IS_WORKER) {
+      func.utils.post_back_to_client(
+        SESSION_ID,
+        "get_doc_from_websocket",
+        _session.worker_id,
+        { doc_id: idP }
+      );
+
+      self.addEventListener("get_doc_obj_from_build_worker_" + idP, (event) => {
+        resolve(event.detail.data);
+      });
+    } else {
+      if (RUNTIME_SERVER_WEBSOCKET && RUNTIME_SERVER_WEBSOCKET_CONNECTED) {
+        RUNTIME_SERVER_WEBSOCKET.emit("message", {
+          service: serviceP,
+          data,
+          websocket_queue_num: glb.websocket_queue_num,
+        });
+        $("body").on(
+          "get_ws_data_response_" + glb.websocket_queue_num,
+          (e, data) => {
+            resolve(data.data);
+            $("body").off("get_ws_data_response_" + glb.websocket_queue_num);
+          }
+        );
+      } else {
+        throw new Error("fail to fetch from ws websocket inactive");
+      }
+    }
+  });
+};
  glb.DEBUG_INFO_OBJ = {};
 // var CONNECTION_ATTEMPTS = 0;
 glb.APP_INFO = {};

package/package.json

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