@systemfsoftware/effect-daemon-spec 0.1.1 → 0.2.0

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { Cause, Context, Duration, Effect, Layer, Metric, Option, Schedule, Schema, Scope, Stream } from "effect";
-
 //#region src/backoff.d.ts
 declare const cappedBackoff: (base: Duration.DurationInput, cap: Duration.DurationInput) => Schedule.Schedule<Duration.Duration>;
 //#endregion
@@ -80,12 +79,12 @@ declare const ChildPolicyConfig_base: Schema.Class<ChildPolicyConfig, {
     window: typeof Schema.DurationFromSelf;
   }>>;
 }>, never, {
+  readonly restart?: "permanent" | "transient" | "temporary" | undefined;
+} & {
   readonly intensity?: {
     readonly restarts: number;
     readonly window: import("effect/Duration").Duration;
   } | undefined;
-} & {
-  readonly restart?: "permanent" | "temporary" | "transient" | undefined;
 }, {}, {}>;
 declare class ChildPolicyConfig extends ChildPolicyConfig_base {}
 declare const LockPolicyConfig_base: Schema.Class<LockPolicyConfig, {
@@ -95,9 +94,9 @@ declare const LockPolicyConfig_base: Schema.Class<LockPolicyConfig, {
   mode: Schema.optional<Schema.Literal<["none", "required", "optional"]>>;
   key: Schema.optional<typeof Schema.String>;
 }>, never, {
-  readonly key?: string | undefined;
+  readonly mode?: "none" | "required" | "optional" | undefined;
 } & {
-  readonly mode?: "none" | "optional" | "required" | undefined;
+  readonly key?: string | undefined;
 }, {}, {}>;
 declare class LockPolicyConfig extends LockPolicyConfig_base {}
 declare const TickPolicyConfig_base: Schema.Class<TickPolicyConfig, {
@@ -109,11 +108,11 @@ declare const TickPolicyConfig_base: Schema.Class<TickPolicyConfig, {
   tickTimeout: typeof Schema.DurationFromSelf;
   startLogLevel: Schema.optional<Schema.Literal<["debug", "info"]>>;
 }>, never, {
+  readonly tickTimeout: import("effect/Duration").Duration;
+} & {
   readonly spanName?: string | undefined;
 } & {
   readonly startLogLevel?: "debug" | "info" | undefined;
-} & {
-  readonly tickTimeout: import("effect/Duration").Duration;
 }, {}, {}>;
 declare class TickPolicyConfig extends TickPolicyConfig_base {}
 //#endregion
@@ -244,9 +243,13 @@ declare const subscription: <A, E, R, L extends LockConfig>(opts: CommonOpts<L>
   readonly acquire: Effect.Effect<A, E, R>;
 }) => Worker<E, R, L>;
 declare const Daemon: {
-  readonly poll: typeof poll;
-  readonly stream: typeof stream;
-  readonly subscription: typeof subscription;
+  readonly poll: <A, E, R, L extends LockConfig>(opts: PollOpts<A, E, R, L>) => Worker<E, R, L>;
+  readonly stream: <A, E, R, L extends LockConfig>(opts: CommonOpts<L> & {
+    readonly stream: Stream.Stream<A, E, R>;
+  }) => Worker<E, R, L>;
+  readonly subscription: <A, E, R, L extends LockConfig>(opts: CommonOpts<L> & {
+    readonly acquire: Effect.Effect<A, E, R>;
+  }) => Worker<E, R, L>;
 };
 //#endregion
 //#region src/leader-lock.schema.d.ts
@@ -308,11 +311,10 @@ declare function supervisor<E, R>(s: Supervisor<E, R, {
   mode: 'none';
 }>): Effect.Effect<SupervisorHealth, never, R | DaemonReporter | Scope.Scope>;
 declare function supervisor<E, R>(s: Supervisor<E, R, LockConfig>): Effect.Effect<SupervisorHealth, never, R | LeaderLock | DaemonReporter | Scope.Scope>;
-declare const dynamic$1: <E, R, Args>(spec: DynamicSpec<E, R, Args>) => Effect.Effect<DynamicHandle<Args, R | LeaderLock | DaemonReporter | Scope.Scope>, never, R | LeaderLock | DaemonReporter | Scope.Scope>;
 declare const run: {
   readonly worker: typeof worker;
   readonly supervisor: typeof supervisor;
-  readonly dynamic: typeof dynamic$1;
+  readonly dynamic: <E, R, Args>(spec: DynamicSpec<E, R, Args>) => Effect.Effect<DynamicHandle<Args, R | LeaderLock | DaemonReporter | Scope.Scope>, never, R | LeaderLock | DaemonReporter | Scope.Scope>;
 };
 //#endregion
 //#region src/supervisor.d.ts

package/dist/index.mjs

@@ -73,15 +73,19 @@ const make$1 = (common, loop) => ({
 	lock: common.lock
 });
 const poll = (opts) => {
-	if (typeof opts.prereq === "undefined") return make$1(opts, {
-		_tag: "Poll",
-		gate: Effect.succeed(Option.some(Effect.asVoid(opts.work))),
-		interval: opts.interval
-	});
+	if (typeof opts.prereq === "undefined") {
+		const gate = Effect.succeed(Option.some(Effect.asVoid(opts.work)));
+		return make$1(opts, {
+			_tag: "Poll",
+			gate,
+			interval: opts.interval
+		});
+	}
 	const { prereq, work } = opts;
+	const gate = Effect.map(prereq, Option.map((data) => work(data)));
 	return make$1(opts, {
 		_tag: "Poll",
-		gate: Effect.map(prereq, Option.map((data) => work(data))),
+		gate,
 		interval: opts.interval
 	});
 };
@@ -165,10 +169,12 @@ const boundedTracker = (restarts, window) => Effect.gen(function* () {
 			yield* Ref.update(timestamps, (ts) => recordTimestamp(ts, now, windowMillis));
 		}),
 		isExceeded: Effect.gen(function* () {
-			return exceedsRestarts((yield* prune(yield* Clock.currentTimeMillis)).length, restarts);
+			const now = yield* Clock.currentTimeMillis;
+			return exceedsRestarts((yield* prune(now)).length, restarts);
 		}),
 		count: Effect.gen(function* () {
-			return (yield* prune(yield* Clock.currentTimeMillis)).length;
+			const now = yield* Clock.currentTimeMillis;
+			return (yield* prune(now)).length;
 		})
 	};
 });
