@kitlangton/motel 0.2.4 → 0.2.6

package/src/StartupGate.tsx

@@ -0,0 +1,289 @@
+import { Effect } from "effect"
+import { RGBA, TextAttributes } from "@opentui/core"
+import { useKeyboard, useRenderer, useTerminalDimensions } from "@opentui/react"
+import { useEffect, useMemo, useState } from "react"
+import { App } from "./App.js"
+import { createDaemonManager, ensureManagedDaemon, getManagedDaemonStatus, type DaemonStatus } from "./daemon.js"
+import { MOTEL_SERVICE_ID } from "./registry.js"
+import { Divider, PlainLine, TextLine } from "./ui/primitives.tsx"
+import { colors } from "./ui/theme.ts"
+
+type ConflictStatus = DaemonStatus & {
+	readonly service: typeof MOTEL_SERVICE_ID
+	readonly pid: number
+	readonly workdir: string
+	readonly reason: string
+}
+
+type ConflictScreenState = {
+	kind: "conflict"
+	message: string
+	status: ConflictStatus
+	busy: boolean
+	notice: string | null
+}
+
+type ErrorScreenState = {
+	kind: "error"
+	message: string
+	busy: boolean
+	notice: string | null
+}
+
+type StartupState =
+	| { kind: "loading"; message: string }
+	| { kind: "ready" }
+	| ConflictScreenState
+	| ErrorScreenState
+
+type RecoveryAction = {
+	readonly key: string
+	readonly label: string
+	readonly run: () => Promise<void>
+	readonly disabled?: boolean
+}
+
+const readStatus = () => Effect.runPromise(getManagedDaemonStatus)
+const startDaemon = () => Effect.runPromise(ensureManagedDaemon)
+
+const parsePort = (url: string) => {
+	try {
+		const port = Number(new URL(url).port)
+		return Number.isFinite(port) && port > 0 ? port : undefined
+	} catch {
+		return undefined
+	}
+}
+
+const isRecoverableConflict = (status: DaemonStatus | null): status is ConflictStatus =>
+	status !== null &&
+	status.service === MOTEL_SERVICE_ID &&
+	status.pid !== null &&
+	status.workdir !== null &&
+	status.reason !== null
+
+const stopConflictingDaemon = async (status: ConflictStatus) => {
+	const port = parsePort(status.url)
+	const manager = createDaemonManager({
+		workdir: status.workdir ?? undefined,
+		databasePath: status.databasePath,
+		port,
+	})
+	await Effect.runPromise(manager.stop)
+}
+
+const LoadingScreen = ({ width, height, message }: { width: number; height: number; message: string }) => {
+	const panelWidth = Math.min(76, Math.max(50, width - 8))
+	const left = Math.max(0, Math.floor((width - panelWidth) / 2))
+	const top = Math.max(0, Math.floor((height - 5) / 2))
+
+	return (
+		<box width={width} height={height} backgroundColor={RGBA.fromHex(colors.screenBg)}>
+			<box position="absolute" left={left} top={top} width={panelWidth} flexDirection="column">
+				<TextLine>
+					<span fg={colors.accent} attributes={TextAttributes.BOLD}>MOTEL</span>
+					<span fg={colors.separator}>{" · "}</span>
+					<span fg={colors.muted}>starting up...</span>
+				</TextLine>
+				<Divider width={panelWidth} />
+				<box paddingTop={1}>
+					<PlainLine text={message} fg={colors.count} />
+				</box>
+			</box>
+		</box>
+	)
+}
+
+const RecoveryScreen = ({
+	title,
+	message,
+	width,
+	height,
+	detailLines,
+	actions,
+	selectedIndex,
+	notice,
+	busy,
+}: {
+	readonly title: string
+	readonly message: string
+	readonly width: number
+	readonly height: number
+	readonly detailLines: readonly string[]
+	readonly actions: readonly RecoveryAction[]
+	readonly selectedIndex: number
+	readonly notice: string | null
+	readonly busy: boolean
+}) => {
+	const panelWidth = Math.min(96, Math.max(64, width - 8))
+	const left = Math.max(0, Math.floor((width - panelWidth) / 2))
+	const bodyHeight = 9 + detailLines.length + actions.length + (notice ? 2 : 0)
+	const top = Math.max(0, Math.floor((height - bodyHeight) / 2))
+
+	return (
+		<box width={width} height={height} backgroundColor={RGBA.fromHex(colors.screenBg)}>
+			<box position="absolute" left={left} top={top} width={panelWidth} flexDirection="column">
+				<TextLine>
+					<span fg={colors.accent} attributes={TextAttributes.BOLD}>MOTEL</span>
+					<span fg={colors.separator}>{" · "}</span>
+					<span fg={colors.error} attributes={TextAttributes.BOLD}>{title}</span>
+				</TextLine>
+				<Divider width={panelWidth} />
+				<box paddingTop={1} paddingBottom={1} flexDirection="column">
+					<PlainLine text={message} fg={colors.text} />
+				</box>
+				{detailLines.map((line, index) => (
+					<PlainLine key={`${index}:${line}`} text={line} fg={colors.muted} />
+				))}
+				<box paddingTop={1} flexDirection="column">
+					{actions.map((action, index) => {
+						const selected = index === selectedIndex
+						const prefix = selected ? ">" : " "
+						const text = `${prefix} [${action.key}] ${action.label}${action.disabled ? " (unavailable)" : ""}`
+						return (
+							<TextLine key={action.key} bg={selected ? colors.selectedBg : undefined}>
+								<span fg={selected ? colors.selectedText : colors.text}>{text}</span>
+							</TextLine>
+						)
+					})}
+				</box>
+				<box paddingTop={1} flexDirection="column">
+					{notice ? <PlainLine text={notice} fg={busy ? colors.warning : colors.count} /> : null}
+					<PlainLine text={busy ? "Working..." : "j/k or ↑↓ select · enter run · r retry · k stop incompatible daemon · q quit"} fg={colors.count} />
+				</box>
+			</box>
+		</box>
+	)
+}
+
+export const StartupGate = () => {
+	const renderer = useRenderer()
+	const { width = 100, height = 24 } = useTerminalDimensions()
+	const [startupState, setStartupState] = useState<StartupState>({ kind: "loading", message: "Checking managed daemon..." })
+	const [selectedIndex, setSelectedIndex] = useState(0)
+
+	const attemptStart = async () => {
+		setStartupState({ kind: "loading", message: "Checking managed daemon..." })
+		try {
+			await startDaemon()
+			setStartupState({ kind: "ready" })
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error)
+			const status = await readStatus().catch(() => null)
+			if (isRecoverableConflict(status)) {
+				setSelectedIndex(0)
+				setStartupState({ kind: "conflict", message, status, busy: false, notice: null })
+				return
+			}
+			setSelectedIndex(0)
+			setStartupState({ kind: "error", message, busy: false, notice: null })
+		}
+	}
+
+	useEffect(() => {
+		void attemptStart()
+	}, [])
+
+	const actions = useMemo<readonly RecoveryAction[]>(() => {
+		if (startupState.kind === "conflict") {
+			return [
+				{ key: "r", label: "Retry startup", run: attemptStart },
+				{
+					key: "k",
+					label: `Stop incompatible daemon (${startupState.status.pid})`,
+					run: async () => {
+						setStartupState((current) => current.kind === "conflict"
+							? { ...current, busy: true, notice: `Stopping daemon ${current.status.pid}...` }
+							: current)
+						try {
+							await stopConflictingDaemon(startupState.status)
+							await attemptStart()
+						} catch (error) {
+							const message = error instanceof Error ? error.message : String(error)
+							setStartupState((current) => current.kind === "conflict"
+								? { ...current, busy: false, notice: message }
+								: current)
+						}
+					},
+				},
+				{ key: "q", label: "Quit", run: async () => { renderer.destroy() } },
+			]
+		}
+		if (startupState.kind === "error") {
+			return [
+				{ key: "r", label: "Retry startup", run: attemptStart },
+				{ key: "q", label: "Quit", run: async () => { renderer.destroy() } },
+			]
+		}
+		return []
+	}, [renderer, startupState])
+
+	useKeyboard((key) => {
+		if (startupState.kind === "ready" || startupState.kind === "loading" || key.repeated) return
+		if (key.name === "q" || (key.ctrl && key.name === "c")) {
+			renderer.destroy()
+			return
+		}
+		if (key.name === "up" || key.name === "k") {
+			setSelectedIndex((current) => (current + actions.length - 1) % actions.length)
+			return
+		}
+		if (key.name === "down" || key.name === "j") {
+			setSelectedIndex((current) => (current + 1) % actions.length)
+			return
+		}
+		if (key.name === "r") {
+			void actions.find((action) => action.key === "r")?.run()
+			return
+		}
+		if (key.name === "k") {
+			void actions.find((action) => action.key === "k")?.run()
+			return
+		}
+		if (key.name === "return" || key.name === "enter") {
+			void actions[selectedIndex]?.run()
+		}
+	})
+
+	if (startupState.kind === "ready") return <App />
+	if (startupState.kind === "loading") return <LoadingScreen width={width} height={height} message={startupState.message} />
+	if (startupState.kind === "conflict") {
+		const status = startupState.status
+		const detailLines = [
+			`Port: ${status.url}`,
+			`Daemon workdir: ${status.workdir}`,
+			`Daemon pid: ${status.pid}`,
+			`Incompatible database: ${status.databasePath}`,
+			status.workdir.startsWith("/tmp") || status.workdir.startsWith("/private/tmp")
+				? "This looks like a temp/test daemon."
+				: "This daemon is using a different database configuration.",
+		]
+		return (
+			<RecoveryScreen
+				title="Daemon Configuration Conflict"
+				message={startupState.message}
+				width={width}
+				height={height}
+				detailLines={detailLines}
+				actions={actions}
+				selectedIndex={selectedIndex}
+				notice={startupState.notice}
+				busy={startupState.busy}
+			/>
+		)
+	}
+
+	return (
+		<RecoveryScreen
+			title="Startup Error"
+			message={startupState.message}
+			width={width}
+			height={height}
+			detailLines={["Retry startup or quit the TUI."]}
+			actions={actions}
+			selectedIndex={selectedIndex}
+			notice={startupState.notice}
+			busy={startupState.busy}
+		/>
+	)
+}

