@xuda.io/xuda-worker-bundle-min 1.3.895 → 1.3.897

package/index.js

@@ -9216,7 +9216,7 @@ func.expression.get = async function (
         var_Arr[key] = {};
         var_Arr[key].value = val.value;
         //--------------
-        const replace_value_in_string = function (retP, fieldIdP) {
+        const replace_value_in_string = async function (retP, fieldIdP) {
           if (
             iterate_info?.iterator_key === fieldIdP ||
             iterate_info?.iterator_val === fieldIdP
@@ -9263,14 +9263,17 @@ func.expression.get = async function (
                 var prevData = var_Arr[key - 1].value;
                 var_Arr[key].value = prevData[data]; //  @objB[@var]
                 if (val.value.indexOf(".") > -1) {
-                  property2 = func.expression.get_property(val.value).property2; //val.value.substr(val.value.indexOf(".") + 1, val.value.length); // get .
+                  property2 = await func.expression.get_property(val.value)
+                    .property2; //val.value.substr(val.value.indexOf(".") + 1, val.value.length); // get .
                   if (prevData[data]) set_value(prevData[data][property2]);
                   //                                    var_Arr[key].value = prevData[data][property2]; //@objB[@var].property
                 }
                 delete var_Arr[key - 1];
               } else {
-                property1 = func.expression.get_property(val.value).property1;
-                property2 = func.expression.get_property(val.value).property2;
+                property1 = await func.expression.get_property(val.value)
+                  .property1;
+                property2 = await func.expression.get_property(val.value)
+                  .property2;
                 if (property1) {
                   var_Arr[key].value = data[property1]; // @var["value"] or @var.property
                   if (property2) {
@@ -9323,7 +9326,7 @@ func.expression.get = async function (
             rowIdP
           ); // find field in dataSources
 
-          replace_value_in_string(ret.ret, ret.fieldIdP);
+          await replace_value_in_string(ret.ret, ret.fieldIdP);
         }
       }
       try {
@@ -9620,8 +9623,8 @@ func.expression.parse = function (strP) {
   return res;
 };
 
-func.expression.get_property = function (valP) {
-  function secure_eval(val) {
+func.expression.get_property = async function (valP) {
+  async function secure_eval(val) {
     if (typeof IS_PROCESS_SERVER === "undefined") {
       try {
         return eval(val);
@@ -9641,7 +9644,7 @@ func.expression.get_property = function (valP) {
         timeout: 1000,
         allowAsync: false,
       });
-      return vm.run(val);
+      return await vm.run(val);
     } catch (err) {
       throw "";
     }
@@ -9653,7 +9656,7 @@ func.expression.get_property = function (valP) {
       valP.indexOf("[") + 1,
       valP.indexOf("]") - valP.indexOf("[") - 1
     ); // get []
-    property1 = secure_eval(property1);
+    property1 = await secure_eval(property1);
   }
   if (valP.indexOf(".") > -1)
     property2 = valP.substr(valP.indexOf(".") + 1, valP.length); // get .
@@ -9775,7 +9778,7 @@ func.expression.secure_eval = async function (
         },
         timeout: 60000,
       });
-      return vm.run(script, {
+      return await vm.run(script, {
         filename: dir,
         dirname: dir,
       });
@@ -9789,28 +9792,37 @@ func.expression.secure_eval = async function (
     }
   } else {
     try {
-      let vm = new VM.VM({
-        sandbox: {
-          xu,
-          func,
-          SESSION_ID,
-          SESSION_OBJ: { [`${SESSION_ID}`]: SESSION_OBJ[SESSION_ID] },
-          callback: js_script_callback,
-          job_id,
-        },
-        timeout: 1000,
-        allowAsync: false,
-      });
-      let ret = val;
-      if (typeof val === "string") {
-        ret = vm.run(val);
+      try {
+        let vm = new VM.VM({
+          sandbox: {
+            xu,
+            func,
+            SESSION_ID,
+            SESSION_OBJ: { [`${SESSION_ID}`]: SESSION_OBJ[SESSION_ID] },
+            callback: js_script_callback,
+            job_id,
+          },
+          timeout: 1000,
+          allowAsync: false,
+        });
+        let ret = val;
+        if (typeof val === "string") {
+          ret = await vm.run(val);
+        }
+        return ret;
+        // return vm.run(val);
+      } catch (err) {
+        // console.warn("Failed to execute VM script:", val, err);
+        // return val;
+        throw "";
       }
-      return ret;
-      // return vm.run(val);
     } catch (err) {
-      // console.warn("Failed to execute VM script:", val, err);
-      // return val;
-      throw "";
+      try {
+        return JSON5.parse(val);
+      } catch (err) {
+        // console.error(err);
+        return val;
+      }
     }
   }
 };

package/package.json

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