@typed-assistant/builder 0.0.62 → 0.0.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -25,10 +25,10 @@
     "home-assistant-js-websocket": "^8.2.0",
     "ts-toolbelt": "^9.6.0",
     "typescript": "^5.3.3",
-    "@typed-assistant/logger": "0.0.17",
     "@typed-assistant/eslint-config": "0.0.9",
-    "@typed-assistant/typescript-config": "0.0.9",
-    "@typed-assistant/utils": "0.0.15"
+    "@typed-assistant/logger": "0.0.17",
+    "@typed-assistant/utils": "0.0.15",
+    "@typed-assistant/typescript-config": "0.0.9"
   },
   "peerDependencies": {
     "home-assistant-js-websocket": "^8.2.0"

package/src/appProcess.tsx

@@ -2,21 +2,20 @@ import { logger } from "@typed-assistant/logger"
 import { generateTypes } from "@typed-assistant/types/generateTypes"
 import type { Subprocess } from "bun"
 import { $ } from "bun"
+import debounce from "debounce"
 import { readFileSync, watch } from "fs"
 import ignore from "ignore"
 import { join, relative } from "path"
+import { getAddonInfo as getAddonInfoAPI } from "./getAddonInfo"
 import {
   addKillListener,
   callKillListeners,
   callSoftKillListeners,
   killSubprocess,
 } from "./killProcess"
+import { restartAddon } from "./restartAddon"
 import { setupGitPoller } from "./setupGitPoller"
-import { setupWebhook } from "./setupWebhook"
 import { startWebappServer } from "./setupWebserver"
-import { restartAddon } from "./restartAddon"
-import { getAddonInfo as getAddonInfoAPI } from "./getAddonInfo"
-import debounce from "debounce"
 
 export async function setup({
   entryFile,
@@ -31,7 +30,6 @@ export async function setup({
   const slug = addonInfo?.data.slug ?? ""
   const directoryToWatch = join(process.cwd(), "./src")
   const addonUrl = `${slug}/ingress`
-  const webhookUrl = `${process.env.HASS_EXTERNAL_URL}${basePath}/webhook`
 
   let subprocesses = await buildAndStartAppProcess(entryFile, {
     mdiPaths: mdiPaths,
@@ -76,7 +74,7 @@ export async function setup({
       )
     },
   })
-  await setupGitSync(webhookUrl)
+  await setupGitSync()
 
   return subprocesses
 }
@@ -166,7 +164,7 @@ const getAddonInfo = async () => {
   return data
 }
 
-const setupGitSync = async (webhookUrl: string) => {
+const setupGitSync = async () => {
   if (
     !process.env.GITHUB_TOKEN ||
     !process.env.GITHUB_USERNAME ||
@@ -178,14 +176,8 @@ const setupGitSync = async (webhookUrl: string) => {
     )
     return { error: {} }
   }
-  if (process.env.HASS_EXTERNAL_URL) {
-    await setupWebhook(webhookUrl)
-    return
-  }
-  logger.warn(
-    { emoji: "⚠️" },
-    "No HASS_EXTERNAL_URL found. Setting up git poller...",
-  )
+
+  logger.warn({ emoji: "⬇️" }, "Setting up git poller...")
   await setupGitPoller()
 }
 

package/src/setupWebserver.tsx

@@ -92,13 +92,13 @@ const getStats = async () => {
           ? data.data.memory_usage
           : stats.max_memory_usage,
     }
-    logger.info(
+    logger.debug(
       { additionalDetails: JSON.stringify(stats, null, 2), emoji: "📊" },
       "Stats updated",
     )
   }
 
-  setTimeout(getStats, 30 * ONE_SECOND)
+  setTimeout(getStats, 10 * ONE_SECOND)
 }
 
 export const startWebappServer = async ({
@@ -164,8 +164,22 @@ export const startWebappServer = async ({
       return { message: "Restarting addon..." }
     })
     .get("/force-sync-with-github", async () => {
-      const { exitCode, stdout, stderr } =
+      const { exitCode, stderr } =
         await $`git reset --hard origin/${process.env.GITHUB_BRANCH}`.quiet()
+      if (exitCode) {
+        logger.error(
+          {
+            additionalDetails: stderr.toString().trim(),
+            emoji: "🔄🚨",
+          },
+          "Failed to reset to origin",
+        )
+        return {
+          message: "Failed to reset to origin",
+        }
+      }
+      logger.info({ emoji: "🔄" }, "Reset to origin")
+      return { message: "Reset to origin" }
     })
     .get(
       "/webhook",

package/src/webserver/App.tsx

@@ -1,11 +1,6 @@
-import { Terminal } from "./Terminal"
 import { Logs } from "./Logs"
-import { useEffect, useState } from "react"
-import { app } from "./api"
-import { Await } from "ts-toolbelt/out/Any/Await"
-import { AppSection } from "./AppSection"
-import { set } from "zod"
-import { ONE_SECOND } from "@typed-assistant/utils/durations"
+import { Stats } from "./Stats"
+import { Terminal } from "./Terminal"
 
 const basePath = process.env.BASE_PATH ?? ""
 
@@ -23,75 +18,4 @@ const App = () => {
   )
 }
 
-const Stats = () => {
-  const [counter, setCounter] = useState(0)
-  const [error, setError] = useState<string | null>(null)
-  const [lastUpdated, setLastUpdated] = useState<number | null>(null)
-  const [stats, setStats] =
-    useState<Awaited<ReturnType<typeof app.stats.get>>["data"]>(null)
-
-  useEffect(() => {
-    app.stats.get().then((stats) => {
-      setLastUpdated(Date.now())
-      if (stats.error) {
-        setError(stats.error.message)
-        return
-      }
-      setStats(stats.data)
-
-      const timeout = setTimeout(() => {
-        setCounter((c) => c + 1)
-      }, 30 * ONE_SECOND)
-      return () => clearTimeout(timeout)
-    })
-  }, [counter])
-
-  return (
-    <AppSection className="pb-0" fullHeight={false} scrollable={false}>
-      {error ? (
-        <>Error: {error}</>
-      ) : stats ? (
-        <div
-          title={`Last updated: ${lastUpdated ? new Date(lastUpdated).toLocaleTimeString() : "Never"}`}
-        >
-          <div className="mb-2 text-slate-400">
-            Last updated:{" "}
-            {lastUpdated ? new Date(lastUpdated).toLocaleTimeString() : "Never"}
-            , max memory usage: {bytesToMegaBytes(stats.max_memory_usage)}MB
-          </div>
-          <div className="mb-3">
-            <div className="mb-1">
-              Memory:{" "}
-              {stats.memory_usage
-                ? `${bytesToMegaBytes(stats.memory_usage ?? 0)} / ${bytesToMegaBytes(stats.memory_limit ?? 0)}MB`
-                : "Loading..."}
-            </div>
-            <ProgressBar value={stats.memory_percent ?? 0} />
-          </div>
-          <div className="mb-1">
-            CPU: {stats.cpu_percent ? `${stats.cpu_percent}%` : "Loading..."}
-          </div>
-          <ProgressBar value={stats.cpu_percent ?? 0} />
-        </div>
-      ) : (
-        <div>Loading...</div>
-      )}
-    </AppSection>
-  )
-}
-
-const ProgressBar = ({ value }: { value: number }) => {
-  return (
-    <div className="relative w-full h-2 bg-slate-800 rounded-md overflow-hidden">
-      <div
-        className="absolute h-full bg-slate-600"
-        style={{ width: `${value}%` }}
-      ></div>
-    </div>
-  )
-}
-
-const bytesToMegaBytes = (bytes: number) =>
-  Math.round((bytes / 1024 / 1024) * 100) / 100
-
 export default App

package/src/webserver/Logs.tsx

@@ -95,9 +95,9 @@ export const Logs = ({ basePath }: { basePath: string }) => {
           {logs
             .filter((log) => log.level >= (levels[level] ?? 0))
             .sort((a, b) => b.time - a.time)
-            .map((log, index) => {
+            .map((log) => {
               return (
-                <li key={index + JSON.stringify(log)} className="flex gap-1">
+                <li key={JSON.stringify(log)} className="flex gap-1">
                   <span className="text-slate-400 mr-2">
                     {dateTimeVisibility === "hidden"
                       ? null

package/src/webserver/Stats.tsx

@@ -0,0 +1,73 @@
+import { useEffect, useState } from "react"
+import { app } from "./api"
+import { AppSection } from "./AppSection"
+import { ONE_SECOND } from "@typed-assistant/utils/durations"
+
+export const Stats = () => {
+  const [counter, setCounter] = useState(0)
+  const [error, setError] = useState<string | null>(null)
+  const [lastUpdated, setLastUpdated] = useState<number | null>(null)
+  const [stats, setStats] =
+    useState<Awaited<ReturnType<typeof app.stats.get>>["data"]>(null)
+
+  useEffect(() => {
+    app.stats.get().then((stats) => {
+      setLastUpdated(Date.now())
+      if (stats.error) {
+        setError(stats.error.message)
+        return
+      }
+      setStats(stats.data)
+
+      const timeout = setTimeout(() => {
+        setCounter((c) => c + 1)
+      }, 10 * ONE_SECOND)
+      return () => clearTimeout(timeout)
+    })
+  }, [counter])
+
+  return (
+    <AppSection className="pb-0" fullHeight={false} scrollable={false}>
+      {error ? (
+        <>Error: {error}</>
+      ) : stats ? (
+        <>
+          <div className="mb-3">
+            <div className="mb-1">
+              Memory:{" "}
+              {stats.memory_usage
+                ? `${bytesToMegaBytes(stats.memory_usage ?? 0)} / ${bytesToMegaBytes(stats.memory_limit ?? 0)}MB`
+                : "Loading..."}
+            </div>
+            <ProgressBar value={stats.memory_percent ?? 0} />
+          </div>
+          <div className="mb-3">
+            <div className="mb-1">
+              CPU: {stats.cpu_percent ? `${stats.cpu_percent}%` : "Loading..."}
+            </div>
+            <ProgressBar value={stats.cpu_percent ?? 0} />
+          </div>
+          <div className=" text-slate-400">
+            Max memory usage: {bytesToMegaBytes(stats.max_memory_usage)}MB. Last
+            updated:{" "}
+            {lastUpdated ? new Date(lastUpdated).toLocaleTimeString() : "Never"}
+          </div>
+        </>
+      ) : (
+        <div>Loading...</div>
+      )}
+    </AppSection>
+  )
+}
+const ProgressBar = ({ value }: { value: number }) => {
+  return (
+    <div className="relative w-full h-2 bg-slate-800 rounded-md overflow-hidden">
+      <div
+        className="absolute h-full bg-slate-600"
+        style={{ width: `${value}%` }}
+      ></div>
+    </div>
+  )
+}
+const bytesToMegaBytes = (bytes: number) =>
+  Math.round((bytes / 1024 / 1024) * 100) / 100

package/src/webserver/Terminal.tsx

@@ -84,6 +84,14 @@ export function Terminal() {
             TypedAssistant <WSIndicator ws={ws.ws} />
           </h1>
           <div className="flex flex-wrap gap-2">
+            <ButtonAsync
+              onClick={() => app["force-sync-with-github"].get()}
+              stateLabels={{
+                idle: "Force sync with remote",
+                loading: "Syncing...",
+                success: "Successfully synced with remote",
+              }}
+            />
             <ButtonAsync
               onClick={() => app["restart-app"].get()}
               stateLabels={{