datool 0.0.2 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datool",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "type": "module",
   "description": "Local-only config-driven log viewer with SSE streaming and a generic table UI.",
   "bin": {

package/src/client/App.tsx

@@ -25,6 +25,7 @@ import type {
   DatoolClientConfig,
   DatoolClientStream,
   DatoolColumn,
+  DatoolSseEndEvent,
   DatoolRowEvent,
   DatoolSseErrorEvent,
 } from "../shared/types"
@@ -45,6 +46,7 @@ import {
   writeDatoolUrlState,
 } from "@/lib/datool-url-state"
 import { LOG_VIEWER_ICONS } from "@/lib/datool-icons"
+import { upsertViewerRow } from "./stream-state"
 
 type ViewerRow = Record<string, unknown> & {
   __datoolRowId: string
@@ -242,6 +244,10 @@ function parseErrorEvent(event: MessageEvent<string>) {
   return JSON.parse(event.data) as DatoolSseErrorEvent
 }
 
+function parseEndEvent(event: MessageEvent<string>) {
+  return JSON.parse(event.data) as DatoolSseEndEvent
+}
+
 function stringifyRowActionValue(value: unknown) {
   if (value === null || value === undefined) {
     return ""
@@ -773,13 +779,12 @@ export default function App() {
     const handleRow = (event: MessageEvent<string>) => {
       const payload = parseRowEvent(event)
 
-      setRows((currentRows) => [
-        ...currentRows,
-        {
+      setRows((currentRows) =>
+        upsertViewerRow(currentRows, {
           ...payload.row,
           __datoolRowId: payload.id,
-        },
-      ])
+        })
+      )
     }
 
     const handleRuntimeError = (event: MessageEvent<string>) => {
@@ -788,6 +793,13 @@ export default function App() {
       setErrorMessage(payload.message)
     }
 
+    const handleEnd = (event: MessageEvent<string>) => {
+      parseEndEvent(event)
+      eventSource.close()
+      eventSourceRef.current = null
+      setIsConnected(false)
+    }
+
     eventSource.onopen = () => {
       setIsConnected(true)
     }
@@ -797,14 +809,19 @@ export default function App() {
     }
 
     eventSource.addEventListener("row", handleRow as EventListener)
-    eventSource.addEventListener("error", handleRuntimeError as EventListener)
+    eventSource.addEventListener(
+      "runtime-error",
+      handleRuntimeError as EventListener
+    )
+    eventSource.addEventListener("end", handleEnd as EventListener)
 
     return () => {
       eventSource.removeEventListener("row", handleRow as EventListener)
       eventSource.removeEventListener(
-        "error",
+        "runtime-error",
         handleRuntimeError as EventListener
       )
+      eventSource.removeEventListener("end", handleEnd as EventListener)
       eventSource.close()
       setIsConnected(false)
     }

package/src/client/stream-state.ts

@@ -0,0 +1,20 @@
+export type StreamViewerRow = Record<string, unknown> & {
+  __datoolRowId: string
+}
+
+export function upsertViewerRow<T extends StreamViewerRow>(
+  currentRows: T[],
+  nextRow: T
+) {
+  const existingIndex = currentRows.findIndex(
+    (row) => row.__datoolRowId === nextRow.__datoolRowId
+  )
+
+  if (existingIndex < 0) {
+    return [...currentRows, nextRow]
+  }
+
+  return currentRows.map((row, index) =>
+    index === existingIndex ? nextRow : row
+  )
+}

package/src/node/server.ts

@@ -10,6 +10,7 @@ import type {
   DatoolActionResolveResult,
   DatoolActionResponse,
   DatoolConfig,
+  DatoolSseEndEvent,
   DatoolSseErrorEvent,
 } from "../shared/types"
 
@@ -74,6 +75,12 @@ function toErrorPayload(error: unknown): DatoolSseErrorEvent {
   }
 }
 
+function toEndPayload(reason: DatoolSseEndEvent["reason"]): DatoolSseEndEvent {
+  return {
+    reason,
+  }
+}
+
 function encodeSseEvent(event: string, data: unknown) {
   return `event: ${event}\ndata: ${JSON.stringify(data)}\n\n`
 }
@@ -279,15 +286,23 @@ function createSseResponse(
         abortController.signal,
         {
           async onError(error) {
-            send("error", toErrorPayload(error))
+            send("runtime-error", toErrorPayload(error))
           },
           async onRow(payload) {
             send("row", payload)
           },
         }
       )
+        .then(() => {
+          if (!abortController.signal.aborted) {
+            send("end", toEndPayload("completed"))
+          }
+        })
         .catch((error) => {
-          send("error", toErrorPayload(error))
+          if (!abortController.signal.aborted) {
+            send("runtime-error", toErrorPayload(error))
+            send("end", toEndPayload("error"))
+          }
         })
         .finally(() => {
           clearInterval(heartbeat)

package/src/shared/types.ts

@@ -179,6 +179,10 @@ export type DatoolSseErrorEvent = {
   message: string
 }
 
+export type DatoolSseEndEvent = {
+  reason: "completed" | "error"
+}
+
 export type DatoolActionRequest = {
   rows: Record<string, unknown>[]
 }