@effect/cluster 0.53.2 → 0.53.3

package/dist/cjs/EntityResource.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.make = exports.TypeId = void 0;
+exports.make = exports.TypeId = exports.CloseScope = void 0;
+var Context = _interopRequireWildcard(require("effect/Context"));
 var Duration = _interopRequireWildcard(require("effect/Duration"));
 var Effect = _interopRequireWildcard(require("effect/Effect"));
 var _Function = require("effect/Function");
@@ -20,6 +21,15 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
  * @category Type ids
  */
 const TypeId = exports.TypeId = "~@effect/cluster/EntityResource";
+/**
+ * A `Scope` that is only closed when the resource is explicitly closed.
+ *
+ * It is not closed during restarts, due to shard movement or node shutdowns.
+ *
+ * @since 1.0.0
+ * @category Scope
+ */
+class CloseScope extends /*#__PURE__*/Context.Tag("@effect/cluster/EntityResource/CloseScope")() {}
 /**
  * A `EntityResource` is a resource that can be acquired inside a cluster
  * entity, which will keep the entity alive even across restarts.
@@ -33,29 +43,19 @@ const TypeId = exports.TypeId = "~@effect/cluster/EntityResource";
  * @since 1.0.0
  * @category Constructors
  */
+exports.CloseScope = CloseScope;
 const make = exports.make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
-  const shutdownMode = options.shutdownMode ?? "always";
   let shuttingDown = false;
   const ref = yield* RcRef.make({
     acquire: Effect.gen(function* () {
-      let scope = yield* Effect.scope;
-      if (shutdownMode === "explicit") {
-        const closeable = yield* Scope.make();
-        const context = yield* Effect.context();
-        yield* Scope.addFinalizerExit(scope, Effect.fnUntraced(function* (exit) {
-          if (shuttingDown) return;
-          yield* Scope.close(closeable, exit);
-          yield* Entity.keepAlive(false);
-        }, Effect.provide(context)));
-        scope = closeable;
-      } else {
-        yield* Effect.addFinalizer(() => {
-          if (shuttingDown) return Effect.void;
-          return Entity.keepAlive(false);
-        });
-      }
+      const closeable = yield* Scope.make();
+      yield* Effect.addFinalizer(Effect.fnUntraced(function* (exit) {
+        if (shuttingDown) return;
+        yield* Scope.close(closeable, exit);
+        yield* Entity.keepAlive(false);
+      }));
       yield* Entity.keepAlive(true);
-      return yield* options.acquire.pipe(Scope.extend(scope));
+      return yield* options.acquire.pipe(Effect.provideService(CloseScope, closeable));
     }),
     idleTimeToLive: options.idleTimeToLive ?? Duration.infinity
   });

