@xuda.io/xuda-worker-bundle-min 1.3.695 → 1.3.697

package/index.js

@@ -1048,6 +1048,40 @@ func.api.call_project_api = async function (prog_id, params) {
 
   return await api_utils.call_project_api(prog_id, params, null);
 };
+func.api.call_system_api = async function (api_method, payload) {
+  const SESSION_ID = Object.keys(SESSION_OBJ)[0];
+  const api_utils = await func.common.get_module(
+    SESSION_ID,
+    "xuda-api-library.mjs",
+    {
+      func,
+      glb,
+      SESSION_OBJ,
+      SESSION_ID,
+      APP_OBJ,
+      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).length - 1,
+    }
+  );
+
+  return await api_utils.call_system_api(api_method, payload, null);
+};
+func.api.call_external_api = async function (method, url, payload) {
+  const SESSION_ID = Object.keys(SESSION_OBJ)[0];
+  const api_utils = await func.common.get_module(
+    SESSION_ID,
+    "xuda-api-library.mjs",
+    {
+      func,
+      glb,
+      SESSION_OBJ,
+      SESSION_ID,
+      APP_OBJ,
+      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).length - 1,
+    }
+  );
+
+  return await api_utils.call_external_api(method, url, payload, null);
+};
 glb.rpi_request_queue_num = 0;
 func.common.perform_rpi_request = async function (
   SESSION_ID,
@@ -8740,16 +8774,16 @@ func.events.execute = async function (
 
       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;
-      }
+      // 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");
 
@@ -8806,32 +8840,83 @@ func.events.execute = async function (
         return;
       }
 
-      const api_url = await get_args_property_value("api_url");
+      const url = await get_args_property_value("url");
 
-      if (!api_url) {
+      if (!url) {
         func.utils.debug_report(
           SESSION_ID,
           "func.events.execute",
-          `${elementP} >${triggerP} >${functionP} > api_url not defined`,
+          `${elementP} >${triggerP} >${functionP} > url not defined`,
           "E"
         );
         func.events.delete_job(SESSION_ID, jobNoP);
         return;
       }
 
-      const payload = await get_args_property_value("payload");
+      const payload_arr = await get_args_property_value("payload");
 
-      if (!payload) {
+      const report_conversion_error = function (res, typeP, valP) {
+        var msg = `${elementP} >${triggerP} >${functionP} > error converting from ${valP} to ${typeP}`;
+        if (error) {
+          return func.utils.debug_report(SESSION_ID, msg, "", "W");
+        }
         func.utils.debug_report(
           SESSION_ID,
-          "func.events.execute",
-          `${elementP} >${triggerP} >${functionP} > payload not defined`,
+          msg + " " + _.capitalize(source) + prog_info,
+          "",
           "E"
         );
-        func.events.delete_job(SESSION_ID, jobNoP);
-        return;
+      };
+      const report_conversion_warn = function (res) {
+        var msg = `${elementP} >${triggerP} >${functionP} > type mismatch auto conversion from value ${valP} to ${typeP}`;
+        func.utils.debug_report(
+          SESSION_ID,
+          msg + " " + _.capitalize(source) + prog_info,
+          "",
+          "W"
+        );
+      };
+      // var ret = valP;
+      if (error) {
+        return report_conversion_error();
       }
 
+      const module = await func.common.get_module(
+        SESSION_ID,
+        "xuda-get-cast-util-module.mjs"
+      );
+      // return module.cast(
+      //   typeP,
+      //   valP,
+      //   report_conversion_error,
+      //   report_conversion_warn
+      // );
+
+      var payload = _.reduce(
+        payload_arr,
+        (ret, val, key) => {
+          ret[val.key] = module.cast(
+            val.type,
+            val.val,
+            report_conversion_error,
+            report_conversion_warn
+          );
+
+          return ret;
+        },
+        {}
+      );
+      // 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) {
@@ -8845,11 +8930,7 @@ func.events.execute = async function (
       //   return;
       // }
 
-      const api_ret = await func.api.call_external_api(
-        method,
-        api_url,
-        payload
-      );
+      const api_ret = await func.api.call_external_api(method, url, payload);
       if (output_field) {
         let datasource_changes = {};
 

package/package.json

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