@xuda.io/xuda-worker-bundle-min 1.3.516 → 1.3.518

package/index.js

@@ -1132,18 +1132,68 @@ func.common.perform_rpi_request = async function (
 
   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 = SESSION_OBJ[SESSION_ID];
+  return new Promise(function (resolve, reject) {
+    glb.websocket_queue_num++;
+    const obj = {
+      service: serviceP,
+      data,
+      websocket_queue_num: glb.websocket_queue_num,
+    };
+    if (glb.IS_WORKER) {
+      func.utils.post_back_to_client(
+        SESSION_ID,
+        "get_dbs_data_from_websocket",
+        _session.worker_id,
+        obj
+      );
+
+      self.addEventListener(
+        "get_ws_data_worker_" + glb.websocket_queue_num,
+        (event) => {
+          resolve(event.detail.data);
+        }
+      );
+      // throw new Error("not ready yet");
+    } else {
+      if (RUNTIME_SERVER_WEBSOCKET && RUNTIME_SERVER_WEBSOCKET_CONNECTED) {
+        RUNTIME_SERVER_WEBSOCKET.emit("message", obj);
+        $("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 = {};
@@ -5842,6 +5892,16 @@ func.utils.ws_worker.functions = {
       data: params,
     });
   },
+  return_dbs_data_from_websocket: function (params) {
+    var SESSION_ID = params.session_id;
+    function emitCustomEvent(eventName, detail) {
+      const event = new CustomEvent(eventName, { detail });
+      self.dispatchEvent(event);
+    }
+    emitCustomEvent("get_ws_data_worker_" + params.websocket_queue_num, {
+      data: params.data,
+    });
+  },
   heartbeat: async function (params) {
     var SESSION_ID = params.session_id;
 

package/package.json

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