@electric-ax/agents-server 0.4.2 → 0.4.3

package/src/server.ts

@@ -7,7 +7,6 @@ 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'
@@ -145,7 +144,9 @@ export class ElectricAgentsServer {
     this.options = options
     this.streamClient = options.durableStreamsUrl
       ? new StreamClient(
-          durableStreamsServiceUrl(options.durableStreamsUrl, this.tenantId),
+          durableStreamsServiceUrl(options.durableStreamsUrl, this.tenantId, {
+            scope: `stream-root`,
+          }),
           { bearer: options.durableStreamsBearer }
         )
       : null!
@@ -186,7 +187,9 @@ export class ElectricAgentsServer {
         )
         this.options.durableStreamsUrl = streamsUrl
         this.streamClient = new StreamClient(
-          durableStreamsServiceUrl(streamsUrl, this.tenantId),
+          durableStreamsServiceUrl(streamsUrl, this.tenantId, {
+            scope: `stream-root`,
+          }),
           { bearer: this.options.durableStreamsBearer }
         )
       }
@@ -401,11 +404,9 @@ export class ElectricAgentsServer {
       principal,
       publicUrl: this.publicUrl,
       localUrl: this._url,
-      durableStreamsUrl: this.options.durableStreamsUrl,
+      durableStreamsUrl: this.streamClient.baseUrl,
       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

@@ -58,7 +58,9 @@ export async function startStandaloneAgentsRuntime(
     options.streamClient ??
     (options.durableStreamsUrl
       ? new StreamClient(
-          durableStreamsServiceUrl(options.durableStreamsUrl, serviceId),
+          durableStreamsServiceUrl(options.durableStreamsUrl, serviceId, {
+            scope: `stream-root`,
+          }),
           { bearer: options.durableStreamsBearer }
         )
       : undefined)

package/src/stream-client.ts

@@ -14,6 +14,8 @@ export interface StreamClientOptions {
   bearer?: DurableStreamsBearerProvider
 }
 
+type DurableStreamsUrlScope = `service` | `stream-root`
+
 export interface StreamAppendResult {
   offset: string
 }
@@ -141,14 +143,29 @@ function durableStreamsBearerHeaders(
 
 export function durableStreamsServiceUrl(
   baseUrl: string,
-  serviceId: string
+  serviceId: string,
+  options: { scope?: DurableStreamsUrlScope } = {}
 ): string {
   const url = new URL(baseUrl)
-  if (/^\/v1\/stream\/[^/]+\/?$/.test(url.pathname)) {
+  if (/\/v1\/streams\/[^/]+\/?$/.test(url.pathname)) {
+    return baseUrl.replace(/\/+$/, ``)
+  }
+  if (/\/v1\/stream\/[^/]+\/?$/.test(url.pathname)) {
     return baseUrl.replace(/\/+$/, ``)
   }
-  const base = baseUrl.replace(/\/+$/, ``)
-  return `${base}/v1/stream/${encodeURIComponent(serviceId)}`
+  const scope = options.scope ?? `service`
+  const encodedServiceId = encodeURIComponent(serviceId)
+  const path = url.pathname.replace(/\/+$/, ``) || `/`
+  if (path.endsWith(`/v1/streams`)) {
+    url.pathname = `${path}/${encodedServiceId}`
+  } else if (path.endsWith(`/v1/stream`)) {
+    url.pathname = scope === `service` ? `${path}/${encodedServiceId}` : path
+  } else if (scope === `stream-root`) {
+    url.pathname = `${path === `/` ? `` : path}/v1/stream`
+  } else {
+    url.pathname = `${path === `/` ? `` : path}/v1/stream/${encodedServiceId}`
+  }
+  return url.toString().replace(/\/+$/, ``)
 }
 
 function isNotFoundError(err: unknown): boolean {
@@ -202,42 +219,17 @@ 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)}`
+    url.pathname = `${url.pathname.replace(/\/+$/, ``)}/__ds/subscriptions/${encodeURIComponent(subscriptionId)}`
     return url.toString()
   }
 

package/src/utils/server-utils.ts

@@ -167,12 +167,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 +181,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)