@typed-assistant/builder 0.0.29 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",

package/src/setupWebserver.tsx

@@ -21,25 +21,34 @@ const cssOutputFile = join(
 const convert = new Convert()
 const decoder = new TextDecoder()
 
-const readers = new Map<
-  ReadableStream<Uint8Array>,
-  ReadableStreamDefaultReader<Uint8Array>
->()
+const readers = {
+  stdout: new Map<
+    ReadableStream<Uint8Array>,
+    ReadableStreamDefaultReader<Uint8Array>
+  >(),
+  stderr: new Map<
+    ReadableStream<Uint8Array>,
+    ReadableStreamDefaultReader<Uint8Array>
+  >(),
+}
 
-const getReader = (stream: ReadableStream<Uint8Array>) => {
-  const cachedReader = readers.get(stream)
+const getReader = (
+  type: "stdout" | "stderr",
+  stream: ReadableStream<Uint8Array>,
+) => {
+  const cachedReader = readers[type].get(stream)
   if (!cachedReader) {
-    readers.forEach((_reader, cachedStream) => {
-      readers.delete(cachedStream)
+    readers[type].forEach((_reader, cachedStream) => {
+      readers[type].delete(cachedStream)
     })
   }
   const reader = cachedReader ?? stream.getReader()
-  readers.set(stream, reader)
+  readers[type].set(stream, reader)
   return reader
 }
 
-const subscribers = new Map<number, (message: string) => void>()
-const logSubscribers = new Map<number, () => void>()
+const subscribers = new Map<string, (message: string) => void>()
+const logSubscribers = new Map<string, () => void>()
 
 let lastMessage = ""
 
@@ -167,26 +176,23 @@ export const startWebappServer = async ({
 
   // eslint-disable-next-line no-constant-condition
   while (true) {
-    const stdoutReader = getReader(getSubprocesses().app.stdout)
-    // const stderrReader = getReader(getSubprocesses().app.stderr)
+    const stdoutReader = getReader("stdout", getSubprocesses().app.stdout)
+    const stderrReader = getReader("stderr", getSubprocesses().app.stderr)
     const { value } = await stdoutReader.read()
+    const { value: stderrValue } = value
+      ? { value: undefined }
+      : await stderrReader.read()
 
-    const newLocal = decoder.decode(value)
-    const convertedMessage = convert.toHtml(newLocal)
+    const decodedString = decoder.decode(value ?? stderrValue)
+    const convertedMessage = convert.toHtml(decodedString)
     if (convertedMessage !== "") {
       lastMessage = convertedMessage
     }
     if (convertedMessage === "") {
-      // const { value } = await stderrReader.read()
-      // const newLocal = decoder.decode(value)
-      // const convertedMessage = convert.toHtml(newLocal)
-
       subscribers.forEach((send) =>
         send(
           "Process is returning an empty string. This was the last non-empty message:\n\n" +
-            lastMessage +
-            "\n\nstderr:\n\n",
-          // convertedMessage,
+            lastMessage,
         ),
       )
       await new Promise((resolve) => setTimeout(resolve, 1000))