@camstack/addon-provider-dreame 0.1.3 → 0.1.4

package/dist/addon.js

@@ -73204,10 +73204,66 @@ function decodeVacuumTanks(caps) {
 		dustBin: caps?.canAutoEmpty ? present : null
 	};
 }
+/**
+* Clamp a raw consumable percentage to `[0, 100]`, or return `null` when the
+* value is absent / non-finite. The library reports remaining life as a 0..100
+* integer; we clamp defensively so an out-of-range firmware value never violates
+* the cap schema.
+*/
+function clampConsumablePct(value) {
+	if (value === null || !Number.isFinite(value)) return null;
+	return Math.max(0, Math.min(100, value));
+}
+/**
+* Build the `consumables` cap runtime-state slice from a live {@link VacuumDevice}
+* handle. The returned object satisfies the cap's `runtimeState` schema
+* (`ConsumablesStatusSchema.extend({ lastFetchedAt: z.number() })`).
+*
+* Always present: main-brush / filter (every Dreame vacuum has both).
+* Conditional: side-brush — only included when the model capability record
+* (`vacuumCapabilities.hasSideBrush`) confirms hardware presence, so a brush-less
+* model does not report a phantom consumable.
+*
+* The library exposes NO per-consumable reset action (no MIoT action id for
+* resetting brushes/filter in the current property maps), so all items report
+* `resettable: false`.
+*/
+function buildVacuumConsumables(vacuum) {
+	const baseItems = [{
+		key: "main-brush",
+		label: "Main Brush",
+		level: clampConsumablePct(vacuum.mainBrushLeftPct),
+		status: null,
+		lastResetAt: null,
+		resettable: false
+	}, {
+		key: "filter",
+		label: "Filter",
+		level: clampConsumablePct(vacuum.filterLeftPct),
+		status: null,
+		lastResetAt: null,
+		resettable: false
+	}];
+	const sideBrushItem = vacuum.vacuumCapabilities.hasSideBrush ? {
+		key: "side-brush",
+		label: "Side Brush",
+		level: clampConsumablePct(vacuum.sideBrushLeftPct),
+		status: null,
+		lastResetAt: null,
+		resettable: false
+	} : null;
+	const now = Date.now();
+	return {
+		items: sideBrushItem !== null ? [...baseItems, sideBrushItem] : [...baseItems],
+		lastChangedAt: now,
+		lastFetchedAt: now
+	};
+}
 //#endregion
 //#region src/devices/dreame-vacuum-device.ts
 var CAP_NAME$1 = "vacuum-control";
