@camstack/addon-pipeline 1.2.236 → 1.2.237

package/dist/stream-broker/index.js

@@ -12107,33 +12107,6 @@ var PrestreamPump = class {
 		});
 	}
 	/**
-	* Prepare the picture NOW, so the next wake does not have to.
-	*
-	* The window is ~6 s wide and the preparation was measured at 2.5-5.5 s of
-	* it (Baby monitor, 2026-09-14) — the placeholder was ready with under a
-	* second left and emitted ONE frame, which is indistinguishable from the
-	* prestream not working, and is how the operator reported it. The encode
-	* cache upstream was built for exactly this and missed every time: it is
-	* keyed on the snapshot's digest, and a fresh snapshot is captured during
-	* every stream window, so the key changed on every wake.
-	*
-	* Called when the camera is ALREADY awake and nobody is waiting (the broker
-	* suspends), which is also the moment its snapshot is the freshest it will
-	* be until the next wake — so the digest that gets cached is the digest the
-	* next wake will compute. It opens NO window, emits nothing and arms no
-	* timer: the only effect it wants is the one it has upstream, a warm cache.
-	*
-	* A failure is swallowed on purpose. This is an optimisation running on
-	* nobody's behalf; reporting it as a fault would put a warn line on every
-	* camera that sleeps with a busy encoder.
-	*/
-	warm(sourceUrl) {
-		if (this.active) return;
-		this.options.prepare({ sourceUrl }).then(() => {
-			this.options.logger?.debug("prestream: picture warmed for the next wake", { ...this.tags });
-		}).catch(() => {});
-	}
-	/**
 	* Close the window. Called on the first NON-placeholder packet — the one edge
 	* the prestream is defined by — and on the broker's own teardown paths so a
 	* stopped broker leaves no timer behind.
@@ -13603,8 +13576,6 @@ var StreamBroker = class StreamBroker {
 			this.placeholderTimer = void 0;
 		}
 		this.prestreamPump?.stop("broker suspended");
-		const warmUrl = this.source?.url;
-		if (warmUrl !== void 0 && warmUrl.length > 0) this.prestreamPump?.warm(warmUrl);
 		this.prestreamWindowClosed = false;
 		this.preBuffer.clear();
 		this.decoderSeedBuffer.clear();
@@ -16315,6 +16286,8 @@ var StreamBrokerManager = class StreamBrokerManager {
 	* was made from. One entry is one still image — kilobytes — and it is
 	* dropped with the broker in `releaseBroker`.
 	*/
+	/** Brokers with a background prestream re-encode in flight (single-flight). */
+	prestreamRefreshing = /* @__PURE__ */ new Set();
 	prestreamFrames = /* @__PURE__ */ new Map();
 	/** Monotonic insertion counter per device — feeds `CameraStreamInternal.order`. */
 	streamOrderSeq = /* @__PURE__ */ new Map();
@@ -17307,6 +17280,26 @@ var StreamBrokerManager = class StreamBrokerManager {
 			});
 			return cached.frame;
 		}
