@typed-assistant/builder 0.0.55 → 0.0.57

package/package.json

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

package/src/pullChanges.tsx

@@ -10,6 +10,7 @@ export const pullChanges = async () => {
       { emoji: "⬇️🚨" },
       `Failed to pull changes.\n  (${stderr.toString().trim()})`,
     )
+    return
   }
   const gitPullText = stdout.toString()
   const packageJSONUpdated = /package.json/.test(gitPullText)

package/src/setupWebserver.tsx

@@ -11,6 +11,8 @@ import { getAddonInfo } from "./getAddonInfo"
 import { addKillListener, killSubprocess } from "./killProcess"
 import { restartAddon } from "./restartAddon"
 import { levels } from "@typed-assistant/logger/levels"
+import { getSupervisorAPI } from "@typed-assistant/utils/getHassAPI"
+import { withErrorHandling } from "@typed-assistant/utils/withErrorHandling"
 
 const indexHtmlFilePath = `${import.meta.dir}/webserver/index.html` as const
 const cssFile = `${import.meta.dir}/webserver/input.css` as const
@@ -141,6 +143,20 @@ export const startWebappServer = async ({
         translations: "HIDDEN",
       }
     })
+    .get("/stats", async () => {
+      const { data, error } = await withErrorHandling(
+        getSupervisorAPI<{
+          error?: never
+          cpu_percent: number
+          memory_usage: number
+          memory_limit: number
+          memory_percent: number
+        }>,
+      )("/addons/self/stats")
+
+      if (error) return { error: error.message }
+      return data
+    })
     .get(
       "/log.txt",
       async ({ query }) => {
@@ -164,17 +180,6 @@ export const startWebappServer = async ({
           t.Literal("fatal"),
         ]),
       }),
-      response: t.Object({
-        logs: t.Array(
-          t.Object({
-            level: t.Number(),
-            time: t.Number(),
-            pid: t.Number(),
-            hostname: t.String(),
-            msg: t.String(),
-          }),
-        ),
-      }),
       async open(ws) {
         ws.send(await getLogsFromFile(ws.data.query.level, ws.data.query.limit))
         logSubscribers.set(ws.id, async () => {

package/src/webserver/App.tsx

@@ -1,5 +1,8 @@
 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"
 
 const basePath = process.env.BASE_PATH ?? ""
 
@@ -10,10 +13,43 @@ const App = () => {
         <Terminal />
       </div>
       <div className="col-span-1">
-        <Logs basePath={basePath} />
+        <div className="p-4 text-xs h-full max-h-dvh w-dvw md:w-auto overflow-x-auto flex flex-col">
+          <Logs basePath={basePath} />
+          <Logs basePath={basePath} />
+        </div>
       </div>
     </div>
   )
 }
 
+const Stats = () => {
+  const [error, setError] = useState<string | null>(null)
+  const [stats, setStats] =
+    useState<Awaited<ReturnType<typeof app.stats.get>>["data"]>()
+
+  useEffect(() => {
+    app.stats.get().then((stats) => {
+      if (stats.error || stats.data.error) {
+        setError(stats.error?.message ?? stats.data?.error ?? "Unknown error")
+        return
+      }
+
+      setStats(stats.data)
+    })
+  }, [])
+
+  if (error || stats?.error) {
+    return <div>Error: {error}</div>
+  }
+  if (stats?.error) {
+    return <div>Error: {error}</div>
+  }
+
+  return (
+    <div className="">
+      <div>Memory: </div>
+    </div>
+  )
+}
+
 export default App

package/src/webserver/Logs.tsx

@@ -1,13 +1,12 @@
+import type { LogSchema } from "@typed-assistant/logger"
+import { levels } from "@typed-assistant/logger/levels"
+import { getPrettyTimestamp } from "@typed-assistant/utils/getPrettyTimestamp"
 import { useCallback, useState } from "react"
-import { z } from "zod"
 import { AppSection } from "./AppSection"
 import { WSIndicator } from "./WSIndicator"
 import { app } from "./api"
-import { useWS } from "./useWS"
-import { getPrettyTimestamp } from "@typed-assistant/utils/getPrettyTimestamp"
-import { levels } from "@typed-assistant/logger/levels"
-import type { LogSchema } from "@typed-assistant/logger"
 import { buttonStyle } from "./styles"
+import { useWS } from "./useWS"
 
 export const Logs = ({ basePath }: { basePath: string }) => {
   const [limit, setLimit] = useState(200)