package/src/cli.ts

@@ -3,18 +3,17 @@ import { config } from "./config.js"
 import { otelServerInstructions } from "./instructions.js"
 import { attributeFiltersFromArgs, isAttributeFilterToken } from "./queryFilters.js"
 import { queryRuntime } from "./runtime.js"
-import { LogQueryService } from "./services/LogQueryService.js"
-import { TraceQueryService } from "./services/TraceQueryService.js"
+import { TelemetryStoreReadonly } from "./services/TelemetryStore.js"
 
 const [command, ...args] = process.argv.slice(2)
 
-const runQuiet = <A, E, R extends TraceQueryService | LogQueryService | never>(effect: Effect.Effect<A, E, R>) =>
+const runQuiet = <A, E, R extends TelemetryStoreReadonly | never>(effect: Effect.Effect<A, E, R>) =>
 	queryRuntime.runPromise(effect.pipe(Effect.provideService(References.MinimumLogLevel, "None")))
 
 try {
 	switch (command) {
 	case "services": {
-		const result = await runQuiet(Effect.flatMap(TraceQueryService.asEffect(), (query) => query.listServices))
+		const result = await runQuiet(Effect.flatMap(TelemetryStoreReadonly, (query) => query.listServices))
 		console.log(JSON.stringify(result, null, 2))
 		break
 	}
@@ -22,7 +21,7 @@ try {
 	case "traces": {
 		const service = args[0] ?? config.otel.serviceName
 		const limit = args[1] ? Number.parseInt(args[1], 10) : config.otel.traceFetchLimit
-		const result = await runQuiet(Effect.flatMap(TraceQueryService.asEffect(), (query) => query.listRecentTraces(service, { limit })))
+		const result = await runQuiet(Effect.flatMap(TelemetryStoreReadonly, (query) => query.listRecentTraces(service, { limit })))
 		console.log(JSON.stringify(result, null, 2))
 		break
 	}
@@ -33,7 +32,7 @@ try {
 			throw new Error("Usage: bun run cli trace <trace-id>")
 		}
 
-		const result = await runQuiet(Effect.flatMap(TraceQueryService.asEffect(), (query) => query.getTrace(traceId)))
+		const result = await runQuiet(Effect.flatMap(TelemetryStoreReadonly, (query) => query.getTrace(traceId)))
 		console.log(JSON.stringify(result, null, 2))
 		break
 	}
@@ -55,7 +54,7 @@ try {
 			throw new Error("Usage: bun run cli trace-spans <trace-id>")
 		}
 
-		const result = await runQuiet(Effect.flatMap(TraceQueryService.asEffect(), (query) => query.listTraceSpans(traceId)))
+		const result = await runQuiet(Effect.flatMap(TelemetryStoreReadonly, (query) => query.listTraceSpans(traceId)))
 		console.log(JSON.stringify(result, null, 2))
 		break
 	}
@@ -68,7 +67,7 @@ try {
 		const attributeStartIndex = operation ? 2 : 1
 		const attributeFilters = attributeFiltersFromArgs(args.slice(attributeStartIndex))
 		const result = await runQuiet(
-			Effect.flatMap(TraceQueryService.asEffect(), (query) =>
+			Effect.flatMap(TelemetryStoreReadonly, (query) =>
 				query.searchSpans({
 					serviceName: service,
 					operation,
@@ -87,7 +86,7 @@ try {
 		const operation = args[1] && !isAttributeFilterToken(args[1]) ? args[1] : undefined
 		const attributeFilters = attributeFiltersFromArgs(args.slice(operation ? 2 : 1))
 		const result = await runQuiet(
-			Effect.flatMap(TraceQueryService.asEffect(), (query) =>
+			Effect.flatMap(TelemetryStoreReadonly, (query) =>
 				query.searchTraces({
 					serviceName: service,
 					operation,
@@ -110,7 +109,7 @@ try {
 		}
 
 		const result = await runQuiet(
-			Effect.flatMap(TraceQueryService.asEffect(), (query) =>
+			Effect.flatMap(TelemetryStoreReadonly, (query) =>
 				query.traceStats({
 					groupBy,
 					agg,
@@ -131,7 +130,7 @@ try {
 
 	case "logs": {
 		const service = args[0] ?? config.otel.serviceName
-		const result = await runQuiet(Effect.flatMap(LogQueryService.asEffect(), (query) => query.listRecentLogs(service)))
+		const result = await runQuiet(Effect.flatMap(TelemetryStoreReadonly, (query) => query.listRecentLogs(service)))
 		console.log(JSON.stringify(result, null, 2))
 		break
 	}
@@ -141,7 +140,7 @@ try {
 		const body = args[1] && !isAttributeFilterToken(args[1]) ? args[1] : undefined
 		const attributeFilters = attributeFiltersFromArgs(args.slice(body ? 2 : 1))
 		const result = await runQuiet(
-			Effect.flatMap(LogQueryService.asEffect(), (query) =>
+			Effect.flatMap(TelemetryStoreReadonly, (query) =>
 				query.searchLogs({
 					serviceName: service,
 					body,
@@ -163,7 +162,7 @@ try {
 		}
 
 		const result = await runQuiet(
-			Effect.flatMap(LogQueryService.asEffect(), (query) =>
+			Effect.flatMap(TelemetryStoreReadonly, (query) =>
 				query.logStats({
 					groupBy,
 					agg: "count",
@@ -183,7 +182,7 @@ try {
 			throw new Error("Usage: bun run cli trace-logs <trace-id>")
 		}
 
-		const result = await runQuiet(Effect.flatMap(LogQueryService.asEffect(), (query) => query.listTraceLogs(traceId)))
+		const result = await runQuiet(Effect.flatMap(TelemetryStoreReadonly, (query) => query.listTraceLogs(traceId)))
 		console.log(JSON.stringify(result, null, 2))
 		break
 	}
@@ -195,7 +194,7 @@ try {
 		}
 
 		const result = await runQuiet(
-			Effect.flatMap(LogQueryService.asEffect(), (query) =>
+			Effect.flatMap(TelemetryStoreReadonly, (query) =>
 				query.searchLogs({
 					spanId,
 					limit: config.otel.logFetchLimit,
@@ -214,7 +213,7 @@ try {
 		}
 
 		const result = await runQuiet(
-			Effect.flatMap(LogQueryService.asEffect(), (query) =>
+			Effect.flatMap(TelemetryStoreReadonly, (query) =>
 				query.listFacets({ type, field, limit: 20 }),
 			),
 		)

package/src/config.ts

@@ -1,3 +1,6 @@
+import { motelStateDir } from "./registry.js"
+import * as path from "node:path"
+
 const parseBoolean = (value: string | undefined, defaultValue: boolean) => {
 	const normalized = value?.trim().toLowerCase()
 	if (!normalized) return defaultValue
@@ -29,11 +32,14 @@ export const config = {
 		queryUrl: baseUrl,
 		exporterUrl: process.env.MOTEL_OTEL_EXPORTER_URL?.trim() || resolveOtelUrl("/v1/traces"),
 		logsExporterUrl: process.env.MOTEL_OTEL_LOGS_EXPORTER_URL?.trim() || resolveOtelUrl("/v1/logs"),
-		databasePath: process.env.MOTEL_OTEL_DB_PATH?.trim() || `${import.meta.dir}/../.motel-data/telemetry.sqlite`,
+		databasePath: process.env.MOTEL_OTEL_DB_PATH?.trim() || path.join(motelStateDir(), "telemetry.sqlite"),
 		traceLookbackMinutes: parsePositiveInt(process.env.MOTEL_OTEL_TRACE_LOOKBACK_MINUTES, 1440),
 		traceFetchLimit: parsePositiveInt(process.env.MOTEL_OTEL_TRACE_LIMIT, 100),
 		logFetchLimit: parsePositiveInt(process.env.MOTEL_OTEL_LOG_LIMIT, 80),
 		retentionHours: parsePositiveInt(process.env.MOTEL_OTEL_RETENTION_HOURS, 168),
 		maxDbSizeMb: parsePositiveInt(process.env.MOTEL_OTEL_MAX_DB_SIZE_MB, 1024),
+		retentionTraceBatch: parsePositiveInt(process.env.MOTEL_OTEL_RETENTION_TRACE_BATCH, 100),
+		retentionLogBatch: parsePositiveInt(process.env.MOTEL_OTEL_RETENTION_LOG_BATCH, 5_000),
+		retentionIntervalSeconds: parsePositiveInt(process.env.MOTEL_OTEL_RETENTION_INTERVAL_SECONDS, 10),
 	},
 } as const