@typed-assistant/builder 0.0.4 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "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/eslint-config": "0.0.3",
-    "@typed-assistant/logger": "0.0.4",
-    "@typed-assistant/typescript-config": "0.0.3",
-    "@typed-assistant/utils": "0.0.4"
+    "@typed-assistant/logger": "0.0.5",
+    "@typed-assistant/utils": "0.0.5",
+    "@typed-assistant/typescript-config": "0.0.4",
+    "@typed-assistant/eslint-config": "0.0.4"
   },
   "peerDependencies": {
     "home-assistant-js-websocket": "^8.2.0"

package/src/appProcess.tsx

@@ -7,6 +7,7 @@ import ignore from "ignore"
 import { ONE_SECOND } from "@typed-assistant/utils/durations"
 import { 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,8 +87,10 @@ const setupGitSync = async ({
   /** Duration in seconds */
   gitPullPollDuration?: number
 } = {}) => {
-  const duration = gitPullPollDuration ?? 5
-  await pullChanges()
+  log(`😅 Attempting to pull changes...`)
+  const duration = gitPullPollDuration ?? 30
+  const { error } = await pullChanges()
+  if (error) return
   log(`   ⏳ Pulling changes again in ${duration} seconds...`)
 
   setTimeout(() => {
@@ -97,6 +105,14 @@ const shouldIgnoreFileOrFolder = (filename: string) =>
   ig.ignores(relative(process.cwd(), filename))
 
 const restartAddon = async () => {
-  log("♻️  Restarting addon...")
+  log("♻️ Restarting addon...")
   await getHassAPI(`http://supervisor/addons/self/restart`, { method: "POST" })
 }
+
+const getAddonInfo = async () => {
+  log("🔍 Getting addon info...")
+
+  return withErrorHandling(getHassAPI)<{
+    data: { ingress_entry: string }
+  }>("http://supervisor/addons/self/info")
+}

package/src/pullChanges.tsx

@@ -11,7 +11,7 @@ export const pullChanges = async () => {
     log(
       "⚠️  Cannot pull changes without GITHUB_TOKEN, GITHUB_USERNAME, and GITHUB_REPO environment variables.",
     )
-    return
+    return { error: {} }
   }
   log("⬇️  Pulling changes...")
   const gitPullText = await getSpawnText(["git", "pull"])
@@ -19,7 +19,7 @@ export const pullChanges = async () => {
   const nothingNew = /Already up to date./.test(gitPullText)
   if (nothingNew) {
     log("   👌 No new changes.")
-    return
+    return {}
   } else {
     log("   👍 Changes pulled.")
   }
@@ -28,4 +28,5 @@ export const pullChanges = async () => {
     const { error } = await bunInstall()
     if (error) throw new Error(error.text)
   }
+  return {}
 }