@typed-assistant/builder 0.0.47 → 0.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -24,9 +24,9 @@
     "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/eslint-config": "0.0.8",
+    "@typed-assistant/logger": "0.0.14",
     "@typed-assistant/utils": "0.0.14"
   },
   "peerDependencies": {

package/src/appProcess.tsx

@@ -68,7 +68,7 @@ async function buildAndStartAppProcess(
 }
 
 async function startApp(appSourceFile: string) {
-  logger.info("🚀 Starting app...")
+  logger.info({ emoji: "🚀" }, "Starting app...")
   const path = join(process.cwd(), appSourceFile)
   return Bun.spawn(["bun", path], {
     stderr: "pipe",
@@ -83,7 +83,7 @@ async function killAndRestartApp(
   subprocesses: Processes,
 ) {
   if (settingUp.current) return subprocesses
-  logger.fatal("♻️ Restarting app...")
+  logger.fatal({ emoji: "♻️" }, "Restarting app...")
   settingUp.current = true
   if (subprocesses.app) await killSubprocess(subprocesses.app)
   const newSubprocesses = await buildAndStartAppProcess(entryFile, options)
@@ -109,8 +109,8 @@ const checkProcesses = async (
   if (matches.length > 1) {
     multipleProcessesErrorCount++
     if (multipleProcessesErrorCount > 5) {
-      const message = `🚨 Multiple processes detected. Check the logs...`
-      logger.fatal(message, ps)
+      const message = `Multiple processes detected. Check the logs...`
+      logger.fatal({ additionalDetails: ps, emoji: "🚨" }, message)
       onProcessError?.(message, addonUrl)
       return
     }
@@ -121,8 +121,8 @@ const checkProcesses = async (
   if (matches.length === 0) {
     noProcessesErrorCount++
     if (noProcessesErrorCount > 5) {
-      const message = `🚨 No processes detected. Check the logs...`
-      logger.fatal(message, ps)
+      const message = `No processes detected. Check the logs...`
+      logger.fatal({ additionalDetails: ps, emoji: "🚨" }, message)
       onProcessError?.(message, addonUrl)
       return
     }
@@ -137,11 +137,11 @@ const checkProcesses = async (
 }
 
 const getAddonInfo = async () => {
-  logger.info("🔍 Getting addon info...")
+  logger.debug({ emoji: "🔍" }, "Getting addon info...")
 
   const { data, error } = await getAddonInfoAPI()
 
-  if (error) logger.error(`🚨 Failed to get addon info: ${error}`)
+  if (error) logger.error({ emoji: "🚨" }, `Failed to get addon info: ${error}`)
 
   return data
 }
@@ -153,7 +153,8 @@ const setupGitSync = async (webhookUrl: string) => {
     !process.env.GITHUB_REPO
   ) {
     logger.warn(
-      "⚠️ Cannot sync with Github without Github token, username, and repo details. Add these in the add-on configuration.",
+      { emoji: "⚠️" },
+      "Cannot sync with Github without Github token, username, and repo details. Add these in the add-on configuration.",
     )
     return { error: {} }
   }
@@ -161,7 +162,10 @@ const setupGitSync = async (webhookUrl: string) => {
     await setupWebhook(webhookUrl)
     return
   }
-  logger.warn("⚠️ No HASS_EXTERNAL_URL found. Setting up git poller...")
+  logger.warn(
+    { emoji: "⚠️" },
+    "No HASS_EXTERNAL_URL found. Setting up git poller...",
+  )
   await setupGitPoller()
 }
 
@@ -188,14 +192,14 @@ function setupWatcher({
     app: Subprocess<"ignore", "pipe", "pipe">
   }
 }) {
-  logger.info("👀 Watching directory:", directoryToWatch)
+  logger.debug({ emoji: "👀" }, "Watching directory: ${directoryToWatch}")
   const watcher = watch(
     directoryToWatch,
     { recursive: true },
     debounce(async function onFileChange(event, filename) {
       if (!filename) return
       if (shouldIgnoreFileOrFolder(filename)) return
-      logger.info(`⚠️ Change to ${filename} detected.`)
+      logger.info({ emoji: "⚠️" }, `Change to ${filename} detected.`)
       if (filename.endsWith("process.tsx")) {
         await killSubprocess(getSubprocesses().app)
         await restartAddon()
@@ -215,13 +219,13 @@ function setupWatcher({
 }
 
 process.on("SIGINT", async () => {
-  logger.fatal("👋 Exiting...")
+  logger.fatal({ emoji: "👋" }, "Exiting...")
   await callSoftKillListeners()
   await callKillListeners()
   process.exit(0)
 })
 process.on("SIGTERM", async () => {
-  logger.fatal("👋 Exiting...")
+  logger.fatal({ emoji: "👋" }, "Exiting...")
   await callSoftKillListeners()
   await callKillListeners()
   process.exit(0)

package/src/bunInstall.tsx

@@ -2,10 +2,10 @@ import { logger } from "@typed-assistant/logger"
 import { $ } from "bun"
 
 export async function bunInstall() {
-  logger.info("🏗️ Running bun install...")
+  logger.info({ emoji: "🏗️" }, "Running bun install...")
   return $`bun install --frozen-lockfile --cache-dir=.bun-cache`
     .text()
     .catch((error) => {
-      logger.error(`🚨 Failed to run bun install: ${error}`)
+      logger.error({ emoji: "🚨" }, `Failed to run bun install: ${error}`)
     })
 }

package/src/killProcess.tsx

@@ -21,7 +21,7 @@ export async function callSoftKillListeners() {
 }
 
 export async function killSubprocess(subprocess: Subprocess) {
-  logger.fatal(`💀 Killing process: ${subprocess.pid}`)
+  logger.fatal({ emoji: "💀" }, `Killing process: ${subprocess.pid}`)
   await callSoftKillListeners()
   subprocess.kill()
   await subprocess.exited

package/src/pullChanges.tsx

@@ -3,22 +3,25 @@ import { $ } from "bun"
 import { bunInstall } from "./bunInstall"
 
 export const pullChanges = async () => {
-  logger.info("⬇️ Pulling changes...")
-  const gitPullText = await $`git pull`.text()
+  logger.debug({ emoji: "⬇️" }, "Pulling changes...")
+  const { stderr, stdout } = await $`git pull`.quiet()
+  if (stderr.length > 0) {
+    logger.error(
+      { emoji: "⬇️🚨" },
+      `Failed to pull changes.\n  (${stderr.toString().trim()})`,
+    )
+  }
+  const gitPullText = stdout.toString()
   const packageJSONUpdated = /package.json/.test(gitPullText)
   const nothingNew = /Already up to date./.test(gitPullText)
-  if (!gitPullText) {
-    logger.error("⬇️🚨 Failed to pull changes.")
-    return { error: "Failed to pull changes." }
-  }
   if (nothingNew) {
-    logger.info("⬇️👌 No new changes.")
+    logger.debug({ emoji: "⬇️👌" }, "No new changes.")
     return {}
   } else {
-    logger.info("⬇️🆕 Changes pulled.")
+    logger.info({ emoji: "⬇️🆕" }, "Changes pulled.")
   }
   if (packageJSONUpdated) {
-    logger.info("⬇️📦 package.json updated.")
+    logger.info({ emoji: "⬇️📦" }, "package.json updated.")
     await bunInstall()
   }
   return {}

package/src/restartAddon.tsx

@@ -3,10 +3,10 @@ import { getSupervisorAPI } from "@typed-assistant/utils/getHassAPI"
 
 export const restartAddon = async () => {
   if (!process.env.SUPERVISOR_TOKEN) {
-    logger.fatal("♻️ Can't restart addon. Exiting...")
+    logger.fatal({ emoji: "♻️" }, "Can't restart addon. Exiting...")
     process.exit(1)
     return
   }
-  logger.fatal("♻️ Restarting addon...")
+  logger.fatal({ emoji: "♻️" }, "Restarting addon...")
   await getSupervisorAPI(`/addons/self/restart`, { method: "POST" })
 }

package/src/setupGitPoller.tsx

@@ -1,7 +1,6 @@
 import { logger } from "@typed-assistant/logger"
 import { ONE_SECOND } from "@typed-assistant/utils/durations"
 import { pullChanges } from "./pullChanges"
-import { withErrorHandling } from "@typed-assistant/utils/withErrorHandling"
 
 export const setupGitPoller = async ({
   gitPullPollDuration,
@@ -10,9 +9,11 @@ export const setupGitPoller = async ({
   gitPullPollDuration?: number
 } = {}) => {
   const duration = gitPullPollDuration ?? 30
-  const { error } = await pullChanges()
-  if (error) return
-  logger.info(`   ⏳ Pulling changes again in ${duration} seconds...`)
+  await pullChanges()
+  logger.debug(
+    { emoji: "⬇️⏳" },
+    `Pulling changes again in ${duration} seconds...`,
+  )
 
   setTimeout(() => {
     setupGitPoller({ gitPullPollDuration })

package/src/setupWebhook.tsx

@@ -20,12 +20,14 @@ const webhookIsSetup = async (webhookUrl: string) => {
     .then((d) => d.json())
 
   if (error) {
-    logger.error(`🚨 Failed to reach webhook "${webhookUrl}"`)
-    logger.error(`  ${error.message}`)
+    logger.error(
+      { additionalDetails: error.message, emoji: "🚨" },
+      `Failed to reach webhook "${webhookUrl}"`,
+    )
     return false
   }
 
-  logger.info("🪝 Webhook reached successfully: ")
+  logger.debug({ emoji: "🪝" }, "Webhook reached successfully: ")
   return true
 }
 
@@ -124,13 +126,16 @@ export const setupWebhook = async (webhookUrl: string): Promise<void> => {
     if (retries < 5) {
       retries++
       logger.error(
-        `🔁 Failed fetching webhooks. Retrying setup in ${retryTimeout / 1000}s...`,
+        { emoji: "🔁" },
+        `Failed fetching webhooks. Retrying setup in ${retryTimeout / 1000}s...`,
       )
       setTimeout(setupWebhook, retryTimeout)
       return
     }
-    logger.error("🚨 Failed fetching webhooks. Giving up.")
-    logger.error(`  ${error.message}`)
+    logger.error(
+      { additionalDetails: error.message, emoji: "🚨" },
+      "Failed fetching webhooks. Giving up.",
+    )
     return
   }
 
@@ -139,7 +144,7 @@ export const setupWebhook = async (webhookUrl: string): Promise<void> => {
   )
 
   if (webhookAlreadyExists) {
-    logger.info("🪝 Webhook already set up")
+    logger.info({ emoji: "🪝" }, "Webhook already set up")
     return
   }
 
@@ -152,15 +157,18 @@ export const setupWebhook = async (webhookUrl: string): Promise<void> => {
     if (retries < 5) {
       retries++
       logger.error(
-        `🔁 Failed creating webhook. Retrying setup in ${retryTimeout / 1000}s...`,
+        { emoji: "🔁" },
+        `Failed creating webhook. Retrying setup in ${retryTimeout / 1000}s...`,
       )
       setTimeout(setupWebhook, retryTimeout)
       return
     }
-    logger.error("🚨 Failed creating webhook. Giving up.")
-    logger.error(`  ${createError.message}`)
+    logger.error(
+      { additionalDetails: createError.message, emoji: "🚨" },
+      "Failed creating webhook. Giving up.",
+    )
     return
   }
 
-  logger.info("🪝 Webhook created: " + webhook.config.url)
+  logger.info({ emoji: "🪝" }, "Webhook created: " + webhook.config.url)
 }

package/src/setupWebserver.tsx

@@ -77,10 +77,10 @@ export const startWebappServer = async ({
     }
     throw new Error("Build failed")
   }
-  logger.info("🛠️ Web server built successfully")
+  logger.debug({ emoji: "🛠️" }, "Web server built successfully")
 
   await $`bunx tailwindcss -c ${tailwindConfig} -i ${cssFile} -o ${cssOutputFile}`.quiet()
-  logger.info("💄 Tailwind built successfully")
+  logger.debug({ emoji: "💄" }, "Tailwind built successfully")
 
   const indexHtml = (await Bun.file(indexHtmlFilePath).text())
     .replace(
@@ -189,10 +189,10 @@ export const startWebappServer = async ({
   })
 
   server.listen(8099)
-  logger.info("🌐 Web server listening on port 8099")
+  logger.info({ emoji: "🌐" }, "Web server listening on port 8099")
 
   const directory = join(process.cwd(), ".")
-  logger.info("👀 Watching log.txt")
+  logger.debug({ emoji: "👀" }, "Watching log.txt")
   const watcher = watch(directory, function onFileChange(_event, filename) {
     if (filename === "log.txt") {
       logSubscribers.forEach((send) => send())

package/src/webserver/Logs.tsx

@@ -6,22 +6,13 @@ import { app } from "./api"
 import { useWS } from "./useWS"
 import { getPrettyTimestamp } from "@typed-assistant/utils/getPrettyTimestamp"
 import { levels } from "@typed-assistant/logger/levels"
-
-const LogSchema = z.object({
-  level: z.number(),
-  time: z.number(),
-  pid: z.number(),
-  hostname: z.string(),
-  msg: z.string(),
-})
-
-type LogSchema = z.infer<typeof LogSchema>
+import type { LogSchema } from "@typed-assistant/logger"
 
 export const Logs = () => {
   const [limit, setLimit] = useState(200)
   const [level, setLevel] = useState<
     "trace" | "debug" | "info" | "warn" | "error" | "fatal"
-  >("trace")
+  >("info")
   const [dateTimeVisibility, setDateTimeVisibility] = useState<
     "hidden" | "timeOnly" | "visible"
   >("timeOnly")
@@ -35,7 +26,7 @@ export const Logs = () => {
     onMessage: useCallback((event) => {
       setLogs(
         (JSON.parse(event.data).logs as string[]).map((log: string) =>
-          LogSchema.parse(JSON.parse(log)),
+          JSON.parse(log),
         ),
       )
     }, []),
@@ -101,18 +92,33 @@ export const Logs = () => {
           {logs
             .filter((log) => log.level >= (levels[level] ?? 0))
             .sort((a, b) => b.time - a.time)
-            .map((log, index) => (
-              <li key={(log.time ?? index) + log.time + log.msg} className="">
-                <span className="text-slate-400 mr-2">
-                  {dateTimeVisibility === "hidden"
-                    ? null
-                    : dateTimeVisibility === "timeOnly"
-                      ? new Date(log.time).toLocaleTimeString("en-GB")
-                      : getPrettyTimestamp(log.time)}
-                </span>
-                {log.msg}
-              </li>
-            ))}
+            .map((log, index) => {
+              return (
+                <li
+                  key={(log.time ?? index) + log.time + log.msg}
+                  className="flex gap-1"
+                >
+                  <span className="text-slate-400 mr-2">
+                    {dateTimeVisibility === "hidden"
+                      ? null
+                      : dateTimeVisibility === "timeOnly"
+                        ? new Date(log.time).toLocaleTimeString("en-GB")
+                        : getPrettyTimestamp(log.time)}
+                  </span>
+                  <div className="flex">
+                    {log.emoji}{" "}
+                    {log.additionalDetails ? (
+                      <details>
+                        <summary>{log.msg}</summary>
+                        <pre>{log.additionalDetails}</pre>
+                      </details>
+                    ) : (
+                      log.msg
+                    )}
+                  </div>
+                </li>
+              )
+            })}
         </ul>
       </pre>
     </AppSection>