From 976adad108efab2897d7d8d054c521c7f5246a00 Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon@intuitiveexplanations.com>
Date: Wed, 4 Jan 2023 19:44:55 -0700
Subject: [PATCH] Fix things, get stdout working seemingly

---
 backend/k8s.js         | 24 +++++++++++++++---------
 backend/sandbox-k8s.js | 21 ++++++++++++++-------
 backend/util.js        |  2 +-
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/backend/k8s.js b/backend/k8s.js
index ca5b450..565a153 100644
--- a/backend/k8s.js
+++ b/backend/k8s.js
@@ -289,20 +289,20 @@ export async function initUserSession({ watcher, podName, proxyInfo }) {
             if (pty) {
               cmdline = ["/riju-bin/ptyify", ...cmdline];
             }
+            const params = new URLSearchParams();
+            for (const arg of cmdline) {
+              params.append("cmdline", arg);
+            }
             let conn;
             if (!proxyInfo) {
               conn = new WebSocket(
-                `ws://${podIP}:869/exec?${new URLSearchParams({
-                  cmdline,
-                }).toString()}`
+                `ws://${podIP}:869/exec?${params.toString()}`
               );
             } else {
               conn = new WebSocket(
                 `${proxyInfo.wsProtocol}://${proxyInfo.host}:${
                   proxyInfo.port
-                }/${podIP}/exec?${new URLSearchParams({
-                  cmdline,
-                }).toString()}`,
+                }/${podIP}/exec?${params.toString()}`,
                 {
                   headers: {
                     Authorization: `Basic ${Buffer.from(
@@ -329,10 +329,10 @@ export async function initUserSession({ watcher, podName, proxyInfo }) {
               }
               switch (event) {
                 case "stdout":
-                  on.stdout(data);
+                  on.stdout(Buffer.from(data, "base64"));
                   break;
                 case "stderr":
-                  on.stderr(data);
+                  on.stderr(Buffer.from(data, "base64"));
                   break;
                 case "exit":
                   on.exit(exitStatus);
@@ -355,8 +355,14 @@ export async function initUserSession({ watcher, podName, proxyInfo }) {
             });
             return {
               stdin: {
+                // data should be of type Buffer
                 write: (data) =>
-                  conn.send(JSON.stringify({ event: "stdin", data })),
+                  conn.send(
+                    JSON.stringify({
+                      event: "stdin",
+                      data: data.toString("base64"),
+                    })
+                  ),
               },
             };
           },
diff --git a/backend/sandbox-k8s.js b/backend/sandbox-k8s.js
index e70052f..8174e13 100644
--- a/backend/sandbox-k8s.js
+++ b/backend/sandbox-k8s.js
@@ -2,6 +2,9 @@ import { spawn } from "child_process";
 import { promises as fs } from "fs";
 import process from "process";
 
+import pQueue from "p-queue";
+const PQueue = pQueue.default;
+
 import { readLangConfig } from "../lib/yaml.js";
 import * as k8s from "./k8s.js";
 import { deptyify, getUUID } from "./util.js";
@@ -52,23 +55,27 @@ async function main() {
     proxyInfo,
   });
   console.log(`Initializing sandbox`);
-  let handlePtyInput;
-  const pty = await deptyify({
-    handlePtyInput: (data) => handlePtyInput(data),
-    handlePtyExit: (_status) => {},
-  });
   await new Promise(async (resolve) => {
+    // Use a queue to resolve the circular dependency between exec and
+    // pty.
+    const outputQueue = new PQueue({ concurrency: 1, autoStart: false });
+    let handlePtyOutput;
     const exec = await session.exec(["bash"], {
       pty: true,
       on: {
-        stdout: (data) => pty.handlePtyOutput(data),
+        stdout: (data) => outputQueue.add(() => handlePtyOutput(data)),
         stderr: (data) => process.stderr.write(data),
         exit: (status) => process.exit(status),
         error: (err) => process.stderr.write(`riju: error: ${err}\n`),
         close: () => resolve(),
       },
     });
-    handlePtyInput = (data) => exec.stdin.write(data);
+    const pty = await deptyify({
+      handlePtyInput: (data) => exec.stdin.write(data),
+      handlePtyExit: (_status) => {},
+    });
+    handlePtyOutput = pty.handlePtyOutput;
+    outputQueue.start();
   });
 }
 
diff --git a/backend/util.js b/backend/util.js
index 0ba4906..4396937 100644
--- a/backend/util.js
+++ b/backend/util.js
@@ -215,7 +215,7 @@ export function deptyify({ handlePtyInput, handlePtyExit }) {
           setTimeout(async () => {
             try {
               while (true) {
-                handlePtyInput(await input.read({ encoding: "utf-8" }));
+                handlePtyInput((await input.read()).buffer);
               }
             } catch (err) {
               logError(err);