@totalis/hip4-client 0.73.0 → 0.75.0

package/dist/stream.js

@@ -63,12 +63,15 @@ export class TotalisStream {
     nextDelayMs;
     timer;
     silence;
+    connecting;
+    /** Counts connects, so one abandoned while its token resolved never opens a socket. */
+    generation = 0;
     reauthorized = false;
     /** A REPLAY resume with publication freshness: live waits for the first publication frame, which follows the replayed events. */
     replaying = false;
     seen = [];
     listeners = {
-        event: new Set(), snapshot: new Set(), reset: new Set(), status: new Set(), frame: new Set(), error: new Set(),
+        event: new Set(), snapshot: new Set(), capital: new Set(), reset: new Set(), status: new Set(), frame: new Set(), error: new Set(),
     };
     constructor(options) {
         this.options = options;
@@ -87,6 +90,7 @@ export class TotalisStream {
         this.setStatus("closed");
         clearTimeout(this.timer);
         clearTimeout(this.silence);
+        clearTimeout(this.connecting);
         const socket = this.socket;
         this.socket = undefined;
         socket?.close(1000);
@@ -172,17 +176,20 @@ export class TotalisStream {
         this.emit("event", event, frame);
     }
     freshness() {
-        const { type, publication_freshness = type === "account" } = this.options.subscription;
+        const { publication_freshness = true } = this.options.subscription;
         return publication_freshness;
     }
     async connect() {
         this.replaying = false;
         this.setStatus("connecting");
-        const { accessToken, environment = "production", baseUrl, streamBaseUrl } = this.options;
+        const generation = ++this.generation;
+        const { accessToken, environment = "production", baseUrl, streamBaseUrl, connectTimeoutMs = 10_000 } = this.options;
+        clearTimeout(this.connecting);
+        this.connecting = setTimeout(() => this.abandon("unsubscribed", `stream not subscribed after ${connectTimeoutMs} ms`), connectTimeoutMs);
         let socket;
         try {
             const token = typeof accessToken === "function" ? await accessToken() : accessToken;
-            if (this.status === "closed")
+            if (this.status === "closed" || generation !== this.generation)
                 return;
             const open = this.options.webSocket ?? openWebSocket;
             const url = realtimeUrl(environment, baseUrl, streamBaseUrl);
@@ -191,6 +198,9 @@ export class TotalisStream {
                 : open(url, [realtimeProtocol], { ...this.options.headers, Authorization: `Bearer ${token}` });
         }
         catch (error) {
+            if (generation !== this.generation)
+                return;
+            clearTimeout(this.connecting);
             this.emit("error", error);
             this.disconnected();
             return;
@@ -221,7 +231,7 @@ export class TotalisStream {
         this.watchSilence();
     }
     subscribe() {
-        const { publication_freshness = this.options.subscription.type === "account", ...subscription } = this.options.subscription;
+        const { publication_freshness = true, ...subscription } = this.options.subscription;
         return {
             method: "subscribe",
             subscription: { ...subscription, ...(publication_freshness ? { publication_freshness } : {}), ...(this.cursor === undefined ? {} : { cursor: this.cursor }) },
@@ -242,6 +252,7 @@ export class TotalisStream {
                 }
                 break;
             case "subscriptionResponse": {
+                clearTimeout(this.connecting);
                 const ready = frame.data;
                 this.clockOffsetMs = Date.parse(ready.server_time) - Date.now();
                 if (ready.resume === "REPLAY") {
@@ -271,6 +282,9 @@ export class TotalisStream {
             case "event":
                 this.apply(frame.data, frame);
                 break;
+            case "capital":
+                this.emit("capital", frame.data);
+                break;
             case "reset":
                 this.reset();
                 break;
@@ -287,6 +301,7 @@ export class TotalisStream {
     onClose(code, reason) {
         this.socket = undefined;
         clearTimeout(this.silence);
+        clearTimeout(this.connecting);
         if (this.status === "closed")
             return;
         const retry = errorRegistry[reason]?.retry ?? "BACKOFF";
@@ -321,11 +336,17 @@ export class TotalisStream {
         clearTimeout(this.silence);
         if (silenceTimeoutMs === undefined)
             return;
-        this.silence = setTimeout(() => {
-            const socket = this.socket;
-            this.socket = undefined;
-            socket?.close(4000, "silent");
-            this.disconnected();
-        }, silenceTimeoutMs);
+        this.silence = setTimeout(() => this.abandon("silent", `stream silent for ${silenceTimeoutMs} ms`), silenceTimeoutMs);
+    }
+    /** Gives up on the current connect or socket, reports why and reconnects. */
+    abandon(reason, message) {
+        this.generation++;
+        clearTimeout(this.silence);
+        clearTimeout(this.connecting);
+        const socket = this.socket;
+        this.socket = undefined;
+        socket?.close(4000, reason);
+        this.emit("error", new Error(message));
+        this.disconnected();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@totalis/hip4-client",
-  "version": "0.73.0",
+  "version": "0.75.0",
   "description": "Totalis HIP-4 SDK: typed HTTP clients, signer-agnostic typed data, a retrying request layer, pagination, a realtime stream and taker/maker flows",
   "type": "module",
   "files": [