@electric-ax/agents-server 0.4.2 → 0.4.4

package/src/server.ts

@@ -7,10 +7,9 @@ import {
   createRuntimeHandler,
 } from '@electric-ax/agents-runtime'
 import { createDb, runMigrations } from './db/index.js'
-import { pathPrefixedSingleTenantDurableStreamsRoutingAdapter } from './routing/durable-streams-routing-adapter.js'
 import { ossServerRouter } from './routing/oss-server-router.js'
 import { startStandaloneAgentsRuntime } from './standalone-runtime.js'
-import { StreamClient, durableStreamsServiceUrl } from './stream-client.js'
+import { StreamClient } from './stream-client.js'
 import { DEFAULT_TENANT_ID } from './tenant.js'
 import { getDevPrincipal, getPrincipalFromRequest } from './principal.js'
 import { apiError } from './electric-agents-http.js'
@@ -121,6 +120,16 @@ function createMockAgentBootstrap(options: {
   return { runtime, registry }
 }
 
+function durableStreamTestServerBackendUrl(origin: string): string {
+  // DurableStreamTestServer.start() returns the HTTP origin, while the
+  // reference server's stream backend is mounted under /v1/stream.
+  // User-provided durableStreamsUrl values are already backend prefixes and
+  // are passed through unchanged.
+  const url = new URL(origin)
+  url.pathname = `${url.pathname.replace(/\/+$/, ``)}/v1/stream`
+  return url.toString().replace(/\/+$/, ``)
+}
+
 export class ElectricAgentsServer {
   private server?: Server
   private electricAgentsManager?: StartedStandaloneAgentsRuntime[`manager`]
@@ -144,10 +153,9 @@ export class ElectricAgentsServer {
     }
     this.options = options
     this.streamClient = options.durableStreamsUrl
-      ? new StreamClient(
-          durableStreamsServiceUrl(options.durableStreamsUrl, this.tenantId),
-          { bearer: options.durableStreamsBearer }
-        )
+      ? new StreamClient(options.durableStreamsUrl, {
+          bearer: options.durableStreamsBearer,
+        })
       : null!
   }
 
@@ -184,11 +192,11 @@ export class ElectricAgentsServer {
         serverLog.info(
           `[agent-server] durable streams server started at ${streamsUrl}`
         )
-        this.options.durableStreamsUrl = streamsUrl
-        this.streamClient = new StreamClient(
-          durableStreamsServiceUrl(streamsUrl, this.tenantId),
-          { bearer: this.options.durableStreamsBearer }
-        )
+        this.options.durableStreamsUrl =
+          durableStreamTestServerBackendUrl(streamsUrl)
+        this.streamClient = new StreamClient(this.options.durableStreamsUrl, {
+          bearer: this.options.durableStreamsBearer,
+        })
       }
 
       this.streamsAgent = new Agent({
@@ -401,11 +409,9 @@ export class ElectricAgentsServer {
       principal,
       publicUrl: this.publicUrl,
       localUrl: this._url,
-      durableStreamsUrl: this.options.durableStreamsUrl,
+      durableStreamsUrl: this.options.durableStreamsUrl!,
       durableStreamsBearer: this.options.durableStreamsBearer,
-      durableStreamsRouting:
-        this.options.durableStreamsRouting ??
-        pathPrefixedSingleTenantDurableStreamsRoutingAdapter,
+      durableStreamsRouting: this.options.durableStreamsRouting,
       durableStreamsDispatcher: this.streamsAgent,
       electricUrl: this.options.electricUrl,
       electricSecret: this.options.electricSecret,

package/src/standalone-runtime.ts

@@ -4,7 +4,7 @@ import { EntityBridgeManager } from './entity-bridge-manager.js'
 import { serverLog } from './utils/log.js'
 import { ElectricAgentsTenantRuntime } from './runtime.js'
 import { Scheduler } from './scheduler.js'
-import { StreamClient, durableStreamsServiceUrl } from './stream-client.js'
+import { StreamClient } from './stream-client.js'
 import { TagStreamOutboxDrainer } from './tag-stream-outbox-drainer.js'
 import { DEFAULT_TENANT_ID } from './tenant.js'
 import { WakeRegistry } from './wake-registry.js'
@@ -57,10 +57,9 @@ export async function startStandaloneAgentsRuntime(
   const streamClient =
     options.streamClient ??
     (options.durableStreamsUrl
-      ? new StreamClient(
-          durableStreamsServiceUrl(options.durableStreamsUrl, serviceId),
-          { bearer: options.durableStreamsBearer }
-        )
+      ? new StreamClient(options.durableStreamsUrl, {
+          bearer: options.durableStreamsBearer,
+        })
       : undefined)
   if (!streamClient) {
     throw new Error(`Either durableStreamsUrl or streamClient is required`)

package/src/stream-client.ts

@@ -32,15 +32,6 @@ export interface WaitForMessagesResult {
   timedOut: boolean
 }
 
-export interface ConsumerStateResponse {
-  state: string
-  wake_id?: string | null
-  webhook?: {
-    wake_id?: string | null
-    subscription_id?: string
-  }
-}
-
 export interface SubscriptionStreamInfo {
   path: string
   tail_offset?: string
@@ -129,6 +120,16 @@ export async function applyDurableStreamsBearer(
   }
 }
 
+function appendPathToBaseUrl(baseUrl: string, path: string): string {
+  const url = new URL(baseUrl)
+  const basePath = url.pathname.replace(/\/+$/, ``)
+  const childPath = path.replace(/^\/+/, ``)
+  url.pathname = childPath
+    ? `${basePath === `/` ? `` : basePath}/${childPath}`
+    : basePath || `/`
+  return url.toString().replace(/\/+$/, ``)
+}
+
 function durableStreamsBearerHeaders(
   bearer: DurableStreamsBearerProvider | undefined
 ): HeadersRecord | undefined {
@@ -139,18 +140,6 @@ function durableStreamsBearerHeaders(
   }
 }
 
-export function durableStreamsServiceUrl(
-  baseUrl: string,
-  serviceId: string
-): string {
-  const url = new URL(baseUrl)
-  if (/^\/v1\/stream\/[^/]+\/?$/.test(url.pathname)) {
-    return baseUrl.replace(/\/+$/, ``)
-  }
-  const base = baseUrl.replace(/\/+$/, ``)
-  return `${base}/v1/stream/${encodeURIComponent(serviceId)}`
-}
-
 function isNotFoundError(err: unknown): boolean {
   return (
     (err instanceof DurableStreamError && err.code === ErrCodeNotFound) ||
@@ -184,7 +173,7 @@ export class StreamClient {
   ) {}
 
   private streamUrl(path: string): string {
-    return `${this.baseUrl}${path}`
+    return appendPathToBaseUrl(this.baseUrl, path)
   }
 
   private streamHeaders(): HeadersRecord | undefined {
@@ -202,43 +191,19 @@ export class StreamClient {
     return headers
   }
 
-  private subscriptionServiceId(): string | null {
-    const url = new URL(this.baseUrl)
-    const match = /^(.*)\/v1\/stream\/([^/]+)\/?$/.exec(url.pathname)
-    return match ? decodeURIComponent(match[2]!) : null
-  }
-
   private backendSubscriptionPath(path: string): string {
-    const normalized = normalizeSubscriptionPath(path)
-    const serviceId = this.subscriptionServiceId()
-    if (!serviceId) return normalized
-    if (normalized === serviceId || normalized.startsWith(`${serviceId}/`)) {
-      return normalized
-    }
-    return `${serviceId}/${normalized}`
+    return normalizeSubscriptionPath(path)
   }
 
   private runtimeSubscriptionPath(path: string): string {
-    const normalized = normalizeSubscriptionPath(path)
-    const serviceId = this.subscriptionServiceId()
-    if (!serviceId) return normalized
-    return normalized.startsWith(`${serviceId}/`)
-      ? normalized.slice(serviceId.length + 1)
-      : normalized
+    return normalizeSubscriptionPath(path)
   }
 
   private subscriptionUrl(subscriptionId: string): string {
-    const url = new URL(this.baseUrl)
-    const match = /^(.*)\/v1\/stream\/([^/]+)\/?$/.exec(url.pathname)
-    if (match) {
-      const [, prefix = ``, serviceId] = match
-      url.pathname = `${prefix}/v1/stream-meta/subscriptions/${encodeURIComponent(subscriptionId)}`
-      url.searchParams.set(`service`, decodeURIComponent(serviceId!))
-      return url.toString()
-    }
-
-    url.pathname = `${url.pathname.replace(/\/+$/, ``)}/v1/stream-meta/subscriptions/${encodeURIComponent(subscriptionId)}`
-    return url.toString()
+    return appendPathToBaseUrl(
+      this.baseUrl,
+      `/__ds/subscriptions/${encodeURIComponent(subscriptionId)}`
+    )
   }
 
   private subscriptionChildUrl(
@@ -278,7 +243,7 @@ export class StreamClient {
       })
       const headers: Record<string, string> = {
         'content-type': `application/json`,
-        'Stream-Forked-From': sourcePath,
+        'Stream-Forked-From': new URL(this.streamUrl(sourcePath)).pathname,
       }
       injectTraceHeaders(headers)
 
@@ -823,20 +788,4 @@ export class StreamClient {
       JSON.parse(text) as SubscriptionResponse
     )
   }
-
-  async getConsumerState(
-    consumerId: string
-  ): Promise<ConsumerStateResponse | null> {
-    const res = await fetch(
-      `${this.baseUrl}/consumers/${encodeURIComponent(consumerId)}`,
-      { method: `GET`, headers: await this.requestHeaders() }
-    )
-    if (res.status === 404) return null
-    if (!res.ok) {
-      throw new Error(
-        `Consumer query failed: ${res.status} ${await res.text()}`
-      )
-    }
-    return res.json() as Promise<ConsumerStateResponse>
-  }
 }

package/src/utils/server-utils.ts

@@ -95,6 +95,7 @@ export function buildElectricProxyTarget(options: {
   electricUrl: string
   electricSecret?: string
   tenantId: string
+  principalUrl?: string
 }): URL {
   const targetPath = options.incomingUrl.pathname.replace(
     `/_electric/electric`,
@@ -130,9 +131,19 @@ export function buildElectricProxyTarget(options: {
   } else if (table === `runners`) {
     target.searchParams.set(
       `columns`,
-      `"tenant_id","id","owner_user_id","label","kind","admin_status","wake_stream","wake_stream_offset","last_seen_at","liveness_lease_expires_at","created_at","updated_at"`
+      `"tenant_id","id","owner_principal","label","kind","admin_status","wake_stream","created_at","updated_at"`
     )
-    applyTenantShapeWhere(target, options.tenantId)
+    applyTenantShapeWhere(target, options.tenantId, [
+      `owner_principal = ${sqlStringLiteral(options.principalUrl ?? ``)}`,
+    ])
+  } else if (table === `runner_runtime_diagnostics`) {
+    target.searchParams.set(
+      `columns`,
+      `"tenant_id","runner_id","owner_principal","wake_stream_offset","last_seen_at","liveness_lease_expires_at","diagnostics","updated_at"`
+    )
+    applyTenantShapeWhere(target, options.tenantId, [
+      `owner_principal = ${sqlStringLiteral(options.principalUrl ?? ``)}`,
+    ])
   } else if (table === `entity_dispatch_state`) {
     target.searchParams.set(
       `columns`,
@@ -167,12 +178,13 @@ export async function forwardFetchRequest(options: {
   serviceId: string
   body?: Uint8Array
   dispatcher?: Agent
-  route?: `stream` | `stream-meta`
+  route?: `stream` | `control`
   durableStreamsBearer?: DurableStreamsBearerProvider
   durableStreamsBearerMode?: `overwrite` | `if-missing` | `none`
 }): Promise<Response> {
   const routingAdapter = resolveDurableStreamsRoutingAdapter(
-    options.durableStreamsRouting
+    options.durableStreamsRouting,
+    options.durableStreamsUrl
   )
   const routingInput = {
     durableStreamsUrl: options.durableStreamsUrl,
@@ -180,8 +192,8 @@ export async function forwardFetchRequest(options: {
     requestUrl: options.request.url,
   }
   const upstreamUrl =
-    options.route === `stream-meta`
-      ? routingAdapter.streamMetaUrl(routingInput)
+    options.route === `control`
+      ? routingAdapter.controlUrl(routingInput)
       : routingAdapter.streamUrl(routingInput)
 
   const headers = new Headers(options.request.headers)
@@ -231,8 +243,15 @@ export function decodeJsonObject(
   return null
 }
 
-function applyTenantShapeWhere(target: URL, tenantId: string): void {
-  const tenantWhere = `tenant_id = ${sqlStringLiteral(tenantId)}`
+function applyTenantShapeWhere(
+  target: URL,
+  tenantId: string,
+  extraConditions: Array<string> = []
+): void {
+  const tenantWhere = [
+    `tenant_id = ${sqlStringLiteral(tenantId)}`,
+    ...extraConditions,
+  ].join(` AND `)
   const existingWhere = target.searchParams.get(`where`)
   target.searchParams.set(
     `where`,