@typed-assistant/builder 0.0.40 → 0.0.42

package/package.json

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

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,7 +11,7 @@ const commonOptions = {
   },
 }
 
-const webhookIsSetup = async () => {
+const webhookIsSetup = async (webhookUrl: string) => {
   const { error } = await fetch(webhookUrl, {
     ...commonOptions,
     body: JSON.stringify({ check: "true" }),
@@ -22,7 +20,8 @@ const webhookIsSetup = async () => {
     .then((d) => d.json())
 
   if (error) {
-    logger.error("🚨 Failed to reach webhook", error.message)
+    logger.error(`🚨 Failed to reach webhook "${webhookUrl}"`)
+    logger.error(`  ${error.message}`)
     return false
   }
 
@@ -49,23 +48,24 @@ const deleteRepoWebhook = async (id: number) =>
     ),
   )()
 
-const deleteAllRepoWebhooks = async () => {
-  const { data: webhooks, error } = await listRepoWebhooks()
+// const deleteAllRepoWebhooks = async () => {
+//   const { data: webhooks, error } = await listRepoWebhooks()
 
-  if (error) {
-    logger.error("🚨 Failed fetching webhooks", error.message)
-    return
-  }
+//   if (error) {
+//     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)
-    }),
-  )
-}
+//   await Promise.all(
+//     webhooks.map(async (webhook) => {
+//       await deleteRepoWebhook(webhook.id)
+//       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`,
@@ -117,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) {
@@ -129,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
   }
 
@@ -142,9 +143,10 @@ export const setupWebhook = async (): Promise<void> => {
     return
   }
 
-  await webhookIsSetup()
+  await webhookIsSetup(webhookUrl)
 
-  const { data: webhook, error: createError } = await createRepoWebhook()
+  const { data: webhook, error: createError } =
+    await createRepoWebhook(webhookUrl)
 
   if (createError) {
     if (retries < 5) {
@@ -155,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)
 }