Skip to content

feat(websocket): add functionality to remove listeners #1383

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
wants to merge 4 commits into from
Closed

feat(websocket): add functionality to remove listeners #1383

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a010e04
[websocket] add functionality to remove listeners
nvzeppelin May 29, 2024
d4e0cb1
Merge branch 'tauri-apps:v2' into v2
nvzeppelin Aug 19, 2024
d768bdd
Merge branch 'tauri-apps:v2' into v2
nvzeppelin Aug 28, 2024
395229e
Resolve merge conflict
nvzeppelin Jan 11, 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
35 changes: 24 additions & 11 deletions plugins/websocket/guest-js/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,26 +57,27 @@ export type Message =
| MessageKind<'Close', CloseFrame | null>

export default class WebSocket {
id: number
private readonly listeners: Array<(arg: Message) => void>
private nextListenerId: number = 0;
id: number;
private readonly listeners: Array<{listener:(arg: Message) => void, id: number}>;

constructor(id: number, listeners: Array<(arg: Message) => void>) {
this.id = id
this.listeners = listeners
constructor(id: number, listeners: Array<{listener:(arg: Message) => void, id: number}>) {
this.id = id;
this.listeners = listeners;
}

static async connect(
url: string,
config?: ConnectionConfig
): Promise<WebSocket> {
const listeners: Array<(arg: Message) => void> = []
const listeners: Array<{listener:(arg: Message) => void, id: number}>)

const onMessage = new Channel<Message>()
onMessage.onmessage = (message: Message): void => {
listeners.forEach((l) => {
l(message)
})
}
l.listener(message);
});
};

if (config?.headers) {
config.headers = Array.from(new Headers(config.headers).entries())
Expand All @@ -89,8 +90,20 @@ export default class WebSocket {
}).then((id) => new WebSocket(id, listeners))
}

addListener(cb: (arg: Message) => void): void {
this.listeners.push(cb)
addListener(cb: (arg: Message) => void): number {
this.listeners.push({listener: cb, id: this.nextListenerId});
this.nextListenerId+=1;
return this.nextListenerId-1;
}

removeListener(id: number): boolean {
if (this.listeners.findIndex(e=>e.id===id)===-1) return false;
let tempListeners = this.listeners.filter(e => e.id !== id);
while (this.listeners.length!==0) this.listeners.pop();
for (const element of tempListeners) {
this.listeners.push(element);
}
return true;
}

async send(message: Message | string | number[]): Promise<void> {
Expand Down