@camstack/addon-provider-bosch 0.1.17 → 0.1.19

package/dist/home-connect/addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("../dist-D6D2JO8x.js");
-const require_account_integration_offline = require("../account-integration-offline-pY2Ojv8k.js");
+const require_dist = require("../dist-C5fLGNXK.js");
+const require_account_integration_offline = require("../account-integration-offline-D5EEH5Xn.js");
 let node_crypto = require("node:crypto");
 let node_tls = require("node:tls");
 let node_zlib = require("node:zlib");
@@ -3826,8 +3826,6 @@ var COLD_DISHWASHER_STATUS = {
 	localControlActive: null,
 	powerOn: null,
 	powerState: null,
-	saltLevel: null,
-	rinseAidLevel: null,
 	filterCleaningDue: null,
 	machineCareDue: null,
 	machineCareRemainingRuns: null,
@@ -3885,8 +3883,6 @@ function dishwasherStatusFromFeatures(input) {
 		localControlActive: boolOf(valueOf(input, findEntity(description, ["status"], ["LocalControlActive"]))),
 		powerOn: powerRaw === null ? null : powerRaw === "On",
 		powerState: powerRaw,
-		saltLevel: consumableFromEvents(input, ["SaltNearlyEmpty"], ["SaltEmpty", "SaltLack"]),
-		rinseAidLevel: consumableFromEvents(input, ["RinseAidNearlyEmpty"], ["RinseAidEmpty", "RinseAidLack"]),
 		filterCleaningDue: reminderDue(input, [
 			"SmartFilterCleaningReminder",
 			"CheckFilterSystem",
@@ -3987,6 +3983,44 @@ function dishwasherOptionsFromDescription(input) {
 var HC_COMMAND_PAUSE = "PauseProgram";
 var HC_COMMAND_RESUME = "ResumeProgram";
 var HC_COMMAND_STOP = "AbortProgram";
+/** The dishwasher supplies, by the events that report them. */
+var DISHWASHER_SUPPLIES = [{
+	key: "salt",
+	label: "Salt",
+	nearlyEmpty: ["SaltNearlyEmpty"],
+	empty: ["SaltEmpty", "SaltLack"]
+}, {
+	key: "rinseAid",
+	label: "Rinse aid",
+	nearlyEmpty: ["RinseAidNearlyEmpty"],
+	empty: ["RinseAidEmpty", "RinseAidLack"]
+}];
+/**
+* The dishwasher's `consumables` items (D915): salt and rinse aid as `supply`
+* items, for each the appliance's description lists an event for. Their
+* status comes from those events (`consumableFromEvents`); none reported is
+* `null` (unknown), never `ok`. Neither is resettable — refilling is the reset.
+*
+* `null` while the appliance is offline or undescribed: nothing is known NOW,
+* and the `consumables` slice is restored — the last observation stays rather
+* than being overwritten with unknowns. Pure.
+*/
+function dishwasherConsumablesFromFeatures(view) {
+	if (availabilityOf(view) !== "available") return null;
+	return DISHWASHER_SUPPLIES.flatMap(({ key, label, nearlyEmpty, empty }) => {
+		if (eventStates(view, [...nearlyEmpty, ...empty]).length === 0) return [];
+		return [{
+			key,
+			label,
+			level: null,
+			status: consumableFromEvents(view, nearlyEmpty, empty),
+			kind: "supply",
+			form: "product",
+			lastResetAt: null,
+			resettable: false
+		}];
+	});
+}
 //#endregion
 //#region src/home-connect/home-connect-child-bindings.ts
 /** The capability a bound child registers. */
@@ -4577,6 +4611,15 @@ var homeConnectDishwasherSchema = require_dist.object({
 	integrationId: require_dist.string().optional()
 });
 var DISH_CAP = "dishwasher";
+var CONSUMABLES_CAP = "consumables";
+var CONSUMABLES_EMPTY = {
+	items: [],
+	lastChangedAt: 0,
+	lastFetchedAt: 0
+};
+function sameItems(a, b) {
+	return JSON.stringify(a) === JSON.stringify(b);
+}
 /** The option short names of the boolean setters, in the spellings an appliance uses. */
 var OPTION_NAMES = {
 	halfLoad: ["HalfLoad"],
@@ -4603,6 +4646,7 @@ var HomeConnectDishwasherDevice = class extends require_dist.BaseDevice {
 	async onActivate() {
 		await super.onActivate();
 		this.registerDishwasherCap();
+		this.registerConsumablesCap();
 		this.runtimeState.setCapState(DISH_CAP, COLD_DISHWASHER_STATUS);
 		this.markOnline(false);
 		this.#unwatch = homeConnectConnections.watch(this.#brokerId, this.#haId, (event) => this.recomputeSlice(event));
@@ -4627,13 +4671,41 @@ var HomeConnectDishwasherDevice = class extends require_dist.BaseDevice {
 	recomputeSlice(event) {
 		const previous = this.runtimeState.getCapState(DISH_CAP);
 		const lastValueAt = event.kind === "feature" && !event.key.startsWith("HomeConnect.Info.") && !event.key.startsWith("HomeConnect.Network.") ? Date.now() : previous?.lastFetchedAt ?? 0;
+		const view = this.view();
 		const slice = dishwasherStatusFromFeatures({
-			...this.view(),
+			...view,
 			lastValueAt
 		});
 		this.runtimeState.setCapState(DISH_CAP, slice);
+		this.writeConsumables(dishwasherConsumablesFromFeatures(view));
 		this.markOnline(slice.availability !== "offline");
 	}
+	/**
+	* Salt and rinse aid, as `consumables` items (D915). Written only when they
+	* changed; `null` (offline / undescribed) and an empty list write nothing —
+	* the slice is restored, and "nothing known now" must not erase the last
+	* observation.
+	*/
+	writeConsumables(items) {
+		if (items === null || items.length === 0) return;
+		const previous = this.runtimeState.getCapState(CONSUMABLES_CAP);
+		if (previous !== void 0 && sameItems(previous.items, items)) return;
+		const now = Date.now();
+		const next = {
+			items,
+			lastChangedAt: now,
+			lastFetchedAt: now
+		};
+		this.runtimeState.setCapState(CONSUMABLES_CAP, next);
+	}
+	registerConsumablesCap() {
+		this.ctx.registerNativeCap(require_dist.consumablesCapability, {
+			getStatus: async () => this.runtimeState.getCapState(CONSUMABLES_CAP) ?? CONSUMABLES_EMPTY,
+			reset: async ({ key }) => {
+				throw new Error(`"${key}" has no reset on a dishwasher — refilling it is the reset`);
+			}
+		});
+	}
 	requireClient() {
 		const client = this.client();
 		if (!client) throw new Error("Home Connect client unavailable — the integration is not connected");

package/dist/home-connect/addon.mjs

@@ -1,5 +1,5 @@
-import { A as object, C as defineCustomActions, D as array, E as _enum, F as EventCategory, M as string, N as union, O as literal, P as unknown, S as customAction, T as isSecretMarkerLike, a as binaryCapability, b as errMsg, c as deviceAdoptionCapability, d as eventEmitterCapability, j as record, l as dishwasherCapability, m as powerMeterCapability, n as BaseDeviceProvider, p as numericSensorCapability, r as DishwasherOperationStateSchema, s as connectionTestCapability, t as BaseDevice, u as enumSensorCapability, v as DeviceRole, w as isSecretMarker, x as createEvent, y as DeviceType } from "../dist-C8QaBSuL.mjs";
-import { n as cascadeRemoveDevicesForIntegration, r as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-W-dxoTT1.mjs";
+import { C as customAction, D as _enum, E as isSecretMarkerLike, F as unknown, I as EventCategory, M as record, N as string, O as array, P as union, S as createEvent, T as isSecretMarker, a as binaryCapability, b as DeviceType, c as consumablesCapability, d as enumSensorCapability, f as eventEmitterCapability, h as powerMeterCapability, j as object, k as literal, l as deviceAdoptionCapability, m as numericSensorCapability, n as BaseDeviceProvider, r as DishwasherOperationStateSchema, s as connectionTestCapability, t as BaseDevice, u as dishwasherCapability, w as defineCustomActions, x as errMsg, y as DeviceRole } from "../dist-LGjOHvFG.mjs";
+import { n as cascadeRemoveDevicesForIntegration, r as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-B9spxppg.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { connect } from "node:tls";
 import { inflateRawSync } from "node:zlib";
@@ -3825,8 +3825,6 @@ var COLD_DISHWASHER_STATUS = {
 	localControlActive: null,
 	powerOn: null,
 	powerState: null,
-	saltLevel: null,
-	rinseAidLevel: null,
 	filterCleaningDue: null,
 	machineCareDue: null,
 	machineCareRemainingRuns: null,
@@ -3884,8 +3882,6 @@ function dishwasherStatusFromFeatures(input) {
 		localControlActive: boolOf(valueOf(input, findEntity(description, ["status"], ["LocalControlActive"]))),
 		powerOn: powerRaw === null ? null : powerRaw === "On",
 		powerState: powerRaw,
-		saltLevel: consumableFromEvents(input, ["SaltNearlyEmpty"], ["SaltEmpty", "SaltLack"]),
-		rinseAidLevel: consumableFromEvents(input, ["RinseAidNearlyEmpty"], ["RinseAidEmpty", "RinseAidLack"]),
 		filterCleaningDue: reminderDue(input, [
 			"SmartFilterCleaningReminder",
 			"CheckFilterSystem",
@@ -3986,6 +3982,44 @@ function dishwasherOptionsFromDescription(input) {
 var HC_COMMAND_PAUSE = "PauseProgram";
 var HC_COMMAND_RESUME = "ResumeProgram";
 var HC_COMMAND_STOP = "AbortProgram";
+/** The dishwasher supplies, by the events that report them. */
+var DISHWASHER_SUPPLIES = [{
+	key: "salt",
+	label: "Salt",
+	nearlyEmpty: ["SaltNearlyEmpty"],
+	empty: ["SaltEmpty", "SaltLack"]
+}, {
+	key: "rinseAid",
+	label: "Rinse aid",
+	nearlyEmpty: ["RinseAidNearlyEmpty"],
+	empty: ["RinseAidEmpty", "RinseAidLack"]
+}];
+/**
+* The dishwasher's `consumables` items (D915): salt and rinse aid as `supply`
+* items, for each the appliance's description lists an event for. Their
+* status comes from those events (`consumableFromEvents`); none reported is
+* `null` (unknown), never `ok`. Neither is resettable — refilling is the reset.
+*
+* `null` while the appliance is offline or undescribed: nothing is known NOW,
+* and the `consumables` slice is restored — the last observation stays rather
+* than being overwritten with unknowns. Pure.
+*/
+function dishwasherConsumablesFromFeatures(view) {
+	if (availabilityOf(view) !== "available") return null;
+	return DISHWASHER_SUPPLIES.flatMap(({ key, label, nearlyEmpty, empty }) => {
+		if (eventStates(view, [...nearlyEmpty, ...empty]).length === 0) return [];
+		return [{
+			key,
+			label,
+			level: null,
+			status: consumableFromEvents(view, nearlyEmpty, empty),
+			kind: "supply",
+			form: "product",
+			lastResetAt: null,
+			resettable: false
+		}];
+	});
+}
 //#endregion
 //#region src/home-connect/home-connect-child-bindings.ts
 /** The capability a bound child registers. */
@@ -4576,6 +4610,15 @@ var homeConnectDishwasherSchema = object({
 	integrationId: string().optional()
 });
 var DISH_CAP = "dishwasher";
+var CONSUMABLES_CAP = "consumables";
+var CONSUMABLES_EMPTY = {
+	items: [],
+	lastChangedAt: 0,
+	lastFetchedAt: 0
+};
+function sameItems(a, b) {
+	return JSON.stringify(a) === JSON.stringify(b);
+}
 /** The option short names of the boolean setters, in the spellings an appliance uses. */
 var OPTION_NAMES = {
 	halfLoad: ["HalfLoad"],
@@ -4602,6 +4645,7 @@ var HomeConnectDishwasherDevice = class extends BaseDevice {
 	async onActivate() {
 		await super.onActivate();
 		this.registerDishwasherCap();
+		this.registerConsumablesCap();
 		this.runtimeState.setCapState(DISH_CAP, COLD_DISHWASHER_STATUS);
 		this.markOnline(false);
 		this.#unwatch = homeConnectConnections.watch(this.#brokerId, this.#haId, (event) => this.recomputeSlice(event));
@@ -4626,13 +4670,41 @@ var HomeConnectDishwasherDevice = class extends BaseDevice {
 	recomputeSlice(event) {
 		const previous = this.runtimeState.getCapState(DISH_CAP);
 		const lastValueAt = event.kind === "feature" && !event.key.startsWith("HomeConnect.Info.") && !event.key.startsWith("HomeConnect.Network.") ? Date.now() : previous?.lastFetchedAt ?? 0;
+		const view = this.view();
 		const slice = dishwasherStatusFromFeatures({
-			...this.view(),
+			...view,
 			lastValueAt
 		});
 		this.runtimeState.setCapState(DISH_CAP, slice);
+		this.writeConsumables(dishwasherConsumablesFromFeatures(view));
 		this.markOnline(slice.availability !== "offline");
 	}
+	/**
+	* Salt and rinse aid, as `consumables` items (D915). Written only when they
+	* changed; `null` (offline / undescribed) and an empty list write nothing —
+	* the slice is restored, and "nothing known now" must not erase the last
+	* observation.
+	*/
+	writeConsumables(items) {
+		if (items === null || items.length === 0) return;
+		const previous = this.runtimeState.getCapState(CONSUMABLES_CAP);
+		if (previous !== void 0 && sameItems(previous.items, items)) return;
+		const now = Date.now();
+		const next = {
+			items,
+			lastChangedAt: now,
+			lastFetchedAt: now
+		};
+		this.runtimeState.setCapState(CONSUMABLES_CAP, next);
+	}
+	registerConsumablesCap() {
+		this.ctx.registerNativeCap(consumablesCapability, {
+			getStatus: async () => this.runtimeState.getCapState(CONSUMABLES_CAP) ?? CONSUMABLES_EMPTY,
+			reset: async ({ key }) => {
+				throw new Error(`"${key}" has no reset on a dishwasher — refilling it is the reset`);
+			}
+		});
+	}
 	requireClient() {
 		const client = this.client();
 		if (!client) throw new Error("Home Connect client unavailable — the integration is not connected");

package/dist/homecom/addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("../dist-D6D2JO8x.js");
-const require_account_integration_offline = require("../account-integration-offline-pY2Ojv8k.js");
+const require_dist = require("../dist-C5fLGNXK.js");
+const require_account_integration_offline = require("../account-integration-offline-D5EEH5Xn.js");
 let node_crypto = require("node:crypto");
 //#region src/homecom/custom-actions.ts
 var homeComActions = require_dist.defineCustomActions({

package/dist/homecom/addon.mjs

@@ -1,5 +1,5 @@
-import { A as object, C as defineCustomActions, E as _enum, F as EventCategory, M as string, O as literal, S as customAction, T as isSecretMarkerLike, _ as waterHeaterCapability, b as errMsg, c as deviceAdoptionCapability, n as BaseDeviceProvider, o as climateControlCapability, s as connectionTestCapability, t as BaseDevice, w as isSecretMarker, y as DeviceType } from "../dist-C8QaBSuL.mjs";
-import { n as cascadeRemoveDevicesForIntegration, r as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-W-dxoTT1.mjs";
+import { C as customAction, D as _enum, E as isSecretMarkerLike, I as EventCategory, N as string, T as isSecretMarker, b as DeviceType, j as object, k as literal, l as deviceAdoptionCapability, n as BaseDeviceProvider, o as climateControlCapability, s as connectionTestCapability, t as BaseDevice, v as waterHeaterCapability, w as defineCustomActions, x as errMsg } from "../dist-LGjOHvFG.mjs";
+import { n as cascadeRemoveDevicesForIntegration, r as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-B9spxppg.mjs";
 import { createHash, randomBytes } from "node:crypto";
 //#region src/homecom/custom-actions.ts
 var homeComActions = defineCustomActions({

package/dist/shc/addon.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region \0rolldown/runtime.js
 var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 //#endregion
-const require_dist = require("../dist-D6D2JO8x.js");
+const require_dist = require("../dist-C5fLGNXK.js");
 let node_crypto = require("node:crypto");
 let node_https = require("node:https");
 let node_child_process = require("node:child_process");

package/dist/shc/addon.mjs

@@ -1,4 +1,4 @@
-import { A as object, C as defineCustomActions, D as array, E as _enum, F as EventCategory, M as string, O as literal, S as customAction, b as errMsg, c as deviceAdoptionCapability, f as heatingValveCapability, g as temperatureSensorCapability, h as switchCapability, i as batteryCapability, k as number, n as BaseDeviceProvider, o as climateControlCapability, s as connectionTestCapability, t as BaseDevice, y as DeviceType } from "../dist-C8QaBSuL.mjs";
+import { A as number, C as customAction, D as _enum, I as EventCategory, N as string, O as array, _ as temperatureSensorCapability, b as DeviceType, g as switchCapability, i as batteryCapability, j as object, k as literal, l as deviceAdoptionCapability, n as BaseDeviceProvider, o as climateControlCapability, p as heatingValveCapability, s as connectionTestCapability, t as BaseDevice, w as defineCustomActions, x as errMsg } from "../dist-LGjOHvFG.mjs";
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { request } from "node:https";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-bosch",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "Bosch smart-home device-provider addons for CamStack — SHC, Home Connect, and HomeCom cloud integrations (scaffold)",
   "keywords": [
     "camstack",
@@ -81,6 +81,9 @@
           },
           {
             "name": "dishwasher"
+          },
+          {
+            "name": "consumables"
           }
         ]
       },