@typed-assistant/builder 0.0.74 → 0.0.76

package/CHANGELOG.md

@@ -1,13 +1,13 @@
 # @typed-assistant/builder
 
-## 0.0.2
+## 0.0.76
 
 ### Patch Changes
 
-- Update READMEs.
+- Add a filter for logs.
 
-## 0.0.1
+## 0.0.75
 
 ### Patch Changes
 
-- First version.
+- Prevent git pull from throwing.

package/package.json

@@ -1,16 +1,19 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
     "./pullChanges": "./src/pullChanges.tsx"
   },
   "dependencies": {
-    "ansi-to-html": "^0.7.2",
-    "@elysiajs/eden": "^0.8.1",
-    "elysia": "^0.8.9",
+    "@elysiajs/eden": "^1.1.3",
     "@mdi/svg": "^7.3.67",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "ansi-to-html": "^0.7.2",
+    "debounce": "^2.0.0",
+    "elysia": "^1.1.25",
     "ignore": "^5.3.0",
     "react": "^18",
     "react-dom": "^18",
@@ -18,18 +21,18 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@types/node": "^20.10.6",
     "@types/eslint": "^8.56.1",
-    "eslint-plugin-html": "^7.1.0",
+    "@types/node": "^20.10.6",
+    "bun-types": "^1.0.2",
     "eslint": "^8.56.0",
+    "eslint-plugin-html": "^7.1.0",
     "ts-toolbelt": "^9.6.0",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.0",
     "@typed-assistant/eslint-config": "0.0.10",
     "@typed-assistant/logger": "0.0.21",
     "@typed-assistant/utils": "0.0.18",
     "@typed-assistant/typescript-config": "0.0.10"
   },
-  "peerDependencies": {},
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"

package/src/pullChanges.tsx

@@ -8,7 +8,7 @@ export const pullChanges = async ({
   onChangesPulled: () => void
 }) => {
   logger.debug({ emoji: "⬇️" }, "Pulling changes...")
-  const { exitCode, stderr, stdout } = await $`git pull`.quiet()
+  const { exitCode, stderr, stdout } = await $`git pull`.nothrow().quiet()
   if (exitCode) {
     logger.error(
       { additionalDetails: stderr.toString().trim(), emoji: "⬇️🚨" },

package/src/setupWebserver.tsx

@@ -204,11 +204,16 @@ export const startWebappServer = async ({
     .get(
       "/log.txt",
       async ({ query }) => {
-        return getLogsFromFile({ level: "trace", limit: query.limit })
+        return getLogsFromFile({
+          level: "trace",
+          limit: query.limit,
+          filter: query.filter,
+        })
       },
       {
         query: t.Object({
           limit: t.Optional(t.String()),
+          filter: t.Optional(t.String()),
         }),
       },
     )
@@ -224,11 +229,13 @@ export const startWebappServer = async ({
           t.Literal("fatal"),
         ]),
         offset: t.Optional(t.String()),
+        filter: t.Optional(t.String()),
       }),
 
       async open(ws) {
         ws.send(
           await getLogsFromFile({
+            filter: ws.data.query.filter,
             level: ws.data.query.level,
             limit: ws.data.query.limit,
             offset: ws.data.query.offset,
@@ -237,6 +244,7 @@ export const startWebappServer = async ({
         logSubscribers.set(ws.id, async () => {
           ws.send(
             await getLogsFromFile({
+              filter: ws.data.query.filter,
               level: ws.data.query.level,
               limit: ws.data.query.limit,
               offset: ws.data.query.offset,
@@ -343,10 +351,12 @@ const getLogsFromFile = async ({
   level,
   limit: limitProp,
   offset: offsetProp = "0",
+  filter,
 }: {
   level: keyof typeof levels
   limit?: string
   offset?: string
+  filter?: string
 }) => {
   try {
     const limit = Number(limitProp)
@@ -360,6 +370,12 @@ const getLogsFromFile = async ({
             : { msg: "Empty line", level: levels.fatal }) as LogSchema,
       )
       .filter((log) => log.level >= levels[level])
+      .filter((log) => {
+        if (!filter) return true
+        const keywords = filter.toLowerCase().split(" ")
+        const logText = JSON.stringify(log).toLowerCase()
+        return keywords.every((keyword) => logText.includes(keyword))
+      })
 
     const logFile = limit
       ? lines.slice(

package/src/webserver/Logs.tsx

@@ -10,7 +10,8 @@ export const Logs = ({ basePath }: { basePath: string }) => {
   const [dateTimeVisibility, setDateTimeVisibility] = useState<
     "hidden" | "timeOnly" | "visible"
   >("timeOnly")
-  const { level, setLevel, logs, offset, setOffset, ws } = useLogStore()
+  const { level, setLevel, logs, offset, setOffset, ws, filter, setFilter } =
+    useLogStore()
 
   return (
     <>
@@ -21,9 +22,18 @@ export const Logs = ({ basePath }: { basePath: string }) => {
               Logs <WSIndicator ws={ws?.ws} />
             </h2>
 
-            <a className={buttonStyle} href={`${basePath}/log.txt?limit=500`}>
-              View raw log.txt
-            </a>
+            <div className="flex gap-2 mb-2">
+              <a className={buttonStyle} href={`${basePath}/log.txt?limit=500`}>
+                View raw log.txt
+              </a>
+              <input
+                type="search"
+                placeholder="Filter logs..."
+                className="border border-gray-300 rounded-md text-slate-800 px-2 flex-grow placeholder:text-slate-700"
+                value={filter}
+                onChange={(e) => setFilter(e.target.value)}
+              />
+            </div>
 
             <div className="flex flex-wrap gap-2 justify-between w-full items-end">
               <div className="flex flex-wrap gap-2">

package/src/webserver/logStore.tsx

@@ -16,14 +16,18 @@ export const getLogStore = ({
   level,
   limit,
   offset,
+  filter,
 }: {
   level: keyof typeof levels
   limit: string
   offset: string
+  filter: string
 }) => ({
   subscribe: (listener: () => void) => {
     listeners = [...listeners, listener]
-    const ws = app.logsws.subscribe({ $query: { level, limit, offset } })
+    const ws = app.logsws.subscribe({
+      $query: { level, limit, offset, filter },
+    })
     logStore = {
       logs: [],
       ws,
@@ -67,14 +71,16 @@ export const useLogStore = () => {
     "trace" | "debug" | "info" | "warn" | "error" | "fatal"
   >("info")
   const [offset, setOffset] = useState(0)
+  const [filter, setFilter] = useState("")
   const logStore = useMemo(
     () =>
       getLogStore({
         level,
         limit: limit.toString(),
         offset: offset.toString(),
+        filter,
       }),
-    [level, limit, offset],
+    [level, limit, offset, filter],
   )
   const { logs, ws } = useSyncExternalStore(
     logStore.subscribe,
@@ -89,6 +95,8 @@ export const useLogStore = () => {
     logs,
     offset,
     setOffset,
+    filter,
+    setFilter,
     ws,
   }
 }