package/dist/cjs/EntityResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityResource.js","names":["Duration","_interopRequireWildcard","require","Effect","_Function","RcRef","Scope","Entity","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","TypeId","exports","make","fnUntraced","options","shutdownMode","shuttingDown","ref","acquire","gen","scope","closeable","context","addFinalizerExit","exit","close","keepAlive","provide","addFinalizer","void","pipe","extend","idleTimeToLive","infinity","scoped","identity","invalidate"],"sources":["../../src/EntityResource.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"EntityResource.js","names":["Context","_interopRequireWildcard","require","Duration","Effect","_Function","RcRef","Scope","Entity","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","TypeId","exports","CloseScope","Tag","make","fnUntraced","options","shuttingDown","ref","acquire","gen","closeable","addFinalizer","exit","close","keepAlive","pipe","provideService","idleTimeToLive","infinity","void","scoped","identity","invalidate"],"sources":["../../src/EntityResource.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/dts/EntityResource.d.ts

@@ -1,6 +1,7 @@
 /**
  * @since 1.0.0
  */
+import * as Context from "effect/Context";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Scope from "effect/Scope";
@@ -25,6 +26,17 @@ export interface EntityResource<out A, out E = never> {
     readonly get: Effect.Effect<A, E, Scope.Scope>;
     readonly close: Effect.Effect<void>;
 }
+declare const CloseScope_base: Context.TagClass<CloseScope, "@effect/cluster/EntityResource/CloseScope", Scope.Scope>;
+/**
+ * A `Scope` that is only closed when the resource is explicitly closed.
+ *
+ * It is not closed during restarts, due to shard movement or node shutdowns.
+ *
+ * @since 1.0.0
+ * @category Scope
+ */
+export declare class CloseScope extends CloseScope_base {
+}
 /**
  * A `EntityResource` is a resource that can be acquired inside a cluster
  * entity, which will keep the entity alive even across restarts.
@@ -41,15 +53,6 @@ export interface EntityResource<out A, out E = never> {
 export declare const make: <A, E, R>(options: {
     readonly acquire: Effect.Effect<A, E, R>;
     readonly idleTimeToLive?: Duration.DurationInput | undefined;
-    /**
-     * When to close the resource Scope.
-     *
-     * If set to "explicit", the resource will only be cleaned up when either the
-     * `idleTimeToLive` is reached, or the .close effect is called.
-     *
-     * Defaults to "always", which means the resource will be cleaned up when the
-     * the parent Scope is closed.
-     */
-    readonly shutdownMode?: "explicit" | "always" | undefined;
-}) => Effect.Effect<EntityResource<A, E>, E, Scope.Scope | R | Sharding | Entity.CurrentAddress>;
+}) => Effect.Effect<EntityResource<A, E>, E, Scope.Scope | Exclude<R, CloseScope> | Sharding | Entity.CurrentAddress>;
+export {};
 //# sourceMappingURL=EntityResource.d.ts.map

