alchemy 2.0.0-beta.61 → 2.0.0-beta.63

package/lib/Cloudflare/Workers/DurableObject.js

@@ -10,10 +10,58 @@ import { asEffect } from "../../Util/types.js";
 import { DurableObjectState, fromDurableObjectState, } from "./DurableObjectState.js";
 import { makeRpcStub } from "./Rpc.js";
 import {} from "./WebSocket.js";
-import { Worker, WorkerEnvironment } from "./Worker.js";
+import { isWorker, Worker, WorkerEnvironment, } from "./Worker.js";
 export const isDurableObjectExport = (value) => typeof value === "object" && value?.kind === "durableObject";
 const TypeId = "Cloudflare.DurableObject";
 export const isDurableObjectLike = (value) => typeof value === "object" && value?.kind === TypeId;
+const resolveTransferSourceRef = (source, depth = 0) => {
+    if (typeof source === "string") {
+        return source;
+    }
+    // A Worker resource — contribute its logical id.
+    if (isWorker(source)) {
+        return source.LogicalId;
+    }
+    // A Worker platform class — carries its logical id statically. (On an
+    // Output proxy this property access yields another Output, never a
+    // string, so the check cannot misfire there.)
+    const logicalId = source.LogicalId;
+    if (typeof logicalId === "string") {
+        return logicalId;
+    }
+    // A same-stack Output on a Worker (e.g. `b.workerName`): take the
+    // identity from its provenance, not the value.
+    if (Output.isPropExpr(source)) {
+        const expr = source.expr;
+        if (Output.isResourceExpr(expr) && isWorker(expr.src)) {
+            return expr.src.LogicalId;
+        }
+    }
+    if (Output.isResourceExpr(source) && isWorker(source.src)) {
+        return source.src.LogicalId;
+    }
+    if (Output.isOutput(source)) {
+        // No local resource to take identity from (e.g. a cross-stack
+        // `stackRef`) — the engine resolves the string at deploy time.
+        return source;
+    }
+    if (typeof source === "function" && depth < 8) {
+        return resolveTransferSourceRef(source(), depth + 1);
+    }
+    throw new Error("Invalid transferredFrom entry: pass the former host's logical id or script name, its Worker class or resource, a thunk of one of those, or a string Output.");
+};
+/**
+ * Normalize a `transferredFrom` declaration to plain host identifiers at
+ * plan time. See {@link DurableObjectTransferSource} for the accepted forms
+ * and why Worker references reduce to logical ids instead of Outputs.
+ *
+ * @internal
+ */
+export const normalizeTransferredFrom = (value) => value === undefined
+    ? undefined
+    : (Array.isArray(value)
+        ? value
+        : [value]).map((source) => resolveTransferSourceRef(source));
 export class DurableObjectScope extends Context.Service()("Cloudflare.DurableObject") {
 }
 /**
@@ -605,6 +653,85 @@ export class DurableObjectScope extends Context.Service()("Cloudflare.DurableObj
  * });
  * ```
  *
+ * @section Moving a Class Between Workers
+ * A Durable Object class can move from one Worker to another with its
+ * data intact. The move is always **declared** — a class that disappears
+ * from one worker and appears on another is otherwise ambiguous between
+ * "transfer the data" and "delete it, start fresh", so Alchemy never
+ * guesses (removing a DO deletes it; that is the default). Declare
+ * `transferredFrom` on the Durable Object at its **new host**, naming the
+ * former host, and the new host's deploy ships Cloudflare's
+ * data-preserving `transferred_classes` migration. The former host's
+ * deploy converges on its own — no delete migration is emitted for a
+ * class that moved away.
+ *
+ * Each `transferredFrom` entry is either the former host's Worker
+ * **logical id** (same stack + stage, resolved via alchemy's ownership
+ * tags) or its **physical script name** (required for cross-stack moves).
+ * When no listed host holds the namespace — a fresh stage, or the
+ * transfer already completed — the declaration is inert, so it is safe to
+ * leave in place indefinitely.
+ *
+ * @example Move a class from WorkerB to WorkerA
+ * ```typescript
+ * // BEFORE: worker-b hosts the class
+ * const b = yield* Cloudflare.Worker("WorkerB", {
+ *   main: "./src/worker-b.ts", // exports MyDOClass
+ *   bindings: {
+ *     MyDO: Cloudflare.DurableObject("MyDO", { className: "MyDOClass" }),
+ *   },
+ * });
+ *
+ * // AFTER: worker-a hosts it and declares where it came from;
+ * // worker-b keeps a cross-script reference.
+ * const a = yield* Cloudflare.Worker("WorkerA", {
+ *   main: "./src/worker-a.ts", // now exports MyDOClass
+ *   bindings: {
+ *     MyDO: Cloudflare.DurableObject("MyDO", {
+ *       className: "MyDOClass",
+ *       transferredFrom: "WorkerB", // logical id (or its script name)
+ *     }),
+ *   },
+ * });
+ * const b = yield* Cloudflare.Worker("WorkerB", {
+ *   main: "./src/worker-b.ts", // no longer exports MyDOClass
+ *   bindings: {
+ *     MyDO: Cloudflare.DurableObject("MyDO", {
+ *       className: "MyDOClass",
+ *       scriptName: a.workerName,
+ *     }),
+ *   },
+ * });
+ * ```
+ *
+ * Forgetting the declaration is safe: when the former host still
+ * references the class cross-script, its deploy fails before any upload
+ * with `DurableObjectTransferRequired`, telling you exactly what to
+ * declare — data is never silently destroyed or forked.
+ *
+ * @example Chained moves keep the host history
+ * ```typescript
+ * // The class moved WorkerB → WorkerA last release and WorkerA →
+ * // WorkerC this release. Keep the full history so a stage that lagged
+ * // behind (or skipped the intermediate release) still transfers from
+ * // wherever its namespace currently lives.
+ * Cloudflare.DurableObject("MyDO", {
+ *   className: "MyDOClass",
+ *   transferredFrom: ["WorkerB", "WorkerA"],
+ * })
+ * ```
+ *
+ * Two rules for multi-worker migrations:
+ *
+ * - **Pure moves (the former host drops the DO entirely, keeping no
+ *   cross-script reference) must be two deploys**: first add the class to
+ *   the new host with `transferredFrom` and deploy; then remove it from
+ *   the former host and deploy. In a single deploy nothing orders the
+ *   transfer before the former host's delete.
+ * - **Cross-stack moves deploy the new host's stack first**, naming the
+ *   former host by physical script name; the former host's stack deploys
+ *   after and converges.
+ *
  * @section Adopting an Existing Durable Object
  * When you adopt a Worker that already exists on Cloudflare — created
  * outside Alchemy via Wrangler, the dashboard, or the raw API — its
@@ -614,7 +741,8 @@ export class DurableObjectScope extends Context.Service()("Cloudflare.DurableObj
  * a worker with no Alchemy ownership tags as `Unowned`.
  *
  * Alchemy normally tracks which class backs each binding through an
- * `alchemy:do:<logicalId>:<className>` tag it writes on the script. A
+ * `alchemy:dos:` metadata tag it writes on the script (mapping each
+ * binding's logical id to its class name). A
  * foreign worker has no such tag, so on the **adopting deploy** Alchemy
  * falls back to matching your binding to the live class **by binding
  * name**. The class is then reused in place — not recreated — so
@@ -625,7 +753,7 @@ export class DurableObjectScope extends Context.Service()("Cloudflare.DurableObj
  * binding's `className` must match the class that already exists on the
  * worker.** You cannot rename the class in the same deploy that adopts
  * it. Once the deploy completes, Alchemy owns the worker and has written
- * the `alchemy:do:` tag, so subsequent renames are driven by logical id
+ * the `alchemy:dos:` tag, so subsequent renames are driven by logical id
  * and work normally.
  *
  * @example Adopting a worker whose `Counter` class already exists
@@ -666,16 +794,16 @@ export const DurableObject = taggedFunction(DurableObjectScope, function (...arg
     const isClassForm = args[2] === true;
     const propsOrImpl = args[1];
     const tag = Context.Service(namespace);
-    const binding = (scriptName) => Effect.gen(function* () {
+    const binding = (scriptName, transferredFrom) => Effect.gen(function* () {
         const worker = yield* Worker;
         yield* worker.bind `${namespace}`({
-            // TODO(sam): automate class migrations, probably in the provider
             bindings: [
                 {
                     type: "durable_object_namespace",
                     name: namespace,
                     className: namespace,
                     scriptName,
+                    transferredFrom: normalizeTransferredFrom(transferredFrom),
                 },
             ],
         });
@@ -715,13 +843,19 @@ export const DurableObject = taggedFunction(DurableObjectScope, function (...arg
             //   use((ns) => ns.jurisdiction(jurisdiction) as any),
         };
     });
+    // Class-form declarations (`DurableObject<Self>()("Name", props?)`) can
+    // carry `transferredFrom` so the host's local binding drives a
+    // data-preserving transfer migration.
+    const classProps = isClassForm && !Effect.isEffect(propsOrImpl)
+        ? propsOrImpl
+        : undefined;
     const make = Effect.fn(function* (impl) {
         // Register the local DO binding (no `scriptName`) and obtain the
         // namespace handle. We provide this same handle as
         // `DurableObjectScope` to the user's constructor effect
         // and also return it so a `Layer.effect(tag, make(impl))` Layer
         // resolves the tag to a concrete namespace value.
-        const self = yield* binding();
+        const self = yield* binding(undefined, classProps?.transferredFrom);
         const phase = yield* ALCHEMY_PHASE;
         const constructor = impl.pipe(Effect.provide(Layer.succeed(DurableObjectScope, self)));
         if (phase === "plan") {
@@ -747,6 +881,7 @@ export const DurableObject = taggedFunction(DurableObjectScope, function (...arg
             name: namespace,
             className: args[1]?.className || namespace,
             scriptName: args[1]?.scriptName,
+            transferredFrom: args[1]?.transferredFrom,
         };
     }
     else if (Effect.isEffect(propsOrImpl)) {

package/lib/Cloudflare/Workers/DurableObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"DurableObject.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/DurableObject.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAGtC,OAAO,KAAK,iBAAiB,MAAM,wCAAwC,CAAC;AAC5E,OAAO,KAAK,kBAAkB,MAAM,yCAAyC,CAAC;AAI9E,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAkB,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAuB,MAAM,aAAa,CAAC;AAY7E,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAc,EACgB,EAAE,CAChC,OAAO,KAAK,KAAK,QAAQ,IAAK,KAAa,EAAE,IAAI,KAAK,eAAe,CAAC;AAUxE,MAAM,MAAM,GAAG,0BAA0B,CAAC;AAE1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,KAAc,EACc,EAAE,CAC9B,OAAO,KAAK,KAAK,QAAQ,IAAK,KAAa,EAAE,IAAI,KAAK,MAAM,CAAC;AA6I/D,MAAM,OAAO,kBAAmB,SAAQ,OAAO,CAAC,OAAO,EAGpD,CAAC,0BAA0B,CAAC;CAAG;AAElC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+nBG;AACH,MAAM,CAAC,MAAM,aAAa,GAAuB,cAAc,CAC7D,kBAAkB,EAClB,UACE,GAAG,IAeE;IAEL,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,CAAC,IAAY,EAAE,WAAiB,EAAE,EAAE;QACzC,mBAAmB;QACnB,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1B,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IACrC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEvC,MAAM,OAAO,GAAG,CAAC,UAA0B,EAAE,EAAE,CAC7C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;QAE7B,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAA,GAAG,SAAS,EAAE,CAAC;YAC/B,iEAAiE;YACjE,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,0BAA0B;oBAChC,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,SAAS;oBACpB,UAAU;iBACX;aACF;SACF,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YAChC,iBAAiB;YACjB,aAAa;SACd,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC9B,IAAI,GAAG,KAAK,SAAS,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;gBAC1C,6EAA6E;gBAC7E,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACnC,CAAC;YACD,MAAM,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;YAC1B,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,OAAO,MAAM,CAAC,GAAG,CACf,IAAI,KAAK,CAAC,kBAAkB,SAAS,aAAa,CAAC,CACpD,CAAC;YACJ,CAAC;iBAAM,IAAI,OAAO,EAAE,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;gBAC9C,OAAO,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,CAAC,GAAG,CACf,IAAI,KAAK,CACP,kBAAkB,SAAS,0BAA0B,CACtD,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QAEF,OAAO;YACL,IAAI,EAAE,MAAM;YACZ,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAC9C,MAAM,CAAC,GAAG,CACR,CAAC,uBAAuB,EAAE,EAAE,CAAC,uBAAuB,EAAE,CAAC,SAAS,CAAC,CAClE,CACF;YACD,SAAS,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACjE,oDAAoD;YACpD,kEAAkE;YAClE,kEAAkE;YAClE,SAAS;YACT,4BAA4B;YAC5B,gEAAgE;YAChE,sDAAsD;YACtD,gEAAgE;YAChE,uDAAuD;SACxD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAC9B,IAIC;QAED,iEAAiE;QACjE,mDAAmD;QACnD,wDAAwD;QACxD,gEAAgE;QAChE,kDAAkD;QAClD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;QACnC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAC3B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,IAAW,CAAC,CAAC,CAC/D,CAAC;QACF,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;YACrB,+EAA+E;YAC/E,mCAAmC;YACnC,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CACrB,MAAM,CAAC,OAAO,CACZ,KAAK,CAAC,OAAO,CACX,kBAAkB;YAClB,wBAAwB;YACxB,sBAAsB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAS,CAAC,CAC/C,CACF,CACF,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE;YACvC,IAAI,EAAE,eAAe;YACrB,iEAAiE;YACjE,WAAW;YACX,gGAAgG;YAChG,QAAQ,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAgC;SAClC,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,oEAAoE;QACpE,OAAO;YACL,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,SAAS;YACf,SAAS,EAAG,IAAI,CAAC,CAAC,CAAwB,EAAE,SAAS,IAAI,SAAS;YAClE,UAAU,EAAG,IAAI,CAAC,CAAC,CAAwB,EAAE,UAAU;SACxD,CAAC;IACJ,CAAC;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACxC,mBAAmB;QACnB,OAAO,WAAW,CAChB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CACzB,IAAI,CAAC,WAAkB,CAAC,CAAC,IAAI,CAC3B,MAAM,CAAC,cAAc,CACnB,kBAAkB,EAClB,sBAAsB;QACpB,yDAAyD;QACzD;YACE,OAAO,EAAE,EAAE;SACL,CACT,CACF,CACF,CACF,CACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,iEAAiE;QACjE,oEAAoE;QACpE,kEAAkE;QAClE,gEAAgE;QAChE,yDAAyD;QACzD,6BAA6B;QAC7B,OAAO,KAAM,SAAQ,WAAW,CAAC,GAAqC,CAAC;YACrE,MAAM,CAAC,IAAI,GAAG,CACZ,IAEC,EACD,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAW,CAAC,CAAC,CAAC;YAE1C,MAAM,CAAC,IAAI,GAAG,CACZ,MAAyD,EACzD,EAAE;gBACF,8DAA8D;gBAC9D,2CAA2C;gBAC3C,EAAE;gBACF,4DAA4D;gBAC5D,0DAA0D;gBAC1D,0DAA0D;gBAC1D,4DAA4D;gBAC5D,2DAA2D;gBAC3D,iDAAiD;gBACjD,8DAA8D;gBAC9D,4DAA4D;gBAC5D,uDAAuD;gBACvD,yCAAyC;gBACzC,8DAA8D;gBAC9D,MAAM,QAAQ,GACZ,OAAO,MAAM,KAAK,QAAQ;oBACxB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;oBACxB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAEvB,OAAO,QAAQ,CAAC,IAAI,CAClB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,OAAO,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAClD,CACF,CAAC;YACJ,CAAC,CAAC;SACH,CAAC;IACJ,CAAC;AACH,CAAC,CACK,CAAC"}
+{"version":3,"file":"DurableObject.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/DurableObject.ts"],"names":[],"mappings":"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"}

package/lib/Cloudflare/Workers/DurableObjectBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DurableObjectBridge.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/DurableObjectBridge.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,IAAI,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG9E,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAmBxC;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,kBAEjB,OAAO,kBAAkB,0BAIrC;IACD,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/C,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH,iBAES,MAAM,KAuJX,GAAG,CAAC"}
+{"version":3,"file":"DurableObjectBridge.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/DurableObjectBridge.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,IAAI,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG9E,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAmBxC;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,kBAEjB,OAAO,kBAAkB,0BAIrC;IACD,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/C,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH,iBAES,MAAM,KA2JX,GACN,CAAC"}

package/lib/Cloudflare/Workers/DurableObjectBridge.js

@@ -16,87 +16,91 @@ import { getWorkerExport, handleRpcExit } from "./WorkerBridge.js";
  * Accepts the `DurableObject` base class and a `getExport` resolver so the
  * implementation lives in real TypeScript instead of a generated string template.
  */
