@acta-markets/ts-sdk 0.0.18-beta → 0.0.19-beta

package/dist/cjs/ws/client.handshake.integration.test.js

@@ -55,7 +55,8 @@ describeIfWsUrl("ws handshake integration (real backend)", () => {
             });
             client.on("error", (err) => {
                 if (!welcomeReceived) {
-                    finish(err);
+                    const msg = err.type === "generic" ? err.data.message : err.type;
+                    finish(new Error(msg));
                 }
             });
             client.on("disconnected", (code, reason) => {

package/dist/cjs/ws/client.js

@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActaWsClient = void 0;
 const flows_1 = require("./flows");
 const wirePolicy_1 = require("./wirePolicy");
+function toGenericServerError(err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { type: "generic", data: { code: "client_error", message } };
+}
 function formatServerError(error) {
     if (error.type === "generic") {
         return `${error.data.code}: ${error.data.message}`;
@@ -160,7 +164,7 @@ class ActaWsClient extends TypedEventEmitter {
         if (this.ws?.readyState === WS_OPEN) {
             if (this.welcomeReceived && !this.startAuthSent) {
                 void this.beginAuthHandshake().catch((err) => {
-                    this.emit("error", err);
+                    this.emit("error", toGenericServerError(err));
                     this.setConnectionState("error");
                 });
             }
@@ -393,6 +397,7 @@ class ActaWsClient extends TypedEventEmitter {
     }
     subscribe(channels, markets) {
         this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
         for (const c of channels)
             this.subscribedChannels.add(c);
         if (markets) {
@@ -402,18 +407,21 @@ class ActaWsClient extends TypedEventEmitter {
         this.send({
             type: "Subscribe",
             data: this.hasMarketScope
-                ? { channels, markets: Array.from(this.subscribedMarkets) }
-                : { channels },
+                ? { request_id, channels, markets: Array.from(this.subscribedMarkets) }
+                : { request_id, channels },
         });
+        return request_id;
     }
     unsubscribe(channels) {
         this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
         for (const c of channels)
             this.subscribedChannels.delete(c);
         this.send({
             type: "Unsubscribe",
-            data: { channels },
+            data: { request_id, channels },
         });
+        return request_id;
     }
     ping() {
         if (this.ws?.readyState === WS_OPEN) {
@@ -468,7 +476,7 @@ class ActaWsClient extends TypedEventEmitter {
         };
         ws.onerror = (ev) => {
             this.log("WebSocket error:", ev);
-            this.emit("error", new Error("WebSocket error"));
+            this.emit("error", toGenericServerError("WebSocket error"));
             if (this.shouldReconnect) {
                 this.cleanup();
                 this.scheduleReconnect();
@@ -485,7 +493,7 @@ class ActaWsClient extends TypedEventEmitter {
                 this.flushPendingMessages();
                 if (this.authRequested && this.authProvider && !this.startAuthSent) {
                     void this.beginAuthHandshake().catch((err) => {
-                        this.emit("error", err);
+                        this.emit("error", toGenericServerError(err));
                         this.setConnectionState("error");
                     });
                 }
@@ -711,7 +719,16 @@ class ActaWsClient extends TypedEventEmitter {
             case "Pong":
                 break;
             case "Error":
-                this.emit("error", new Error(formatServerError(message.data)));
+                this.emit("error", message.data);
+                break;
+            case "RequestError":
+                this.emit("requestError", message.data);
+                break;
+            case "SubscribeAck":
+                this.emit("subscribeAck", message.data);
+                break;
+            case "UnsubscribeAck":
+                this.emit("unsubscribeAck", message.data);
                 break;
         }
     }
@@ -732,7 +749,7 @@ class ActaWsClient extends TypedEventEmitter {
     async handleAuthRequest(challenge) {
         this.setConnectionState("authenticating");
         if (!this.authProvider) {
-            this.emit("error", new Error("No auth provider configured"));
+            this.emit("error", toGenericServerError("No auth provider configured"));
             return;
         }
         try {
@@ -746,7 +763,7 @@ class ActaWsClient extends TypedEventEmitter {
             });
         }
         catch (err) {
-            this.emit("error", err);
+            this.emit("error", toGenericServerError(err));
             this.setConnectionState("error");
         }
     }
@@ -797,9 +814,10 @@ class ActaWsClient extends TypedEventEmitter {
         this.emit("authenticated", sessionId, expiresAt);
         if (this.subscribedChannels.size > 0) {
             const channels = Array.from(this.subscribedChannels);
+            const request_id = this.nextRequestId();
             const data = this.hasMarketScope
-                ? { channels, markets: Array.from(this.subscribedMarkets) }
-                : { channels };
+                ? { request_id, channels, markets: Array.from(this.subscribedMarkets) }
+                : { request_id, channels };
             this.send({ type: "Subscribe", data });
         }
     }
@@ -813,14 +831,14 @@ class ActaWsClient extends TypedEventEmitter {
             this.lastAuthSessionId = null;
             this.startAuthSent = false;
             void this.sendStartAuth().catch((err) => {
-                this.emit("error", err);
+                this.emit("error", toGenericServerError(err));
                 this.setConnectionState("error");
             });
             return;
         }
         this.setConnectionState("error");
         const details = message ? `${reason}: ${message}` : reason;
-        this.emit("error", new Error(`Authentication failed: ${details}`));
+        this.emit("error", toGenericServerError(`Authentication failed: ${details}`));
     }
     handleSnapshot(snapshot) {
         this.state.markets.clear();
@@ -959,7 +977,7 @@ class ActaWsClient extends TypedEventEmitter {
                 this.log("Pending queue full, dropping newest message:", message.type);
                 return false;
             case "throw":
-                this.emit("error", new Error(`Pending queue overflow (maxPendingMessages=${maxPending}) for message type=${message.type}`));
+                this.emit("error", toGenericServerError(`Pending queue overflow (maxPendingMessages=${maxPending}) for message type=${message.type}`));
                 return false;
         }
     }

package/dist/cjs/ws/client.test.js

@@ -420,7 +420,11 @@ describe("ActaWsClient", () => {
         client.getMarkets();
         client.getTokens();
         expect(errors).toHaveLength(1);
-        expect(errors[0].message).toContain("Pending queue overflow");
+        const err0 = errors[0];
+        expect(err0.type).toBe("generic");
+        if (err0.type === "generic") {
+            expect(err0.data.message).toContain("Pending queue overflow");
+        }
         ws.triggerMessage(WELCOME_MESSAGE);
         const flushedTypes = ws.sent
             .slice(1)

package/dist/ws/client.d.ts

@@ -2,7 +2,7 @@
 import type { AuthProvider } from "./auth";
 import type { SignerLike } from "../chain/orders";
 import type { Address } from "@solana/addresses";
-import type { ActiveRfqInfo, ChainEventMessage, EarnSummaryData, TokenMarketsInfoData, GlobalStats, MarketDescriptorInfo, MarketInfo, MyActiveRfqInfo, MyActiveRfqsMessage, OrderStatusMessage, PositionInfo, QuoteAcknowledgedMessage, QuoteBestStatusMessage, QuoteCancelledMessage, QuoteMessage, QuoteRefreshRequestedMessage, QuoteOutbidMessage, QuoteReceivedMessage, QuoteSelectedMessage, QuotesUpdateMessage, RfqBroadcastMessage, RfqClosedMessage, RfqCreatedMessage, RfqSkippedMessage, RfqRequestMessage, RfqAvailableAgainMessage, QuoteExpiredMessage, QuoteFilledMessage, IndicativePricesMessage, IndicativePricesRequestMessage, IndicativePricesResponseMessage, GetIndicativePricesMessage, RequestId, ServerMessage, SnapshotMessage, StatsDelta, SubscriptionsMessage, TokenInfo, TradeInfo, UuidString, VersionMismatchMessage, WelcomeMessage, WsChannel } from "./types";
+import type { ActiveRfqInfo, ChainEventMessage, EarnSummaryData, TokenMarketsInfoData, GlobalStats, MarketDescriptorInfo, MarketInfo, MyActiveRfqInfo, MyActiveRfqsMessage, OrderStatusMessage, PositionInfo, QuoteAcknowledgedMessage, QuoteBestStatusMessage, QuoteCancelledMessage, QuoteMessage, QuoteRefreshRequestedMessage, QuoteOutbidMessage, QuoteReceivedMessage, QuoteSelectedMessage, QuotesUpdateMessage, RfqBroadcastMessage, RfqClosedMessage, RfqCreatedMessage, RfqSkippedMessage, RfqRequestMessage, RfqAvailableAgainMessage, QuoteExpiredMessage, QuoteFilledMessage, IndicativePricesMessage, IndicativePricesRequestMessage, IndicativePricesResponseMessage, GetIndicativePricesMessage, RequestId, ServerError, ServerMessage, SnapshotMessage, StatsDelta, SubscriptionsMessage, TokenInfo, TradeInfo, UuidString, VersionMismatchMessage, WelcomeMessage, WsChannel } from "./types";
 export type ConnectionState = "disconnected" | "connecting" | "authenticating" | "authenticated" | "error";
 export type ClientRole = "taker" | "maker";
 export type PendingMessagesOverflowPolicy = "drop_oldest" | "drop_newest" | "throw";
@@ -60,7 +60,19 @@ export type ActaWsClientEvents = {
     authError: (reason: string, message?: string) => void;
     logoutSuccess: () => void;
     disconnected: (code: number, reason: string) => void;
-    error: (error: Error) => void;
+    error: (error: ServerError) => void;
+    requestError: (data: {
+        request_id: RequestId;
+        error: ServerError;
+    }) => void;
+    subscribeAck: (data: {
+        request_id: RequestId;
+        subscribed: WsChannel[];
+    }) => void;
+    unsubscribeAck: (data: {
+        request_id: RequestId;
+        unsubscribed: WsChannel[];
+    }) => void;
     stateChange: (state: ConnectionState) => void;
     message: (message: ServerMessage) => void;
     snapshot: (snapshot: SnapshotMessage) => void;
@@ -241,8 +253,8 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
         makerSigner: SignerLike;
     }): Promise<void>;
     cancelQuote(rfqId: string): RequestId;
-    subscribe(channels: WsChannel[], markets?: string[]): void;
-    unsubscribe(channels: WsChannel[]): void;
+    subscribe(channels: WsChannel[], markets?: string[]): RequestId;
+    unsubscribe(channels: WsChannel[]): RequestId;
     ping(): void;
     resumeAuth(sessionId: string): void;
     private doConnect;

package/dist/ws/client.handshake.integration.test.js

@@ -50,7 +50,8 @@ describeIfWsUrl("ws handshake integration (real backend)", () => {
             });
             client.on("error", (err) => {
                 if (!welcomeReceived) {
-                    finish(err);
+                    const msg = err.type === "generic" ? err.data.message : err.type;
+                    finish(new Error(msg));
                 }
             });
             client.on("disconnected", (code, reason) => {

package/dist/ws/client.js

@@ -1,6 +1,10 @@
 /** Acta WebSocket client (rfq-server). */
 import { buildSignedQuoteMessage, buildAcceptQuoteMessage } from "./flows";
 import { assertWsU64Safe, validateQuantityBySizeRule } from "./wirePolicy";
+function toGenericServerError(err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { type: "generic", data: { code: "client_error", message } };
+}
 function formatServerError(error) {
     if (error.type === "generic") {
         return `${error.data.code}: ${error.data.message}`;
@@ -157,7 +161,7 @@ export class ActaWsClient extends TypedEventEmitter {
         if (this.ws?.readyState === WS_OPEN) {
             if (this.welcomeReceived && !this.startAuthSent) {
                 void this.beginAuthHandshake().catch((err) => {
-                    this.emit("error", err);
+                    this.emit("error", toGenericServerError(err));
                     this.setConnectionState("error");
                 });
             }
@@ -390,6 +394,7 @@ export class ActaWsClient extends TypedEventEmitter {
     }
     subscribe(channels, markets) {
         this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
         for (const c of channels)
             this.subscribedChannels.add(c);
         if (markets) {
@@ -399,18 +404,21 @@ export class ActaWsClient extends TypedEventEmitter {
         this.send({
             type: "Subscribe",
             data: this.hasMarketScope
-                ? { channels, markets: Array.from(this.subscribedMarkets) }
-                : { channels },
+                ? { request_id, channels, markets: Array.from(this.subscribedMarkets) }
+                : { request_id, channels },
         });
+        return request_id;
     }
     unsubscribe(channels) {
         this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
         for (const c of channels)
             this.subscribedChannels.delete(c);
         this.send({
             type: "Unsubscribe",
-            data: { channels },
+            data: { request_id, channels },
         });
+        return request_id;
     }
     ping() {
         if (this.ws?.readyState === WS_OPEN) {
@@ -465,7 +473,7 @@ export class ActaWsClient extends TypedEventEmitter {
         };
         ws.onerror = (ev) => {
             this.log("WebSocket error:", ev);
-            this.emit("error", new Error("WebSocket error"));
+            this.emit("error", toGenericServerError("WebSocket error"));
             if (this.shouldReconnect) {
                 this.cleanup();
                 this.scheduleReconnect();
@@ -482,7 +490,7 @@ export class ActaWsClient extends TypedEventEmitter {
                 this.flushPendingMessages();
                 if (this.authRequested && this.authProvider && !this.startAuthSent) {
                     void this.beginAuthHandshake().catch((err) => {
-                        this.emit("error", err);
+                        this.emit("error", toGenericServerError(err));
                         this.setConnectionState("error");
                     });
                 }
@@ -708,7 +716,16 @@ export class ActaWsClient extends TypedEventEmitter {
             case "Pong":
                 break;
             case "Error":
-                this.emit("error", new Error(formatServerError(message.data)));
+                this.emit("error", message.data);
+                break;
+            case "RequestError":
+                this.emit("requestError", message.data);
+                break;
+            case "SubscribeAck":
+                this.emit("subscribeAck", message.data);
+                break;
+            case "UnsubscribeAck":
+                this.emit("unsubscribeAck", message.data);
                 break;
         }
     }
@@ -729,7 +746,7 @@ export class ActaWsClient extends TypedEventEmitter {
     async handleAuthRequest(challenge) {
         this.setConnectionState("authenticating");
         if (!this.authProvider) {
-            this.emit("error", new Error("No auth provider configured"));
+            this.emit("error", toGenericServerError("No auth provider configured"));
             return;
         }
         try {
@@ -743,7 +760,7 @@ export class ActaWsClient extends TypedEventEmitter {
             });
         }
         catch (err) {
-            this.emit("error", err);
+            this.emit("error", toGenericServerError(err));
             this.setConnectionState("error");
         }
     }
@@ -794,9 +811,10 @@ export class ActaWsClient extends TypedEventEmitter {
         this.emit("authenticated", sessionId, expiresAt);
         if (this.subscribedChannels.size > 0) {
             const channels = Array.from(this.subscribedChannels);
+            const request_id = this.nextRequestId();
             const data = this.hasMarketScope
-                ? { channels, markets: Array.from(this.subscribedMarkets) }
-                : { channels };
+                ? { request_id, channels, markets: Array.from(this.subscribedMarkets) }
+                : { request_id, channels };
             this.send({ type: "Subscribe", data });
         }
     }
@@ -810,14 +828,14 @@ export class ActaWsClient extends TypedEventEmitter {
             this.lastAuthSessionId = null;
             this.startAuthSent = false;
             void this.sendStartAuth().catch((err) => {
-                this.emit("error", err);
+                this.emit("error", toGenericServerError(err));
                 this.setConnectionState("error");
             });
             return;
         }
         this.setConnectionState("error");
         const details = message ? `${reason}: ${message}` : reason;
-        this.emit("error", new Error(`Authentication failed: ${details}`));
+        this.emit("error", toGenericServerError(`Authentication failed: ${details}`));
     }
     handleSnapshot(snapshot) {
         this.state.markets.clear();
@@ -956,7 +974,7 @@ export class ActaWsClient extends TypedEventEmitter {
                 this.log("Pending queue full, dropping newest message:", message.type);
                 return false;
             case "throw":
-                this.emit("error", new Error(`Pending queue overflow (maxPendingMessages=${maxPending}) for message type=${message.type}`));
+                this.emit("error", toGenericServerError(`Pending queue overflow (maxPendingMessages=${maxPending}) for message type=${message.type}`));
                 return false;
         }
     }

package/dist/ws/client.test.js

@@ -418,7 +418,11 @@ describe("ActaWsClient", () => {
         client.getMarkets();
         client.getTokens();
         expect(errors).toHaveLength(1);
-        expect(errors[0].message).toContain("Pending queue overflow");
+        const err0 = errors[0];
+        expect(err0.type).toBe("generic");
+        if (err0.type === "generic") {
+            expect(err0.data.message).toContain("Pending queue overflow");
+        }
         ws.triggerMessage(WELCOME_MESSAGE);
         const flushedTypes = ws.sent
             .slice(1)

package/dist/ws/types.d.ts

@@ -171,12 +171,14 @@ export type ClientMessage = {
 } | {
     type: "Subscribe";
     data: {
+        request_id: RequestId;
         channels: WsChannel[];
         markets?: string[];
     };
 } | {
     type: "Unsubscribe";
     data: {
+        request_id: RequestId;
         channels: WsChannel[];
     };
 };
@@ -483,6 +485,24 @@ export type ServerMessage = {
 } | {
     type: "Error";
     data: ServerError;
+} | {
+    type: "RequestError";
+    data: {
+        request_id: RequestId;
+        error: ServerError;
+    };
+} | {
+    type: "SubscribeAck";
+    data: {
+        request_id: RequestId;
+        subscribed: WsChannel[];
+    };
+} | {
+    type: "UnsubscribeAck";
+    data: {
+        request_id: RequestId;
+        unsubscribed: WsChannel[];
+    };
 };
 export type MarketDescriptorInfo = {
     market: MarketDescriptor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acta-markets/ts-sdk",
-  "version": "0.0.18-beta",
+  "version": "0.0.19-beta",
   "description": "TypeScript SDK for Acta Protocol",
   "type": "module",
   "main": "dist/index.js",