MirrorMirror
/
riju
mirror of https://github.com/radian-software/riju.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Catch more errors

This commit is contained in:
Radon Rosborough 2021-08-26 18:46:04 -07:00
parent d3ab5d6336
commit c9af422461
1 changed files with 66 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
backend/api.js
View File

@ -417,69 +417,81 @@ export class Session {
};
stopLSP = async () => {
if (this.lsp) {
this.lsp.stopping = true;
this.lsp.proc.kill();
this.lsp = null;
try {
if (this.lsp) {
this.lsp.stopping = true;
this.lsp.proc.kill();
this.lsp = null;
}
} catch (err) {
logError(err);
}
};
startLSP = async () => {
if (this.config.lsp) {
await this.stopLSP();
if (this.config.lsp.setup) {
await this.run(this.privilegedExec(this.config.lsp.setup));
try {
if (this.config.lsp) {
await this.stopLSP();
if (this.config.lsp.setup) {
await this.run(this.privilegedExec(this.config.lsp.setup));
}
const lspArgs = this.privilegedExec(this.config.lsp.start);
const lspProc = spawn(lspArgs[0], lspArgs.slice(1));
const lsp = {
proc: lspProc,
reader: new rpc.StreamMessageReader(lspProc.stdout),
writer: new rpc.StreamMessageWriter(lspProc.stdin),
live: true,
stopping: false,
};
this.lsp = lsp;
this.lsp.reader.listen((data) => {
this.send({ event: "lspOutput", output: data });
});
lspProc.stderr.on("data", (data) => {
if (lsp.live) {
this.send({
event: "serviceLog",
service: "lsp",
output: data.toString("utf8"),
});
}
});
lspProc.on("close", (code, signal) => {
if (lsp.stopping) {
this.send({
event: "lspStopped",
});
} else {
this.send({
event: "serviceFailed",
service: "lsp",
error: `Exited with status ${signal || code}`,
code: signal || code,
});
}
});
lspProc.on("error", (err) =>
this.send({ event: "serviceFailed", service: "lsp", error: `${err}` })
);
this.send({ event: "lspStarted", root: this.homedir });
}
const lspArgs = this.privilegedExec(this.config.lsp.start);
const lspProc = spawn(lspArgs[0], lspArgs.slice(1));
const lsp = {
proc: lspProc,
reader: new rpc.StreamMessageReader(lspProc.stdout),
writer: new rpc.StreamMessageWriter(lspProc.stdin),
live: true,
stopping: false,
};
this.lsp = lsp;
this.lsp.reader.listen((data) => {
this.send({ event: "lspOutput", output: data });
});
lspProc.stderr.on("data", (data) => {
if (lsp.live) {
this.send({
event: "serviceLog",
service: "lsp",
output: data.toString("utf8"),
});
}
});
lspProc.on("close", (code, signal) => {
if (lsp.stopping) {
this.send({
event: "lspStopped",
});
} else {
this.send({
event: "serviceFailed",
service: "lsp",
error: `Exited with status ${signal || code}`,
code: signal || code,
});
}
});
lspProc.on("error", (err) =>
this.send({ event: "serviceFailed", service: "lsp", error: `${err}` })
);
this.send({ event: "lspStarted", root: this.homedir });
} catch (err) {
logError(err);
}
};
ensure = async (cmd) => {
const code = (
await this.run(this.privilegedExec(cmd), {
check: false,
})
).code;
this.send({ event: "ensured", code });
try {
const code = (
await this.run(this.privilegedExec(cmd), {
check: false,
})
).code;
this.send({ event: "ensured", code });
} catch (err) {
logError(err);
}
};
teardown = async () => {