-export const makeDurableObjectBridge = (DurableObject, { entrypoint, stack, }) => (className) => class DurableObjectBridge extends DurableObject {
-    #state;
-    #globalContext;
-    #exported;
-    #instance;
-    constructor(state, env) {
-        super(state, env);
-        this.#state = state;
-        const { globalContext, exported } = getWorkerExport({
-            entrypoint,
-            stack,
-            exportName: className,
-        });
-        this.#globalContext = globalContext;
-        this.#exported = exported;
-        this.#instance = state.blockConcurrencyWhile(() => this.#exported.pipe(Effect.flatMap(({ constructor, services }) => {
-            const context = Layer.succeed(DurableObjectState, fromDurableObjectState(this.#state)).pipe(Layer.provideMerge(Layer.succeedContext(services)));
-            return constructor.pipe(Effect.provide(context), Effect.flatMap((instance) => instance.pipe(Effect.provide(context))), Effect.map((instance) => ({ instance, services })));
-        }), Effect.provide(this.#globalContext), Effect.runPromise));
-        return new Proxy(this, {
-            get: (target, prop) => {
-                const bind = (f) => typeof f === "function" ? f.bind(target) : f;
-                if (typeof prop !== "string")
-                    return bind(target[prop]);
-                if (prop in target)
-                    return bind(target[prop]);
-                return async (...args) => this.#execute((instance) => {
-                    const method = instance[prop];
-                    if (typeof method === "function") {
-                        const result = method(...args);
-                        // Effects (including nested-RPC values built by
-                        // `asEffectOrStream`, which are Effects *branded* as Streams)
-                        // must be run as effects — their resolved value may itself be
-                        // a `Stream`, which `handleRpcExit` then encodes. Only a
-                        // *genuine* `Stream` (not an Effect) is lifted into the
-                        // success channel so `handleRpcExit` encodes it directly.
-                        return Effect.isEffect(result)
-                            ? result
-                            : Stream.isStream(result)
-                                ? Effect.succeed(result)
-                                : result;
-                    }
-                    else if (Effect.isEffect(method)) {
-                        return method;
-                    }
-                    else {
-                        return Effect.succeed(method);
-                    }
-                }, handleRpcExit);
-            },
-        });
-    }
-    async #execute(fn, onExit) {
-        const scope = Scope.makeUnsafe();
-        const { instance, services } = await this.#instance;
-        return fn(instance)
-            .pipe(Effect.provide(Layer.succeed(DurableObjectState, fromDurableObjectState(this.#state)).pipe(Layer.provideMerge(Layer.succeed(Scope.Scope, scope)), Layer.provideMerge(Layer.succeedContext(services)), Layer.provideMerge(this.#globalContext))), Effect.runPromiseExit)
-            .then(onExit ??
-            ((exit) => exit._tag === "Success"
-                ? Promise.resolve(exit.value)
-                : Promise.reject(Cause.squash(exit.cause))))
-            .finally(() => isScopeEjected(scope)
-            ? undefined
-            : Scope.close(scope, Exit.void).pipe(Effect.runPromise, (promise) => this.ctx.waitUntil(promise)));
-    }
-    async fetch(request) {
-        return this.#execute((instance) => instance.fetch
-            ? makeRequestEffect(request, instance.fetch)
-            : Effect.succeed(HttpServerResponse.text("Not implemented", {
-                status: 404,
-            })));
-    }
-    async alarm(alarmInfo) {
-        return this.#execute((instance) => instance.alarm(alarmInfo));
-    }
-    async webSocketMessage(ws, message) {
-        return this.#execute((instance) => instance.webSocketMessage?.(fromWebSocket(ws), message) ??
-            Effect.void);
-    }
-    async webSocketClose(ws, code, reason, wasClean) {
-        return this.#execute((instance) => instance.webSocketClose?.(fromWebSocket(ws), code, reason, wasClean) ?? Effect.void);
-    }
+export const makeDurableObjectBridge = (DurableObject, { entrypoint, stack, }) => (className) => {
+    // One isolate-lifetime layer build shared by every activation of this DO
+    // class: `build` memoizes the built context, so re-activations (including
+    // hibernatable WebSocket wakes, which re-run the constructor) reuse it
+    // instead of rebuilding the layer stack.
+    const { build } = getWorkerExport({
+        entrypoint,
+        stack,
+        exportName: className,
+    });
+    return class DurableObjectBridge extends DurableObject {
+        #state;
+        #instance;
+        constructor(state, env) {
+            super(state, env);
+            this.#state = state;
+            this.#instance = state.blockConcurrencyWhile(() => build((promise) => void state.waitUntil?.(promise)).then(({ context, export: exported }) => {
+                const { constructor, services } = exported;
+                const doContext = Layer.succeed(DurableObjectState, fromDurableObjectState(this.#state)).pipe(Layer.provideMerge(Layer.succeedContext(services)), Layer.provideMerge(Layer.succeedContext(context)));
+                return constructor.pipe(Effect.provide(doContext), Effect.flatMap((instance) => instance.pipe(Effect.provide(doContext))), Effect.map((instance) => ({ instance, services, context })), Effect.runPromise);
+            }));
+            return new Proxy(this, {
+                get: (target, prop) => {
+                    const bind = (f) => typeof f === "function" ? f.bind(target) : f;
+                    if (typeof prop !== "string")
+                        return bind(target[prop]);
+                    if (prop in target)
+                        return bind(target[prop]);
+                    return async (...args) => this.#execute((instance) => {
+                        const method = instance[prop];
+                        if (typeof method === "function") {
+                            const result = method(...args);
+                            // Effects (including nested-RPC values built by
+                            // `asEffectOrStream`, which are Effects *branded* as Streams)
+                            // must be run as effects — their resolved value may itself be
+                            // a `Stream`, which `handleRpcExit` then encodes. Only a
+                            // *genuine* `Stream` (not an Effect) is lifted into the
+                            // success channel so `handleRpcExit` encodes it directly.
+                            return Effect.isEffect(result)
+                                ? result
+                                : Stream.isStream(result)
+                                    ? Effect.succeed(result)
+                                    : result;
+                        }
+                        else if (Effect.isEffect(method)) {
+                            return method;
+                        }
+                        else {
+                            return Effect.succeed(method);
+                        }
+                    }, handleRpcExit);
+                },
+            });
+        }
+        async #execute(fn, onExit) {
+            const scope = Scope.makeUnsafe();
+            const { instance, services, context } = await this.#instance;
+            return fn(instance)
+                .pipe(Effect.provide(Layer.succeed(DurableObjectState, fromDurableObjectState(this.#state)).pipe(Layer.provideMerge(Layer.succeed(Scope.Scope, scope)), Layer.provideMerge(Layer.succeedContext(services)), Layer.provideMerge(Layer.succeedContext(context)))), Effect.runPromiseExit)
+                .then((exit) => onExit
+                ? onExit(exit, scope)
+                : exit._tag === "Success"
+                    ? Promise.resolve(exit.value)
+                    : Promise.reject(Cause.squash(exit.cause)))
+                .finally(() => isScopeEjected(scope)
+                ? undefined
+                : Scope.close(scope, Exit.void).pipe(Effect.runPromise, (promise) => this.ctx.waitUntil(promise)));
+        }
+        async fetch(request) {
+            return this.#execute((instance) => instance.fetch
+                ? makeRequestEffect(request, instance.fetch)
+                : Effect.succeed(HttpServerResponse.text("Not implemented", {
+                    status: 404,
+                })));
+        }
+        async alarm(alarmInfo) {
+            return this.#execute((instance) => instance.alarm(alarmInfo));
+        }
+        async webSocketMessage(ws, message) {
+            return this.#execute((instance) => instance.webSocketMessage?.(fromWebSocket(ws), message) ??
+                Effect.void);
+        }
+        async webSocketClose(ws, code, reason, wasClean) {
+            return this.#execute((instance) => instance.webSocketClose?.(fromWebSocket(ws), code, reason, wasClean) ?? Effect.void);
+        }
+    };
 };
 //# sourceMappingURL=DurableObjectBridge.js.map

