@typed-assistant/builder 0.0.49 → 0.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.49",
+  "version": "0.0.52",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -24,9 +24,9 @@
     "home-assistant-js-websocket": "^8.2.0",
     "ts-toolbelt": "^9.6.0",
     "typescript": "^5.3.3",
-    "@typed-assistant/typescript-config": "0.0.8",
     "@typed-assistant/eslint-config": "0.0.8",
-    "@typed-assistant/logger": "0.0.14",
+    "@typed-assistant/logger": "0.0.16",
+    "@typed-assistant/typescript-config": "0.0.8",
     "@typed-assistant/utils": "0.0.14"
   },
   "peerDependencies": {

package/src/appProcess.tsx

@@ -24,8 +24,8 @@ export async function setup({
   onProcessError,
 }: {
   entryFile: string
-} & Parameters<typeof generateTypes>[0] &
-  Pick<Parameters<typeof checkProcesses>[1], "onProcessError">) {
+  onProcessError: (message: string, addonUrl: string) => void
+} & Parameters<typeof generateTypes>[0]) {
   const addonInfo = await getAddonInfo()
   const basePath = addonInfo?.data.ingress_entry ?? ""
   const slug = addonInfo?.data.slug ?? ""
@@ -51,7 +51,24 @@ export async function setup({
     getSubprocesses: () => subprocesses,
   })
 
-  checkProcesses(entryFile, { addonUrl, onProcessError })
+  checkProcesses(entryFile, {
+    onMultiProcessError: (ps) => {
+      const message = `Multiple processes detected. Restarting addon...`
+      logger.fatal({ additionalDetails: ps, emoji: "🚨" }, message)
+      onProcessError?.(message, addonUrl)
+      restartAddon()
+    },
+    onNoProcessError: async (ps) => {
+      const message = `No processes detected. Restarting app...`
+      logger.fatal({ additionalDetails: ps, emoji: "🚨" }, message)
+      onProcessError?.(message, addonUrl)
+      subprocesses = await killAndRestartApp(
+        entryFile,
+        { mdiPaths },
+        subprocesses,
+      )
+    },
+  })
   await setupGitSync(webhookUrl)
 
   return subprocesses
@@ -96,11 +113,11 @@ let noProcessesErrorCount = 0
 const checkProcesses = async (
   entryFile: string,
   {
-    addonUrl,
-    onProcessError,
+    onMultiProcessError,
+    onNoProcessError,
   }: {
-    addonUrl: string
-    onProcessError?: (message: string, addonUrl: string) => void
+    onMultiProcessError?: (psOutput: string) => void | Promise<void>
+    onNoProcessError?: (psOutput: string) => void | Promise<void>
   },
 ) => {
   const ps = await $`ps -f`.text()
@@ -109,9 +126,7 @@ const checkProcesses = async (
   if (matches.length > 1) {
     multipleProcessesErrorCount++
     if (multipleProcessesErrorCount > 5) {
-      const message = `Multiple processes detected. Check the logs...`
-      logger.fatal({ additionalDetails: ps, emoji: "🚨" }, message)
-      onProcessError?.(message, addonUrl)
+      await onMultiProcessError?.(ps)
       return
     }
   } else {
@@ -121,9 +136,7 @@ const checkProcesses = async (
   if (matches.length === 0) {
     noProcessesErrorCount++
     if (noProcessesErrorCount > 5) {
-      const message = `No processes detected. Check the logs...`
-      logger.fatal({ additionalDetails: ps, emoji: "🚨" }, message)
-      onProcessError?.(message, addonUrl)
+      await onNoProcessError?.(ps)
       return
     }
   } else {
@@ -131,7 +144,7 @@ const checkProcesses = async (
   }
 
   setTimeout(
-    () => checkProcesses(entryFile, { addonUrl, onProcessError }),
+    () => checkProcesses(entryFile, { onMultiProcessError, onNoProcessError }),
     5000,
   )
 }

package/src/webserver/App.tsx

@@ -10,7 +10,7 @@ const App = () => {
         <Terminal basePath={basePath} />
       </div>
       <div className="col-span-1">
-        <Logs />
+        <Logs basePath={basePath} />
       </div>
     </div>
   )

package/src/webserver/Logs.tsx

@@ -7,8 +7,9 @@ import { useWS } from "./useWS"
 import { getPrettyTimestamp } from "@typed-assistant/utils/getPrettyTimestamp"
 import { levels } from "@typed-assistant/logger/levels"
 import type { LogSchema } from "@typed-assistant/logger"
+import { buttonStyle } from "./styles"
 
-export const Logs = () => {
+export const Logs = ({ basePath }: { basePath: string }) => {
   const [limit, setLimit] = useState(200)
   const [level, setLevel] = useState<
     "trace" | "debug" | "info" | "warn" | "error" | "fatal"
@@ -39,6 +40,11 @@ export const Logs = () => {
           <h2 className="mb-2 text-2xl flex items-baseline gap-3">
             Logs <WSIndicator ws={ws.ws} />
           </h2>
+
+          <a className={buttonStyle} href={`${basePath}/log.txt?limit=500`}>
+            View raw log.txt
+          </a>
+
           <div className="flex flex-wrap gap-2">
             <div className="flex gap-2">
               <label htmlFor="dateTimeVisibility">Date/Time</label>
@@ -94,10 +100,7 @@ export const Logs = () => {
             .sort((a, b) => b.time - a.time)
             .map((log, index) => {
               return (
-                <li
-                  key={(log.time ?? index) + log.time + log.msg}
-                  className="flex gap-1"
-                >
+                <li key={index + JSON.stringify(log)} className="flex gap-1">
                   <span className="text-slate-400 mr-2">
                     {dateTimeVisibility === "hidden"
                       ? null

package/src/webserver/Terminal.tsx

@@ -3,6 +3,7 @@ import { app } from "./api"
 import { useWS } from "./useWS"
 import { WSIndicator } from "./WSIndicator"
 import { AppSection } from "./AppSection"
+import { buttonStyle } from "./styles"
 
 export function Terminal({ basePath }: { basePath: string }) {
   const [content, setContent] = useState("")
@@ -22,9 +23,6 @@ export function Terminal({ basePath }: { basePath: string }) {
             <a className={buttonStyle} href={`${basePath}/restart-addon`}>
               Restart addon
             </a>
-            <a className={buttonStyle} href={`${basePath}/log.txt?limit=500`}>
-              View log.txt
-            </a>
           </div>
         </>
       )}
@@ -33,5 +31,3 @@ export function Terminal({ basePath }: { basePath: string }) {
     </AppSection>
   )
 }
-
-const buttonStyle = "bg-slate-800 text-white px-3 py-1 rounded-md"

package/src/webserver/index.html

@@ -1,3 +1,4 @@
+<!doctype html>
 <html class="h-full">
   <head>
     <link rel="stylesheet" href="{{ STYLESHEET }}" />

package/src/webserver/styles.tsx

@@ -0,0 +1 @@
+export const buttonStyle = "bg-slate-800 text-white px-3 py-1 rounded-md"