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

API mostly working aside from LSP

This commit is contained in:
Radon Rosborough 2021-08-14 18:37:07 -07:00
parent c6a22e2793
commit e197ad9c72
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
backend/api.js
View File

@ -3,7 +3,6 @@ import path from "path";
import process from "process"; import process from "process";
import WebSocket from "ws"; import WebSocket from "ws";
import pty from "node-pty";
import pQueue from "p-queue"; import pQueue from "p-queue";
const PQueue = pQueue.default; const PQueue = pQueue.default;
import rpc from "vscode-jsonrpc"; import rpc from "vscode-jsonrpc";
@ -58,13 +57,11 @@ export class Session {
try { try {
allSessions.add(this); allSessions.add(this);
const containerArgs = this.privilegedSession(); const containerArgs = this.privilegedSession();
const containerPty = pty.spawn(containerArgs[0], containerArgs.slice(1), { const containerProc = spawn(containerArgs[0], containerArgs.slice(1));
name: "xterm-color",
});
this.container = { this.container = {
pty: containerPty, proc: containerProc,
}; };
containerPty.on("close", async (code, signal) => { containerProc.on("close", async (code, signal) => {
this.send({ this.send({
event: "serviceFailed", event: "serviceFailed",
service: "container", service: "container",
@ -73,21 +70,28 @@ export class Session {
}); });
await this.teardown(); await this.teardown();
}); });
containerPty.on("error", (err) => containerProc.on("error", (err) =>
this.send({ this.send({
event: "serviceFailed", event: "serviceFailed",
service: "container", service: "container",
error: `${err}`, error: `${err}`,
}) })
); );
containerProc.stderr.on("data", (data) =>
this.send({
event: "serviceLog",
service: "container",
output: data.toString("utf8"),
})
);
let buffer = ""; let buffer = "";
await new Promise((resolve) => { await new Promise((resolve) => {
containerPty.on("data", (data) => { containerProc.stdout.on("data", (data) => {
buffer += data; buffer += data.toString();
let idx; let idx;
while ((idx = buffer.indexOf("\r\n")) !== -1) { while ((idx = buffer.indexOf("\n")) !== -1) {
const line = buffer.slice(0, idx); const line = buffer.slice(0, idx);
buffer = buffer.slice(idx + 2); buffer = buffer.slice(idx + 1);
if (line === "riju: container ready") { if (line === "riju: container ready") {
resolve(); resolve();
} else { } else {
@ -237,7 +241,7 @@ export class Session {
this.log("terminalInput ignored because term is null"); this.log("terminalInput ignored because term is null");
break; break;
} }
this.term.pty.write(msg.input); this.term.pty.stdin.write(msg.input);
break; break;
case "runCode": case "runCode":
if (typeof msg.code !== "string") { if (typeof msg.code !== "string") {
@ -326,17 +330,24 @@ export class Session {
await this.writeCode(code); await this.writeCode(code);
const termArgs = this.privilegedPty(cmdline); const termArgs = this.privilegedPty(cmdline);
const term = { const term = {
pty: pty.spawn(termArgs[0], termArgs.slice(1), { pty: spawn(termArgs[0], termArgs.slice(1)),
name: "xterm-color",
}),
live: true, live: true,
}; };
this.term = term; this.term = term;
this.term.pty.on("data", (data) => { this.term.pty.stdout.on("data", (data) => {
// Capture term in closure so that we don't keep sending output // Capture term in closure so that we don't keep sending output
// from the old pty even after it's been killed (see ghci). // from the old pty even after it's been killed (see ghci).
if (term.live) { if (term.live) {
this.send({ event: "terminalOutput", output: data }); this.send({ event: "terminalOutput", output: data.toString() });
}
});
this.term.pty.stderr.on("data", (data) => {
if (term.live) {
this.send({
event: "serviceLog",
service: "pty",
output: data.toString("utf8"),
});
} }
}); });
this.term.pty.on("exit", (code, signal) => { this.term.pty.on("exit", (code, signal) => {
@ -441,7 +452,7 @@ export class Session {
this.log(`Tearing down session`); this.log(`Tearing down session`);
this.tearingDown = true; this.tearingDown = true;
if (this.container) { if (this.container) {
this.container.pty.kill(); this.container.proc.kill();
} }
allSessions.delete(this); allSessions.delete(this);
this.ws.terminate(); this.ws.terminate();