package/lib/Cloudflare/Workers/DurableObjectBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"DurableObjectBridge.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/DurableObjectBridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DurableObjectBridge.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/DurableObjectBridge.ts"],"names":[],"mappings":"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"}

package/lib/Cloudflare/Workers/HttpServer.d.ts

@@ -1,12 +1,9 @@
 import type * as cf from "@cloudflare/workers-types";
 import * as Effect from "effect/Effect";
-import * as Scope from "effect/Scope";
 import * as Http from "../../Http.ts";
 import { type WorkerServices } from "./Worker.ts";
 export type HttpEffect = Http.HttpEffect<WorkerServices>;
 export declare const makeRequestHandler: <Req = never>(handler: Http.HttpEffect<Req> | Effect.Effect<Http.HttpEffect<Req>>) => (event: any) => any;
 export declare const makeRequestEffect: <Req = never>(webRequest: cf.Request, handler: Http.HttpEffect<Req> | Effect.Effect<Http.HttpEffect<Req>>) => any;
-declare const scopeEjected: unique symbol;
-export declare const isScopeEjected: (scope: Scope.Scope) => scope is Scope.Scope & Record<typeof scopeEjected, unknown>;
-export {};
+export { isScopeEjected } from "../../Http.ts";
 //# sourceMappingURL=HttpServer.d.ts.map

