@typed-assistant/builder 0.0.33 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -24,10 +24,10 @@
     "home-assistant-js-websocket": "^8.2.0",
     "ts-toolbelt": "^9.6.0",
     "typescript": "^5.3.3",
+    "@typed-assistant/typescript-config": "0.0.7",
     "@typed-assistant/eslint-config": "0.0.7",
     "@typed-assistant/logger": "0.0.11",
-    "@typed-assistant/typescript-config": "0.0.7",
-    "@typed-assistant/utils": "0.0.10"
+    "@typed-assistant/utils": "0.0.11"
   },
   "peerDependencies": {
     "home-assistant-js-websocket": "^8.2.0"

package/src/appProcess.tsx

@@ -1,7 +1,5 @@
 import { log } from "@typed-assistant/logger"
 import { generateTypes } from "@typed-assistant/types/generateTypes"
-import { getSupervisorAPI } from "@typed-assistant/utils/getHassAPI"
-import { withErrorHandling } from "@typed-assistant/utils/withErrorHandling"
 import type { Subprocess } from "bun"
 import { $ } from "bun"
 import { readFileSync, watch } from "fs"
@@ -16,6 +14,8 @@ import {
 import { setupGitPoller } from "./setupGitPoller"
 import { setupWebhook } from "./setupWebhook"
 import { startWebappServer } from "./setupWebserver"
+import { restartAddon } from "./restartAddon"
+import { getAddonInfo } from "./getAddonInfo"
 
 type Processes = Awaited<ReturnType<typeof buildAndStartAppProcess>>
 
@@ -55,7 +55,19 @@ let multipleProcessesErrorCount = 0
 let noProcessesErrorCount = 0
 const checkProcesses = async (
   entryFile: string,
-  { onProcessError }: { onProcessError?: (message: string) => void },
+  {
+    addonUrl,
+    onProcessError,
+    restartAddonUrl,
+  }: {
+    addonUrl: string
+    onProcessError?: (
+      message: string,
+      addonUrl: string,
+      restartAddonUrl?: string,
+    ) => void
+    restartAddonUrl: string
+  },
 ) => {
   const ps = await $`ps -f`.text()
   const matches = ps.match(new RegExp(`bun .+${entryFile}`, "gmi")) ?? []
@@ -66,7 +78,7 @@ const checkProcesses = async (
       const message = `🚨 Multiple processes detected. Restarting TypedAssistant addon...`
       log(message)
       log(ps)
-      onProcessError?.(message)
+      onProcessError?.(message, addonUrl, restartAddonUrl)
       // restartAddon()
       return
     }
@@ -80,7 +92,7 @@ const checkProcesses = async (
       const message = `🚨 No processes detected. Restarting TypedAssistant addon...`
       log(message)
       log(ps)
-      onProcessError?.(message)
+      onProcessError?.(message, addonUrl, restartAddonUrl)
       // restartAddon()
       return
     }
@@ -88,7 +100,11 @@ const checkProcesses = async (
     noProcessesErrorCount = 0
   }
 
-  setTimeout(() => checkProcesses(entryFile, { onProcessError }), 5000)
+  setTimeout(
+    () =>
+      checkProcesses(entryFile, { addonUrl, onProcessError, restartAddonUrl }),
+    5000,
+  )
 }
 
 export async function setup({
@@ -98,12 +114,14 @@ export async function setup({
 }: {
   entryFile: string
 } & Parameters<typeof generateTypes>[0] &
-  Parameters<typeof checkProcesses>[1]) {
+  Pick<Parameters<typeof checkProcesses>[1], "onProcessError">) {
   const addonInfo = await getAddonInfo()
   const basePath = addonInfo?.data.ingress_entry ?? ""
   const directoryToWatch = join(process.cwd(), "./src")
+  const addonUrl = basePath
+  const restartAddonUrl = `${basePath}/restart-addon`
 
-  checkProcesses(entryFile, { onProcessError })
+  checkProcesses(entryFile, { addonUrl, onProcessError, restartAddonUrl })
   await setupGitSync()
 
   let subprocesses = await buildAndStartAppProcess(entryFile, {
@@ -152,28 +170,6 @@ const ig = ignore().add(
 const shouldIgnoreFileOrFolder = (filename: string) =>
   ig.ignores(relative(process.cwd(), filename))
 
-const restartAddon = async () => {
-  if (!process.env.SUPERVISOR_TOKEN) {
-    log("♻️ Can't restart addon. Exiting...")
-    process.exit(0)
-    return
-  }
-  log("♻️ Restarting addon...")
-  await getSupervisorAPI(`/addons/self/restart`, { method: "POST" })
-}
-
-const getAddonInfo = async () => {
-  log("🔍 Getting addon info...")
-
-  const { data, error } = await withErrorHandling(getSupervisorAPI)<{
-    data: { ingress_entry: string }
-  }>("/addons/self/info")
-
-  if (error) log(`🚨 Failed to get addon info: ${error}`)
-
-  return data
-}
-
 function setupWatcher({
   directoryToWatch,
   entryFile,
@@ -200,6 +196,7 @@ function setupWatcher({
       if (shouldIgnoreFileOrFolder(filename)) return
       log(`⚠️ Change to ${filename} detected.`)
       if (filename.endsWith("process.tsx")) {
+        await killSubprocess(getSubprocesses().app)
         await restartAddon()
       } else {
         onSubprocessChange(
@@ -222,3 +219,9 @@ process.on("SIGINT", async () => {
   await callKillListeners()
   process.exit(0)
 })
+process.on("SIGTERM", async () => {
+  log("👋 Exiting...")
+  await callSoftKillListeners()
+  await callKillListeners()
+  process.exit(0)
+})

package/src/setupWebserver.tsx

@@ -6,7 +6,15 @@ import { Elysia, t } from "elysia"
 import { watch } from "fs"
 import { basename, join } from "path"
 import type { List, String } from "ts-toolbelt"
-import { addKillListener, addSoftKillListener } from "./killProcess"
+import {
+  addKillListener,
+  addSoftKillListener,
+  killSubprocess,
+} from "./killProcess"
+import { restartAddon } from "./restartAddon"
+import { getAddonInfo } from "./getAddonInfo"
+import { withErrorHandling } from "@typed-assistant/utils/withErrorHandling"
+import { getSupervisorAPI } from "@typed-assistant/utils/getHassAPI"
 
 const indexHtmlFilePath = `${import.meta.dir}/webserver/index.html` as const
 const cssFile = `${import.meta.dir}/webserver/input.css` as const
@@ -103,6 +111,18 @@ export const startWebappServer = async ({
           headers: { "content-type": "text/html" },
         }),
     )
+    .get("/restart-addon", async () => {
+      await killSubprocess(getSubprocesses().app)
+      restartAddon()
+    })
+    .get("/addon-info", async () => {
+      const { data, error } = await withErrorHandling(getSupervisorAPI)<{
+        data: { ingress_entry: string }
+      }>("/addons/self/info")
+
+      if (error) return error
+      return data
+    })
     .get(
       "/log.txt",
       async ({ query }) => {