@fatehan/tsrp 1.3.44 → 1.3.46

package/dist/system.io.d.ts

@@ -1,5 +1,6 @@
 import { ShownIo, SystemIo } from "./fatehan/devices/devices";
 import { Data } from "./fatehan/packets/dataModel";
 declare const SystemIoCast: (systemIo: SystemIo[], deviceIo: SystemIo[], data: Data) => ShownIo[];
+export declare function evalExpressionSafe(template: string, context: any): number | boolean | string | null;
 export default SystemIoCast;
 //# sourceMappingURL=system.io.d.ts.map

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;AA2IF,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;AAkGF,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,CA4BnG;AACD,eAAe,YAAY,CAAC"}

package/dist/system.io.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.evalExpressionSafe = evalExpressionSafe;
 const devices_1 = require("./fatehan/devices/devices");
 const SystemIoCast = (systemIo, deviceIo, data) => {
     let list = [];
@@ -93,11 +94,15 @@ function Separator(value, seprator) {
 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;
@@ -135,16 +140,20 @@ function getValueByPathCaseInsensitive(obj, path) {
     for (const rawPart of parts) {
         if (cur == null)
             return undefined;
-        if (/^\d+$/.test(rawPart)) {
-            const idx = Number(rawPart);
+        const isIndex = /^\d+$/.test(rawPart);
+        if (isIndex) {
+            const idx = rawPart;
             if (Array.isArray(cur) || cur instanceof Uint8Array) {
-                cur = cur[idx];
+                cur = cur[Number(idx)];
                 continue;
             }
-            else {
-                return undefined;
+            if (typeof cur === "object" && cur !== null && idx in cur) {
+                cur = cur[idx];
+                continue;
             }
+            return undefined;
         }
+        // حالت 3: object معمولی (case-insensitive)
         if (isPlainObject(cur)) {
             const lower = rawPart.toLowerCase();
             const foundKey = Object.keys(cur).find(k => k.toLowerCase() === lower);
@@ -164,7 +173,7 @@ function evalExpressionSafe(template, context) {
     try {
         if (typeof template !== 'string')
             return null;
-        const replaced = template.replace(/\$([A-Za-z0-9_.\[\]]+)/gi, (_m, expr) => {
+        const replaced = template.replace(/\$([A-Za-z0-9_.\[\]]+)/gi, (_, expr) => {
             const value = getValueByPathCaseInsensitive(context, expr);
             if (value === undefined || value === null)
                 return "null";
@@ -176,38 +185,20 @@ function evalExpressionSafe(template, context) {
                 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(',')}]`;
-            }
+            if (Array.isArray(value))
+                return `[${value.map(v => (typeof v === "string" ? JSON.stringify(v) : v)).join(',')}]`;
             return "null";
         });
-        if (replaced.includes("null")) {
+        const cleaned = replaced.replace(/;/g, ' ').replace(/`/g, ' ').replace(/\\/g, ' ').trim();
+        if (!/^[0-9+\-*/ ().><=!&|,"'\[\]truefalsenull]*$/i.test(cleaned))
             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")
+        const fn = new Function(`return (${cleaned});`);
+        const result = fn();
+        if (typeof result === "number" && !isNaN(result))
+            return result;
+        if (typeof result === "boolean")
+            return result;
+        if (typeof result === "string")
             return result;
         return null;
     }

package/package.json

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