Skip to content

Commit

Permalink
fix: Use ES6 class methods to prevent broken this references, exit …
Browse files Browse the repository at this point in the history
…after close event in TCP TS example
  • Loading branch information
pojntfx committed Dec 30, 2023
1 parent bf8c422 commit 4fa552c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 17 deletions.
6 changes: 5 additions & 1 deletion ts/ltsrpc-example-tcp-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ const { remote, close } = linkTCPSocket(
(v) => v,
(v) => v
);
socket.on("close", close);
socket.on("close", () => {
close();

exit(0);
});

console.log("Connected to", raddr);

Expand Down
30 changes: 14 additions & 16 deletions ts/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,22 @@ class WebSocketRequestResponseReader<T> implements IRequestResponseReader<T> {
};
}

open() {
this.socket.addEventListener("message", this.handler);
}
open = () => this.socket.addEventListener("message", this.handler);

close() {
this.socket.removeEventListener("message", this.handler);
}
close = () => this.socket.removeEventListener("message", this.handler);

on(event: "request" | "response", listener: (message: T) => void): this {
on = (
event: "request" | "response",
listener: (message: T) => void
): this => {
if (event === "request") {
this.requestListener = listener;
} else if (event === "response") {
this.responseListener = listener;
}

return this;
}
};
}

class TCPSocketRequestResponseReader<T> implements IRequestResponseReader<T> {
Expand All @@ -105,23 +104,22 @@ class TCPSocketRequestResponseReader<T> implements IRequestResponseReader<T> {
};
}

open() {
this.socket.addListener("data", this.handler);
}
open = () => this.socket.addListener("data", this.handler);

close() {
this.socket.removeListener("data", this.handler);
}
close = () => this.socket.removeListener("data", this.handler);

on(event: "request" | "response", listener: (message: T) => void): this {
on = (
event: "request" | "response",
listener: (message: T) => void
): this => {
if (event === "request") {
this.requestListener = listener;
} else if (event === "response") {
this.responseListener = listener;
}

return this;
}
};
}

/**
Expand Down

0 comments on commit 4fa552c

Please sign in to comment.