@camstack/addon-provider-hikvision 1.2.4 → 1.2.5

package/dist/addon.js

@@ -12991,6 +12991,12 @@ var motionCooldownMsField = {
 	default: 3e4,
 	step: 500
 };
+var maxSessionHoldMsField = {
+	min: 0,
+	max: 6e5,
+	default: 12e4,
+	step: 5e3
+};
 var motionFpsField = {
 	min: 1,
 	max: 30,
@@ -13138,6 +13144,19 @@ var RunnerCameraConfigSchema = object({
 		"on-motion"
 	]).default("always-on"),
 	motionCooldownMs: number().min(motionCooldownMsField.min).default(motionCooldownMsField.default),
+	/**
+	* Orchestrator-side on-motion session-hold cap (ms). While an on-motion
+	* detection session is active and ≥1 confirmed non-stationary track is
+	* still live, the orchestrator keeps the session open past
+	* `motionCooldownMs` (a slowly-moving subject can stop re-triggering the
+	* camera's VMD yet is still being tracked frame-to-frame) — up to this many
+	* ms since the session opened, after which it closes regardless. `0`
+	* disables the hold (legacy cooldown-only teardown). Not consumed by the
+	* runner itself — carried here so it shares the per-camera device-settings
+	* surface with `motionCooldownMs`; the orchestrator reads it off the
+	* resolved `CameraDetectionConfig`.
+	*/
+	maxSessionHoldMs: number().min(maxSessionHoldMsField.min).max(maxSessionHoldMsField.max).optional(),
 	motionFps: number().min(motionFpsField.min).max(motionFpsField.max).default(motionFpsField.default),
 	detectionFps: number().min(detectionFpsField.min).max(detectionFpsField.max).default(detectionFpsField.default),
 	motionStreamId: string(),
@@ -13227,7 +13246,7 @@ var RunnerCameraConfigSchema = object({
 	*/
 	inferenceDevices: array(RunnerInferenceDeviceSchema).readonly().optional()
 });
-motionFpsField.min, motionFpsField.max, motionFpsField.step, motionFpsField.default, detectionFpsField.min, detectionFpsField.max, detectionFpsField.step, detectionFpsField.default, motionCooldownMsField.min, motionCooldownMsField.max, motionCooldownMsField.step, motionCooldownMsField.default, occupancyRecheckSecField.min, occupancyRecheckSecField.max, occupancyRecheckSecField.step, occupancyRecheckSecField.default, occupancyRecheckFramesField.min, occupancyRecheckFramesField.max, occupancyRecheckFramesField.step, occupancyRecheckFramesField.default;
+motionFpsField.min, motionFpsField.max, motionFpsField.step, motionFpsField.default, detectionFpsField.min, detectionFpsField.max, detectionFpsField.step, detectionFpsField.default, motionCooldownMsField.min, motionCooldownMsField.max, motionCooldownMsField.step, motionCooldownMsField.default, maxSessionHoldMsField.min, maxSessionHoldMsField.max, maxSessionHoldMsField.step, maxSessionHoldMsField.default, occupancyRecheckSecField.min, occupancyRecheckSecField.max, occupancyRecheckSecField.step, occupancyRecheckSecField.default, occupancyRecheckFramesField.min, occupancyRecheckFramesField.max, occupancyRecheckFramesField.step, occupancyRecheckFramesField.default;
 /**
 * Runtime load summary returned by `getLocalLoad`. Used by the orchestrator's
 * load-balancing levels (L2 capacity-based, L3 hardware-aware) to decide
@@ -19996,7 +20015,10 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
 }), method(object({
 	eventId: string(),
 	kind: MediaFileKindEnum.optional()
-}), array(MediaFileSchema).readonly()), method(object({ trackId: string() }), array(MediaFileSchema).readonly()), method(SearchObjectEventsInput, array(ScoredObjectEventSchema).readonly()), object({
+}), array(MediaFileSchema).readonly()), method(object({
+	trackId: string(),
+	kinds: array(MediaFileKindEnum).optional()
+}), array(MediaFileSchema).readonly()), method(SearchObjectEventsInput, array(ScoredObjectEventSchema).readonly()), object({
 	deviceId: number(),
 	timestamp: number(),
 	frameWidth: number(),
@@ -31194,13 +31216,44 @@ function parseTwoWayAudioChannels(xml) {
 	return out;
 }
 /**
+* Idle watchdog for the alarm stream. Hikvision firmware emits a keep-alive
+* heartbeat (typically a `videoloss`/`inactive` alert) roughly every ~5s even
+* when nothing is happening, so a total absence of ANY bytes for this long
+* means the pipe is dead — either a half-open TCP connection (no FIN, no data)
+* that would otherwise block `reader.read()` forever, or a stalled proxy/NAT
+* conntrack entry between the hub and a camera on a different subnet. When it
+* fires we cancel the reader, surfacing a clean stream-end that the reconnect
+* path treats as a recoverable disconnect.
+*/
+var ALARM_STREAM_IDLE_TIMEOUT_MS = 3e4;
+/**
 * Subscribe to the camera's alarm stream. Returns an `AbortController`
 * — `controller.abort()` tears the subscription down. Reconnect logic
 * is the caller's responsibility (we keep the parser simple and let
 * the device class own the lifecycle / backoff timing).
-*/
-function subscribeAlarms(client, handlers) {
+*
+* Every terminal outcome that is NOT a deliberate `controller.abort()` is
+* reported through `onError` exactly once, so the caller's reconnect logic
+* always fires:
+*   - HTTP / boundary failure at subscribe time,
+*   - a thrown error while pumping,
+*   - AND a clean stream-end (`done`). Hikvision cameras recycle the
+*     alertStream HTTP connection periodically (firmware keep-alive limits,
+*     internal event-subsystem restarts, or an idle NAT/proxy hop closing the
+*     socket). A clean close used to fall through silently — `onError` never
+*     fired, the caller's `alarmController` stayed non-null, and the device
+*     never resubscribed — so motion stopped permanently until the provider
+*     restarted. Treating clean-end as a recoverable disconnect closes that gap.
+*/
+function subscribeAlarms(client, handlers, idleTimeoutMs = ALARM_STREAM_IDLE_TIMEOUT_MS) {
 	const controller = new AbortController();
+	let settled = false;
+	const fail = (err) => {
+		if (settled) return;
+		settled = true;
+		if (controller.signal.aborted) return;
+		handlers.onError(err);
+	};
 	(async () => {
 		try {
 			const res = await client.request("/ISAPI/Event/notification/alertStream", {
@@ -31209,20 +31262,20 @@ function subscribeAlarms(client, handlers) {
 				timeoutMs: null
 			});
 			if (!res.ok || !res.body) {
-				handlers.onError(/* @__PURE__ */ new Error(`alarm stream HTTP ${res.status}`));
+				fail(/* @__PURE__ */ new Error(`alarm stream HTTP ${res.status}`));
 				return;
 			}
 			const ct = res.headers.get("content-type") ?? "";
 			const boundary = parseBoundary(ct);
 			if (!boundary) {
-				handlers.onError(/* @__PURE__ */ new Error(`alarm stream missing multipart boundary in Content-Type: "${ct}"`));
+				fail(/* @__PURE__ */ new Error(`alarm stream missing multipart boundary in Content-Type: "${ct}"`));
 				return;
 			}
 			handlers.onConnected?.();
-			await pumpAlarmStream(res.body, boundary, handlers);
+			await pumpAlarmStream(res.body, boundary, handlers, idleTimeoutMs);
+			fail(/* @__PURE__ */ new Error("alarm stream ended"));
 		} catch (err) {
-			if (controller.signal.aborted) return;
-			handlers.onError(err);
+			fail(err);
 		}
 	})();
 	return controller;
@@ -31231,14 +31284,24 @@ function parseBoundary(contentType) {
 	const m = /boundary\s*=\s*"?([^";\s]+)"?/i.exec(contentType);
 	return m ? m[1].trim() : null;
 }
-async function pumpAlarmStream(stream, boundary, handlers) {
+async function pumpAlarmStream(stream, boundary, handlers, idleTimeoutMs = ALARM_STREAM_IDLE_TIMEOUT_MS) {
 	const reader = stream.getReader();
 	const dashBoundary = `--${boundary}`;
 	let bufferedBytes = new Uint8Array(0);
+	let idleTimer = null;
+	const armIdle = () => {
+		if (idleTimeoutMs <= 0) return;
+		if (idleTimer) clearTimeout(idleTimer);
+		idleTimer = setTimeout(() => {
+			reader.cancel().catch(() => {});
+		}, idleTimeoutMs);
+	};
 	try {
+		armIdle();
 		while (true) {
 			const { value, done } = await reader.read();
 			if (done) break;
+			armIdle();
 			if (!value || value.byteLength === 0) continue;
 			bufferedBytes = concat(bufferedBytes, value);
 			const parts = splitOnBoundary(bufferedBytes, dashBoundary);
@@ -31253,6 +31316,7 @@ async function pumpAlarmStream(stream, boundary, handlers) {
 			}
 		}
 	} finally {
+		if (idleTimer) clearTimeout(idleTimer);
 		try {
 			reader.releaseLock();
 		} catch {}

package/dist/addon.mjs

@@ -12992,6 +12992,12 @@ var motionCooldownMsField = {
 	default: 3e4,
 	step: 500
 };
+var maxSessionHoldMsField = {
+	min: 0,
+	max: 6e5,
+	default: 12e4,
+	step: 5e3
+};
 var motionFpsField = {
 	min: 1,
 	max: 30,
@@ -13139,6 +13145,19 @@ var RunnerCameraConfigSchema = object({
 		"on-motion"
 	]).default("always-on"),
 	motionCooldownMs: number().min(motionCooldownMsField.min).default(motionCooldownMsField.default),
+	/**
+	* Orchestrator-side on-motion session-hold cap (ms). While an on-motion
+	* detection session is active and ≥1 confirmed non-stationary track is
+	* still live, the orchestrator keeps the session open past
+	* `motionCooldownMs` (a slowly-moving subject can stop re-triggering the
+	* camera's VMD yet is still being tracked frame-to-frame) — up to this many
+	* ms since the session opened, after which it closes regardless. `0`
+	* disables the hold (legacy cooldown-only teardown). Not consumed by the
+	* runner itself — carried here so it shares the per-camera device-settings
+	* surface with `motionCooldownMs`; the orchestrator reads it off the
+	* resolved `CameraDetectionConfig`.
+	*/
+	maxSessionHoldMs: number().min(maxSessionHoldMsField.min).max(maxSessionHoldMsField.max).optional(),
 	motionFps: number().min(motionFpsField.min).max(motionFpsField.max).default(motionFpsField.default),
 	detectionFps: number().min(detectionFpsField.min).max(detectionFpsField.max).default(detectionFpsField.default),
 	motionStreamId: string(),
@@ -13228,7 +13247,7 @@ var RunnerCameraConfigSchema = object({
 	*/
 	inferenceDevices: array(RunnerInferenceDeviceSchema).readonly().optional()
 });
-motionFpsField.min, motionFpsField.max, motionFpsField.step, motionFpsField.default, detectionFpsField.min, detectionFpsField.max, detectionFpsField.step, detectionFpsField.default, motionCooldownMsField.min, motionCooldownMsField.max, motionCooldownMsField.step, motionCooldownMsField.default, occupancyRecheckSecField.min, occupancyRecheckSecField.max, occupancyRecheckSecField.step, occupancyRecheckSecField.default, occupancyRecheckFramesField.min, occupancyRecheckFramesField.max, occupancyRecheckFramesField.step, occupancyRecheckFramesField.default;
+motionFpsField.min, motionFpsField.max, motionFpsField.step, motionFpsField.default, detectionFpsField.min, detectionFpsField.max, detectionFpsField.step, detectionFpsField.default, motionCooldownMsField.min, motionCooldownMsField.max, motionCooldownMsField.step, motionCooldownMsField.default, maxSessionHoldMsField.min, maxSessionHoldMsField.max, maxSessionHoldMsField.step, maxSessionHoldMsField.default, occupancyRecheckSecField.min, occupancyRecheckSecField.max, occupancyRecheckSecField.step, occupancyRecheckSecField.default, occupancyRecheckFramesField.min, occupancyRecheckFramesField.max, occupancyRecheckFramesField.step, occupancyRecheckFramesField.default;
 /**
 * Runtime load summary returned by `getLocalLoad`. Used by the orchestrator's
 * load-balancing levels (L2 capacity-based, L3 hardware-aware) to decide
@@ -19997,7 +20016,10 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
 }), method(object({
 	eventId: string(),
 	kind: MediaFileKindEnum.optional()
-}), array(MediaFileSchema).readonly()), method(object({ trackId: string() }), array(MediaFileSchema).readonly()), method(SearchObjectEventsInput, array(ScoredObjectEventSchema).readonly()), object({
+}), array(MediaFileSchema).readonly()), method(object({
+	trackId: string(),
+	kinds: array(MediaFileKindEnum).optional()
+}), array(MediaFileSchema).readonly()), method(SearchObjectEventsInput, array(ScoredObjectEventSchema).readonly()), object({
 	deviceId: number(),
 	timestamp: number(),
 	frameWidth: number(),
@@ -31195,13 +31217,44 @@ function parseTwoWayAudioChannels(xml) {
 	return out;
 }
 /**
+* Idle watchdog for the alarm stream. Hikvision firmware emits a keep-alive
+* heartbeat (typically a `videoloss`/`inactive` alert) roughly every ~5s even
+* when nothing is happening, so a total absence of ANY bytes for this long
+* means the pipe is dead — either a half-open TCP connection (no FIN, no data)
+* that would otherwise block `reader.read()` forever, or a stalled proxy/NAT
+* conntrack entry between the hub and a camera on a different subnet. When it
+* fires we cancel the reader, surfacing a clean stream-end that the reconnect
+* path treats as a recoverable disconnect.
+*/
+var ALARM_STREAM_IDLE_TIMEOUT_MS = 3e4;
+/**
 * Subscribe to the camera's alarm stream. Returns an `AbortController`
 * — `controller.abort()` tears the subscription down. Reconnect logic
 * is the caller's responsibility (we keep the parser simple and let
 * the device class own the lifecycle / backoff timing).
-*/
-function subscribeAlarms(client, handlers) {
+*
+* Every terminal outcome that is NOT a deliberate `controller.abort()` is
+* reported through `onError` exactly once, so the caller's reconnect logic
+* always fires:
+*   - HTTP / boundary failure at subscribe time,
+*   - a thrown error while pumping,
+*   - AND a clean stream-end (`done`). Hikvision cameras recycle the
+*     alertStream HTTP connection periodically (firmware keep-alive limits,
+*     internal event-subsystem restarts, or an idle NAT/proxy hop closing the
+*     socket). A clean close used to fall through silently — `onError` never
+*     fired, the caller's `alarmController` stayed non-null, and the device
+*     never resubscribed — so motion stopped permanently until the provider
+*     restarted. Treating clean-end as a recoverable disconnect closes that gap.
+*/
+function subscribeAlarms(client, handlers, idleTimeoutMs = ALARM_STREAM_IDLE_TIMEOUT_MS) {
 	const controller = new AbortController();
+	let settled = false;
+	const fail = (err) => {
+		if (settled) return;
+		settled = true;
+		if (controller.signal.aborted) return;
+		handlers.onError(err);
+	};
 	(async () => {
 		try {
 			const res = await client.request("/ISAPI/Event/notification/alertStream", {
@@ -31210,20 +31263,20 @@ function subscribeAlarms(client, handlers) {
 				timeoutMs: null
 			});
 			if (!res.ok || !res.body) {
-				handlers.onError(/* @__PURE__ */ new Error(`alarm stream HTTP ${res.status}`));
+				fail(/* @__PURE__ */ new Error(`alarm stream HTTP ${res.status}`));
 				return;
 			}
 			const ct = res.headers.get("content-type") ?? "";
 			const boundary = parseBoundary(ct);
 			if (!boundary) {
-				handlers.onError(/* @__PURE__ */ new Error(`alarm stream missing multipart boundary in Content-Type: "${ct}"`));
+				fail(/* @__PURE__ */ new Error(`alarm stream missing multipart boundary in Content-Type: "${ct}"`));
 				return;
 			}
 			handlers.onConnected?.();
-			await pumpAlarmStream(res.body, boundary, handlers);
+			await pumpAlarmStream(res.body, boundary, handlers, idleTimeoutMs);
+			fail(/* @__PURE__ */ new Error("alarm stream ended"));
 		} catch (err) {
-			if (controller.signal.aborted) return;
-			handlers.onError(err);
+			fail(err);
 		}
 	})();
 	return controller;
@@ -31232,14 +31285,24 @@ function parseBoundary(contentType) {
 	const m = /boundary\s*=\s*"?([^";\s]+)"?/i.exec(contentType);
 	return m ? m[1].trim() : null;
 }
-async function pumpAlarmStream(stream, boundary, handlers) {
+async function pumpAlarmStream(stream, boundary, handlers, idleTimeoutMs = ALARM_STREAM_IDLE_TIMEOUT_MS) {
 	const reader = stream.getReader();
 	const dashBoundary = `--${boundary}`;
 	let bufferedBytes = new Uint8Array(0);
+	let idleTimer = null;
+	const armIdle = () => {
+		if (idleTimeoutMs <= 0) return;
+		if (idleTimer) clearTimeout(idleTimer);
+		idleTimer = setTimeout(() => {
+			reader.cancel().catch(() => {});
+		}, idleTimeoutMs);
+	};
 	try {
+		armIdle();
 		while (true) {
 			const { value, done } = await reader.read();
 			if (done) break;
+			armIdle();
 			if (!value || value.byteLength === 0) continue;
 			bufferedBytes = concat(bufferedBytes, value);
 			const parts = splitOnBoundary(bufferedBytes, dashBoundary);
@@ -31254,6 +31317,7 @@ async function pumpAlarmStream(stream, boundary, handlers) {
 			}
 		}
 	} finally {
+		if (idleTimer) clearTimeout(idleTimer);
 		try {
 			reader.releaseLock();
 		} catch {}

package/package.json

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