@ariestools/cli 0.1.16 → 0.1.17

package/dist/bin/daemons/dapp-server.mjs

@@ -3,13 +3,17 @@ import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import path from "node:path";
+import { runActorsService } from "@ariestools/actor-cli";
 import { DAPP_BACKINGS, DAPP_BUCKETS, isDappBackingKind, resolveBacking, startDappServer } from "@ariestools/aries-dapp-serve";
+import { createNodeProcessHost } from "@ariestools/cli-kit-node";
 import { ConsoleLogger, assertEx, creatable } from "@ariestools/sdk";
-import { PeriodicActor, bootActors } from "@ariestools/actor";
+import { PeriodicActor } from "@ariestools/actor";
 import { DeleteObjectCommand, GetObjectCommand, HeadObjectCommand, ListObjectsV2Command, PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
 import { pathToFileURL } from "node:url";
 //#region src/providers/capabilities.ts
-/** Thrown when a read-only capability wrapper receives a write. */
+/**
+Thrown when a read-only capability wrapper receives a write.
+*/
 var ReadOnlyStoreError = class extends Error {
 	name = "ReadOnlyStoreError";
 	constructor(role, operation = "put") {
@@ -66,10 +70,14 @@ const DappStateStoreMoniker = "DappStateStore";
 const DappIndexStoreMoniker = "DappIndexStore";
 //#endregion
 //#region src/publication/constants.ts
-/** Well-known relative keys published by the coherent generation protocol. */
+/**
+Well-known relative keys published by the coherent generation protocol.
+*/
 const HEAD_KEY = "head.json";
 const STATUS_KEY = "status.json";
-/** CDN caching: mutable head and status objects that must revalidate. */
+/**
+CDN caching: mutable head and status objects that must revalidate.
+*/
 const CACHE_CONTROL_REVALIDATE = "public, max-age=0, must-revalidate";
 const INDEXER_STATUS_SCHEMA = "network.aries.dapp.indexer.status";
 //#endregion
@@ -134,7 +142,9 @@ const PROGRESS_KEYS = [
 	"generation",
 	"generationRoot"
 ];
-/** Carry forward durable progress fields from a prior status object. */
+/**
+Carry forward durable progress fields from a prior status object.
+*/
 function priorProgressFields(prior) {
 	if (prior === void 0) return {};
 	return {
@@ -142,7 +152,9 @@ function priorProgressFields(prior) {
 		...prior.lastSuccessAt !== void 0 && { lastSuccessAt: prior.lastSuccessAt }
 	};
 }
-/** Build success status fields from reduce progress, falling back to prior. */
+/**
+Build success status fields from reduce progress, falling back to prior.
+*/
 function successStatusFields(progress, prior, now) {
 	const fromProgress = progress === void 0 ? {} : pickDefined(progress, PROGRESS_KEYS);
 	const generation = progress?.generation ?? prior?.generation;
@@ -157,7 +169,9 @@ function successStatusFields(progress, prior, now) {
 		...prior?.lastErrorAt !== void 0 && { lastErrorAt: prior.lastErrorAt }
 	};
 }
-/** Build failure status fields while preserving prior checkpoint progress. */
+/**
+Build failure status fields while preserving prior checkpoint progress.
+*/
 function failureStatusFields(prior, consecutiveFailures, error, now) {
 	return {
 		consecutiveFailures,
@@ -167,7 +181,7 @@ function failureStatusFields(prior, consecutiveFailures, error, now) {
 	};
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.142.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.143.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -194,11 +208,15 @@ let DappActor = class DappActor extends PeriodicActor {
 	_data;
 	_index;
 	_state;
-	/** Dapp actors require a logger in the locator context (see {@link DappContext}). */
+	/**
+	Dapp actors require a logger in the locator context (see {@link DappContext}).
+	*/
 	get logger() {
 		return assertEx(super.logger, () => `Logger is required in context for actor ${this.name}.`);
 	}
-	/** Reduce cadence: `reduceIntervalMs` names the interval in dapp configs. */
+	/**
+	Reduce cadence: `reduceIntervalMs` names the interval in dapp configs.
+	*/
 	get intervalMs() {
 		return this.params.reduceIntervalMs ?? DEFAULT_REDUCE_INTERVAL_MS;
 	}
@@ -213,7 +231,9 @@ let DappActor = class DappActor extends PeriodicActor {
 		await super.startHandler();
 		this.logger.info(`DappActor started: reducer '${this.params.reducer.name}' every ${this.intervalMs}ms (first run in ${this.firstRunDelayMs}ms)`);
 	}
-	/** Failure side-channel: publish durable failure status (count already incremented). */
+	/**
+	Failure side-channel: publish durable failure status (count already incremented).
+	*/
 	async onPassError(error) {
 		await this.safePublishStatus(void 0, error);
 	}
@@ -251,33 +271,6 @@ let DappActor = class DappActor extends PeriodicActor {
 };
 DappActor = __decorate([creatable()], DappActor);
 //#endregion
-//#region src/boot/bootDappActors.ts
-/**
-* Creates and starts one {@link DappActor} per spec, all sharing the single
-* process-wide locator. A thin wrapper over actor-kit's `bootActors`: on
-* partial failure, actors already started are stopped (with shutdown
-* fallback) before the error is rethrown. Returns them so the caller can
-* stop them on shutdown.
-*/
-async function bootDappActors(locator, specs) {
-	return await bootActors(specs.map((spec) => {
-		const params = {
-			locator,
-			name: spec.name,
-			reducer: spec.reducer,
-			...spec.reduceIntervalMs !== void 0 && { reduceIntervalMs: spec.reduceIntervalMs },
-			...spec.firstRunDelayMs !== void 0 && { firstRunDelayMs: spec.firstRunDelayMs },
-			...spec.maxConsecutiveFailures !== void 0 && { maxConsecutiveFailures: spec.maxConsecutiveFailures },
-			...spec.publishStatus !== void 0 && { publishStatus: spec.publishStatus },
-			...spec.shutdownTimeoutMs !== void 0 && { shutdownTimeoutMs: spec.shutdownTimeoutMs }
-		};
-		return {
-			create: () => DappActor.create(params),
-			...spec.runReady !== void 0 && { runReady: spec.runReady }
-		};
-	}));
-}
-//#endregion
 //#region src/providers/errors.ts
 /**
 * Thrown when a conditional put fails (object already exists under
@@ -305,7 +298,9 @@ function joinKey(prefix, relativeKey) {
 	if (cleanKey.length === 0) return cleanPrefix;
 	return `${cleanPrefix}/${cleanKey}`;
 }
-/** Strip a role prefix from a physical key, returning the relative key. */
+/**
+Strip a role prefix from a physical key, returning the relative key.
+*/
 function stripPrefix(prefix, physicalKey) {
 	const cleanPrefix = prefix.replaceAll(/^\/+|\/+$/g, "");
 	if (cleanPrefix.length === 0) return physicalKey;
@@ -314,7 +309,9 @@ function stripPrefix(prefix, physicalKey) {
 	if (physicalKey.startsWith(withSlash)) return physicalKey.slice(withSlash.length);
 	return physicalKey;
 }
-/** Normalize an optional public base URL (no trailing slash). */
+/**
+Normalize an optional public base URL (no trailing slash).
+*/
 function normalizePublicBaseUrl(url) {
 	if (url === void 0 || url.length === 0) return void 0;
 	return url.replace(/\/+$/, "");
@@ -730,28 +727,30 @@ async function main() {
 	});
 	process.env.DAPP_PUBLICATION_SAFETY ??= "unfenced";
 	process.env.DAPP_ENDPOINT ??= server.baseUrl;
-	const actors = await bootDappActors(locator, [{
+	const actors = [await DappActor.create({
+		firstRunDelayMs: FIRST_RUN_DELAY_MS,
+		locator,
 		name: "DappActor",
-		reducer,
+		publishStatus: reducer.name !== "noop",
 		reduceIntervalMs: REDUCE_INTERVAL_MS,
-		firstRunDelayMs: FIRST_RUN_DELAY_MS,
-		publishStatus: reducer.name !== "noop"
-	}]);
+		reducer
+	})];
 	const versionSuffix = reducer.version === void 0 ? "" : `@${reducer.version}`;
 	const reducerLine = REDUCER_SPEC === void 0 ? "\nreducer: noop (pass DAPP_REDUCER / --reducer for real logic)" : `\nreducer: ${REDUCER_SPEC}`;
-	console.log(`[dev-only] dapp server listening at ${server.baseUrl}\n` + DAPP_BUCKETS.map((bucket) => `  /${bucket.padEnd(5)} ${server.baseUrl}/${bucket}`).join("\n") + `\nbacking: ${backing.description}\nactors: ${actors.length} (reducer '${reducer.name}'${versionSuffix}, every ${REDUCE_INTERVAL_MS}ms)` + reducerLine);
-	const shutdown = async () => {
-		for (const actor of actors) await actor.stop();
+	const banner = `[dev-only] dapp server listening at ${server.baseUrl}\n` + DAPP_BUCKETS.map((bucket) => `  /${bucket.padEnd(5)} ${server.baseUrl}/${bucket}`).join("\n") + `\nbacking: ${backing.description}\nactors: ${actors.length} (reducer '${reducer.name}'${versionSuffix}, every ${REDUCE_INTERVAL_MS}ms)` + reducerLine;
+	const processHost = createNodeProcessHost({ signals: ["SIGINT", "SIGTERM"] });
+	try {
+		await runActorsService(processHost, {
+			actors,
+			onReady: () => {
+				console.log(banner);
+			},
+			supervisor: "parallel"
+		});
+	} finally {
 		locator.destroy();
 		await server.close();
-		process.exit(0);
-	};
-	process.on("SIGINT", () => {
-		shutdown();
-	});
-	process.on("SIGTERM", () => {
-		shutdown();
-	});
+	}
 }
 main().catch((error) => {
 	console.error(error);