@zlink-systems/stream-connector 0.31.0 → 0.32.0

package/dist/browser/index.global.js

@@ -956,15 +956,15 @@ var ZlinkStreamConnectorBundle = (() => {
     }
     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;
@@ -974,7 +974,7 @@ var ZlinkStreamConnectorBundle = (() => {
       if (token === "n") return this.scanLiteral("null");
       this.scanNumber();
     }
-    scanObject() {
+    scanObject(path) {
       var _a, _b;
       this.index++;
       this.skipWhitespace();
@@ -988,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) {
@@ -997,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] === "]") {
@@ -1012,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;
@@ -2939,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 {
@@ -2980,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(
           {
@@ -3007,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

@@ -911,15 +911,15 @@ var JsonPropertyScanner = class {
   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;
@@ -929,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] === "}") {
@@ -942,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) {
@@ -951,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] === "]") {
@@ -966,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;
@@ -2877,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 {
@@ -2918,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(
         {
@@ -2944,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.31.0",
+  "version": "0.32.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -22,6 +22,6 @@
     }
   },
   "dependencies": {
-    "@zlink-systems/stream-wire": "0.31.0"
+    "@zlink-systems/stream-wire": "0.32.0"
   }
 }