@typed-assistant/builder 0.0.87 → 0.0.89

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @typed-assistant/builder
 
+## 0.0.89
+
+### Patch Changes
+
+- More robust restarting of app when process error occurs.
+
+## 0.0.88
+
+### Patch Changes
+
+- Fire onProcessError when empty stream is detected in web server.
+
 ## 0.0.87
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -30,8 +30,8 @@
     "typescript": "^5.4.0",
     "@typed-assistant/eslint-config": "0.0.10",
     "@typed-assistant/logger": "0.0.22",
-    "@typed-assistant/utils": "0.0.19",
-    "@typed-assistant/typescript-config": "0.0.11"
+    "@typed-assistant/typescript-config": "0.0.11",
+    "@typed-assistant/utils": "0.0.19"
   },
   "publishConfig": {
     "access": "public",

package/src/appProcess.tsx

@@ -47,16 +47,20 @@ export async function setup({
     },
     onProcessError: async (message) => {
       const messageAll = `${message}. Restarting app...`
-      logger.fatal({  emoji: "🚨" }, messageAll)
+      logger.fatal({ emoji: "🚨" }, messageAll)
       onProcessError?.(messageAll, addonUrl)
-      subprocesses = await killAndRestartApp(
+      if (subprocesses.app) await killSubprocess(subprocesses.app)
+      if (watcher) watcher.close()
+      if (processChecker) processChecker.stop()
+      if ("stop" in gitPoller) gitPoller.stop()
+      setup({
         entryFile,
-        { mdiPaths },
-        subprocesses,
-      )
+        mdiPaths,
+        onProcessError,
+      })
     },
   })
