@typed-assistant/builder 0.0.5 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -17,10 +17,10 @@
     "eslint": "^8.56.0",
     "home-assistant-js-websocket": "^8.2.0",
     "typescript": "^5.3.3",
-    "@typed-assistant/typescript-config": "0.0.3",
-    "@typed-assistant/eslint-config": "0.0.3",
-    "@typed-assistant/utils": "0.0.4",
-    "@typed-assistant/logger": "0.0.4"
+    "@typed-assistant/eslint-config": "0.0.4",
+    "@typed-assistant/logger": "0.0.5",
+    "@typed-assistant/typescript-config": "0.0.4",
+    "@typed-assistant/utils": "0.0.6"
   },
   "peerDependencies": {
     "home-assistant-js-websocket": "^8.2.0"

package/src/appProcess.tsx

@@ -5,8 +5,9 @@ import { readFileSync, watch } from "fs"
 import { join, relative } from "path"
 import ignore from "ignore"
 import { ONE_SECOND } from "@typed-assistant/utils/durations"
-import { getHassAPI } from "@typed-assistant/utils/getHassAPI"
+import { fetchWithAuth, getHassAPI } from "@typed-assistant/utils/getHassAPI"
 import { pullChanges } from "./pullChanges"
+import { withErrorHandling } from "@typed-assistant/utils/withErrorHandling"
 
 type Processes = Awaited<ReturnType<typeof buildAndStartAppProcess>>
 
@@ -33,7 +34,7 @@ async function kill(process: Subprocess) {
 let settingUp = { current: false }
 async function killAndRestartApp(subprocesses: Processes) {
   if (settingUp.current) return subprocesses
-  log("♻️  Restarting app...")
+  log("♻️ Restarting app...")
   settingUp.current = true
   if (subprocesses.app) await kill(subprocesses.app)
   const newSubprocesses = await buildAndStartAppProcess()
@@ -54,6 +55,11 @@ function setupWatcherInternal(...args: Parameters<typeof watch>) {
 export async function setupWatcher(
   ...args: Parameters<typeof buildAndStartAppProcess>
 ) {
+  const { data: addonInfo, error: addonInfoError } = await getAddonInfo()
+  if (addonInfoError) {
+    log(`🚨 Failed to get addon info: ${addonInfoError}`)
+  }
+  console.log("ℹ️ ~ addonInfo:", addonInfo)
   await setupGitSync()
 
   let subprocesses = await buildAndStartAppProcess(...args)
@@ -63,7 +69,7 @@ export async function setupWatcher(
     async function onFileChange(event, filename) {
       if (!filename) return
       if (shouldIgnoreFileOrFolder(filename)) return
-      log(`⚠️  Change to ${filename} detected.`)
+      log(`⚠️ Change to ${filename} detected.`)
       if (filename.endsWith("process.tsx")) {
         await restartAddon()
       } else {
@@ -81,7 +87,8 @@ const setupGitSync = async ({
   /** Duration in seconds */
   gitPullPollDuration?: number
 } = {}) => {
-  const duration = gitPullPollDuration ?? 5
+  log(`😅 Attempting to pull changes...`)
+  const duration = gitPullPollDuration ?? 30
   const { error } = await pullChanges()
   if (error) return
   log(`   ⏳ Pulling changes again in ${duration} seconds...`)
@@ -98,6 +105,14 @@ const shouldIgnoreFileOrFolder = (filename: string) =>
   ig.ignores(relative(process.cwd(), filename))
 
 const restartAddon = async () => {
-  log("♻️  Restarting addon...")
-  await getHassAPI(`http://supervisor/addons/self/restart`, { method: "POST" })
+  log("♻️ Restarting addon...")
+  await fetchWithAuth(`http://supervisor/addons/self/restart`, {
+    method: "POST",
+  })
+}
+
+const getAddonInfo = async () => {
+  log("🔍 Getting addon info...")
+
+  return withErrorHandling(fetchWithAuth)("http://supervisor/addons/self/info")
 }