@streamsy/serve 0.4.0 → 0.6.0

package/dist/{wakeup-CWKg8pts.js → wakeup-eIs0xIUh.js}

@@ -1,15 +1,15 @@
-import { Clock, Context, Duration, Effect, Exit, Layer, Option, Predicate, Semaphore } from "effect";
+import { Array, Clock, Context, Duration, Effect, Exit, Layer, Option, Predicate, Pull, Schedule, Semaphore } from "effect";
 import { Storage } from "@streamsy/core";
 import { Protocol } from "@streamsy/core/protocol";
-//#region src/cloudflare/alarm.ts
+// src/cloudflare/alarm.ts
 var AlarmSlot = class extends Context.Service()("@streamsy/serve/cloudflare/AlarmSlot") {};
 const alarmSlotLayer = (storage) => Layer.succeed(AlarmSlot, {
 	current: Effect.promise(() => storage.getAlarm()).pipe(Effect.map(Option.fromNullishOr)),
 	arm: (at) => Effect.promise(() => storage.setAlarm(at)),
 	clear: Effect.promise(() => storage.deleteAlarm())
 });
-//#endregion
-//#region src/cloudflare/wakeup.ts
+// src/cloudflare/wakeup.ts
+const defaultRetry = Schedule.exponential("1 second").pipe(Schedule.modifyDelay(({ duration }) => Effect.succeed(Duration.min(duration, Duration.hours(1)))));
 const Permits = Context.Reference("@streamsy/serve/cloudflare/WakeupPermits", { defaultValue: () => void 0 });
 const Guarded = Symbol.for("@streamsy/serve/cloudflare/WakeupPermit");
 const reportsMore = (value) => Predicate.hasProperty(value, "more") && value.more;
