Skip to content

fix: clean up subscriptions and dataStore on unsubscribe in ws-client #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
realfishsam wants to merge 1 commit into from
Closed

fix: clean up subscriptions and dataStore on unsubscribe in ws-client #574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion sdks/typescript/pmxt/ws-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,14 @@ export class SidecarWsClient {
): Promise<Record<string, any>> {
const symbols: string[] = Array.isArray(args[0]) ? args[0] : [];

// Deduplicate via activeSubs -- reuse existing subscription for the same symbol set
const subKey = `${method}:${[...symbols].sort().join(",")}`;
const existingId = this.activeSubs.get(subKey);
if (existingId && this.subscriptions.has(existingId)) {
await this.waitForData(existingId, timeoutMs);
return this.collectBatchResult(existingId, symbols);
}

await this.ensureConnected();

const requestId = `req-${Math.random().toString(36).slice(2, 14)}`;
Expand All @@ -266,6 +274,7 @@ export class SidecarWsClient {
reject: null,
};
this.subscriptions.set(requestId, sub);
this.activeSubs.set(subKey, requestId);

const message: Record<string, any> = {
id: requestId,
Expand All @@ -283,19 +292,31 @@ export class SidecarWsClient {
// Wait for first data event
await this.waitForData(requestId, timeoutMs);

// Collect per-symbol data
return this.collectBatchResult(requestId, symbols);
}

/**
* Collect per-symbol data for a batch subscription and clean up
* consumed dataStore entries to prevent unbounded growth.
*/
private collectBatchResult(
requestId: string,
symbols: readonly string[],
): Record<string, any> {
const result: Record<string, any> = {};
for (const symbol of symbols) {
const storeKey = `${requestId}:${symbol}`;
const data = this.dataStore.get(storeKey);
if (data !== undefined) {
result[symbol] = data;
this.dataStore.delete(storeKey);
}
}

// If no per-symbol data, return the single data event as-is
if (Object.keys(result).length === 0) {
const data = this.dataStore.get(requestId);
this.dataStore.delete(requestId);
if (data && typeof data === "object") {
return data;
}
Expand All @@ -306,6 +327,9 @@ export class SidecarWsClient {

close(): void {
this.closed = true;
this.subscriptions.clear();
this.dataStore.clear();
this.activeSubs.clear();
if (this.ws) {
try {
this.ws.close();
Expand Down
Loading