npm - @typed-assistant/builder - Versions diffs - 0.0.9 → 0.0.11 - Mend

@typed-assistant/builder 0.0.9 → 0.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json +6 -4
package/src/appProcess.tsx +13 -2
package/src/setupWebserver.tsx +103 -0
package/src/webserver/terminal.html +56 -0

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -8,6 +8,8 @@
     "./pullChanges": "./src/pullChanges.tsx"
   },
   "dependencies": {
+    "ansi-to-html": "^0.7.2",
+    "elysia": "^0.8.9",
     "@mdi/svg": "^7.3.67",
     "ignore": "^5.3.0"
   },
@@ -17,10 +19,10 @@
     "eslint": "^8.56.0",
     "home-assistant-js-websocket": "^8.2.0",
     "typescript": "^5.3.3",
-    "@typed-assistant/typescript-config": "0.0.4",
-    "@typed-assistant/utils": "0.0.7",
     "@typed-assistant/eslint-config": "0.0.4",
-    "@typed-assistant/logger": "0.0.5"
+    "@typed-assistant/logger": "0.0.5",
+    "@typed-assistant/typescript-config": "0.0.4",
+    "@typed-assistant/utils": "0.0.7"
   },
   "peerDependencies": {
     "home-assistant-js-websocket": "^8.2.0"

package/src/appProcess.tsx CHANGED Viewed

@@ -8,6 +8,7 @@ import { ONE_SECOND } from "@typed-assistant/utils/durations"
 import { getHassAPI, getSupervisorAPI } from "@typed-assistant/utils/getHassAPI"
 import { pullChanges } from "./pullChanges"
 import { withErrorHandling } from "@typed-assistant/utils/withErrorHandling"
+import { startWebappServer } from "./setupWebserver"
 type Processes = Awaited<ReturnType<typeof buildAndStartAppProcess>>
@@ -22,7 +23,10 @@ async function buildAndStartAppProcess(
 async function startApp(appSourceFile: string = "src/entry.tsx") {
   log("🚀 Starting app...")
   const path = join(process.cwd(), appSourceFile)
-  return Bun.spawn(["bun", path], { env: { FORCE_COLOR: "1" } })
+  return Bun.spawn(["bun", path], {
+    stderr: "pipe",
+    env: { ...process.env, FORCE_COLOR: "1" },
+  })
 }
 async function kill(process: Subprocess) {
@@ -59,7 +63,6 @@ export async function setupWatcher(
   if (addonInfoError) {
     log(`🚨 Failed to get addon info: ${addonInfoError}`)
   }
-  console.log("ℹ️ ~ addonInfo:", addonInfo)
   await setupGitSync()
   let subprocesses = await buildAndStartAppProcess(...args)
@@ -78,9 +81,12 @@ export async function setupWatcher(
     },
   )
+  startWebappServer({getSubprocesses: () => subprocesses})
   return subprocesses
 }
 const setupGitSync = async ({
   gitPullPollDuration,
 }: {
@@ -104,6 +110,11 @@ const shouldIgnoreFileOrFolder = (filename: string) =>
   ig.ignores(relative(process.cwd(), filename))
 const restartAddon = async () => {
+  if (!process.env.SUPERVISOR_TOKEN) {
+    log("♻️ Can't restart addon. Exiting...")
+    process.exit(0)
+    return
+  }
   log("♻️ Restarting addon...")
   await getHassAPI(`http://supervisor/addons/self/restart`, { method: "POST" })
 }

package/src/setupWebserver.tsx ADDED Viewed

@@ -0,0 +1,103 @@
+import Convert from "ansi-to-html"
+import type { Context } from "elysia"
+import { Elysia, t } from "elysia"
+import type { Subprocess } from "bun"
+import terminalHtmlUrl from "./webserver/terminal.html" with { type: "url" }
+const convert = new Convert()
+const decoder = new TextDecoder()
+const getIngressPath = (req: Context["request"]) =>
+  req.headers.get("x-ingress-path") ?? ""
+const readers = new Map<
+  ReadableStream<Uint8Array>,
+  ReadableStreamDefaultReader<Uint8Array>
+>()
+const getReader = (stream: ReadableStream<Uint8Array>) => {
+  const cachedReader = readers.get(stream)
+  if (!cachedReader) {
+    readers.forEach((_reader, cachedStream) => {
+      readers.delete(cachedStream)
+    })
+  }
+  const reader = cachedReader ?? stream.getReader()
+  readers.set(stream, reader)
+  return reader
+}
+const subscribers = new Map<number, (message: string) => void>()
+let lastMessage = ""
+export const startWebappServer = async ({
+  getSubprocesses,
+}: {
+  getSubprocesses: () => {
+    app: Subprocess<"ignore", "pipe", "pipe">
+  }
+}) => {
+  new Elysia()
+    .get("/", ({ request }) => {
+      getIngressPath(request)
+      return new Response(
+        `
+    <html>
+      <meta charset="UTF-8">
+      <body>
+        <a href="${getIngressPath(request)}/log.txt">Logs</a>
+        <a href="${getIngressPath(request)}/terminal">Terminal</a>
+      </body>
+    </html>
+  `,
+        { headers: { "content-type": "text/html" } },
+      )
+    })
+    .get("/terminal", Bun.file(terminalHtmlUrl))
+    .get("/log.txt", Bun.file("./log.txt"))
+    .get("/*", ({ request }) => {
+      getIngressPath(request)
+      return "Hello Elysia"
+    })
+    .ws("/ws", {
+      body: t.Object({
+        id: t.String(),
+      }),
+      async open(ws) {
+        ws.send("Connected successfully. Awaiting messages...")
+        subscribers.set(ws.id, (message) => {
+          ws.send(message)
+        })
+        console.log("😅😅😅 ~ ws.id:", ws.id)
+      },
+      close(ws, code, message) {
+        console.log("ws closed", code, message, ws.id)
+        console.log("😅😅😅 ~ ws.id:", ws.id)
+        subscribers.delete(ws.id)
+      },
+    })
+    .listen(8099)
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    const stdoutReader = getReader(getSubprocesses().app.stdout)
+    const { value } = await stdoutReader.read()
+    const convertedMessage = convert.toHtml(decoder.decode(value))
+    if (convertedMessage !== "") {
+      lastMessage = convertedMessage
+    }
+    if (convertedMessage === "") {
+      subscribers.forEach((send) =>
+        send(
+          "Process is returning an empty string. This was the last non-empty message:\n\n" +
+            lastMessage,
+        ),
+      )
+      await new Promise((resolve) => setTimeout(resolve, 1000))
+      continue
+    }
+    subscribers.forEach((send) => send(convertedMessage))
+  }
+}

package/src/webserver/terminal.html ADDED Viewed

@@ -0,0 +1,56 @@
+<!doctype html>
+<h1>Terminal</h1>
+<pre id="log"></pre>
+<style>
+  html {
+    background: #000;
+    color: #fff;
+  }
+</style>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/ansi-to-html/0.7.2/ansi_to_html.js"></script>
+<script>
+  function log(msg) {
+    document.getElementById("log").innerHTML = msg + "\n"
+  }
+  const getWS = () => {
+    const url = new URL(window.location.href)
+    url.pathname = url.pathname.replace("/terminal", "/ws")
+    url.protocol = "ws:"
+    return new WebSocket(
+      // "ws://192.168.86.11:8123/api/hassio_ingress/wmQTEkorulChwnbeWV1GvPSwBsEpGzYlyLR70rdHzH0/ws",
+      // "ws://localhost:8099/ws",
+      url,
+    )
+  }
+  const setupWs = (ws) => {
+    ws.onopen = function () {
+      console.log("CONNECT")
+    }
+    ws.onclose = function () {
+      console.log("DISCONNECT")
+      document.getElementById("log").innerHTML +=
+        "Disconnected. Retrying..." + "\n"
+      retry()
+    }
+    ws.onmessage = function (event) {
+      log(event.data)
+    }
+  }
+  var ws = getWS()
+  console.log("😅😅😅 ~ ws:", ws)
+  setupWs(ws)
+  const retry = () => {
+    console.log("Retrying in 1 second...")
+    setTimeout(() => {
+      if (ws.readyState === WebSocket.OPEN) {
+        return
+      }
+      ws = getWS()
+      setupWs(ws)
+    }, 1000)
+  }
+</script>