-  setupWatcher({
+  const watcher = setupWatcher({
     directoryToWatch,
     entryFile,
     mdiPaths,
@@ -66,7 +70,7 @@ export async function setup({
     getSubprocesses: () => subprocesses,
   })
 
-  checkProcesses(entryFile, {
+  const processChecker = checkProcesses(entryFile, {
     onMultiProcessError: (ps) => {
       const message = `Multiple processes detected. Restarting addon...`
       logger.fatal({ additionalDetails: ps, emoji: "🚨" }, message)
@@ -84,7 +88,8 @@ export async function setup({
       )
     },
   })
-  await setupGitSync({
+
+  const gitPoller = await setupGitSync({
     onChangesPulled: async () => {
       subprocesses = await killAndRestartApp(
         entryFile,
@@ -133,7 +138,7 @@ async function killAndRestartApp(
 
 let multipleProcessesErrorCount = 0
 let noProcessesErrorCount = 0
-const checkProcesses = async (
+const checkProcesses = (
   entryFile: string,
   {
     onMultiProcessError,
@@ -143,33 +148,33 @@ const checkProcesses = async (
     onNoProcessError?: (psOutput: string) => void | Promise<void>
   },
 ) => {
-  const ps = await $`ps -f`.text()
-  const matches = ps.match(new RegExp(`bun .+${entryFile}`, "gmi")) ?? []
+  const interval = setInterval(async () => {
+    const ps = await $`ps -f`.text()
+    logger.debug({ emoji: "🔍" }, `Checking processes...\n${ps}`)
+    const matches = ps.match(new RegExp(`bun .+${entryFile}`, "gmi")) ?? []
 
-  if (matches.length > 1) {
-    multipleProcessesErrorCount++
-    if (multipleProcessesErrorCount > 5) {
-      await onMultiProcessError?.(ps)
-      return
+    if (matches.length > 1) {
+      multipleProcessesErrorCount++
+      if (multipleProcessesErrorCount > 5) {
+        await onMultiProcessError?.(ps)
+        return
+      }
+    } else {
+      multipleProcessesErrorCount = 0
     }
-  } else {
-    multipleProcessesErrorCount = 0
-  }
 
-  if (matches.length === 0) {
-    noProcessesErrorCount++
-    if (noProcessesErrorCount > 5) {
-      await onNoProcessError?.(ps)
-      return
+    if (matches.length === 0) {
+      noProcessesErrorCount++
+      if (noProcessesErrorCount > 5) {
+        await onNoProcessError?.(ps)
+        return
+      }
+    } else {
+      noProcessesErrorCount = 0
     }
-  } else {
-    noProcessesErrorCount = 0
-  }
+  }, 10000)
 
-  setTimeout(
-    () => checkProcesses(entryFile, { onMultiProcessError, onNoProcessError }),
-    5000,
-  )
+  return { stop: () => clearInterval(interval) }
 }
 
 const getAddonInfo = async () => {
@@ -200,7 +205,7 @@ const setupGitSync = async ({
   }
 
   logger.warn({ emoji: "⬇️" }, "Setting up git poller...")
-  await setupGitPoller({ onChangesPulled })
+  return setupGitPoller({ onChangesPulled })
 }
 
 const ig = ignore().add(

package/src/setupGitPoller.tsx

@@ -11,13 +11,14 @@ export const setupGitPoller = async ({
   onChangesPulled: () => void
 }) => {
   const duration = gitPullPollDuration ?? 30
-  await pullChanges({ onChangesPulled })
-  logger.debug(
-    { emoji: "⬇️⏳" },
-    `Pulling changes again in ${duration} seconds...`,
-  )
 
-  setTimeout(() => {
-    setupGitPoller({ gitPullPollDuration, onChangesPulled })
+  const interval = setInterval(async () => {
+    await pullChanges({ onChangesPulled })
+    logger.debug(
+      { emoji: "⬇️⏳" },
+      `Pulling changes again in ${duration} seconds...`,
+    )
   }, duration * ONE_SECOND)
+
+  return { stop: () => clearInterval(interval) }
 }

package/src/setupWebserver.tsx

@@ -346,7 +346,7 @@ export const startWebappServer = async ({
     await server.stop()
   })
 
-  let emptyStringCount = 0
+  let fatalErrorMessage = ""
 
   // eslint-disable-next-line no-constant-condition
   while (true) {
@@ -366,15 +366,8 @@ export const startWebappServer = async ({
       stdoutResult.done &&
       (stderrResult.done || stderrResult.value === undefined)
     if (streamEnded) {
-      logger.warn(
-        {
-          emoji: "😴",
-          additionalDetails: JSON.stringify({ exitCode: app.exitCode }),
-        },
-        "Subprocess output streams ended; waiting for restart or new output",
-      )
-      await new Promise((resolve) => setTimeout(resolve, 1000))
-      continue
+      fatalErrorMessage = "Subprocess output streams ended"
+      break
     }
 
     const chunk = stdoutResult.value ?? stderrResult.value
@@ -382,35 +375,22 @@ export const startWebappServer = async ({
     const convertedMessage = convert.toHtml(decodedString)
     if (convertedMessage !== "") {
       lastMessage = convertedMessage
+      subscribers.forEach((send) => send(convertedMessage))
+    } else {
+      fatalErrorMessage = "Process is returning an empty string"
+      break
     }
-    if (convertedMessage === "") {
-      emptyStringCount += 1
-      const emptyStringMessage =
-        "Process is returning an empty string"
-      if (emptyStringCount === 10) {
-        onProcessError(emptyStringMessage)
-      }
-      subscribers.forEach((send) =>
-        send("Process is returning an empty string. This was the last non-empty message:\n\n" +
-        lastMessage),
-      )
-      logger.fatal(
-        {
-          emoji: "💀",
-          additionalDetails: JSON.stringify({
-            exitCode: getSubprocesses().app.exitCode,
-          }),
-        },
-        emptyStringMessage,
-      )
-      await new Promise((resolve) => setTimeout(resolve, 1000))
-      continue
-    }
-    emptyStringCount = 0
-    subscribers.forEach((send) => send(convertedMessage))
   }
 
-  return server
+  subscribers.forEach((send) =>
+    send(
+      "Fatal error occured. This was the last non-empty message:\n\n" +
+        lastMessage,
+    ),
+  )
+
+  logger.warn({ emoji: "💀" }, fatalErrorMessage)
+  onProcessError(fatalErrorMessage)
 }
 
 export type WebServer = Awaited<ReturnType<typeof startWebappServer>>
@@ -428,13 +408,11 @@ const getLogsFromFile = async ({
 }) => {
   try {
     const parsedLimit = Number(limitProp)
-    const limit = Number.isFinite(parsedLimit) && parsedLimit > 0
-      ? parsedLimit
-      : undefined
+    const limit =
+      Number.isFinite(parsedLimit) && parsedLimit > 0 ? parsedLimit : undefined
     const parsedOffset = Number(offsetProp)
-    const offset = Number.isFinite(parsedOffset) && parsedOffset >= 0
-      ? parsedOffset
-      : 0
+    const offset =
+      Number.isFinite(parsedOffset) && parsedOffset >= 0 ? parsedOffset : 0
 
     const normalizedFilter = filter?.toLowerCase().trim()
 
@@ -450,7 +428,7 @@ const getLogsFromFile = async ({
           return result.concat({
             msg: e instanceof Error ? e.message : "Unknown parse error",
             level: levels.fatal,
-          })
+          } as LogSchema)
         }
       }, [] as LogSchema[])