@xuda.io/xuda-worker-bundle-min 1.3.681 → 1.3.683

package/index.js

@@ -9018,7 +9018,6 @@ func.expression.get = async function (
             ) {
               ret = ret;
             } else {
-              // ret = secure_eval(ret); //eval(ret);
               ret = await func.expression.secure_eval(
                 SESSION_ID,
                 sourceP,
@@ -9273,7 +9272,7 @@ func.expression.get = async function (
           else res = [exp.result];
           fields = _.assignIn(exp.fields, fieldsP);
         }
-        var result = join(res); //res.join("");
+        var result = join(res);
 
         if (res.length === 1) {
           // bypass join for single value expression
@@ -9291,7 +9290,7 @@ func.expression.get = async function (
             typeof res[0] !== "object"
           ) {
             // avoid eval when query leading zeros problem
-            ret = join(res); // res.join("");
+            ret = join(res);
             if (ret && ret.substr(0, 1) === "@") {
               error = "Error encoding @ var";
               var_error_found = true;
@@ -9305,7 +9304,6 @@ func.expression.get = async function (
                 "DbQuery",
               ].includes(sourceP)
             ) {
-              // ret = secure_eval(result); // eval(result);
               ret = await func.expression.secure_eval(
                 SESSION_ID,
                 sourceP,
@@ -9460,7 +9458,12 @@ func.expression.parse = function (strP) {
 func.expression.get_property = function (valP) {
   function secure_eval(val) {
     if (typeof IS_PROCESS_SERVER === "undefined") {
-      return eval(val);
+      try {
+        return eval(val);
+      } catch (err) {
+        console.error(err);
+        return;
+      }
     }
 
     try {
@@ -9542,7 +9545,16 @@ func.expression.secure_eval = async function (
     typeof IS_PROCESS_SERVER === "undefined" &&
     typeof IS_DOCKER === "undefined"
   ) {
-    return eval(val);
+    try {
+      return eval(val);
+    } catch (err) {
+      try {
+        return JSON5.parse(val);
+      } catch (err) {
+        console.error(err);
+        return;
+      }
+    }
   }
   // server side execution
   if (sourceP === "javascript") {

package/package.json

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