package/dist/dts/EntityResource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityResource.d.ts","sourceRoot":"","sources":["../../src/EntityResource.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,MAA0C,CAAA;AAE/D;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,iCAAiC,CAAA;AAEtD;;;GAGG;AACH,MAAM,WAAW,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,KAAK;IAClD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAC9C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CACpC;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACxC,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAC5D;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAA;CAC1D,KAAK,MAAM,CAAC,MAAM,CACjB,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EACpB,CAAC,EACD,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,QAAQ,GAAG,MAAM,CAAC,cAAc,CAsDlD,CAAA"}
+{"version":3,"file":"EntityResource.d.ts","sourceRoot":"","sources":["../../src/EntityResource.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,MAA0C,CAAA;AAE/D;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,iCAAiC,CAAA;AAEtD;;;GAGG;AACH,MAAM,WAAW,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,KAAK;IAClD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAC9C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CACpC;;AAED;;;;;;;GAOG;AACH,qBAAa,UAAW,SAAQ,eAG7B;CAAG;AAEN;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACxC,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;CAC7D,KAAK,MAAM,CAAC,MAAM,CACjB,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EACpB,CAAC,EACD,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,QAAQ,GAAG,MAAM,CAAC,cAAc,CAyCvE,CAAA"}

package/dist/esm/EntityResource.js

@@ -1,6 +1,7 @@
 /**
  * @since 1.0.0
  */
+import * as Context from "effect/Context";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import { identity } from "effect/Function";
@@ -12,6 +13,15 @@ import * as Entity from "./Entity.js";
  * @category Type ids
  */
 export const TypeId = "~@effect/cluster/EntityResource";
+/**
+ * A `Scope` that is only closed when the resource is explicitly closed.
+ *
+ * It is not closed during restarts, due to shard movement or node shutdowns.
+ *
+ * @since 1.0.0
+ * @category Scope
+ */
+export class CloseScope extends /*#__PURE__*/Context.Tag("@effect/cluster/EntityResource/CloseScope")() {}
 /**
  * A `EntityResource` is a resource that can be acquired inside a cluster
  * entity, which will keep the entity alive even across restarts.
@@ -26,28 +36,17 @@ export const TypeId = "~@effect/cluster/EntityResource";
  * @category Constructors
  */
 export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
-  const shutdownMode = options.shutdownMode ?? "always";
   let shuttingDown = false;
   const ref = yield* RcRef.make({
     acquire: Effect.gen(function* () {
-      let scope = yield* Effect.scope;
-      if (shutdownMode === "explicit") {
-        const closeable = yield* Scope.make();
-        const context = yield* Effect.context();
-        yield* Scope.addFinalizerExit(scope, Effect.fnUntraced(function* (exit) {
-          if (shuttingDown) return;
-          yield* Scope.close(closeable, exit);
-          yield* Entity.keepAlive(false);
-        }, Effect.provide(context)));
-        scope = closeable;
-      } else {
-        yield* Effect.addFinalizer(() => {
-          if (shuttingDown) return Effect.void;
-          return Entity.keepAlive(false);
-        });
-      }
+      const closeable = yield* Scope.make();
+      yield* Effect.addFinalizer(Effect.fnUntraced(function* (exit) {
+        if (shuttingDown) return;
+        yield* Scope.close(closeable, exit);
+        yield* Entity.keepAlive(false);
+      }));
       yield* Entity.keepAlive(true);
-      return yield* options.acquire.pipe(Scope.extend(scope));
+      return yield* options.acquire.pipe(Effect.provideService(CloseScope, closeable));
     }),
     idleTimeToLive: options.idleTimeToLive ?? Duration.infinity
   });

package/dist/esm/EntityResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityResource.js","names":["Duration","Effect","identity","RcRef","Scope","Entity","TypeId","make","fnUntraced","options","shutdownMode","shuttingDown","ref","acquire","gen","scope","closeable","context","addFinalizerExit","exit","close","keepAlive","provide","addFinalizer","void","pipe","extend","idleTimeToLive","infinity","scoped","get","invalidate"],"sources":["../../src/EntityResource.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,SAASC,QAAQ,QAAQ,iBAAiB;AAC1C,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,aAAa;AAGrC;;;;AAIA,OAAO,MAAMC,MAAM,GAAW,iCAAiC;AAkB/D;;;;;;;;;;;;;AAaA,OAAO,MAAMC,IAAI,gBAiBbN,MAAM,CAACO,UAAU,CAAC,WAAmBC,OAIxC;EACC,MAAMC,YAAY,GAAGD,OAAO,CAACC,YAAY,IAAI,QAAQ;EACrD,IAAIC,YAAY,GAAG,KAAK;EAExB,MAAMC,GAAG,GAAG,OAAOT,KAAK,CAACI,IAAI,CAAC;IAC5BM,OAAO,EAAEZ,MAAM,CAACa,GAAG,CAAC,aAAS;MAC3B,IAAIC,KAAK,GAAG,OAAOd,MAAM,CAACc,KAAK;MAE/B,IAAIL,YAAY,KAAK,UAAU,EAAE;QAC/B,MAAMM,SAAS,GAAG,OAAOZ,KAAK,CAACG,IAAI,EAAE;QACrC,MAAMU,OAAO,GAAG,OAAOhB,MAAM,CAACgB,OAAO,EAAoC;QACzE,OAAOb,KAAK,CAACc,gBAAgB,CAC3BH,KAAK,EACLd,MAAM,CAACO,UAAU,CAAC,WAAUW,IAAI;UAC9B,IAAIR,YAAY,EAAE;UAClB,OAAOP,KAAK,CAACgB,KAAK,CAACJ,SAAS,EAAEG,IAAI,CAAC;UACnC,OAAOd,MAAM,CAACgB,SAAS,CAAC,KAAK,CAAC;QAChC,CAAC,EAAEpB,MAAM,CAACqB,OAAO,CAACL,OAAO,CAAC,CAAC,CAC5B;QACDF,KAAK,GAAGC,SAAS;MACnB,CAAC,MAAM;QACL,OAAOf,MAAM,CAACsB,YAAY,CAAC,MAAK;UAC9B,IAAIZ,YAAY,EAAE,OAAOV,MAAM,CAACuB,IAAI;UACpC,OAAOnB,MAAM,CAACgB,SAAS,CAAC,KAAK,CAAC;QAChC,CAAC,CAAC;MACJ;MAEA,OAAOhB,MAAM,CAACgB,SAAS,CAAC,IAAI,CAAC;MAE7B,OAAO,OAAOZ,OAAO,CAACI,OAAO,CAACY,IAAI,CAChCrB,KAAK,CAACsB,MAAM,CAACX,KAAK,CAAC,CACpB;IACH,CAAC,CAAC;IACFY,cAAc,EAAElB,OAAO,CAACkB,cAAc,IAAI3B,QAAQ,CAAC4B;GACpD,CAAC;EAEF,OAAO3B,MAAM,CAACsB,YAAY,CAAC,MAAK;IAC9BZ,YAAY,GAAG,IAAI;IACnB,OAAOV,MAAM,CAACuB,IAAI;EACpB,CAAC,CAAC;EAEF;EACA,OAAOvB,MAAM,CAAC4B,MAAM,CAAC1B,KAAK,CAAC2B,GAAG,CAAClB,GAAG,CAAC,CAAC;EAEpC,OAAOV,QAAQ,CAAuB;IACpC,CAACI,MAAM,GAAGA,MAAM;IAChBwB,GAAG,EAAE3B,KAAK,CAAC2B,GAAG,CAAClB,GAAG,CAAC;IACnBQ,KAAK,EAAEjB,KAAK,CAAC4B,UAAU,CAACnB,GAAG;GAC5B,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"EntityResource.js","names":["Context","Duration","Effect","identity","RcRef","Scope","Entity","TypeId","CloseScope","Tag","make","fnUntraced","options","shuttingDown","ref","acquire","gen","closeable","addFinalizer","exit","close","keepAlive","pipe","provideService","idleTimeToLive","infinity","void","scoped","get","invalidate"],"sources":["../../src/EntityResource.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,SAASC,QAAQ,QAAQ,iBAAiB;AAC1C,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,aAAa;AAGrC;;;;AAIA,OAAO,MAAMC,MAAM,GAAW,iCAAiC;AAkB/D;;;;;;;;AAQA,OAAM,MAAOC,UAAW,sBAAQR,OAAO,CAACS,GAAG,CAAC,2CAA2C,CAAC,EAGrF;AAEH;;;;;;;;;;;;;AAaA,OAAO,MAAMC,IAAI,gBAObR,MAAM,CAACS,UAAU,CAAC,WAAmBC,OAGxC;EACC,IAAIC,YAAY,GAAG,KAAK;EAExB,MAAMC,GAAG,GAAG,OAAOV,KAAK,CAACM,IAAI,CAAC;IAC5BK,OAAO,EAAEb,MAAM,CAACc,GAAG,CAAC,aAAS;MAC3B,MAAMC,SAAS,GAAG,OAAOZ,KAAK,CAACK,IAAI,EAAE;MAErC,OAAOR,MAAM,CAACgB,YAAY,CACxBhB,MAAM,CAACS,UAAU,CAAC,WAAUQ,IAAI;QAC9B,IAAIN,YAAY,EAAE;QAClB,OAAOR,KAAK,CAACe,KAAK,CAACH,SAAS,EAAEE,IAAI,CAAC;QACnC,OAAOb,MAAM,CAACe,SAAS,CAAC,KAAK,CAAC;MAChC,CAAC,CAAC,CACH;MAED,OAAOf,MAAM,CAACe,SAAS,CAAC,IAAI,CAAC;MAE7B,OAAO,OAAOT,OAAO,CAACG,OAAO,CAACO,IAAI,CAChCpB,MAAM,CAACqB,cAAc,CAACf,UAAU,EAAES,SAAS,CAAC,CAC7C;IACH,CAAC,CAAC;IACFO,cAAc,EAAEZ,OAAO,CAACY,cAAc,IAAIvB,QAAQ,CAACwB;GACpD,CAAC;EAEF,OAAOvB,MAAM,CAACgB,YAAY,CAAC,MAAK;IAC9BL,YAAY,GAAG,IAAI;IACnB,OAAOX,MAAM,CAACwB,IAAI;EACpB,CAAC,CAAC;EAEF;EACA,OAAOxB,MAAM,CAACyB,MAAM,CAACvB,KAAK,CAACwB,GAAG,CAACd,GAAG,CAAC,CAAC;EAEpC,OAAOX,QAAQ,CAAuB;IACpC,CAACI,MAAM,GAAGA,MAAM;IAChBqB,GAAG,EAAExB,KAAK,CAACwB,GAAG,CAACd,GAAG,CAAC;IACnBM,KAAK,EAAEhB,KAAK,CAACyB,UAAU,CAACf,GAAG;GAC5B,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/cluster",
-  "version": "0.53.2",
+  "version": "0.53.3",
   "description": "Unified interfaces for common cluster-specific services",
   "license": "MIT",
   "repository": {
@@ -13,9 +13,9 @@
   "peerDependencies": {
     "@effect/platform": "^0.93.3",
     "@effect/sql": "^0.48.0",
+    "@effect/rpc": "^0.72.2",
     "@effect/workflow": "^0.13.0",
-    "effect": "^3.19.6",
-    "@effect/rpc": "^0.72.2"
+    "effect": "^3.19.6"
   },
   "publishConfig": {
     "provenance": true

package/src/EntityResource.ts

@@ -1,6 +1,7 @@
 /**
  * @since 1.0.0
  */
+import * as Context from "effect/Context"
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import { identity } from "effect/Function"
@@ -31,6 +32,19 @@ export interface EntityResource<out A, out E = never> {
   readonly close: Effect.Effect<void>
 }
 
+/**
+ * A `Scope` that is only closed when the resource is explicitly closed.
+ *
+ * It is not closed during restarts, due to shard movement or node shutdowns.
+ *
+ * @since 1.0.0
+ * @category Scope
+ */
+export class CloseScope extends Context.Tag("@effect/cluster/EntityResource/CloseScope")<
+  CloseScope,
+  Scope.Scope
+>() {}
+
 /**
  * A `EntityResource` is a resource that can be acquired inside a cluster
  * entity, which will keep the entity alive even across restarts.
@@ -47,55 +61,32 @@ export interface EntityResource<out A, out E = never> {
 export const make: <A, E, R>(options: {
   readonly acquire: Effect.Effect<A, E, R>
   readonly idleTimeToLive?: Duration.DurationInput | undefined
-  /**
-   * When to close the resource Scope.
-   *
-   * If set to "explicit", the resource will only be cleaned up when either the
-   * `idleTimeToLive` is reached, or the .close effect is called.
-   *
-   * Defaults to "always", which means the resource will be cleaned up when the
-   * the parent Scope is closed.
-   */
-  readonly shutdownMode?: "explicit" | "always" | undefined
 }) => Effect.Effect<
   EntityResource<A, E>,
   E,
-  Scope.Scope | R | Sharding | Entity.CurrentAddress
+  Scope.Scope | Exclude<R, CloseScope> | Sharding | Entity.CurrentAddress
 > = Effect.fnUntraced(function*<A, E, R>(options: {
   readonly acquire: Effect.Effect<A, E, R>
   readonly idleTimeToLive?: Duration.DurationInput | undefined
-  readonly shutdownMode?: "explicit" | "always" | undefined
 }) {
-  const shutdownMode = options.shutdownMode ?? "always"
   let shuttingDown = false
 
   const ref = yield* RcRef.make({
     acquire: Effect.gen(function*() {
-      let scope = yield* Effect.scope
+      const closeable = yield* Scope.make()
 
-      if (shutdownMode === "explicit") {
-        const closeable = yield* Scope.make()
-        const context = yield* Effect.context<Sharding | Entity.CurrentAddress>()
-        yield* Scope.addFinalizerExit(
-          scope,
-          Effect.fnUntraced(function*(exit) {
-            if (shuttingDown) return
-            yield* Scope.close(closeable, exit)
-            yield* Entity.keepAlive(false)
-          }, Effect.provide(context))
-        )
-        scope = closeable
-      } else {
-        yield* Effect.addFinalizer(() => {
-          if (shuttingDown) return Effect.void
-          return Entity.keepAlive(false)
+      yield* Effect.addFinalizer(
+        Effect.fnUntraced(function*(exit) {
+          if (shuttingDown) return
+          yield* Scope.close(closeable, exit)
+          yield* Entity.keepAlive(false)
         })
-      }
+      )
 
       yield* Entity.keepAlive(true)
 
       return yield* options.acquire.pipe(
-        Scope.extend(scope)
+        Effect.provideService(CloseScope, closeable)
       )
     }),
     idleTimeToLive: options.idleTimeToLive ?? Duration.infinity