@typed-assistant/builder 0.0.80 → 0.0.82

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @typed-assistant/builder
 
+## 0.0.82
+
+### Patch Changes
+
+- Restart app when an empty string is returned from the process.
+
+## 0.0.81
+
+### Patch Changes
+
+- Pin Elysia to 1.1.x.
+
 ## 0.0.79
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.80",
+  "version": "0.0.82",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -13,7 +13,7 @@
     "@types/react-dom": "^18.3.1",
     "ansi-to-html": "^0.7.2",
     "debounce": "^2.0.0",
-    "elysia": "^1.1.25",
+    "elysia": "~1.1.25",
     "ignore": "^5.3.0",
     "react": "^18",
     "react-dom": "^18",
@@ -28,10 +28,10 @@
     "eslint-plugin-html": "^7.1.0",
     "ts-toolbelt": "^9.6.0",
     "typescript": "^5.4.0",
-    "@typed-assistant/eslint-config": "0.0.10",
     "@typed-assistant/logger": "0.0.22",
     "@typed-assistant/typescript-config": "0.0.10",
-    "@typed-assistant/utils": "0.0.19"
+    "@typed-assistant/utils": "0.0.19",
+    "@typed-assistant/eslint-config": "0.0.10"
   },
   "publishConfig": {
     "access": "public",

package/src/setupWebserver.tsx

@@ -45,7 +45,13 @@ const getReader = (
 ) => {
   const cachedReader = readers[type].get(stream)
   if (!cachedReader) {
-    readers[type].forEach((_reader, cachedStream) => {
+    readers[type].forEach((reader, cachedStream) => {
+      // Properly release the lock before deleting
+      try {
+        reader.releaseLock()
+      } catch (e) {
+        // Ignore if already released
+      }
       readers[type].delete(cachedStream)
     })
   }
@@ -65,6 +71,8 @@ let stats = {
   memory_percent: null as number | null,
   max_memory_usage: 0,
 }
+let statsInterval: ReturnType<typeof setInterval> | null = null
+
 const getStats = async () => {
   const { data, error } = await withErrorHandling(
     getSupervisorAPI<{
@@ -93,8 +101,6 @@ const getStats = async () => {
           : stats.max_memory_usage,
     }
   }
-
-  setTimeout(getStats, 10 * ONE_SECOND)
 }
 
 export const startWebappServer = async ({
@@ -233,14 +239,7 @@ export const startWebappServer = async ({
       }),
 
       async open(ws) {
-        ws.send(
-          await getLogsFromFile({
-            filter: ws.data.query.filter,
-            level: ws.data.query.level,
-            limit: ws.data.query.limit,
-            offset: ws.data.query.offset,
-          }),
-        )
+        // Set the log subscriber first to avoid race conditions
         logSubscribers.set(ws.id, async () => {
           ws.send(
             await getLogsFromFile({
@@ -251,6 +250,15 @@ export const startWebappServer = async ({
             }),
           )
         })
+        // Then send the initial logs
+        ws.send(
+          await getLogsFromFile({
+            filter: ws.data.query.filter,
+            level: ws.data.query.level,
+            limit: ws.data.query.limit,
+            offset: ws.data.query.offset,
+          }),
+        )
       },
       close(ws) {
         logSubscribers.delete(ws.id)
@@ -337,11 +345,34 @@ export const startWebappServer = async ({
 
   watchLogFileSize()
 
-  getStats()
+  // Start stats polling interval
+  statsInterval = setInterval(getStats, 10 * 1000)
 
   addKillListener(async () => {
     watcher.close()
     await server.stop()
+    // Clean up all websocket subscribers
+    subscribers.clear()
+    logSubscribers.clear()
+    // Release and clear all readers
+    for (const reader of readers.stdout.values()) {
+      try {
+        reader.releaseLock()
+      } catch (e) {
+        /* ignore */
+      }
+    }
+    for (const reader of readers.stderr.values()) {
+      try {
+        reader.releaseLock()
+      } catch (e) {
+        /* ignore */
+      }
+    }
+    readers.stdout.clear()
+    readers.stderr.clear()
+    // Clear stats polling interval
+    if (statsInterval) clearInterval(statsInterval)
   })
 
   // eslint-disable-next-line no-constant-condition
@@ -373,12 +404,14 @@ export const startWebappServer = async ({
           emoji: "💀",
           additionalDetails: JSON.stringify({
             exitCode: getSubprocesses().app.exitCode,
+            stderrValue,
+            stderrValueDecoded: decodedString,
           }),
         },
-        "Process is returning an empty string",
+        "Process is returning an empty string. Restarting app...",
       )
-      await new Promise((resolve) => setTimeout(resolve, 1000))
-      continue
+      onRestartAppRequest()
+      break
     }
     subscribers.forEach((send) => send(convertedMessage))
   }