@concavejs/runtime-cf-base 0.0.1-alpha.7 → 0.0.1-alpha.9

package/dist/worker/create-concave-worker.d.ts

@@ -1,5 +1,6 @@
 import type { DurableObjectNamespace, ExecutionContext } from "@cloudflare/workers-types";
 import { handleHttpApiRequest } from "../http/http-api";
+import type { SyncWriteDispatchPayload } from "../http/http-api";
 import { type ModuleLoader, type ModuleRegistry } from "@concavejs/core/udf";
 export interface ConcaveWorkerBindings {
     getConcaveNamespace: (env: any, ctx: ExecutionContext) => DurableObjectNamespace | undefined;
@@ -25,6 +26,50 @@ export interface ConcaveWorkerOptions {
     configureModuleLoaders?: (registry: ModuleRegistry) => void;
     /** Pre-loaded dashboard HTML (avoids bundling dashboard-local) */
     dashboardHtml?: string;
+    /**
+     * Optional per-request routing overrides for selecting physical DO targets.
+     *
+     * `instance` remains the logical tenant/app instance used for auth/data scoping.
+     * Route targets can point at a pooled DO name for scaling.
+     */
+    resolveRouteTargets?: (context: ConcaveWorkerRouteContext) => ConcaveWorkerRouteTargets | Promise<ConcaveWorkerRouteTargets | undefined> | undefined;
+}
+export interface ConcaveWorkerRouteContext<Env = any> {
+    request: Request;
+    env: Env;
+    ctx: ExecutionContext;
+    /** Logical instance selected via query/header/cookie routing. */
+    instance: string;
+}
+export interface ConcaveWorkerRouteTargets {
+    /** Physical ConcaveDO name to route /api and /udf requests to. */
+    concaveDoName?: string;
+    /** Physical SyncDO name to route /sync websocket connections to. */
+    syncDoName?: string;
+    /**
+     * Physical SyncDO names that should receive mutation write notifications.
+     * Defaults to `[syncDoName]`.
+     */
+    syncNotifyDoNames?: string[];
+    /**
+     * Structured target descriptor for runtime adapters.
+     * `targetName` maps to ConcaveDO in Cloudflare runtime.
+     */
+    concave?: {
+        targetName?: string;
+    };
+    /**
+     * Structured sync target descriptor for runtime adapters.
+     * `targetName` maps to SyncDO, and `notifyTargetNames` maps to fanout targets.
+     */
+    sync?: {
+        targetName?: string;
+        notifyTargetNames?: string[];
+    };
+    /**
+     * Optional write-dispatch override (queue/stream fanout) for API mutations.
+     */
+    dispatchSyncWrites?: (payload: SyncWriteDispatchPayload) => Promise<void>;
 }
 export declare function resolveNamespaceBinding(env: any, ctx: ExecutionContext, bindingName: string, exportName: string): DurableObjectNamespace | undefined;
 export declare function createScopedNamespace(ns: DurableObjectNamespace, prefix: string): DurableObjectNamespace;

package/dist/worker/create-concave-worker.js

@@ -22,7 +22,7 @@ export function createScopedNamespace(ns, prefix) {
     };
 }
 export function createConcaveWorker(options) {
-    const { bindings, instanceKey = DEFAULT_INSTANCE_KEY, cors = true, apiPrefix = "/api", udfPrefix = "/udf", syncPathMatcher = DEFAULT_SYNC_PATH_MATCHER, handleHttpApiRequest: apiHandler = handleHttpApiRequest, moduleLoader, moduleLoaders, configureModuleLoaders, dashboardHtml: injectedDashboardHtml, } = options;
+    const { bindings, instanceKey = DEFAULT_INSTANCE_KEY, cors = true, apiPrefix = "/api", udfPrefix = "/udf", syncPathMatcher = DEFAULT_SYNC_PATH_MATCHER, handleHttpApiRequest: apiHandler = handleHttpApiRequest, moduleLoader, moduleLoaders, configureModuleLoaders, dashboardHtml: injectedDashboardHtml, resolveRouteTargets, } = options;
     let cachedDashboardHtml = injectedDashboardHtml;
     const explicitLoaders = collectModuleLoaders(moduleLoader, moduleLoaders);
     if (explicitLoaders.length > 0) {
@@ -49,6 +49,10 @@ export function createConcaveWorker(options) {
             });
             const instance = instanceResolution.value;
             const forwardUrl = new URL(url.toString());
+            const routeTargets = (await resolveRouteTargets?.({ request, env, ctx, instance })) ?? {};
+            const concaveDoName = normalizeRouteTargetName(routeTargets.concaveDoName ?? routeTargets.concave?.targetName, instance);
+            const syncDoName = normalizeRouteTargetName(routeTargets.syncDoName ?? routeTargets.sync?.targetName, instance);
+            const syncNotifyDoNames = normalizeSyncNotifyTargets(routeTargets.syncNotifyDoNames ?? routeTargets.sync?.notifyTargetNames, syncDoName);
             if (cors && request.method === "OPTIONS") {
                 return new Response("OK", {
                     headers: buildCorsHeaders(request),
@@ -63,10 +67,11 @@ export function createConcaveWorker(options) {
                     console.error("[ConcaveWorker] Sync Durable Object namespace is not configured");
                     throw new Error("Sync Durable Object namespace is not configured");
                 }
-                const id = namespace.idFromName(instance);
+                const id = namespace.idFromName(syncDoName);
                 const stub = namespace.get(id);
-                console.log(`[ConcaveWorker] Forwarding to SyncDO: ${instance} (${id.toString()})`);
+                console.log(`[ConcaveWorker] Forwarding to SyncDO: logical=${instance} physical=${syncDoName} (${id.toString()})`);
                 const forwardedRequest = new Request(forwardUrl.toString(), request);
+                forwardedRequest.headers.set("X-Concave-Instance", instance);
                 if (request.headers.get("Upgrade")) {
                     forwardedRequest.headers.set("Upgrade", request.headers.get("Upgrade"));
                 }
@@ -85,7 +90,12 @@ export function createConcaveWorker(options) {
             }
             if (pathname.startsWith(apiPrefix)) {
                 const forwardedRequest = new Request(forwardUrl.toString(), request);
-                const response = await apiHandler(forwardedRequest, env, ctx, instance);
+                forwardedRequest.headers.set("X-Concave-Instance", instance);
+                const response = await apiHandler(forwardedRequest, env, ctx, instance, {
+                    concaveDoName,
+                    syncDoNames: syncNotifyDoNames,
+                    dispatchSyncWrites: routeTargets.dispatchSyncWrites,
+                });
                 return maybeAttachInstanceCookie(response, request, instanceResolution, { instanceKey });
             }
             if (pathname.startsWith(udfPrefix)) {
@@ -93,9 +103,10 @@ export function createConcaveWorker(options) {
                 if (!namespace) {
                     throw new Error("Concave Durable Object namespace is not configured");
                 }
-                const id = namespace.idFromName(instance);
+                const id = namespace.idFromName(concaveDoName);
                 const stub = namespace.get(id);
                 const forwardedRequest = new Request(forwardUrl.toString(), request);
+                forwardedRequest.headers.set("X-Concave-Instance", instance);
                 const response = await stub.fetch(forwardedRequest);
                 return maybeAttachInstanceCookie(response, request, instanceResolution, { instanceKey });
             }
@@ -160,3 +171,23 @@ function collectModuleLoaders(primary, additional) {
 function isDashboardPath(pathname) {
     return pathname === "/_dashboard" || pathname.startsWith("/_dashboard/");
 }
+function normalizeRouteTargetName(target, fallback) {
+    const trimmed = target?.trim();
+    return trimmed && trimmed.length > 0 ? trimmed : fallback;
+}
+function normalizeSyncNotifyTargets(targets, fallback) {
+    if (targets === undefined) {
+        return [fallback];
+    }
+    if (targets.length === 0) {
+        return [];
+    }
+    const deduped = new Set();
+    for (const target of targets) {
+        const trimmed = target.trim();
+        if (trimmed.length > 0) {
+            deduped.add(trimmed);
+        }
+    }
+    return Array.from(deduped);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concavejs/runtime-cf-base",
-  "version": "0.0.1-alpha.7",
+  "version": "0.0.1-alpha.9",
   "license": "FSL-1.1-Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -68,6 +68,10 @@
 "types": "./dist/worker/udf-worker.d.ts",
 "default": "./dist/worker/udf-worker.js"
 },
+"./routing/sync-topology": {
+"types": "./dist/routing/sync-topology.d.ts",
+"default": "./dist/routing/sync-topology.js"
+},
 "./sync": {
 "types": "./dist/sync/index.d.ts",
 "default": "./dist/sync/index.js"
@@ -81,12 +85,12 @@
   "test": "bun test --run --passWithNoTests || true"
 },
 "dependencies": {
-  "@concavejs/core": "0.0.1-alpha.6",
-  "@concavejs/runtime-base": "0.0.1-alpha.6",
-  "@concavejs/docstore-cf-do": "0.0.1-alpha.6",
-  "@concavejs/docstore-cf-d1": "0.0.1-alpha.6",
-  "@concavejs/docstore-cf-hyperdrive": "0.0.1-alpha.6",
-  "@concavejs/blobstore-cf-r2": "0.0.1-alpha.6",
+  "@concavejs/core": "0.0.1-alpha.8",
+  "@concavejs/runtime-base": "0.0.1-alpha.8",
+  "@concavejs/docstore-cf-do": "0.0.1-alpha.8",
+  "@concavejs/docstore-cf-d1": "0.0.1-alpha.8",
+  "@concavejs/docstore-cf-hyperdrive": "0.0.1-alpha.8",
+  "@concavejs/blobstore-cf-r2": "0.0.1-alpha.8",
   "convex": "^1.27.3"
 },
 "devDependencies": {