@matter-server/ws-client 0.2.6 → 0.2.7-alpha.0-20260118-993a1c7

package/dist/esm/json-utils.d.ts

@@ -14,6 +14,8 @@ export declare function toBigIntAwareJson(value: unknown, spaces?: number): stri
  * Parse JSON with BigInt support for large numbers that exceed JavaScript precision.
  * Numbers with 15+ digits that exceed MAX_SAFE_INTEGER are converted to BigInt.
  * Use this for incoming WebSocket messages.
+ *
+ * This function carefully avoids modifying numbers that appear inside string values.
  */
 export declare function parseBigIntAwareJson(json: string): unknown;
 //# sourceMappingURL=json-utils.d.ts.map

package/dist/esm/json-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-utils.d.ts","sourceRoot":"","sources":["../../src/json-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CA2BzE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAmB1D"}
+{"version":3,"file":"json-utils.d.ts","sourceRoot":"","sources":["../../src/json-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CA2BzE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAsG1D"}

package/dist/esm/json-utils.js

@@ -29,13 +29,77 @@ function toBigIntAwareJson(value, spaces) {
   return result;
 }
 function parseBigIntAwareJson(json) {
-  const processed = json.replace(/([:,[])\s*(\d{15,})(?=[,}\]\s])/g, (match, prefix, number) => {
-    const num = BigInt(number);
-    if (num > Number.MAX_SAFE_INTEGER) {
-      return `${prefix}"${BIGINT_MARKER}${number}"`;
+  const result = [];
+  let i = 0;
+  let inString = false;
+  while (i < json.length) {
+    const char = json[i];
+    if (inString) {
+      if (char === "\\") {
+        result.push(char);
+        i++;
+        if (i < json.length) {
+          result.push(json[i]);
+          i++;
+        }
+      } else if (char === '"') {
+        result.push(char);
+        inString = false;
+        i++;
+      } else {
+        result.push(char);
+        i++;
+      }
+    } else {
+      if (char === '"') {
+        result.push(char);
+        inString = true;
+        i++;
+      } else if (char >= "0" && char <= "9") {
+        const hasMinus = result.length > 0 && result[result.length - 1] === "-";
+        if (hasMinus) {
+          result.pop();
+        }
+        const start = i;
+        while (i < json.length && json[i] >= "0" && json[i] <= "9") {
+          i++;
+        }
+        let isFloat = false;
+        if (i < json.length && json[i] === ".") {
+          isFloat = true;
+          i++;
+          while (i < json.length && json[i] >= "0" && json[i] <= "9") {
+            i++;
+          }
+        }
+        if (i < json.length && (json[i] === "e" || json[i] === "E")) {
+          isFloat = true;
+          i++;
+          if (i < json.length && (json[i] === "+" || json[i] === "-")) {
+            i++;
+          }
+          while (i < json.length && json[i] >= "0" && json[i] <= "9") {
+            i++;
+          }
+        }
+        const numberStr = (hasMinus ? "-" : "") + json.slice(start, i);
+        if (!isFloat && numberStr.length - (hasMinus ? 1 : 0) >= 15) {
+          const num = BigInt(numberStr);
+          if (num > Number.MAX_SAFE_INTEGER || num < Number.MIN_SAFE_INTEGER) {
+            result.push(`"${BIGINT_MARKER}${numberStr}"`);
+          } else {
+            result.push(numberStr);
+          }
+        } else {
+          result.push(numberStr);
+        }
+      } else {
+        result.push(char);
+        i++;
+      }
     }
-    return match;
-  });
+  }
+  const processed = result.join("");
   return JSON.parse(processed, (_key, value) => {
     if (typeof value === "string" && value.startsWith(BIGINT_MARKER)) {
       return BigInt(value.slice(BIGINT_MARKER.length));

package/dist/esm/json-utils.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/json-utils.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAaA,MAAM,gBAAgB;AAQf,SAAS,kBAAkB,OAAgB,QAAyB;AACvE,QAAM,eAAe,IAAI,MAAoC;AAC7D,MAAI,SAAS,KAAK;AAAA,IACd;AAAA,IACA,CAAC,MAAM,QAAQ;AACX,UAAI,OAAO,QAAQ,UAAU;AACzB,YAAI,MAAM,OAAO,kBAAkB;AAE/B,uBAAa,KAAK,EAAE,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC,KAAK,IAAI,IAAI,SAAS,EAAE,CAAC;AACzE,iBAAO,KAAK,IAAI,SAAS,EAAE,CAAC;AAAA,QAChC,OAAO;AACH,iBAAO,OAAO,GAAG;AAAA,QACrB;AAAA,MACJ;AACA,aAAO;AAAA,IACX;AAAA,IACA;AAAA,EACJ;AAGA,MAAI,aAAa,SAAS,GAAG;AACzB,iBAAa,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;AACnC,eAAS,OAAO,WAAW,MAAM,EAAE;AAAA,IACvC,CAAC;AAAA,EACL;AAEA,SAAO;AACX;AAOO,SAAS,qBAAqB,MAAuB;AAIxD,QAAM,YAAY,KAAK,QAAQ,oCAAoC,CAAC,OAAO,QAAQ,WAAW;AAC1F,UAAM,MAAM,OAAO,MAAM;AACzB,QAAI,MAAM,OAAO,kBAAkB;AAC/B,aAAO,GAAG,MAAM,IAAI,aAAa,GAAG,MAAM;AAAA,IAC9C;AACA,WAAO;AAAA,EACX,CAAC;AAGD,SAAO,KAAK,MAAM,WAAW,CAAC,MAAM,UAAU;AAC1C,QAAI,OAAO,UAAU,YAAY,MAAM,WAAW,aAAa,GAAG;AAC9D,aAAO,OAAO,MAAM,MAAM,cAAc,MAAM,CAAC;AAAA,IACnD;AACA,WAAO;AAAA,EACX,CAAC;AACL;",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter-server/ws-client",
-    "version": "0.2.6",
+    "version": "0.2.7-alpha.0-20260118-993a1c7",
     "type": "module",
     "description": "WebSocket client library for Matter server",
     "bugs": {
@@ -24,7 +24,10 @@
     },
     "dependencies": {},
     "devDependencies": {
-        "@types/node": "^25.0.8"
+        "@types/node": "^25.0.8",
+        "@types/ws": "^8.18.1",
+        "@matter/testing": "0.16.5",
+        "ws": "^8.18.3"
     },
     "files": [
         "dist/**/*",

package/src/json-utils.ts

@@ -52,18 +52,103 @@ export function toBigIntAwareJson(value: unknown, spaces?: number): string {
  * Parse JSON with BigInt support for large numbers that exceed JavaScript precision.
  * Numbers with 15+ digits that exceed MAX_SAFE_INTEGER are converted to BigInt.
  * Use this for incoming WebSocket messages.
+ *
+ * This function carefully avoids modifying numbers that appear inside string values.
  */
 export function parseBigIntAwareJson(json: string): unknown {
     // Pre-process: Replace large numbers (15+ digits) with marked string placeholders
     // This must happen before JSON.parse to preserve precision
-    // Match numbers after colon (object values) or after [ or , (array elements)
-    const processed = json.replace(/([:,[])\s*(\d{15,})(?=[,}\]\s])/g, (match, prefix, number) => {
-        const num = BigInt(number);
-        if (num > Number.MAX_SAFE_INTEGER) {
-            return `${prefix}"${BIGINT_MARKER}${number}"`;
+    // We need to track whether we're inside a string to avoid modifying string contents
+    const result: string[] = [];
+    let i = 0;
+    let inString = false;
+
+    while (i < json.length) {
+        const char = json[i];
+
+        if (inString) {
+            // Inside a string - copy characters as-is until we find the closing quote
+            if (char === "\\") {
+                // Escape sequence - copy both the backslash and the next character
+                result.push(char);
+                i++;
+                if (i < json.length) {
+                    result.push(json[i]);
+                    i++;
+                }
+            } else if (char === '"') {
+                // End of string
+                result.push(char);
+                inString = false;
+                i++;
+            } else {
+                result.push(char);
+                i++;
+            }
+        } else {
+            // Outside a string
+            if (char === '"') {
+                // Start of a string
+                result.push(char);
+                inString = true;
+                i++;
+            } else if (char >= "0" && char <= "9") {
+                // Potential number - extract and check
+                // Check if previous character was a minus sign (for negative numbers)
+                const hasMinus = result.length > 0 && result[result.length - 1] === "-";
+                if (hasMinus) {
+                    result.pop(); // Remove the minus sign, we'll include it in the number
+                }
+
+                // Extract the integer part
+                const start = i;
+                while (i < json.length && json[i] >= "0" && json[i] <= "9") {
+                    i++;
+                }
+
+                // Check for decimal point (fractional number) or exponent
+                let isFloat = false;
+                if (i < json.length && json[i] === ".") {
+                    isFloat = true;
+                    i++; // consume the decimal point
+                    while (i < json.length && json[i] >= "0" && json[i] <= "9") {
+                        i++;
+                    }
+                }
+
+                // Check for exponent (e.g., 1e10, 1E-5)
+                if (i < json.length && (json[i] === "e" || json[i] === "E")) {
+                    isFloat = true;
+                    i++; // consume 'e' or 'E'
+                    if (i < json.length && (json[i] === "+" || json[i] === "-")) {
+                        i++; // consume sign
+                    }
+                    while (i < json.length && json[i] >= "0" && json[i] <= "9") {
+                        i++;
+                    }
+                }
+
+                const numberStr = (hasMinus ? "-" : "") + json.slice(start, i);
+
+                // Only convert integers (not floats) with 15+ digits that exceed safe integer range
+                if (!isFloat && numberStr.length - (hasMinus ? 1 : 0) >= 15) {
+                    const num = BigInt(numberStr);
+                    if (num > Number.MAX_SAFE_INTEGER || num < Number.MIN_SAFE_INTEGER) {
+                        result.push(`"${BIGINT_MARKER}${numberStr}"`);
+                    } else {
+                        result.push(numberStr);
+                    }
+                } else {
+                    result.push(numberStr);
+                }
+            } else {
+                result.push(char);
+                i++;
+            }
         }
-        return match;
-    });
+    }
+
+    const processed = result.join("");
 
     // Parse with reviver to convert marked strings back to BigInt
     return JSON.parse(processed, (_key, value) => {