@typed-assistant/builder 0.0.35 → 0.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -25,9 +25,9 @@
     "ts-toolbelt": "^9.6.0",
     "typescript": "^5.3.3",
     "@typed-assistant/eslint-config": "0.0.8",
+    "@typed-assistant/logger": "0.0.12",
     "@typed-assistant/typescript-config": "0.0.8",
-    "@typed-assistant/utils": "0.0.12",
-    "@typed-assistant/logger": "0.0.12"
+    "@typed-assistant/utils": "0.0.13"
   },
   "peerDependencies": {
     "home-assistant-js-websocket": "^8.2.0"

package/src/appProcess.tsx

@@ -15,7 +15,46 @@ import { setupGitPoller } from "./setupGitPoller"
 import { setupWebhook } from "./setupWebhook"
 import { startWebappServer } from "./setupWebserver"
 import { restartAddon } from "./restartAddon"
-import { getAddonInfo } from "./getAddonInfo"
+import { getAddonInfo as getAddonInfoAPI } from "./getAddonInfo"
+import debounce from "debounce"
+
+export async function setup({
+  entryFile,
+  mdiPaths,
+  onProcessError,
+}: {
+  entryFile: string
+} & Parameters<typeof generateTypes>[0] &
+  Pick<Parameters<typeof checkProcesses>[1], "onProcessError">) {
+  const addonInfo = await getAddonInfo()
+  const basePath = addonInfo?.data.ingress_entry ?? ""
+  const slug = addonInfo?.data.slug ?? ""
+  const directoryToWatch = join(process.cwd(), "./src")
+  const addonUrl = `${slug}/ingress`
+
+  checkProcesses(entryFile, { addonUrl, onProcessError })
+  await setupGitSync()
+
+  let subprocesses = await buildAndStartAppProcess(entryFile, {
+    mdiPaths: mdiPaths,
+  })
+
+  startWebappServer({
+    basePath,
+    getSubprocesses: () => subprocesses,
+  })
+  setupWatcher({
+    directoryToWatch,
+    entryFile,
+    mdiPaths,
+    onSubprocessChange: (newSubprocesses) => {
+      subprocesses = newSubprocesses
+    },
+    getSubprocesses: () => subprocesses,
+  })
+
+  return subprocesses
+}
 
 type Processes = Awaited<ReturnType<typeof buildAndStartAppProcess>>
 
@@ -58,15 +97,9 @@ const checkProcesses = async (
   {
     addonUrl,
     onProcessError,
-    restartAddonUrl,
   }: {
     addonUrl: string
-    onProcessError?: (
-      message: string,
-      addonUrl: string,
-      restartAddonUrl?: string,
-    ) => void
-    restartAddonUrl: string
+    onProcessError?: (message: string, addonUrl: string) => void
   },
 ) => {
   const ps = await $`ps -f`.text()
@@ -75,11 +108,10 @@ const checkProcesses = async (
   if (matches.length > 1) {
     multipleProcessesErrorCount++
     if (multipleProcessesErrorCount > 5) {
-      const message = `🚨 Multiple processes detected. Restarting TypedAssistant addon...`
+      const message = `🚨 Multiple processes detected. Check the logs...`
       log(message)
       log(ps)
-      onProcessError?.(message, addonUrl, restartAddonUrl)
-      // restartAddon()
+      onProcessError?.(message, addonUrl)
       return
     }
   } else {
@@ -89,11 +121,10 @@ const checkProcesses = async (
   if (matches.length === 0) {
     noProcessesErrorCount++
     if (noProcessesErrorCount > 5) {
-      const message = `🚨 No processes detected. Restarting TypedAssistant addon...`
+      const message = `🚨 No processes detected. Check the logs...`
       log(message)
       log(ps)
-      onProcessError?.(message, addonUrl, restartAddonUrl)
-      // restartAddon()
+      onProcessError?.(message, addonUrl)
       return
     }
   } else {
@@ -101,48 +132,19 @@ const checkProcesses = async (
   }
 
   setTimeout(
-    () =>
-      checkProcesses(entryFile, { addonUrl, onProcessError, restartAddonUrl }),
+    () => checkProcesses(entryFile, { addonUrl, onProcessError }),
     5000,
   )
 }
 
-export async function setup({
-  entryFile,
-  mdiPaths,
-  onProcessError,
-}: {
-  entryFile: string
-} & Parameters<typeof generateTypes>[0] &
-  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`
+const getAddonInfo = async () => {
+  log("🔍 Getting addon info...")
 
-  checkProcesses(entryFile, { addonUrl, onProcessError, restartAddonUrl })
-  await setupGitSync()
+  const { data, error } = await getAddonInfoAPI()
 
-  let subprocesses = await buildAndStartAppProcess(entryFile, {
-    mdiPaths: mdiPaths,
-  })
+  if (error) log(`🚨 Failed to get addon info: ${error}`)
 
-  startWebappServer({
-    basePath,
-    getSubprocesses: () => subprocesses,
-  })
-  setupWatcher({
-    directoryToWatch,
-    entryFile,
-    mdiPaths,
-    onSubprocessChange: (newSubprocesses) => {
-      subprocesses = newSubprocesses
-    },
-    getSubprocesses: () => subprocesses,
-  })
-
-  return subprocesses
+  return data
 }
 
 const setupGitSync = async () => {
@@ -191,7 +193,7 @@ function setupWatcher({
   const watcher = watch(
     directoryToWatch,
     { recursive: true },
-    async function onFileChange(event, filename) {
+    debounce(async function onFileChange(event, filename) {
       if (!filename) return
       if (shouldIgnoreFileOrFolder(filename)) return
       log(`⚠️ Change to ${filename} detected.`)
@@ -203,7 +205,7 @@ function setupWatcher({
           await killAndRestartApp(entryFile, { mdiPaths }, getSubprocesses()),
         )
       }
-    },
+    }, 200),
   )
 
   addKillListener(() => {

package/src/getAddonInfo.tsx

@@ -2,14 +2,73 @@ import { log } from "@typed-assistant/logger"
 import { getSupervisorAPI } from "@typed-assistant/utils/getHassAPI"
 import { withErrorHandling } from "@typed-assistant/utils/withErrorHandling"
 
-export 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
+type AddonInfoResponse = {
+  result: string
+  data: {
+    name: string
+    slug: string
+    hostname: string
+    description: string
+    long_description: string
+    advanced: boolean
+    stage: string
+    repository: string
+    version_latest: string
+    protected: boolean
+    rating: number
+    boot: string
+    arch: string[]
+    machine: any[]
+    homeassistant: null
+    url: string
+    detached: boolean
+    available: boolean
+    build: boolean
+    network: null
+    network_description: null
+    host_network: boolean
+    host_pid: boolean
+    host_ipc: boolean
+    host_uts: boolean
+    host_dbus: boolean
+    full_access: boolean
+    apparmor: string
+    icon: boolean
+    logo: boolean
+    changelog: boolean
+    documentation: boolean
+    stdin: boolean
+    hassio_api: boolean
+    hassio_role: string
+    auth_api: boolean
+    homeassistant_api: boolean
+    gpio: boolean
+    usb: boolean
+    uart: boolean
+    kernel_modules: boolean
+    devicetree: boolean
+    udev: boolean
+    docker_api: boolean
+    video: boolean
+    audio: boolean
+    startup: string
+    ingress: boolean
+    signed: boolean
+    state: string
+    webui: null
+    ingress_entry: string
+    ingress_url: string
+    ingress_port: number
+    ingress_panel: boolean
+    audio_input: null
+    audio_output: null
+    auto_update: boolean
+    ip_address: string
+    version: string
+    update_available: boolean
+    watchdog: boolean
+  }
 }
+
+export const getAddonInfo = () =>
+  withErrorHandling(getSupervisorAPI)<AddonInfoResponse>("/addons/self/info")

package/src/setupWebhook.tsx

@@ -1,4 +1,5 @@
 import { log } from "@typed-assistant/logger"
+import { handleFetchError } from "@typed-assistant/utils/getHassAPI"
 import { withErrorHandling } from "@typed-assistant/utils/withErrorHandling"
 import { z } from "zod"
 
@@ -97,19 +98,6 @@ const Webhook = z.object({
 
 type Webhook = z.infer<typeof Webhook>
 
-const handleFetchError = async (d: Response): Promise<Response> => {
-  if (!d.ok)
-    throw new Error(
-      d.status +
-        " " +
-        d.statusText +
-        (d.headers.get("Content-Type")?.includes("application/json")
-          ? `:\n${JSON.stringify(await d.json(), null, 2)}`
-          : ""),
-    )
-  return d
-}
-
 const retryTimeout = 2000
 let retries = 0
 export const setupWebhook = async (): Promise<void> => {

package/src/setupWebserver.tsx

@@ -6,15 +6,9 @@ import { Elysia, t } from "elysia"
 import { watch } from "fs"
 import { basename, join } from "path"
 import type { List, String } from "ts-toolbelt"
-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"
+import { addKillListener, killSubprocess } from "./killProcess"
+import { restartAddon } from "./restartAddon"
 
 const indexHtmlFilePath = `${import.meta.dir}/webserver/index.html` as const
 const cssFile = `${import.meta.dir}/webserver/input.css` as const
@@ -114,14 +108,18 @@ export const startWebappServer = async ({
     .get("/restart-addon", async () => {
       await killSubprocess(getSubprocesses().app)
       restartAddon()
+      return { message: "Restarting addon..." }
     })
     .get("/addon-info", async () => {
-      const { data, error } = await withErrorHandling(getSupervisorAPI)<{
-        data: { ingress_entry: string }
-      }>("/addons/self/info")
+      const { data, error } = await getAddonInfo()
 
       if (error) return error
-      return data
+      return {
+        ...data.data,
+        options: "HIDDEN",
+        schema: "HIDDEN",
+        translations: "HIDDEN",
+      }
     })
     .get(
       "/log.txt",