Skip to content

fix(ws): report actually subscribed channels in legacy subscribe response #163

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

Open
0x-SquidSol wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ws): report actually subscribed channels in legacy subscribe response #163

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
15 changes: 11 additions & 4 deletions src/routes/ws.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,17 +926,24 @@ export function setupWebSocket(server: Server): WebSocketServer {
message: "Please use channels array. Subscribing to all channels for this slab."
}));

const subscribed: string[] = [];
for (const channel of channels) {
if (client.subscriptions.has(channel)) continue;
if (globalSubscriptionCount >= MAX_GLOBAL_SUBSCRIPTIONS) break;
if (client.subscriptions.size >= MAX_SUBSCRIPTIONS_PER_CLIENT) break;

client.subscriptions.add(channel);
globalSubscriptionCount++;
subscribed.push(channel);
}

if (subscribed.length > 0) {
addClientToSlab(client, sanitized);
}
ws.send(JSON.stringify({ type: "subscribed", slabAddress: sanitized, channels: subscribed }));
if (subscribed.length < channels.length) {
ws.send(JSON.stringify({ type: "error", message: "Subscription limit reached — some channels were not subscribed" }));
}

addClientToSlab(client, sanitized);
ws.send(JSON.stringify({ type: "subscribed", slabAddress: sanitized, channels }));
}
// Handle unsubscribe with channels array
else if (msg.type === "unsubscribe" && msg.channels && Array.isArray(msg.channels)) {
Expand Down
Loading