@electric-ax/agents-server 0.4.0 → 0.4.2

package/src/routing/runners-router.ts

@@ -13,6 +13,7 @@ import {
 import { routeBody, withSchema } from './schema.js'
 import { subscriptionIdForDispatchTarget } from './dispatch-policy.js'
 import { withLeadingSlash } from './tenant-stream-paths.js'
+import { principalFromCreatedBy } from '../principal.js'
 import type { JsonRouteRequest } from './schema.js'
 import type { RouterType } from 'itty-router'
 import type { TenantContext } from './context.js'
@@ -104,7 +105,7 @@ async function registerRunner(
   ctx: TenantContext
 ): Promise<Response> {
   const parsed = routeBody<RegisterRunnerBody>(request)
-  const ownerUserId = parsed.owner_user_id ?? ctx.authenticatedUser?.userId
+  const ownerUserId = parsed.owner_user_id ?? ctx.principal?.key
   if (!ownerUserId) {
     throw new ElectricAgentsError(
       ErrCodeInvalidRequest,
@@ -112,7 +113,7 @@ async function registerRunner(
       400
     )
   }
-  if (ctx.authenticatedUser && ownerUserId !== ctx.authenticatedUser.userId) {
+  if (ctx.principal && ownerUserId !== ctx.principal.key) {
     throw new ElectricAgentsError(
       ErrCodeUnauthorized,
       `owner_user_id must match the authenticated user`,
@@ -139,11 +140,7 @@ async function listRunners(
   ctx: TenantContext
 ): Promise<Response> {
   const requestedOwner = firstQueryValue(request.query.owner_user_id)
-  if (
-    ctx.authenticatedUser &&
-    requestedOwner &&
-    requestedOwner !== ctx.authenticatedUser.userId
-  ) {
+  if (ctx.principal && requestedOwner && requestedOwner !== ctx.principal.key) {
     throw new ElectricAgentsError(
       ErrCodeUnauthorized,
       `owner_user_id must match the authenticated user`,
@@ -151,7 +148,7 @@ async function listRunners(
     )
   }
   const runners = await ctx.entityManager.registry.listRunners({
-    ownerUserId: ctx.authenticatedUser?.userId ?? requestedOwner,
+    ownerUserId: ctx.principal?.key ?? requestedOwner,
   })
   return json(runners)
 }
@@ -224,15 +221,8 @@ async function claimWake(
   ctx: TenantContext
 ): Promise<Response> {
   const runnerId = routeParam(request, `id`)
-  if (!ctx.authenticatedUser) {
-    throw new ElectricAgentsError(
-      ErrCodeUnauthorized,
-      `Authentication is required to claim runner work`,
-      401
-    )
-  }
   const runner = await requireRunner(ctx, runnerId)
-  if (runner.owner_user_id !== ctx.authenticatedUser.userId) {
+  if (ctx.principal && runner.owner_user_id !== ctx.principal.key) {
     throw new ElectricAgentsError(
       ErrCodeUnauthorized,
       `Runner claim requires the authenticated owner`,
@@ -308,8 +298,8 @@ function assertRunnerOwnerIfAuthenticated(
   ctx: TenantContext,
   ownerUserId: string
 ): void {
-  if (!ctx.authenticatedUser) return
-  if (ownerUserId === ctx.authenticatedUser.userId) return
+  if (!ctx.principal) return
+  if (ownerUserId === ctx.principal.key) return
   throw new ElectricAgentsError(
     ErrCodeUnauthorized,
     `Runner access requires the authenticated owner`,
@@ -411,6 +401,8 @@ async function notificationFromClaim(
       streams: entity.streams,
       tags: entity.tags,
       spawnArgs: entity.spawn_args,
+      createdBy: entity.created_by,
     },
+    principal: principalFromCreatedBy(entity.created_by),
   }
 }

package/src/runtime.ts

@@ -435,6 +435,8 @@ export class ElectricAgentsTenantRuntime {
     const fireAtRaw = value.fireAt
     const producerId = value.producerId
     const targetUrl = value.targetUrl
+    const senderUrl =
+      typeof value.senderUrl === `string` ? value.senderUrl : ownerEntityUrl
     if (
       typeof fireAtRaw !== `string` ||
       typeof producerId !== `string` ||
@@ -459,7 +461,7 @@ export class ElectricAgentsTenantRuntime {
       manifestKey,
       {
         entityUrl: targetUrl,
-        from: typeof value.from === `string` ? value.from : ownerEntityUrl,
+        from: senderUrl,
         payload: value.payload,
         key: `scheduled-${producerId}`,
         type:
@@ -474,6 +476,7 @@ export class ElectricAgentsTenantRuntime {
             kind: `schedule`,
             scheduleType: `future_send`,
             targetUrl,
+            senderUrl,
             fireAt: fireAt.toISOString(),
             producerId,
             status: `pending`,

package/src/scheduler.ts

@@ -9,6 +9,8 @@ export interface DelayedSendPayload {
   payload: unknown
   key?: string
   type?: string
+  mode?: `immediate` | `queued` | `paused` | `steer`
+  position?: string
   producerId?: string
   manifest?: {
     ownerEntityUrl: string

package/src/server.ts

@@ -12,6 +12,13 @@ import { ossServerRouter } from './routing/oss-server-router.js'
 import { startStandaloneAgentsRuntime } from './standalone-runtime.js'
 import { StreamClient, durableStreamsServiceUrl } from './stream-client.js'
 import { DEFAULT_TENANT_ID } from './tenant.js'
+import { getDevPrincipal, getPrincipalFromRequest } from './principal.js'
+import { apiError } from './electric-agents-http.js'
+import {
+  ErrCodeInvalidRequest,
+  ErrCodeUnauthorized,
+} from './electric-agents-types.js'
+import { ElectricAgentsError } from './entity-manager.js'
 import { serverLog } from './utils/log.js'
 import type { DrizzleDB, PgClient } from './db/index.js'
 import type { Server } from 'node:http'
@@ -22,7 +29,7 @@ import type {
   EntityRegistry,
   RuntimeHandler,
 } from '@electric-ax/agents-runtime'
-import type { AuthenticateRequest } from './electric-agents-types.js'
+import type { Principal } from './principal.js'
 import type { EntityBridgeCoordinator } from './entity-bridge-manager.js'
 import type { DurableStreamsRoutingAdapter } from './routing/durable-streams-routing-adapter.js'
 import type { OssServerContext } from './routing/oss-server-router.js'
@@ -46,7 +53,10 @@ export interface ElectricAgentsServerOptions {
   postgresUrl: string
   electricUrl?: string
   electricSecret?: string
-  authenticateRequest?: AuthenticateRequest
+  authenticateRequest?: (
+    request: Request
+  ) => Promise<Principal | null> | Principal | null
+  allowDevPrincipalFallback?: boolean
   /**
    * Disabled by default. When set to a positive interval, periodically
    * recovers expired dispatch claims and stale outstanding wakes.
@@ -207,6 +217,7 @@ export class ElectricAgentsServer {
       })
       this.electricAgentsManager = this.standaloneRuntime.manager
       this.entityBridgeManager = this.standaloneRuntime.entityBridgeManager
+      await this.electricAgentsManager.ensurePrincipalEntityType()
 
       const serverAdapter = createServerAdapter((request) =>
         this.handleRequest(request)
@@ -323,9 +334,27 @@ export class ElectricAgentsServer {
       return new Response(null, { status: 503 })
     }
 
-    return await ossServerRouter.fetch(
-      request as Parameters<typeof ossServerRouter.fetch>[0],
-      await this.buildTenantContext(request)
+    try {
+      return await ossServerRouter.fetch(
+        request as Parameters<typeof ossServerRouter.fetch>[0],
+        await this.buildTenantContext(request)
+      )
+    } catch (error) {
+      if (error instanceof ElectricAgentsError) {
+        return apiError(error.status, error.code, error.message, error.details)
+      }
+      throw error
+    }
+  }
+
+  private allowDevPrincipalFallback(): boolean {
+    if (this.options.allowDevPrincipalFallback !== undefined) {
+      return this.options.allowDevPrincipalFallback
+    }
+    return (
+      process.env.ELECTRIC_INSECURE === `true` ||
+      process.env.NODE_ENV !== `production` ||
+      Boolean(this.options.durableStreamsServer)
     )
   }
 
@@ -343,10 +372,33 @@ export class ElectricAgentsServer {
       throw new Error(`agents-server runtime is not started`)
     }
 
+    let principal: Principal | null
+    try {
+      principal =
+        (await this.options.authenticateRequest?.(request)) ??
+        getPrincipalFromRequest(request)
+    } catch (error) {
+      throw new ElectricAgentsError(
+        ErrCodeInvalidRequest,
+        error instanceof Error ? error.message : `Invalid principal`,
+        400
+      )
+    }
+
+    if (!principal && this.allowDevPrincipalFallback()) {
+      principal = getDevPrincipal()
+    }
+    if (!principal) {
+      throw new ElectricAgentsError(
+        ErrCodeUnauthorized,
+        `Missing Electric-Principal`,
+        401
+      )
+    }
+
     return {
       service: this.tenantId,
-      authenticatedUser:
-        (await this.options.authenticateRequest?.(request)) ?? undefined,
+      principal,
       publicUrl: this.publicUrl,
       localUrl: this._url,
       durableStreamsUrl: this.options.durableStreamsUrl,

package/src/dev-asserted-auth.ts

@@ -1,46 +0,0 @@
-import type {
-  AuthenticateRequest,
-  AuthenticatedRequestUser,
-} from './electric-agents-types.js'
-
-export interface DevAssertedAuthOptions {
-  enabled?: boolean
-  defaultEmail?: string
-  defaultName?: string
-}
-
-export const DEV_ASSERTED_EMAIL_HEADER = `x-electric-asserted-email`
-export const DEV_ASSERTED_NAME_HEADER = `x-electric-asserted-name`
-
-function clean(value: string | undefined | null): string | undefined {
-  const trimmed = value?.trim()
-  return trimmed || undefined
-}
-
-export function createDevAssertedAuthenticateRequest(
-  options: DevAssertedAuthOptions
-): AuthenticateRequest | undefined {
-  if (!options.enabled) return undefined
-
-  return (request): AuthenticatedRequestUser | null => {
-    const email =
-      clean(request.headers.get(DEV_ASSERTED_EMAIL_HEADER)) ??
-      clean(options.defaultEmail)
-    const name =
-      clean(request.headers.get(DEV_ASSERTED_NAME_HEADER)) ??
-      clean(options.defaultName)
-    const userId = email ?? name
-    if (!userId) return null
-    return { userId, email, name }
-  }
-}
-
-export function devAssertedAuthOptionsFromEnv(
-  env: Record<string, string | undefined> = process.env
-): DevAssertedAuthOptions {
-  return {
-    enabled: env.ELECTRIC_AGENTS_DEV_ASSERTED_AUTH === `1`,
-    defaultEmail: env.ELECTRIC_ASSERTED_AUTH_EMAIL,
-    defaultName: env.ELECTRIC_ASSERTED_AUTH_NAME,
-  }
-}