@typed-assistant/builder 0.0.54 → 0.0.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.54",
+  "version": "0.0.55",
   "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/utils": "0.0.15"
+    "@typed-assistant/typescript-config": "0.0.9"
   },
   "peerDependencies": {
     "home-assistant-js-websocket": "^8.2.0"

package/src/setupWebserver.tsx

@@ -1,3 +1,4 @@
+import type { LogSchema } from "@typed-assistant/logger"
 import { logger } from "@typed-assistant/logger"
 import Convert from "ansi-to-html"
 import type { Subprocess } from "bun"
@@ -9,6 +10,7 @@ import type { List, String } from "ts-toolbelt"
 import { getAddonInfo } from "./getAddonInfo"
 import { addKillListener, killSubprocess } from "./killProcess"
 import { restartAddon } from "./restartAddon"
+import { levels } from "@typed-assistant/logger/levels"
 
 const indexHtmlFilePath = `${import.meta.dir}/webserver/index.html` as const
 const cssFile = `${import.meta.dir}/webserver/input.css` as const
@@ -142,7 +144,7 @@ export const startWebappServer = async ({
     .get(
       "/log.txt",
       async ({ query }) => {
-        return getLogsFromFile(query.limit)
+        return getLogsFromFile("trace", query.limit)
       },
       {
         query: t.Object({
@@ -153,12 +155,32 @@ export const startWebappServer = async ({
     .ws("/logsws", {
       query: t.Object({
         limit: t.Optional(t.String()),
+        level: t.Union([
+          t.Literal("trace"),
+          t.Literal("debug"),
+          t.Literal("info"),
+          t.Literal("warn"),
+          t.Literal("error"),
+          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(),
+          }),
+        ),
       }),
-      response: t.Object({ logs: t.Array(t.String()) }),
       async open(ws) {
-        ws.send(await getLogsFromFile(ws.data.query.limit))
+        ws.send(await getLogsFromFile(ws.data.query.level, ws.data.query.limit))
         logSubscribers.set(ws.id, async () => {
-          ws.send(await getLogsFromFile(ws.data.query.limit))
+          ws.send(
+            await getLogsFromFile(ws.data.query.level, ws.data.query.limit),
+          )
         })
       },
       close(ws) {
@@ -242,15 +264,36 @@ export const startWebappServer = async ({
 
 export type WebServer = Awaited<ReturnType<typeof startWebappServer>>
 
-const getLogsFromFile = async (limit?: string) => {
+const getLogsFromFile = async (level: keyof typeof levels, limit?: string) => {
   try {
-    const lines = (await Bun.file("./log.txt").text()).split("\n")
+    const lines = (await Bun.file("./log.txt").text())
+      .split("\n")
+      .map(
+        (line) =>
+          (line
+            ? JSON.parse(line)
+            : { msg: "Empty line", level: levels.fatal }) as LogSchema,
+      )
+      .filter((log) => log.level >= levels[level])
+
     const logFile = limit
       ? lines.slice(lines.length - 1 - Number(limit), lines.length - 1)
       : lines
+
     return { logs: logFile }
   } catch (e) {
-    return { logs: ["Error reading log.txt file"] }
+    return {
+      logs: [
+        {
+          msg: "Error reading log.txt file",
+          level: levels.fatal,
+        },
+        {
+          msg: e instanceof Error ? e.message : e,
+          level: levels.fatal,
+        },
+      ] as LogSchema[],
+    }
   }
 }
 

package/src/webserver/Logs.tsx

@@ -21,15 +21,13 @@ export const Logs = ({ basePath }: { basePath: string }) => {
 
   const ws = useWS({
     subscribe: useCallback(
-      () => app.logsws.subscribe({ $query: { limit: limit.toString() } }),
-      [limit],
+      () =>
+        app.logsws.subscribe({ $query: { level, limit: limit.toString() } }),
+      [level, limit],
     ),
     onMessage: useCallback((event) => {
-      setLogs(
-        (JSON.parse(event.data).logs as string[]).map((log: string) =>
-          JSON.parse(log),
-        ),
-      )
+      console.log("😅😅😅 ~ event:", event)
+      setLogs((JSON.parse(event.data) as { logs: LogSchema[] }).logs)
     }, []),
   })
 

package/src/webserver/useWS.tsx

@@ -11,7 +11,7 @@ export function useWS({
   const [ws, setWS] = useState(subscribe)
 
   useEffect(() => {
-    let timeout: NodeJS.Timeout
+    let timeout: ReturnType<typeof setTimeout>
 
     ws.ws.onclose = function () {
       timeout = setTimeout(() => {