effect-start 0.26.0 → 0.28.0

package/src/{console → tower}/routes/errors/route.tsx

@@ -2,44 +2,37 @@ import * as Stream from "effect/Stream"
 import * as Route from "../../../Route.ts"
 import * as HyperHtml from "../../../hyper/HyperHtml.ts"
 import * as HyperRoute from "../../../hyper/HyperRoute.ts"
-import * as ConsoleStore from "../../ConsoleStore.ts"
+import * as TowerStore from "../../TowerStore.ts"
 import * as Errors from "../../ui/Errors.tsx"
 import * as Shell from "../../ui/Shell.tsx"
 
-const prefix = ConsoleStore.store.prefix
-
-function collectTags(): Array<string> {
-  const tags = new Set<string>()
-  for (const error of ConsoleStore.store.errors.toArray()) {
-    for (const d of error.details) {
-      if (d.tag) tags.add(d.tag)
-    }
-  }
-  return Array.from(tags).sort()
-}
-
-function filterErrors(url: URL): Array<ConsoleStore.ConsoleError> {
-  const search = url.searchParams.get("errorSearch") || ""
-  const tag = url.searchParams.get("errorTag") || ""
-  let errors = ConsoleStore.store.errors.toArray()
-  if (tag) {
-    errors = errors.filter((e) => e.details.some((d) => d.tag && d.tag.startsWith(tag)))
-  }
-  if (search) {
-    const lower = search.toLowerCase()
-    errors = errors.filter((e) => {
-      const firstLine = e.prettyPrint.split("\n")[0] ?? ""
-      return firstLine.toLowerCase().includes(lower)
-    })
-  }
-  return errors.reverse()
-}
+const prefix = TowerStore.store.prefix
 
 export default Route.get(
   HyperRoute.html(function* (ctx) {
     const url = new URL(ctx.request.url)
-    const errors = filterErrors(url)
-    const tags = collectTags()
+    const search = url.searchParams.get("errorSearch") || ""
+    const tag = url.searchParams.get("errorTag") || ""
+    const allErrors = yield* TowerStore.allErrors(TowerStore.store.sql)
+    const tagSet = new Set<string>()
+    for (const error of allErrors) {
+      for (const d of error.details) {
+        if (d.tag) tagSet.add(d.tag)
+      }
+    }
+    const sortedTags = Array.from(tagSet).sort()
+    let errors = allErrors
+    if (tag) {
+      errors = errors.filter((e) => e.details.some((d) => d.tag && d.tag.startsWith(tag)))
+    }
+    if (search) {
+      const lower = search.toLowerCase()
+      errors = errors.filter((e) => {
+        const firstLine = e.prettyPrint.split("\n")[0] ?? ""
+        return firstLine.toLowerCase().includes(lower)
+      })
+    }
+    errors = errors.reverse()
 
     return (
       <Shell.Shell prefix={prefix} active="errors">
@@ -65,7 +58,7 @@ export default Route.get(
               data-on:input={(c) => c.actions.get(location.href, { contentType: "form" })}
             />
             <datalist id="error-tags">
-              {tags.map((t) => (
+              {sortedTags.map((t) => (
                 <option value={t} />
               ))}
             </datalist>
@@ -80,7 +73,7 @@ export default Route.get(
     )
   }),
   Route.sse(
-    Stream.fromPubSub(ConsoleStore.store.events).pipe(
+    Stream.fromPubSub(TowerStore.store.events).pipe(
       Stream.filter((e) => e._tag === "Error"),
       Stream.map((e) => {
         const html = HyperHtml.renderToString(<Errors.ErrorLine error={e.error} />).replace(

package/src/{console → tower}/routes/fiberDetail.tsx

@@ -1,8 +1,9 @@
 import * as Schema from "effect/Schema"
 import * as Route from "../../Route.ts"
 import * as RouteSchema from "../../RouteSchema.ts"
+import * as Unique from "../../Unique.ts"
 import * as HyperRoute from "../../hyper/HyperRoute.ts"
-import * as ConsoleStore from "../ConsoleStore.ts"
+import * as TowerStore from "../TowerStore.ts"
 import * as Fibers from "../ui/Fibers.tsx"
 import * as Shell from "../ui/Shell.tsx"
 
@@ -12,35 +13,31 @@ export default Route.get(
     const fiberId = ctx.pathParams.id
     const fiberName = fiberId.startsWith("#") ? fiberId : `#${fiberId}`
 
-    const allLogs = ConsoleStore.store.logs.toArray()
-    const fiberLogs = allLogs.filter((l) => l.fiberId === fiberName)
-
-    const allSpans = ConsoleStore.store.spans.toArray()
-    const fiberSpans = allSpans.filter((s) => {
-      const spanFiber = s.attributes["fiber.id"] as string | undefined
-      return spanFiber === fiberName
-    })
+    const fiberLogs = yield* TowerStore.logsByFiberId(TowerStore.store.sql, fiberName)
+    const fiberSpans = yield* TowerStore.spansByFiberId(TowerStore.store.sql, fiberName)
 
     const fiberNum = parseInt(fiberName.slice(1), 10)
-    const counter = ConsoleStore.fiberIdCounter()
+    const counter = TowerStore.fiberIdCounter()
     let alive: "alive" | "dead" | "unknown" = "unknown"
     if (!isNaN(fiberNum)) {
       if (fiberNum < counter) alive = "dead"
       else alive = "unknown"
     }
     if (fiberLogs.length > 0 || fiberSpans.length > 0) {
-      const hasRecent = fiberLogs.some((l) => Date.now() - l.date.getTime() < 5000)
+      const hasRecent = fiberLogs.some(
+        (l) => Date.now() - Number(Unique.snowflake.timestamp(l.id)) < 5000,
+      )
       if (hasRecent) alive = "alive"
       else if (fiberNum < counter) alive = "dead"
     }
 
-    const parents = Fibers.getParentChain(fiberName, ConsoleStore.store.fiberParents)
-    const fiberContext = ConsoleStore.store.fiberContexts.get(fiberName)
+    const parents = yield* TowerStore.getParentChain(TowerStore.store.sql, fiberName)
+    const fiberContext = yield* TowerStore.getFiberContext(TowerStore.store.sql, fiberName)
 
     return (
-      <Shell.Shell prefix={ConsoleStore.store.prefix} active="fibers">
+      <Shell.Shell prefix={TowerStore.store.prefix} active="fibers">
         <Fibers.FiberDetail
-          prefix={ConsoleStore.store.prefix}
+          prefix={TowerStore.store.prefix}
           fiberId={fiberName}
           logs={fiberLogs}
           spans={fiberSpans}

package/src/tower/routes/fibers/route.tsx

@@ -0,0 +1,46 @@
+import * as Effect from "effect/Effect"
+import * as Stream from "effect/Stream"
+import * as Route from "../../../Route.ts"
+import * as HyperHtml from "../../../hyper/HyperHtml.ts"
+import * as HyperRoute from "../../../hyper/HyperRoute.ts"
+import * as TowerStore from "../../TowerStore.ts"
+import * as Fibers from "../../ui/Fibers.tsx"
+import * as Shell from "../../ui/Shell.tsx"
+
+export default Route.get(
+  HyperRoute.html(function* () {
+    const logs = yield* TowerStore.allLogs(TowerStore.store.sql)
+    const spans = yield* TowerStore.allSpans(TowerStore.store.sql)
+    const fibers = Fibers.collectFibers(logs, spans)
+    return (
+      <Shell.Shell prefix={TowerStore.store.prefix} active="fibers">
+        <div style="display:flex;flex-direction:column;flex:1;overflow:hidden">
+          <div class="tab-header">Fibers</div>
+          <div id="fibers-container" class="tab-body">
+            <Fibers.FiberList fibers={fibers} prefix={TowerStore.store.prefix} />
+          </div>
+          <div data-init={`@get('${TowerStore.store.prefix}/fibers')`} />
+        </div>
+      </Shell.Shell>
+    )
+  }),
+  Route.sse(
+    Stream.fromPubSub(TowerStore.store.events).pipe(
+      Stream.filter((e) => e._tag === "SpanStart" || e._tag === "SpanEnd" || e._tag === "Log"),
+      Stream.mapEffect(() =>
+        Effect.gen(function* () {
+          const logs = yield* TowerStore.allLogs(TowerStore.store.sql)
+          const spans = yield* TowerStore.allSpans(TowerStore.store.sql)
+          const fibers = Fibers.collectFibers(logs, spans)
+          const html = HyperHtml.renderToString(
+            <Fibers.FiberList fibers={fibers} prefix={TowerStore.store.prefix} />,
+          ).replace(/\n/g, "")
+          return {
+            event: "datastar-patch-elements",
+            data: `selector #fibers-container\nmode inner\nelements ${html}`,
+          }
+        }),
+      ),
+    ),
+  ),
+)

package/src/{console/console.html → tower/routes/layout.html}

@@ -1,7 +1,7 @@
 <!doctype html>
 <html style="height: 100%">
   <head>
-    <title>Effect Console</title>
+    <title>Effect Tower</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <script type="module" src="effect-start/datastar"></script>
     <style>

package/src/{console → tower}/routes/layout.tsx

@@ -1,4 +1,4 @@
 import * as BunRoute from "../../bun/BunRoute.ts"
 import * as Route from "../../Route.ts"
 
-export default Route.use(BunRoute.htmlBundle(() => import("../console.html")))
+export default Route.use(BunRoute.htmlBundle(() => import("./layout.html")))

package/src/{console → tower}/routes/logs/route.tsx

@@ -2,28 +2,24 @@ import * as Stream from "effect/Stream"
 import * as Route from "../../../Route.ts"
 import * as HyperHtml from "../../../hyper/HyperHtml.ts"
 import * as HyperRoute from "../../../hyper/HyperRoute.ts"
-import * as ConsoleStore from "../../ConsoleStore.ts"
+import * as TowerStore from "../../TowerStore.ts"
 import * as Logs from "../../ui/Logs.tsx"
 import * as Shell from "../../ui/Shell.tsx"
 
-const prefix = ConsoleStore.store.prefix
-
-function filterLogs(url: URL): Array<ConsoleStore.ConsoleLog> {
-  const level = url.searchParams.get("logLevel") || ""
-  const search = url.searchParams.get("logSearch") || ""
-  let logs = ConsoleStore.store.logs.toArray()
-  if (level) logs = logs.filter((l) => l.level === level)
-  if (search) {
-    const lower = search.toLowerCase()
-    logs = logs.filter((l) => l.message.toLowerCase().includes(lower))
-  }
-  return logs.reverse()
-}
+const prefix = TowerStore.store.prefix
 
 export default Route.get(
   HyperRoute.html(function* (ctx) {
     const url = new URL(ctx.request.url)
-    const logs = filterLogs(url)
+    const level = url.searchParams.get("logLevel") || ""
+    const search = url.searchParams.get("logSearch") || ""
+    let logs = yield* TowerStore.allLogs(TowerStore.store.sql)
+    if (level) logs = logs.filter((l) => l.level === level)
+    if (search) {
+      const lower = search.toLowerCase()
+      logs = logs.filter((l) => l.message.toLowerCase().includes(lower))
+    }
+    logs = logs.reverse()
 
     return (
       <Shell.Shell prefix={prefix} active="logs">
@@ -63,7 +59,7 @@ export default Route.get(
     )
   }),
   Route.sse(
-    Stream.fromPubSub(ConsoleStore.store.events).pipe(
+    Stream.fromPubSub(TowerStore.store.events).pipe(
       Stream.filter((e) => e._tag === "Log"),
       Stream.map((e) => {
         const html = HyperHtml.renderToString(<Logs.LogLine log={e.log} />).replace(/\n/g, "")

package/src/{console → tower}/routes/metrics/route.tsx

@@ -2,24 +2,24 @@ import * as Stream from "effect/Stream"
 import * as Route from "../../../Route.ts"
 import * as HyperHtml from "../../../hyper/HyperHtml.ts"
 import * as HyperRoute from "../../../hyper/HyperRoute.ts"
-import * as ConsoleStore from "../../ConsoleStore.ts"
+import * as TowerStore from "../../TowerStore.ts"
 import * as Metrics from "../../ui/Metrics.tsx"
 import * as Shell from "../../ui/Shell.tsx"
 
 export default Route.get(
   HyperRoute.html(function* () {
     return (
-      <Shell.Shell prefix={ConsoleStore.store.prefix} active="metrics">
+      <Shell.Shell prefix={TowerStore.store.prefix} active="metrics">
         <div class="tab-header">Metrics</div>
         <div id="metrics-container" class="tab-body metrics-grid">
-          <Metrics.MetricsGrid metrics={ConsoleStore.store.metrics} />
+          <Metrics.MetricsGrid metrics={TowerStore.store.metrics} />
         </div>
-        <div data-init={`@get('${ConsoleStore.store.prefix}/metrics')`} />
+        <div data-init={`@get('${TowerStore.store.prefix}/metrics')`} />
       </Shell.Shell>
     )
   }),
   Route.sse(
-    Stream.fromPubSub(ConsoleStore.store.events).pipe(
+    Stream.fromPubSub(TowerStore.store.events).pipe(
       Stream.filter((e) => e._tag === "MetricsSnapshot"),
       Stream.map((e) => {
         const html = HyperHtml.renderToString(<Metrics.MetricsGrid metrics={e.metrics} />).replace(

package/src/tower/routes/route.tsx

@@ -0,0 +1,8 @@
+import * as Route from "../../Route.ts"
+import * as TowerStore from "../TowerStore.ts"
+
+export default Route.get(
+  Route.render(function* () {
+    return Route.redirect(`${TowerStore.store.prefix}/traces`)
+  }),
+)

package/src/{console → tower}/routes/routes/route.tsx

@@ -1,7 +1,7 @@
 import * as Route from "../../../Route.ts"
 import * as RouteTree from "../../../RouteTree.ts"
 import * as HyperRoute from "../../../hyper/HyperRoute.ts"
-import * as ConsoleStore from "../../ConsoleStore.ts"
+import * as TowerStore from "../../TowerStore.ts"
 import * as Routes from "../../ui/Routes.tsx"
 import * as Shell from "../../ui/Shell.tsx"
 
@@ -19,7 +19,7 @@ export default Route.get(
     }
 
     return (
-      <Shell.Shell prefix={ConsoleStore.store.prefix} active="routes">
+      <Shell.Shell prefix={TowerStore.store.prefix} active="routes">
         <div class="tab-header">Routes</div>
         <div class="tab-body">
           <Routes.RouteList routes={routes} />

package/src/{console → tower}/routes/services/route.tsx

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect"
 import * as Route from "../../../Route.ts"
 import * as HyperRoute from "../../../hyper/HyperRoute.ts"
-import * as ConsoleStore from "../../ConsoleStore.ts"
+import * as TowerStore from "../../TowerStore.ts"
 import * as Services from "../../ui/Services.tsx"
 import * as Shell from "../../ui/Shell.tsx"
 
@@ -10,7 +10,7 @@ export default Route.get(
     const ctx = yield* Effect.context<never>()
     const services = Services.collectServices(ctx.unsafeMap)
     return (
-      <Shell.Shell prefix={ConsoleStore.store.prefix} active="services">
+      <Shell.Shell prefix={TowerStore.store.prefix} active="services">
         <div class="tab-header">Services ({services.length})</div>
         <div class="tab-body">
           <Services.ServiceList services={services} />

package/src/{console → tower}/routes/system/route.tsx

@@ -2,15 +2,15 @@ import * as Stream from "effect/Stream"
 import * as Route from "../../../Route.ts"
 import * as HyperHtml from "../../../hyper/HyperHtml.ts"
 import * as HyperRoute from "../../../hyper/HyperRoute.ts"
-import * as ConsoleStore from "../../ConsoleStore.ts"
+import * as TowerStore from "../../TowerStore.ts"
 import * as System from "../../ui/System.tsx"
 import * as Shell from "../../ui/Shell.tsx"
 
 export default Route.get(
   HyperRoute.html(function* () {
-    const stats = ConsoleStore.store.process
+    const stats = TowerStore.store.process
     return (
-      <Shell.Shell prefix={ConsoleStore.store.prefix} active="system">
+      <Shell.Shell prefix={TowerStore.store.prefix} active="system">
         <div style="display:flex;flex-direction:column;flex:1;overflow:hidden">
           <div class="tab-header">System</div>
           <div id="system-container" class="tab-body">
@@ -20,13 +20,13 @@ export default Route.get(
               <div class="empty">Waiting for system data...</div>
             )}
           </div>
-          <div data-init={`@get('${ConsoleStore.store.prefix}/system')`} />
+          <div data-init={`@get('${TowerStore.store.prefix}/system')`} />
         </div>
       </Shell.Shell>
     )
   }),
   Route.sse(
-    Stream.fromPubSub(ConsoleStore.store.events).pipe(
+    Stream.fromPubSub(TowerStore.store.events).pipe(
       Stream.filter((e) => e._tag === "ProcessSnapshot"),
       Stream.map((e) => {
         const html = HyperHtml.renderToString(<System.SystemStatsView stats={e.stats} />).replace(

package/src/tower/routes/traceDetail.tsx

@@ -0,0 +1,30 @@
+import * as Schema from "effect/Schema"
+import * as Route from "../../Route.ts"
+import * as RouteSchema from "../../RouteSchema.ts"
+import * as HyperRoute from "../../hyper/HyperRoute.ts"
+import * as TowerStore from "../TowerStore.ts"
+import * as Shell from "../ui/Shell.tsx"
+import * as Traces from "../ui/Traces.tsx"
+
+export default Route.get(
+  RouteSchema.schemaPathParams(Schema.Struct({ id: Schema.String })),
+  HyperRoute.html(function* (ctx) {
+    let traceId: bigint
+    try {
+      traceId = BigInt(ctx.pathParams.id)
+    } catch {
+      return (
+        <Shell.Shell prefix={TowerStore.store.prefix} active="traces">
+          <div class="empty">Trace not found</div>
+        </Shell.Shell>
+      )
+    }
+    const spans = yield* TowerStore.spansByTraceId(TowerStore.store.sql, traceId)
+
+    return (
+      <Shell.Shell prefix={TowerStore.store.prefix} active="traces">
+        <Traces.TraceDetail prefix={TowerStore.store.prefix} spans={spans} />
+      </Shell.Shell>
+    )
+  }),
+)

package/src/{console → tower}/routes/traces/route.tsx

@@ -1,36 +1,25 @@
+import * as Effect from "effect/Effect"
 import * as Stream from "effect/Stream"
 import * as Route from "../../../Route.ts"
 import * as HyperHtml from "../../../hyper/HyperHtml.ts"
 import * as HyperRoute from "../../../hyper/HyperRoute.ts"
-import * as ConsoleStore from "../../ConsoleStore.ts"
+import * as TowerStore from "../../TowerStore.ts"
 import * as Shell from "../../ui/Shell.tsx"
 import * as Traces from "../../ui/Traces.tsx"
 
-const prefix = ConsoleStore.store.prefix
-
-function collectNames(): Array<string> {
-  const names = new Set<string>()
-  for (const span of ConsoleStore.store.spans.toArray()) {
-    if (span.name) names.add(span.name)
-  }
-  return Array.from(names).sort()
-}
-
-function filterSpans(url: URL): Array<ConsoleStore.ConsoleSpan> {
-  const search = url.searchParams.get("traceSearch") || ""
-  let spans = ConsoleStore.store.spans.toArray()
-  if (search) {
-    const lower = search.toLowerCase()
-    spans = spans.filter((s) => s.name.toLowerCase().startsWith(lower))
-  }
-  return spans
-}
+const prefix = TowerStore.store.prefix
 
 export default Route.get(
   HyperRoute.html(function* (ctx) {
     const url = new URL(ctx.request.url)
-    const spans = filterSpans(url)
-    const names = collectNames()
+    const search = url.searchParams.get("traceSearch") || ""
+    const allSpans = yield* TowerStore.allSpans(TowerStore.store.sql)
+    const names = Array.from(new Set(allSpans.map((s) => s.name))).sort()
+    let spans = allSpans
+    if (search) {
+      const lower = search.toLowerCase()
+      spans = spans.filter((s) => s.name.toLowerCase().startsWith(lower))
+    }
 
     return (
       <Shell.Shell prefix={prefix} active="traces">
@@ -63,19 +52,21 @@ export default Route.get(
     )
   }),
   Route.sse(
-    Stream.fromPubSub(ConsoleStore.store.events).pipe(
+    Stream.fromPubSub(TowerStore.store.events).pipe(
       Stream.filter((e) => e._tag === "SpanStart" || e._tag === "SpanEnd"),
-      Stream.map(() => {
-        const spans = ConsoleStore.store.spans.toArray()
-        const html = HyperHtml.renderToString(<Traces.TraceGroups spans={spans} />).replace(
-          /\n/g,
-          "",
-        )
-        return {
-          event: "datastar-patch-elements",
-          data: `selector #traces-container\nmode inner\nelements ${html}`,
-        }
-      }),
+      Stream.mapEffect(() =>
+        Effect.gen(function* () {
+          const spans = yield* TowerStore.allSpans(TowerStore.store.sql)
+          const html = HyperHtml.renderToString(<Traces.TraceGroups spans={spans} />).replace(
+            /\n/g,
+            "",
+          )
+          return {
+            event: "datastar-patch-elements",
+            data: `selector #traces-container\nmode inner\nelements ${html}`,
+          }
+        }),
+      ),
     ),
   ),
 )

package/src/{console → tower}/routes/tree.ts

@@ -2,7 +2,6 @@ import * as Route from "../../Route.ts"
 import errorsRoute from "./errors/route.tsx"
 import fiberDetailRoute from "./fiberDetail.tsx"
 import fibersRoute from "./fibers/route.tsx"
-import gitRoute from "./git/route.tsx"
 import layout from "./layout.tsx"
 import logsRoute from "./logs/route.tsx"
 import metricsRoute from "./metrics/route.tsx"
@@ -26,5 +25,4 @@ export default Route.tree({
   "/routes": routesRoute,
   "/system": systemRoute,
   "/services": servicesRoute,
-  "/git": gitRoute,
 })

package/src/{console → tower}/ui/Errors.tsx

@@ -1,17 +1,21 @@
-import * as ConsoleStore from "../ConsoleStore.ts"
+import * as Unique from "../../Unique.ts"
+import * as TowerStore from "../TowerStore.ts"
 
-export function ErrorLine({ error }: { error: ConsoleStore.ConsoleError }) {
-  const time = error.date.toLocaleTimeString("en", {
-    hour12: false,
-    hour: "2-digit",
-    minute: "2-digit",
-    second: "2-digit",
-  })
-  const firstLine = error.prettyPrint.split("\n")[0] ?? ""
-  const tags = error.details.map((d) => d.tag).filter(Boolean)
+export function ErrorLine(options: { error: TowerStore.TowerError }) {
+  const time = new Date(Number(Unique.snowflake.timestamp(options.error.id))).toLocaleTimeString(
+    "en",
+    {
+      hour12: false,
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+    },
+  )
+  const firstLine = options.error.prettyPrint.split("\n")[0] ?? ""
+  const tags = options.error.details.map((d) => d.tag).filter(Boolean)
 
-  const allSpans = error.details.map((d) => d.span).filter(Boolean)
-  const allProps = error.details.flatMap((d) => Object.entries(d.properties))
+  const allSpans = options.error.details.map((d) => d.span).filter(Boolean)
+  const allProps = options.error.details.flatMap((d) => Object.entries(d.properties))
 
   return (
     <details style="border-bottom:1px solid #1e293b">
@@ -61,14 +65,14 @@ export function ErrorLine({ error }: { error: ConsoleStore.ConsoleError }) {
         <div style="margin-bottom:6px">
           <span style="color:#64748b">fiber </span>
           <a
-            href={`${ConsoleStore.store.prefix}/fibers/${error.fiberId.replace("#", "")}`}
+            href={`${TowerStore.store.prefix}/fibers/${options.error.fiberId.replace("#", "")}`}
             style="color:#9ca3af;text-decoration:none"
           >
-            {error.fiberId}
+            {options.error.fiberId}
           </a>
         </div>
         <pre style="color:#9ca3af;font-size:11px;padding:0;margin:0;white-space:pre-wrap;word-break:break-all">
-          {error.prettyPrint}
+          {options.error.prettyPrint}
         </pre>
       </div>
     </details>