chipmunkmc/gamja
1
0
Fork 0
mirror of https://codeberg.org/emersion/gamja.git synced 2024-11-14 19:05:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/client: reject Client.roundtrip promise on disconnect

Browse source
This commit is contained in:
Simon Ser 2021-06-21 00:18:17 +02:00
parent edbf294380
commit c187eac3c8
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/client.js
View file

@ -519,6 +519,8 @@ export default class Client extends EventTarget {
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let removeEventListeners;
let handleMessage = (event) => { let handleMessage = (event) => {
let msg = event.detail.message; let msg = event.detail.message;
@ -531,18 +533,31 @@ export default class Client extends EventTarget {
try { try {
result = done(msg); result = done(msg);
} catch (err) { } catch (err) {
this.removeEventListener("message", handleMessage); removeEventListeners();
reject(err); reject(err);
} }
if (result) { if (result) {
this.removeEventListener("message", handleMessage); removeEventListeners();
resolve(result); resolve(result);
} }
// TODO: handle end of labeled response somehow // TODO: handle end of labeled response somehow
}; };
let handleStatus = () => {
if (this.status === Client.Status.DISCONNECTED) {
removeEventListeners();
reject(new Error("Connection closed"));
}
};
removeEventListeners = () => {
this.removeEventListener("message", handleMessage);
this.removeEventListener("status", handleStatus);
};
this.addEventListener("message", handleMessage); this.addEventListener("message", handleMessage);
this.addEventListener("status", handleStatus);
this.send(msg); this.send(msg);
}); });
} }