Skip to content

Allow overriding subscriptions #68

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

Draft
syyyr wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Allow overriding subscriptions #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2938e11
Allow overriding subscriptions
syyyr Aug 6, 2025
e715f66
Anchor compatible zod version
syyyr Aug 6, 2025
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "libshv-js",
"version": "3.21.0",
"version": "3.22.0",
"description": "Typescript implementation of libshv",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down Expand Up @@ -41,7 +41,7 @@
"js-pkce": "^2.0.0",
"@vueuse/core": "^13.5.0",
"vue": "^3.5.18",
"zod": "^4.0.5"
"zod": "4.0.5 - 4.0.10"
},
"devDependencies": {
"@typescript-eslint/parser": "^8.38.0",
Expand Down
11 changes: 6 additions & 5 deletions src/ws-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,11 +544,6 @@ class WsClient {
}

subscribe(subscriber: string, path: string, method: string, callback: SubscriptionCallback) {
if (this.subscriptions.some(val => val.subscriber === subscriber && val.path === path && val.method === method)) {
this.logDebug(`Already subscribed {$path}:${method} for subscriber ${subscriber}`);
return;
}

// If this path:method has not been subscribed on the broker, do it now
if (!this.subscriptions.some(val => val.path === path && val.method === method)) {
this.callRpcMethod('.broker/app', 'subscribe', makeMap({
Expand All @@ -558,6 +553,12 @@ class WsClient {
});
}

const oldSubscriber = this.subscriptions.findIndex(val => val.subscriber === subscriber && val.path === path && val.method === method);
if (oldSubscriber !== -1) {
this.logDebug(`Removing previous subscription {$path}:${method} for subscriber ${subscriber}`);
this.subscriptions.splice(oldSubscriber, 1);
}

this.subscriptions.push({
subscriber,
path,
Expand Down