a/code-server-2
1
0
Fork 0
mirror of https://git.tuxpa.in/a/code-server.git synced 2024-12-26 12:15:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix cleanup after getting message from vscode

Browse Source
This commit is contained in:
Asher 2020-11-12 11:16:21 -06:00
parent 79478eb89f
commit 72931edcf0
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/node/vscode.ts
View File

@ -123,8 +123,19 @@ export class VscodeProvider {
fn: (message: ipc.VscodeMessage) => message is T,
): Promise<T> {
return new Promise((resolve, _reject) => {
const reject = (error: Error) => {
const cleanup = () => {
proc.off("error", reject)
proc.off("exit", onExit)
clearTimeout(timeout)
}
const timeout = setTimeout(() => {
cleanup()
_reject(new Error("timed out"))
}, this.timeoutInterval)
const reject = (error: Error) => {
cleanup()
_reject(error)
}
@ -132,16 +143,10 @@ export class VscodeProvider {
reject(new Error(`VS Code exited unexpectedly with code ${code}`))
}
const timeout = setTimeout(() => {
reject(new Error("timed out"))
}, this.timeoutInterval)
proc.on("message", (message: ipc.VscodeMessage) => {
logger.debug("got message from vscode", field("message", message))
proc.off("error", reject)
proc.off("exit", onExit)
if (fn(message)) {
clearTimeout(timeout)
cleanup()
resolve(message)
}
})