@camstack/addon-provider-dreame 0.2.71 → 0.2.72

package/dist/addon.js

@@ -57117,6 +57117,12 @@ Object.fromEntries([
 		icon: "move",
 		order: 40
 	},
+	{
+		id: "navigation",
+		label: "Navigation",
+		icon: "compass",
+		order: 41
+	},
 	{
 		id: "consumables",
 		label: "Consumables",
@@ -80553,10 +80559,7 @@ var PtzMoveCommandSchema = object({
 	zoom: number().optional(),
 	speed: number().optional()
 });
-/** PTZ status — current position plus the camera's autofocus state.
-*  `getPosition` / `move` still operate on the bare position; the
-*  auto-injected `getStatus` returns this richer block. */
-var PtzStatusSchema = PtzPositionSchema.extend({ autofocus: boolean() });
+PtzPositionSchema.extend({ autofocus: boolean() });
 /** Per-camera PTZ availability descriptor — drives the UI. */
 var PtzOptionsSchema = object({
 	hasPan: boolean(),
@@ -80569,65 +80572,26 @@ var PtzOptionsSchema = object({
 	*  (boolean `hasX` per the getOptions availability convention). */
 	hasAutofocus: boolean()
 });
-var ptzCapability = {
-	name: "ptz",
-	scope: "device",
-	deviceNative: true,
-	mode: "singleton",
-	deviceTypes: [DeviceType.Camera],
-	deviceConfig: { ui: {
-		kind: "widget",
-		widgetId: "host/ptz-panel",
-		tab: "ptz",
-		topTab: true,
-		label: "PTZ",
-		order: 0
-	} },
-	methods: {
-		move: method(PtzMoveCommandSchema.extend({ deviceId: number() }), _void(), { kind: "mutation" }),
-		continuousMove: method(PtzMoveCommandSchema.extend({ deviceId: number() }), _void(), { kind: "mutation" }),
-		stop: method(object({ deviceId: number() }), _void(), { kind: "mutation" }),
-		getPresets: method(object({ deviceId: number() }), array(PtzPresetSchema)),
-		goToPreset: method(object({
-			deviceId: number(),
-			presetId: string()
-		}), _void(), { kind: "mutation" }),
-		savePreset: method(object({
-			deviceId: number(),
-			presetId: string(),
-			name: string()
-		}), _void(), {
-			kind: "mutation",
-			auth: "admin"
-		}),
-		deletePreset: method(object({
-			deviceId: number(),
-			presetId: string()
-		}), _void(), {
-			kind: "mutation",
-			auth: "admin"
-		}),
-		getOptions: method(object({ deviceId: number() }), PtzOptionsSchema),
-		goHome: method(object({ deviceId: number() }), _void(), { kind: "mutation" }),
-		/**
-		* Pull the current PTZ position. Redundant with the auto-injected
-		* `getStatus` method (see `status` below); kept for callers that
-		* haven't migrated. Will be folded into `getStatus` in a future
-		* cleanup pass once all consumers use the typed status surface.
-		*/
-		getPosition: method(object({ deviceId: number() }), PtzPositionSchema),
-		/** Toggle the camera's autofocus. Only meaningful when
-		*  `getOptions().hasAutofocus` is true. */
-		setAutofocus: method(object({
-			deviceId: number(),
-			enabled: boolean()
-		}), _void(), { kind: "mutation" })
-	},
-	status: {
-		schema: PtzStatusSchema,
-		kind: "command-driven"
-	}
-};
+DeviceType.Camera, method(PtzMoveCommandSchema.extend({ deviceId: number() }), _void(), { kind: "mutation" }), method(PtzMoveCommandSchema.extend({ deviceId: number() }), _void(), { kind: "mutation" }), method(object({ deviceId: number() }), _void(), { kind: "mutation" }), method(object({ deviceId: number() }), array(PtzPresetSchema)), method(object({
+	deviceId: number(),
+	presetId: string()
+}), _void(), { kind: "mutation" }), method(object({
+	deviceId: number(),
+	presetId: string(),
+	name: string()
+}), _void(), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	deviceId: number(),
+	presetId: string()
+}), _void(), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({ deviceId: number() }), PtzOptionsSchema), method(object({ deviceId: number() }), _void(), { kind: "mutation" }), method(object({ deviceId: number() }), PtzPositionSchema), method(object({
+	deviceId: number(),
+	enabled: boolean()
+}), _void(), { kind: "mutation" });
 var PtzAutotrackSettingsSchema = object({
 	targetType: string().describe("Vendor target string (people/vehicle/pet); empty = camera default"),
 	stopDelaySeconds: number().int().min(0).max(300),
@@ -96331,6 +96295,65 @@ function buildVacuumConsumables(vacuum) {
 	};
 }
 //#endregion
+//#region src/devices/dreame-camera-stream.ts
+/** The one stream the robot camera offers. Half of the broker id (`<deviceId>/live`). */
+var CAMERA_STREAM_ID = "live";
+/** How often an open monitor asks the broker whether anybody is still watching. */
+var IDLE_CHECK_MS = 6e4;
+/** `ChargingStatus` as the robot reports it (siid 3 piid 2, VERIFIED r2532a). */
+var CHARGING_STATUS_CHARGING = 1;
+function clampLevel(level) {
+	if (level === null || !Number.isFinite(level)) return null;
+	return Math.max(0, Math.min(100, level));
+}
+/**
+* The battery slice the broker reads before a play: `sleeping` decides
+* whether it asks for a wake, `lastContactAt` decides whether it refuses to
+* (`deriveBatteryPresence` calls hours of silence "unreachable"). A contact
+* of 0 would read as "never heard" — the field is omitted instead.
+*/
+function cameraBatterySlice(facts) {
+	const charging = facts.charging === null ? "unknown" : facts.charging === CHARGING_STATUS_CHARGING ? "dc" : "none";
+	return {
+		percentage: clampLevel(facts.level),
+		charging,
+		sleeping: !facts.streamOpen,
+		lastUpdated: facts.now,
+		...facts.contactAt !== null && facts.contactAt > 0 ? { lastContactAt: facts.contactAt } : {}
+	};
+}
+/** One `pull-rtmp` descriptor while the monitor is open; nothing while it is closed. */
+function cameraStreamCatalog(session) {
+	if (session === null) return [];
+	return [{
+		camStreamId: CAMERA_STREAM_ID,
+		kind: "pull-rtmp",
+		url: session.url,
+		codec: "h264",
+		label: "Robot camera",
+		deviceFeatures: ["battery-operated"],
+		autoEligible: true
+	}];
+}
+/**
+* Somebody WATCHING is a reason to keep the monitor open: an RTSP client, a
+* WebRTC session (an `encoded` subscriber), an audio listener. The detection
+* pipeline is deliberately NOT one — it subscribes decoded frames for as long
+* as a stream exists, so counting it would keep the robot's relay open, on
+* its battery and through the cloud, until the battery died. It rides along
+* while a viewer watches and stops when the monitor closes.
+*/
+function isBrokerBusy(clients) {
+	return clients.rtsp.length > 0 || clients.encoded.length > 0 || clients.audio.length > 0;
+}
+/** Consecutive idle checks; a busy check starts the count over. */
+function nextIdleCount(previous, busy) {
+	return busy ? 0 : previous + 1;
+}
+function shouldCloseForIdle(idleCount) {
+	return idleCount >= 3;
+}
+//#endregion
 //#region src/devices/dreame-navigation-actions.ts
 /** Forward throttle magnitude for a full-forward nudge (device speed units). */
 var FORWARD_SPEED = 200;
@@ -96537,60 +96560,6 @@ function resolveNavigationFeatures(overrides) {
 function resolveDisabledEntryIds(overrides) {
 	return new Set([...DREAME_NAVIGATION_DISABLED_ENTRY_IDS, ...overrides?.disabledEntryIds ?? []]);
 }
-//#endregion
-//#region src/devices/dreame-navigation-ptz-adapter.ts
-/** A gimbal descriptor for a robot: the joystick is pan/tilt, there is no lens. */
-function ptzOptionsFromFeatures(features) {
-	return {
-		hasPan: features.move,
-		hasTilt: features.move,
-		hasZoom: false,
-		supportsPresets: features.runAction || features.playSound,
-		hasAutofocus: false
-	};
-}
-/** Every ENABLED dictionary entry is a preset; the label is the preset name. */
-function presetsFromCatalog(entries, features) {
-	return entries.filter((entry) => entry.enabled).filter((entry) => entry.kind === "action" ? features.runAction : features.playSound).map((entry) => ({
-		id: entry.id,
-		name: entry.label
-	}));
-}
-/**
-* Resolve a preset id back to the navigation call. `null` when the id names
-* nothing enabled — the caller rejects rather than guessing an action.
-*/
-function presetTarget(entries, presetId) {
-	const entry = entries.find((candidate) => candidate.id === presetId && candidate.enabled);
-	if (!entry) return null;
-	if (entry.kind === "sound") return entry.soundId === void 0 ? null : {
-		kind: "sound",
-		soundId: entry.soundId
-	};
-	const parsed = NavigationActionIdSchema.safeParse(entry.id);
-	return parsed.success ? {
-		kind: "action",
-		actionId: parsed.data
-	} : null;
-}
-function clampAxis(value) {
-	if (value === void 0 || !Number.isFinite(value)) return void 0;
-	return Math.max(-1, Math.min(1, value));
-}
-/**
-* A PTZ move is a navigation nudge: pan turns, tilt drives, zoom has no
-* meaning on a chassis and is dropped. Axes are clamped to the cap's [-1, 1].
-*/
-function ptzMoveToNavigation(cmd) {
-	const pan = clampAxis(cmd.pan);
-	const tilt = clampAxis(cmd.tilt);
-	const speed = cmd.speed === void 0 || !Number.isFinite(cmd.speed) ? void 0 : Math.max(0, Math.min(1, cmd.speed));
-	return {
-		...pan !== void 0 ? { pan } : {},
-		...tilt !== void 0 ? { tilt } : {},
-		...speed !== void 0 ? { speed } : {}
-	};
-}
 /** The camera-service fill-light mode/level property. */
 var FILL_LIGHT_SET_SIID = 10001;
 /** The wire value that means "auto" on `fillinLightSet`. */
@@ -96639,14 +96608,30 @@ function decodeNavigationReadback(read) {
 //#endregion
 //#region src/devices/dreame-camera-device.ts
 var CAP_NAME$12 = "navigation";
+/**
+* The slice as WRITTEN: the cap's runtime-state shape (status + `lastFetchedAt`).
+* `setCapState` validates against it, so a status-only object throws at
+* activation and registers nothing — which is how the first deploy shipped
+* a camera with no navigation and no PTZ.
+*/
 var NAV_COLD_START = {
 	mode: "unknown",
 	following: false,
 	flash: false,
 	lightMode: "auto",
 	lightLevel: 100,
-	lastChangedAt: 0
+	lastChangedAt: 0,
+	lastFetchedAt: 0
 };
+/** The next slice: the previous one, the patch, and both clocks stamped `now`. */
+function navigationSlice(prev, patch, now) {
+	return {
+		...prev,
+		...patch,
+		lastChangedAt: now,
+		lastFetchedAt: now
+	};
+}
 /**
 * Dreame CAMERA + NAVIGATION device — a SEPARATE camstack device from the
 * `DreameVacuumDevice`, spawned only for camera-capable vacuums (those whose
@@ -96672,11 +96657,10 @@ var NAV_COLD_START = {
 * read-back lands, from the commands this device issued. `following` has no
 * confirmed read-back yet and stays command-driven.
 *
-* PTZ MIMIC: the same device also registers `ptz`, projected from `navigation`
-* through `dreame-navigation-ptz-adapter.ts` (pure, tested) — the joystick is
-* pan/tilt, the enabled actions and sounds are the presets, there is no zoom
-* and no autofocus. `navigation` stays the source of truth; nothing is stored
-* on the PTZ side.
+* `navigation` is its own capability, deliberately NOT projected as `ptz`: a
+* gimbal and a chassis are different physical models, and the operator asked
+* for two separate things (admin UI: two tabs; viewer: one panel that shows the
+* navigation controls when the device has the cap).
 */
 var DreameCameraDevice = class extends DreameChildDevice {
 	features = [DeviceFeature.BatteryOperated];
@@ -96687,7 +96671,148 @@ var DreameCameraDevice = class extends DreameChildDevice {
 		const provider = this.buildNavigationProvider();
 		this.ctx.registerNativeCap(navigationCapability, provider);
 		this.runtimeState.setCapState(CAP_NAME$12, NAV_COLD_START);
-		this.ctx.registerNativeCap(ptzCapability, this.buildPtzMimic(provider));
+		this.registerBatteryCap();
+		this.registerStreamCatalogCap();
+	}
+	/** The relay the current `open()` handed out; null while the monitor is closed. */
+	session = null;
+	/** A single in-flight `open()` — two plays must not cold-start the robot twice. */
+	opening = null;
+	idleTimer = null;
+	idleCount = 0;
+	/** Last time the robot said anything (a state change) — the wake refusal's evidence. */
+	lastContactAt = null;
+	registerBatteryCap() {
+		this.ctx.registerNativeCap(batteryCapability, { wakeForStream: async ({ timeoutMs }) => this.wakeForStream(timeoutMs) });
+		this.publishBattery();
+		this.runtimeState.subscribeCap(batteryCapability.name, (slice) => {
+			if (!slice) return;
+			this.ctx.eventBus.emit(createEvent(EventCategory.BatteryOnStatusChanged, {
+				type: "device",
+				id: this.stableId
+			}, {
+				deviceId: this.id,
+				status: slice
+			}));
+		});
+	}
+	registerStreamCatalogCap() {
+		this.ctx.registerNativeCap(streamCatalogCapability, { getCatalog: async ({ deviceId }) => deviceId === this.id ? cameraStreamCatalog(this.session) : [] });
+		this.publishCatalog();
+	}
+	publishBattery() {
+		const handle = this.resolveHandle();
+		const vacuum = handle instanceof VacuumDevice ? handle : null;
+		this.setCapSlice(batteryCapability, cameraBatterySlice({
+			level: vacuum?.battery ?? null,
+			charging: vacuum?.charging ?? null,
+			streamOpen: this.session !== null,
+			now: Date.now(),
+			contactAt: this.lastContactAt
+		}));
+	}
+	publishCatalog() {
+		this.runtimeState.setCapState(streamCatalogCapability.name, {
+			descriptors: [...cameraStreamCatalog(this.session)],
+			lastFetchedAt: Date.now()
+		});
+	}
+	/**
+	* `battery.wakeForStream`: open the monitor inside the caller's bound. An
+	* open that outlives the bound keeps running — the next play joins it.
+	*/
+	async wakeForStream(timeoutMs) {
+		const startedAt = Date.now();
+		if (this.session !== null) return {
+			awoke: true,
+			durationMs: 0
+		};
+		const opened = this.openStream().then(() => "open", () => "failed");
+		const bound = new Promise((resolve) => {
+			setTimeout(() => resolve("timeout"), timeoutMs).unref?.();
+		});
+		const outcome = await Promise.race([opened, bound]);
+		if (outcome === "timeout") this.ctx.logger.info("robot camera: the wake outlived its bound — the open keeps running", {
+			tags: { deviceId: this.id },
+			meta: { timeoutMs }
+		});
+		return {
+			awoke: outcome === "open",
+			durationMs: Date.now() - startedAt
+		};
+	}
+	openStream() {
+		if (this.opening !== null) return this.opening;
+		const run = (async () => {
+			const startedAt = Date.now();
+			try {
+				const handle = await (await this.requireController()).open();
+				this.session = { url: handle.rtmpUrl };
+				this.idleCount = 0;
+				this.publishBattery();
+				this.publishCatalog();
+				this.startIdleWatch();
+				this.ctx.logger.info("robot camera: monitor open, relay published to the catalog", {
+					tags: { deviceId: this.id },
+					meta: { openMs: Date.now() - startedAt }
+				});
+			} catch (err) {
+				this.ctx.logger.warn("robot camera: monitor could not be opened", {
+					tags: { deviceId: this.id },
+					meta: {
+						openMs: Date.now() - startedAt,
+						error: errMsg(err)
+					}
+				});
+				throw err;
+			}
+		})();
+		this.opening = run.finally(() => {
+			this.opening = null;
+		});
+		return this.opening;
+	}
+	async closeStream(reason) {
+		this.stopIdleWatch();
+		if (this.session === null) return;
+		this.session = null;
+		this.publishBattery();
+		this.publishCatalog();
+		this.ctx.logger.info("robot camera: monitor closed", {
+			tags: { deviceId: this.id },
+			meta: { reason }
+		});
+		const pending = this.controller;
+		if (pending === null) return;
+		await pending.then((controller) => controller.close()).catch((err) => {
+			this.ctx.logger.debug("robot camera: close reported an error", {
+				tags: { deviceId: this.id },
+				meta: {
+					reason,
+					error: errMsg(err)
+				}
+			});
+		});
+	}
+	startIdleWatch() {
+		this.stopIdleWatch();
+		this.idleTimer = setInterval(() => {
+			this.checkIdle();
+		}, IDLE_CHECK_MS);
+		this.idleTimer.unref?.();
+	}
+	stopIdleWatch() {
+		if (this.idleTimer !== null) clearInterval(this.idleTimer);
+		this.idleTimer = null;
+		this.idleCount = 0;
+	}
+	/** Ask the broker whether anybody is still watching; no broker at all counts as idle. */
+	async checkIdle() {
+		if (this.session === null) return;
+		const clients = await this.ctx.api.streamBroker.listClients.query({ brokerId: `${String(this.id)}/${CAMERA_STREAM_ID}` }).catch(() => null);
+		const busy = clients !== null && isBrokerBusy(clients);
+		this.idleCount = nextIdleCount(this.idleCount, busy);
+		if (shouldCloseForIdle(this.idleCount)) await this.closeStream("idle");
 	}
 	buildNavigationProvider() {
 		return {
@@ -96737,81 +96862,19 @@ var DreameCameraDevice = class extends DreameChildDevice {
 			}
 		};
 	}
-	/**
-	* `ptz` projected from `navigation` (the PTZ-mimic adapter). Every call
-	* forwards to the navigation provider through the pure mapping; a preset
-	* that names nothing enabled is rejected, never guessed.
-	*/
-	buildPtzMimic(nav) {
-		const deviceId = this.id;
-		const noGimbal = (what) => {
-			throw new Error(`DreameCameraDevice: a robot camera has no ${what}`);
-		};
-		return {
-			getStatus: async () => ({
-				pan: 0,
-				tilt: 0,
-				zoom: 0,
-				autofocus: false
-			}),
-			getPosition: async () => ({
-				pan: 0,
-				tilt: 0,
-				zoom: 0
-			}),
-			getOptions: async () => ptzOptionsFromFeatures(await nav.getFeatures({ deviceId })),
-			move: async (cmd) => {
-				await nav.move({
-					deviceId,
-					...ptzMoveToNavigation(cmd)
-				});
-			},
-			continuousMove: async (cmd) => {
-				await nav.move({
-					deviceId,
-					...ptzMoveToNavigation(cmd)
-				});
-			},
-			stop: async () => {
-				await nav.stop({ deviceId });
-			},
-			goHome: async () => {
-				await nav.runAction({
-					deviceId,
-					actionId: "goHome"
-				});
-			},
-			getPresets: async () => presetsFromCatalog(await nav.listActions({ deviceId }), await nav.getFeatures({ deviceId })),
-			goToPreset: async ({ presetId }) => {
-				const target = presetTarget(await nav.listActions({ deviceId }), presetId);
-				if (target === null) throw new Error(`DreameCameraDevice: unknown or disabled navigation preset "${presetId}"`);
-				if (target.kind === "sound") await nav.playSound({
-					deviceId,
-					soundId: target.soundId
-				});
-				else await nav.runAction({
-					deviceId,
-					actionId: target.actionId
-				});
-			},
-			savePreset: async () => noGimbal("saved preset — its presets are its actions"),
-			deletePreset: async () => noGimbal("deletable preset — its presets are its actions"),
-			setAutofocus: async () => noGimbal("autofocus")
-		};
-	}
 	recomputeSlice() {
 		const handle = this.resolveHandle();
 		if (handle === null) return;
+		this.lastContactAt = Date.now();
+		this.publishBattery();
 		const prev = this.runtimeState.getCapState(CAP_NAME$12) ?? NAV_COLD_START;
 		const readback = handle instanceof VacuumDevice ? decodeNavigationReadback((siid, piid) => handle.getProperty(siid, piid)?.value) : {};
 		const following = handle instanceof VacuumDevice ? decodeFollowing(handle.status) : null;
-		this.runtimeState.setCapState(CAP_NAME$12, {
-			...prev,
+		this.runtimeState.setCapState(CAP_NAME$12, navigationSlice(prev, {
 			...readback,
 			...following !== null ? { following } : {},
-			mode: following === true ? "following" : this.deriveMode(handle),
-			lastChangedAt: Date.now()
-		});
+			mode: following === true ? "following" : this.deriveMode(handle)
+		}, Date.now()));
 	}
 	controller = null;
 	controllerHandle = null;
@@ -96826,7 +96889,16 @@ var DreameCameraDevice = class extends DreameChildDevice {
 		if (this.controller === null || this.controllerHandle !== handle) {
 			const accessCode = this.config.get("navigationAccessCode");
 			this.controllerHandle = handle;
-			this.controller = handle.createCameraController(accessCode !== void 0 && accessCode !== "" ? { accessCode } : {}).catch((err) => {
+			this.controller = handle.createCameraController({
+				...accessCode !== void 0 && accessCode !== "" ? { accessCode } : {},
+				onKeepAliveError: (err) => {
+					this.ctx.logger.warn("robot camera: relay keep-alive failed — closing the monitor", {
+						tags: { deviceId: this.id },
+						meta: { error: errMsg(err) }
+					});
+					this.closeStream("keep-alive");
+				}
+			}).catch((err) => {
 				this.controller = null;
 				this.controllerHandle = null;
 				throw err;
@@ -96840,6 +96912,7 @@ var DreameCameraDevice = class extends DreameChildDevice {
 	}
 	async removeDevice() {
 		await super.removeDevice();
+		await this.closeStream("removed");
 		const pending = this.controller;
 		this.controller = null;
 		this.controllerHandle = null;
@@ -96901,11 +96974,7 @@ var DreameCameraDevice = class extends DreameChildDevice {
 	*/
 	patchStatus(patch) {
 		const prev = this.runtimeState.getCapState(CAP_NAME$12) ?? NAV_COLD_START;
-		this.runtimeState.setCapState(CAP_NAME$12, {
-			...prev,
-			...patch,
-			lastChangedAt: Date.now()
-		});
+		this.runtimeState.setCapState(CAP_NAME$12, navigationSlice(prev, patch, Date.now()));
 	}
 };
 //#endregion

package/dist/addon.mjs

@@ -57117,6 +57117,12 @@ Object.fromEntries([
 		icon: "move",
 		order: 40
 	},
+	{
+		id: "navigation",
+		label: "Navigation",
+		icon: "compass",
+		order: 41
+	},
 	{
 		id: "consumables",
 		label: "Consumables",
@@ -80553,10 +80559,7 @@ var PtzMoveCommandSchema = object({
 	zoom: number().optional(),
 	speed: number().optional()
 });
-/** PTZ status — current position plus the camera's autofocus state.
-*  `getPosition` / `move` still operate on the bare position; the
-*  auto-injected `getStatus` returns this richer block. */
-var PtzStatusSchema = PtzPositionSchema.extend({ autofocus: boolean() });
+PtzPositionSchema.extend({ autofocus: boolean() });
 /** Per-camera PTZ availability descriptor — drives the UI. */
 var PtzOptionsSchema = object({
 	hasPan: boolean(),
@@ -80569,65 +80572,26 @@ var PtzOptionsSchema = object({
 	*  (boolean `hasX` per the getOptions availability convention). */
 	hasAutofocus: boolean()
 });
-var ptzCapability = {
-	name: "ptz",
-	scope: "device",
-	deviceNative: true,
-	mode: "singleton",
-	deviceTypes: [DeviceType.Camera],
-	deviceConfig: { ui: {
-		kind: "widget",
-		widgetId: "host/ptz-panel",
-		tab: "ptz",
-		topTab: true,
-		label: "PTZ",
-		order: 0
-	} },
-	methods: {
-		move: method(PtzMoveCommandSchema.extend({ deviceId: number() }), _void(), { kind: "mutation" }),
-		continuousMove: method(PtzMoveCommandSchema.extend({ deviceId: number() }), _void(), { kind: "mutation" }),
-		stop: method(object({ deviceId: number() }), _void(), { kind: "mutation" }),
-		getPresets: method(object({ deviceId: number() }), array(PtzPresetSchema)),
-		goToPreset: method(object({
-			deviceId: number(),
-			presetId: string()
-		}), _void(), { kind: "mutation" }),
-		savePreset: method(object({
-			deviceId: number(),
-			presetId: string(),
-			name: string()
-		}), _void(), {
-			kind: "mutation",
-			auth: "admin"
-		}),
-		deletePreset: method(object({
-			deviceId: number(),
-			presetId: string()
-		}), _void(), {
-			kind: "mutation",
-			auth: "admin"
-		}),
-		getOptions: method(object({ deviceId: number() }), PtzOptionsSchema),
-		goHome: method(object({ deviceId: number() }), _void(), { kind: "mutation" }),
-		/**
-		* Pull the current PTZ position. Redundant with the auto-injected
-		* `getStatus` method (see `status` below); kept for callers that
-		* haven't migrated. Will be folded into `getStatus` in a future
-		* cleanup pass once all consumers use the typed status surface.
-		*/
-		getPosition: method(object({ deviceId: number() }), PtzPositionSchema),
-		/** Toggle the camera's autofocus. Only meaningful when
-		*  `getOptions().hasAutofocus` is true. */
-		setAutofocus: method(object({
-			deviceId: number(),
-			enabled: boolean()
-		}), _void(), { kind: "mutation" })
-	},
-	status: {
-		schema: PtzStatusSchema,
-		kind: "command-driven"
-	}
-};
+DeviceType.Camera, method(PtzMoveCommandSchema.extend({ deviceId: number() }), _void(), { kind: "mutation" }), method(PtzMoveCommandSchema.extend({ deviceId: number() }), _void(), { kind: "mutation" }), method(object({ deviceId: number() }), _void(), { kind: "mutation" }), method(object({ deviceId: number() }), array(PtzPresetSchema)), method(object({
+	deviceId: number(),
+	presetId: string()
+}), _void(), { kind: "mutation" }), method(object({
+	deviceId: number(),
+	presetId: string(),
+	name: string()
+}), _void(), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	deviceId: number(),
+	presetId: string()
+}), _void(), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({ deviceId: number() }), PtzOptionsSchema), method(object({ deviceId: number() }), _void(), { kind: "mutation" }), method(object({ deviceId: number() }), PtzPositionSchema), method(object({
+	deviceId: number(),
+	enabled: boolean()
+}), _void(), { kind: "mutation" });
 var PtzAutotrackSettingsSchema = object({
 	targetType: string().describe("Vendor target string (people/vehicle/pet); empty = camera default"),
 	stopDelaySeconds: number().int().min(0).max(300),
@@ -96331,6 +96295,65 @@ function buildVacuumConsumables(vacuum) {
 	};
 }
 //#endregion
+//#region src/devices/dreame-camera-stream.ts
+/** The one stream the robot camera offers. Half of the broker id (`<deviceId>/live`). */
+var CAMERA_STREAM_ID = "live";
+/** How often an open monitor asks the broker whether anybody is still watching. */
+var IDLE_CHECK_MS = 6e4;
+/** `ChargingStatus` as the robot reports it (siid 3 piid 2, VERIFIED r2532a). */
+var CHARGING_STATUS_CHARGING = 1;
+function clampLevel(level) {
+	if (level === null || !Number.isFinite(level)) return null;
+	return Math.max(0, Math.min(100, level));
+}
+/**
+* The battery slice the broker reads before a play: `sleeping` decides
+* whether it asks for a wake, `lastContactAt` decides whether it refuses to
+* (`deriveBatteryPresence` calls hours of silence "unreachable"). A contact
+* of 0 would read as "never heard" — the field is omitted instead.
+*/
+function cameraBatterySlice(facts) {
+	const charging = facts.charging === null ? "unknown" : facts.charging === CHARGING_STATUS_CHARGING ? "dc" : "none";
+	return {
+		percentage: clampLevel(facts.level),
+		charging,
+		sleeping: !facts.streamOpen,
+		lastUpdated: facts.now,
+		...facts.contactAt !== null && facts.contactAt > 0 ? { lastContactAt: facts.contactAt } : {}
+	};
+}
+/** One `pull-rtmp` descriptor while the monitor is open; nothing while it is closed. */
+function cameraStreamCatalog(session) {
+	if (session === null) return [];
+	return [{
+		camStreamId: CAMERA_STREAM_ID,
+		kind: "pull-rtmp",
+		url: session.url,
+		codec: "h264",
+		label: "Robot camera",
+		deviceFeatures: ["battery-operated"],
+		autoEligible: true
+	}];
+}
+/**
+* Somebody WATCHING is a reason to keep the monitor open: an RTSP client, a
+* WebRTC session (an `encoded` subscriber), an audio listener. The detection
+* pipeline is deliberately NOT one — it subscribes decoded frames for as long
+* as a stream exists, so counting it would keep the robot's relay open, on
+* its battery and through the cloud, until the battery died. It rides along
+* while a viewer watches and stops when the monitor closes.
+*/
+function isBrokerBusy(clients) {
+	return clients.rtsp.length > 0 || clients.encoded.length > 0 || clients.audio.length > 0;
+}
+/** Consecutive idle checks; a busy check starts the count over. */
+function nextIdleCount(previous, busy) {
+	return busy ? 0 : previous + 1;
+}
+function shouldCloseForIdle(idleCount) {
+	return idleCount >= 3;
+}
+//#endregion
 //#region src/devices/dreame-navigation-actions.ts
 /** Forward throttle magnitude for a full-forward nudge (device speed units). */
 var FORWARD_SPEED = 200;
@@ -96537,60 +96560,6 @@ function resolveNavigationFeatures(overrides) {
 function resolveDisabledEntryIds(overrides) {
 	return new Set([...DREAME_NAVIGATION_DISABLED_ENTRY_IDS, ...overrides?.disabledEntryIds ?? []]);
 }
-//#endregion
-//#region src/devices/dreame-navigation-ptz-adapter.ts
-/** A gimbal descriptor for a robot: the joystick is pan/tilt, there is no lens. */
-function ptzOptionsFromFeatures(features) {
-	return {
-		hasPan: features.move,
-		hasTilt: features.move,
-		hasZoom: false,
-		supportsPresets: features.runAction || features.playSound,
-		hasAutofocus: false
-	};
-}
-/** Every ENABLED dictionary entry is a preset; the label is the preset name. */
-function presetsFromCatalog(entries, features) {
-	return entries.filter((entry) => entry.enabled).filter((entry) => entry.kind === "action" ? features.runAction : features.playSound).map((entry) => ({
-		id: entry.id,
-		name: entry.label
-	}));
-}
-/**
-* Resolve a preset id back to the navigation call. `null` when the id names
-* nothing enabled — the caller rejects rather than guessing an action.
-*/
-function presetTarget(entries, presetId) {
-	const entry = entries.find((candidate) => candidate.id === presetId && candidate.enabled);
-	if (!entry) return null;
-	if (entry.kind === "sound") return entry.soundId === void 0 ? null : {
-		kind: "sound",
-		soundId: entry.soundId
-	};
-	const parsed = NavigationActionIdSchema.safeParse(entry.id);
-	return parsed.success ? {
-		kind: "action",
-		actionId: parsed.data
-	} : null;
-}
-function clampAxis(value) {
-	if (value === void 0 || !Number.isFinite(value)) return void 0;
-	return Math.max(-1, Math.min(1, value));
-}
-/**
-* A PTZ move is a navigation nudge: pan turns, tilt drives, zoom has no
-* meaning on a chassis and is dropped. Axes are clamped to the cap's [-1, 1].
-*/
-function ptzMoveToNavigation(cmd) {
-	const pan = clampAxis(cmd.pan);
-	const tilt = clampAxis(cmd.tilt);
-	const speed = cmd.speed === void 0 || !Number.isFinite(cmd.speed) ? void 0 : Math.max(0, Math.min(1, cmd.speed));
-	return {
-		...pan !== void 0 ? { pan } : {},
-		...tilt !== void 0 ? { tilt } : {},
-		...speed !== void 0 ? { speed } : {}
-	};
-}
 /** The camera-service fill-light mode/level property. */
 var FILL_LIGHT_SET_SIID = 10001;
 /** The wire value that means "auto" on `fillinLightSet`. */
@@ -96639,14 +96608,30 @@ function decodeNavigationReadback(read) {
 //#endregion
 //#region src/devices/dreame-camera-device.ts
 var CAP_NAME$12 = "navigation";
+/**
+* The slice as WRITTEN: the cap's runtime-state shape (status + `lastFetchedAt`).
+* `setCapState` validates against it, so a status-only object throws at
+* activation and registers nothing — which is how the first deploy shipped
+* a camera with no navigation and no PTZ.
+*/
 var NAV_COLD_START = {
 	mode: "unknown",
 	following: false,
 	flash: false,
 	lightMode: "auto",
 	lightLevel: 100,
-	lastChangedAt: 0
+	lastChangedAt: 0,
+	lastFetchedAt: 0
 };
+/** The next slice: the previous one, the patch, and both clocks stamped `now`. */
+function navigationSlice(prev, patch, now) {
+	return {
+		...prev,
+		...patch,
+		lastChangedAt: now,
+		lastFetchedAt: now
+	};
+}
 /**
 * Dreame CAMERA + NAVIGATION device — a SEPARATE camstack device from the
 * `DreameVacuumDevice`, spawned only for camera-capable vacuums (those whose
@@ -96672,11 +96657,10 @@ var NAV_COLD_START = {
 * read-back lands, from the commands this device issued. `following` has no
 * confirmed read-back yet and stays command-driven.
 *
-* PTZ MIMIC: the same device also registers `ptz`, projected from `navigation`
-* through `dreame-navigation-ptz-adapter.ts` (pure, tested) — the joystick is
-* pan/tilt, the enabled actions and sounds are the presets, there is no zoom
-* and no autofocus. `navigation` stays the source of truth; nothing is stored
-* on the PTZ side.
+* `navigation` is its own capability, deliberately NOT projected as `ptz`: a
+* gimbal and a chassis are different physical models, and the operator asked
+* for two separate things (admin UI: two tabs; viewer: one panel that shows the
+* navigation controls when the device has the cap).
 */
 var DreameCameraDevice = class extends DreameChildDevice {
 	features = [DeviceFeature.BatteryOperated];
@@ -96687,7 +96671,148 @@ var DreameCameraDevice = class extends DreameChildDevice {
 		const provider = this.buildNavigationProvider();
 		this.ctx.registerNativeCap(navigationCapability, provider);
 		this.runtimeState.setCapState(CAP_NAME$12, NAV_COLD_START);
-		this.ctx.registerNativeCap(ptzCapability, this.buildPtzMimic(provider));
+		this.registerBatteryCap();
+		this.registerStreamCatalogCap();
+	}
+	/** The relay the current `open()` handed out; null while the monitor is closed. */
+	session = null;
+	/** A single in-flight `open()` — two plays must not cold-start the robot twice. */
+	opening = null;
+	idleTimer = null;
+	idleCount = 0;
+	/** Last time the robot said anything (a state change) — the wake refusal's evidence. */
+	lastContactAt = null;
+	registerBatteryCap() {
+		this.ctx.registerNativeCap(batteryCapability, { wakeForStream: async ({ timeoutMs }) => this.wakeForStream(timeoutMs) });
+		this.publishBattery();
+		this.runtimeState.subscribeCap(batteryCapability.name, (slice) => {
+			if (!slice) return;
+			this.ctx.eventBus.emit(createEvent(EventCategory.BatteryOnStatusChanged, {
+				type: "device",
+				id: this.stableId
+			}, {
+				deviceId: this.id,
+				status: slice
+			}));
+		});
+	}
+	registerStreamCatalogCap() {
+		this.ctx.registerNativeCap(streamCatalogCapability, { getCatalog: async ({ deviceId }) => deviceId === this.id ? cameraStreamCatalog(this.session) : [] });
+		this.publishCatalog();
+	}
+	publishBattery() {
+		const handle = this.resolveHandle();
+		const vacuum = handle instanceof VacuumDevice ? handle : null;
+		this.setCapSlice(batteryCapability, cameraBatterySlice({
+			level: vacuum?.battery ?? null,
+			charging: vacuum?.charging ?? null,
+			streamOpen: this.session !== null,
+			now: Date.now(),
+			contactAt: this.lastContactAt
+		}));
+	}
+	publishCatalog() {
+		this.runtimeState.setCapState(streamCatalogCapability.name, {
+			descriptors: [...cameraStreamCatalog(this.session)],
+			lastFetchedAt: Date.now()
+		});
+	}
+	/**
+	* `battery.wakeForStream`: open the monitor inside the caller's bound. An
+	* open that outlives the bound keeps running — the next play joins it.
+	*/
+	async wakeForStream(timeoutMs) {
+		const startedAt = Date.now();
+		if (this.session !== null) return {
+			awoke: true,
+			durationMs: 0
+		};
+		const opened = this.openStream().then(() => "open", () => "failed");
+		const bound = new Promise((resolve) => {
+			setTimeout(() => resolve("timeout"), timeoutMs).unref?.();
+		});
+		const outcome = await Promise.race([opened, bound]);
+		if (outcome === "timeout") this.ctx.logger.info("robot camera: the wake outlived its bound — the open keeps running", {
+			tags: { deviceId: this.id },
+			meta: { timeoutMs }
+		});
+		return {
+			awoke: outcome === "open",
+			durationMs: Date.now() - startedAt
+		};
+	}
+	openStream() {
+		if (this.opening !== null) return this.opening;
+		const run = (async () => {
+			const startedAt = Date.now();
+			try {
+				const handle = await (await this.requireController()).open();
+				this.session = { url: handle.rtmpUrl };
+				this.idleCount = 0;
+				this.publishBattery();
+				this.publishCatalog();
+				this.startIdleWatch();
+				this.ctx.logger.info("robot camera: monitor open, relay published to the catalog", {
+					tags: { deviceId: this.id },
+					meta: { openMs: Date.now() - startedAt }
+				});
+			} catch (err) {
+				this.ctx.logger.warn("robot camera: monitor could not be opened", {
+					tags: { deviceId: this.id },
+					meta: {
+						openMs: Date.now() - startedAt,
+						error: errMsg(err)
+					}
+				});
+				throw err;
+			}
+		})();
+		this.opening = run.finally(() => {
+			this.opening = null;
+		});
+		return this.opening;
+	}
+	async closeStream(reason) {
+		this.stopIdleWatch();
+		if (this.session === null) return;
+		this.session = null;
+		this.publishBattery();
+		this.publishCatalog();
+		this.ctx.logger.info("robot camera: monitor closed", {
+			tags: { deviceId: this.id },
+			meta: { reason }
+		});
+		const pending = this.controller;
+		if (pending === null) return;
+		await pending.then((controller) => controller.close()).catch((err) => {
+			this.ctx.logger.debug("robot camera: close reported an error", {
+				tags: { deviceId: this.id },
+				meta: {
+					reason,
+					error: errMsg(err)
+				}
+			});
+		});
+	}
+	startIdleWatch() {
+		this.stopIdleWatch();
+		this.idleTimer = setInterval(() => {
+			this.checkIdle();
+		}, IDLE_CHECK_MS);
+		this.idleTimer.unref?.();
+	}
+	stopIdleWatch() {
+		if (this.idleTimer !== null) clearInterval(this.idleTimer);
+		this.idleTimer = null;
+		this.idleCount = 0;
+	}
+	/** Ask the broker whether anybody is still watching; no broker at all counts as idle. */
+	async checkIdle() {
+		if (this.session === null) return;
+		const clients = await this.ctx.api.streamBroker.listClients.query({ brokerId: `${String(this.id)}/${CAMERA_STREAM_ID}` }).catch(() => null);
+		const busy = clients !== null && isBrokerBusy(clients);
+		this.idleCount = nextIdleCount(this.idleCount, busy);
+		if (shouldCloseForIdle(this.idleCount)) await this.closeStream("idle");
 	}
 	buildNavigationProvider() {
 		return {
@@ -96737,81 +96862,19 @@ var DreameCameraDevice = class extends DreameChildDevice {
 			}
 		};
 	}
-	/**
-	* `ptz` projected from `navigation` (the PTZ-mimic adapter). Every call
-	* forwards to the navigation provider through the pure mapping; a preset
-	* that names nothing enabled is rejected, never guessed.
-	*/
-	buildPtzMimic(nav) {
-		const deviceId = this.id;
-		const noGimbal = (what) => {
-			throw new Error(`DreameCameraDevice: a robot camera has no ${what}`);
-		};
-		return {
-			getStatus: async () => ({
-				pan: 0,
-				tilt: 0,
-				zoom: 0,
-				autofocus: false
-			}),
-			getPosition: async () => ({
-				pan: 0,
-				tilt: 0,
-				zoom: 0
-			}),
-			getOptions: async () => ptzOptionsFromFeatures(await nav.getFeatures({ deviceId })),
-			move: async (cmd) => {
-				await nav.move({
-					deviceId,
-					...ptzMoveToNavigation(cmd)
-				});
-			},
-			continuousMove: async (cmd) => {
-				await nav.move({
-					deviceId,
-					...ptzMoveToNavigation(cmd)
-				});
-			},
-			stop: async () => {
-				await nav.stop({ deviceId });
-			},
-			goHome: async () => {
-				await nav.runAction({
-					deviceId,
-					actionId: "goHome"
-				});
-			},
-			getPresets: async () => presetsFromCatalog(await nav.listActions({ deviceId }), await nav.getFeatures({ deviceId })),
-			goToPreset: async ({ presetId }) => {
-				const target = presetTarget(await nav.listActions({ deviceId }), presetId);
-				if (target === null) throw new Error(`DreameCameraDevice: unknown or disabled navigation preset "${presetId}"`);
-				if (target.kind === "sound") await nav.playSound({
-					deviceId,
-					soundId: target.soundId
-				});
-				else await nav.runAction({
-					deviceId,
-					actionId: target.actionId
-				});
-			},
-			savePreset: async () => noGimbal("saved preset — its presets are its actions"),
-			deletePreset: async () => noGimbal("deletable preset — its presets are its actions"),
-			setAutofocus: async () => noGimbal("autofocus")
-		};
-	}
 	recomputeSlice() {
 		const handle = this.resolveHandle();
 		if (handle === null) return;
+		this.lastContactAt = Date.now();
+		this.publishBattery();
 		const prev = this.runtimeState.getCapState(CAP_NAME$12) ?? NAV_COLD_START;
 		const readback = handle instanceof VacuumDevice ? decodeNavigationReadback((siid, piid) => handle.getProperty(siid, piid)?.value) : {};
 		const following = handle instanceof VacuumDevice ? decodeFollowing(handle.status) : null;
-		this.runtimeState.setCapState(CAP_NAME$12, {
-			...prev,
+		this.runtimeState.setCapState(CAP_NAME$12, navigationSlice(prev, {
 			...readback,
 			...following !== null ? { following } : {},
-			mode: following === true ? "following" : this.deriveMode(handle),
-			lastChangedAt: Date.now()
-		});
+			mode: following === true ? "following" : this.deriveMode(handle)
+		}, Date.now()));
 	}
 	controller = null;
 	controllerHandle = null;
@@ -96826,7 +96889,16 @@ var DreameCameraDevice = class extends DreameChildDevice {
 		if (this.controller === null || this.controllerHandle !== handle) {
 			const accessCode = this.config.get("navigationAccessCode");
 			this.controllerHandle = handle;
-			this.controller = handle.createCameraController(accessCode !== void 0 && accessCode !== "" ? { accessCode } : {}).catch((err) => {
+			this.controller = handle.createCameraController({
+				...accessCode !== void 0 && accessCode !== "" ? { accessCode } : {},
+				onKeepAliveError: (err) => {
+					this.ctx.logger.warn("robot camera: relay keep-alive failed — closing the monitor", {
+						tags: { deviceId: this.id },
+						meta: { error: errMsg(err) }
+					});
+					this.closeStream("keep-alive");
+				}
+			}).catch((err) => {
 				this.controller = null;
 				this.controllerHandle = null;
 				throw err;
@@ -96840,6 +96912,7 @@ var DreameCameraDevice = class extends DreameChildDevice {
 	}
 	async removeDevice() {
 		await super.removeDevice();
+		await this.closeStream("removed");
 		const pending = this.controller;
 		this.controller = null;
 		this.controllerHandle = null;
@@ -96901,11 +96974,7 @@ var DreameCameraDevice = class extends DreameChildDevice {
 	*/
 	patchStatus(patch) {
 		const prev = this.runtimeState.getCapState(CAP_NAME$12) ?? NAV_COLD_START;
-		this.runtimeState.setCapState(CAP_NAME$12, {
-			...prev,
-			...patch,
-			lastChangedAt: Date.now()
-		});
+		this.runtimeState.setCapState(CAP_NAME$12, navigationSlice(prev, patch, Date.now()));
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-dreame",
-  "version": "0.2.71",
+  "version": "0.2.72",
   "description": "Dreame robot-vacuum / lawn-mower device-provider addon for CamStack — wraps the @apocaliss92/nodedreame Dreamehome cloud client",
   "keywords": [
     "camstack",