@camstack/addon-provider-reolink 1.2.88 → 1.2.90

package/dist/addon.js

@@ -7592,7 +7592,8 @@ var CameraSwitchAuthoritySchema = discriminatedUnion("kind", [
 var CameraSwitchUnavailableReasonSchema = _enum([
 	"no-provider",
 	"source-unreachable",
-	"not-configured"
+	"not-configured",
+	"device-disabled"
 ]);
 /**
 * One switch, resolved for one camera.
@@ -24325,12 +24326,20 @@ var BatteryStatusSchema = object({
 	* Charging source. `'dc'` covers wall/USB adapters; `'solar'` is
 	* Reolink-specific for the Solar Panel 2 accessory (will become
 	* common on other battery cams). `'none'` means running on battery
-	* alone.
+	* alone — a NEGATIVE the firmware actually reported.
+	*
+	* `'unknown'` is the absence of an answer: the provider has not read the
+	* power fields yet, or the firmware reported neither. Before it existed,
+	* two unreadable fields produced `'none'`, and a camera nobody had reached
+	* was drawn "on battery alone" — the same D315 defect `percentage` closed
+	* by going nullable. Consumers SKIP it (no charger state published, no
+	* glyph, no HomeKit ChargingState) rather than coerce it either way.
 	*/
 	charging: _enum([
 		"dc",
 		"solar",
-		"none"
+		"none",
+		"unknown"
 	]),
 	/**
 	* True when the camera firmware has gone into low-power mode. Battery
@@ -24420,7 +24429,7 @@ onStatusChanged: { data: object({
 		kind: "push",
 		empty: {
 			percentage: 0,
-			charging: "none",
+			charging: "unknown",
 			sleeping: false,
 			lastUpdated: 0
 		}
@@ -34128,13 +34137,30 @@ var BaseDeviceProvider = class extends BaseAddon {
 	async onRestoreDevices(savedDevices) {
 		const restored = /* @__PURE__ */ new Set();
 		const failures = [];
+		const liveStableIds = new Set((await this.ctx.kernel.devices.getAll()).map((device) => device.stableId));
 		const attemptRestore = async (saved) => {
 			if (restored.has(saved.id)) return;
+			if (liveStableIds.has(saved.stableId)) {
+				this.ctx.logger.debug("Restore row already live — not dialled again", { tags: {
+					deviceId: saved.id,
+					stableId: saved.stableId
+				} });
+				restored.add(saved.id);
+				return;
+			}
 			const Class = this.deviceClasses[saved.type];
 			if (!Class) throw new Error(`no device class registered for type "${saved.type}"`);
 			if (saved.parentDeviceId !== null && !restored.has(saved.parentDeviceId)) throw new Error(`parent device ${saved.parentDeviceId} not restored`);
 			await this.healSavedConfig(saved, savedDevices);
-			await this.ctx.kernel.devices.create(saved.stableId, Class, {}, saved.parentDeviceId);
+			try {
+				await this.ctx.kernel.devices.create(saved.stableId, Class, {}, saved.parentDeviceId);
+			} catch (err) {
+				if (!(await this.ctx.kernel.devices.getAll()).some((device) => device.stableId === saved.stableId)) throw err;
+				this.ctx.logger.debug("Restore row came to life during its own dial — kept", { tags: {
+					deviceId: saved.id,
+					stableId: saved.stableId
+				} });
+			}
 			restored.add(saved.id);
 		};
 		const topLevel = savedDevices.filter((saved) => saved.parentDeviceId === null);
@@ -231801,13 +231827,15 @@ var reolinkDebugActions = defineCustomActions({ debugRawRead: customAction(RawRe
 * passato da `adapterStatus: 1` a `0`, con `chargeStatus: 0` da entrambe le
 * parti — cioè `chargeStatus` da solo NON distingue i due stati.
 *
-* ⚠️ Questa funzione non sa ancora dire "non lo so": `BatteryStatus['charging']`
-* non ha un valore `unknown`, quindi due campi illeggibili producono `'none'`,
-* che è un valore NEGATIVO al posto di un non-noto. È il difetto D315 che
-* `percentage` ha già chiuso (è `nullable`) e questo campo no; chiuderlo tocca
-* `battery.cap.ts`, cioè la closure del server, e vive nel proprio lavoro.
+* Due campi assenti NON sono `'none'`: `'none'` è un negativo che il firmware
+* ha detto ("nessun adattatore, cella ferma"), l'assenza di entrambi è
+* `'unknown'` — lo stesso confine che `percentage` ha chiuso diventando
+* `nullable` (D315). Il chiamante (`mapBatteryInfo`) non arriva qui con un
+* push che non parla di alimentazione: `reportsPowerSource` lo filtra prima e
+* conserva la convinzione precedente.
 */
 function deriveChargingSource(adapterStatus, chargeStatus) {
+	if (adapterStatus === void 0 && chargeStatus === void 0) return "unknown";
 	const adapter = (adapterStatus ?? "").toLowerCase();
 	const charge = (chargeStatus ?? "").toLowerCase();
 	if (adapter.includes("solar")) return "solar";
@@ -236946,7 +236974,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	mapBatteryInfo(info) {
 		return {
 			percentage: typeof info.batteryPercent === "number" ? Math.max(0, Math.min(100, Math.round(info.batteryPercent))) : this.state.battery.percentage ?? null,
-			charging: reportsPowerSource(info) ? deriveChargingSource(info.adapterStatus, info.chargeStatus) : this.state.battery.charging ?? "none",
+			charging: reportsPowerSource(info) ? deriveChargingSource(info.adapterStatus, info.chargeStatus) : this.state.battery.charging ?? "unknown",
 			sleeping: info.sleeping === true || this.sleeping,
 			lastUpdated: Date.now()
 		};
@@ -243003,6 +243031,69 @@ function asDebugSocketFlags(value) {
 	return Array.isArray(value) ? value.filter((v) => typeof v === "string") : [];
 }
 //#endregion
+//#region src/hub-battery-fields.ts
+/**
+* The hub boundary for the per-channel battery power fields.
+*
+* The Reolink hub/NVR reports `chargeStatus` and `adapterStatus` as NUMBERS
+* (0/1/2); the standalone camera path reports the same facts as strings, and
+* `deriveChargingSource` (`battery-charging.ts`) speaks only the string
+* vocabulary. This module is the translation, and — the part that was
+* missing — it NAMES a code it cannot translate instead of dropping the field
+* silently. A dropped field reads as "the push said nothing about power", so
+* a new firmware value would have kept the previous belief forever, with not
+* one log line. The ledger lets the hub warn once per (device, field, code).
+*/
+var CHARGE_STATUS_BY_CODE = {
+	0: "none",
+	1: "charging",
+	2: "chargeComplete"
+};
+var ADAPTER_STATUS_BY_CODE = {
+	0: "none",
+	1: "dc",
+	2: "solarPanel"
+};
+function mapOne(field, value, byCode) {
+	if (value === void 0 || value === null) return {};
+	if (typeof value === "string") return { mapped: value };
+	if (typeof value === "number") {
+		const mapped = byCode[value];
+		if (mapped !== void 0) return { mapped };
+	}
+	return { unmapped: {
+		field,
+		value
+	} };
+}
+/** Translate one channel's raw CGI power fields; never throws. */
+function mapHubBatteryPower(cgi) {
+	const charge = mapOne("chargeStatus", cgi?.["chargeStatus"], CHARGE_STATUS_BY_CODE);
+	const adapter = mapOne("adapterStatus", cgi?.["adapterStatus"], ADAPTER_STATUS_BY_CODE);
+	return {
+		fields: {
+			...charge.mapped !== void 0 ? { chargeStatus: charge.mapped } : {},
+			...adapter.mapped !== void 0 ? { adapterStatus: adapter.mapped } : {}
+		},
+		unmapped: [...charge.unmapped !== void 0 ? [charge.unmapped] : [], ...adapter.unmapped !== void 0 ? [adapter.unmapped] : []]
+	};
+}
+/**
+* Remembers which (device, field, code) triples were already reported, so a
+* polled read warns once per finding and not once per tick. Unbounded only in
+* theory: the key space is a few cameras times two fields times the handful of
+* codes a firmware can invent.
+*/
+var UnmappedCodeLedger = class {
+	seen = /* @__PURE__ */ new Set();
+	firstSeen(deviceId, field, value) {
+		const key = `${deviceId}:${field}:${String(value)}`;
+		if (this.seen.has(key)) return false;
+		this.seen.add(key);
+		return true;
+	}
+};
+//#endregion
 //#region src/reolink-hub.ts
 var HUB_DISCOVERY_REFRESH_TIMEOUT_MS = 8e3;
 /**
@@ -243064,6 +243155,8 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 	/** One-shot: the raw per-channel battery payload is logged once per
 	*  process so the firmware's charge-field naming is on record. */
 	batteryShapeLogged = false;
+	/** Firmware power codes this hub could not translate — warned once each. */
+	unmappedBatteryCodes = new UnmappedCodeLedger();
 	/** Channels the last successful discovery refresh listed as present but
 	*  NOT adopted — their pushes are expected drops (debug), not faults. */
 	knownUnadoptedChannels = /* @__PURE__ */ new Set();
@@ -243544,10 +243637,21 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 				const child = all.find((d) => d.id === deviceId);
 				if (!(child instanceof ReolinkCamera)) continue;
 				const cgi = info.entries[0];
+				const power = mapHubBatteryPower(cgi);
+				for (const { field, value } of power.unmapped) {
+					if (!this.unmappedBatteryCodes.firstSeen(deviceId, field, value)) continue;
+					this.ctx.logger.warn("Reolink Hub: unmapped battery power code — field dropped", {
+						tags: { deviceId },
+						meta: {
+							channel: Number(chKey),
+							field,
+							value
+						}
+					});
+				}
 				child.applyHubBatteryInfo({
 					batteryPercent: info.batteryLevel,
-					...mapHubChargeStatus(cgi?.["chargeStatus"]) !== void 0 ? { chargeStatus: mapHubChargeStatus(cgi?.["chargeStatus"]) } : {},
-					...mapHubAdapterStatus(cgi?.["adapterStatus"]) !== void 0 ? { adapterStatus: mapHubAdapterStatus(cgi?.["adapterStatus"]) } : {}
+					...power.fields
 				});
 			}
 		} catch (err) {
@@ -243988,18 +244092,6 @@ function discoveredStatusFor(d) {
 *   chargeStatus: 0 none · 1 charging · 2 charge complete
 *   adapterStatus: 0 none · 1 DC adapter · 2 solar panel
 */
-function mapHubChargeStatus(value) {
-	if (typeof value === "string") return value;
-	if (value === 0) return "none";
-	if (value === 1) return "charging";
-	if (value === 2) return "chargeComplete";
-}
-function mapHubAdapterStatus(value) {
-	if (typeof value === "string") return value;
-	if (value === 0) return "none";
-	if (value === 1) return "dc";
-	if (value === 2) return "solarPanel";
-}
 //#endregion
 //#region src/creation-schema.ts
 /**

package/dist/addon.mjs

@@ -7587,7 +7587,8 @@ var CameraSwitchAuthoritySchema = discriminatedUnion("kind", [
 var CameraSwitchUnavailableReasonSchema = _enum([
 	"no-provider",
 	"source-unreachable",
-	"not-configured"
+	"not-configured",
+	"device-disabled"
 ]);
 /**
 * One switch, resolved for one camera.
@@ -24320,12 +24321,20 @@ var BatteryStatusSchema = object({
 	* Charging source. `'dc'` covers wall/USB adapters; `'solar'` is
 	* Reolink-specific for the Solar Panel 2 accessory (will become
 	* common on other battery cams). `'none'` means running on battery
-	* alone.
+	* alone — a NEGATIVE the firmware actually reported.
+	*
+	* `'unknown'` is the absence of an answer: the provider has not read the
+	* power fields yet, or the firmware reported neither. Before it existed,
+	* two unreadable fields produced `'none'`, and a camera nobody had reached
+	* was drawn "on battery alone" — the same D315 defect `percentage` closed
+	* by going nullable. Consumers SKIP it (no charger state published, no
+	* glyph, no HomeKit ChargingState) rather than coerce it either way.
 	*/
 	charging: _enum([
 		"dc",
 		"solar",
-		"none"
+		"none",
+		"unknown"
 	]),
 	/**
 	* True when the camera firmware has gone into low-power mode. Battery
@@ -24415,7 +24424,7 @@ onStatusChanged: { data: object({
 		kind: "push",
 		empty: {
 			percentage: 0,
-			charging: "none",
+			charging: "unknown",
 			sleeping: false,
 			lastUpdated: 0
 		}
@@ -34123,13 +34132,30 @@ var BaseDeviceProvider = class extends BaseAddon {
 	async onRestoreDevices(savedDevices) {
 		const restored = /* @__PURE__ */ new Set();
 		const failures = [];
+		const liveStableIds = new Set((await this.ctx.kernel.devices.getAll()).map((device) => device.stableId));
 		const attemptRestore = async (saved) => {
 			if (restored.has(saved.id)) return;
+			if (liveStableIds.has(saved.stableId)) {
+				this.ctx.logger.debug("Restore row already live — not dialled again", { tags: {
+					deviceId: saved.id,
+					stableId: saved.stableId
+				} });
+				restored.add(saved.id);
+				return;
+			}
 			const Class = this.deviceClasses[saved.type];
 			if (!Class) throw new Error(`no device class registered for type "${saved.type}"`);
 			if (saved.parentDeviceId !== null && !restored.has(saved.parentDeviceId)) throw new Error(`parent device ${saved.parentDeviceId} not restored`);
 			await this.healSavedConfig(saved, savedDevices);
-			await this.ctx.kernel.devices.create(saved.stableId, Class, {}, saved.parentDeviceId);
+			try {
+				await this.ctx.kernel.devices.create(saved.stableId, Class, {}, saved.parentDeviceId);
+			} catch (err) {
+				if (!(await this.ctx.kernel.devices.getAll()).some((device) => device.stableId === saved.stableId)) throw err;
+				this.ctx.logger.debug("Restore row came to life during its own dial — kept", { tags: {
+					deviceId: saved.id,
+					stableId: saved.stableId
+				} });
+			}
 			restored.add(saved.id);
 		};
 		const topLevel = savedDevices.filter((saved) => saved.parentDeviceId === null);
@@ -231781,13 +231807,15 @@ var reolinkDebugActions = defineCustomActions({ debugRawRead: customAction(RawRe
 * passato da `adapterStatus: 1` a `0`, con `chargeStatus: 0` da entrambe le
 * parti — cioè `chargeStatus` da solo NON distingue i due stati.
 *
-* ⚠️ Questa funzione non sa ancora dire "non lo so": `BatteryStatus['charging']`
-* non ha un valore `unknown`, quindi due campi illeggibili producono `'none'`,
-* che è un valore NEGATIVO al posto di un non-noto. È il difetto D315 che
-* `percentage` ha già chiuso (è `nullable`) e questo campo no; chiuderlo tocca
-* `battery.cap.ts`, cioè la closure del server, e vive nel proprio lavoro.
+* Due campi assenti NON sono `'none'`: `'none'` è un negativo che il firmware
+* ha detto ("nessun adattatore, cella ferma"), l'assenza di entrambi è
+* `'unknown'` — lo stesso confine che `percentage` ha chiuso diventando
+* `nullable` (D315). Il chiamante (`mapBatteryInfo`) non arriva qui con un
+* push che non parla di alimentazione: `reportsPowerSource` lo filtra prima e
+* conserva la convinzione precedente.
 */
 function deriveChargingSource(adapterStatus, chargeStatus) {
+	if (adapterStatus === void 0 && chargeStatus === void 0) return "unknown";
 	const adapter = (adapterStatus ?? "").toLowerCase();
 	const charge = (chargeStatus ?? "").toLowerCase();
 	if (adapter.includes("solar")) return "solar";
@@ -236926,7 +236954,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	mapBatteryInfo(info) {
 		return {
 			percentage: typeof info.batteryPercent === "number" ? Math.max(0, Math.min(100, Math.round(info.batteryPercent))) : this.state.battery.percentage ?? null,
-			charging: reportsPowerSource(info) ? deriveChargingSource(info.adapterStatus, info.chargeStatus) : this.state.battery.charging ?? "none",
+			charging: reportsPowerSource(info) ? deriveChargingSource(info.adapterStatus, info.chargeStatus) : this.state.battery.charging ?? "unknown",
 			sleeping: info.sleeping === true || this.sleeping,
 			lastUpdated: Date.now()
 		};
@@ -242983,6 +243011,69 @@ function asDebugSocketFlags(value) {
 	return Array.isArray(value) ? value.filter((v) => typeof v === "string") : [];
 }
 //#endregion
+//#region src/hub-battery-fields.ts
+/**
+* The hub boundary for the per-channel battery power fields.
+*
+* The Reolink hub/NVR reports `chargeStatus` and `adapterStatus` as NUMBERS
+* (0/1/2); the standalone camera path reports the same facts as strings, and
+* `deriveChargingSource` (`battery-charging.ts`) speaks only the string
+* vocabulary. This module is the translation, and — the part that was
+* missing — it NAMES a code it cannot translate instead of dropping the field
+* silently. A dropped field reads as "the push said nothing about power", so
+* a new firmware value would have kept the previous belief forever, with not
+* one log line. The ledger lets the hub warn once per (device, field, code).
+*/
+var CHARGE_STATUS_BY_CODE = {
+	0: "none",
+	1: "charging",
+	2: "chargeComplete"
+};
+var ADAPTER_STATUS_BY_CODE = {
+	0: "none",
+	1: "dc",
+	2: "solarPanel"
+};
+function mapOne(field, value, byCode) {
+	if (value === void 0 || value === null) return {};
+	if (typeof value === "string") return { mapped: value };
+	if (typeof value === "number") {
+		const mapped = byCode[value];
+		if (mapped !== void 0) return { mapped };
+	}
+	return { unmapped: {
+		field,
+		value
+	} };
+}
+/** Translate one channel's raw CGI power fields; never throws. */
+function mapHubBatteryPower(cgi) {
+	const charge = mapOne("chargeStatus", cgi?.["chargeStatus"], CHARGE_STATUS_BY_CODE);
+	const adapter = mapOne("adapterStatus", cgi?.["adapterStatus"], ADAPTER_STATUS_BY_CODE);
+	return {
+		fields: {
+			...charge.mapped !== void 0 ? { chargeStatus: charge.mapped } : {},
+			...adapter.mapped !== void 0 ? { adapterStatus: adapter.mapped } : {}
+		},
+		unmapped: [...charge.unmapped !== void 0 ? [charge.unmapped] : [], ...adapter.unmapped !== void 0 ? [adapter.unmapped] : []]
+	};
+}
+/**
+* Remembers which (device, field, code) triples were already reported, so a
+* polled read warns once per finding and not once per tick. Unbounded only in
+* theory: the key space is a few cameras times two fields times the handful of
+* codes a firmware can invent.
+*/
+var UnmappedCodeLedger = class {
+	seen = /* @__PURE__ */ new Set();
+	firstSeen(deviceId, field, value) {
+		const key = `${deviceId}:${field}:${String(value)}`;
+		if (this.seen.has(key)) return false;
+		this.seen.add(key);
+		return true;
+	}
+};
+//#endregion
 //#region src/reolink-hub.ts
 var HUB_DISCOVERY_REFRESH_TIMEOUT_MS = 8e3;
 /**
@@ -243044,6 +243135,8 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 	/** One-shot: the raw per-channel battery payload is logged once per
 	*  process so the firmware's charge-field naming is on record. */
 	batteryShapeLogged = false;
+	/** Firmware power codes this hub could not translate — warned once each. */
+	unmappedBatteryCodes = new UnmappedCodeLedger();
 	/** Channels the last successful discovery refresh listed as present but
 	*  NOT adopted — their pushes are expected drops (debug), not faults. */
 	knownUnadoptedChannels = /* @__PURE__ */ new Set();
@@ -243524,10 +243617,21 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 				const child = all.find((d) => d.id === deviceId);
 				if (!(child instanceof ReolinkCamera)) continue;
 				const cgi = info.entries[0];
+				const power = mapHubBatteryPower(cgi);
+				for (const { field, value } of power.unmapped) {
+					if (!this.unmappedBatteryCodes.firstSeen(deviceId, field, value)) continue;
+					this.ctx.logger.warn("Reolink Hub: unmapped battery power code — field dropped", {
+						tags: { deviceId },
+						meta: {
+							channel: Number(chKey),
+							field,
+							value
+						}
+					});
+				}
 				child.applyHubBatteryInfo({
 					batteryPercent: info.batteryLevel,
-					...mapHubChargeStatus(cgi?.["chargeStatus"]) !== void 0 ? { chargeStatus: mapHubChargeStatus(cgi?.["chargeStatus"]) } : {},
-					...mapHubAdapterStatus(cgi?.["adapterStatus"]) !== void 0 ? { adapterStatus: mapHubAdapterStatus(cgi?.["adapterStatus"]) } : {}
+					...power.fields
 				});
 			}
 		} catch (err) {
@@ -243968,18 +244072,6 @@ function discoveredStatusFor(d) {
 *   chargeStatus: 0 none · 1 charging · 2 charge complete
 *   adapterStatus: 0 none · 1 DC adapter · 2 solar panel
 */
-function mapHubChargeStatus(value) {
-	if (typeof value === "string") return value;
-	if (value === 0) return "none";
-	if (value === 1) return "charging";
-	if (value === 2) return "chargeComplete";
-}
-function mapHubAdapterStatus(value) {
-	if (typeof value === "string") return value;
-	if (value === 0) return "none";
-	if (value === 1) return "dc";
-	if (value === 2) return "solarPanel";
-}
 //#endregion
 //#region src/creation-schema.ts
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-reolink",
-  "version": "1.2.88",
+  "version": "1.2.90",
   "description": "Reolink camera device provider addon for CamStack — native Baichuan protocol",
   "keywords": [
     "camstack",