@fatehan/tsrp 1.3.43 → 1.3.45

package/dist/system.io.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system.io.d.ts","sourceRoot":"","sources":["../src/system.io.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,QAAQ,EAET,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAEnD,QAAA,MAAM,YAAY,GAChB,UAAU,QAAQ,EAAE,EACpB,UAAU,QAAQ,EAAE,EACpB,MAAM,IAAI,KACT,OAAO,EA2FT,CAAC;AAqFF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"system.io.d.ts","sourceRoot":"","sources":["../src/system.io.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,QAAQ,EAET,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAEnD,QAAA,MAAM,YAAY,GAChB,UAAU,QAAQ,EAAE,EACpB,UAAU,QAAQ,EAAE,EACpB,MAAM,IAAI,KACT,OAAO,EA4FT,CAAC;AA8IF,eAAe,YAAY,CAAC"}

package/dist/system.io.js

@@ -12,7 +12,7 @@ const SystemIoCast = (systemIo, deviceIo, data) => {
     const tempSystemIo = [...systemIo, ...deviceIo].sort((a, b) => a.sord - b.sord);
     tempSystemIo.forEach((io) => {
         var _a;
-        const value = evalExpression(io.formula, data);
+        const value = evalExpressionSafe(io.formula, data);
         if (value !== null) {
             let style = io.activeStyle;
             if (io.type === devices_1.SystemIo_SystemIoType.BOOLEAN) {
@@ -90,54 +90,18 @@ function Separator(value, seprator) {
     const formattedInt = intPart.replace(regex, ",");
     return decimalPart ? `${formattedInt}.${decimalPart}` : formattedInt;
 }
-function getValueByPath(obj, path) {
-    const parts = path
-        .replace(/\[(\w+)\]/g, '.$1')
-        .split('.')
-        .filter(Boolean);
-    let current = obj;
-    for (const key of parts) {
-        if (current == null)
-            return undefined;
-        current = current[key];
-    }
-    return current;
-}
-function evalExpression(template, context) {
-    try {
-        const replaced = template.replace(/\$([A-Za-z0-9_.\[\]]+)/g, (_, expr) => {
-            const value = getValueByPath(context, expr);
-            if (value === undefined || value === null)
-                return "null";
-            if (typeof value === "string")
-                return JSON.stringify(value);
-            if (typeof value === "boolean")
-                return value ? "true" : "false";
-            return String(value);
-        });
-        if (!/^[0-9+\-*/ ().truefalsenull"']+$/.test(replaced)) {
-            return null;
-        }
-        const fn = new Function(`return (${replaced});`);
-        const result = fn();
-        if (result === undefined || result === null)
-            return null;
-        if (typeof result === "number" || typeof result === "boolean" || typeof result === "string")
-            return result;
-        return null;
-    }
-    catch {
-        return null;
-    }
-}
 function safeEvalFormula(formula, xValue) {
     try {
         const replaced = formula.replace(/x/g, String(xValue));
-        if (!/^[0-9+\-*/ ().]+$/.test(replaced))
+        if (!/^[0-9+\-*/ ().><=!&|]+$/.test(replaced))
             return null;
         const fn = new Function(`return (${replaced});`);
         const result = fn();
-        return typeof result === "number" && !isNaN(result) ? result : null;
+        if (typeof result === "number" && !isNaN(result))
+            return result;
+        if (typeof result === "boolean")
+            return result;
+        return null;
     }
     catch {
         return null;
@@ -164,4 +128,95 @@ function safeEvalCondition(formula, xValue) {
         return null;
     }
 }
+function isPlainObject(v) {
+    return v !== null && typeof v === "object" && !Array.isArray(v) && !(v instanceof Uint8Array);
+}
+function getValueByPathCaseInsensitive(obj, path) {
+    if (!path)
+        return undefined;
+    const parts = path.replace(/\[(\d+)\]/g, '.$1').split('.').filter(Boolean);
+    let cur = obj;
+    for (const rawPart of parts) {
+        if (cur == null)
+            return undefined;
+        if (/^\d+$/.test(rawPart)) {
+            const idx = Number(rawPart);
+            if (Array.isArray(cur) || cur instanceof Uint8Array) {
+                cur = cur[idx];
+                continue;
+            }
+            else {
+                return undefined;
+            }
+        }
+        if (isPlainObject(cur)) {
+            const lower = rawPart.toLowerCase();
+            const foundKey = Object.keys(cur).find(k => k.toLowerCase() === lower);
+            if (foundKey !== undefined) {
+                cur = cur[foundKey];
+                continue;
+            }
+            else {
+                return undefined;
+            }
+        }
+        return undefined;
+    }
+    return cur;
+}
+function evalExpressionSafe(template, context) {
+    try {
+        if (typeof template !== 'string')
+            return null;
+        const replaced = template.replace(/\$([A-Za-z0-9_.\[\]]+)/gi, (_m, expr) => {
+            const value = getValueByPathCaseInsensitive(context, expr);
+            if (value === undefined || value === null)
+                return "null";
+            if (typeof value === "number")
+                return String(value);
+            if (typeof value === "boolean")
+                return value ? "true" : "false";
+            if (typeof value === "string")
+                return JSON.stringify(value);
+            if (value instanceof Uint8Array)
+                return `[${Array.from(value).join(',')}]`;
+            if (Array.isArray(value)) {
+                return `[${value.map(v => (typeof v === 'string' ? JSON.stringify(v) : String(v))).join(',')}]`;
+            }
+            return "null";
+        });
+        if (replaced.includes("null")) {
+            return null;
+        }
+        const cleaned = replaced
+            .replace(/;/g, ' ')
+            .replace(/`/g, ' ')
+            .replace(/\\/g, ' ')
+            .trim();
+        const allowedPattern = /^[0-9+\-*/ %().,<>=!&|"\[\]truefalsenull,':\s]*$/i;
+        if (!allowedPattern.test(cleaned))
+            return null;
+        const forbidden = [/constructor\b/i, /process\b/i, /require\b/i, /global\b/i, /__proto__\b/i];
+        if (forbidden.some(rx => rx.test(cleaned)))
+            return null;
+        if (cleaned.length === 0)
+            return null;
+        let result;
+        try {
+            const fn = new Function(`return (${cleaned});`);
+            result = fn();
+        }
+        catch {
+            return null;
+        }
+        if (result === undefined || result === null)
+            return null;
+        if (typeof result === "number" || typeof result === "boolean" || typeof result === "string")
+            return result;
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
 exports.default = SystemIoCast;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fatehan/tsrp",
-  "version": "1.3.43",
+  "version": "1.3.45",
   "description": "fatehan main models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",