@effect/cluster 0.50.6 → 0.52.0

package/dist/esm/RunnerAddress.js

@@ -4,6 +4,7 @@
 import * as Equal from "effect/Equal";
 import * as Hash from "effect/Hash";
 import { NodeInspectSymbol } from "effect/Inspectable";
+import * as PrimaryKey from "effect/PrimaryKey";
 import * as Schema from "effect/Schema";
 const SymbolKey = "@effect/cluster/RunnerAddress";
 /**
@@ -23,6 +24,12 @@ export class RunnerAddress extends /*#__PURE__*/Schema.Class(SymbolKey)({
    * @since 1.0.0
    */
   [TypeId] = TypeId;
+  /**
+   * @since 1.0.0
+   */
+  [PrimaryKey.symbol]() {
+    return `${this.host}:${this.port}`;
+  }
   /**
    * @since 1.0.0
    */

package/dist/esm/RunnerAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"RunnerAddress.js","names":["Equal","Hash","NodeInspectSymbol","Schema","SymbolKey","TypeId","Symbol","for","RunnerAddress","Class","host","NonEmptyString","port","Int","symbol","that","cached","string","toString","make"],"sources":["../../src/RunnerAddress.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,IAAI,MAAM,aAAa;AACnC,SAASC,iBAAiB,QAAQ,oBAAoB;AACtD,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,MAAMC,SAAS,GAAG,+BAA+B;AAEjD;;;;AAIA,OAAO,MAAMC,MAAM,gBAAkBC,MAAM,CAACC,GAAG,CAACH,SAAS,CAAC;AAQ1D;;;;AAIA,OAAM,MAAOI,aAAc,sBAAQL,MAAM,CAACM,KAAK,CAAgBL,SAAS,CAAC,CAAC;EACxEM,IAAI,EAAEP,MAAM,CAACQ,cAAc;EAC3BC,IAAI,EAAET,MAAM,CAACU;CACd,CAAC;EACA;;;EAGS,CAACR,MAAM,IAAIA,MAAM;EAE1B;;;EAGA,CAACL,KAAK,CAACc,MAAM,EAAEC,IAAmB;IAChC,OAAO,IAAI,CAACL,IAAI,KAAKK,IAAI,CAACL,IAAI,IAAI,IAAI,CAACE,IAAI,KAAKG,IAAI,CAACH,IAAI;EAC3D;EAEA;;;EAGA,CAACX,IAAI,CAACa,MAAM,IAAC;IACX,OAAOb,IAAI,CAACe,MAAM,CAAC,IAAI,EAAEf,IAAI,CAACgB,MAAM,CAAC,IAAI,CAACC,QAAQ,EAAE,CAAC,CAAC;EACxD;EAEA;;;EAGAA,QAAQA,CAAA;IACN,OAAO,iBAAiB,IAAI,CAACR,IAAI,IAAI,IAAI,CAACE,IAAI,GAAG;EACnD;EAEA;;;EAGA,CAACV,iBAAiB,IAAC;IACjB,OAAO,IAAI,CAACgB,QAAQ,EAAE;EACxB;;AAGF;;;;AAIA,OAAO,MAAMC,IAAI,GAAGA,CAACT,IAAY,EAAEE,IAAY,KAAoB,IAAIJ,aAAa,CAAC;EAAEE,IAAI;EAAEE;AAAI,CAAE,CAAC","ignoreList":[]}
+{"version":3,"file":"RunnerAddress.js","names":["Equal","Hash","NodeInspectSymbol","PrimaryKey","Schema","SymbolKey","TypeId","Symbol","for","RunnerAddress","Class","host","NonEmptyString","port","Int","symbol","that","cached","string","toString","make"],"sources":["../../src/RunnerAddress.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,IAAI,MAAM,aAAa;AACnC,SAASC,iBAAiB,QAAQ,oBAAoB;AACtD,OAAO,KAAKC,UAAU,MAAM,mBAAmB;AAC/C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,MAAMC,SAAS,GAAG,+BAA+B;AAEjD;;;;AAIA,OAAO,MAAMC,MAAM,gBAAkBC,MAAM,CAACC,GAAG,CAACH,SAAS,CAAC;AAQ1D;;;;AAIA,OAAM,MAAOI,aAAc,sBAAQL,MAAM,CAACM,KAAK,CAAgBL,SAAS,CAAC,CAAC;EACxEM,IAAI,EAAEP,MAAM,CAACQ,cAAc;EAC3BC,IAAI,EAAET,MAAM,CAACU;CACd,CAAC;EACA;;;EAGS,CAACR,MAAM,IAAIA,MAAM;EAE1B;;;EAGA,CAACH,UAAU,CAACY,MAAM,IAAC;IACjB,OAAO,GAAG,IAAI,CAACJ,IAAI,IAAI,IAAI,CAACE,IAAI,EAAE;EACpC;EAEA;;;EAGA,CAACb,KAAK,CAACe,MAAM,EAAEC,IAAmB;IAChC,OAAO,IAAI,CAACL,IAAI,KAAKK,IAAI,CAACL,IAAI,IAAI,IAAI,CAACE,IAAI,KAAKG,IAAI,CAACH,IAAI;EAC3D;EAEA;;;EAGA,CAACZ,IAAI,CAACc,MAAM,IAAC;IACX,OAAOd,IAAI,CAACgB,MAAM,CAAC,IAAI,EAAEhB,IAAI,CAACiB,MAAM,CAAC,IAAI,CAACC,QAAQ,EAAE,CAAC,CAAC;EACxD;EAEA;;;EAGAA,QAAQA,CAAA;IACN,OAAO,iBAAiB,IAAI,CAACR,IAAI,IAAI,IAAI,CAACE,IAAI,GAAG;EACnD;EAEA;;;EAGA,CAACX,iBAAiB,IAAC;IACjB,OAAO,IAAI,CAACiB,QAAQ,EAAE;EACxB;;AAGF;;;;AAIA,OAAO,MAAMC,IAAI,GAAGA,CAACT,IAAY,EAAEE,IAAY,KAAoB,IAAIJ,aAAa,CAAC;EAAEE,IAAI;EAAEE;AAAI,CAAE,CAAC","ignoreList":[]}

package/dist/esm/RunnerHealth.js

@@ -1,11 +1,16 @@
 /**
  * @since 1.0.0
  */
+import * as FileSystem from "@effect/platform/FileSystem";
+import * as HttpClient from "@effect/platform/HttpClient";
+import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
+import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import { identity } from "effect/Function";
 import * as Layer from "effect/Layer";
-import * as RcMap from "effect/RcMap";
-import * as MessageStorage from "./MessageStorage.js";
+import * as Schedule from "effect/Schedule";
+import * as Schema from "effect/Schema";
 import * as Runners from "./Runners.js";
 /**
  * Represents the service used to check if a Runner is healthy.
@@ -18,26 +23,6 @@ import * as Runners from "./Runners.js";
  * @category models
  */
 export class RunnerHealth extends /*#__PURE__*/Context.Tag("@effect/cluster/RunnerHealth")() {}
-/**
- * @since 1.0.0
- * @category Constructors
- */
-export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
-  const connections = yield* RcMap.make({
-    lookup: _address => Effect.void
-  });
-  const onConnection = address => RcMap.get(connections, address);
-  const isAlive = Effect.fnUntraced(function* (address) {
-    if (yield* RcMap.has(connections, address)) {
-      return true;
-    }
-    return yield* options.isAlive(address);
-  });
-  return RunnerHealth.of({
-    onConnection,
-    isAlive
-  });
-});
 /**
  * A layer which will **always** consider a Runner healthy.
  *
@@ -46,21 +31,23 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
  * @since 1.0.0
  * @category layers
  */
-export const layerNoop = /*#__PURE__*/Layer.scoped(RunnerHealth, /*#__PURE__*/make({
+export const layerNoop = /*#__PURE__*/Layer.succeed(RunnerHealth, {
   isAlive: () => Effect.succeed(true)
-}));
+});
 /**
  * @since 1.0.0
  * @category Constructors
  */
 export const makePing = /*#__PURE__*/Effect.gen(function* () {
   const runners = yield* Runners.Runners;
+  const schedule = Schedule.spaced(500);
   function isAlive(address) {
-    return runners.ping(address).pipe(Effect.timeout(3000), Effect.retry({
-      times: 3
+    return runners.ping(address).pipe(Effect.timeout(10_000), Effect.retry({
+      times: 5,
+      schedule
     }), Effect.isSuccess);
   }
-  return yield* make({
+  return RunnerHealth.of({
     isAlive
   });
 });
@@ -70,12 +57,83 @@ export const makePing = /*#__PURE__*/Effect.gen(function* () {
  * @since 1.0.0
  * @category layers
  */
-export const layer = /*#__PURE__*/Layer.scoped(RunnerHealth, makePing);
+export const layerPing = /*#__PURE__*/Layer.scoped(RunnerHealth, makePing);
 /**
- * A layer which will ping a Runner directly to check if it is healthy.
+ * @since 1.0.0
+ * @category Constructors
+ */
+export const makeK8s = /*#__PURE__*/Effect.fnUntraced(function* (options) {
+  const fs = yield* FileSystem.FileSystem;
+  const token = yield* fs.readFileString("/var/run/secrets/kubernetes.io/serviceaccount/token").pipe(Effect.option);
+  const client = (yield* HttpClient.HttpClient).pipe(HttpClient.filterStatusOk);
+  const baseRequest = HttpClientRequest.get("https://kubernetes.default.svc/api").pipe(token._tag === "Some" ? HttpClientRequest.bearerToken(token.value.trim()) : identity);
+  const getPods = baseRequest.pipe(HttpClientRequest.appendUrl(options?.namespace ? `/v1/namespaces/${options.namespace}/pods` : "/v1/pods"), HttpClientRequest.setUrlParam("fieldSelector", "status.phase=Running"), options?.labelSelector ? HttpClientRequest.setUrlParam("labelSelector", options.labelSelector) : identity);
+  const allPods = yield* client.execute(getPods).pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(PodList)), Effect.map(list => {
+    const pods = new Map();
+    for (let i = 0; i < list.items.length; i++) {
+      const pod = list.items[i];
+      pods.set(pod.status.podIP, pod);
+    }
+    return pods;
+  }), Effect.tapErrorCause(cause => Effect.logWarning("Failed to fetch pods from Kubernetes API", cause)), Effect.cachedWithTTL("10 seconds"));
+  return RunnerHealth.of({
+    isAlive: address => allPods.pipe(Effect.map(pods => pods.get(address.host)?.isReady ?? false), Effect.catchAllCause(() => Effect.succeed(true)))
+  });
+});
+class Pod extends /*#__PURE__*/Schema.Class("effect/cluster/RunnerHealth/Pod")({
+  status: /*#__PURE__*/Schema.Struct({
+    phase: Schema.String,
+    conditions: /*#__PURE__*/Schema.Array(/*#__PURE__*/Schema.Struct({
+      type: Schema.String,
+      status: Schema.String,
+      lastTransitionTime: Schema.String
+    })),
+    podIP: Schema.String
+  })
+}) {
+  get isReady() {
+    let initializedAt;
+    let readyAt;
+    for (let i = 0; i < this.status.conditions.length; i++) {
+      const condition = this.status.conditions[i];
+      switch (condition.type) {
+        case "Initialized":
+          {
+            if (condition.status !== "True") {
+              return true;
+            }
+            initializedAt = condition.lastTransitionTime;
+            break;
+          }
+        case "Ready":
+          {
+            if (condition.status === "True") {
+              return true;
+            }
+            readyAt = condition.lastTransitionTime;
+            break;
+          }
+      }
+    }
+    // if the pod is still booting up, consider it ready as it would have
+    // already registered itself with RunnerStorage by now
+    return initializedAt === readyAt;
+  }
+}
+const PodList = /*#__PURE__*/Schema.Struct({
+  items: /*#__PURE__*/Schema.Array(Pod)
+});
+/**
+ * A layer which will check the Kubernetes API to see if a Runner is healthy.
+ *
+ * The provided HttpClient will need to add the pod's CA certificate to its
+ * trusted root certificates in order to communicate with the Kubernetes API.
+ *
+ * The pod service account will also need to have permissions to list pods in
+ * order to use this layer.
  *
  * @since 1.0.0
  * @category layers
  */
-export const layerRpc = /*#__PURE__*/layer.pipe(/*#__PURE__*/Layer.provide(Runners.layerRpc), /*#__PURE__*/Layer.provide(MessageStorage.layerNoop));
+export const layerK8s = options => Layer.effect(RunnerHealth, makeK8s(options));
 //# sourceMappingURL=RunnerHealth.js.map

package/dist/esm/RunnerHealth.js.map

@@ -1 +1 @@
-{"version":3,"file":"RunnerHealth.js","names":["Context","Effect","Layer","RcMap","MessageStorage","Runners","RunnerHealth","Tag","make","fnUntraced","options","connections","lookup","_address","void","onConnection","address","get","isAlive","has","of","layerNoop","scoped","succeed","makePing","gen","runners","ping","pipe","timeout","retry","times","isSuccess","layer","layerRpc","provide"],"sources":["../../src/RunnerHealth.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC,OAAO,KAAKC,cAAc,MAAM,qBAAqB;AAErD,OAAO,KAAKC,OAAO,MAAM,cAAc;AAGvC;;;;;;;;;;AAUA,OAAM,MAAOC,YAAa,sBAAQN,OAAO,CAACO,GAAG,CAAC,8BAA8B,CAAC,EAU1E;AAEH;;;;AAIA,OAAO,MAAMC,IAAI,gBAMbP,MAAM,CAACQ,UAAU,CAAC,WAAUC,OAE/B;EACC,MAAMC,WAAW,GAAG,OAAOR,KAAK,CAACK,IAAI,CAAC;IACpCI,MAAM,EAAGC,QAAuB,IAAKZ,MAAM,CAACa;GAC7C,CAAC;EAEF,MAAMC,YAAY,GAAIC,OAAsB,IAAKb,KAAK,CAACc,GAAG,CAACN,WAAW,EAAEK,OAAO,CAAC;EAChF,MAAME,OAAO,GAAGjB,MAAM,CAACQ,UAAU,CAAC,WAAUO,OAAsB;IAChE,IAAI,OAAOb,KAAK,CAACgB,GAAG,CAACR,WAAW,EAAEK,OAAO,CAAC,EAAE;MAC1C,OAAO,IAAI;IACb;IACA,OAAO,OAAON,OAAO,CAACQ,OAAO,CAACF,OAAO,CAAC;EACxC,CAAC,CAAC;EAEF,OAAOV,YAAY,CAACc,EAAE,CAAC;IACrBL,YAAY;IACZG;GACD,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;AAQA,OAAO,MAAMG,SAAS,gBAAGnB,KAAK,CAACoB,MAAM,CACnChB,YAAY,eACZE,IAAI,CAAC;EACHU,OAAO,EAAEA,CAAA,KAAMjB,MAAM,CAACsB,OAAO,CAAC,IAAI;CACnC,CAAC,CACH;AAED;;;;AAIA,OAAO,MAAMC,QAAQ,gBAIjBvB,MAAM,CAACwB,GAAG,CAAC,aAAS;EACtB,MAAMC,OAAO,GAAG,OAAOrB,OAAO,CAACA,OAAO;EAEtC,SAASa,OAAOA,CAACF,OAAsB;IACrC,OAAOU,OAAO,CAACC,IAAI,CAACX,OAAO,CAAC,CAACY,IAAI,CAC/B3B,MAAM,CAAC4B,OAAO,CAAC,IAAI,CAAC,EACpB5B,MAAM,CAAC6B,KAAK,CAAC;MAAEC,KAAK,EAAE;IAAC,CAAE,CAAC,EAC1B9B,MAAM,CAAC+B,SAAS,CACjB;EACH;EAEA,OAAO,OAAOxB,IAAI,CAAC;IAAEU;EAAO,CAAE,CAAC;AACjC,CAAC,CAAC;AAEF;;;;;;AAMA,OAAO,MAAMe,KAAK,gBAId/B,KAAK,CAACoB,MAAM,CAAChB,YAAY,EAAEkB,QAAQ,CAAC;AAExC;;;;;;AAMA,OAAO,MAAMU,QAAQ,gBAIjBD,KAAK,CAACL,IAAI,cACZ1B,KAAK,CAACiC,OAAO,CAAC9B,OAAO,CAAC6B,QAAQ,CAAC,eAC/BhC,KAAK,CAACiC,OAAO,CAAC/B,cAAc,CAACiB,SAAS,CAAC,CACxC","ignoreList":[]}
+{"version":3,"file":"RunnerHealth.js","names":["FileSystem","HttpClient","HttpClientRequest","HttpClientResponse","Context","Effect","identity","Layer","Schedule","Schema","Runners","RunnerHealth","Tag","layerNoop","succeed","isAlive","makePing","gen","runners","schedule","spaced","address","ping","pipe","timeout","retry","times","isSuccess","of","layerPing","scoped","makeK8s","fnUntraced","options","fs","token","readFileString","option","client","filterStatusOk","baseRequest","get","_tag","bearerToken","value","trim","getPods","appendUrl","namespace","setUrlParam","labelSelector","allPods","execute","flatMap","schemaBodyJson","PodList","map","list","pods","Map","i","items","length","pod","set","status","podIP","tapErrorCause","cause","logWarning","cachedWithTTL","host","isReady","catchAllCause","Pod","Class","Struct","phase","String","conditions","Array","type","lastTransitionTime","initializedAt","readyAt","condition","layerK8s","effect"],"sources":["../../src/RunnerHealth.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/RunnerServer.js

@@ -3,20 +3,19 @@
  */
 import * as RpcServer from "@effect/rpc/RpcServer";
 import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
 import { constant } from "effect/Function";
 import * as Layer from "effect/Layer";
 import * as Mailbox from "effect/Mailbox";
 import * as Option from "effect/Option";
-import * as ClusterError from "./ClusterError.js";
+import * as Runtime from "effect/Runtime";
 import * as Message from "./Message.js";
 import * as MessageStorage from "./MessageStorage.js";
 import * as Reply from "./Reply.js";
+import * as RunnerHealth from "./RunnerHealth.js";
 import * as Runners from "./Runners.js";
 import * as Sharding from "./Sharding.js";
 import { ShardingConfig } from "./ShardingConfig.js";
-import * as ShardManager from "./ShardManager.js";
-import * as ShardStorage from "./ShardStorage.js";
-import * as SynchronizedClock from "./SynchronizedClock.js";
 const constVoid = /*#__PURE__*/constant(Effect.void);
 /**
  * @since 1.0.0
@@ -40,27 +39,41 @@ export const layerHandlers = /*#__PURE__*/Runners.Rpcs.toLayer(/*#__PURE__*/Effe
       persisted,
       request
     }) => {
-      let resume;
-      let replyEncoded;
+      let replyEncoded = undefined;
+      let resume = reply => {
+        replyEncoded = reply;
+      };
       const message = new Message.IncomingRequest({
         envelope: request,
         lastSentReply: Option.none(),
         respond(reply) {
-          return Effect.flatMap(Reply.serialize(reply), reply => {
-            if (resume) {
-              resume(Effect.succeed(reply));
-            } else {
-              replyEncoded = reply;
-            }
-            return Effect.void;
-          });
+          resume(Effect.orDie(Reply.serialize(reply)));
+          return Effect.void;
         }
       });
-      return Effect.zipRight(persisted ? Effect.zipRight(storage.registerReplyHandler(message, Effect.sync(() => resume(Effect.fail(new ClusterError.EntityNotAssignedToRunner({
-        address: request.address
-      }))))), sharding.notify(message)) : sharding.send(message), Effect.async(resume_ => {
+      if (persisted) {
+        return Effect.async(resume_ => {
+          resume = resume_;
+          const parent = Option.getOrThrow(Fiber.getCurrentFiber());
+          const runtime = Runtime.make({
+            context: parent.currentContext,
+            runtimeFlags: Runtime.defaultRuntimeFlags,
+            fiberRefs: parent.getFiberRefs()
+          });
+          const onExit = exit => {
+            if (exit._tag === "Failure") {
+              resume(exit);
+            }
+          };
+          const fiber = Runtime.runFork(runtime)(storage.registerReplyHandler(message));
+          fiber.addObserver(onExit);
+          Runtime.runFork(runtime)(Effect.catchTag(sharding.notify(message, constWaitUntilRead), "AlreadyProcessingMessage", () => Effect.void)).addObserver(onExit);
+          return Fiber.interrupt(fiber);
+        });
+      }
+      return Effect.zipRight(sharding.send(message), Effect.async(resume_ => {
         if (replyEncoded) {
-          resume_(Effect.succeed(replyEncoded));
+          resume_(replyEncoded);
         } else {
           resume = resume_;
         }
@@ -80,9 +93,7 @@ export const layerHandlers = /*#__PURE__*/Runners.Rpcs.toLayer(/*#__PURE__*/Effe
           });
         }
       });
-      return Effect.as(persisted ? Effect.zipRight(storage.registerReplyHandler(message, Effect.suspend(() => mailbox.fail(new ClusterError.EntityNotAssignedToRunner({
-        address: request.address
-      })))), sharding.notify(message)) : sharding.send(message), mailbox);
+      return Effect.as(persisted ? Effect.zipRight(storage.registerReplyHandler(message).pipe(Effect.onError(cause => mailbox.failCause(cause)), Effect.forkScoped, Effect.interruptible), sharding.notify(message, constWaitUntilRead)) : sharding.send(message), mailbox);
     }),
     Envelope: ({
       envelope
@@ -91,6 +102,9 @@ export const layerHandlers = /*#__PURE__*/Runners.Rpcs.toLayer(/*#__PURE__*/Effe
     }))
   };
 }));
+const constWaitUntilRead = {
+  waitUntilRead: true
+};
 /**
  * The `RunnerServer` recieves messages from other Runners and forwards them to the
  * `Sharding` layer.
@@ -110,18 +124,18 @@ export const layer = /*#__PURE__*/RpcServer.layer(Runners.Rpcs, {
  * @since 1.0.0
  * @category Layers
  */
-export const layerWithClients = /*#__PURE__*/layer.pipe(/*#__PURE__*/Layer.provideMerge(Sharding.layer), /*#__PURE__*/Layer.provideMerge(Runners.layerRpc), /*#__PURE__*/Layer.provideMerge(SynchronizedClock.layer), /*#__PURE__*/Layer.provide(ShardManager.layerClientRpc));
+export const layerWithClients = /*#__PURE__*/layer.pipe(/*#__PURE__*/Layer.provideMerge(Sharding.layer), /*#__PURE__*/Layer.provideMerge(Runners.layerRpc));
 /**
  * A `Runners` layer that is client only.
  *
- * It will not register with the ShardManager and recieve shard assignments,
+ * It will not register with RunnerStorage and recieve shard assignments,
  * so this layer can be used to embed a cluster client inside another effect
  * application.
  *
  * @since 1.0.0
  * @category Layers
  */
-export const layerClientOnly = /*#__PURE__*/Sharding.layer.pipe(/*#__PURE__*/Layer.provideMerge(Runners.layerRpc), /*#__PURE__*/Layer.provide(ShardManager.layerClientRpc), /*#__PURE__*/Layer.provide(ShardStorage.layerNoop), /*#__PURE__*/Layer.updateService(ShardingConfig, config => ({
+export const layerClientOnly = /*#__PURE__*/Sharding.layer.pipe(/*#__PURE__*/Layer.provideMerge(Runners.layerRpc), /*#__PURE__*/Layer.provide(RunnerHealth.layerNoop), /*#__PURE__*/Layer.updateService(ShardingConfig, config => ({
   ...config,
   runnerAddress: Option.none()
 })));

package/dist/esm/RunnerServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"RunnerServer.js","names":["RpcServer","Effect","constant","Layer","Mailbox","Option","ClusterError","Message","MessageStorage","Reply","Runners","Sharding","ShardingConfig","ShardManager","ShardStorage","SynchronizedClock","constVoid","void","layerHandlers","Rpcs","toLayer","gen","sharding","storage","Ping","Notify","envelope","notify","_tag","IncomingRequest","respond","lastSentReply","none","IncomingEnvelope","persisted","request","resume","replyEncoded","message","reply","flatMap","serialize","succeed","zipRight","registerReplyHandler","sync","fail","EntityNotAssignedToRunner","address","send","async","resume_","Stream","make","mailbox","unsafeOffer","as","suspend","Envelope","layer","spanPrefix","disableTracing","pipe","provide","layerWithClients","provideMerge","layerRpc","layerClientRpc","layerClientOnly","layerNoop","updateService","config","runnerAddress"],"sources":["../../src/RunnerServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"RunnerServer.js","names":["RpcServer","Effect","Fiber","constant","Layer","Mailbox","Option","Runtime","Message","MessageStorage","Reply","RunnerHealth","Runners","Sharding","ShardingConfig","constVoid","void","layerHandlers","Rpcs","toLayer","gen","sharding","storage","Ping","Notify","envelope","notify","_tag","IncomingRequest","respond","lastSentReply","none","IncomingEnvelope","persisted","request","replyEncoded","undefined","resume","reply","message","orDie","serialize","async","resume_","parent","getOrThrow","getCurrentFiber","runtime","make","context","currentContext","runtimeFlags","defaultRuntimeFlags","fiberRefs","getFiberRefs","onExit","exit","fiber","runFork","registerReplyHandler","addObserver","catchTag","constWaitUntilRead","interrupt","zipRight","send","Stream","flatMap","mailbox","unsafeOffer","as","pipe","onError","cause","failCause","forkScoped","interruptible","Envelope","waitUntilRead","layer","spanPrefix","disableTracing","provide","layerWithClients","provideMerge","layerRpc","layerClientOnly","layerNoop","updateService","config","runnerAddress"],"sources":["../../src/RunnerServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/RunnerStorage.js

@@ -0,0 +1,90 @@
+/**
+ * @since 1.0.0
+ */
+import { isNonEmptyArray } from "effect/Array";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as MutableHashMap from "effect/MutableHashMap";
+import * as MachineId from "./MachineId.js";
+import { Runner } from "./Runner.js";
+import { ShardId } from "./ShardId.js";
+/**
+ * Represents a generic interface to the persistent storage required by the
+ * cluster.
+ *
+ * @since 1.0.0
+ * @category models
+ */
+export class RunnerStorage extends /*#__PURE__*/Context.Tag("@effect/cluster/RunnerStorage")() {}
+/**
+ * @since 1.0.0
+ * @category layers
+ */
+export const makeEncoded = encoded => RunnerStorage.of({
+  getRunners: Effect.gen(function* () {
+    const runners = yield* encoded.getRunners;
+    const results = [];
+    for (let i = 0; i < runners.length; i++) {
+      const [runner, healthy] = runners[i];
+      try {
+        results.push([Runner.decodeSync(runner), healthy]);
+      } catch {
+        //
+      }
+    }
+    return results;
+  }),
+  register: (runner, healthy) => Effect.map(encoded.register(encodeRunnerAddress(runner.address), Runner.encodeSync(runner), healthy), MachineId.make),
+  unregister: address => encoded.unregister(encodeRunnerAddress(address)),
+  setRunnerHealth: (address, healthy) => encoded.setRunnerHealth(encodeRunnerAddress(address), healthy),
+  acquire: (address, shardIds) => {
+    const arr = Array.from(shardIds, id => id.toString());
+    if (!isNonEmptyArray(arr)) return Effect.succeed([]);
+    return encoded.acquire(encodeRunnerAddress(address), arr).pipe(Effect.map(shards => shards.map(ShardId.fromString)));
+  },
+  refresh: (address, shardIds) => encoded.refresh(encodeRunnerAddress(address), Array.from(shardIds, id => id.toString())).pipe(Effect.map(shards => shards.map(ShardId.fromString))),
+  release(address, shardId) {
+    return encoded.release(encodeRunnerAddress(address), shardId.toString());
+  },
+  releaseAll(address) {
+    return encoded.releaseAll(encodeRunnerAddress(address));
+  }
+});
+/**
+ * @since 1.0.0
+ * @category constructors
+ */
+export const makeMemory = /*#__PURE__*/Effect.gen(function* () {
+  const runners = MutableHashMap.empty();
+  let acquired = [];
+  let id = 0;
+  return RunnerStorage.of({
+    getRunners: Effect.sync(() => Array.from(MutableHashMap.values(runners), runner => [runner, true])),
+    register: runner => Effect.sync(() => {
+      MutableHashMap.set(runners, runner.address, runner);
+      return MachineId.make(id++);
+    }),
+    unregister: address => Effect.sync(() => {
+      MutableHashMap.remove(runners, address);
+    }),
+    setRunnerHealth: () => Effect.void,
+    acquire: (_address, shardIds) => {
+      acquired = Array.from(shardIds);
+      return Effect.succeed(Array.from(shardIds));
+    },
+    refresh: () => Effect.sync(() => acquired),
+    release: () => Effect.void,
+    releaseAll: () => Effect.void
+  });
+});
+/**
+ * @since 1.0.0
+ * @category layers
+ */
+export const layerMemory = /*#__PURE__*/Layer.effect(RunnerStorage)(makeMemory);
+// -------------------------------------------------------------------------------------
+// internal
+// -------------------------------------------------------------------------------------
+const encodeRunnerAddress = runnerAddress => `${runnerAddress.host}:${runnerAddress.port}`;
+//# sourceMappingURL=RunnerStorage.js.map

package/dist/esm/RunnerStorage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RunnerStorage.js","names":["isNonEmptyArray","Context","Effect","Layer","MutableHashMap","MachineId","Runner","ShardId","RunnerStorage","Tag","makeEncoded","encoded","of","getRunners","gen","runners","results","i","length","runner","healthy","push","decodeSync","register","map","encodeRunnerAddress","address","encodeSync","make","unregister","setRunnerHealth","acquire","shardIds","arr","Array","from","id","toString","succeed","pipe","shards","fromString","refresh","release","shardId","releaseAll","makeMemory","empty","acquired","sync","values","set","remove","void","_address","layerMemory","effect","runnerAddress","host","port"],"sources":["../../src/RunnerStorage.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/Runners.js

@@ -14,7 +14,7 @@ import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as RcMap from "effect/RcMap";
 import * as Schema from "effect/Schema";
-import { AlreadyProcessingMessage, EntityNotAssignedToRunner, EntityNotManagedByRunner, MailboxFull, RunnerUnavailable } from "./ClusterError.js";
+import { AlreadyProcessingMessage, EntityNotAssignedToRunner, MailboxFull, RunnerUnavailable } from "./ClusterError.js";
 import { Persisted } from "./ClusterSchema.js";
 import * as Envelope from "./Envelope.js";
 import * as Message from "./Message.js";
@@ -127,6 +127,7 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
         for (const message of entry.messages) {
           yield* message.respond(reply);
         }
+        // wait for ack
         yield* entry.latch.await;
       }
       entry.replies = [];
@@ -143,6 +144,7 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
   const storageLatch = Effect.unsafeMakeLatch(false);
   if (storage !== MessageStorage.noop) {
     yield* Effect.gen(function* () {
+      const foundRequests = new Set();
       while (true) {
         yield* storageLatch.await;
         storageLatch.unsafeClose();
@@ -151,7 +153,6 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
           module: "Runners",
           fiber: "Read replies loop"
         }), [])));
-        const foundRequests = new Set();
         // put the replies into the storage requests and then open the latches
         for (let i = 0; i < replies.length; i++) {
           const reply = replies[i];
@@ -162,6 +163,7 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
           foundRequests.add(entry);
         }
         foundRequests.forEach(entry => entry.latch.unsafeOpen());
+        foundRequests.clear();
       }
     }).pipe(Effect.interruptible, Effect.forkIn(runnersScope));
     yield* Effect.suspend(() => {
@@ -201,12 +203,7 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
           return Effect.catchAll(options.send({
             address: options_.address.value,
             message
-          }), error => {
-            if (error._tag === "EntityNotManagedByRunner") {
-              return Effect.fail(error);
-            }
-            return replyFromStorage(message);
-          });
+          }), _ => replyFromStorage(message));
         }
         return options.notify(options_).pipe(Effect.andThen(replyFromStorage(message)));
       });
@@ -216,7 +213,7 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
         if (options.discard || message._tag === "OutgoingEnvelope") {
           return Effect.catchTag(options.notify(Message.incomingLocalFromOutgoing(message)), "EntityNotAssignedToRunner", () => Effect.void);
         } else if (!duplicate && options.storageOnly !== true) {
-          return storage.registerReplyHandler(message, Effect.suspend(() => replyFromStorage(message).pipe(Effect.forkIn(runnersScope), Effect.interruptible))).pipe(Effect.andThen(options.notify(Message.incomingLocalFromOutgoing(message))), Effect.catchTag("EntityNotAssignedToRunner", () => Effect.void));
+          return options.notify(Message.incomingLocalFromOutgoing(message)).pipe(Effect.andThen(storage.registerReplyHandler(message)), Effect.catchTag("EntityNotAssignedToRunner", () => replyFromStorage(message)));
         }
         return options.notify(Message.incomingLocalFromOutgoing(message)).pipe(Effect.catchTag("EntityNotAssignedToRunner", () => Effect.void), Effect.andThen(replyFromStorage(message)));
       });
@@ -230,18 +227,19 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
 export const makeNoop = /*#__PURE__*/make({
   send: ({
     message
-  }) => Effect.fail(new EntityNotManagedByRunner({
+  }) => Effect.fail(new EntityNotAssignedToRunner({
     address: message.envelope.address
   })),
   notify: () => Effect.void,
-  ping: () => Effect.void
+  ping: () => Effect.void,
+  onRunnerUnavailable: () => Effect.void
 });
 /**
  * @since 1.0.0
  * @category Layers
  */
 export const layerNoop = /*#__PURE__*/Layer.scoped(Runners, makeNoop).pipe(/*#__PURE__*/Layer.provide([Snowflake.layerGenerator]));
-const rpcErrors = /*#__PURE__*/Schema.Union(EntityNotManagedByRunner, EntityNotAssignedToRunner, MailboxFull, AlreadyProcessingMessage);
+const rpcErrors = /*#__PURE__*/Schema.Union(EntityNotAssignedToRunner, MailboxFull, AlreadyProcessingMessage);
 /**
  * @since 1.0.0
  * @category Rpcs
@@ -251,7 +249,7 @@ export class Rpcs extends /*#__PURE__*/RpcGroup.make(/*#__PURE__*/Rpc.make("Ping
     envelope: Envelope.PartialEncoded
   },
   success: Schema.Void,
-  error: /*#__PURE__*/Schema.Union(EntityNotManagedByRunner, EntityNotAssignedToRunner, AlreadyProcessingMessage)
+  error: /*#__PURE__*/Schema.Union(EntityNotAssignedToRunner, AlreadyProcessingMessage)
 }), /*#__PURE__*/Rpc.make("Effect", {
   payload: {
     request: Envelope.PartialEncodedRequest,
@@ -295,9 +293,11 @@ export const makeRpc = /*#__PURE__*/Effect.gen(function* () {
   });
   return yield* make({
     ping(address) {
-      return RcMap.get(clients, address).pipe(Effect.flatMap(client => client.Ping()), Effect.catchAllCause(() => Effect.fail(new RunnerUnavailable({
-        address
-      }))), Effect.scoped);
+      return RcMap.get(clients, address).pipe(Effect.flatMap(client => client.Ping()), Effect.catchAllCause(() => {
+        return Effect.zipRight(RcMap.invalidate(clients, address), Effect.fail(new RunnerUnavailable({
+          address
+        })));
+      }), Effect.scoped);
     },
     send({
       address,
@@ -358,13 +358,9 @@ export const makeRpc = /*#__PURE__*/Effect.gen(function* () {
       const envelope = message.envelope;
       return RcMap.get(clients, address.value).pipe(Effect.flatMap(client => client.Notify({
         envelope
-      })), Effect.scoped, Effect.catchAll(error => {
-        if (error._tag === "EntityNotManagedByRunner") {
-          return Effect.fail(error);
-        }
-        return Effect.void;
-      }));
-    }
+      })), Effect.scoped, Effect.ignore);
+    },
+    onRunnerUnavailable: address => RcMap.invalidate(clients, address)
   });
 });
 /**