@typed-assistant/builder 0.0.39 → 0.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",

package/src/appProcess.tsx

@@ -32,9 +32,6 @@ export async function setup({
   const directoryToWatch = join(process.cwd(), "./src")
   const addonUrl = `${slug}/ingress`
 
-  checkProcesses(entryFile, { addonUrl, onProcessError })
-  await setupGitSync()
-
   let subprocesses = await buildAndStartAppProcess(entryFile, {
     mdiPaths: mdiPaths,
   })
@@ -53,6 +50,9 @@ export async function setup({
     getSubprocesses: () => subprocesses,
   })
 
+  checkProcesses(entryFile, { addonUrl, onProcessError })
+  await setupGitSync()
+
   return subprocesses
 }
 

package/src/setupWebhook.tsx

@@ -3,8 +3,6 @@ import { handleFetchError } from "@typed-assistant/utils/getHassAPI"
 import { withErrorHandling } from "@typed-assistant/utils/withErrorHandling"
 import { z } from "zod"
 
-const webhookUrl = `${process.env.HASS_EXTERNAL_URL}/webhook`
-
 const commonOptions = {
   headers: {
     Accept: "application/vnd.github+json",
@@ -13,6 +11,24 @@ const commonOptions = {
   },
 }
 
+const webhookIsSetup = async (webhookUrl: string) => {
+  const { error } = await fetch(webhookUrl, {
+    ...commonOptions,
+    body: JSON.stringify({ check: "true" }),
+  })
+    .then(handleFetchError)
+    .then((d) => d.json())
+
+  if (error) {
+    logger.error(`🚨 Failed to reach webhook "${webhookUrl}"`)
+    logger.error(`  ${error.message}`)
+    return false
+  }
+
+  logger.info("🪝 Webhook reached successfully: ")
+  return true
+}
+
 const listRepoWebhooks = async () =>
   withErrorHandling(() =>
     fetch(
@@ -36,19 +52,20 @@ const deleteAllRepoWebhooks = async () => {
   const { data: webhooks, error } = await listRepoWebhooks()
 
   if (error) {
-    logger.error("🚨 Failed fetching webhooks", error.message)
+    logger.error("🚨 Failed fetching webhooks")
+    logger.error(`  ${error.message}`)
     return
   }
 
   await Promise.all(
     webhooks.map(async (webhook) => {
       await deleteRepoWebhook(webhook.id)
-      logger.info("🚮 Webhook deleted: ", webhook.config.url)
+      logger.info("🚮 Webhook deleted: " + webhook.config.url)
     }),
   )
 }
 
-const createRepoWebhook = async () =>
+const createRepoWebhook = async (webhookUrl: string) =>
   withErrorHandling(() =>
     fetch(
       `https://api.github.com/repos/${process.env.GITHUB_USERNAME}/${process.env.GITHUB_REPO}/hooks`,
@@ -100,7 +117,7 @@ type Webhook = z.infer<typeof Webhook>
 
 const retryTimeout = 2000
 let retries = 0
-export const setupWebhook = async (): Promise<void> => {
+export const setupWebhook = async (webhookUrl: string): Promise<void> => {
   const { data: webhooks, error } = await listRepoWebhooks()
 
   if (error) {
@@ -112,7 +129,8 @@ export const setupWebhook = async (): Promise<void> => {
       setTimeout(setupWebhook, retryTimeout)
       return
     }
-    logger.error("🚨 Failed fetching webhooks. Giving up.", error.message)
+    logger.error("🚨 Failed fetching webhooks. Giving up.")
+    logger.error(`  ${error.message}`)
     return
   }
 
@@ -125,7 +143,10 @@ export const setupWebhook = async (): Promise<void> => {
     return
   }
 
-  const { data: webhook, error: createError } = await createRepoWebhook()
+  await webhookIsSetup(webhookUrl)
+
+  const { data: webhook, error: createError } =
+    await createRepoWebhook(webhookUrl)
 
   if (createError) {
     if (retries < 5) {
@@ -136,9 +157,10 @@ export const setupWebhook = async (): Promise<void> => {
       setTimeout(setupWebhook, retryTimeout)
       return
     }
-    logger.error("🚨 Failed creating webhook. Giving up.", createError.message)
+    logger.error("🚨 Failed creating webhook. Giving up.")
+    logger.error(`  ${createError.message}`)
     return
   }
 
-  logger.info("🪝 Webhook created: ", webhook.config.url)
+  logger.info("🪝 Webhook created: " + webhook.config.url)
 }

package/src/setupWebserver.tsx

@@ -110,6 +110,18 @@ export const startWebappServer = async ({
       restartAddon()
       return { message: "Restarting addon..." }
     })
+    .get(
+      "/webhook",
+      async ({ query }) => {
+        if (query.check === "true") return { message: "Set up successfully" }
+        return { message: "Restarting addon..." }
+      },
+      {
+        query: t.Object({
+          check: t.Optional(t.Literal("true")),
+        }),
+      },
+    )
     .get("/addon-info", async () => {
       const { data, error } = await getAddonInfo()
 
@@ -138,7 +150,6 @@ export const startWebappServer = async ({
       }),
       response: t.Object({ logs: t.Array(t.String()) }),
       async open(ws) {
-        console.log("😅😅😅 ~ ws.data.query.limit:", ws.data.query.limit)
         ws.send(await getLogsFromFile(ws.data.query.limit))
         logSubscribers.set(ws.id, async () => {
           ws.send(await getLogsFromFile(ws.data.query.limit))
@@ -226,7 +237,6 @@ export const startWebappServer = async ({
 export type WebServer = Awaited<ReturnType<typeof startWebappServer>>
 
 const getLogsFromFile = async (limit?: string) => {
-  console.log("😅😅😅 ~ limit:", limit)
   try {
     const lines = (await Bun.file("./log.txt").text()).split("\n")
     const logFile = limit