@camstack/addon-provider-hikvision 1.2.142 → 1.2.143

package/dist/addon.js

@@ -10802,6 +10802,57 @@ var ClipSearchStrictnessSchema = _enum([
 	"balanced",
 	"strict"
 ]);
+new Set([
+	{
+		id: "person",
+		name: "Person"
+	},
+	{
+		id: "vehicle",
+		name: "Vehicle"
+	},
+	{
+		id: "animal",
+		name: "Animal"
+	},
+	{
+		id: "package",
+		name: "Package"
+	}
+].map((l) => l.id));
+var COCO_TO_MACRO = {
+	mapping: {
+		person: "person",
+		bicycle: "vehicle",
+		car: "vehicle",
+		motorcycle: "vehicle",
+		airplane: "vehicle",
+		bus: "vehicle",
+		train: "vehicle",
+		truck: "vehicle",
+		boat: "vehicle",
+		bird: "animal",
+		cat: "animal",
+		dog: "animal",
+		horse: "animal",
+		sheep: "animal",
+		cow: "animal",
+		elephant: "animal",
+		bear: "animal",
+		zebra: "animal",
+		giraffe: "animal",
+		suitcase: "package",
+		backpack: "package",
+		handbag: "package"
+	},
+	preserveOriginal: false
+};
+/** Steps a root detector may declare it fills. */
+var FILLABLE_STEP_IDS = [
+	"animal-classifier",
+	"vehicle-classifier",
+	"package-detection"
+];
 var MODEL_FORMATS = [
 	"onnx",
 	"coreml",
@@ -10934,6 +10985,12 @@ var ModelLicenseSchema = preprocess((value) => typeof value === "string" ? { wei
 	/** True when the weights or their data forbid commercial use. */
 	nonCommercial: boolean().optional()
 }));
