@xuda.io/xuda-worker-bundle-min 1.3.487 → 1.3.488

package/index.js

@@ -1019,34 +1019,48 @@ func.common.perform_rpi_request = async function (
   opt = {},
   data
 ) {
-  var url = func.common.get_url(SESSION_ID, "rpi", "");
-  var _session = SESSION_OBJ[SESSION_ID];
-  const app_id = _session.APP_ID;
+  const http = async function () {
+    var url = func.common.get_url(SESSION_ID, "rpi", "");
+    var _session = SESSION_OBJ[SESSION_ID];
+    const app_id = _session.APP_ID;
 
-  if (
-    APP_OBJ[app_id].is_deployment &&
-    _session.rpi_http_methods?.includes(serviceP)
-  ) {
-    url = "https://" + _session.host + "/rpi/";
-  }
+    if (
+      APP_OBJ[app_id].is_deployment &&
+      _session.rpi_http_methods?.includes(serviceP)
+    ) {
+      url = "https://" + _session.host + "/rpi/";
+    }
 
-  url += serviceP;
+    url += serviceP;
 
-  try {
-    const response = await fetch(url, {
-      method: opt.type ? opt.type : "POST",
-      headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(data),
+    try {
+      const response = await fetch(url, {
+        method: opt.type ? opt.type : "POST",
+        headers: {
+          Accept: "application/json",
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(data),
+      });
+      if (!response.ok) throw "";
+      const json = await response.json();
+      return json;
+    } catch (err) {
+      console.error(err);
+      return {};
+    }
+  };
+  const ws = async function () {
+    RUNTIME_SERVER_WEBSOCKET.emit("message", {
+      service: serviceP,
+      data,
     });
-    if (!response.ok) throw "";
-    const json = await response.json();
-    return json;
-  } catch (err) {
-    console.error(err);
-    return {};
+  };
+
+  if (RUNTIME_SERVER_WEBSOCKET && RUNTIME_SERVER_WEBSOCKET_CONNECTED) {
+    return await ws();
+  } else {
+    return await http();
   }
 };
  glb.DEBUG_INFO_OBJ = {};
@@ -5047,15 +5061,17 @@ func.utils.job_worker = function (session_id) {
             _this._was_busy = true;
           } else {
             // idle
-            if (glb.IS_WORKER) {
-              func.utils.post_back_to_client(
-                SESSION_ID,
-                "worker_busy_off",
-                _session.worker_id,
-                null
-              );
-            } else {
-              func.UI.utils.indicator.worker.normal();
+            if (_this._was_busy) {
+              if (glb.IS_WORKER) {
+                func.utils.post_back_to_client(
+                  SESSION_ID,
+                  "worker_busy_off",
+                  _session.worker_id,
+                  null
+                );
+              } else {
+                func.UI.utils.indicator.worker.normal();
+              }
             }
             _this._was_busy = false;
           }
@@ -5729,54 +5745,54 @@ func.utils.ws_worker.functions = {
       data: params,
     });
   },
-  heartbeat: async function (params) {
-    var SESSION_ID = params.session_id;
+  // heartbeat: async function (params) {
+  //   var SESSION_ID = params.session_id;
 
-    try {
-      const do_heartbeat = async function (
-        app_replicate,
-        app_id,
-        token_id,
-        fingerprint,
-        device_name,
-        stat
-      ) {
-        try {
-          module.exports.close_expired_device_log_sessions(app_id);
-
-          return await update_device(
-            app_replicate,
-            app_id,
-            token_id,
-            fingerprint,
-            device_name,
-            stat
-          );
-        } catch (err) {
-          return { code: -400, data: err.message };
-        }
-      };
-      let ret = await do_heartbeat(
-        params.app_replicate,
-        params.app_id,
-        params.gtp_token || req.body.token,
-        params.fingerprint,
-        params.device_name,
-        params.stat
-      );
+  //   try {
+  //     const do_heartbeat = async function (
+  //       app_replicate,
+  //       app_id,
+  //       token_id,
+  //       fingerprint,
+  //       device_name,
+  //       stat
+  //     ) {
+  //       try {
+  //         module.exports.close_expired_device_log_sessions(app_id);
+
+  //         return await update_device(
+  //           app_replicate,
+  //           app_id,
+  //           token_id,
+  //           fingerprint,
+  //           device_name,
+  //           stat
+  //         );
+  //       } catch (err) {
+  //         return { code: -400, data: err.message };
+  //       }
+  //     };
+  //     let ret = await do_heartbeat(
+  //       params.app_replicate,
+  //       params.app_id,
+  //       params.gtp_token || req.body.token,
+  //       params.fingerprint,
+  //       params.device_name,
+  //       params.stat
+  //     );
 
-      // session_status: ret_session.data.stat
-      if (params.token) {
-        try {
-          const couch = await __.rpi.get_app_couch(req.body.app_id);
-          const session_doc = await couch.get(req.body.token);
-          ret.session_stat = session_doc.stat;
-        } catch (error) {}
-      }
-    } catch (error) {
-      debugger;
-    }
-  },
+  //     // session_status: ret_session.data.stat
+  //     if (params.token) {
+  //       try {
+  //         const couch = await __.rpi.get_app_couch(req.body.app_id);
+  //         const session_doc = await couch.get(req.body.token);
+  //         ret.session_stat = session_doc.stat;
+  //       } catch (error) {}
+  //     }
+  //   } catch (error) {
+  //     debugger;
+  //   }
+  // },
   return_rpi_request_from_studio: function (params) {
     var SESSION_ID = params.session_id;
     function emitCustomEvent(eventName, detail) {

package/package.json

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