-var COLD_START$1 = {
+var CONSUMABLES_CAP_NAME = "consumables";
+var CONTROL_COLD_START = {
 	state: "idle",
 	batteryLevel: null,
 	fanSpeed: null,
@@ -73218,9 +73274,15 @@ var COLD_START$1 = {
 	dustBin: null,
 	lastChangedAt: 0
 };
+var CONSUMABLES_COLD_START = {
+	items: [],
+	lastChangedAt: 0,
+	lastFetchedAt: 0
+};
 /**
-* Dreame robot-vacuum device. Registers the `vacuum-control` cap and maps the
-* library `VacuumDevice` getters → the cap slice on every `stateChanged` push.
+* Dreame robot-vacuum device. Registers the `vacuum-control` and `consumables`
+* caps and maps the library `VacuumDevice` getters → the cap slices on every
+* `stateChanged` push.
 *
 * Commands route to the live handle: `start`→`startCleaning()`, `pause`→
 * `pause()`, `stop`→`stop()`, `returnToBase`→`dock()`, `locate`→`locate()`,
@@ -73233,8 +73295,12 @@ var COLD_START$1 = {
 * level, not a tank fill) plus brush/filter consumable life. We therefore map
 * tank PRESENCE only (from the model capability flags via `decodeVacuumTanks`):
 * a present tank reports `{ level: null, status: null }` (exists, level unknown)
-* and an absent tank reports `null`. Consumable life (brush/filter %) has no
-* field on the `vacuum-control` cap, so it is intentionally not surfaced.
+* and an absent tank reports `null`.
+*
+* Consumables: main-brush / filter (always present), side-brush (conditional on
+* `vacuumCapabilities.hasSideBrush`). The library exposes no MIoT reset action
+* for consumables, so all items report `resettable: false` and `reset()` is a
+* no-op that throws.
 *
 * Map data: the library exposes `lastMap` / `currentSegmentId` (a room/segment
 * list), but no existing camstack cap models a vacuum room map — surfacing it
@@ -73252,7 +73318,7 @@ var DreameVacuumDevice = class extends DreameChildDevice {
 	}
 	registerControlCap() {
 		this.ctx.registerNativeCap(vacuumControlCapability, {
-			getStatus: async () => this.runtimeState.getCapState(CAP_NAME$1) ?? COLD_START$1,
+			getStatus: async () => this.runtimeState.getCapState(CAP_NAME$1) ?? CONTROL_COLD_START,
 			start: async () => {
 				await this.requireVacuum().startCleaning();
 			},
@@ -73275,13 +73341,36 @@ var DreameVacuumDevice = class extends DreameChildDevice {
 				await vacuum.setSuction(level);
 			}
 		});
-		this.runtimeState.setCapState(CAP_NAME$1, COLD_START$1);
+		this.runtimeState.setCapState(CAP_NAME$1, CONTROL_COLD_START);
+		this.registerConsumablesCap();
+	}
+	/**
+	* Register the `consumables` cap. The provider surfaces remaining life % for
+	* main-brush / filter (always present) and side-brush (model-conditional).
+	*
+	* The library exposes no MIoT reset action for consumables, so `reset()` throws
+	* an informative error on every call — all items are marked `resettable: false`
+	* so the UI suppresses the reset button and the mutation is a guard-only path.
+	*/
+	registerConsumablesCap() {
+		this.ctx.registerNativeCap(consumablesCapability, {
+			getStatus: async () => this.runtimeState.getCapState(CONSUMABLES_CAP_NAME) ?? CONSUMABLES_COLD_START,
+			reset: async ({ key }) => {
+				throw new Error(`dreame vacuum: consumable reset not supported (item="${key}", device=${this.dreameDeviceId})`);
+			}
+		});
+		this.runtimeState.setCapState(CONSUMABLES_CAP_NAME, CONSUMABLES_COLD_START);
 	}
+	/**
+	* `registerControlCap()` (called by `super.onActivate()`) already registers
+	* the consumables cap before the parent seeds the first slice via
+	* `recomputeSlice()`. No additional work needed here; the override is removed.
+	*/
 	recomputeSlice() {
 		const vacuum = this.resolveVacuum();
 		if (vacuum === null) return;
 		const tanks = decodeVacuumTanks(vacuum.vacuumCapabilities);
-		const slice = {
+		const controlSlice = {
 			state: mapMiotStateToVacuumState(vacuum.status),
 			batteryLevel: clampBatteryLevel$1(vacuum.battery),
 			fanSpeed: suctionLevelToken(vacuum.suction),
@@ -73292,7 +73381,9 @@ var DreameVacuumDevice = class extends DreameChildDevice {
 			dustBin: tanks.dustBin,
 			lastChangedAt: Date.now()
 		};
-		this.runtimeState.setCapState(CAP_NAME$1, slice);
+		this.runtimeState.setCapState(CAP_NAME$1, controlSlice);
+		const consumablesSlice = buildVacuumConsumables(vacuum);
+		this.runtimeState.setCapState(CONSUMABLES_CAP_NAME, consumablesSlice);
 	}
 	/** The live typed vacuum handle, or throw a clear error when disconnected. */
 	requireVacuum() {

package/dist/addon.mjs

@@ -73204,10 +73204,66 @@ function decodeVacuumTanks(caps) {
 		dustBin: caps?.canAutoEmpty ? present : null
 	};
 }
+/**
+* Clamp a raw consumable percentage to `[0, 100]`, or return `null` when the
+* value is absent / non-finite. The library reports remaining life as a 0..100
+* integer; we clamp defensively so an out-of-range firmware value never violates
+* the cap schema.
+*/
+function clampConsumablePct(value) {
+	if (value === null || !Number.isFinite(value)) return null;
+	return Math.max(0, Math.min(100, value));
+}
+/**
+* Build the `consumables` cap runtime-state slice from a live {@link VacuumDevice}
+* handle. The returned object satisfies the cap's `runtimeState` schema
+* (`ConsumablesStatusSchema.extend({ lastFetchedAt: z.number() })`).
+*
+* Always present: main-brush / filter (every Dreame vacuum has both).
+* Conditional: side-brush — only included when the model capability record
+* (`vacuumCapabilities.hasSideBrush`) confirms hardware presence, so a brush-less
+* model does not report a phantom consumable.
+*
+* The library exposes NO per-consumable reset action (no MIoT action id for
+* resetting brushes/filter in the current property maps), so all items report
+* `resettable: false`.
+*/
+function buildVacuumConsumables(vacuum) {
+	const baseItems = [{
+		key: "main-brush",
+		label: "Main Brush",
+		level: clampConsumablePct(vacuum.mainBrushLeftPct),
+		status: null,
+		lastResetAt: null,
+		resettable: false
+	}, {
+		key: "filter",
+		label: "Filter",
+		level: clampConsumablePct(vacuum.filterLeftPct),
+		status: null,
+		lastResetAt: null,
+		resettable: false
+	}];
+	const sideBrushItem = vacuum.vacuumCapabilities.hasSideBrush ? {
+		key: "side-brush",
+		label: "Side Brush",
+		level: clampConsumablePct(vacuum.sideBrushLeftPct),
+		status: null,
+		lastResetAt: null,
+		resettable: false
+	} : null;
+	const now = Date.now();
+	return {
+		items: sideBrushItem !== null ? [...baseItems, sideBrushItem] : [...baseItems],
+		lastChangedAt: now,
+		lastFetchedAt: now
+	};
+}
 //#endregion
 //#region src/devices/dreame-vacuum-device.ts
 var CAP_NAME$1 = "vacuum-control";
-var COLD_START$1 = {
+var CONSUMABLES_CAP_NAME = "consumables";
+var CONTROL_COLD_START = {
 	state: "idle",
 	batteryLevel: null,
 	fanSpeed: null,
@@ -73218,9 +73274,15 @@ var COLD_START$1 = {
 	dustBin: null,
 	lastChangedAt: 0
 };
+var CONSUMABLES_COLD_START = {
+	items: [],
+	lastChangedAt: 0,
+	lastFetchedAt: 0
+};
 /**
-* Dreame robot-vacuum device. Registers the `vacuum-control` cap and maps the
-* library `VacuumDevice` getters → the cap slice on every `stateChanged` push.
+* Dreame robot-vacuum device. Registers the `vacuum-control` and `consumables`
+* caps and maps the library `VacuumDevice` getters → the cap slices on every
+* `stateChanged` push.
 *
 * Commands route to the live handle: `start`→`startCleaning()`, `pause`→
 * `pause()`, `stop`→`stop()`, `returnToBase`→`dock()`, `locate`→`locate()`,
@@ -73233,8 +73295,12 @@ var COLD_START$1 = {
 * level, not a tank fill) plus brush/filter consumable life. We therefore map
 * tank PRESENCE only (from the model capability flags via `decodeVacuumTanks`):
 * a present tank reports `{ level: null, status: null }` (exists, level unknown)
-* and an absent tank reports `null`. Consumable life (brush/filter %) has no
-* field on the `vacuum-control` cap, so it is intentionally not surfaced.
+* and an absent tank reports `null`.
+*
+* Consumables: main-brush / filter (always present), side-brush (conditional on
+* `vacuumCapabilities.hasSideBrush`). The library exposes no MIoT reset action
+* for consumables, so all items report `resettable: false` and `reset()` is a
+* no-op that throws.
 *
 * Map data: the library exposes `lastMap` / `currentSegmentId` (a room/segment
 * list), but no existing camstack cap models a vacuum room map — surfacing it
@@ -73252,7 +73318,7 @@ var DreameVacuumDevice = class extends DreameChildDevice {
 	}
 	registerControlCap() {
 		this.ctx.registerNativeCap(vacuumControlCapability, {
-			getStatus: async () => this.runtimeState.getCapState(CAP_NAME$1) ?? COLD_START$1,
+			getStatus: async () => this.runtimeState.getCapState(CAP_NAME$1) ?? CONTROL_COLD_START,
 			start: async () => {
 				await this.requireVacuum().startCleaning();
 			},
@@ -73275,13 +73341,36 @@ var DreameVacuumDevice = class extends DreameChildDevice {
 				await vacuum.setSuction(level);
 			}
 		});
-		this.runtimeState.setCapState(CAP_NAME$1, COLD_START$1);
+		this.runtimeState.setCapState(CAP_NAME$1, CONTROL_COLD_START);
+		this.registerConsumablesCap();
+	}
+	/**
+	* Register the `consumables` cap. The provider surfaces remaining life % for
+	* main-brush / filter (always present) and side-brush (model-conditional).
+	*
+	* The library exposes no MIoT reset action for consumables, so `reset()` throws
+	* an informative error on every call — all items are marked `resettable: false`
+	* so the UI suppresses the reset button and the mutation is a guard-only path.
+	*/
+	registerConsumablesCap() {
+		this.ctx.registerNativeCap(consumablesCapability, {
+			getStatus: async () => this.runtimeState.getCapState(CONSUMABLES_CAP_NAME) ?? CONSUMABLES_COLD_START,
+			reset: async ({ key }) => {
+				throw new Error(`dreame vacuum: consumable reset not supported (item="${key}", device=${this.dreameDeviceId})`);
+			}
+		});
+		this.runtimeState.setCapState(CONSUMABLES_CAP_NAME, CONSUMABLES_COLD_START);
 	}
+	/**
+	* `registerControlCap()` (called by `super.onActivate()`) already registers
+	* the consumables cap before the parent seeds the first slice via
+	* `recomputeSlice()`. No additional work needed here; the override is removed.
+	*/
 	recomputeSlice() {
 		const vacuum = this.resolveVacuum();
 		if (vacuum === null) return;
 		const tanks = decodeVacuumTanks(vacuum.vacuumCapabilities);
-		const slice = {
+		const controlSlice = {
 			state: mapMiotStateToVacuumState(vacuum.status),
 			batteryLevel: clampBatteryLevel$1(vacuum.battery),
 			fanSpeed: suctionLevelToken(vacuum.suction),
@@ -73292,7 +73381,9 @@ var DreameVacuumDevice = class extends DreameChildDevice {
 			dustBin: tanks.dustBin,
 			lastChangedAt: Date.now()
 		};
-		this.runtimeState.setCapState(CAP_NAME$1, slice);
+		this.runtimeState.setCapState(CAP_NAME$1, controlSlice);
+		const consumablesSlice = buildVacuumConsumables(vacuum);
+		this.runtimeState.setCapState(CONSUMABLES_CAP_NAME, consumablesSlice);
 	}
 	/** The live typed vacuum handle, or throw a clear error when disconnected. */
 	requireVacuum() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-dreame",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Dreame robot-vacuum / lawn-mower device-provider addon for CamStack — wraps the @apocaliss92/nodedreame Dreamehome cloud client",
   "keywords": [
     "camstack",
@@ -54,6 +54,9 @@
           },
           {
             "name": "device-adoption"
+          },
+          {
+            "name": "consumables"
           }
         ]
       }