+		const cachedGeometry = cached ? cached.key.slice(cached.key.indexOf(":")) : null;
+		const wantedGeometry = key.slice(key.indexOf(":"));
+		if (cached && cachedGeometry === wantedGeometry) {
+			logger.info("prestream: serving the previous picture while the new one encodes", {
+				tags: { deviceId },
+				meta: { bytes: cached.frame.annexB.length }
+			});
+			this.encodePrestreamInBackground(deviceId, brokerId, plan, key, cachedJpeg, deviceName, logger);
+			return cached.frame;
+		}
+		return await this.composeAndEncodePrestream(deviceId, brokerId, plan, key, cachedJpeg, deviceName, logger);
+	}
+	/**
+	* Compose the treatment and encode ONE IDR, then cache it under `key`.
+	*
+	* Split out so the wake path and the background refresh share it byte for
+	* byte — two encoders that drifted apart would put two different pictures in
+	* front of the operator depending on which wake they caught.
+	*/
+	async composeAndEncodePrestream(deviceId, brokerId, plan, key, cachedJpeg, deviceName, logger) {
 		const picture = await composePrestreamPicture({
 			cachedJpeg,
 			deviceName,
@@ -17350,6 +17343,20 @@ var StreamBrokerManager = class StreamBrokerManager {
 		});
 		return frame;
 	}
+	/**
+	* Encode the CURRENT picture for the NEXT wake, off the wake path.
+	*
+	* Single-flight per broker: a camera that wakes twice inside one encode must
+	* not spawn a second ffmpeg — that is CPU taken from the live stream the
+	* operator is actually waiting for.
+	*/
+	encodePrestreamInBackground(deviceId, brokerId, plan, key, cachedJpeg, deviceName, logger) {
+		if (this.prestreamRefreshing.has(brokerId)) return;
+		this.prestreamRefreshing.add(brokerId);
+		this.composeAndEncodePrestream(deviceId, brokerId, plan, key, cachedJpeg, deviceName, logger).catch(() => {}).finally(() => {
+			this.prestreamRefreshing.delete(brokerId);
+		});
+	}
 	subscribePlaceholderStateSources(bus) {
 		bus.subscribe({ category: require_dist.EventCategory.BatteryOnStatusChanged }, (event) => {
 			const data = event.data;

package/dist/stream-broker/index.mjs

@@ -12103,33 +12103,6 @@ var PrestreamPump = class {
 		});
 	}
 	/**
-	* Prepare the picture NOW, so the next wake does not have to.
-	*
-	* The window is ~6 s wide and the preparation was measured at 2.5-5.5 s of
-	* it (Baby monitor, 2026-09-14) — the placeholder was ready with under a
-	* second left and emitted ONE frame, which is indistinguishable from the
-	* prestream not working, and is how the operator reported it. The encode
-	* cache upstream was built for exactly this and missed every time: it is
-	* keyed on the snapshot's digest, and a fresh snapshot is captured during
-	* every stream window, so the key changed on every wake.
-	*
-	* Called when the camera is ALREADY awake and nobody is waiting (the broker
-	* suspends), which is also the moment its snapshot is the freshest it will
-	* be until the next wake — so the digest that gets cached is the digest the
-	* next wake will compute. It opens NO window, emits nothing and arms no
-	* timer: the only effect it wants is the one it has upstream, a warm cache.
-	*
-	* A failure is swallowed on purpose. This is an optimisation running on
-	* nobody's behalf; reporting it as a fault would put a warn line on every
-	* camera that sleeps with a busy encoder.
-	*/
-	warm(sourceUrl) {
-		if (this.active) return;
-		this.options.prepare({ sourceUrl }).then(() => {
-			this.options.logger?.debug("prestream: picture warmed for the next wake", { ...this.tags });
-		}).catch(() => {});
-	}
-	/**
 	* Close the window. Called on the first NON-placeholder packet — the one edge
 	* the prestream is defined by — and on the broker's own teardown paths so a
 	* stopped broker leaves no timer behind.
@@ -13599,8 +13572,6 @@ var StreamBroker = class StreamBroker {
 			this.placeholderTimer = void 0;
 		}
 		this.prestreamPump?.stop("broker suspended");
-		const warmUrl = this.source?.url;
-		if (warmUrl !== void 0 && warmUrl.length > 0) this.prestreamPump?.warm(warmUrl);
 		this.prestreamWindowClosed = false;
 		this.preBuffer.clear();
 		this.decoderSeedBuffer.clear();
@@ -16311,6 +16282,8 @@ var StreamBrokerManager = class StreamBrokerManager {
 	* was made from. One entry is one still image — kilobytes — and it is
 	* dropped with the broker in `releaseBroker`.
 	*/
+	/** Brokers with a background prestream re-encode in flight (single-flight). */
+	prestreamRefreshing = /* @__PURE__ */ new Set();
 	prestreamFrames = /* @__PURE__ */ new Map();
 	/** Monotonic insertion counter per device — feeds `CameraStreamInternal.order`. */
 	streamOrderSeq = /* @__PURE__ */ new Map();
@@ -17303,6 +17276,26 @@ var StreamBrokerManager = class StreamBrokerManager {
 			});
 			return cached.frame;
 		}
+		const cachedGeometry = cached ? cached.key.slice(cached.key.indexOf(":")) : null;
+		const wantedGeometry = key.slice(key.indexOf(":"));
+		if (cached && cachedGeometry === wantedGeometry) {
+			logger.info("prestream: serving the previous picture while the new one encodes", {
+				tags: { deviceId },
+				meta: { bytes: cached.frame.annexB.length }
+			});
+			this.encodePrestreamInBackground(deviceId, brokerId, plan, key, cachedJpeg, deviceName, logger);
+			return cached.frame;
+		}
+		return await this.composeAndEncodePrestream(deviceId, brokerId, plan, key, cachedJpeg, deviceName, logger);
+	}
+	/**
+	* Compose the treatment and encode ONE IDR, then cache it under `key`.
+	*
+	* Split out so the wake path and the background refresh share it byte for
+	* byte — two encoders that drifted apart would put two different pictures in
+	* front of the operator depending on which wake they caught.
+	*/
+	async composeAndEncodePrestream(deviceId, brokerId, plan, key, cachedJpeg, deviceName, logger) {
 		const picture = await composePrestreamPicture({
 			cachedJpeg,
 			deviceName,
@@ -17346,6 +17339,20 @@ var StreamBrokerManager = class StreamBrokerManager {
 		});
 		return frame;
 	}
+	/**
+	* Encode the CURRENT picture for the NEXT wake, off the wake path.
+	*
+	* Single-flight per broker: a camera that wakes twice inside one encode must
+	* not spawn a second ffmpeg — that is CPU taken from the live stream the
+	* operator is actually waiting for.
+	*/
+	encodePrestreamInBackground(deviceId, brokerId, plan, key, cachedJpeg, deviceName, logger) {
+		if (this.prestreamRefreshing.has(brokerId)) return;
+		this.prestreamRefreshing.add(brokerId);
+		this.composeAndEncodePrestream(deviceId, brokerId, plan, key, cachedJpeg, deviceName, logger).catch(() => {}).finally(() => {
+			this.prestreamRefreshing.delete(brokerId);
+		});
+	}
 	subscribePlaceholderStateSources(bus) {
 		bus.subscribe({ category: EventCategory.BatteryOnStatusChanged }, (event) => {
 			const data = event.data;

package/package.json

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