@@ -35,41 +35,53 @@ const expiry = Wakeup.make({
 });
 /** Internal object owner. Its context closes over the same services as fetch. */
 const makeWakeups = (context, definitions = []) => Effect.gen(function* () {
-	const wakeups = [expiry, ...definitions].map(Wakeup.make);
+	const acquired = yield* Effect.forEach(definitions, (definition) => Effect.isEffect(definition) ? definition.pipe(Effect.provide(context)) : Effect.succeed(definition));
+	const wakeups = Array.map([expiry, ...acquired], (wakeup) => Wakeup.make(wakeup));
 	const names = /* @__PURE__ */ new Set();
 	for (const wakeup of wakeups) {
 		if (names.has(wakeup.name)) return yield* Effect.die(/* @__PURE__ */ new Error(`Duplicate wakeup name: ${wakeup.name}`));
 		names.add(wakeup.name);
 	}
-	const permits = new Map(wakeups.map((wakeup) => [wakeup.name, Semaphore.makeUnsafe(1)]));
+	const permits = new Map(Array.map(wakeups, (wakeup) => [wakeup.name, Semaphore.makeUnsafe(1)]));
 	const reconcilePermit = yield* Semaphore.make(1);
 	const turnPermit = yield* Semaphore.make(1);
-	const states = wakeups.map((wakeup) => ({
-		wakeup,
-		failures: 0,
-		floor: 0,
-		initial: Duration.toMillis(wakeup.retry?.initial ?? "1 second"),
-		max: Duration.toMillis(wakeup.retry?.max ?? "1 hour")
+	const states = yield* Effect.forEach(wakeups, (wakeup) => Effect.gen(function* () {
+		const policy = wakeup.retry ?? defaultRetry;
+		return {
+			wakeup,
+			failures: 0,
+			floor: 0,
+			exhausted: false,
+			policy,
+			step: yield* Schedule.toStep(policy)
+		};
 	}));
 	const slot = Context.get(context, AlarmSlot);
 	const provided = () => Context.add(Context.add(context, Permits, permits), Wakeups, service);
-	const backOff = (state, at) => {
+	const backOff = (state, at) => Effect.gen(function* () {
 		state.failures += 1;
-		state.floor = at + Math.min(state.max, state.initial * 2 ** (state.failures - 1));
-	};
-	const recover = (state) => {
+		const delay = yield* state.step(at, void 0).pipe(Effect.map(([, duration]) => Option.some(duration)), Pull.catchDone(() => Effect.succeedNone));
+		state.exhausted = Option.isNone(delay);
+		state.floor = Option.isSome(delay) ? at + Duration.toMillis(delay.value) : 0;
+	});
+	const recover = (state) => Effect.gen(function* () {
 		state.failures = 0;
 		state.floor = 0;
-	};
+		state.exhausted = false;
+		state.step = yield* Schedule.toStep(state.policy);
+	});
 	const status = Effect.forEach(states, (state) => state.wakeup.next.pipe(Effect.map((next) => ({
 		name: state.wakeup.name,
 		next,
 		failures: state.failures,
 		retryAt: state.floor > 0 ? Option.some(state.floor) : Option.none()
 	}))));
-	const deadlineOf = (state, now) => state.wakeup.next.pipe(Effect.map(Option.map((next) => Math.max(next, state.floor))), Effect.catchCause((cause) => {
-		if (state.floor <= now) backOff(state, now);
-		return Effect.logError(`Wakeup ${state.wakeup.name} deadline failed`, cause).pipe(Effect.as(Option.some(state.floor)));
+	const deadlineOf = (state, now) => state.exhausted ? Effect.succeedNone : state.wakeup.next.pipe(Effect.map(Option.map((next) => Math.max(next, state.floor))), Effect.catchCause((cause) => {
+		return Effect.gen(function* () {
+			if (state.floor <= now) yield* backOff(state, now);
+			yield* Effect.logError(`Wakeup ${state.wakeup.name} deadline failed`, cause);
+			return state.exhausted ? Option.none() : Option.some(state.floor);
+		});
 	}));
 	const reconcileWith = (force) => reconcilePermit.withPermit(Effect.gen(function* () {
 		const now = yield* Clock.currentTimeMillis;
@@ -96,22 +108,21 @@ const makeWakeups = (context, definitions = []) => Effect.gen(function* () {
 		const now = yield* Clock.currentTimeMillis;
 		yield* slot.arm(now + 3e4);
 		for (const state of states) yield* Effect.gen(function* () {
-			const at = yield* Clock.currentTimeMillis;
-			if (state.floor > at) return;
+			if (state.exhausted || state.floor > (yield* Clock.currentTimeMillis)) return;
 			const next = yield* state.wakeup.next;
+			const at = yield* Clock.currentTimeMillis;
 			if (Option.isNone(next) || next.value > at) return;
 			const exit = yield* Effect.exit(state.wakeup.run);
 			if (Exit.isFailure(exit)) {
-				backOff(state, yield* Clock.currentTimeMillis);
+				yield* backOff(state, yield* Clock.currentTimeMillis);
 				yield* Effect.logError(`Wakeup ${state.wakeup.name} failed`, exit.cause);
 				return;
 			}
 			const after = yield* state.wakeup.next;
-			if (!reportsMore(exit.value) && Option.isSome(after) && after.value <= at) backOff(state, yield* Clock.currentTimeMillis);
-			else recover(state);
+			if (!reportsMore(exit.value) && Option.isSome(after) && after.value <= at) yield* backOff(state, yield* Clock.currentTimeMillis);
+			else yield* recover(state);
 		}).pipe(Effect.catchCause((cause) => Clock.currentTimeMillis.pipe(Effect.flatMap((at) => {
-			backOff(state, at);
-			return Effect.logError(`Wakeup ${state.wakeup.name} deadline failed`, cause);
+			return backOff(state, at).pipe(Effect.andThen(Effect.logError(`Wakeup ${state.wakeup.name} deadline failed`, cause)));
 		}))));
 	}).pipe(Effect.ensuring(reconcileWith(true).pipe(Effect.catchCause((cause) => Effect.logError("Wakeup reconciliation failed", cause)))), Effect.catchCause((cause) => Effect.logError("Wakeup alarm failed", cause))));
 	const complete = provided();
@@ -121,5 +132,4 @@ const makeWakeups = (context, definitions = []) => Effect.gen(function* () {
 		alarm: alarm.pipe(Effect.provide(complete))
 	};
 });
-//#endregion
 export { alarmSlotLayer as a, makeWakeups as i, Wakeup as n, Wakeups as r, RequestTouch as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamsy/serve",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Effect HttpRouter routes, Bun, Node, Deno and Cloudflare hosts, and durable action delivery.",
   "license": "MIT",
   "repository": {
@@ -87,7 +87,7 @@
     "test:dialects": "bun --bun vitest run test/action/outbox-dialects.test.ts"
   },
   "dependencies": {
-    "@streamsy/core": "^0.4.0"
+    "@streamsy/core": "^0.6.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20251228.0",
@@ -98,7 +98,7 @@
     "@effect/sql-pg": "4.0.5",
     "@effect/sql-sqlite-do": "4.0.5",
     "@effect/vitest": "4.0.5",
-    "@streamsy/storage": "0.4.0",
+    "@streamsy/storage": "0.6.0",
     "@types/bun": "^1.4.3",
     "alchemy": "2.0.0-beta.83",
     "effect": "4.0.5",

package/dist/placement-BOM3E08P.d.ts

@@ -1,60 +0,0 @@
-import { r as Wakeups } from "./wakeup-BtnMEjLv.js";
-import { Context, Effect, Layer, Option, Scope } from "effect";
-import { HttpRouter, HttpServerRespondable, HttpServerResponse } from "effect/http";
-import { Storage, StorageFault } from "@streamsy/core";
-//#region src/cloudflare/object-runtime.d.ts
-type ObjectServices<R = never> = Storage | Wakeups | R;
-type ObjectApp<R = never> = Layer.Layer<never, never, HttpRouter.HttpRouter | HttpRouter.Request.From<"Requires", ObjectServices<R>> | HttpRouter.Request.From<"Error", HttpServerRespondable.Respondable>>;
-//#endregion
-//#region src/cloudflare/placement.d.ts
-interface Placement {
-  readonly name: (streamPath: string) => string;
-}
-/** The parse side of a stream, which is all a placement rule reads. */
-interface Parser<Params> {
-  parse(id: string): Option.Option<Params>;
-}
-/**
- * One rule in a stream placement: a stream and the object name its
- * addresses belong to.
- *
- * The owner takes the same parameters its own stream decodes, so the object name
- * and the storage routing agree by construction. `owner` uses method syntax on
- * purpose: it gives the parameter its contextually typed shape at the call site
- * and keeps the rule assignable to the erased table.
- */
-interface OwnerRule<Params> {
-  readonly stream: Parser<Params>;
-  /** Names the object that owns every stream matching `stream`. */
-  owner(params: Params): string;
-}
-/**
- * A rule after its parameter type is erased. `byRoute` reads each rule only
- * through that rule's own `parse`, so the erased parameter is never observed.
- */
-interface ErasedOwnerRule {
-  readonly stream: Parser<unknown>;
-  owner(params: never): string;
-}
-/**
- * Declare one placement rule with its stream's parameters in scope.
- *
- * The helper exists so the owner parameter is typed and checked. A rule passed
- * to `Placement.byRoute` without it would see the erased parameter set instead.
- */
-declare const rule: <Params>(spec: OwnerRule<Params>) => ErasedOwnerRule;
-declare const Placement: {
-  readonly byStream: () => Placement;
-  readonly byKey: (key: (streamPath: string) => string) => Placement;
-  /**
-   * The first matching rule names the object.
-   *
-   * A path that no rule matches yields `""`, which the router turns into
-   * `400 Invalid placement key`. An owner that throws is a `500`. A rule whose
-   * stream cannot decode a segment does not own that path, so the table falls
-   * through to the next rule.
-   */
-  readonly byRoute: (rules: ReadonlyArray<ErasedOwnerRule>) => Placement;
-};
-//#endregion
-export { ObjectServices as i, rule as n, ObjectApp as r, Placement as t };

package/dist/router-DviIc1O7.js

@@ -1,130 +0,0 @@
-import { i as makeWakeups, r as Wakeups, t as RequestTouch } from "./wakeup-CWKg8pts.js";
-import { Context, Effect, Exit, Layer, Option, Scope } from "effect";
-import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
-import { Http } from "@streamsy/core";
-import { securityHeaders, streamPath } from "@streamsy/core/http";
-//#region src/cloudflare/host-program.ts
-/**
-* Reconciliation belongs to the mutation's finalizer. A request interruption
-* can be pending when the mutation's own uninterruptible region ends, so a
-* second sequential uninterruptible effect is not sufficient. A failed
-* reconciliation is logged and does not replace the mutation's result.
-*/
-const withMutationReconciliation = (effect, reconcile) => effect.pipe(Effect.ensuring(reconcile.pipe(Effect.uninterruptible, Effect.catchCause((cause) => Effect.logError("Wakeup reconciliation failed", cause)))));
-//#endregion
-//#region src/cloudflare/object-runtime.ts
-/** Both object hosts install this middleware, including around user routes. */
-function objectApp(app, context) {
-	const middleware = HttpRouter.middleware((handler) => Effect.gen(function* () {
-		const request = yield* HttpServerRequest.HttpServerRequest;
-		const marker = { touched: false };
-		const wakeups = Context.get(context, Wakeups);
-		return yield* withMutationReconciliation(handler, Effect.suspend(() => [
-			"PUT",
-			"POST",
-			"DELETE"
-		].includes(request.method) || marker.touched ? wakeups.reconcile : Effect.void)).pipe(Effect.catchDefect(() => Effect.succeed(HttpServerResponse.text("Internal server error", {
-			status: 500,
-			headers: Http.securityHeaders
-		}))), Effect.provideService(RequestTouch, marker));
-	}).pipe(Effect.provide(context)), { global: true });
-	return Layer.merge(app, middleware);
-}
-const unavailable = () => HttpServerResponse.text("Storage unavailable", {
-	status: 503,
-	headers: {
-		...Http.securityHeaders,
-		"retry-after": "1"
-	}
-});
-/** One lazy successful acquisition per object owner. Failed attempts close before retry. */
-function acquireObject(layer, compile, wakeups) {
-	return Effect.gen(function* () {
-		const owner = yield* Scope.Scope;
-		return yield* Effect.gen(function* () {
-			const attempt = yield* Scope.fork(owner);
-			return yield* Effect.gen(function* () {
-				const context = yield* Layer.buildWithScope(layer, attempt);
-				const scheduler = yield* makeWakeups(context, wakeups);
-				return yield* compile(scheduler.context, scheduler.alarm).pipe(Effect.provideService(Scope.Scope, attempt));
-			}).pipe(Effect.onExit((exit) => Exit.isFailure(exit) ? Scope.close(attempt, exit) : Effect.void));
-		}).pipe(Effect.cachedWithTTL((exit) => Exit.isSuccess(exit) ? "Infinity" : 0));
-	});
-}
-/** Request markers are all supplied by this exact object context. */
-function providedApp(app, context) {
-	return objectApp(app, context).pipe(HttpRouter.provideRequest(Layer.succeedContext(context)));
-}
-//#endregion
-//#region src/cloudflare/placement.ts
-/**
-* Declare one placement rule with its stream's parameters in scope.
-*
-* The helper exists so the owner parameter is typed and checked. A rule passed
-* to `Placement.byRoute` without it would see the erased parameter set instead.
-*/
-const rule = (spec) => spec;
-const Placement = {
-	byStream: () => ({ name: (streamPath) => streamPath }),
-	byKey: (key) => ({ name: key }),
-	/**
-	* The first matching rule names the object.
-	*
-	* A path that no rule matches yields `""`, which the router turns into
-	* `400 Invalid placement key`. An owner that throws is a `500`. A rule whose
-	* stream cannot decode a segment does not own that path, so the table falls
-	* through to the next rule.
-	*/
-	byRoute: (rules) => ({ name: (streamPath) => {
-		for (const entry of rules) {
-			const params = entry.stream.parse(streamPath);
-			if (Option.isNone(params)) continue;
-			return entry.owner(params.value);
-		}
-		return "";
-	} })
-};
-//#endregion
-//#region src/cloudflare/router.ts
-const badRequest = (message) => new Response(message, {
-	status: 400,
-	headers: securityHeaders
-});
-const internalError = () => new Response("Internal server error", {
-	status: 500,
-	headers: securityHeaders
-});
-const invalidPlacement = () => badRequest("Invalid placement key");
-const resolvePlacement = (placement, streamPath) => {
-	try {
-		const candidate = placement.name(streamPath);
-		const name = String(candidate);
-		return candidate === name && name.length > 0 ? {
-			ok: true,
-			name
-		} : {
-			ok: false,
-			response: invalidPlacement()
-		};
-	} catch {
-		return {
-			ok: false,
-			response: internalError()
-		};
-	}
-};
-const router = (options) => {
-	const path = streamPath(options.prefix);
-	const placement = options.placement ?? Placement.byStream();
-	return { fetch(request, env) {
-		const url = new URL(request.url);
-		const streamPath = path.strip(url.pathname);
-		if (!streamPath || streamPath === url.pathname) return badRequest(`Stream path required: ${path.requiredPathPattern()}`);
-		const child = resolvePlacement(placement, streamPath);
-		if (!child.ok) return child.response;
-		const namespace = options.namespace(env);
-		return namespace.get(namespace.idFromName(child.name)).fetch(request);
-	} };
-};
-//#endregion
-export { acquireObject as a, rule as i, router as n, providedApp as o, Placement as r, unavailable as s, resolvePlacement as t };