@camstack/addon-provider-reolink 1.2.175 → 1.2.176

package/dist/addon.js

@@ -11101,6 +11101,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",
@@ -11233,6 +11284,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(),
@@ -11359,6 +11416,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
@@ -18722,51 +18789,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",
@@ -24208,7 +24230,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({
@@ -166310,6 +166333,37 @@ function buildSyntheticRfc4571Sdp(input) {
 function buildLazyRfc4571Url(camStreamId) {
 	return `lazy:rfc4571:${encodeURIComponent(camStreamId)}`;
 }
+function createMotionSensorTracker(now = Date.now) {
+	const latest = /* @__PURE__ */ new Map();
+	return {
+		observe(event) {
+			if (event.type !== "motion") return;
+			const sensor = event.motion.source;
+			if (sensor === void 0) return;
+			latest.set(event.channel, {
+				sensor,
+				at: now()
+			});
+		},
+		take(channel) {
+			const entry = latest.get(channel);
+			if (!entry) return null;
+			latest.delete(channel);
+			return now() - entry.at <= 2e3 ? entry.sensor : null;
+		}
+	};
+}
+var isMotionSensor = (value) => value === "md" || value === "pir" || value === "unknown";
+/**
+* The sensor a simple event states itself, for a library version that forwards
+* `motion.source` on the simple event; `null` for the versions that do not.
+*/
+function motionSensorOnSimpleEvent(event) {
+	if (!("motion" in event)) return null;
+	const motion = event.motion;
+	if (typeof motion !== "object" || motion === null || !("source" in motion)) return null;
+	return isMotionSensor(motion.source) ? motion.source : null;
+}
 //#endregion
 //#region src/reolink-camera.ts
 /**
@@ -166616,6 +166670,16 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 		this.handleSimpleEvent(event);
 	};
 	/**
+	* MD vs PIR of this camera's own motion pushes. The lib's simple event drops
+	* it, so the raw client `event` is observed — PREPENDED, so the sensor is
+	* recorded before the API maps the same emit into the simple event
+	* (`motion-sensor-source.ts`). Hub children get theirs from the hub.
+	*/
+	motionSensors = createMotionSensorTracker();
+	observeRawEventBound = (event) => {
+		this.motionSensors.observe(event);
+	};
+	/**
 	* Stable bound handler for `api.onObjectDetections` — created ONCE so
 	* every `onObjectDetections` / `offObjectDetections` call uses the
 	* SAME function reference (same listener-Set dedup rationale as
@@ -172017,6 +172081,11 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 			this.ctx.logger.debug("Reolink event watchdog re-subscribe failed", { meta: { error: err instanceof Error ? err.message : String(err) } });
 		}
 	}
+	/** Off-then-prepend, so a re-attached api never carries two observers. */
+	observeMotionSensors(api) {
+		api.client.off("event", this.observeRawEventBound);
+		api.client.prependListener("event", this.observeRawEventBound);
+	}
 	/**
 	* Subscribe (or re-subscribe) `handleSimpleEventBound` against
 	* the Baichuan API. Single-source-of-truth for the listener
@@ -173611,6 +173680,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	adoptApi(api) {
 		this.api = api;
 		this.reconnectAttempts = 0;
+		this.observeMotionSensors(api);
 		api.client.on("close", () => this.scheduleReconnect("close"));
 		api.client.on("error", (err) => {
 			this.ctx.logger.warn("Baichuan client error — scheduling reconnect", {
@@ -173758,6 +173828,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 					meta: { error: err instanceof Error ? err.message : String(err) }
 				});
 			});
+			this.observeMotionSensors(api);
 			api.client.on("close", () => this.scheduleReconnect("close"));
 			api.client.on("error", (err) => {
 				this.ctx.logger.warn("Baichuan client error — scheduling reconnect", {
@@ -173827,8 +173898,9 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	* when the camera lives under a Hub and inherits the parent's
 	* single subscription.
 	*/
-	handleSimpleEvent(event) {
+	handleSimpleEvent(event, routedMotionSensor = null) {
 		this.lastEventAt = Date.now();
+		const motionSensor = event.type === "motion" ? motionSensorOnSimpleEvent(event) ?? routedMotionSensor ?? this.motionSensors.take(event.channel) : null;
 		this.consecutiveStaleHealthChecks = 0;
 		this.nextEventHealthCheckAt = 0;
 		this.markPassiveContact();
@@ -173847,7 +173919,8 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 			type: event.type,
 			channel: event.channel,
 			timestamp: event.timestamp,
-			source: event.source
+			source: event.source,
+			...event.type === "motion" ? { motionSensor } : {}
 		} });
 		if (event.type === "motion") {
 			const now = Date.now();
@@ -174406,6 +174479,17 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 	handleSimpleEventBound = (ev) => {
 		this.routeSimpleEvent(ev);
 	};
+	/** MD vs PIR per channel, read off the raw client event the lib's simple
+	*  event drops (`motion-sensor-source.ts`) and handed to the child. */
+	motionSensors = createMotionSensorTracker();
+	observeRawEventBound = (ev) => {
+		this.motionSensors.observe(ev);
+	};
+	/** Off-then-prepend: recorded before the API maps the same emit. */
+	observeMotionSensors(api) {
+		api.client.off("event", this.observeRawEventBound);
+		api.client.prependListener("event", this.observeRawEventBound);
+	}
 	constructor(ctx) {
 		super(ctx, reolinkHubSchema, { type: DeviceType.Hub });
 		this.registerDeviceDiscovery();
@@ -175169,6 +175253,7 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 	routeSimpleEvent(ev) {
 		const channel = ev?.channel;
 		if (typeof channel !== "number") return;
+		const motionSensor = ev.type === "motion" ? this.motionSensors.take(channel) : null;
 		const deviceId = this.channelToDeviceId.get(channel);
 		if (deviceId === void 0) {
 			const last = this.unroutedChannelLoggedAt.get(channel) ?? 0;
@@ -175198,7 +175283,7 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 				deviceId: child.id,
 				name: child.name
 			} });
-			child.handleSimpleEvent(ev);
+			child.handleSimpleEvent(ev, motionSensor);
 		}).catch((err) => {
 			this.ctx.logger.debug("Hub simpleEvent dispatch failed", { meta: {
 				channel,
@@ -175242,6 +175327,7 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 		try {
 			await api.offSimpleEvent(this.handleSimpleEventBound);
 		} catch {}
+		this.observeMotionSensors(api);
 		await api.onSimpleEvent(this.handleSimpleEventBound);
 		api.client.on("close", () => this.scheduleReconnect("socket-close"));
 		api.client.on("error", (err) => {
@@ -175300,6 +175386,7 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 		this.api = api;
 		this.reconnectAttempts = 0;
 		this.markOnline(true);
+		this.observeMotionSensors(api);
 		api.client.on("close", () => this.scheduleReconnect("socket-close"));
 		api.client.on("error", (err) => {
 			this.ctx.logger.warn("Reolink Hub adopted socket error", { meta: { error: err instanceof Error ? err.message : String(err) } });

package/dist/addon.mjs

@@ -11093,6 +11093,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",
@@ -11225,6 +11276,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(),
@@ -11351,6 +11408,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
@@ -18714,51 +18781,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",
@@ -24200,7 +24222,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({
@@ -166302,6 +166325,37 @@ function buildSyntheticRfc4571Sdp(input) {
 function buildLazyRfc4571Url(camStreamId) {
 	return `lazy:rfc4571:${encodeURIComponent(camStreamId)}`;
 }
+function createMotionSensorTracker(now = Date.now) {
+	const latest = /* @__PURE__ */ new Map();
+	return {
+		observe(event) {
+			if (event.type !== "motion") return;
+			const sensor = event.motion.source;
+			if (sensor === void 0) return;
+			latest.set(event.channel, {
+				sensor,
+				at: now()
+			});
+		},
+		take(channel) {
+			const entry = latest.get(channel);
+			if (!entry) return null;
+			latest.delete(channel);
+			return now() - entry.at <= 2e3 ? entry.sensor : null;
+		}
+	};
+}
+var isMotionSensor = (value) => value === "md" || value === "pir" || value === "unknown";
+/**
+* The sensor a simple event states itself, for a library version that forwards
+* `motion.source` on the simple event; `null` for the versions that do not.
+*/
+function motionSensorOnSimpleEvent(event) {
+	if (!("motion" in event)) return null;
+	const motion = event.motion;
+	if (typeof motion !== "object" || motion === null || !("source" in motion)) return null;
+	return isMotionSensor(motion.source) ? motion.source : null;
+}
 //#endregion
 //#region src/reolink-camera.ts
 /**
@@ -166608,6 +166662,16 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 		this.handleSimpleEvent(event);
 	};
 	/**
+	* MD vs PIR of this camera's own motion pushes. The lib's simple event drops
+	* it, so the raw client `event` is observed — PREPENDED, so the sensor is
+	* recorded before the API maps the same emit into the simple event
+	* (`motion-sensor-source.ts`). Hub children get theirs from the hub.
+	*/
+	motionSensors = createMotionSensorTracker();
+	observeRawEventBound = (event) => {
+		this.motionSensors.observe(event);
+	};
+	/**
 	* Stable bound handler for `api.onObjectDetections` — created ONCE so
 	* every `onObjectDetections` / `offObjectDetections` call uses the
 	* SAME function reference (same listener-Set dedup rationale as
@@ -172009,6 +172073,11 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 			this.ctx.logger.debug("Reolink event watchdog re-subscribe failed", { meta: { error: err instanceof Error ? err.message : String(err) } });
 		}
 	}
+	/** Off-then-prepend, so a re-attached api never carries two observers. */
+	observeMotionSensors(api) {
+		api.client.off("event", this.observeRawEventBound);
+		api.client.prependListener("event", this.observeRawEventBound);
+	}
 	/**
 	* Subscribe (or re-subscribe) `handleSimpleEventBound` against
 	* the Baichuan API. Single-source-of-truth for the listener
@@ -173603,6 +173672,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	adoptApi(api) {
 		this.api = api;
 		this.reconnectAttempts = 0;
+		this.observeMotionSensors(api);
 		api.client.on("close", () => this.scheduleReconnect("close"));
 		api.client.on("error", (err) => {
 			this.ctx.logger.warn("Baichuan client error — scheduling reconnect", {
@@ -173750,6 +173820,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 					meta: { error: err instanceof Error ? err.message : String(err) }
 				});
 			});
+			this.observeMotionSensors(api);
 			api.client.on("close", () => this.scheduleReconnect("close"));
 			api.client.on("error", (err) => {
 				this.ctx.logger.warn("Baichuan client error — scheduling reconnect", {
@@ -173819,8 +173890,9 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	* when the camera lives under a Hub and inherits the parent's
 	* single subscription.
 	*/
-	handleSimpleEvent(event) {
+	handleSimpleEvent(event, routedMotionSensor = null) {
 		this.lastEventAt = Date.now();
+		const motionSensor = event.type === "motion" ? motionSensorOnSimpleEvent(event) ?? routedMotionSensor ?? this.motionSensors.take(event.channel) : null;
 		this.consecutiveStaleHealthChecks = 0;
 		this.nextEventHealthCheckAt = 0;
 		this.markPassiveContact();
@@ -173839,7 +173911,8 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 			type: event.type,
 			channel: event.channel,
 			timestamp: event.timestamp,
-			source: event.source
+			source: event.source,
+			...event.type === "motion" ? { motionSensor } : {}
 		} });
 		if (event.type === "motion") {
 			const now = Date.now();
@@ -174398,6 +174471,17 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 	handleSimpleEventBound = (ev) => {
 		this.routeSimpleEvent(ev);
 	};
+	/** MD vs PIR per channel, read off the raw client event the lib's simple
+	*  event drops (`motion-sensor-source.ts`) and handed to the child. */
+	motionSensors = createMotionSensorTracker();
+	observeRawEventBound = (ev) => {
+		this.motionSensors.observe(ev);
+	};
+	/** Off-then-prepend: recorded before the API maps the same emit. */
+	observeMotionSensors(api) {
+		api.client.off("event", this.observeRawEventBound);
+		api.client.prependListener("event", this.observeRawEventBound);
+	}
 	constructor(ctx) {
 		super(ctx, reolinkHubSchema, { type: DeviceType.Hub });
 		this.registerDeviceDiscovery();
@@ -175161,6 +175245,7 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 	routeSimpleEvent(ev) {
 		const channel = ev?.channel;
 		if (typeof channel !== "number") return;
+		const motionSensor = ev.type === "motion" ? this.motionSensors.take(channel) : null;
 		const deviceId = this.channelToDeviceId.get(channel);
 		if (deviceId === void 0) {
 			const last = this.unroutedChannelLoggedAt.get(channel) ?? 0;
@@ -175190,7 +175275,7 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 				deviceId: child.id,
 				name: child.name
 			} });
-			child.handleSimpleEvent(ev);
+			child.handleSimpleEvent(ev, motionSensor);
 		}).catch((err) => {
 			this.ctx.logger.debug("Hub simpleEvent dispatch failed", { meta: {
 				channel,
@@ -175234,6 +175319,7 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 		try {
 			await api.offSimpleEvent(this.handleSimpleEventBound);
 		} catch {}
+		this.observeMotionSensors(api);
 		await api.onSimpleEvent(this.handleSimpleEventBound);
 		api.client.on("close", () => this.scheduleReconnect("socket-close"));
 		api.client.on("error", (err) => {
@@ -175292,6 +175378,7 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 		this.api = api;
 		this.reconnectAttempts = 0;
 		this.markOnline(true);
+		this.observeMotionSensors(api);
 		api.client.on("close", () => this.scheduleReconnect("socket-close"));
 		api.client.on("error", (err) => {
 			this.ctx.logger.warn("Reolink Hub adopted socket error", { meta: { error: err instanceof Error ? err.message : String(err) } });

package/package.json

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