@zlink-systems/stream-connector 0.30.3 → 0.32.0

package/dist/browser/index.global.js

@@ -794,20 +794,22 @@ var ZlinkStreamConnectorBundle = (() => {
     if (value === void 0 || typeof value === "function" || typeof value === "symbol") {
       throw new TypeError("framework-json-v1 payload is not a JSON value.");
     }
-    const encoded = JSON.stringify(
-      value,
-      replacer === void 0 ? frameworkJsonV1Replacer : function(key, item) {
-        const transformed = replacer.call(this, key, item);
-        return frameworkJsonV1Replacer.call({ [key]: transformed }, key, transformed);
-      }
-    );
+    const encoded = replacer === void 0 ? JSON.stringify(value, frameworkJsonV1Replacer) : stringifyWithReplacer(value, replacer);
     if (schema !== void 0) {
       validateFrameworkJsonV1Value(JSON.parse(encoded), schema, "$", false);
     }
     return encoded;
   }
+  function stringifyWithReplacer(value, replacer) {
+    return JSON.stringify(value, function(key, item) {
+      const transformed = replacer.call(this, key, item);
+      return frameworkJsonV1Value(transformed, transformed);
+    });
+  }
   function frameworkJsonV1Replacer(key, item) {
-    const source = this[key];
+    return frameworkJsonV1Value(this[key], item);
+  }
+  function frameworkJsonV1Value(source, item) {
     if (typeof source === "number" && !Number.isFinite(source)) {
       throw new TypeError("framework-json-v1 only accepts finite JSON numbers.");
     }
@@ -948,18 +950,21 @@ var ZlinkStreamConnectorBundle = (() => {
       this.text = text;
       this.options = options;
       __publicField(this, "index", 0);
+      __publicField(this, "firstEscape");
+      const escape = text.indexOf("\\");
+      this.firstEscape = escape === -1 ? text.length : escape;
     }
     scan() {
       this.skipWhitespace();
-      this.scanValue();
+      this.scanValue([]);
       this.skipWhitespace();
       if (this.index !== this.text.length) this.fail("trailing data");
     }
-    scanValue() {
+    scanValue(path) {
       this.skipWhitespace();
       const token = this.text[this.index];
-      if (token === "{") return this.scanObject();
-      if (token === "[") return this.scanArray();
+      if (token === "{") return this.scanObject(path);
+      if (token === "[") return this.scanArray(path);
       if (token === '"') {
         this.scanString();
         return;
@@ -969,7 +974,7 @@ var ZlinkStreamConnectorBundle = (() => {
       if (token === "n") return this.scanLiteral("null");
       this.scanNumber();
     }
-    scanObject() {
+    scanObject(path) {
       var _a, _b;
       this.index++;
       this.skipWhitespace();
@@ -983,7 +988,11 @@ var ZlinkStreamConnectorBundle = (() => {
         if (this.text[this.index] !== '"') this.fail("object property name");
         const property = this.scanString();
         if (properties.has(property)) {
-          throw new SyntaxError(`framework-json-v1 duplicate property '${property}'.`);
+          if (this.options.onDuplicateProperty !== void 0) {
+            this.options.onDuplicateProperty(property, path);
+          } else {
+            throw new SyntaxError(`framework-json-v1 duplicate property '${property}'.`);
+          }
         }
         properties.add(property);
         if (((_b = (_a = this.options).rejectPropertyName) == null ? void 0 : _b.call(_a, property)) === true) {
@@ -992,14 +1001,14 @@ var ZlinkStreamConnectorBundle = (() => {
         this.skipWhitespace();
         if (this.text[this.index] !== ":") this.fail("':' after object property");
         this.index++;
-        this.scanValue();
+        this.scanValue(this.options.onDuplicateProperty === void 0 ? path : [...path, property]);
         this.skipWhitespace();
         const delimiter = this.text[this.index++];
         if (delimiter === "}") return;
         if (delimiter !== ",") this.fail("',' or '}' after object property");
       }
     }
-    scanArray() {
+    scanArray(path) {
       this.index++;
       this.skipWhitespace();
       if (this.text[this.index] === "]") {
@@ -1007,7 +1016,7 @@ var ZlinkStreamConnectorBundle = (() => {
         return;
       }
       for (; ; ) {
-        this.scanValue();
+        this.scanValue(this.options.onDuplicateProperty === void 0 ? path : [...path, "[]"]);
         this.skipWhitespace();
         const delimiter = this.text[this.index++];
         if (delimiter === "]") return;
@@ -1015,19 +1024,32 @@ var ZlinkStreamConnectorBundle = (() => {
       }
     }
     scanString() {
-      const start = this.index++;
+      const text = this.text;
+      const start = this.index;
+      let index = start + 1;
+      const end = text.indexOf('"', index);
+      if (end !== -1 && end < this.firstEscape) {
+        this.index = end + 1;
+        return text.slice(index, end);
+      }
       let sawEscape = false;
       for (; ; ) {
-        if (this.index >= this.text.length) this.fail("unterminated string");
-        const character = this.text[this.index++];
+        if (index >= text.length) {
+          this.index = index;
+          this.fail("unterminated string");
+        }
+        const character = text[index++];
         if (character === '"') {
-          return sawEscape ? JSON.parse(this.text.slice(start, this.index)) : this.text.slice(start + 1, this.index - 1);
+          this.index = index;
+          return sawEscape ? JSON.parse(text.slice(start, index)) : text.slice(start + 1, index - 1);
         }
         if (character === "\\") {
           sawEscape = true;
-          if (this.index >= this.text.length) this.fail("unterminated escape");
-          const escaped = this.text[this.index++];
-          if (escaped === "u") this.index += 4;
+          if (index >= text.length) {
+            this.index = index;
+            this.fail("unterminated escape");
+          }
+          if (text[index++] === "u") index += 4;
         }
       }
     }
@@ -2921,6 +2943,10 @@ var ZlinkStreamConnectorBundle = (() => {
       }
     }
     async dispatch(connection, header, payload, signal) {
+      if (header.kind === 5 /* Control */) {
+        await this.dispatchControl(connection, header, payload, signal);
+        return;
+      }
       const actor = header.actorSlot === void 0 ? void 0 : this.actors.resolve(header.actorSlot);
       if (header.kind === 3 /* Response */ && header.requestSeq !== void 0) {
         try {
@@ -2962,10 +2988,6 @@ var ZlinkStreamConnectorBundle = (() => {
         }
         return;
       }
-      if (header.kind === 5 /* Control */) {
-        await this.dispatchControl(connection, header, payload, signal);
-        return;
-      }
       if (header.kind === 1 /* Send */) {
         this.receivedMessages.enqueue(
           {
@@ -2989,16 +3011,16 @@ var ZlinkStreamConnectorBundle = (() => {
         await ((_a = this.serverClosing) == null ? void 0 : _a.call(this, closing.closeReason));
         return;
       }
-      if (payload.length !== 0) {
-        throw connectorError(
-          "frameDecodeFailed" /* FrameDecodeFailed */,
-          "Control packet payload must be empty."
-        );
-      }
       if (header.name === ZLINK_STREAM_HEARTBEAT_PING) {
         await this.frameSender.sendControl(connection, ZLINK_STREAM_HEARTBEAT_PONG);
         return;
       }
+      if (header.name === ZLINK_STREAM_HEARTBEAT_PONG) {
+        return;
+      }
+      if (header.name.startsWith("$zlink.")) {
+        return;
+      }
       if (header.name !== ZLINK_STREAM_HEARTBEAT_PONG) {
         throw connectorError("frameDecodeFailed" /* FrameDecodeFailed */, "Unknown control packet.");
       }

package/dist/browser/index.mjs

@@ -749,20 +749,22 @@ function stringifyFrameworkJsonV1(value, schema, replacer) {
   if (value === void 0 || typeof value === "function" || typeof value === "symbol") {
     throw new TypeError("framework-json-v1 payload is not a JSON value.");
   }
-  const encoded = JSON.stringify(
-    value,
-    replacer === void 0 ? frameworkJsonV1Replacer : function(key, item) {
-      const transformed = replacer.call(this, key, item);
-      return frameworkJsonV1Replacer.call({ [key]: transformed }, key, transformed);
-    }
-  );
+  const encoded = replacer === void 0 ? JSON.stringify(value, frameworkJsonV1Replacer) : stringifyWithReplacer(value, replacer);
   if (schema !== void 0) {
     validateFrameworkJsonV1Value(JSON.parse(encoded), schema, "$", false);
   }
   return encoded;
 }
+function stringifyWithReplacer(value, replacer) {
+  return JSON.stringify(value, function(key, item) {
+    const transformed = replacer.call(this, key, item);
+    return frameworkJsonV1Value(transformed, transformed);
+  });
+}
 function frameworkJsonV1Replacer(key, item) {
-  const source = this[key];
+  return frameworkJsonV1Value(this[key], item);
+}
+function frameworkJsonV1Value(source, item) {
   if (typeof source === "number" && !Number.isFinite(source)) {
     throw new TypeError("framework-json-v1 only accepts finite JSON numbers.");
   }
@@ -902,19 +904,22 @@ var JsonPropertyScanner = class {
   constructor(text, options) {
     this.text = text;
     this.options = options;
+    const escape = text.indexOf("\\");
+    this.firstEscape = escape === -1 ? text.length : escape;
   }
   index = 0;
+  firstEscape;
   scan() {
     this.skipWhitespace();
-    this.scanValue();
+    this.scanValue([]);
     this.skipWhitespace();
     if (this.index !== this.text.length) this.fail("trailing data");
   }
-  scanValue() {
+  scanValue(path) {
     this.skipWhitespace();
     const token = this.text[this.index];
-    if (token === "{") return this.scanObject();
-    if (token === "[") return this.scanArray();
+    if (token === "{") return this.scanObject(path);
+    if (token === "[") return this.scanArray(path);
     if (token === '"') {
       this.scanString();
       return;
@@ -924,7 +929,7 @@ var JsonPropertyScanner = class {
     if (token === "n") return this.scanLiteral("null");
     this.scanNumber();
   }
-  scanObject() {
+  scanObject(path) {
     this.index++;
     this.skipWhitespace();
     if (this.text[this.index] === "}") {
@@ -937,7 +942,11 @@ var JsonPropertyScanner = class {
       if (this.text[this.index] !== '"') this.fail("object property name");
       const property = this.scanString();
       if (properties.has(property)) {
-        throw new SyntaxError(`framework-json-v1 duplicate property '${property}'.`);
+        if (this.options.onDuplicateProperty !== void 0) {
+          this.options.onDuplicateProperty(property, path);
+        } else {
+          throw new SyntaxError(`framework-json-v1 duplicate property '${property}'.`);
+        }
       }
       properties.add(property);
       if (this.options.rejectPropertyName?.(property) === true) {
@@ -946,14 +955,14 @@ var JsonPropertyScanner = class {
       this.skipWhitespace();
       if (this.text[this.index] !== ":") this.fail("':' after object property");
       this.index++;
-      this.scanValue();
+      this.scanValue(this.options.onDuplicateProperty === void 0 ? path : [...path, property]);
       this.skipWhitespace();
       const delimiter = this.text[this.index++];
       if (delimiter === "}") return;
       if (delimiter !== ",") this.fail("',' or '}' after object property");
     }
   }
-  scanArray() {
+  scanArray(path) {
     this.index++;
     this.skipWhitespace();
     if (this.text[this.index] === "]") {
@@ -961,7 +970,7 @@ var JsonPropertyScanner = class {
       return;
     }
     for (; ; ) {
-      this.scanValue();
+      this.scanValue(this.options.onDuplicateProperty === void 0 ? path : [...path, "[]"]);
       this.skipWhitespace();
       const delimiter = this.text[this.index++];
       if (delimiter === "]") return;
@@ -969,19 +978,32 @@ var JsonPropertyScanner = class {
     }
   }
   scanString() {
-    const start = this.index++;
+    const text = this.text;
+    const start = this.index;
+    let index = start + 1;
+    const end = text.indexOf('"', index);
+    if (end !== -1 && end < this.firstEscape) {
+      this.index = end + 1;
+      return text.slice(index, end);
+    }
     let sawEscape = false;
     for (; ; ) {
-      if (this.index >= this.text.length) this.fail("unterminated string");
-      const character = this.text[this.index++];
+      if (index >= text.length) {
+        this.index = index;
+        this.fail("unterminated string");
+      }
+      const character = text[index++];
       if (character === '"') {
-        return sawEscape ? JSON.parse(this.text.slice(start, this.index)) : this.text.slice(start + 1, this.index - 1);
+        this.index = index;
+        return sawEscape ? JSON.parse(text.slice(start, index)) : text.slice(start + 1, index - 1);
       }
       if (character === "\\") {
         sawEscape = true;
-        if (this.index >= this.text.length) this.fail("unterminated escape");
-        const escaped = this.text[this.index++];
-        if (escaped === "u") this.index += 4;
+        if (index >= text.length) {
+          this.index = index;
+          this.fail("unterminated escape");
+        }
+        if (text[index++] === "u") index += 4;
       }
     }
   }
@@ -2859,6 +2881,10 @@ var ZlinkStreamReceiveDispatcher = class {
     }
   }
   async dispatch(connection, header, payload, signal) {
+    if (header.kind === 5 /* Control */) {
+      await this.dispatchControl(connection, header, payload, signal);
+      return;
+    }
     const actor = header.actorSlot === void 0 ? void 0 : this.actors.resolve(header.actorSlot);
     if (header.kind === 3 /* Response */ && header.requestSeq !== void 0) {
       try {
@@ -2900,10 +2926,6 @@ var ZlinkStreamReceiveDispatcher = class {
       }
       return;
     }
-    if (header.kind === 5 /* Control */) {
-      await this.dispatchControl(connection, header, payload, signal);
-      return;
-    }
     if (header.kind === 1 /* Send */) {
       this.receivedMessages.enqueue(
         {
@@ -2926,16 +2948,16 @@ var ZlinkStreamReceiveDispatcher = class {
       await this.serverClosing?.(closing.closeReason);
       return;
     }
-    if (payload.length !== 0) {
-      throw connectorError(
-        "frameDecodeFailed" /* FrameDecodeFailed */,
-        "Control packet payload must be empty."
-      );
-    }
     if (header.name === ZLINK_STREAM_HEARTBEAT_PING) {
       await this.frameSender.sendControl(connection, ZLINK_STREAM_HEARTBEAT_PONG);
       return;
     }
+    if (header.name === ZLINK_STREAM_HEARTBEAT_PONG) {
+      return;
+    }
+    if (header.name.startsWith("$zlink.")) {
+      return;
+    }
     if (header.name !== ZLINK_STREAM_HEARTBEAT_PONG) {
       throw connectorError("frameDecodeFailed" /* FrameDecodeFailed */, "Unknown control packet.");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zlink-systems/stream-connector",
-  "version": "0.30.3",
+  "version": "0.32.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -22,6 +22,6 @@
     }
   },
   "dependencies": {
-    "@zlink-systems/stream-wire": "0.30.3"
+    "@zlink-systems/stream-wire": "0.32.0"
   }
 }