@camstack/addon-provider-hikvision 1.2.136 → 1.2.137

package/dist/addon.js

@@ -15166,7 +15166,17 @@ var SiteZoneSchema = object({
 var ProviderStatusSchema = object({
 	connected: boolean(),
 	deviceCount: number(),
-	error: string().optional()
+	error: string().optional(),
+	/**
+	* `'orchestrator'`: this provider writes NO camera's `motion` runtime slice
+	* — the orchestrator is its only writer (D696). Set by `BaseDeviceProvider`,
+	* which every provider bundles, so only a provider BUILT from D696-amended
+	* code says it. ABSENT means an older provider that may still write it (raw
+	* VMD writes, a boot seed), and the orchestrator's provider gate keeps that
+	* provider's cameras unwritten (`camera-sensors/motion-slice-provider-gate.ts`)
+	* — the provider twin of the runner's `getLocalLoad().motionSliceWriter`.
+	*/
+	motionSliceWriter: literal("orchestrator").optional()
 });
 object({
 	externalId: string(),
@@ -20647,6 +20657,29 @@ object({
 	firstAt: number(),
 	lastAt: number()
 });
+var NC_ALARM_TRIGGERED_MAX_SEC = 3600;
+var NcAlarmDelaySecSchema = number().int().min(0).max(600);
+var NcAlarmTriggeredSecSchema = number().int().min(0).max(NC_ALARM_TRIGGERED_MAX_SEC);
+var uniqueModes = (entries) => new Set(entries.map((e) => e.mode)).size === entries.length;
+var NcAlarmModeDelaysListSchema = array(object({
+	mode: AlarmArmModeSchema,
+	exitDelaySec: NcAlarmDelaySecSchema.optional(),
+	entryDelaySec: NcAlarmDelaySecSchema.optional(),
+	triggeredDurationSec: NcAlarmTriggeredSecSchema.optional()
+})).max(8).refine(uniqueModes, { message: "modeDelays: at most one entry per arm mode" });
+var NcAlarmModeDelaysEditListSchema = array(object({
+	mode: AlarmArmModeSchema,
+	exitDelaySec: NcAlarmDelaySecSchema.nullable().optional(),
+	entryDelaySec: NcAlarmDelaySecSchema.nullable().optional(),
+	triggeredDurationSec: NcAlarmTriggeredSecSchema.nullable().optional()
+})).max(8).refine(uniqueModes, { message: "modeDelays: at most one edit per arm mode" });
+/** One switch of the alarm table: put ONE device on, or take it off, ONE mode's list. */
+var NcAlarmNonBlockingEditSchema = object({
+	mode: AlarmArmModeSchema,
+	deviceId: number().int().positive(),
+	/** true = on the list (may be open, does not block); false = off the list (blocks). */
+	nonBlocking: boolean()
+});
 /**
 * The per-mode lists, at most one per mode. Two lists for one mode have no
 * meaning a reader could agree on (union? the last one?), so they are refused
@@ -20655,10 +20688,10 @@ object({
 var NcAlarmNonBlockingListSchema = array(object({
 	mode: AlarmArmModeSchema,
 	deviceIds: array(number().int()).max(200)
-})).max(8).refine((lists) => new Set(lists.map((l) => l.mode)).size === lists.length, { message: "nonBlocking: at most one list per arm mode" });
+})).max(8).refine(uniqueModes, { message: "nonBlocking: at most one list per arm mode" });
 /**
-* The three durations the panel's state machine runs on, who hears about its
-* transitions, and which openings each mode tolerates.
+* The three durations — global, and per mode since D697 — the panel's state
+* machine runs on, who hears about its transitions, and which openings each mode tolerates.
 *
 * They live on the NOTIFICATION-RULES cap, not on `alarm-panel`, on purpose:
 * `alarm-panel` is `deviceNative` and its other provider mirrors somebody
@@ -20668,15 +20701,15 @@ var NcAlarmNonBlockingListSchema = array(object({
 */
 var NcAlarmSettingsSchema = object({
 	/** Grace period between arming and the mode taking effect. 0 = immediate. */
-	exitDelaySec: number().int().min(0).max(600),
+	exitDelaySec: NcAlarmDelaySecSchema,
 	/** Grace period between a trigger and the alarm firing. 0 = immediate. */
-	entryDelaySec: number().int().min(0).max(600),
+	entryDelaySec: NcAlarmDelaySecSchema,
 	/**
 	* How long `triggered` lasts before the panel re-arms itself.
 	* **0 = until an operator disarms it** — the behaviour before this field
 	* existed, and therefore what an untouched install keeps doing.
 	*/
-	triggeredDurationSec: number().int().min(0).max(3600),
+	triggeredDurationSec: NcAlarmTriggeredSecSchema,
 	/**
 	* Deprecated by D630 — every transition is announced. Parsed, never read;
 	* remove after one release. Optional so an older admin's patch (which still
@@ -20699,17 +20732,30 @@ var NcAlarmSettingsSchema = object({
 	* per mode is meaningful. Defaulted to `[]` so a blob stored before D630
 	* parses as "every opening blocks" — the behaviour it was written under.
 	*/
-	nonBlocking: NcAlarmNonBlockingListSchema.default([])
+	nonBlocking: NcAlarmNonBlockingListSchema.default([]),
+	/**
+	* Per arm mode, the delays that mode OVERRIDES (D697). A mode with no entry, or an entry
+	* without a field, uses the global value above — so `[]`, the default, is exactly the
+	* behaviour of a blob stored before this field existed. Read through `resolveModeDelays`.
+	*/
+	modeDelays: NcAlarmModeDelaysListSchema.default([])
 });
 /**
 * Every field optional — a tab edits one control at a time.
 *
-* `nonBlocking` is re-declared WITHOUT its default: `.partial()` does not
-* remove an inner `.default()`, so a patch that never named the field would
-* parse to `nonBlocking: []` and wipe every mode's list on an unrelated edit
-* (the same trap {@link NcRulePatchSchema} documents).
+* `nonBlocking` and `modeDelays` are re-declared WITHOUT their defaults:
+* `.partial()` does not remove an inner `.default()`, so a patch that never
+* named the field would parse to `[]` and wipe every mode's list on an
+* unrelated edit (the same trap {@link NcRulePatchSchema} documents). Here
+* `modeDelays` means EDITS, not the stored overrides.
 */
-var NcAlarmSettingsPatchSchema = NcAlarmSettingsSchema.extend({ nonBlocking: NcAlarmNonBlockingListSchema }).partial();
+var NcAlarmSettingsPatchSchema = NcAlarmSettingsSchema.extend({
+	nonBlocking: NcAlarmNonBlockingListSchema,
+	/** Per-mode, per-field edits — NOT the whole list (see NcAlarmModeDelaysEditSchema). */
+	modeDelays: NcAlarmModeDelaysEditListSchema,
+	/** ONE membership change; the panel applies it to the list it holds at its turn. */
+	nonBlockingEdit: NcAlarmNonBlockingEditSchema
+}).partial().refine((p) => p.nonBlocking === void 0 || p.nonBlockingEdit === void 0, { message: "nonBlocking and nonBlockingEdit are exclusive — send the whole lists or one edit" });
 /**
 * What one arm mode actually arms, DERIVED from the enabled rules gated on it.
 * Never authored, never stored — see `alarm-mode-coverage.ts` for why a stored
@@ -20809,6 +20855,28 @@ var NcAlarmConfigSchema = object({
 	*/
 	live: NcAlarmLiveSchema.optional()
 });
+var NcAlarmSensorReadingSchema = _enum([
+	"open",
+	"closed",
+	"unknown",
+	"not-opening"
+]);
+/** One device's state as the alarm reads it — the classifier the arm check uses. */
+var NcAlarmSensorStateSchema = object({
+	deviceId: number().int().positive(),
+	reading: NcAlarmSensorReadingSchema,
+	/** The word as read (`open`, `closed`, `unlocked`, `stopped`, …); null when unknown / not an opening. */
+	state: string().nullable(),
+	/** Why `unknown`: the read failed, or the slice holds no word its cap defines (a placeholder included). */
+	unknownWhy: _enum(["read-failed", "unknown-word"]).nullable(),
+	/** The device manager's liveness as the centre mirrors it; null = not known. */
+	online: boolean().nullable()
+});
+var NcAlarmSensorsInputSchema = object({ deviceIds: array(number().int().positive()).max(500) });
+var NcAlarmSensorsSchema = object({
+	sensors: array(NcAlarmSensorStateSchema),
+	readAt: number().int().nonnegative()
+});
 /**
 * ONE rule's demand on ONE camera's clip ring.
 *
@@ -20899,7 +20967,7 @@ method(object({}), object({ rules: array(NcRuleSchema) }), { auth: "admin" }), m
 }), method(object({}), NcAlarmConfigSchema, { auth: "admin" }), method(object({ patch: NcAlarmSettingsPatchSchema }), NcAlarmConfigSchema, {
 	kind: "mutation",
 	auth: "admin"
-});
+}), method(NcAlarmSensorsInputSchema, NcAlarmSensorsSchema, { auth: "admin" });
 /**
 * Zod schemas for persisted record types.
 *
@@ -41222,13 +41290,14 @@ var BaseDeviceProvider = class extends BaseAddon {
 	async getStatus() {
 		const all = await this.ctx.kernel.devices?.getAll() ?? [];
 		const summary = this.restoreFailureSummary();
-		if (summary === null) return {
+		const base = {
 			connected: true,
-			deviceCount: all.length
+			deviceCount: all.length,
+			motionSliceWriter: "orchestrator"
 		};
+		if (summary === null) return base;
 		return {
-			connected: true,
-			deviceCount: all.length,
+			...base,
 			error: summary
 		};
 	}
@@ -46882,6 +46951,12 @@ Object.freeze({
 		addonId: null,
 		access: "view"
 	},
+	"notificationRules.getAlarmSensors": {
+		capName: "notification-rules",
+		capScope: "system",
+		addonId: null,
+		access: "view"
+	},
 	"notificationRules.getClipRetentionAsks": {
 		capName: "notification-rules",
 		capScope: "system",
@@ -51365,6 +51440,11 @@ Object.freeze({
 		form: "single",
 		optional: false
 	}],
+	"notificationRules.getAlarmSensors": [{
+		name: "deviceIds",
+		form: "array",
+		optional: false
+	}],
 	"notificationRules.setDeviceMuted": [{
 		name: "deviceId",
 		form: "single",

package/dist/addon.mjs

@@ -15145,7 +15145,17 @@ var SiteZoneSchema = object({
 var ProviderStatusSchema = object({
 	connected: boolean(),
 	deviceCount: number(),
-	error: string().optional()
+	error: string().optional(),
+	/**
+	* `'orchestrator'`: this provider writes NO camera's `motion` runtime slice
+	* — the orchestrator is its only writer (D696). Set by `BaseDeviceProvider`,
+	* which every provider bundles, so only a provider BUILT from D696-amended
+	* code says it. ABSENT means an older provider that may still write it (raw
+	* VMD writes, a boot seed), and the orchestrator's provider gate keeps that
+	* provider's cameras unwritten (`camera-sensors/motion-slice-provider-gate.ts`)
+	* — the provider twin of the runner's `getLocalLoad().motionSliceWriter`.
+	*/
+	motionSliceWriter: literal("orchestrator").optional()
 });
 object({
 	externalId: string(),
@@ -20626,6 +20636,29 @@ object({
 	firstAt: number(),
 	lastAt: number()
 });
+var NC_ALARM_TRIGGERED_MAX_SEC = 3600;
+var NcAlarmDelaySecSchema = number().int().min(0).max(600);
+var NcAlarmTriggeredSecSchema = number().int().min(0).max(NC_ALARM_TRIGGERED_MAX_SEC);
+var uniqueModes = (entries) => new Set(entries.map((e) => e.mode)).size === entries.length;
+var NcAlarmModeDelaysListSchema = array(object({
+	mode: AlarmArmModeSchema,
+	exitDelaySec: NcAlarmDelaySecSchema.optional(),
+	entryDelaySec: NcAlarmDelaySecSchema.optional(),
+	triggeredDurationSec: NcAlarmTriggeredSecSchema.optional()
+})).max(8).refine(uniqueModes, { message: "modeDelays: at most one entry per arm mode" });
+var NcAlarmModeDelaysEditListSchema = array(object({
+	mode: AlarmArmModeSchema,
+	exitDelaySec: NcAlarmDelaySecSchema.nullable().optional(),
+	entryDelaySec: NcAlarmDelaySecSchema.nullable().optional(),
+	triggeredDurationSec: NcAlarmTriggeredSecSchema.nullable().optional()
+})).max(8).refine(uniqueModes, { message: "modeDelays: at most one edit per arm mode" });
+/** One switch of the alarm table: put ONE device on, or take it off, ONE mode's list. */
+var NcAlarmNonBlockingEditSchema = object({
+	mode: AlarmArmModeSchema,
+	deviceId: number().int().positive(),
+	/** true = on the list (may be open, does not block); false = off the list (blocks). */
+	nonBlocking: boolean()
+});
 /**
 * The per-mode lists, at most one per mode. Two lists for one mode have no
 * meaning a reader could agree on (union? the last one?), so they are refused
@@ -20634,10 +20667,10 @@ object({
 var NcAlarmNonBlockingListSchema = array(object({
 	mode: AlarmArmModeSchema,
 	deviceIds: array(number().int()).max(200)
-})).max(8).refine((lists) => new Set(lists.map((l) => l.mode)).size === lists.length, { message: "nonBlocking: at most one list per arm mode" });
+})).max(8).refine(uniqueModes, { message: "nonBlocking: at most one list per arm mode" });
 /**
-* The three durations the panel's state machine runs on, who hears about its
-* transitions, and which openings each mode tolerates.
+* The three durations — global, and per mode since D697 — the panel's state
+* machine runs on, who hears about its transitions, and which openings each mode tolerates.
 *
 * They live on the NOTIFICATION-RULES cap, not on `alarm-panel`, on purpose:
 * `alarm-panel` is `deviceNative` and its other provider mirrors somebody
@@ -20647,15 +20680,15 @@ var NcAlarmNonBlockingListSchema = array(object({
 */
 var NcAlarmSettingsSchema = object({
 	/** Grace period between arming and the mode taking effect. 0 = immediate. */
-	exitDelaySec: number().int().min(0).max(600),
+	exitDelaySec: NcAlarmDelaySecSchema,
 	/** Grace period between a trigger and the alarm firing. 0 = immediate. */
-	entryDelaySec: number().int().min(0).max(600),
+	entryDelaySec: NcAlarmDelaySecSchema,
 	/**
 	* How long `triggered` lasts before the panel re-arms itself.
 	* **0 = until an operator disarms it** — the behaviour before this field
 	* existed, and therefore what an untouched install keeps doing.
 	*/
-	triggeredDurationSec: number().int().min(0).max(3600),
+	triggeredDurationSec: NcAlarmTriggeredSecSchema,
 	/**
 	* Deprecated by D630 — every transition is announced. Parsed, never read;
 	* remove after one release. Optional so an older admin's patch (which still
@@ -20678,17 +20711,30 @@ var NcAlarmSettingsSchema = object({
 	* per mode is meaningful. Defaulted to `[]` so a blob stored before D630
 	* parses as "every opening blocks" — the behaviour it was written under.
 	*/
-	nonBlocking: NcAlarmNonBlockingListSchema.default([])
+	nonBlocking: NcAlarmNonBlockingListSchema.default([]),
+	/**
+	* Per arm mode, the delays that mode OVERRIDES (D697). A mode with no entry, or an entry
+	* without a field, uses the global value above — so `[]`, the default, is exactly the
+	* behaviour of a blob stored before this field existed. Read through `resolveModeDelays`.
+	*/
+	modeDelays: NcAlarmModeDelaysListSchema.default([])
 });
 /**
 * Every field optional — a tab edits one control at a time.
 *
-* `nonBlocking` is re-declared WITHOUT its default: `.partial()` does not
-* remove an inner `.default()`, so a patch that never named the field would
-* parse to `nonBlocking: []` and wipe every mode's list on an unrelated edit
-* (the same trap {@link NcRulePatchSchema} documents).
+* `nonBlocking` and `modeDelays` are re-declared WITHOUT their defaults:
+* `.partial()` does not remove an inner `.default()`, so a patch that never
+* named the field would parse to `[]` and wipe every mode's list on an
+* unrelated edit (the same trap {@link NcRulePatchSchema} documents). Here
+* `modeDelays` means EDITS, not the stored overrides.
 */
-var NcAlarmSettingsPatchSchema = NcAlarmSettingsSchema.extend({ nonBlocking: NcAlarmNonBlockingListSchema }).partial();
+var NcAlarmSettingsPatchSchema = NcAlarmSettingsSchema.extend({
+	nonBlocking: NcAlarmNonBlockingListSchema,
+	/** Per-mode, per-field edits — NOT the whole list (see NcAlarmModeDelaysEditSchema). */
+	modeDelays: NcAlarmModeDelaysEditListSchema,
+	/** ONE membership change; the panel applies it to the list it holds at its turn. */
+	nonBlockingEdit: NcAlarmNonBlockingEditSchema
+}).partial().refine((p) => p.nonBlocking === void 0 || p.nonBlockingEdit === void 0, { message: "nonBlocking and nonBlockingEdit are exclusive — send the whole lists or one edit" });
 /**
 * What one arm mode actually arms, DERIVED from the enabled rules gated on it.
 * Never authored, never stored — see `alarm-mode-coverage.ts` for why a stored
@@ -20788,6 +20834,28 @@ var NcAlarmConfigSchema = object({
 	*/
 	live: NcAlarmLiveSchema.optional()
 });