@@ -284,7 +290,7 @@ const superviseChild = (ctx, child, idx) => Effect.gen(function* () {
 	});
 	const loop = () => Effect.gen(function* () {
 		const supIntensity = yield* make(ctx.policy.intensity);
-		const epochResult = yield* runSupervisionEpochWithBackoff(Effect.gen(function* () {
+		const attempt = Effect.gen(function* () {
 			yield* ctx.health.paused.await;
 			const fiber = yield* Effect.forkScoped(child.run);
 			const exit = yield* Fiber.await(fiber);
@@ -308,7 +314,8 @@ const superviseChild = (ctx, child, idx) => Effect.gen(function* () {
 				return yield* Match.value(decision).pipe(Match.tag("Continue", () => Effect.succeed(new StopEpoch())), Match.tag("Exhausted", () => handleExhausted(ctx, exit.cause)), Match.tag("Restart", () => handleRestart(ctx, exit.cause, Effect.void)), Match.exhaustive);
 			}
 			return new StopEpoch();
-		}), ctx);
+		});
+		const epochResult = yield* runSupervisionEpochWithBackoff(attempt, ctx);
 		return yield* Match.value(epochResult).pipe(Match.tag("ContinueSupervision", () => loop()), Match.tag("StopSupervision", () => Effect.void), Match.exhaustive);
 	});
 	return yield* loop();
@@ -327,7 +334,7 @@ const runGroup = (strategy, ctx) => Effect.gen(function* () {
 			onSome: (cfg) => Effect.map(make(new BoundedIntensity(cfg)), Option.some)
 		}));
 		const cursor = yield* Ref.make(0);
