@xuda.io/xuda-worker-bundle-min 1.3.417 → 1.3.419

package/index.js

@@ -266,34 +266,34 @@ func.common.db = async function (
 
     data.req_id = new Date().valueOf();
 
-    const perform_rpi_request = async function (serviceP) {
-      var url = func.common.get_url(SESSION_ID, "rpi", "");
+    // const perform_rpi_request = async function (serviceP) {
+    //   var url = func.common.get_url(SESSION_ID, "rpi", "");
 
-      if (
-        APP_OBJ[app_id].is_deployment &&
-        _session.rpi_http_methods?.includes(serviceP)
-      ) {
-        url = "https://" + _session.host + "/rpi/";
-      }
-
-      url += serviceP;
+    //   if (
+    //     APP_OBJ[app_id].is_deployment &&
+    //     _session.rpi_http_methods?.includes(serviceP)
+    //   ) {
+    //     url = "https://" + _session.host + "/rpi/";
+    //   }
 
-      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.data;
-      } catch (err) {
-        console.error(err);
-      }
-    };
+    //   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),
+    //     });
+    //     if (!response.ok) throw "";
+    //     const json = await response.json();
+    //     return json.data;
+    //   } catch (err) {
+    //     console.error(err);
+    //   }
+    // };
 
     // const perform_rpi_request_from_studio = async function (serviceP) {
     //   return new Promise(function (resolve, reject) {
@@ -382,7 +382,11 @@ func.common.db = async function (
         }
 
         if (doc.stat < 3) {
-          return await perform_rpi_request(serviceP);
+          return await func.common.perform_rpi_request(
+            SESSION_ID,
+            serviceP,
+            opt
+          );
         }
         return await func.db.pouch[serviceP](SESSION_ID, dataP);
       } catch (err) {}
@@ -396,7 +400,11 @@ func.common.db = async function (
 
         return json;
       } catch (err) {
-        const json = await perform_rpi_request(serviceP);
+        const json = await func.common.perform_rpi_request(
+          SESSION_ID,
+          serviceP,
+          opt
+        );
         if (json.opt) {
           try {
             try {
@@ -425,7 +433,7 @@ func.common.db = async function (
         await db.get(dataP.row_id);
         return await func.db.pouch[serviceP](SESSION_ID, dataP);
       } catch (err) {
-        return await perform_rpi_request(serviceP);
+        return await func.common.perform_rpi_request(SESSION_ID, serviceP, opt);
       }
     };
     const create_dbs_pouch = async function (db) {
@@ -433,7 +441,7 @@ func.common.db = async function (
       try {
         return await func.db.pouch[serviceP](SESSION_ID, dataP);
       } catch (err) {
-        return await perform_rpi_request(serviceP);
+        return await func.common.perform_rpi_request(SESSION_ID, serviceP, opt);
       }
     };
 
@@ -484,66 +492,30 @@ func.common.db = async function (
 
           default:
             try {
-              const json = await perform_rpi_request(serviceP);
+              const json = await func.common.perform_rpi_request(
+                SESSION_ID,
+                serviceP,
+                opt
+              );
               return success_callback(json, true);
             } catch (err) {
               return error_callback(err);
             }
             break;
         }
-
-        // if (
-        //   SESSION_OBJ[SESSION_ID].engine_mode === "live_preview" &&
-        //   ["dbs_read", "dbs_update", "dbs_delete", "dbs_create"].includes(
-        //     serviceP
-        //   )
-        // ) {
-        //   try {
-        //     const ret = {
-        //       code: 1,
-        //       data: await perform_rpi_request_from_pouch(serviceP),
-        //     };
-        //     return success_callback(ret);
-        //   } catch (err) {
-        //     return error_callback(err);
-        //   }
-
-        //   // const ret = {
-        //   //   code: 1,
-        //   //   data: await perform_rpi_request_from_pouch(serviceP),
-        //   // };
-        //   // return success_callback(ret);
-        // }
       }
       try {
-        const json = await perform_rpi_request(serviceP);
+        const json = await func.common.perform_rpi_request(
+          SESSION_ID,
+          serviceP,
+          opt
+        );
         return success_callback(json, true);
       } catch (err) {
         return error_callback(err);
       }
-      // return perform_rpi_request(serviceP);
     }
 
-    // if (
-    //   (typeof IS_DOCKER === "undefined" &&
-    //     typeof IS_PROCESS_SERVER === "undefined") ||
-    //   !SESSION_OBJ?.[SESSION_ID]?.rpi_http_methods?.includes(serviceP)
-    // ) {
-    //   if (
-    //     SESSION_OBJ[SESSION_ID].engine_mode === "live_preview" &&
-    //     ["dbs_read", "dbs_update", "dbs_delete", "dbs_restore"].includes(
-    //       serviceP
-    //     )
-    //   ) {
-    //     const ret = {
-    //       code: 1,
-    //       data: await perform_rpi_request_from_studio(serviceP),
-    //     };
-    //     return success_callback(ret);
-    //   }
-    //   return perform_rpi_request(serviceP);
-    // }
-
     // DOCKER // PROCESS_SERVER
 
     const response = function (res, ret) {
@@ -1072,6 +1044,41 @@ func.api.call_api_program = async function (prog_id, params) {
 
   return await api_utils.call_api_program(prog_id, params, null);
 };
+
+func.common.perform_rpi_request = async function (
+  SESSION_ID,
+  serviceP,
+  opt = {}
+) {
+  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/";
+  }
+
+  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),
+    });
+    if (!response.ok) throw "";
+    const json = await response.json();
+    return json.data;
+  } catch (err) {
+    console.error(err);
+  }
+};
  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.417",
+  "version": "1.3.419",
   "description": "xuda framework min",
   "main": "index.js",
   "scripts": {