@camstack/addon-provider-reolink 1.1.17 → 1.1.18

package/dist/addon.js

@@ -18071,7 +18071,17 @@ var AgentAddonConfigSchema = object({
 });
 var AgentPipelineSettingsSchema = object({
 	addonDefaults: record(string(), AgentAddonConfigSchema).readonly(),
-	maxCameras: number().int().nonnegative().nullable().default(null)
+	maxCameras: number().int().nonnegative().nullable().default(null),
+	/** Per-node detection weight (relative share for the quota balancer). */
+	detectWeight: number().positive().optional(),
+	/** Node is eligible to run the detection pipeline (decode + inference). */
+	detect: boolean().optional(),
+	/** Node is eligible to host decoder sessions. */
+	decode: boolean().optional(),
+	/** Node is eligible to run audio-analyzer sessions. */
+	audio: boolean().optional(),
+	/** Node is eligible to be the ingest / source-owner (serve the restream). */
+	ingest: boolean().optional()
 });
 var CameraPipelineForAgentSchema = object({
 	steps: array(PipelineStepInputSchema).readonly(),
@@ -18377,6 +18387,21 @@ method(object({
 }), object({ success: literal(true) }), {
 	kind: "mutation",
 	auth: "admin"
+}), method(object({
+	agentNodeId: string(),
+	detectWeight: number().positive().nullable()
+}), object({ success: literal(true) }), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	agentNodeId: string(),
+	detect: boolean().nullable().optional(),
+	decode: boolean().nullable().optional(),
+	audio: boolean().nullable().optional(),
+	ingest: boolean().nullable().optional()
+}), object({ success: literal(true) }), {
+	kind: "mutation",
+	auth: "admin"
 }), method(object({ deviceId: number() }), CameraPipelineSettingsSchema.nullable()), method(object({
 	deviceId: number(),
 	addonId: string(),
@@ -24608,6 +24633,18 @@ Object.freeze({
 		addonId: null,
 		access: "create"
 	},
+	"pipelineOrchestrator.setAgentCapabilities": {
+		capName: "pipeline-orchestrator",
+		capScope: "system",
+		addonId: null,
+		access: "create"
+	},
+	"pipelineOrchestrator.setAgentDetectWeight": {
+		capName: "pipeline-orchestrator",
+		capScope: "system",
+		addonId: null,
+		access: "create"
+	},
 	"pipelineOrchestrator.setAgentMaxCameras": {
 		capName: "pipeline-orchestrator",
 		capScope: "system",
@@ -214519,6 +214556,30 @@ function buildRawState(reader) {
 	};
 }
 //#endregion
+//#region src/native-sdp-overlay.ts
+/**
+* Return a new descriptor list in which every native `pull-rfc4571` entry with
+* a live upstream server carries that server's real `tcp://` URL + real SDP.
+* Pure + immutable: non-native or cold entries pass through unchanged;
+* upgraded entries are fresh objects and sibling metadata keys are preserved.
+*/
+function overlayLiveNativeRfc4571Sdp(descriptors, liveServerFor) {
+	return descriptors.map((descriptor) => {
+		if (descriptor.kind !== "pull-rfc4571") return descriptor;
+		const live = liveServerFor(descriptor.camStreamId);
+		if (!live) return descriptor;
+		const auth = `${encodeURIComponent(live.username)}:${encodeURIComponent(live.password)}`;
+		return {
+			...descriptor,
+			url: `tcp://${auth}@${live.host}:${live.port}`,
+			metadata: {
+				...descriptor.metadata,
+				sdp: live.sdp
+			}
+		};
+	});
+}
+//#endregion
 //#region src/accessory-probe-flags.ts
 var FLAG_KEYS = [
 	"hasBattery",
@@ -220529,17 +220590,39 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	* session or touches the broker.
 	*/
 	async buildStreamCatalog() {
-		if (this.cachedStreamDescriptors?.length) return this.cachedStreamDescriptors;
-		if (this.buildStreamCatalogInFlight) return this.buildStreamCatalogInFlight;
+		if (this.cachedStreamDescriptors?.length) return this.withLiveNativeSdp(this.cachedStreamDescriptors);
+		if (this.buildStreamCatalogInFlight) return this.withLiveNativeSdp(await this.buildStreamCatalogInFlight);
 		const build = this.buildStreamCatalogUncached();
 		this.buildStreamCatalogInFlight = build;
 		try {
-			return await build;
+			return this.withLiveNativeSdp(await build);
 		} finally {
 			this.buildStreamCatalogInFlight = null;
 		}
 	}
 	/**
+	* Upgrade native `pull-rfc4571` descriptors to the live upstream server's
+	* real `tcp://` URL + real (sprop-bearing) SDP whenever a server is
+	* currently listening in `this.active`. The synthetic catalog SDP omits
+	* `sprop-parameter-sets`, which the raw ffmpeg decode reader cannot recover
+	* (it has no in-band SPS/PPS merge) — so a decode-path consumer that pulls
+	* the catalog after `materializeStreamSocket` must still see the real SDP.
+	* See `native-sdp-overlay.ts`.
+	*/
+	withLiveNativeSdp(descriptors) {
+		return overlayLiveNativeRfc4571Sdp(descriptors, (camStreamId) => {
+			const server = this.active.get(camStreamId)?.server;
+			if (!server?.server?.listening) return null;
+			return {
+				host: server.host,
+				port: server.port,
+				username: server.username,
+				password: server.password,
+				sdp: server.sdp
+			};
+		});
+	}
+	/**
 	* Synthesize the HTTP-FLV pull URL for a (channel, profile) pair. FLV is
 	* served off the Reolink Baichuan media port (default 1935, app `bcs`) as
 	* `channel<channel>_<profile>.bcs` — the same shape Frigate/go2rtc use. The
@@ -220763,13 +220846,16 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 		}
 		const url = `tcp://${`${encodeURIComponent(server.username)}:${encodeURIComponent(server.password)}`}@${server.host}:${server.port}`;
 		const codec = server.videoType === "H265" ? "h265" : "h264";
+		const descriptor = this.cachedStreamDescriptors?.find((d) => d.camStreamId === camStreamId);
 		await this.publishOne({
 			camStreamId,
 			kind: "pull-rfc4571",
-			label: camStreamId,
+			label: descriptor?.label ?? camStreamId,
 			url,
 			codec,
 			autoEligible: true,
+			...descriptor?.resolution ? { resolution: descriptor.resolution } : {},
+			...descriptor?.fps !== void 0 ? { fps: descriptor.fps } : {},
 			metadata: { sdp: server.sdp }
 		});
 		this.ctx.logger.info("materialized rfc4571 stream socket on broker demand", {

package/dist/addon.mjs

@@ -18066,7 +18066,17 @@ var AgentAddonConfigSchema = object({
 });
 var AgentPipelineSettingsSchema = object({
 	addonDefaults: record(string(), AgentAddonConfigSchema).readonly(),
-	maxCameras: number().int().nonnegative().nullable().default(null)
+	maxCameras: number().int().nonnegative().nullable().default(null),
+	/** Per-node detection weight (relative share for the quota balancer). */
+	detectWeight: number().positive().optional(),
+	/** Node is eligible to run the detection pipeline (decode + inference). */
+	detect: boolean().optional(),
+	/** Node is eligible to host decoder sessions. */
+	decode: boolean().optional(),
+	/** Node is eligible to run audio-analyzer sessions. */
+	audio: boolean().optional(),
+	/** Node is eligible to be the ingest / source-owner (serve the restream). */
+	ingest: boolean().optional()
 });
 var CameraPipelineForAgentSchema = object({
 	steps: array(PipelineStepInputSchema).readonly(),
@@ -18372,6 +18382,21 @@ method(object({
 }), object({ success: literal(true) }), {
 	kind: "mutation",
 	auth: "admin"
+}), method(object({
+	agentNodeId: string(),
+	detectWeight: number().positive().nullable()
+}), object({ success: literal(true) }), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	agentNodeId: string(),
+	detect: boolean().nullable().optional(),
+	decode: boolean().nullable().optional(),
+	audio: boolean().nullable().optional(),
+	ingest: boolean().nullable().optional()
+}), object({ success: literal(true) }), {
+	kind: "mutation",
+	auth: "admin"
 }), method(object({ deviceId: number() }), CameraPipelineSettingsSchema.nullable()), method(object({
 	deviceId: number(),
 	addonId: string(),
@@ -24603,6 +24628,18 @@ Object.freeze({
 		addonId: null,
 		access: "create"
 	},
+	"pipelineOrchestrator.setAgentCapabilities": {
+		capName: "pipeline-orchestrator",
+		capScope: "system",
+		addonId: null,
+		access: "create"
+	},
+	"pipelineOrchestrator.setAgentDetectWeight": {
+		capName: "pipeline-orchestrator",
+		capScope: "system",
+		addonId: null,
+		access: "create"
+	},
 	"pipelineOrchestrator.setAgentMaxCameras": {
 		capName: "pipeline-orchestrator",
 		capScope: "system",
@@ -214499,6 +214536,30 @@ function buildRawState(reader) {
 	};
 }
 //#endregion
+//#region src/native-sdp-overlay.ts
+/**
+* Return a new descriptor list in which every native `pull-rfc4571` entry with
+* a live upstream server carries that server's real `tcp://` URL + real SDP.
+* Pure + immutable: non-native or cold entries pass through unchanged;
+* upgraded entries are fresh objects and sibling metadata keys are preserved.
+*/
+function overlayLiveNativeRfc4571Sdp(descriptors, liveServerFor) {
+	return descriptors.map((descriptor) => {
+		if (descriptor.kind !== "pull-rfc4571") return descriptor;
+		const live = liveServerFor(descriptor.camStreamId);
+		if (!live) return descriptor;
+		const auth = `${encodeURIComponent(live.username)}:${encodeURIComponent(live.password)}`;
+		return {
+			...descriptor,
+			url: `tcp://${auth}@${live.host}:${live.port}`,
+			metadata: {
+				...descriptor.metadata,
+				sdp: live.sdp
+			}
+		};
+	});
+}
+//#endregion
 //#region src/accessory-probe-flags.ts
 var FLAG_KEYS = [
 	"hasBattery",
@@ -220509,17 +220570,39 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	* session or touches the broker.
 	*/
 	async buildStreamCatalog() {
-		if (this.cachedStreamDescriptors?.length) return this.cachedStreamDescriptors;
-		if (this.buildStreamCatalogInFlight) return this.buildStreamCatalogInFlight;
+		if (this.cachedStreamDescriptors?.length) return this.withLiveNativeSdp(this.cachedStreamDescriptors);
+		if (this.buildStreamCatalogInFlight) return this.withLiveNativeSdp(await this.buildStreamCatalogInFlight);
 		const build = this.buildStreamCatalogUncached();
 		this.buildStreamCatalogInFlight = build;
 		try {
-			return await build;
+			return this.withLiveNativeSdp(await build);
 		} finally {
 			this.buildStreamCatalogInFlight = null;
 		}
 	}
 	/**
+	* Upgrade native `pull-rfc4571` descriptors to the live upstream server's
+	* real `tcp://` URL + real (sprop-bearing) SDP whenever a server is
+	* currently listening in `this.active`. The synthetic catalog SDP omits
+	* `sprop-parameter-sets`, which the raw ffmpeg decode reader cannot recover
+	* (it has no in-band SPS/PPS merge) — so a decode-path consumer that pulls
+	* the catalog after `materializeStreamSocket` must still see the real SDP.
+	* See `native-sdp-overlay.ts`.
+	*/
+	withLiveNativeSdp(descriptors) {
+		return overlayLiveNativeRfc4571Sdp(descriptors, (camStreamId) => {
+			const server = this.active.get(camStreamId)?.server;
+			if (!server?.server?.listening) return null;
+			return {
+				host: server.host,
+				port: server.port,
+				username: server.username,
+				password: server.password,
+				sdp: server.sdp
+			};
+		});
+	}
+	/**
 	* Synthesize the HTTP-FLV pull URL for a (channel, profile) pair. FLV is
 	* served off the Reolink Baichuan media port (default 1935, app `bcs`) as
 	* `channel<channel>_<profile>.bcs` — the same shape Frigate/go2rtc use. The
@@ -220743,13 +220826,16 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 		}
 		const url = `tcp://${`${encodeURIComponent(server.username)}:${encodeURIComponent(server.password)}`}@${server.host}:${server.port}`;
 		const codec = server.videoType === "H265" ? "h265" : "h264";
+		const descriptor = this.cachedStreamDescriptors?.find((d) => d.camStreamId === camStreamId);
 		await this.publishOne({
 			camStreamId,
 			kind: "pull-rfc4571",
-			label: camStreamId,
+			label: descriptor?.label ?? camStreamId,
 			url,
 			codec,
 			autoEligible: true,
+			...descriptor?.resolution ? { resolution: descriptor.resolution } : {},
+			...descriptor?.fps !== void 0 ? { fps: descriptor.fps } : {},
 			metadata: { sdp: server.sdp }
 		});
 		this.ctx.logger.info("materialized rfc4571 stream socket on broker demand", {

package/package.json

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