package/lib/Cloudflare/Workers/HttpServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HttpServer.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/HttpServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAEjE,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;AAEzD,eAAO,MAAM,kBAAkB,GAC5B,GAAG,GAAG,KAAK,WACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,aAE7D,GAAG,QAGI,CAAC;AAElB,eAAO,MAAM,iBAAiB,GAAI,GAAG,GAAG,KAAK,cAC/B,EAAE,CAAC,OAAO,WACb,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAyB7D,GACP,CAAC;AAwBF,QAAA,MAAM,YAAY,eAAoD,CAAC;AAEvE,eAAO,MAAM,cAAc,UAAW,KAAK,CAAC,KAAK,gEAA0B,CAAC"}
+{"version":3,"file":"HttpServer.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/HttpServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAMxC,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAEjE,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;AAEzD,eAAO,MAAM,kBAAkB,GAC5B,GAAG,GAAG,KAAK,WACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,aAE7D,GAAG,QAGI,CAAC;AAElB,eAAO,MAAM,iBAAiB,GAAI,GAAG,GAAG,KAAK,cAC/B,EAAE,CAAC,OAAO,WACb,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAyB7D,GACP,CAAC;AAwBF,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC"}

package/lib/Cloudflare/Workers/HttpServer.js

@@ -2,7 +2,6 @@ import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as Scope from "effect/Scope";
 import * as EffectHttp from "effect/unstable/http/HttpEffect";
 import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
 import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";
