@camstack/addon-provider-hikvision 1.2.73 → 1.2.75

package/dist/addon.js

@@ -7548,7 +7548,8 @@ var CameraSwitchAuthoritySchema = discriminatedUnion("kind", [
 var CameraSwitchUnavailableReasonSchema = _enum([
 	"no-provider",
 	"source-unreachable",
-	"not-configured"
+	"not-configured",
+	"device-disabled"
 ]);
 /**
 * One switch, resolved for one camera.
@@ -23987,12 +23988,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
@@ -24082,7 +24091,7 @@ onStatusChanged: { data: object({
 		kind: "push",
 		empty: {
 			percentage: 0,
-			charging: "none",
+			charging: "unknown",
 			sleeping: false,
 			lastUpdated: 0
 		}
@@ -33836,13 +33845,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);

package/dist/addon.mjs

@@ -7549,7 +7549,8 @@ var CameraSwitchAuthoritySchema = discriminatedUnion("kind", [
 var CameraSwitchUnavailableReasonSchema = _enum([
 	"no-provider",
 	"source-unreachable",
-	"not-configured"
+	"not-configured",
+	"device-disabled"
 ]);
 /**
 * One switch, resolved for one camera.
@@ -23988,12 +23989,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
@@ -24083,7 +24092,7 @@ onStatusChanged: { data: object({
 		kind: "push",
 		empty: {
 			percentage: 0,
-			charging: "none",
+			charging: "unknown",
 			sleeping: false,
 			lastUpdated: 0
 		}
@@ -33837,13 +33846,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-hikvision",
-  "version": "1.2.73",
+  "version": "1.2.75",
   "description": "Hikvision camera device provider addon for CamStack — ISAPI over HTTP(S) with digest auth (snapshot, alarm stream, RTSP discovery)",
   "keywords": [
     "camstack",