+/** One `fillsClassifierEffects` entry — see `ModelCatalogEntry.fillsClassifierEffects`. */
+var FillsClassifierEffectSchema = object({
+	stepId: _enum(FILLABLE_STEP_IDS),
+	labelToEffect: record(string(), string()),
+	uncovered: array(string()).readonly()
+});
 var ModelCatalogEntrySchema = object({
 	id: string(),
 	name: string(),
@@ -11060,6 +11117,16 @@ var ModelCatalogEntrySchema = object({
 	*/
 	classMap: DetectionCatalogClassMapSchema.optional(),
 	/**
+	* The pipeline steps this ROOT detector already does the work of (D715):
+	* its labels name the effect the step exists to produce (`deer` for
+	* `animal-classifier`, `package` for `package-detection`). Derived from the
+	* labelmap by `deriveClassifierFills`, never hand-written; a COCO model
+	* declares none. Whether a declaration is honoured is the step's own
+	* `labelLink` policy (`resolveLabelLink`). `labelToEffect` values are in
+	* `FILLABLE_STEP_VOCABULARIES` (guard `check-label-link-vocabulary`).
+	*/
+	fillsClassifierEffects: array(FillsClassifierEffectSchema).readonly().optional(),
+	/**
 	* The model's CLIP feature-space contract (text encoder, dimension, vector
 	* index, token window, search floor) — see `clip-model.ts`. Present ONLY on a
 	* CLIP image encoder; its absence is what "not a CLIP model" means to the
@@ -18402,51 +18469,6 @@ method(object({}), array(TargetKindSchema)), method(object({}), array(TargetSche
 	kind: "mutation",
 	auth: "admin"
 });
-new Set([
-	{
-		id: "person",
-		name: "Person"
-	},
-	{
-		id: "vehicle",
-		name: "Vehicle"
-	},
-	{
-		id: "animal",
-		name: "Animal"
-	},
-	{
-		id: "package",
-		name: "Package"
-	}
-].map((l) => l.id));
-var COCO_TO_MACRO = {
-	mapping: {
-		person: "person",
-		bicycle: "vehicle",
-		car: "vehicle",
-		motorcycle: "vehicle",
-		airplane: "vehicle",
-		bus: "vehicle",
-		train: "vehicle",
-		truck: "vehicle",
-		boat: "vehicle",
-		bird: "animal",
-		cat: "animal",
-		dog: "animal",
-		horse: "animal",
-		sheep: "animal",
-		cow: "animal",
-		elephant: "animal",
-		bear: "animal",
-		zebra: "animal",
-		giraffe: "animal",
-		suitcase: "package",
-		backpack: "package",
-		handbag: "package"
-	},
-	preserveOriginal: false
-};
 var AUDIO_MACRO_LABELS = [
 	{
 		id: "speech",
@@ -23888,7 +23910,8 @@ var PipelineModelOptionSchema = object({
 	group: ModelVariantGroupSchema.optional(),
 	legacy: boolean().optional(),
 	provider: ModelProviderIdSchema.optional(),
-	defaultConfidence: number().optional()
+	defaultConfidence: number().optional(),
+	fillsClassifierEffects: array(FillsClassifierEffectSchema).readonly().optional()
 });
 var ConfigFieldBridge = custom();
 var PipelineAddonSchemaSchema = object({
@@ -59911,6 +59934,75 @@ function createAccessoryDevice(kind, ctx, parent) {
 		default: throw new Error(`Hikvision provider does not implement accessory kind "${String(kind)}"`);
 	}
 }
+var ALARM_INGRESS_MESSAGE = "hikvision: alarm event received";
+var countsRecord = (counts) => Object.fromEntries(counts);
+function createAlarmIngressLog(deps) {
+	const intervalMs = deps.intervalMs ?? 6e4;
+	const bursts = /* @__PURE__ */ new Map();
+	const tags = { deviceId: deps.deviceId };
+	const received = (ev) => {
+		const existing = bursts.get(ev.camStreamId);
+		const burst = existing ?? {
+			startedAt: ev.at,
+			lastLineAt: ev.at,
+			counts: /* @__PURE__ */ new Map(),
+			types: /* @__PURE__ */ new Set(),
+			ticks: 0
+		};
+		if (!existing) bursts.set(ev.camStreamId, burst);
+		burst.ticks += 1;
+		if (!burst.types.has(ev.type)) {
+			burst.types.add(ev.type);
+			deps.logger.info(ALARM_INGRESS_MESSAGE, {
+				tags,
+				meta: {
+					edge: "start",
+					type: ev.type,
+					state: ev.state,
+					camStreamId: ev.camStreamId,
+					...ev.aiClass === null ? {} : { aiClass: ev.aiClass },
+					...existing ? { burstAgeMs: ev.at - burst.startedAt } : {}
+				}
+			});
+			burst.lastLineAt = Math.max(burst.lastLineAt, ev.at);
+			return;
+		}
+		burst.counts.set(ev.type, (burst.counts.get(ev.type) ?? 0) + 1);
+		if (ev.at - burst.lastLineAt < intervalMs) return;
+		deps.logger.info(ALARM_INGRESS_MESSAGE, {
+			tags,
+			meta: {
+				edge: "ongoing",
+				camStreamId: ev.camStreamId,
+				counts: countsRecord(burst.counts),
+				windowMs: ev.at - burst.lastLineAt,
+				burstAgeMs: ev.at - burst.startedAt
+			}
+		});
+		burst.counts.clear();
+		burst.lastLineAt = ev.at;
+	};
+	const ended = (camStreamId, at) => {
+		const burst = bursts.get(camStreamId);
+		if (!burst) return;
+		bursts.delete(camStreamId);
+		deps.logger.info(ALARM_INGRESS_MESSAGE, {
+			tags,
+			meta: {
+				edge: "end",
+				camStreamId,
+				counts: countsRecord(burst.counts),
+				ticks: burst.ticks,
+				types: [...burst.types],
+				durationMs: at - burst.startedAt
+			}
+		});
+	};
+	return {
+		received,
+		ended
+	};
+}
 function createAlarmTypeTally(deps) {
 	const intervalMs = deps.intervalMs ?? 3e5;
 	const lastLoggedAt = /* @__PURE__ */ new Map();
@@ -64297,6 +64389,20 @@ var HikvisionCamera = class HikvisionCamera extends BaseDevice {
 		});
 		return this.unhandledAlarmsTally;
 	}
+	/**
+	* Sampled info-level ingress line for the motion-bearing alarms (VMD and
+	* smart events): one at each burst's start, one per minute while it lasts,
+	* one at its end — never one per ~1 Hz tick. Lazy for the same reason as
+	* `unhandledAlarms`.
+	*/
+	motionIngressLog = null;
+	get motionIngress() {
+		this.motionIngressLog ??= createAlarmIngressLog({
+			logger: this.ctx.logger,
+			deviceId: this.id
+		});
+		return this.motionIngressLog;
+	}
 	/** Hysteresis: drop motion-active back to inactive after this many ms with
 	*  no fresh `VMD` event. Hikvision fires VMD every ~1s while motion is
 	*  active; missing 2 ticks signals the burst is over. */
@@ -66872,6 +66978,13 @@ var HikvisionCamera = class HikvisionCamera extends BaseDevice {
 	handleMotionEvent(ev, camStreamId) {
 		const now = ev.observedAt;
 		this.lastMotionAt.set(camStreamId, now);
+		this.motionIngress.received({
+			type: ev.type,
+			state: ev.state,
+			aiClass: ev.aiClass,
+			camStreamId,
+			at: now
+		});
 		this.ctx.eventBus.emit(providerMotionEvent(this.eventSource, {
 			deviceId: this.id,
 			detected: true,
@@ -66884,6 +66997,7 @@ var HikvisionCamera = class HikvisionCamera extends BaseDevice {
 			const clearedAt = Date.now();
 			this.lastMotionAt.set(camStreamId, 0);
 			this.motionInactiveTimers.delete(camStreamId);
+			this.motionIngress.ended(camStreamId, clearedAt);
 			this.ctx.eventBus.emit(providerMotionEvent(this.eventSource, {
 				deviceId: this.id,
 				detected: false,

package/dist/addon.mjs

@@ -10781,6 +10781,57 @@ var ClipSearchStrictnessSchema = _enum([
 	"balanced",
 	"strict"
 ]);
+new Set([
+	{
+		id: "person",
+		name: "Person"
+	},
+	{
+		id: "vehicle",
+		name: "Vehicle"
+	},
+	{
+		id: "animal",
+		name: "Animal"
+	},
+	{
+		id: "package",
+		name: "Package"
+	}
+].map((l) => l.id));
+var COCO_TO_MACRO = {
+	mapping: {
+		person: "person",
+		bicycle: "vehicle",
+		car: "vehicle",
+		motorcycle: "vehicle",
+		airplane: "vehicle",
+		bus: "vehicle",
+		train: "vehicle",
+		truck: "vehicle",
+		boat: "vehicle",
+		bird: "animal",
+		cat: "animal",
+		dog: "animal",
+		horse: "animal",
+		sheep: "animal",
+		cow: "animal",
+		elephant: "animal",
+		bear: "animal",
+		zebra: "animal",
+		giraffe: "animal",
+		suitcase: "package",
+		backpack: "package",
+		handbag: "package"
+	},
+	preserveOriginal: false
+};
+/** Steps a root detector may declare it fills. */
+var FILLABLE_STEP_IDS = [
+	"animal-classifier",
+	"vehicle-classifier",
+	"package-detection"
+];
 var MODEL_FORMATS = [
 	"onnx",
 	"coreml",
@@ -10913,6 +10964,12 @@ var ModelLicenseSchema = preprocess((value) => typeof value === "string" ? { wei
 	/** True when the weights or their data forbid commercial use. */
 	nonCommercial: boolean().optional()
 }));
+/** One `fillsClassifierEffects` entry — see `ModelCatalogEntry.fillsClassifierEffects`. */
+var FillsClassifierEffectSchema = object({
+	stepId: _enum(FILLABLE_STEP_IDS),
+	labelToEffect: record(string(), string()),
+	uncovered: array(string()).readonly()
+});
 var ModelCatalogEntrySchema = object({
 	id: string(),
 	name: string(),
@@ -11039,6 +11096,16 @@ var ModelCatalogEntrySchema = object({
 	*/
 	classMap: DetectionCatalogClassMapSchema.optional(),
 	/**
+	* The pipeline steps this ROOT detector already does the work of (D715):
+	* its labels name the effect the step exists to produce (`deer` for
+	* `animal-classifier`, `package` for `package-detection`). Derived from the
+	* labelmap by `deriveClassifierFills`, never hand-written; a COCO model
+	* declares none. Whether a declaration is honoured is the step's own
+	* `labelLink` policy (`resolveLabelLink`). `labelToEffect` values are in
+	* `FILLABLE_STEP_VOCABULARIES` (guard `check-label-link-vocabulary`).
+	*/
+	fillsClassifierEffects: array(FillsClassifierEffectSchema).readonly().optional(),
+	/**
 	* The model's CLIP feature-space contract (text encoder, dimension, vector
 	* index, token window, search floor) — see `clip-model.ts`. Present ONLY on a
 	* CLIP image encoder; its absence is what "not a CLIP model" means to the
@@ -18381,51 +18448,6 @@ method(object({}), array(TargetKindSchema)), method(object({}), array(TargetSche
 	kind: "mutation",
 	auth: "admin"
 });
-new Set([
-	{
-		id: "person",
-		name: "Person"
-	},
-	{
-		id: "vehicle",
-		name: "Vehicle"
-	},
-	{
-		id: "animal",
-		name: "Animal"
-	},
-	{
-		id: "package",
-		name: "Package"
-	}
-].map((l) => l.id));
-var COCO_TO_MACRO = {
-	mapping: {
-		person: "person",
-		bicycle: "vehicle",
-		car: "vehicle",
-		motorcycle: "vehicle",
-		airplane: "vehicle",
-		bus: "vehicle",
-		train: "vehicle",
-		truck: "vehicle",
-		boat: "vehicle",
-		bird: "animal",
-		cat: "animal",
-		dog: "animal",
-		horse: "animal",
-		sheep: "animal",
-		cow: "animal",
-		elephant: "animal",
-		bear: "animal",
-		zebra: "animal",
-		giraffe: "animal",
-		suitcase: "package",
-		backpack: "package",
-		handbag: "package"
-	},
-	preserveOriginal: false
-};
 var AUDIO_MACRO_LABELS = [
 	{
 		id: "speech",
@@ -23867,7 +23889,8 @@ var PipelineModelOptionSchema = object({
 	group: ModelVariantGroupSchema.optional(),
 	legacy: boolean().optional(),
 	provider: ModelProviderIdSchema.optional(),
-	defaultConfidence: number().optional()
+	defaultConfidence: number().optional(),
+	fillsClassifierEffects: array(FillsClassifierEffectSchema).readonly().optional()
 });
 var ConfigFieldBridge = custom();
 var PipelineAddonSchemaSchema = object({
@@ -59890,6 +59913,75 @@ function createAccessoryDevice(kind, ctx, parent) {
 		default: throw new Error(`Hikvision provider does not implement accessory kind "${String(kind)}"`);
 	}
 }
+var ALARM_INGRESS_MESSAGE = "hikvision: alarm event received";
+var countsRecord = (counts) => Object.fromEntries(counts);
+function createAlarmIngressLog(deps) {
+	const intervalMs = deps.intervalMs ?? 6e4;
+	const bursts = /* @__PURE__ */ new Map();
+	const tags = { deviceId: deps.deviceId };
+	const received = (ev) => {
+		const existing = bursts.get(ev.camStreamId);
+		const burst = existing ?? {
+			startedAt: ev.at,
+			lastLineAt: ev.at,
+			counts: /* @__PURE__ */ new Map(),
+			types: /* @__PURE__ */ new Set(),
+			ticks: 0
+		};
+		if (!existing) bursts.set(ev.camStreamId, burst);
+		burst.ticks += 1;
+		if (!burst.types.has(ev.type)) {
+			burst.types.add(ev.type);
+			deps.logger.info(ALARM_INGRESS_MESSAGE, {
+				tags,
+				meta: {
+					edge: "start",
+					type: ev.type,
+					state: ev.state,
+					camStreamId: ev.camStreamId,
+					...ev.aiClass === null ? {} : { aiClass: ev.aiClass },
+					...existing ? { burstAgeMs: ev.at - burst.startedAt } : {}
+				}
+			});
+			burst.lastLineAt = Math.max(burst.lastLineAt, ev.at);
+			return;
+		}
+		burst.counts.set(ev.type, (burst.counts.get(ev.type) ?? 0) + 1);
+		if (ev.at - burst.lastLineAt < intervalMs) return;
+		deps.logger.info(ALARM_INGRESS_MESSAGE, {
+			tags,
+			meta: {
+				edge: "ongoing",
+				camStreamId: ev.camStreamId,
+				counts: countsRecord(burst.counts),
+				windowMs: ev.at - burst.lastLineAt,
+				burstAgeMs: ev.at - burst.startedAt
+			}
+		});
+		burst.counts.clear();
+		burst.lastLineAt = ev.at;
+	};
+	const ended = (camStreamId, at) => {
+		const burst = bursts.get(camStreamId);
+		if (!burst) return;
+		bursts.delete(camStreamId);
+		deps.logger.info(ALARM_INGRESS_MESSAGE, {
+			tags,
+			meta: {
+				edge: "end",
+				camStreamId,
+				counts: countsRecord(burst.counts),
+				ticks: burst.ticks,
+				types: [...burst.types],
+				durationMs: at - burst.startedAt
+			}
+		});
+	};
+	return {
+		received,
+		ended
+	};
+}
 function createAlarmTypeTally(deps) {
 	const intervalMs = deps.intervalMs ?? 3e5;
 	const lastLoggedAt = /* @__PURE__ */ new Map();
@@ -64276,6 +64368,20 @@ var HikvisionCamera = class HikvisionCamera extends BaseDevice {
 		});
 		return this.unhandledAlarmsTally;
 	}
+	/**
+	* Sampled info-level ingress line for the motion-bearing alarms (VMD and
+	* smart events): one at each burst's start, one per minute while it lasts,
+	* one at its end — never one per ~1 Hz tick. Lazy for the same reason as
+	* `unhandledAlarms`.
+	*/
+	motionIngressLog = null;
+	get motionIngress() {
+		this.motionIngressLog ??= createAlarmIngressLog({
+			logger: this.ctx.logger,
+			deviceId: this.id
+		});
+		return this.motionIngressLog;
+	}
 	/** Hysteresis: drop motion-active back to inactive after this many ms with
 	*  no fresh `VMD` event. Hikvision fires VMD every ~1s while motion is
 	*  active; missing 2 ticks signals the burst is over. */
@@ -66851,6 +66957,13 @@ var HikvisionCamera = class HikvisionCamera extends BaseDevice {
 	handleMotionEvent(ev, camStreamId) {
 		const now = ev.observedAt;
 		this.lastMotionAt.set(camStreamId, now);
+		this.motionIngress.received({
+			type: ev.type,
+			state: ev.state,
+			aiClass: ev.aiClass,
+			camStreamId,
+			at: now
+		});
 		this.ctx.eventBus.emit(providerMotionEvent(this.eventSource, {
 			deviceId: this.id,
 			detected: true,
@@ -66863,6 +66976,7 @@ var HikvisionCamera = class HikvisionCamera extends BaseDevice {
 			const clearedAt = Date.now();
 			this.lastMotionAt.set(camStreamId, 0);
 			this.motionInactiveTimers.delete(camStreamId);
+			this.motionIngress.ended(camStreamId, clearedAt);
 			this.ctx.eventBus.emit(providerMotionEvent(this.eventSource, {
 				deviceId: this.id,
 				detected: false,

package/package.json

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