+var NcAlarmSensorReadingSchema = _enum([
+	"open",
+	"closed",
+	"unknown",
+	"not-opening"
+]);
+/** One device's state as the alarm reads it — the classifier the arm check uses. */
+var NcAlarmSensorStateSchema = object({
+	deviceId: number().int().positive(),
+	reading: NcAlarmSensorReadingSchema,
+	/** The word as read (`open`, `closed`, `unlocked`, `stopped`, …); null when unknown / not an opening. */
+	state: string().nullable(),
+	/** Why `unknown`: the read failed, or the slice holds no word its cap defines (a placeholder included). */
+	unknownWhy: _enum(["read-failed", "unknown-word"]).nullable(),
+	/** The device manager's liveness as the centre mirrors it; null = not known. */
+	online: boolean().nullable()
+});
+var NcAlarmSensorsInputSchema = object({ deviceIds: array(number().int().positive()).max(500) });
+var NcAlarmSensorsSchema = object({
+	sensors: array(NcAlarmSensorStateSchema),
+	readAt: number().int().nonnegative()
+});
 /**
 * ONE rule's demand on ONE camera's clip ring.
 *
@@ -20878,7 +20946,7 @@ method(object({}), object({ rules: array(NcRuleSchema) }), { auth: "admin" }), m
 }), method(object({}), NcAlarmConfigSchema, { auth: "admin" }), method(object({ patch: NcAlarmSettingsPatchSchema }), NcAlarmConfigSchema, {
 	kind: "mutation",
 	auth: "admin"
-});
+}), method(NcAlarmSensorsInputSchema, NcAlarmSensorsSchema, { auth: "admin" });
 /**
 * Zod schemas for persisted record types.
 *
@@ -41201,13 +41269,14 @@ var BaseDeviceProvider = class extends BaseAddon {
 	async getStatus() {
 		const all = await this.ctx.kernel.devices?.getAll() ?? [];
 		const summary = this.restoreFailureSummary();
-		if (summary === null) return {
+		const base = {
 			connected: true,
-			deviceCount: all.length
+			deviceCount: all.length,
+			motionSliceWriter: "orchestrator"
 		};
+		if (summary === null) return base;
 		return {
-			connected: true,
-			deviceCount: all.length,
+			...base,
 			error: summary
 		};
 	}
@@ -46861,6 +46930,12 @@ Object.freeze({
 		addonId: null,
 		access: "view"
 	},
+	"notificationRules.getAlarmSensors": {
+		capName: "notification-rules",
+		capScope: "system",
+		addonId: null,
+		access: "view"
+	},
 	"notificationRules.getClipRetentionAsks": {
 		capName: "notification-rules",
 		capScope: "system",
@@ -51344,6 +51419,11 @@ Object.freeze({
 		form: "single",
 		optional: false
 	}],
+	"notificationRules.getAlarmSensors": [{
+		name: "deviceIds",
+		form: "array",
+		optional: false
+	}],
 	"notificationRules.setDeviceMuted": [{
 		name: "deviceId",
 		form: "single",

package/package.json

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