@camstack/addon-pipeline 1.2.262 → 1.2.264

package/dist/recorder/index.js

@@ -11928,6 +11928,31 @@ function pendingMovesSignature(moves) {
 	return moves.map((m) => `${String(m.deviceId)}:${m.profile}>${m.plannedFor}`).join(",");
 }
 //#endregion
+//#region src/recorder/addon/hour-adoption-catchup.ts
+/**
+* @returns true when the run stopped with work still to do — the caller should
+*   come back SOON rather than at the next daily tick. A repair that knows it
+*   is unfinished and waits a day is how an archive stays short for months.
+*/
+async function runAdoptionCatchUp(deps) {
+	const startedAt = deps.now();
+	const spent = () => deps.now() - startedAt;
+	for (const locationId of deps.locationIds) for (;;) {
+		if (spent() >= deps.budgetMs) return true;
+		let report;
+		try {
+			report = await deps.sweep({ locationId });
+		} catch (error) {
+			deps.onError?.(locationId, error);
+			break;
+		}
+		if (!report.bounded) break;
+		if (spent() >= deps.budgetMs) return true;
+		await deps.pace();
+	}
+	return false;
+}
+//#endregion
 //#region src/recorder/addon/hour-adoption-sweep.ts
 var HOUR_MS$1 = 36e5;
 /** The profile trees a camera directory is allowed to have. Everything else
@@ -12196,12 +12221,16 @@ function startPeriodicPass(deps) {
 	};
 	const timer = setInterval(fire, deps.intervalMs);
 	timer.unref?.();
+	const firstRun = deps.firstRunDelayMs === void 0 ? null : setTimeout(fire, deps.firstRunDelayMs);
+	firstRun?.unref?.();
 	return {
 		stop() {
 			stopped = true;
 			clearInterval(timer);
+			if (firstRun !== null) clearTimeout(firstRun);
 		},
-		isRunning: () => startedAt !== null
+		isRunning: () => startedAt !== null,
+		fireNow: fire
 	};
 }
 //#endregion
@@ -17793,6 +17822,29 @@ var LEDGER_WALK_PAUSE_MS = 100;
 * are already contending for that array.
 */
 var HOUR_ADOPTION_INTERVAL_MS = 1440 * 6e4;
+/**
+* How long after boot the first adoption pass runs.
+*
+* Long enough that it is not competing with everything else a starting recorder
+* does (locations resolving, writers attaching, the ledger warming), short
+* enough that a hub restarted twice in an evening still repairs its archive.
+*/
+var HOUR_ADOPTION_FIRST_RUN_DELAY_MS = 3 * 6e4;
+/**
+* How long one adoption run may keep sweeping bounded locations.
+*
+* Long enough to make real progress on a damaged archive (the first pass here
+* moved ~29 k segments in about twenty seconds of listings), short enough that
+* the array is not being walked continuously — every listing is a `readdir` on
+* a spinning disk shared with live writers.
+*/
+var HOUR_ADOPTION_CATCHUP_BUDGET_MS = 10 * 6e4;
+/**
+* How long the recorder waits before resuming an adoption run that stopped on
+* its budget. Enough of a gap that the array is not walked back-to-back;
+* nothing like a day.
+*/
+var HOUR_ADOPTION_RESUME_MS = 5 * 6e4;
 /** An adoption pass longer than this is reported with its duration. Bounded
 *  work (512 hour listings, paced) — minutes is normal, an hour is not. */
 var HOUR_ADOPTION_SLOW_AFTER_MS = 10 * 6e4;
