@xuda.io/xuda-worker-bundle-min 1.3.693 → 1.3.694

package/index.js

@@ -192,7 +192,8 @@ func.common.get_custom_icon = async function (
           const url = func.common.get_url(
             SESSION_ID,
             "studio-drive",
-            `${app_obj.app_replicate ? app_obj.app_replicate : app_obj._id}/${tree_ret2.rPTH
+            `${app_obj.app_replicate ? app_obj.app_replicate : app_obj._id}/${
+              tree_ret2.rPTH
             }`
           );
           return url;
@@ -219,7 +220,7 @@ func.common.db = async function (
     const app_id = _session.app_id;
 
     if (_session.engine_mode === "live_preview") {
-      console.log("request", dataP)
+      console.log("request", dataP);
     }
 
     var data = {
@@ -242,7 +243,7 @@ func.common.db = async function (
       ) {
         data.device_name = firebase.auth().currentUser.displayName;
       }
-    } catch (error) { }
+    } catch (error) {}
 
     for (const [key, val] of Object.entries(dataP)) {
       data[key] = val;
@@ -263,7 +264,7 @@ func.common.db = async function (
       }
 
       if (_session.engine_mode === "live_preview") {
-        console.log("response", ret)
+        console.log("response", ret);
       }
       resolve(ret, true);
     };
@@ -368,7 +369,7 @@ func.common.db = async function (
               });
             }
             func.db.pouch.set_db_replication_from_server(SESSION_ID);
-          } catch (err) { }
+          } catch (err) {}
         }
         return json;
       }
@@ -809,8 +810,9 @@ func.common.getContrast_color = function (hexcolor) {
 };
 
 func.common.get_url = function (SESSION_ID, method, path) {
-  return `https://${SESSION_OBJ[SESSION_ID].domain}/${method}${path ? "/" + path : "/"
-    }`;
+  return `https://${SESSION_OBJ[SESSION_ID].domain}/${method}${
+    path ? "/" + path : "/"
+  }`;
 };
 
 var UI_FRAMEWORK_INSTALLED = null;
@@ -1029,7 +1031,7 @@ func.api.invoke_event = async function (event_id) {
 
   return await api_utils.invoke_event(event_id);
 };
-func.api.call_api_program = async function (prog_id, params) {
+func.api.call_project_api = async function (prog_id, params) {
   const SESSION_ID = Object.keys(SESSION_OBJ)[0];
   const api_utils = await func.common.get_module(
     SESSION_ID,
@@ -1044,7 +1046,7 @@ func.api.call_api_program = async function (prog_id, params) {
     }
   );
 
-  return await api_utils.call_api_program(prog_id, params, null);
+  return await api_utils.call_project_api(prog_id, params, null);
 };
 glb.rpi_request_queue_num = 0;
 func.common.perform_rpi_request = async function (
@@ -8665,57 +8667,214 @@ func.events.execute = async function (
     comment: async function () {
       if (jobNoP) func.events.delete_job(SESSION_ID, jobNoP);
     },
-    call_api: async function () {
+    call_project_api: async function () {
       const params_obj = await get_params_obj();
-      let _prog_id = await get_prog_id();
+      const _prog_id = await get_prog_id();
 
       if (!_prog_id) {
         func.utils.debug_report(
           SESSION_ID,
           "func.events.execute",
-          `${elementP} > ${triggerP} > ${functionP} > program is missing`,
+          `${elementP} > ${triggerP} > ${functionP} > program not defined`,
           "E"
         );
         func.events.delete_job(SESSION_ID, jobNoP);
         return;
       }
 
-      let output_field = await get_args_property_value("outputField");
+      const output_field = await get_args_property_value("outputField");
 
-      if (!output_field) {
+      // if (!output_field) {
+      //   func.utils.debug_report(
+      //     SESSION_ID,
+      //     "func.events.execute",
+      //     `${elementP} >${triggerP} >${functionP} > Output field not defined`,
+      //     "E"
+      //   );
+      //   func.events.delete_job(SESSION_ID, jobNoP);
+      //   return;
+      // }
+
+      const api_ret = await func.api.call_project_api(_prog_id, params_obj);
+
+      if (output_field) {
+        let datasource_changes = {};
+
+        let ret_get_value = await func.datasource.get_value(
+          SESSION_ID,
+          output_field,
+          dsSessionP
+        );
+        if (ret_get_value.found) {
+          let _ds = _session.DS_GLB[ret_get_value.dsSessionP];
+          if (!datasource_changes[_ds.dsSession]) {
+            datasource_changes[_ds.dsSession] = {};
+          }
+          if (
+            !datasource_changes[_ds.dsSession][ret_get_value.currentRecordId]
+          ) {
+            datasource_changes[_ds.dsSession][ret_get_value.currentRecordId] =
+              {};
+          }
+          datasource_changes[_ds.dsSession][ret_get_value.currentRecordId][
+            output_field
+          ] = api_ret;
+          await func.datasource.update(SESSION_ID, datasource_changes);
+        }
+      }
+      func.events.delete_job(SESSION_ID, jobNoP);
+    },
+    call_system_api: async function () {
+      const api_method = await get_args_property_value("api_method");
+
+      if (!api_method) {
         func.utils.debug_report(
           SESSION_ID,
           "func.events.execute",
-          `${elementP} >${triggerP} >${functionP} > Output field is missing`,
+          `${elementP} >${triggerP} >${functionP} > api_method not defined`,
           "E"
         );
         func.events.delete_job(SESSION_ID, jobNoP);
         return;
       }
 
-      const api_ret = await func.api.call_api_program(_prog_id, params_obj);
+      const payload = await get_args_property_value("payload");
 
-      let datasource_changes = {};
+      if (!payload) {
+        func.utils.debug_report(
+          SESSION_ID,
+          "func.events.execute",
+          `${elementP} >${triggerP} >${functionP} > payload not defined`,
+          "E"
+        );
+        func.events.delete_job(SESSION_ID, jobNoP);
+        return;
+      }
 
-      let ret_get_value = await func.datasource.get_value(
-        SESSION_ID,
-        output_field,
-        dsSessionP
-      );
-      if (ret_get_value.found) {
-        let _ds = _session.DS_GLB[ret_get_value.dsSessionP];
-        if (!datasource_changes[_ds.dsSession]) {
-          datasource_changes[_ds.dsSession] = {};
-        }
-        if (!datasource_changes[_ds.dsSession][ret_get_value.currentRecordId]) {
-          datasource_changes[_ds.dsSession][ret_get_value.currentRecordId] = {};
+      const output_field = await get_args_property_value("outputField");
+
+      // if (!output_field) {
+      //   func.utils.debug_report(
+      //     SESSION_ID,
+      //     "func.events.execute",
+      //     `${elementP} >${triggerP} >${functionP} > Output field not defined`,
+      //     "E"
+      //   );
+      //   func.events.delete_job(SESSION_ID, jobNoP);
+      //   return;
+      // }
+
+      const api_ret = await func.api.call_system_api(api_method, payload);
+      if (output_field) {
+        let datasource_changes = {};
+
+        let ret_get_value = await func.datasource.get_value(
+          SESSION_ID,
+          output_field,
+          dsSessionP
+        );
+        if (ret_get_value.found) {
+          let _ds = _session.DS_GLB[ret_get_value.dsSessionP];
+          if (!datasource_changes[_ds.dsSession]) {
+            datasource_changes[_ds.dsSession] = {};
+          }
+          if (
+            !datasource_changes[_ds.dsSession][ret_get_value.currentRecordId]
+          ) {
+            datasource_changes[_ds.dsSession][ret_get_value.currentRecordId] =
+              {};
+          }
+          datasource_changes[_ds.dsSession][ret_get_value.currentRecordId][
+            output_field
+          ] = api_ret;
+          await func.datasource.update(SESSION_ID, datasource_changes);
         }
-        datasource_changes[_ds.dsSession][ret_get_value.currentRecordId][
-          output_field
-        ] = api_ret;
-        await func.datasource.update(SESSION_ID, datasource_changes);
       }
+      func.events.delete_job(SESSION_ID, jobNoP);
+    },
+    call_external_api: async function () {
+      const method = await get_args_property_value("method");
+
+      if (!method) {
+        func.utils.debug_report(
+          SESSION_ID,
+          "func.events.execute",
+          `${elementP} >${triggerP} >${functionP} > method not defined`,
+          "E"
+        );
+        func.events.delete_job(SESSION_ID, jobNoP);
+        return;
+      }
+
+      const api_url = await get_args_property_value("api_url");
+
+      if (!api_url) {
+        func.utils.debug_report(
+          SESSION_ID,
+          "func.events.execute",
+          `${elementP} >${triggerP} >${functionP} > api_url not defined`,
+          "E"
+        );
+        func.events.delete_job(SESSION_ID, jobNoP);
+        return;
+      }
+
+      const payload = await get_args_property_value("payload");
+
+      if (!payload) {
+        func.utils.debug_report(
+          SESSION_ID,
+          "func.events.execute",
+          `${elementP} >${triggerP} >${functionP} > payload not defined`,
+          "E"
+        );
+        func.events.delete_job(SESSION_ID, jobNoP);
+        return;
+      }
+
+      const output_field = await get_args_property_value("outputField");
+
+      // if (!output_field) {
+      //   func.utils.debug_report(
+      //     SESSION_ID,
+      //     "func.events.execute",
+      //     `${elementP} >${triggerP} >${functionP} > Output field not defined`,
+      //     "E"
+      //   );
+      //   func.events.delete_job(SESSION_ID, jobNoP);
+      //   return;
+      // }
+
+      const api_ret = await func.api.call_external_api(
+        method,
+        api_url,
+        payload
+      );
+      if (output_field) {
+        let datasource_changes = {};
 
+        let ret_get_value = await func.datasource.get_value(
+          SESSION_ID,
+          output_field,
+          dsSessionP
+        );
+        if (ret_get_value.found) {
+          let _ds = _session.DS_GLB[ret_get_value.dsSessionP];
+          if (!datasource_changes[_ds.dsSession]) {
+            datasource_changes[_ds.dsSession] = {};
+          }
+          if (
+            !datasource_changes[_ds.dsSession][ret_get_value.currentRecordId]
+          ) {
+            datasource_changes[_ds.dsSession][ret_get_value.currentRecordId] =
+              {};
+          }
+          datasource_changes[_ds.dsSession][ret_get_value.currentRecordId][
+            output_field
+          ] = api_ret;
+          await func.datasource.update(SESSION_ID, datasource_changes);
+        }
+      }
       func.events.delete_job(SESSION_ID, jobNoP);
     },
   };

package/package.json

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