effect-start 0.28.0 → 0.30.0

package/src/{tower/TowerProcess.ts → studio/StudioProcess.ts}

@@ -3,9 +3,9 @@ import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as PubSub from "effect/PubSub"
 import * as Schedule from "effect/Schedule"
-import * as TowerStore from "./TowerStore.ts"
+import * as StudioStore from "./StudioStore.ts"
 
-function snapshot(): TowerStore.ProcessStats {
+function snapshot(): StudioStore.ProcessStats {
   const mem = process.memoryUsage()
   const cpu = process.cpuUsage()
   const res = process.resourceUsage()
@@ -41,9 +41,9 @@ function snapshot(): TowerStore.ProcessStats {
   }
 }
 
-export const layer: Layer.Layer<never, never, TowerStore.TowerStore> = Layer.scopedDiscard(
+export const layer: Layer.Layer<never, never, StudioStore.StudioStore> = Layer.scopedDiscard(
   Effect.gen(function* () {
-    const store = yield* TowerStore.TowerStore
+    const store = yield* StudioStore.StudioStore
 
     yield* Effect.forkScoped(
       Effect.schedule(

package/src/{tower/TowerStore.ts → studio/StudioStore.ts}

@@ -8,16 +8,16 @@ import * as Schema from "effect/Schema"
 import * as Unique from "../Unique.ts"
 import * as SqlClient from "../sql/SqlClient.ts"
 
-export let store: TowerStoreShape = GlobalValue.globalValue(
-  Symbol.for("effect-start/TowerStore"),
+export let store: StudioStoreShape = GlobalValue.globalValue(
+  Symbol.for("effect-start/StudioStore"),
   () => ({
-    prefix: "/tower",
+    prefix: "/studio",
     sql: undefined as unknown as SqlClient.SqlClient,
-    events: Effect.runSync(PubSub.unbounded<TowerEvent>()),
+    events: Effect.runSync(PubSub.unbounded<StudioEvent>()),
     spanCapacity: 1000,
     logCapacity: 5000,
     errorCapacity: 1000,
-    metrics: [] as Array<TowerMetricSnapshot>,
+    metrics: [] as Array<StudioMetricSnapshot>,
     process: undefined as ProcessStats | undefined,
   }),
 )
@@ -32,7 +32,7 @@ export const nextSpanId = () => nextPackedId()
 
 export const nextTraceId = () => nextPackedId()
 
-export interface TowerSpan {
+export interface StudioSpan {
   readonly spanId: bigint
   readonly traceId: bigint
   readonly fiberId: string | undefined
@@ -47,7 +47,7 @@ export interface TowerSpan {
   readonly events: Array<{ name: string; startTime: bigint; attributes?: Record<string, unknown> }>
 }
 
-export interface TowerLog {
+export interface StudioLog {
   readonly id: bigint
   readonly level: "DEBUG" | "INFO" | "WARNING" | "ERROR" | "FATAL"
   readonly message: string
@@ -87,7 +87,7 @@ export interface ProcessStats {
   }
 }
 
-export interface TowerErrorDetail {
+export interface StudioErrorDetail {
   readonly kind: "fail" | "die"
   readonly tag: string | undefined
   readonly message: string
@@ -95,15 +95,15 @@ export interface TowerErrorDetail {
   readonly span: string | undefined
 }
 
-export interface TowerError {
+export interface StudioError {
   readonly id: bigint
   readonly fiberId: string
   readonly interrupted: boolean
   readonly prettyPrint: string
-  readonly details: Array<TowerErrorDetail>
+  readonly details: Array<StudioErrorDetail>
 }
 
-export interface TowerMetricSnapshot {
+export interface StudioMetricSnapshot {
   readonly name: string
   readonly type: "counter" | "gauge" | "histogram" | "summary" | "frequency"
   readonly value: unknown
@@ -111,12 +111,12 @@ export interface TowerMetricSnapshot {
   readonly timestamp: number
 }
 
-export type TowerEvent =
-  | { readonly _tag: "SpanStart"; readonly span: TowerSpan }
-  | { readonly _tag: "SpanEnd"; readonly span: TowerSpan }
-  | { readonly _tag: "Log"; readonly log: TowerLog }
-  | { readonly _tag: "Error"; readonly error: TowerError }
-  | { readonly _tag: "MetricsSnapshot"; readonly metrics: Array<TowerMetricSnapshot> }
+export type StudioEvent =
+  | { readonly _tag: "SpanStart"; readonly span: StudioSpan }
+  | { readonly _tag: "SpanEnd"; readonly span: StudioSpan }
+  | { readonly _tag: "Log"; readonly log: StudioLog }
+  | { readonly _tag: "Error"; readonly error: StudioError }
+  | { readonly _tag: "MetricsSnapshot"; readonly metrics: Array<StudioMetricSnapshot> }
   | { readonly _tag: "ProcessSnapshot"; readonly stats: ProcessStats }
 
 export interface FiberContext {
@@ -125,14 +125,14 @@ export interface FiberContext {
   readonly annotations: Record<string, unknown>
 }
 
-export interface TowerStoreShape {
+export interface StudioStoreShape {
   prefix: string
   readonly sql: SqlClient.SqlClient
-  readonly events: PubSub.PubSub<TowerEvent>
+  readonly events: PubSub.PubSub<StudioEvent>
   readonly spanCapacity: number
   readonly logCapacity: number
   readonly errorCapacity: number
-  metrics: Array<TowerMetricSnapshot>
+  metrics: Array<StudioMetricSnapshot>
   process: ProcessStats | undefined
 }
 
@@ -143,12 +143,12 @@ export function fiberIdCounter(): number {
   return MutableRef.get(counter)
 }
 
-export class TowerStore extends Context.Tag("effect-start/TowerStore")<
-  TowerStore,
-  TowerStoreShape
+export class StudioStore extends Context.Tag("effect-start/StudioStore")<
+  StudioStore,
+  StudioStoreShape
 >() {}
 
-export interface TowerStoreOptions {
+export interface StudioStoreOptions {
   readonly spanCapacity?: number
   readonly logCapacity?: number
   readonly errorCapacity?: number
@@ -195,10 +195,10 @@ const DDL = [
 ]
 
 export function layer(
-  options?: TowerStoreOptions,
-): Layer.Layer<TowerStore, SqlClient.SqlError, SqlClient.SqlClient> {
+  options?: StudioStoreOptions,
+): Layer.Layer<StudioStore, SqlClient.SqlError, SqlClient.SqlClient> {
   return Layer.effect(
-    TowerStore,
+    StudioStore,
     Effect.gen(function* () {
       const sql = yield* SqlClient.SqlClient
       for (const ddl of DDL) {
@@ -287,8 +287,8 @@ export const FiberRow = Schema.Struct({
 })
 type FiberRow = typeof FiberRow.Type
 
-function deserializeSpan(row: SpanRow): TowerSpan {
-  const events = reviveBigint(JSON.parse(row.events)) as TowerSpan["events"]
+function deserializeSpan(row: SpanRow): StudioSpan {
+  const events = reviveBigint(JSON.parse(row.events)) as StudioSpan["events"]
   return {
     spanId: BigInt(row.spanId),
     traceId: BigInt(row.traceId),
@@ -299,16 +299,16 @@ function deserializeSpan(row: SpanRow): TowerSpan {
     startTime: BigInt(row.startTime),
     endTime: row.endTime ? BigInt(row.endTime) : undefined,
     durationMs: row.durationMs ?? undefined,
-    status: row.status as TowerSpan["status"],
+    status: row.status as StudioSpan["status"],
     attributes: JSON.parse(row.attributes),
     events,
   }
 }
 
-function deserializeLog(row: LogRow): TowerLog {
+function deserializeLog(row: LogRow): StudioLog {
   return {
     id: BigInt(row.id),
-    level: row.level as TowerLog["level"],
+    level: row.level as StudioLog["level"],
     message: row.message,
     fiberId: row.fiberId,
     cause: row.cause ?? undefined,
@@ -317,7 +317,7 @@ function deserializeLog(row: LogRow): TowerLog {
   }
 }
 
-function deserializeError(row: ErrorRow): TowerError {
+function deserializeError(row: ErrorRow): StudioError {
   return {
     id: BigInt(row.id),
     fiberId: row.fiberId,
@@ -327,7 +327,7 @@ function deserializeError(row: ErrorRow): TowerError {
   }
 }
 
-export function insertSpan(sql: SqlClient.SqlClient, span: TowerSpan) {
+export function insertSpan(sql: SqlClient.SqlClient, span: StudioSpan) {
   return sql`INSERT INTO Span ${sql({
     spanId: span.spanId,
     traceId: span.traceId,
@@ -344,7 +344,7 @@ export function insertSpan(sql: SqlClient.SqlClient, span: TowerSpan) {
   })}`
 }
 
-export function updateSpan(sql: SqlClient.SqlClient, span: TowerSpan) {
+export function updateSpan(sql: SqlClient.SqlClient, span: StudioSpan) {
   return sql`UPDATE Span SET
     endTime = ${span.endTime?.toString() ?? null},
     durationMs = ${span.durationMs ?? null},
@@ -354,7 +354,7 @@ export function updateSpan(sql: SqlClient.SqlClient, span: TowerSpan) {
     WHERE spanId = ${span.spanId}`
 }
 
-export function insertLog(sql: SqlClient.SqlClient, log: TowerLog) {
+export function insertLog(sql: SqlClient.SqlClient, log: StudioLog) {
   return sql`INSERT INTO Log ${sql({
     id: log.id,
     level: log.level,
@@ -366,7 +366,7 @@ export function insertLog(sql: SqlClient.SqlClient, log: TowerLog) {
   })}`
 }
 
-export function insertError(sql: SqlClient.SqlClient, error: TowerError) {
+export function insertError(sql: SqlClient.SqlClient, error: StudioError) {
   return sql`INSERT INTO Error ${sql({
     id: error.id,
     fiberId: error.fiberId,

package/src/{tower/TowerTracer.ts → studio/StudioTracer.ts}

@@ -6,9 +6,9 @@ import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as PubSub from "effect/PubSub"
 import * as Tracer from "effect/Tracer"
-import * as TowerStore from "./TowerStore.ts"
+import * as StudioStore from "./StudioStore.ts"
 
-const publish = (store: TowerStore.TowerStoreShape, event: TowerStore.TowerEvent) =>
+const publish = (store: StudioStore.StudioStoreShape, event: StudioStore.StudioEvent) =>
   Effect.runSync(PubSub.publish(store.events, event))
 
 const fromTracerId = (id: string): bigint | undefined => {
@@ -19,7 +19,7 @@ const fromTracerId = (id: string): bigint | undefined => {
   }
 }
 
-const make = (store: TowerStore.TowerStoreShape): Tracer.Tracer =>
+const make = (store: StudioStore.StudioStoreShape): Tracer.Tracer =>
   Tracer.make({
     span(name, parent, context, links, startTime, kind, options) {
       const parentSpanId =
@@ -27,8 +27,8 @@ const make = (store: TowerStore.TowerStoreShape): Tracer.Tracer =>
           ? fromTracerId(parent.value.spanId)
           : undefined
       const parentTraceId = Option.isSome(parent) ? fromTracerId(parent.value.traceId) : undefined
-      const traceId = parentTraceId ?? TowerStore.nextTraceId()
-      const spanId = TowerStore.nextSpanId()
+      const traceId = parentTraceId ?? StudioStore.nextTraceId()
+      const spanId = StudioStore.nextSpanId()
 
       const attributes: Record<string, unknown> = {}
       const currentFiber = Fiber.getCurrentFiber()
@@ -45,7 +45,7 @@ const make = (store: TowerStore.TowerStoreShape): Tracer.Tracer =>
         }
       }
 
-      const towerSpan: TowerStore.TowerSpan = {
+      const studioSpan: StudioStore.StudioSpan = {
         spanId,
         traceId,
         fiberId,
@@ -60,13 +60,13 @@ const make = (store: TowerStore.TowerStoreShape): Tracer.Tracer =>
         events: [],
       }
 
-      TowerStore.runWrite(
+      StudioStore.runWrite(
         Effect.zipRight(
-          TowerStore.insertSpan(store.sql, towerSpan),
-          TowerStore.evict(store.sql, "Span", store.spanCapacity),
+          StudioStore.insertSpan(store.sql, studioSpan),
+          StudioStore.evict(store.sql, "Span", store.spanCapacity),
         ),
       )
-      publish(store, { _tag: "SpanStart", span: towerSpan })
+      publish(store, { _tag: "SpanStart", span: studioSpan })
 
       const attrs = new Map<string, unknown>(Object.entries(attributes))
       const spanLinks = [...links]
@@ -79,35 +79,35 @@ const make = (store: TowerStore.TowerStoreShape): Tracer.Tracer =>
         parent,
         context,
         get status(): Tracer.SpanStatus {
-          if (towerSpan.endTime != null) {
+          if (studioSpan.endTime != null) {
             return {
               _tag: "Ended",
-              startTime: towerSpan.startTime,
-              endTime: towerSpan.endTime,
+              startTime: studioSpan.startTime,
+              endTime: studioSpan.endTime,
               exit: Exit.void,
             }
           }
-          return { _tag: "Started", startTime: towerSpan.startTime }
+          return { _tag: "Started", startTime: studioSpan.startTime }
         },
         attributes: attrs,
         links: spanLinks,
         sampled: true,
         kind,
         end(endTime, exit) {
-          towerSpan.endTime = endTime
-          towerSpan.durationMs = Number(endTime - towerSpan.startTime) / 1_000_000
-          towerSpan.status = Exit.isSuccess(exit) ? "ok" : "error"
-          TowerStore.runWrite(TowerStore.updateSpan(store.sql, towerSpan))
-          publish(store, { _tag: "SpanEnd", span: towerSpan })
+          studioSpan.endTime = endTime
+          studioSpan.durationMs = Number(endTime - studioSpan.startTime) / 1_000_000
+          studioSpan.status = Exit.isSuccess(exit) ? "ok" : "error"
+          StudioStore.runWrite(StudioStore.updateSpan(store.sql, studioSpan))
+          publish(store, { _tag: "SpanEnd", span: studioSpan })
         },
         attribute(key, value) {
           attrs.set(key, value)
-          ;(towerSpan.attributes as Record<string, unknown>)[key] = value
-          TowerStore.runWrite(TowerStore.updateSpan(store.sql, towerSpan))
+          ;(studioSpan.attributes as Record<string, unknown>)[key] = value
+          StudioStore.runWrite(StudioStore.updateSpan(store.sql, studioSpan))
         },
         event(name, startTime, attributes) {
-          towerSpan.events.push({ name, startTime, attributes })
-          TowerStore.runWrite(TowerStore.updateSpan(store.sql, towerSpan))
+          studioSpan.events.push({ name, startTime, attributes })
+          StudioStore.runWrite(StudioStore.updateSpan(store.sql, studioSpan))
         },
         addLinks(newLinks) {
           spanLinks.push(...newLinks)
@@ -120,9 +120,9 @@ const make = (store: TowerStore.TowerStoreShape): Tracer.Tracer =>
     },
   })
 
-export const layer: Layer.Layer<never, never, TowerStore.TowerStore> = Layer.unwrapEffect(
+export const layer: Layer.Layer<never, never, StudioStore.StudioStore> = Layer.unwrapEffect(
   Effect.gen(function* () {
-    const store = yield* TowerStore.TowerStore
+    const store = yield* StudioStore.StudioStore
     return Layer.setTracer(make(store))
   }),
 )

package/src/studio/index.ts

@@ -0,0 +1,3 @@
+export * as Studio from "./Studio.ts"
+export * as StudioStore from "./StudioStore.ts"
+export * as Simulation from "./Simulation.ts"

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

@@ -1,19 +1,18 @@
 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 Html from "../../../Html.ts"
+import * as StudioStore from "../../StudioStore.ts"
 import * as Errors from "../../ui/Errors.tsx"
 import * as Shell from "../../ui/Shell.tsx"
 
-const prefix = TowerStore.store.prefix
+const prefix = StudioStore.store.prefix
 
 export default Route.get(
-  HyperRoute.html(function* (ctx) {
+  Route.html(function* (ctx) {
     const url = new URL(ctx.request.url)
     const search = url.searchParams.get("errorSearch") || ""
     const tag = url.searchParams.get("errorTag") || ""
-    const allErrors = yield* TowerStore.allErrors(TowerStore.store.sql)
+    const allErrors = yield* StudioStore.allErrors(StudioStore.store.sql)
     const tagSet = new Set<string>()
     for (const error of allErrors) {
       for (const d of error.details) {
@@ -73,10 +72,10 @@ export default Route.get(
     )
   }),
   Route.sse(
-    Stream.fromPubSub(TowerStore.store.events).pipe(
+    Stream.fromPubSub(StudioStore.store.events).pipe(
       Stream.filter((e) => e._tag === "Error"),
       Stream.map((e) => {
-        const html = HyperHtml.renderToString(<Errors.ErrorLine error={e.error} />).replace(
+        const html = Html.renderToString(<Errors.ErrorLine error={e.error} />).replace(
           /\n/g,
           "",
         )

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

@@ -2,22 +2,21 @@ 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 TowerStore from "../TowerStore.ts"
+import * as StudioStore from "../StudioStore.ts"
 import * as Fibers from "../ui/Fibers.tsx"
 import * as Shell from "../ui/Shell.tsx"
 
 export default Route.get(
   RouteSchema.schemaPathParams(Schema.Struct({ id: Schema.String })),
-  HyperRoute.html(function* (ctx) {
+  Route.html(function* (ctx) {
     const fiberId = ctx.pathParams.id
     const fiberName = fiberId.startsWith("#") ? fiberId : `#${fiberId}`
 
-    const fiberLogs = yield* TowerStore.logsByFiberId(TowerStore.store.sql, fiberName)
-    const fiberSpans = yield* TowerStore.spansByFiberId(TowerStore.store.sql, fiberName)
+    const fiberLogs = yield* StudioStore.logsByFiberId(StudioStore.store.sql, fiberName)
+    const fiberSpans = yield* StudioStore.spansByFiberId(StudioStore.store.sql, fiberName)
 
     const fiberNum = parseInt(fiberName.slice(1), 10)
-    const counter = TowerStore.fiberIdCounter()
+    const counter = StudioStore.fiberIdCounter()
     let alive: "alive" | "dead" | "unknown" = "unknown"
     if (!isNaN(fiberNum)) {
       if (fiberNum < counter) alive = "dead"
@@ -31,13 +30,13 @@ export default Route.get(
       else if (fiberNum < counter) alive = "dead"
     }
 
-    const parents = yield* TowerStore.getParentChain(TowerStore.store.sql, fiberName)
-    const fiberContext = yield* TowerStore.getFiberContext(TowerStore.store.sql, fiberName)
+    const parents = yield* StudioStore.getParentChain(StudioStore.store.sql, fiberName)
+    const fiberContext = yield* StudioStore.getFiberContext(StudioStore.store.sql, fiberName)
 
     return (
-      <Shell.Shell prefix={TowerStore.store.prefix} active="fibers">
+      <Shell.Shell prefix={StudioStore.store.prefix} active="fibers">
         <Fibers.FiberDetail
-          prefix={TowerStore.store.prefix}
+          prefix={StudioStore.store.prefix}
           fiberId={fiberName}
           logs={fiberLogs}
           spans={fiberSpans}

package/src/{tower → studio}/routes/fibers/route.tsx

@@ -1,39 +1,38 @@
 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 Html from "../../../Html.ts"
+import * as StudioStore from "../../StudioStore.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)
+  Route.html(function* () {
+    const logs = yield* StudioStore.allLogs(StudioStore.store.sql)
+    const spans = yield* StudioStore.allSpans(StudioStore.store.sql)
     const fibers = Fibers.collectFibers(logs, spans)
     return (
-      <Shell.Shell prefix={TowerStore.store.prefix} active="fibers">
+      <Shell.Shell prefix={StudioStore.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} />
+            <Fibers.FiberList fibers={fibers} prefix={StudioStore.store.prefix} />
           </div>
-          <div data-init={`@get('${TowerStore.store.prefix}/fibers')`} />
+          <div data-init={`@get('${StudioStore.store.prefix}/fibers')`} />
         </div>
       </Shell.Shell>
     )
   }),
   Route.sse(
-    Stream.fromPubSub(TowerStore.store.events).pipe(
+    Stream.fromPubSub(StudioStore.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 logs = yield* StudioStore.allLogs(StudioStore.store.sql)
+          const spans = yield* StudioStore.allSpans(StudioStore.store.sql)
           const fibers = Fibers.collectFibers(logs, spans)
-          const html = HyperHtml.renderToString(
-            <Fibers.FiberList fibers={fibers} prefix={TowerStore.store.prefix} />,
+          const html = Html.renderToString(
+            <Fibers.FiberList fibers={fibers} prefix={StudioStore.store.prefix} />,
           ).replace(/\n/g, "")
           return {
             event: "datastar-patch-elements",