@@ -18021,6 +18073,7 @@ var RecorderV2Addon = class extends require_dist.BaseAddon {
 	*  the storage record no longer has. Armed in `onHubReachable`. */
 	ghostLocationPass = null;
 	hourAdoptionPass = null;
+	hourAdoptionResume;
 	/** Reversible migration pause lease; never reflected in RecordingConfig. */
 	storageMigrationLeaseId = null;
 	/**
@@ -18920,9 +18973,30 @@ var RecorderV2Addon = class extends require_dist.BaseAddon {
 			this.hourAdoptionPass = startPeriodicPass({
 				name: "hour-adoption",
 				intervalMs: HOUR_ADOPTION_INTERVAL_MS,
+				firstRunDelayMs: HOUR_ADOPTION_FIRST_RUN_DELAY_MS,
 				slowAfterMs: HOUR_ADOPTION_SLOW_AFTER_MS,
 				run: async () => {
-					for (const location of this.resolvedLocations) await adopter.sweep({ locationId: location.id });
+					if (await runAdoptionCatchUp({
+						locationIds: this.resolvedLocations.map((location) => location.id),
+						sweep: (input) => adopter.sweep(input),
+						budgetMs: HOUR_ADOPTION_CATCHUP_BUDGET_MS,
+						now: () => Date.now(),
+						pace: () => require_dist.sleep(LEDGER_WALK_PAUSE_MS),
+						onError: (locationId, error) => {
+							this.ctx.logger.warn("recorder: hour adoption could not sweep a location", { meta: {
+								locationId,
+								error: require_dist.errMsg(error)
+							} });
+						}
+					})) {
+						this.ctx.logger.info("recorder: hour adoption stopped on its budget with work left — resuming shortly", { meta: { resumeInMs: HOUR_ADOPTION_RESUME_MS } });
+						this.hourAdoptionResume?.unref?.();
+						clearTimeout(this.hourAdoptionResume);
+						this.hourAdoptionResume = setTimeout(() => {
+							this.hourAdoptionPass?.fireNow();
+						}, HOUR_ADOPTION_RESUME_MS);
+						this.hourAdoptionResume.unref?.();
+					}
 				},
 				logger: this.ctx.logger
 			});

package/dist/recorder/index.mjs

@@ -11921,6 +11921,31 @@ function pendingMovesSignature(moves) {
 	return moves.map((m) => `${String(m.deviceId)}:${m.profile}>${m.plannedFor}`).join(",");
 }
 //#endregion
+//#region src/recorder/addon/hour-adoption-catchup.ts
+/**
+* @returns true when the run stopped with work still to do — the caller should
+*   come back SOON rather than at the next daily tick. A repair that knows it
+*   is unfinished and waits a day is how an archive stays short for months.
+*/
+async function runAdoptionCatchUp(deps) {
+	const startedAt = deps.now();
+	const spent = () => deps.now() - startedAt;
+	for (const locationId of deps.locationIds) for (;;) {
+		if (spent() >= deps.budgetMs) return true;
+		let report;
+		try {
+			report = await deps.sweep({ locationId });
+		} catch (error) {
+			deps.onError?.(locationId, error);
+			break;
+		}
+		if (!report.bounded) break;
+		if (spent() >= deps.budgetMs) return true;
+		await deps.pace();
+	}
+	return false;
+}
+//#endregion
 //#region src/recorder/addon/hour-adoption-sweep.ts
 var HOUR_MS$1 = 36e5;
 /** The profile trees a camera directory is allowed to have. Everything else
@@ -12189,12 +12214,16 @@ function startPeriodicPass(deps) {
 	};
 	const timer = setInterval(fire, deps.intervalMs);
 	timer.unref?.();
+	const firstRun = deps.firstRunDelayMs === void 0 ? null : setTimeout(fire, deps.firstRunDelayMs);
+	firstRun?.unref?.();
 	return {
 		stop() {
 			stopped = true;
 			clearInterval(timer);
+			if (firstRun !== null) clearTimeout(firstRun);
 		},
-		isRunning: () => startedAt !== null
+		isRunning: () => startedAt !== null,
+		fireNow: fire
 	};
 }
 //#endregion
@@ -17786,6 +17815,29 @@ var LEDGER_WALK_PAUSE_MS = 100;
 * are already contending for that array.
 */
 var HOUR_ADOPTION_INTERVAL_MS = 1440 * 6e4;
+/**
+* How long after boot the first adoption pass runs.
+*
+* Long enough that it is not competing with everything else a starting recorder
+* does (locations resolving, writers attaching, the ledger warming), short
+* enough that a hub restarted twice in an evening still repairs its archive.
+*/
+var HOUR_ADOPTION_FIRST_RUN_DELAY_MS = 3 * 6e4;
+/**
+* How long one adoption run may keep sweeping bounded locations.
+*
+* Long enough to make real progress on a damaged archive (the first pass here
+* moved ~29 k segments in about twenty seconds of listings), short enough that
+* the array is not being walked continuously — every listing is a `readdir` on
+* a spinning disk shared with live writers.
+*/
+var HOUR_ADOPTION_CATCHUP_BUDGET_MS = 10 * 6e4;
+/**
+* How long the recorder waits before resuming an adoption run that stopped on
+* its budget. Enough of a gap that the array is not walked back-to-back;
+* nothing like a day.
+*/
+var HOUR_ADOPTION_RESUME_MS = 5 * 6e4;
 /** An adoption pass longer than this is reported with its duration. Bounded
 *  work (512 hour listings, paced) — minutes is normal, an hour is not. */
 var HOUR_ADOPTION_SLOW_AFTER_MS = 10 * 6e4;
@@ -18014,6 +18066,7 @@ var RecorderV2Addon = class extends BaseAddon {
 	*  the storage record no longer has. Armed in `onHubReachable`. */
 	ghostLocationPass = null;
 	hourAdoptionPass = null;
+	hourAdoptionResume;
 	/** Reversible migration pause lease; never reflected in RecordingConfig. */
 	storageMigrationLeaseId = null;
 	/**
@@ -18913,9 +18966,30 @@ var RecorderV2Addon = class extends BaseAddon {
 			this.hourAdoptionPass = startPeriodicPass({
 				name: "hour-adoption",
 				intervalMs: HOUR_ADOPTION_INTERVAL_MS,
+				firstRunDelayMs: HOUR_ADOPTION_FIRST_RUN_DELAY_MS,
 				slowAfterMs: HOUR_ADOPTION_SLOW_AFTER_MS,
 				run: async () => {
-					for (const location of this.resolvedLocations) await adopter.sweep({ locationId: location.id });
+					if (await runAdoptionCatchUp({
+						locationIds: this.resolvedLocations.map((location) => location.id),
+						sweep: (input) => adopter.sweep(input),
+						budgetMs: HOUR_ADOPTION_CATCHUP_BUDGET_MS,
+						now: () => Date.now(),
+						pace: () => sleep$1(LEDGER_WALK_PAUSE_MS),
+						onError: (locationId, error) => {
+							this.ctx.logger.warn("recorder: hour adoption could not sweep a location", { meta: {
+								locationId,
+								error: errMsg(error)
+							} });
+						}
+					})) {
+						this.ctx.logger.info("recorder: hour adoption stopped on its budget with work left — resuming shortly", { meta: { resumeInMs: HOUR_ADOPTION_RESUME_MS } });
+						this.hourAdoptionResume?.unref?.();
+						clearTimeout(this.hourAdoptionResume);
+						this.hourAdoptionResume = setTimeout(() => {
+							this.hourAdoptionPass?.fireNow();
+						}, HOUR_ADOPTION_RESUME_MS);
+						this.hourAdoptionResume.unref?.();
+					}
 				},
 				logger: this.ctx.logger
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-pipeline",
-  "version": "1.2.262",
+  "version": "1.2.264",
   "description": "Pipeline bundle — runner, detection, motion, audio + stream broker. Multi-entry npm package shipping pipeline addons under a single bundle.",
   "keywords": [
     "camstack",