Skip to content
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

Jump to bottom

perf(client): Focus subscription message listeners on id #150

Merged
merged 10 commits into from
Mar 29, 2021
Merged

perf(client): Focus subscription message listeners on id #150

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d06d4ed
Update client.ts
michelepra Mar 26, 2021
60908e6
Update client.ts
michelepra Mar 26, 2021
ff04549
Update client.ts
michelepra Mar 26, 2021
cc26ea3
Merge branch 'master' of https://github.com/michelepra/graphql-ws
michelepra Mar 26, 2021
e32831d
Update client.ts
michelepra Mar 26, 2021
d3275e4
Update client.ts
michelepra Mar 26, 2021
d8d2f65
refactor: prefer return
enisdenjo Mar 29, 2021
a5c6a7c
refactor: message emit first in line
enisdenjo Mar 29, 2021
b6c743f
refactor: one liner
enisdenjo Mar 29, 2021
668e8ec
refactor: simpler prop check and one liner
enisdenjo Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 25 additions & 14 deletions src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,15 +293,30 @@ export function createClient(options: ClientOptions): Client {

// websocket status emitter, subscriptions are handled differently
const emitter = (() => {
const message = (() => {
const listeners: { [key: string]: EventMessageListener } = {};
return {
on(id: string, listener: EventMessageListener) {
listeners[id] = listener;
return () => {
delete listeners[id];
};
},
emit(message: Message) {
if ('id' in message) listeners[message.id]?.(message);
},
};
})();
const listeners: { [event in Event]: EventListener<event>[] } = {
connecting: on?.connecting ? [on.connecting] : [],
connected: on?.connected ? [on.connected] : [],
message: on?.message ? [on.message] : [],
message: on?.message ? [message.emit, on.message] : [message.emit],
closed: on?.closed ? [on.closed] : [],
error: on?.error ? [on.error] : [],
};

return {
onMessage: message.on,
on<E extends Event>(event: E, listener: EventListener<E>) {
const l = listeners[event] as EventListener<E>[];
l.push(listener);
Expand Down Expand Up @@ -518,28 +533,24 @@ export function createClient(options: ClientOptions): Client {
// if completed while waiting for connect, release the connection lock right away
if (completed) return release();

const unlisten = emitter.on('message', (message) => {
const unlisten = emitter.onMessage(id, (message) => {
switch (message.type) {
case MessageType.Next: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
if (message.id === id) sink.next(message.payload as any);
sink.next(message.payload as any);
return;
}
case MessageType.Error: {
if (message.id === id) {
completed = true;
sink.error(message.payload);
releaser();
// TODO-db-201025 calling releaser will complete the sink, meaning that both the `error` and `complete` will be
// called. neither promises or observables care; once they settle, additional calls to the resolvers will be ignored
}
completed = true;
sink.error(message.payload);
releaser();
// TODO-db-201025 calling releaser will complete the sink, meaning that both the `error` and `complete` will be
// called. neither promises or observables care; once they settle, additional calls to the resolvers will be ignored
return;
}
case MessageType.Complete: {
if (message.id === id) {
completed = true;
releaser(); // release completes the sink
}
completed = true;
releaser(); // release completes the sink
return;
}
}
Expand Down