@xuda.io/xuda-worker-bundle-min 1.3.486 → 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;
           }
@@ -5328,7 +5344,6 @@ func.utils.ws_worker.functions = {
       service: params.service,
     });
   },
-
   datasource_get_grid_data: async function (params, promise_queue_id) {
     var SESSION_ID = params.session_id;
     var _session = SESSION_OBJ[SESSION_ID];
@@ -5574,34 +5589,33 @@ func.utils.ws_worker.functions = {
         );
     }
   },
-  datasource_get_value: async function (params, promise_queue_id) {
-    var SESSION_ID = params.session_id;
-    var _session = SESSION_OBJ[SESSION_ID];
-    if (show_log)
-      console.log(
-        "DATASOURCE GET VALUE SESSION_ID: " + SESSION_ID,
-        APP_OBJ[_session.APP_ID].app_name,
-        params.dssession
-      );
-    const ret = await func.datasource.get_value(
-      SESSION_ID,
-      params.fieldIdP,
-      params.dsSessionP,
-
-      params.rowIdP
-    );
-    // debugger;
-    worker_post_message({
-      promise_queue_id,
-      worker_id: ws_worker_id,
-      params: ret,
-
-      session_id: SESSION_ID,
-      process_pid: params.process_pid,
-      service: params.service,
-    });
-  },
-
+  // datasource_get_value: async function (params, promise_queue_id) {
+  //   var SESSION_ID = params.session_id;
+  //   var _session = SESSION_OBJ[SESSION_ID];
+  //   if (show_log)
+  //     console.log(
+  //       "DATASOURCE GET VALUE SESSION_ID: " + SESSION_ID,
+  //       APP_OBJ[_session.APP_ID].app_name,
+  //       params.dssession
+  //     );
+  //   const ret = await func.datasource.get_value(
+  //     SESSION_ID,
+  //     params.fieldIdP,
+  //     params.dsSessionP,
+
+  //     params.rowIdP
+  //   );
+  //   // debugger;
+  //   worker_post_message({
+  //     promise_queue_id,
+  //     worker_id: ws_worker_id,
+  //     params: ret,
+
+  //     session_id: SESSION_ID,
+  //     process_pid: params.process_pid,
+  //     service: params.service,
+  //   });
+  // },
   return_to_data_source: function (params, promise_queue_id) {
     var SESSION_ID = params.session_id;
     var _session = SESSION_OBJ[SESSION_ID];
@@ -5648,7 +5662,6 @@ func.utils.ws_worker.functions = {
 
     done(SESSION_ID, params.dssession);
   },
-
   acknowledged_worker_with_eventChangesResults_done: function (params) {
     var SESSION_ID = params.session_id;
     var _session = SESSION_OBJ[SESSION_ID];
@@ -5700,17 +5713,17 @@ func.utils.ws_worker.functions = {
   update_debug_info: function (params) {
     glb.DEBUG_INFO_OBJ = params;
   },
-  update_VIEWS_OBJ: function (params) {
-    delete VIEWS_OBJ[APP_ID][params.id];
-  },
-  update_TREE_OBJ: function (params) {
-    delete TREE_OBJ[APP_ID][params.id];
-  },
-  send_object_to_worker: function (params) {
-    if (RESPONSE_FROM_STUDIO_QUEUE[params.req_id]) {
-      RESPONSE_FROM_STUDIO_QUEUE[params.req_id].data = params;
-    }
-  },
+  // update_VIEWS_OBJ: function (params) {
+  //   delete VIEWS_OBJ[APP_ID][params.id];
+  // },
+  // update_TREE_OBJ: function (params) {
+  //   delete TREE_OBJ[APP_ID][params.id];
+  // },
+  // send_object_to_worker: function (params) {
+  //   if (RESPONSE_FROM_STUDIO_QUEUE[params.req_id]) {
+  //     RESPONSE_FROM_STUDIO_QUEUE[params.req_id].data = params;
+  //   }
+  // },
   get_dataSourceSessionGlobal: function (params) {
     var SESSION_ID = params.session_id;
     SESSION_OBJ[SESSION_ID].dataSourceSessionGlobal++;
@@ -5732,6 +5745,54 @@ func.utils.ws_worker.functions = {
       data: params,
     });
   },
+  // 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
+  //     );
+
+  //     // 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.486",
+  "version": "1.3.488",
   "description": "xuda framework min",
   "main": "index.js",
   "scripts": {