-		const epochResult = yield* runSupervisionEpochWithBackoff(Effect.gen(function* () {
+		const attempt = Effect.gen(function* () {
 			yield* ctx.health.paused.await;
 			const startIdx = yield* Ref.get(cursor);
 			const slice = ctx.booted.slice(startIdx);
@@ -359,7 +366,8 @@ const runGroup = (strategy, ctx) => Effect.gen(function* () {
 				return yield* Match.value(decision).pipe(Match.tag("Continue", () => Effect.succeed(new StopEpoch())), Match.tag("Exhausted", () => handleExhausted(ctx, firstExit.cause)), Match.tag("Restart", (restartDecision) => handleRestart(ctx, firstExit.cause, Ref.set(cursor, restartDecision.indices[0]))), Match.exhaustive);
 			}
 			return new StopEpoch();
-		}), ctx);
+		});
+		const epochResult = yield* runSupervisionEpochWithBackoff(attempt, ctx);
 		return yield* Match.value(epochResult).pipe(Match.tag("ContinueSupervision", () => loop()), Match.tag("StopSupervision", () => Effect.void), Match.exhaustive);
 	});
 	return yield* loop();
@@ -463,15 +471,17 @@ const buildStreamLoop = (worker, loop, health) => {
 		yield* Effect.raceFirst(ready, Fiber.join(fiber));
 		yield* Fiber.join(fiber);
 	});
-	return wrapSpan(worker, applyInnerRetry(worker.tickHooks)(body).pipe(Effect.asVoid));
+	const retried = applyInnerRetry(worker.tickHooks)(body);
+	return wrapSpan(worker, retried.pipe(Effect.asVoid));
 };
 const buildSubscriptionLoop = (worker, loop, health) => {
-	return wrapSpan(worker, Effect.gen(function* () {
+	const body = Effect.gen(function* () {
 		yield* health.paused.await;
 		yield* applyTimeout(worker.tick)(loop.acquire);
 		yield* Effect.zipRight(health.ready.open, Metric.set(Metric.tagged(Metric.tagged(healthStateGauge, "daemon", health.name), "latch", "ready"), 1));
 		return yield* Effect.never;
-	}).pipe(Effect.asVoid));
+	});
+	return wrapSpan(worker, body.pipe(Effect.asVoid));
 };
 const buildWorkerLoop = (worker, health) => Match.value(worker.loop).pipe(Match.tag("Poll", (loop) => buildPollLoop(worker, loop, health)), Match.tag("Stream", (loop) => buildStreamLoop(worker, loop, health)), Match.tag("Subscription", (loop) => buildSubscriptionLoop(worker, loop, health)), Match.exhaustive);
 //#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@systemfsoftware/effect-daemon-spec",
   "license": "MIT",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "author": "Ryan Lee <drdgvhbh@gmail.com>",
   "repository": {
     "type": "git",
@@ -37,23 +37,22 @@
     "dist"
   ],
   "devDependencies": {
-    "@effect/vitest": "0.29.0",
+    "@effect/vitest": "0.30.0",
     "@microsoft/api-extractor": "^7.58.7",
-    "@stryker-mutator/core": "^9.6.1",
-    "@stryker-mutator/typescript-checker": "^9.6.1",
     "@stryker-mutator/vitest-runner": "^9.6.1",
     "@types/node": "^24",
     "@vitest/coverage-v8": "^4",
-    "effect": "^3.21.2",
+    "effect": "^3.22.0",
     "fast-check": "^3",
     "rimraf": "^6.1.3",
-    "tsdown": "^0.22.3",
-    "typescript": "^7",
+    "tsdown": "^0.22.9",
     "vite-tsconfig-paths": "^6.1.1",
     "vitest": "^4",
-    "@systemfsoftware/effect-gherkin-spec": "^0.1.0",
     "@systemfsoftware/effect-schema-law": "^0.1.0",
+    "@systemfsoftware/stryker-js-core": "^0.1.0",
     "@systemfsoftware/oxlint-config": "^0.1.0",
+    "@systemfsoftware/stryker-js-typescript-checker": "^0.1.0",
+    "@systemfsoftware/effect-gherkin-spec": "^0.1.0",
     "@systemfsoftware/stryker-plugins": "^0.1.0",
     "@systemfsoftware/tsconfig": "^1.0.0",
     "@systemfsoftware/vitest-config": "^0.1.0"