@camstack/addon-provider-amcrest 0.2.130 → 0.2.131

package/dist/addon.js

@@ -10510,6 +10510,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",
@@ -10642,6 +10693,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(),
@@ -10768,6 +10825,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
@@ -18091,51 +18158,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",
@@ -18931,6 +18953,8 @@ var NcSystemEventKindSchema = _enum([
 	"stream-offline",
 	"node-online",
 	"node-offline",
+	"node-restarting",
+	"node-updating",
 	"node-inference-unavailable",
 	"detection-blind",
 	"addon-crash-loop",
@@ -23577,7 +23601,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({
@@ -33247,7 +33272,8 @@ var MotionStatusSchema = object({
 	*   writes this slice (not even a boot seed), and neither does the runner's
 	*   phase machine: its phase is "a session is attached" for every on-motion
 	*   session, not motion, and it now has its own `DetectionPhaseTransition`.
-	*   A provider's `isDetected` answers from the hub's slice.
+	*   A provider's `isDetected` and `getStatus` answer from the hub's slice
+	*   (`hubMotionNativeProvider`).
 	* - **Sensors** (Home Assistant binary sensors, Homematic, Matter, Alexa
 	*   imports) — the provider pushes both edges itself, from the upstream
 	*   system's own state change. That is the sensor's own fact.
@@ -53385,6 +53411,8 @@ new Map(Object.entries({
 	"detection-blind": "device-events",
 	"node-online": "system",
 	"node-offline": "system",
+	"node-restarting": "system",
+	"node-updating": "system",
 	"node-inference-unavailable": "system",
 	"addon-crash-loop": "system",
 	"addon-update-available": "system",
@@ -53462,6 +53490,7 @@ var NC_SYSTEM_EVENT_KIND_GROUP_SPECS = [
 		kinds: [
 			"node-offline",
 			"node-online",
+			"node-restarting",
 			"node-inference-unavailable"
 		]
 	},
@@ -53483,6 +53512,7 @@ var NC_SYSTEM_EVENT_KIND_GROUP_SPECS = [
 		label: "Server & container updates",
 		kinds: [
 			"server-update-available",
+			"node-updating",
 			"server-updated",
 			"wrapper-update-available"
 		]
@@ -53630,6 +53660,7 @@ var STATE_SUMMARY_SECTION_VARS = [
 		kinds: [
 			"node-offline",
 			"node-online",
+			"node-restarting",
 			"node-inference-unavailable"
 		]
 	},
@@ -53651,6 +53682,7 @@ var STATE_SUMMARY_SECTION_VARS = [
 		example: "server 1.2.377 → 1.2.378",
 		kinds: [
 			"server-update-available",
+			"node-updating",
 			"server-updated",
 			"wrapper-update-available"
 		]
@@ -54106,10 +54138,9 @@ TimelapseRuleInputSchema.extend({
 	createdAt: number(),
 	updatedAt: number()
 });
-async function readHubMotionDetected(deviceState, deviceId) {
-	let slice;
+async function readSlice(deviceState, deviceId) {
 	try {
-		slice = await deviceState.getCapSlice.query({
+		return await deviceState.getCapSlice.query({
 			deviceId,
 			capName: "motion"
 		});
@@ -54117,10 +54148,44 @@ async function readHubMotionDetected(deviceState, deviceId) {
 		const reason = err instanceof Error ? err.message : String(err);
 		throw new Error(`motion state of device ${deviceId} is unreadable: ${reason}`, { cause: err });
 	}
-	const detected = slice?.["detected"];
+}
+/**
+* The hub's `motion` slice as a `MotionStatus`, or `null` when nobody has
+* published it since the hub started. Throws when the hub does not answer or
+* the slice is malformed — never a made-up "no motion".
+*/
+async function readHubMotionStatus(deviceState, deviceId) {
+	const slice = await readSlice(deviceState, deviceId);
+	if (slice === null) return null;
+	const parsed = MotionStatusSchema.safeParse(slice);
+	if (!parsed.success) throw new Error(`motion state of device ${deviceId} is malformed on the hub: ${parsed.error.message}`);
+	return parsed.data;
+}
+async function readHubMotionDetected(deviceState, deviceId) {
+	const detected = (await readSlice(deviceState, deviceId))?.["detected"];
 	if (typeof detected !== "boolean") throw new Error(`motion state of device ${deviceId} is not published yet (unknown)`);
 	return detected;
 }
+/**
+* The native `motion` provider of a camera whose slice the orchestrator writes
+* (D696): `isDetected` AND `getStatus`, both from the hub. `owner` names the
+* provider class in the deviceId-mismatch error.
+*/
+function hubMotionNativeProvider(deviceState, deviceId, owner) {
+	const ownDevice = (asked) => {
+		if (asked !== deviceId) throw new Error(`${owner}: motion deviceId mismatch, expected ${deviceId}, got ${asked}`);
+	};
+	return {
+		isDetected: async ({ deviceId: asked }) => {
+			ownDevice(asked);
+			return readHubMotionDetected(deviceState, deviceId);
+		},
+		getStatus: async ({ deviceId: asked }) => {
+			ownDevice(asked);
+			return readHubMotionStatus(deviceState, deviceId);
+		}
+	};
+}
 MotionOnMotionChangedDataSchema.omit({ triggeredBy: true });
 function providerMotionEvent(source, data) {
 	return createEvent(EventCategory.ProviderMotion, source, data);
@@ -56494,14 +56559,12 @@ var AmcrestCamera = class AmcrestCamera extends BaseDevice {
 	}
 	/** Register the native `motion` cap. Its mere presence (a `kind:'native'`
 	*  `motion` binding) is what the orchestrator reads to default a
-	*  freshly-adopted camera to `motionSources:['onboard']`. `isDetected`
-	*  answers from the HUB's slice; an unreadable hub, or a slice nobody has
-	*  published yet, fails the call — never `false` for unknown (D49, D393). */
+	*  freshly-adopted camera to `motionSources:['onboard']`. `isDetected` and
+	*  `getStatus` answer from the HUB's slice (`hubMotionNativeProvider`); an
+	*  unreadable hub fails both — never `false` for unknown (D49, D393). */
 	registerMotionCap() {
-		this.ctx.registerNativeCap(motionCapability, { isDetected: async ({ deviceId }) => {
-			if (deviceId !== this.id) throw new Error(`AmcrestCamera: motion deviceId mismatch, expected ${this.id}, got ${deviceId}`);
-			return readHubMotionDetected(this.ctx.api.deviceState, this.id);
-		} });
+		const provider = hubMotionNativeProvider(this.ctx.api.deviceState, this.id, "AmcrestCamera");
+		this.ctx.registerNativeCap(motionCapability, provider);
 		this.ctx.logger.info("amcrest: motion cap registered", { tags: { deviceId: this.id } });
 	}
 	/** Reusable event-source identity for every emit on this device. */

package/dist/addon.mjs

@@ -10489,6 +10489,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",
@@ -10621,6 +10672,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(),
@@ -10747,6 +10804,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
@@ -18070,51 +18137,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",
@@ -18910,6 +18932,8 @@ var NcSystemEventKindSchema = _enum([
 	"stream-offline",
 	"node-online",
 	"node-offline",
+	"node-restarting",
+	"node-updating",
 	"node-inference-unavailable",
 	"detection-blind",
 	"addon-crash-loop",
@@ -23556,7 +23580,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({
@@ -33226,7 +33251,8 @@ var MotionStatusSchema = object({
 	*   writes this slice (not even a boot seed), and neither does the runner's
 	*   phase machine: its phase is "a session is attached" for every on-motion
 	*   session, not motion, and it now has its own `DetectionPhaseTransition`.
-	*   A provider's `isDetected` answers from the hub's slice.
+	*   A provider's `isDetected` and `getStatus` answer from the hub's slice
+	*   (`hubMotionNativeProvider`).
 	* - **Sensors** (Home Assistant binary sensors, Homematic, Matter, Alexa
 	*   imports) — the provider pushes both edges itself, from the upstream
 	*   system's own state change. That is the sensor's own fact.
@@ -53364,6 +53390,8 @@ new Map(Object.entries({
 	"detection-blind": "device-events",
 	"node-online": "system",
 	"node-offline": "system",
+	"node-restarting": "system",
+	"node-updating": "system",
 	"node-inference-unavailable": "system",
 	"addon-crash-loop": "system",
 	"addon-update-available": "system",
@@ -53441,6 +53469,7 @@ var NC_SYSTEM_EVENT_KIND_GROUP_SPECS = [
 		kinds: [
 			"node-offline",
 			"node-online",
+			"node-restarting",
 			"node-inference-unavailable"
 		]
 	},
@@ -53462,6 +53491,7 @@ var NC_SYSTEM_EVENT_KIND_GROUP_SPECS = [
 		label: "Server & container updates",
 		kinds: [
 			"server-update-available",
+			"node-updating",
 			"server-updated",
 			"wrapper-update-available"
 		]
@@ -53609,6 +53639,7 @@ var STATE_SUMMARY_SECTION_VARS = [
 		kinds: [
 			"node-offline",
 			"node-online",
+			"node-restarting",
 			"node-inference-unavailable"
 		]
 	},
@@ -53630,6 +53661,7 @@ var STATE_SUMMARY_SECTION_VARS = [
 		example: "server 1.2.377 → 1.2.378",
 		kinds: [
 			"server-update-available",
+			"node-updating",
 			"server-updated",
 			"wrapper-update-available"
 		]
@@ -54085,10 +54117,9 @@ TimelapseRuleInputSchema.extend({
 	createdAt: number(),
 	updatedAt: number()
 });
-async function readHubMotionDetected(deviceState, deviceId) {
-	let slice;
+async function readSlice(deviceState, deviceId) {
 	try {
-		slice = await deviceState.getCapSlice.query({
+		return await deviceState.getCapSlice.query({
 			deviceId,
 			capName: "motion"
 		});
@@ -54096,10 +54127,44 @@ async function readHubMotionDetected(deviceState, deviceId) {
 		const reason = err instanceof Error ? err.message : String(err);
 		throw new Error(`motion state of device ${deviceId} is unreadable: ${reason}`, { cause: err });
 	}
-	const detected = slice?.["detected"];
+}
+/**
+* The hub's `motion` slice as a `MotionStatus`, or `null` when nobody has
+* published it since the hub started. Throws when the hub does not answer or
+* the slice is malformed — never a made-up "no motion".
+*/
+async function readHubMotionStatus(deviceState, deviceId) {
+	const slice = await readSlice(deviceState, deviceId);
+	if (slice === null) return null;
+	const parsed = MotionStatusSchema.safeParse(slice);
+	if (!parsed.success) throw new Error(`motion state of device ${deviceId} is malformed on the hub: ${parsed.error.message}`);
+	return parsed.data;
+}
+async function readHubMotionDetected(deviceState, deviceId) {
+	const detected = (await readSlice(deviceState, deviceId))?.["detected"];
 	if (typeof detected !== "boolean") throw new Error(`motion state of device ${deviceId} is not published yet (unknown)`);
 	return detected;
 }
+/**
+* The native `motion` provider of a camera whose slice the orchestrator writes
+* (D696): `isDetected` AND `getStatus`, both from the hub. `owner` names the
+* provider class in the deviceId-mismatch error.
+*/
+function hubMotionNativeProvider(deviceState, deviceId, owner) {
+	const ownDevice = (asked) => {
+		if (asked !== deviceId) throw new Error(`${owner}: motion deviceId mismatch, expected ${deviceId}, got ${asked}`);
+	};
+	return {
+		isDetected: async ({ deviceId: asked }) => {
+			ownDevice(asked);
+			return readHubMotionDetected(deviceState, deviceId);
+		},
+		getStatus: async ({ deviceId: asked }) => {
+			ownDevice(asked);
+			return readHubMotionStatus(deviceState, deviceId);
+		}
+	};
+}
 MotionOnMotionChangedDataSchema.omit({ triggeredBy: true });
 function providerMotionEvent(source, data) {
 	return createEvent(EventCategory.ProviderMotion, source, data);
@@ -56473,14 +56538,12 @@ var AmcrestCamera = class AmcrestCamera extends BaseDevice {
 	}
 	/** Register the native `motion` cap. Its mere presence (a `kind:'native'`
 	*  `motion` binding) is what the orchestrator reads to default a
-	*  freshly-adopted camera to `motionSources:['onboard']`. `isDetected`
-	*  answers from the HUB's slice; an unreadable hub, or a slice nobody has
-	*  published yet, fails the call — never `false` for unknown (D49, D393). */
+	*  freshly-adopted camera to `motionSources:['onboard']`. `isDetected` and
+	*  `getStatus` answer from the HUB's slice (`hubMotionNativeProvider`); an
+	*  unreadable hub fails both — never `false` for unknown (D49, D393). */
 	registerMotionCap() {
-		this.ctx.registerNativeCap(motionCapability, { isDetected: async ({ deviceId }) => {
-			if (deviceId !== this.id) throw new Error(`AmcrestCamera: motion deviceId mismatch, expected ${this.id}, got ${deviceId}`);
-			return readHubMotionDetected(this.ctx.api.deviceState, this.id);
-		} });
+		const provider = hubMotionNativeProvider(this.ctx.api.deviceState, this.id, "AmcrestCamera");
+		this.ctx.registerNativeCap(motionCapability, provider);
 		this.ctx.logger.info("amcrest: motion cap registered", { tags: { deviceId: this.id } });
 	}
 	/** Reusable event-source identity for every emit on this device. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-amcrest",
-  "version": "0.2.130",
+  "version": "0.2.131",
   "description": "Amcrest/Dahua camera device provider addon for CamStack — Dahua CGI over HTTP(S) with digest auth (snapshot, RTSP catalog, PTZ, image/day-night config)",
   "keywords": [
     "camstack",