@@ -42,6 +41,5 @@ const toHandledWebResponse = (handler) => Effect.gen(function* () {
     })));
     return yield* Deferred.await(webResponse);
 });
-const scopeEjected = Symbol.for("effect/http/HttpEffect/scopeEjected");
-export const isScopeEjected = (scope) => scopeEjected in scope;
+export { isScopeEjected } from "../../Http.js";
 //# sourceMappingURL=HttpServer.js.map

package/lib/Cloudflare/Workers/HttpServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/HttpServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/HttpServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,iBAAiB,MAAM,wCAAwC,CAAC;AAC5E,OAAO,KAAK,kBAAkB,MAAM,yCAAyC,CAAC;AAC9E,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,aAAa,EAAuB,MAAM,aAAa,CAAC;AAIjE,MAAM,CAAC,MAAM,kBAAkB,GAC7B,CACE,OAAmE,EACnE,EAAE,CACJ,CAAC,KAAU,EAAE,EAAE,CACb,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;IAC5C,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC;IACzC,CAAC,CAAC,SAAS,CAAC;AAElB,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,UAAsB,EACtB,OAAmE,EACnE,EAAE;IACF,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACjD,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,OAAO,GAAG,iBAAiB,CAAC,OAAO,CACvC,UAAuC,CACxC,CAAC,MAAM,CAAC;YACP,aAAa,EAAE,MAAM,CAAC,eAAe,CACnC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,SAAS,CACxD;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE;YACpC,GAAG,EAAE,GAAG,EAAE,CACR,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;gBAC5B,GAAG,EAAE,UAAU,CAAC,IAAI;aACrB,CAAC;SACL,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,IAAI,CAClD,MAAM,CAAC,OAAO,CAAC;YACb,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,OAAO,CAAC;YAC3D,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,UAAiB,CAAC;SAC1C,CAAC,CACH,CAAC;IACJ,CAAC,CAAQ,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAC3B,OAAyE,EACzE,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,wEAAwE;IACxE,2EAA2E;IAC3E,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAY,CAAC;IAErD,KAAK,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CACzD,QAAQ,CAAC,OAAO,CACd,WAAW;IACX,wFAAwF;IACxF,kBAAkB,CAAC,KAAK,CAAC,UAAU,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE;QACnE,WAAW,EAAE,OAAO,CAAC,MAAM,KAAK,MAAM;QACtC,OAAO;KACR,CAAC,CACH,CACF,CAAC;IACF,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEL,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC"}