@typed-assistant/builder 0.0.83 → 0.0.85

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @typed-assistant/builder
 
+## 0.0.85
+
+### Patch Changes
+
+- Restart app when empty string bug is detected.
+
+## 0.0.84
+
+### Patch Changes
+
+- Improve logging for random crashes.
+
 ## 0.0.83
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.83",
+  "version": "0.0.85",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -30,7 +30,7 @@
     "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/typescript-config": "0.0.11",
     "@typed-assistant/utils": "0.0.19"
   },
   "publishConfig": {

package/src/appProcess.tsx

@@ -45,6 +45,16 @@ export async function setup({
         subprocesses,
       )
     },
+    onProcessError: async (message) => {
+      const messageAll = `${message}. Restarting app...`
+      logger.fatal({  emoji: "🚨" }, messageAll)
+      onProcessError?.(messageAll, addonUrl)
+      subprocesses = await killAndRestartApp(
+        entryFile,
+        { mdiPaths },
+        subprocesses,
+      )
+    },
   })
   setupWatcher({
     directoryToWatch,

package/src/setupWebserver.tsx

@@ -101,12 +101,14 @@ export const startWebappServer = async ({
   basePath,
   getSubprocesses,
   onRestartAppRequest,
+  onProcessError,
 }: {
   basePath: string
   getSubprocesses: () => {
     app: Subprocess<"ignore", "pipe", "pipe">
   }
   onRestartAppRequest: () => void
+  onProcessError: (message: string) => void
 }) => {
   const buildResult = await Bun.build({
     entrypoints: [tsEntryPoint],
@@ -344,29 +346,53 @@ export const startWebappServer = async ({
     await server.stop()
   })
 
+  let emptyStringCount = 0
+
   // eslint-disable-next-line no-constant-condition
   while (true) {
-    getSubprocesses().app.exitCode
-    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 decodedString = stderrValue
-      ? decoder.decode(stderrValue)
-      : decoder.decode(value)
+    const app = getSubprocesses().app
+    const stdoutReader = getReader("stdout", app.stdout)
+    const stderrReader = getReader("stderr", app.stderr)
+    const stdoutResult = await stdoutReader.read()
+    const stderrResult =
+      stdoutResult.value === undefined
+        ? await stderrReader.read()
+        : ({
+            value: undefined,
+            done: true,
+          } satisfies ReadableStreamDefaultReadDoneResult)
+
+    const streamEnded =
+      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
+    }
+
+    const chunk = stdoutResult.value ?? stderrResult.value
+    const decodedString = chunk ? decoder.decode(chunk) : ""
     const convertedMessage = convert.toHtml(decodedString)
     if (convertedMessage !== "") {
       lastMessage = convertedMessage
     }
     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,
-        ),
+        send("Process is returning an empty string. This was the last non-empty message:\n\n" +
+        lastMessage),
       )
       logger.fatal(
         {
@@ -375,11 +401,12 @@ export const startWebappServer = async ({
             exitCode: getSubprocesses().app.exitCode,
           }),
         },
-        "Process is returning an empty string",
+        emptyStringMessage,
       )
       await new Promise((resolve) => setTimeout(resolve, 1000))
       continue
     }
+    emptyStringCount = 0
     subscribers.forEach((send) => send(convertedMessage))
   }
 

package/src/setupWebhook.tsx

@@ -1,174 +0,0 @@
-import { logger } from "@typed-assistant/logger"
-import { handleFetchError } from "@typed-assistant/utils/getHassAPI"
-import { withErrorHandling } from "@typed-assistant/utils/withErrorHandling"
-import { z } from "zod"
-
-const commonOptions = {
-  headers: {
-    Accept: "application/vnd.github+json",
-    Authorization: `Bearer ${process.env.GITHUB_TOKEN}`,
-    "X-GitHub-Api-Version": "2022-11-28",
-  },
-}
-
-const webhookIsSetup = async (webhookUrl: string) => {
-  const { error } = await fetch(webhookUrl, {
-    ...commonOptions,
-    body: JSON.stringify({ check: "true" }),
-  })
-    .then(handleFetchError)
-    .then((d) => d.json())
-
-  if (error) {
-    logger.error(
-      { additionalDetails: error.message, emoji: "🚨" },
-      `Failed to reach webhook "${webhookUrl}"`,
-    )
-    return false
-  }
-
-  logger.debug({ emoji: "🪝" }, "Webhook reached successfully: ")
-  return true
-}
-
-const listRepoWebhooks = async () =>
-  withErrorHandling(() =>
-    fetch(
-      `https://api.github.com/repos/${process.env.GITHUB_USERNAME}/${process.env.GITHUB_REPO}/hooks`,
-      { ...commonOptions },
-    )
-      .then(handleFetchError)
-      .then((d) => d?.json())
-      .then(z.array(Webhook).parse),
-  )()
-
-// const deleteRepoWebhook = async (id: number) =>
-//   withErrorHandling(() =>
-//     fetch(
-//       `https://api.github.com/repos/${process.env.GITHUB_USERNAME}/${process.env.GITHUB_REPO}/hooks/${id}`,
-//       { ...commonOptions, method: "DELETE" },
-//     ),
-//   )()
-
-// const deleteAllRepoWebhooks = async () => {
-//   const { data: webhooks, error } = await listRepoWebhooks()
-
-//   if (error) {
-//     logger.error("🚨 Failed fetching webhooks")
-//     logger.error(`  ${error.message}`)
-//     return
-//   }
-
-//   await Promise.all(
-//     webhooks.map(async (webhook) => {
-//       await deleteRepoWebhook(webhook.id)
-//       logger.info("🚮 Webhook deleted: " + webhook.config.url)
-//     }),
-//   )
-// }
-
-const createRepoWebhook = async (webhookUrl: string) =>
-  withErrorHandling(() =>
-    fetch(
-      `https://api.github.com/repos/${process.env.GITHUB_USERNAME}/${process.env.GITHUB_REPO}/hooks`,
-      {
-        ...commonOptions,
-        method: "POST",
-        body: JSON.stringify({
-          name: "web",
-          active: true,
-          config: {
-            url: webhookUrl,
-            content_type: "json",
-            insecure_ssl: "0",
-          },
-          events: ["push"],
-        }),
-      },
-    )
-      .then(handleFetchError)
-      .then((d) => d.json())
-      .then(Webhook.parse),
-  )()
-
-const Webhook = z.object({
-  type: z.literal("Repository"),
-  id: z.number(),
-  name: z.literal("web"),
-  active: z.boolean(),
-  events: z.array(z.string()),
-  config: z.object({
-    content_type: z.string(),
-    insecure_ssl: z.enum(["0", "1"]),
-    url: z.string(),
-  }),
-  updated_at: z.string(),
-  created_at: z.string(),
-  url: z.string(),
-  test_url: z.string(),
-  ping_url: z.string(),
-  deliveries_url: z.string(),
-  last_response: z.object({
-    code: z.number().nullable(),
-    status: z.string().nullable(),
-    message: z.string().nullable(),
-  }),
-})
-
-type Webhook = z.infer<typeof Webhook>
-
-const retryTimeout = 2000
-let retries = 0
-export const setupWebhook = async (webhookUrl: string): Promise<void> => {
-  const { data: webhooks, error } = await listRepoWebhooks()
-
-  if (error) {
-    if (retries < 5) {
-      retries++
-      logger.error(
-        { emoji: "🔁" },
-        `Failed fetching webhooks. Retrying setup in ${retryTimeout / 1000}s...`,
-      )
-      setTimeout(setupWebhook, retryTimeout)
-      return
-    }
-    logger.error(
-      { additionalDetails: error.message, emoji: "🚨" },
-      "Failed fetching webhooks. Giving up.",
-    )
-    return
-  }
-
-  const webhookAlreadyExists = webhooks.some(
-    async (webhook) => webhook.config.url === webhookUrl,
-  )
-
-  if (webhookAlreadyExists) {
-    logger.info({ emoji: "🪝" }, "Webhook already set up")
-    return
-  }
-
-  await webhookIsSetup(webhookUrl)
-
-  const { data: webhook, error: createError } =
-    await createRepoWebhook(webhookUrl)
-
-  if (createError) {
-    if (retries < 5) {
-      retries++
-      logger.error(
-        { emoji: "🔁" },
-        `Failed creating webhook. Retrying setup in ${retryTimeout / 1000}s...`,
-      )
-      setTimeout(setupWebhook, retryTimeout)
-      return
-    }
-    logger.error(
-      { additionalDetails: createError.message, emoji: "🚨" },
-      "Failed creating webhook. Giving up.",
-    )
-    return
-  }
-
-  logger.info({ emoji: "🪝" }, "Webhook created: " + webhook.config.url)
-}