@acta-markets/ts-sdk 0.0.4-beta → 0.0.5-beta

package/README.md

@@ -88,11 +88,14 @@ client.ws!.on("positions", (positions) => {
   console.log("first expiry", positions[0]?.expiry_ts);
 });
 
-client.ws!.getMarkets();
+const marketsRequestId = client.ws!.getMarkets();
+console.log("GetMarkets request_id:", marketsRequestId);
 // positions require auth:
 // client.ws!.getPositions();
 ```
 
+Most WS read/query methods now return the generated `request_id` so UI code can correlate responses (`data.request_id`) without building custom request id plumbing.
+
 ### RFQ → accept quote → sign sponsored tx (wallet UX)
 
 ```ts

package/dist/cjs/ws/client.js

@@ -73,6 +73,21 @@ function getCloseInfo(ev) {
         reason: typeof rec.reason === "string" ? rec.reason : undefined,
     };
 }
+function generateRequestId() {
+    const cryptoApi = globalThis.crypto;
+    if (cryptoApi?.randomUUID) {
+        return cryptoApi.randomUUID();
+    }
+    if (cryptoApi?.getRandomValues) {
+        const bytes = cryptoApi.getRandomValues(new Uint8Array(16));
+        // RFC4122 v4 bits: version=0100, variant=10xx.
+        bytes[6] = (bytes[6] & 0x0f) | 0x40;
+        bytes[8] = (bytes[8] & 0x3f) | 0x80;
+        const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
+        return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+    }
+    return `req-${Date.now()}-${Math.random().toString(16).slice(2, 10)}`;
+}
 class ActaWsClient extends TypedEventEmitter {
     ws = null;
     options;
@@ -82,6 +97,7 @@ class ActaWsClient extends TypedEventEmitter {
     pendingResumeSessionId = null;
     connectionState = "disconnected";
     sessionId = null;
+    lastAuthSessionId = null;
     helloSent = false;
     welcomeReceived = false;
     pendingMessages = [];
@@ -124,6 +140,7 @@ class ActaWsClient extends TypedEventEmitter {
         this.authProvider = null;
         this.authRequested = false;
         this.pendingResumeSessionId = null;
+        this.lastAuthSessionId = null;
         this.shouldReconnect = this.options.autoReconnect;
         this.doConnect();
     }
@@ -223,47 +240,89 @@ class ActaWsClient extends TypedEventEmitter {
     }
     getPositions() {
         this.ensureAuthenticated();
-        this.send({ type: "GetPositions" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetPositions",
+            data: { request_id: requestId },
+        });
+        return requestId;
     }
     getMarkets() {
-        this.send({ type: "GetMarkets" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetMarkets",
+            data: { request_id: requestId },
+        });
+        return requestId;
     }
     getMarketDescriptors(args) {
+        const requestId = this.nextRequestId();
         const data = {
+            request_id: requestId,
             active_only: args?.active_only ?? true,
         };
         this.send({ type: "GetMarketDescriptors", data });
+        return requestId;
     }
     getExpiries(args) {
+        const requestId = this.nextRequestId();
         this.send({
             type: "GetExpiries",
             data: {
+                request_id: requestId,
                 underlying_mint: args?.underlying_mint,
                 quote_mint: args?.quote_mint,
                 is_put: args?.is_put ?? null,
             },
         });
+        return requestId;
     }
     getTokens(args) {
+        const requestId = this.nextRequestId();
         const data = {
+            request_id: requestId,
             active_only: args?.active_only ?? true,
         };
         this.send({ type: "GetTokens", data });
+        return requestId;
     }
     getMyActiveRfqs() {
         this.ensureAuthenticated();
-        this.send({ type: "GetMyActiveRfqs" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetMyActiveRfqs",
+            data: { request_id: requestId },
+        });
+        return requestId;
     }
     getActiveRfqs() {
-        this.send({ type: "GetActiveRfqs" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetActiveRfqs",
+            data: { request_id: requestId },
+        });
+        return requestId;
+    }
+    logout() {
+        this.send({ type: "Logout" });
     }
     getOrderStatus(orderIdHex) {
         this.ensureAuthenticated();
-        this.send({ type: "GetOrderStatus", data: { order_id: orderIdHex } });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetOrderStatus",
+            data: { request_id: requestId, order_id: orderIdHex },
+        });
+        return requestId;
     }
     cancelRfq(rfqId) {
         this.ensureAuthenticated();
-        this.send({ type: "CancelRfq", data: { rfq_id: rfqId } });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "CancelRfq",
+            data: { rfq_id: rfqId, request_id: requestId },
+        });
+        return requestId;
     }
     submitQuote(quote) {
         this.ensureAuthenticated();
@@ -293,7 +352,12 @@ class ActaWsClient extends TypedEventEmitter {
     }
     cancelQuote(rfqId) {
         this.ensureAuthenticated();
-        this.send({ type: "CancelQuote", data: { rfq_id: rfqId } });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "CancelQuote",
+            data: { rfq_id: rfqId, request_id: requestId },
+        });
+        return requestId;
     }
     subscribe(channels, markets) {
         this.ensureAuthenticated();
@@ -418,6 +482,14 @@ class ActaWsClient extends TypedEventEmitter {
             case "AuthError":
                 this.handleAuthError(message.data.reason, message.data.message);
                 break;
+            case "LogoutSuccess":
+                this.sessionId = null;
+                this.pendingResumeSessionId = null;
+                this.lastAuthSessionId = null;
+                this.startAuthSent = false;
+                this.setConnectionState("connecting");
+                this.emit("logoutSuccess");
+                break;
             case "Snapshot":
                 this.handleSnapshot(message.data);
                 break;
@@ -587,10 +659,12 @@ class ActaWsClient extends TypedEventEmitter {
     }
     /** Taker-only: request current indicative prices for a market + position_type. */
     getIndicativePrices(req) {
+        const requestId = this.nextRequestId();
         this.send({
             type: "GetIndicativePrices",
-            data: req,
+            data: { ...req, request_id: requestId },
         });
+        return requestId;
     }
     /** Maker-only: respond to an indicative request (unsigned, non-binding). */
     sendIndicativePricesResponse(resp) {
@@ -619,8 +693,9 @@ class ActaWsClient extends TypedEventEmitter {
         }
     }
     async beginAuthHandshake() {
-        if (this.pendingResumeSessionId) {
-            this.sendResumeAuth(this.pendingResumeSessionId);
+        const resumeSessionId = this.pendingResumeSessionId ?? this.lastAuthSessionId;
+        if (resumeSessionId) {
+            this.sendResumeAuth(resumeSessionId);
             return;
         }
         await this.sendStartAuth();
@@ -657,6 +732,9 @@ class ActaWsClient extends TypedEventEmitter {
     handleAuthSuccess(sessionId, expiresAt) {
         this.sessionId = sessionId;
         this.pendingResumeSessionId = null;
+        if (expiresAt !== null) {
+            this.lastAuthSessionId = sessionId;
+        }
         this.setConnectionState("authenticated");
         this.emit("authenticated", sessionId, expiresAt);
         if (this.subscribedChannels.size > 0) {
@@ -668,12 +746,13 @@ class ActaWsClient extends TypedEventEmitter {
         }
     }
     handleAuthError(reason, message) {
-        this.emit("authError", reason);
+        this.emit("authError", reason, message);
         if (reason === "session_expired" &&
             this.authRequested &&
             this.authProvider &&
-            this.pendingResumeSessionId) {
+            (this.pendingResumeSessionId || this.lastAuthSessionId)) {
             this.pendingResumeSessionId = null;
+            this.lastAuthSessionId = null;
             this.startAuthSent = false;
             void this.sendStartAuth().catch((err) => {
                 this.emit("error", err);
@@ -789,6 +868,9 @@ class ActaWsClient extends TypedEventEmitter {
             this.log("Cannot send, WebSocket not open");
         }
     }
+    nextRequestId() {
+        return generateRequestId();
+    }
     ensureAuthenticated() {
         if (this.connectionState !== "authenticated") {
             throw new Error("Client is not authenticated");
@@ -883,7 +965,6 @@ class ActaWsClient extends TypedEventEmitter {
         this.helloSent = false;
         this.welcomeReceived = false;
         this.startAuthSent = false;
-        this.pendingResumeSessionId = null;
         this.pendingMessages = [];
         this.setConnectionState("disconnected");
     }

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

@@ -169,13 +169,123 @@ describe("ActaWsClient", () => {
     });
     it("emits authError reason on AuthError", () => {
         const { client } = makeHarness();
-        const reasons = [];
-        client.on("authError", (reason) => reasons.push(reason));
+        const errors = [];
+        client.on("authError", (reason, message) => errors.push({ reason, message }));
         client.handleMessage({
             type: "AuthError",
             data: { reason: "invalid_signature", message: "bad signature bytes" },
         });
-        expect(reasons).toEqual(["invalid_signature"]);
+        expect(errors).toEqual([
+            { reason: "invalid_signature", message: "bad signature bytes" },
+        ]);
+    });
+    it("uses last auth session for resume-first reconnect", async () => {
+        const { client, socket } = makeHarness();
+        const auth = makeAuthProvider("WalletPubkey", "WalletSignature");
+        client.connectAndAuthenticate(auth);
+        let ws = socket();
+        ws.triggerOpen();
+        ws.triggerMessage(WELCOME_MESSAGE);
+        await flushMicrotasks();
+        ws.triggerMessage({
+            type: "AuthSuccess",
+            data: { session_id: "persisted-session", expires_at: 1_710_086_400 },
+        });
+        ws.triggerClose(1006, "network_drop");
+        client.connectAndAuthenticate(auth);
+        ws = socket();
+        ws.triggerOpen();
+        ws.triggerMessage(WELCOME_MESSAGE);
+        await flushMicrotasks();
+        const sentTypes = ws.sent.map((payload) => parseClientMessage(payload).type);
+        expect(sentTypes).toEqual(["Hello", "ResumeAuth"]);
+        const resumeAuth = parseClientMessage(ws.sent[1]);
+        expect(resumeAuth.type).toBe("ResumeAuth");
+        if (resumeAuth.type === "ResumeAuth") {
+            expect(resumeAuth.data.session_id).toBe("persisted-session");
+        }
+    });
+    it("sends Logout and emits logoutSuccess", () => {
+        const { client, socket } = makeHarness();
+        const events = [];
+        client.on("logoutSuccess", () => events.push("logoutSuccess"));
+        client.connectAnonymous();
+        const ws = socket();
+        ws.triggerOpen();
+        ws.triggerMessage(WELCOME_MESSAGE);
+        client.logout();
+        const sent = parseClientMessage(ws.sent[1]);
+        expect(sent.type).toBe("Logout");
+        ws.triggerMessage({ type: "LogoutSuccess", data: {} });
+        expect(events).toEqual(["logoutSuccess"]);
+    });
+    it("adds request_id to public request messages", () => {
+        const { client, socket } = makeHarness();
+        client.connectAnonymous();
+        const ws = socket();
+        ws.triggerOpen();
+        ws.triggerMessage(WELCOME_MESSAGE);
+        const getMarketsId = client.getMarkets();
+        const getMarketDescriptorsId = client.getMarketDescriptors();
+        const getTokensId = client.getTokens();
+        const getExpiriesId = client.getExpiries();
+        const getActiveRfqsId = client.getActiveRfqs();
+        const getIndicativePricesId = client.getIndicativePrices({
+            market: "market-1",
+            position_type: "covered_call",
+        });
+        const sent = ws.sent.slice(1).map(parseClientMessage);
+        const withRequestId = sent.filter((msg) => msg.type !== "Logout");
+        for (const msg of withRequestId) {
+            if ("data" in msg) {
+                const data = msg.data;
+                expect(typeof data.request_id).toBe("string");
+                expect(data.request_id.length).toBeGreaterThan(0);
+            }
+        }
+        expect(sent[0].data.request_id).toBe(getMarketsId);
+        expect(sent[1].data.request_id).toBe(getMarketDescriptorsId);
+        expect(sent[2].data.request_id).toBe(getTokensId);
+        expect(sent[3].data.request_id).toBe(getExpiriesId);
+        expect(sent[4].data.request_id).toBe(getActiveRfqsId);
+        expect(sent[5].data.request_id).toBe(getIndicativePricesId);
+    });
+    it("adds request_id to authenticated request messages", () => {
+        const { client, socket } = makeHarness();
+        client.connectAnonymous();
+        const ws = socket();
+        ws.triggerOpen();
+        ws.triggerMessage(WELCOME_MESSAGE);
+        client.handleMessage({
+            type: "AuthSuccess",
+            data: { session_id: "session-id", expires_at: 1_710_086_400 },
+        });
+        const getPositionsId = client.getPositions();
+        const getMyActiveRfqsId = client.getMyActiveRfqs();
+        const getOrderStatusId = client.getOrderStatus("11".repeat(32));
+        const cancelRfqId = client.cancelRfq("rfq-1");
+        const cancelQuoteId = client.cancelQuote("rfq-2");
+        const sent = ws.sent.slice(1).map(parseClientMessage);
+        const authRequests = sent.filter((msg) => [
+            "GetPositions",
+            "GetMyActiveRfqs",
+            "GetOrderStatus",
+            "CancelRfq",
+            "CancelQuote",
+        ].includes(msg.type));
+        expect(authRequests).toHaveLength(5);
+        for (const msg of authRequests) {
+            if ("data" in msg) {
+                const data = msg.data;
+                expect(typeof data.request_id).toBe("string");
+                expect(data.request_id.length).toBeGreaterThan(0);
+            }
+        }
+        expect(authRequests[0].data.request_id).toBe(getPositionsId);
+        expect(authRequests[1].data.request_id).toBe(getMyActiveRfqsId);
+        expect(authRequests[2].data.request_id).toBe(getOrderStatusId);
+        expect(authRequests[3].data.request_id).toBe(cancelRfqId);
+        expect(authRequests[4].data.request_id).toBe(cancelQuoteId);
     });
     it("drop_oldest policy keeps the latest queued messages", () => {
         const { client, socket } = makeHarness({

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, GlobalStats, MarketDescriptorInfo, MarketInfo, MyActiveRfqInfo, MyActiveRfqsMessage, OrderStatusMessage, PositionInfo, QuoteAcknowledgedMessage, QuoteBestStatusMessage, QuoteCancelledMessage, QuoteMessage, QuoteRefreshRequestedMessage, QuoteOutbidMessage, QuoteReceivedMessage, QuoteSelectedMessage, QuotesUpdateMessage, RfqBroadcastMessage, RfqClosedMessage, RfqCreatedMessage, RfqRequestMessage, RfqAvailableAgainMessage, QuoteExpiredMessage, QuoteFilledMessage, IndicativePricesMessage, IndicativePricesRequestMessage, IndicativePricesResponseMessage, GetIndicativePricesMessage, ServerMessage, SnapshotMessage, StatsDelta, SubscriptionsMessage, TokenInfo, TradeInfo, UuidString, VersionMismatchMessage, WelcomeMessage, WsChannel } from "./types";
+import type { ActiveRfqInfo, ChainEventMessage, GlobalStats, MarketDescriptorInfo, MarketInfo, MyActiveRfqInfo, MyActiveRfqsMessage, OrderStatusMessage, PositionInfo, QuoteAcknowledgedMessage, QuoteBestStatusMessage, QuoteCancelledMessage, QuoteMessage, QuoteRefreshRequestedMessage, QuoteOutbidMessage, QuoteReceivedMessage, QuoteSelectedMessage, QuotesUpdateMessage, RfqBroadcastMessage, RfqClosedMessage, RfqCreatedMessage, RfqRequestMessage, RfqAvailableAgainMessage, QuoteExpiredMessage, QuoteFilledMessage, IndicativePricesMessage, IndicativePricesRequestMessage, IndicativePricesResponseMessage, GetIndicativePricesMessage, RequestId, 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";
@@ -57,7 +57,8 @@ export type ActaWsClientEvents = {
     welcome: (msg: WelcomeMessage) => void;
     versionMismatch: (msg: VersionMismatchMessage) => void;
     authenticated: (sessionId: string, expiresAt: number | null) => void;
-    authError: (reason: string) => void;
+    authError: (reason: string, message?: string) => void;
+    logoutSuccess: () => void;
     disconnected: (code: number, reason: string) => void;
     error: (error: Error) => void;
     stateChange: (state: ConnectionState) => void;
@@ -151,6 +152,7 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
     private pendingResumeSessionId;
     private connectionState;
     private sessionId;
+    private lastAuthSessionId;
     private helloSent;
     private welcomeReceived;
     private pendingMessages;
@@ -195,23 +197,24 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
         orderIdHex: string;
         txBase64: string;
     }): Promise<void>;
-    getPositions(): void;
-    getMarkets(): void;
+    getPositions(): RequestId;
+    getMarkets(): RequestId;
     getMarketDescriptors(args?: {
         active_only?: boolean;
-    }): void;
+    }): RequestId;
     getExpiries(args?: {
         underlying_mint?: Address<string>;
         quote_mint?: Address<string>;
         is_put?: boolean | null;
-    }): void;
+    }): RequestId;
     getTokens(args?: {
         active_only?: boolean;
-    }): void;
-    getMyActiveRfqs(): void;
-    getActiveRfqs(): void;
-    getOrderStatus(orderIdHex: string): void;
-    cancelRfq(rfqId: string): void;
+    }): RequestId;
+    getMyActiveRfqs(): RequestId;
+    getActiveRfqs(): RequestId;
+    logout(): void;
+    getOrderStatus(orderIdHex: string): RequestId;
+    cancelRfq(rfqId: string): RequestId;
     submitQuote(quote: QuoteMessage): void;
     /**
      * Convenience: sign 32-byte `orderId` and send `Quote`.
@@ -228,7 +231,7 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
         orderId: Uint8Array;
         makerSigner: SignerLike;
     }): Promise<void>;
-    cancelQuote(rfqId: string): void;
+    cancelQuote(rfqId: string): RequestId;
     subscribe(channels: WsChannel[], markets?: string[]): void;
     unsubscribe(channels: WsChannel[]): void;
     ping(): void;
@@ -236,7 +239,7 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
     private doConnect;
     private handleMessage;
     /** Taker-only: request current indicative prices for a market + position_type. */
-    getIndicativePrices(req: GetIndicativePricesMessage): void;
+    getIndicativePrices(req: Omit<GetIndicativePricesMessage, "request_id">): RequestId;
     /** Maker-only: respond to an indicative request (unsigned, non-binding). */
     sendIndicativePricesResponse(resp: IndicativePricesResponseMessage): void;
     private handleAuthRequest;
@@ -257,6 +260,7 @@ export declare class ActaWsClient extends TypedEventEmitter<ActaWsClientEvents>
     private handlePositionUpdated;
     private handleChainEvent;
     private send;
+    private nextRequestId;
     private ensureAuthenticated;
     private setConnectionState;
     private startPingInterval;

package/dist/ws/client.js

@@ -70,6 +70,21 @@ function getCloseInfo(ev) {
         reason: typeof rec.reason === "string" ? rec.reason : undefined,
     };
 }
+function generateRequestId() {
+    const cryptoApi = globalThis.crypto;
+    if (cryptoApi?.randomUUID) {
+        return cryptoApi.randomUUID();
+    }
+    if (cryptoApi?.getRandomValues) {
+        const bytes = cryptoApi.getRandomValues(new Uint8Array(16));
+        // RFC4122 v4 bits: version=0100, variant=10xx.
+        bytes[6] = (bytes[6] & 0x0f) | 0x40;
+        bytes[8] = (bytes[8] & 0x3f) | 0x80;
+        const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
+        return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+    }
+    return `req-${Date.now()}-${Math.random().toString(16).slice(2, 10)}`;
+}
 export class ActaWsClient extends TypedEventEmitter {
     ws = null;
     options;
@@ -79,6 +94,7 @@ export class ActaWsClient extends TypedEventEmitter {
     pendingResumeSessionId = null;
     connectionState = "disconnected";
     sessionId = null;
+    lastAuthSessionId = null;
     helloSent = false;
     welcomeReceived = false;
     pendingMessages = [];
@@ -121,6 +137,7 @@ export class ActaWsClient extends TypedEventEmitter {
         this.authProvider = null;
         this.authRequested = false;
         this.pendingResumeSessionId = null;
+        this.lastAuthSessionId = null;
         this.shouldReconnect = this.options.autoReconnect;
         this.doConnect();
     }
@@ -220,47 +237,89 @@ export class ActaWsClient extends TypedEventEmitter {
     }
     getPositions() {
         this.ensureAuthenticated();
-        this.send({ type: "GetPositions" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetPositions",
+            data: { request_id: requestId },
+        });
+        return requestId;
     }
     getMarkets() {
-        this.send({ type: "GetMarkets" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetMarkets",
+            data: { request_id: requestId },
+        });
+        return requestId;
     }
     getMarketDescriptors(args) {
+        const requestId = this.nextRequestId();
         const data = {
+            request_id: requestId,
             active_only: args?.active_only ?? true,
         };
         this.send({ type: "GetMarketDescriptors", data });
+        return requestId;
     }
     getExpiries(args) {
+        const requestId = this.nextRequestId();
         this.send({
             type: "GetExpiries",
             data: {
+                request_id: requestId,
                 underlying_mint: args?.underlying_mint,
                 quote_mint: args?.quote_mint,
                 is_put: args?.is_put ?? null,
             },
         });
+        return requestId;
     }
     getTokens(args) {
+        const requestId = this.nextRequestId();
         const data = {
+            request_id: requestId,
             active_only: args?.active_only ?? true,
         };
         this.send({ type: "GetTokens", data });
+        return requestId;
     }
     getMyActiveRfqs() {
         this.ensureAuthenticated();
-        this.send({ type: "GetMyActiveRfqs" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetMyActiveRfqs",
+            data: { request_id: requestId },
+        });
+        return requestId;
     }
     getActiveRfqs() {
-        this.send({ type: "GetActiveRfqs" });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetActiveRfqs",
+            data: { request_id: requestId },
+        });
+        return requestId;
+    }
+    logout() {
+        this.send({ type: "Logout" });
     }
     getOrderStatus(orderIdHex) {
         this.ensureAuthenticated();
-        this.send({ type: "GetOrderStatus", data: { order_id: orderIdHex } });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetOrderStatus",
+            data: { request_id: requestId, order_id: orderIdHex },
+        });
+        return requestId;
     }
     cancelRfq(rfqId) {
         this.ensureAuthenticated();
-        this.send({ type: "CancelRfq", data: { rfq_id: rfqId } });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "CancelRfq",
+            data: { rfq_id: rfqId, request_id: requestId },
+        });
+        return requestId;
     }
     submitQuote(quote) {
         this.ensureAuthenticated();
@@ -290,7 +349,12 @@ export class ActaWsClient extends TypedEventEmitter {
     }
     cancelQuote(rfqId) {
         this.ensureAuthenticated();
-        this.send({ type: "CancelQuote", data: { rfq_id: rfqId } });
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "CancelQuote",
+            data: { rfq_id: rfqId, request_id: requestId },
+        });
+        return requestId;
     }
     subscribe(channels, markets) {
         this.ensureAuthenticated();
@@ -415,6 +479,14 @@ export class ActaWsClient extends TypedEventEmitter {
             case "AuthError":
                 this.handleAuthError(message.data.reason, message.data.message);
                 break;
+            case "LogoutSuccess":
+                this.sessionId = null;
+                this.pendingResumeSessionId = null;
+                this.lastAuthSessionId = null;
+                this.startAuthSent = false;
+                this.setConnectionState("connecting");
+                this.emit("logoutSuccess");
+                break;
             case "Snapshot":
                 this.handleSnapshot(message.data);
                 break;
@@ -584,10 +656,12 @@ export class ActaWsClient extends TypedEventEmitter {
     }
     /** Taker-only: request current indicative prices for a market + position_type. */
     getIndicativePrices(req) {
+        const requestId = this.nextRequestId();
         this.send({
             type: "GetIndicativePrices",
-            data: req,
+            data: { ...req, request_id: requestId },
         });
+        return requestId;
     }
     /** Maker-only: respond to an indicative request (unsigned, non-binding). */
     sendIndicativePricesResponse(resp) {
@@ -616,8 +690,9 @@ export class ActaWsClient extends TypedEventEmitter {
         }
     }
     async beginAuthHandshake() {
-        if (this.pendingResumeSessionId) {
-            this.sendResumeAuth(this.pendingResumeSessionId);
+        const resumeSessionId = this.pendingResumeSessionId ?? this.lastAuthSessionId;
+        if (resumeSessionId) {
+            this.sendResumeAuth(resumeSessionId);
             return;
         }
         await this.sendStartAuth();
@@ -654,6 +729,9 @@ export class ActaWsClient extends TypedEventEmitter {
     handleAuthSuccess(sessionId, expiresAt) {
         this.sessionId = sessionId;
         this.pendingResumeSessionId = null;
+        if (expiresAt !== null) {
+            this.lastAuthSessionId = sessionId;
+        }
         this.setConnectionState("authenticated");
         this.emit("authenticated", sessionId, expiresAt);
         if (this.subscribedChannels.size > 0) {
@@ -665,12 +743,13 @@ export class ActaWsClient extends TypedEventEmitter {
         }
     }
     handleAuthError(reason, message) {
-        this.emit("authError", reason);
+        this.emit("authError", reason, message);
         if (reason === "session_expired" &&
             this.authRequested &&
             this.authProvider &&
-            this.pendingResumeSessionId) {
+            (this.pendingResumeSessionId || this.lastAuthSessionId)) {
             this.pendingResumeSessionId = null;
+            this.lastAuthSessionId = null;
             this.startAuthSent = false;
             void this.sendStartAuth().catch((err) => {
                 this.emit("error", err);
@@ -786,6 +865,9 @@ export class ActaWsClient extends TypedEventEmitter {
             this.log("Cannot send, WebSocket not open");
         }
     }
+    nextRequestId() {
+        return generateRequestId();
+    }
     ensureAuthenticated() {
         if (this.connectionState !== "authenticated") {
             throw new Error("Client is not authenticated");
@@ -880,7 +962,6 @@ export class ActaWsClient extends TypedEventEmitter {
         this.helloSent = false;
         this.welcomeReceived = false;
         this.startAuthSent = false;
-        this.pendingResumeSessionId = null;
         this.pendingMessages = [];
         this.setConnectionState("disconnected");
     }

package/dist/ws/client.test.js

@@ -167,13 +167,123 @@ describe("ActaWsClient", () => {
     });
     it("emits authError reason on AuthError", () => {
         const { client } = makeHarness();
-        const reasons = [];
-        client.on("authError", (reason) => reasons.push(reason));
+        const errors = [];
+        client.on("authError", (reason, message) => errors.push({ reason, message }));
         client.handleMessage({
             type: "AuthError",
             data: { reason: "invalid_signature", message: "bad signature bytes" },
         });
-        expect(reasons).toEqual(["invalid_signature"]);
+        expect(errors).toEqual([
+            { reason: "invalid_signature", message: "bad signature bytes" },
+        ]);
+    });
+    it("uses last auth session for resume-first reconnect", async () => {
+        const { client, socket } = makeHarness();
+        const auth = makeAuthProvider("WalletPubkey", "WalletSignature");
+        client.connectAndAuthenticate(auth);
+        let ws = socket();
+        ws.triggerOpen();
+        ws.triggerMessage(WELCOME_MESSAGE);
+        await flushMicrotasks();
+        ws.triggerMessage({
+            type: "AuthSuccess",
+            data: { session_id: "persisted-session", expires_at: 1_710_086_400 },
+        });
+        ws.triggerClose(1006, "network_drop");
+        client.connectAndAuthenticate(auth);
+        ws = socket();
+        ws.triggerOpen();
+        ws.triggerMessage(WELCOME_MESSAGE);
+        await flushMicrotasks();
+        const sentTypes = ws.sent.map((payload) => parseClientMessage(payload).type);
+        expect(sentTypes).toEqual(["Hello", "ResumeAuth"]);
+        const resumeAuth = parseClientMessage(ws.sent[1]);
+        expect(resumeAuth.type).toBe("ResumeAuth");
+        if (resumeAuth.type === "ResumeAuth") {
+            expect(resumeAuth.data.session_id).toBe("persisted-session");
+        }
+    });
+    it("sends Logout and emits logoutSuccess", () => {
+        const { client, socket } = makeHarness();
+        const events = [];
+        client.on("logoutSuccess", () => events.push("logoutSuccess"));
+        client.connectAnonymous();
+        const ws = socket();
+        ws.triggerOpen();
+        ws.triggerMessage(WELCOME_MESSAGE);
+        client.logout();
+        const sent = parseClientMessage(ws.sent[1]);
+        expect(sent.type).toBe("Logout");
+        ws.triggerMessage({ type: "LogoutSuccess", data: {} });
+        expect(events).toEqual(["logoutSuccess"]);
+    });
+    it("adds request_id to public request messages", () => {
+        const { client, socket } = makeHarness();
+        client.connectAnonymous();
+        const ws = socket();
+        ws.triggerOpen();
+        ws.triggerMessage(WELCOME_MESSAGE);
+        const getMarketsId = client.getMarkets();
+        const getMarketDescriptorsId = client.getMarketDescriptors();
+        const getTokensId = client.getTokens();
+        const getExpiriesId = client.getExpiries();
+        const getActiveRfqsId = client.getActiveRfqs();
+        const getIndicativePricesId = client.getIndicativePrices({
+            market: "market-1",
+            position_type: "covered_call",
+        });
+        const sent = ws.sent.slice(1).map(parseClientMessage);
+        const withRequestId = sent.filter((msg) => msg.type !== "Logout");
+        for (const msg of withRequestId) {
+            if ("data" in msg) {
+                const data = msg.data;
+                expect(typeof data.request_id).toBe("string");
+                expect(data.request_id.length).toBeGreaterThan(0);
+            }
+        }
+        expect(sent[0].data.request_id).toBe(getMarketsId);
+        expect(sent[1].data.request_id).toBe(getMarketDescriptorsId);
+        expect(sent[2].data.request_id).toBe(getTokensId);
+        expect(sent[3].data.request_id).toBe(getExpiriesId);
+        expect(sent[4].data.request_id).toBe(getActiveRfqsId);
+        expect(sent[5].data.request_id).toBe(getIndicativePricesId);
+    });
+    it("adds request_id to authenticated request messages", () => {
+        const { client, socket } = makeHarness();
+        client.connectAnonymous();
+        const ws = socket();
+        ws.triggerOpen();
+        ws.triggerMessage(WELCOME_MESSAGE);
+        client.handleMessage({
+            type: "AuthSuccess",
+            data: { session_id: "session-id", expires_at: 1_710_086_400 },
+        });
+        const getPositionsId = client.getPositions();
+        const getMyActiveRfqsId = client.getMyActiveRfqs();
+        const getOrderStatusId = client.getOrderStatus("11".repeat(32));
+        const cancelRfqId = client.cancelRfq("rfq-1");
+        const cancelQuoteId = client.cancelQuote("rfq-2");
+        const sent = ws.sent.slice(1).map(parseClientMessage);
+        const authRequests = sent.filter((msg) => [
+            "GetPositions",
+            "GetMyActiveRfqs",
+            "GetOrderStatus",
+            "CancelRfq",
+            "CancelQuote",
+        ].includes(msg.type));
+        expect(authRequests).toHaveLength(5);
+        for (const msg of authRequests) {
+            if ("data" in msg) {
+                const data = msg.data;
+                expect(typeof data.request_id).toBe("string");
+                expect(data.request_id.length).toBeGreaterThan(0);
+            }
+        }
+        expect(authRequests[0].data.request_id).toBe(getPositionsId);
+        expect(authRequests[1].data.request_id).toBe(getMyActiveRfqsId);
+        expect(authRequests[2].data.request_id).toBe(getOrderStatusId);
+        expect(authRequests[3].data.request_id).toBe(cancelRfqId);
+        expect(authRequests[4].data.request_id).toBe(cancelQuoteId);
     });
     it("drop_oldest policy keeps the latest queued messages", () => {
         const { client, socket } = makeHarness({

package/dist/ws/types.d.ts

@@ -83,6 +83,8 @@ export type ClientMessage = {
     data: {
         session_id: string;
     };
+} | {
+    type: "Logout";
 } | {
     type: "AuthChallenge";
     data: AuthChallengeData;
@@ -93,6 +95,7 @@ export type ClientMessage = {
     type: "CancelQuote";
     data: {
         rfq_id: UuidString;
+        request_id: RequestId;
     };
 } | {
     type: "IndicativePricesResponse";
@@ -113,14 +116,17 @@ export type ClientMessage = {
     type: "CancelRfq";
     data: {
         rfq_id: UuidString;
+        request_id: RequestId;
     };
 } | {
     type: "GetIndicativePrices";
     data: GetIndicativePricesMessage;
 } | {
     type: "GetPositions";
+    data: GetPositionsMessage;
 } | {
     type: "GetMarkets";
+    data: GetMarketsMessage;
 } | {
     type: "GetMarketDescriptors";
     data: GetMarketDescriptorsMessage;
@@ -132,11 +138,13 @@ export type ClientMessage = {
     data: GetTokensMessage;
 } | {
     type: "GetMyActiveRfqs";
+    data: GetMyActiveRfqsMessage;
 } | {
     type: "GetOrderStatus";
     data: GetOrderStatusMessage;
 } | {
     type: "GetActiveRfqs";
+    data: GetActiveRfqsMessage;
 } | {
     type: "GetMakerPositions";
     data: GetMakerPositionsMessage;
@@ -148,8 +156,10 @@ export type ClientMessage = {
     data: GetMarketsForMakerMessage;
 } | {
     type: "GetMakerBalances";
+    data: GetMakerBalancesMessage;
 } | {
     type: "GetSubscriptions";
+    data: GetSubscriptionsMessage;
 } | {
     type: "CancelAllQuotes";
     data: CancelAllQuotesMessage;
@@ -168,29 +178,54 @@ export type ClientMessage = {
     };
 };
 export type GetMarketDescriptorsMessage = {
+    request_id: RequestId;
     active_only?: boolean;
 };
 export type GetTokensMessage = {
+    request_id: RequestId;
     active_only?: boolean;
 };
 export type GetExpiriesMessage = {
+    request_id: RequestId;
     underlying_mint?: Address<string>;
     quote_mint?: Address<string>;
     is_put?: boolean | null;
 };
+export type GetPositionsMessage = {
+    request_id: RequestId;
+};
+export type GetMarketsMessage = {
+    request_id: RequestId;
+};
+export type GetMyActiveRfqsMessage = {
+    request_id: RequestId;
+};
+export type GetActiveRfqsMessage = {
+    request_id: RequestId;
+};
+export type GetMakerBalancesMessage = {
+    request_id: RequestId;
+};
+export type GetSubscriptionsMessage = {
+    request_id: RequestId;
+};
 export type GetOrderStatusMessage = {
+    request_id: RequestId;
     order_id: OrderIdHex32;
 };
 export type GetMakerPositionsMessage = {
+    request_id: RequestId;
     market?: string;
     underlying_mint?: string;
     status?: string[];
     min_expiry_ts?: WsU64;
 };
 export type GetMyQuotesMessage = {
+    request_id: RequestId;
     active_only?: boolean;
 };
 export type GetMarketsForMakerMessage = {
+    request_id: RequestId;
     underlying_mints?: string[];
     quote_mints?: string[];
     min_expiry_ts?: WsU64;
@@ -199,6 +234,7 @@ export type GetMarketsForMakerMessage = {
     include_stats?: boolean;
 };
 export type CancelAllQuotesMessage = {
+    request_id: RequestId;
     market?: string;
 };
 export type AuthChallengeData = {
@@ -268,6 +304,9 @@ export type ServerMessage = {
         reason: ErrorMessage;
         message?: string;
     };
+} | {
+    type: "LogoutSuccess";
+    data: Record<string, never>;
 } | {
     type: "RfqCreated";
     data: RfqCreatedMessage;
@@ -319,6 +358,7 @@ export type ServerMessage = {
 } | {
     type: "ActiveRfqs";
     data: {
+        request_id: RequestId;
         rfqs: ActiveRfqInfo[];
     };
 } | {
@@ -625,11 +665,14 @@ export type QuoteExpiredMessage = {
     reason: QuoteExpiredReason;
 };
 export type MakerPositionsMessage = {
+    request_id: RequestId;
     positions: MakerPositionInfo[];
 };
 export type MakerPositionInfo = {
     pda: string;
     market: string;
+    underlying_mint: string;
+    quote_mint: string;
     position_type: PositionType;
     status: PositionStatus;
     strike: WsU64;
@@ -642,6 +685,7 @@ export type MakerPositionInfo = {
     expiry_ts: WsU64;
 };
 export type MyQuotesMessage = {
+    request_id: RequestId;
     quotes: MakerQuoteInfo[];
 };
 export type MakerQuoteInfo = {
@@ -657,6 +701,7 @@ export type MakerQuoteInfo = {
     created_at: WsU64;
 };
 export type MakerMarketsMessage = {
+    request_id: RequestId;
     markets: MakerMarketInfo[];
 };
 export type MakerMarketInfo = {
@@ -675,6 +720,7 @@ export type MarketStats = {
     trades_24h: WsU32;
 };
 export type MakerBalancesMessage = {
+    request_id: RequestId;
     balances_by_mint: Record<string, MakerMintBalance>;
 };
 export type MakerMintBalance = {
@@ -683,6 +729,7 @@ export type MakerMintBalance = {
     available: WsU64;
 };
 export type SubscriptionsMessage = {
+    request_id: RequestId;
     channels: WsChannel[];
     markets?: string[];
 };
@@ -702,10 +749,12 @@ export type IndicativePricesResponseMessage = {
     }>;
 };
 export type GetIndicativePricesMessage = {
+    request_id: RequestId;
     market: Address<string>;
     position_type: PositionType;
 };
 export type IndicativePricesMessage = {
+    request_id: RequestId;
     market: Address<string>;
     position_type: PositionType;
     updated_at: WsU64;
@@ -746,18 +795,23 @@ export type QuotesUpdateMessage = {
     quotes: QuoteReceivedMessage[];
 };
 export type PositionsMessage = {
+    request_id: RequestId;
     positions: PositionInfo[];
 };
 export type MarketsMessage = {
+    request_id: RequestId;
     markets: MarketInfo[];
 };
 export type MarketDescriptorsMessage = {
+    request_id: RequestId;
     markets: MarketDescriptorInfo[];
 };
 export type ExpiriesMessage = {
+    request_id: RequestId;
     expiries_ts: WsU64[];
 };
 export type TokensMessage = {
+    request_id: RequestId;
     underlyings: TokenInfo[];
     quotes_by_underlying: Record<Address<string>, TokenInfo[]>;
 };
@@ -769,9 +823,11 @@ export type SnapshotMessage = {
     markets: MarketInfo[];
 };
 export type MyActiveRfqsMessage = {
+    request_id: RequestId;
     rfqs: MyActiveRfqInfo[];
 };
 export type OrderStatusMessage = {
+    request_id: RequestId;
     order_id: OrderIdHex32;
     status: OrderStatusValue;
     rfq_id?: UuidString | null;
@@ -817,6 +873,8 @@ export type RfqOrderOption = {
 export type PositionInfo = {
     pda: string;
     market: string;
+    underlying_mint: string;
+    quote_mint: string;
     position_type: PositionType;
     status: PositionStatus;
     strike: WsU64;

package/package.json

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