@camstack/system 1.2.265 → 1.2.267

package/dist/builtins/camera-grid/grid-profiles.d.ts

@@ -1,4 +1,5 @@
 import { CamProfile } from '@camstack/types';
+import { NormalizedRect } from './grid-filter-graph.js';
 /**
  * One id, for every grid, forever.
  *
@@ -20,15 +21,33 @@ export declare const GRID_CAM_STREAM_ID = "grid";
 export declare const GRID_OUTPUT_PROFILE: CamProfile;
 /** The cheapest stream this source serves, or `null` when it serves none. */
 export declare function lowestServedProfile(served: readonly CamProfile[]): CamProfile | null;
+/** One stream a camera serves, with the size that decides whether it fits. */
+export interface ServedProfile {
+    readonly profile: CamProfile;
+    /** `0` means the broker stated no size — see `gridSourceProfiles`. */
+    readonly width: number;
+    readonly height: number;
+}
+/** One cell, as the two rectangles that decide what its source must carry. */
+export interface GridSourceCell {
+    readonly deviceId: number;
+    /** The part of the source it shows, normalized against the SOURCE. */
+    readonly source: NormalizedRect;
+    /** Where it lands, normalized against the CANVAS. */
+    readonly cell: NormalizedRect;
+}
 export interface GridSourceProfilesInput {
-    /** Every camera the composition takes a cell from, deduplicated. */
-    readonly sourceDeviceIds: readonly number[];
+    readonly canvas: {
+        readonly width: number;
+        readonly height: number;
+    };
+    readonly cells: readonly GridSourceCell[];
     /**
-     * Which profiles this source can serve, or `null` when nobody could say.
+     * Which streams this source can serve, or `null` when nobody could say.
      * `null` is not an empty list: an unanswerable question is a refusal, and
      * saying so separately keeps "we did not ask" out of the catalog.
      */
-    readonly profilesServedBy: (deviceId: number) => readonly CamProfile[] | null;
+    readonly profilesServedBy: (deviceId: number) => readonly ServedProfile[] | null;
 }
 export interface GridSourcePlan {
     /** True when every source can be read — the only case a grid is on offer. */

package/dist/builtins/camera-grid/index.js

@@ -956,18 +956,59 @@ var CHEAPEST_FIRST = [
 function lowestServedProfile(served) {
 	return CHEAPEST_FIRST.find((profile) => served.includes(profile)) ?? null;
 }
+/** The pixels a cell needs BEHIND it, before the crop takes its share. */
+function requiredSourceSize(cell, canvas) {
+	const tileWidth = cell.cell.width * canvas.width;
+	const tileHeight = cell.cell.height * canvas.height;
+	const cropWidth = cell.source.width > 0 ? cell.source.width : 1;
+	const cropHeight = cell.source.height > 0 ? cell.source.height : 1;
+	return {
+		width: tileWidth / cropWidth,
+		height: tileHeight / cropHeight
+	};
+}
+/**
+* The cheapest stream that covers `need`, or the BIGGEST when none does.
+*
+* Soft beats absent: a camera whose best stream cannot fill its cell still
+* composes, at the best it has. Refusing would take the whole grid down over
+* one cell being drawn larger than its source.
+*
+* A stream that states NO size cannot be compared, so it is ordered as cheapest
+* rather than discarded — an unmeasurable stream is still a stream, and the
+* picture is what the operator asked for.
+*/
+function bestFit(served, need) {
+	if (served.length === 0) return null;
+	const order = new Map(CHEAPEST_FIRST.map((profile, index) => [profile, index]));
+	const cheapestFirst = [...served].sort((a, b) => (order.get(a.profile) ?? 0) - (order.get(b.profile) ?? 0));
+	const unmeasurable = cheapestFirst.find((s) => s.width <= 0 || s.height <= 0);
+	if (unmeasurable !== void 0) return unmeasurable.profile;
+	const covering = cheapestFirst.find((s) => s.width >= need.width && s.height >= need.height);
+	if (covering !== void 0) return covering.profile;
+	return cheapestFirst.reduce((best, s) => s.width * s.height > best.width * best.height ? s : best).profile;
+}
 /** Which stream to read each source at, and who cannot be read at all. */
 function gridSourceProfiles(input) {
+	const neededBySource = /* @__PURE__ */ new Map();
+	for (const cell of input.cells) {
+		const need = requiredSourceSize(cell, input.canvas);
+		const current = neededBySource.get(cell.deviceId);
+		neededBySource.set(cell.deviceId, {
+			width: Math.max(current?.width ?? 0, need.width),
+			height: Math.max(current?.height ?? 0, need.height)
+		});
+	}
 	const profileBySource = /* @__PURE__ */ new Map();
 	const missingSources = [];
-	for (const deviceId of input.sourceDeviceIds) {
+	for (const [deviceId, need] of neededBySource) {
 		const served = input.profilesServedBy(deviceId);
-		const chosen = served === null ? null : lowestServedProfile(served);
+		const chosen = served === null ? null : bestFit(served, need);
 		if (chosen === null) missingSources.push(deviceId);
 		else profileBySource.set(deviceId, chosen);
 	}
 	return {
-		offered: input.sourceDeviceIds.length > 0 && missingSources.length === 0,
+		offered: neededBySource.size > 0 && missingSources.length === 0,
 		profileBySource,
 		missingSources
 	};
@@ -2243,6 +2284,25 @@ async function startGridCompositorChild(ctx, plan, sources, onEnded) {
 	};
 	let encoderIn = null;
 	let encoderOut = null;
+	let draining = false;
+	let tick = null;
+	const compositor = new GridCompositor({
+		plan: tilePlan,
+		write: (frame) => {
+			const sink = encoderIn;
+			if (sink === null || draining || sink.destroyed) return false;
+			const accepted = sink.write(frame);
+			if (!accepted) draining = true;
+			return accepted;
+		}
+	});
+	const startTick = () => {
+		if (tick !== null) return;
+		tick = setInterval(() => {
+			compositor.tick();
+		}, Math.max(1, Math.round(1e3 / plan.fps)));
+		tick.unref();
+	};
 	const encoder = new _camstack_types_node.FfmpegProcess({
 		binaryPath: ctx.binaryPath,
 		buildArgs: () => require_dist.buildFfmpegArgs(gridCanvasEncoderInvocation({
@@ -2266,34 +2326,26 @@ async function startGridCompositorChild(ctx, plan, sources, onEnded) {
 		onChild: (child) => {
 			encoderIn = child.stdin;
 			if (child.stdout) encoderOut = child.stdout;
+			child.stdin?.on("drain", () => {
+				draining = false;
+			});
+			startTick();
 			child.stderr?.on("data", () => {});
 			child.stdin?.on("error", () => {});
 		},
 		onExit: (exit) => end(`encoder:${exit.classification}`)
 	});
-	await encoder.start();
+	try {
+		await encoder.start();
+	} catch (error) {
+		if (tick !== null) clearInterval(tick);
+		compositor.close();
+		throw error;
+	}
 	if (encoderIn === null || encoderOut === null) {
 		await encoder.stop();
 		throw new Error("camera-grid: the canvas encoder exposed no stdin/stdout to compose into");
 	}
-	let draining = false;
-	const sink = encoderIn;
-	sink.on("drain", () => {
-		draining = false;
-	});
-	const compositor = new GridCompositor({
-		plan: tilePlan,
-		write: (frame) => {
-			if (draining || sink.destroyed) return false;
-			const accepted = sink.write(frame);
-			if (!accepted) draining = true;
-			return accepted;
-		}
-	});
-	const tick = setInterval(() => {
-		compositor.tick();
-	}, Math.max(1, Math.round(1e3 / plan.fps)));
-	tick.unref();
 	const urlByDeviceId = /* @__PURE__ */ new Map();
 	for (const [index, deviceId] of plan.sourceDeviceIds.entries()) {
 		const url = sources[index]?.url;
@@ -2333,7 +2385,7 @@ async function startGridCompositorChild(ctx, plan, sources, onEnded) {
 		await decoder.start();
 	};
 	const stopAll = async () => {
-		clearInterval(tick);
+		if (tick !== null) clearInterval(tick);
 		compositor.close();
 		await Promise.allSettled(decoders.map((d) => d.stop()));
 		await encoder.stop();
@@ -2677,12 +2729,24 @@ var CameraGridAddon = class extends require_dist.BaseAddon {
 		for (const slot of slots) {
 			if (slot.sourceCamStreamId === null) continue;
 			const profiles = servedBy.get(slot.deviceId) ?? [];
-			profiles.push(slot.profile);
+			profiles.push({
+				profile: slot.profile,
+				width: slot.resolution?.width ?? 0,
+				height: slot.resolution?.height ?? 0
+			});
 			servedBy.set(slot.deviceId, profiles);
 		}
 		for (const instance of instances) {
 			const plan = gridSourceProfiles({
-				sourceDeviceIds: [...new Set(instance.cells.map((cell) => cell.deviceId))],
+				canvas: {
+					width: instance.width,
+					height: instance.height
+				},
+				cells: instance.cells.map((cell) => ({
+					deviceId: cell.deviceId,
+					source: cell.source,
+					cell: cell.cell
+				})),
 				profilesServedBy: (deviceId) => servedBy.get(deviceId) ?? null
 			});
 			const previous = this.planByInstanceId.get(instance.id);

package/dist/builtins/camera-grid/index.mjs

@@ -951,18 +951,59 @@ var CHEAPEST_FIRST = [
 function lowestServedProfile(served) {
 	return CHEAPEST_FIRST.find((profile) => served.includes(profile)) ?? null;
 }
+/** The pixels a cell needs BEHIND it, before the crop takes its share. */
+function requiredSourceSize(cell, canvas) {
+	const tileWidth = cell.cell.width * canvas.width;
+	const tileHeight = cell.cell.height * canvas.height;
+	const cropWidth = cell.source.width > 0 ? cell.source.width : 1;
+	const cropHeight = cell.source.height > 0 ? cell.source.height : 1;
+	return {
+		width: tileWidth / cropWidth,
+		height: tileHeight / cropHeight
+	};
+}
+/**
+* The cheapest stream that covers `need`, or the BIGGEST when none does.
+*
+* Soft beats absent: a camera whose best stream cannot fill its cell still
+* composes, at the best it has. Refusing would take the whole grid down over
+* one cell being drawn larger than its source.
+*
+* A stream that states NO size cannot be compared, so it is ordered as cheapest
+* rather than discarded — an unmeasurable stream is still a stream, and the
+* picture is what the operator asked for.
+*/
+function bestFit(served, need) {
+	if (served.length === 0) return null;
+	const order = new Map(CHEAPEST_FIRST.map((profile, index) => [profile, index]));
+	const cheapestFirst = [...served].sort((a, b) => (order.get(a.profile) ?? 0) - (order.get(b.profile) ?? 0));
+	const unmeasurable = cheapestFirst.find((s) => s.width <= 0 || s.height <= 0);
+	if (unmeasurable !== void 0) return unmeasurable.profile;
+	const covering = cheapestFirst.find((s) => s.width >= need.width && s.height >= need.height);
+	if (covering !== void 0) return covering.profile;
+	return cheapestFirst.reduce((best, s) => s.width * s.height > best.width * best.height ? s : best).profile;
+}
 /** Which stream to read each source at, and who cannot be read at all. */
 function gridSourceProfiles(input) {
+	const neededBySource = /* @__PURE__ */ new Map();
+	for (const cell of input.cells) {
+		const need = requiredSourceSize(cell, input.canvas);
+		const current = neededBySource.get(cell.deviceId);
+		neededBySource.set(cell.deviceId, {
+			width: Math.max(current?.width ?? 0, need.width),
+			height: Math.max(current?.height ?? 0, need.height)
+		});
+	}
 	const profileBySource = /* @__PURE__ */ new Map();
 	const missingSources = [];
-	for (const deviceId of input.sourceDeviceIds) {
+	for (const [deviceId, need] of neededBySource) {
 		const served = input.profilesServedBy(deviceId);
-		const chosen = served === null ? null : lowestServedProfile(served);
+		const chosen = served === null ? null : bestFit(served, need);
 		if (chosen === null) missingSources.push(deviceId);
 		else profileBySource.set(deviceId, chosen);
 	}
 	return {
-		offered: input.sourceDeviceIds.length > 0 && missingSources.length === 0,
+		offered: neededBySource.size > 0 && missingSources.length === 0,
 		profileBySource,
 		missingSources
 	};
@@ -2238,6 +2279,25 @@ async function startGridCompositorChild(ctx, plan, sources, onEnded) {
 	};
 	let encoderIn = null;
 	let encoderOut = null;
+	let draining = false;
+	let tick = null;
+	const compositor = new GridCompositor({
+		plan: tilePlan,
+		write: (frame) => {
+			const sink = encoderIn;
+			if (sink === null || draining || sink.destroyed) return false;
+			const accepted = sink.write(frame);
+			if (!accepted) draining = true;
+			return accepted;
+		}
+	});
+	const startTick = () => {
+		if (tick !== null) return;
+		tick = setInterval(() => {
+			compositor.tick();
+		}, Math.max(1, Math.round(1e3 / plan.fps)));
+		tick.unref();
+	};
 	const encoder = new FfmpegProcess({
 		binaryPath: ctx.binaryPath,
 		buildArgs: () => buildFfmpegArgs(gridCanvasEncoderInvocation({
@@ -2261,34 +2321,26 @@ async function startGridCompositorChild(ctx, plan, sources, onEnded) {
 		onChild: (child) => {
 			encoderIn = child.stdin;
 			if (child.stdout) encoderOut = child.stdout;
+			child.stdin?.on("drain", () => {
+				draining = false;
+			});
+			startTick();
 			child.stderr?.on("data", () => {});
 			child.stdin?.on("error", () => {});
 		},
 		onExit: (exit) => end(`encoder:${exit.classification}`)
 	});
-	await encoder.start();
+	try {
+		await encoder.start();
+	} catch (error) {
+		if (tick !== null) clearInterval(tick);
+		compositor.close();
+		throw error;
+	}
 	if (encoderIn === null || encoderOut === null) {
 		await encoder.stop();
 		throw new Error("camera-grid: the canvas encoder exposed no stdin/stdout to compose into");
 	}
-	let draining = false;
-	const sink = encoderIn;
-	sink.on("drain", () => {
-		draining = false;
-	});
-	const compositor = new GridCompositor({
-		plan: tilePlan,
-		write: (frame) => {
-			if (draining || sink.destroyed) return false;
-			const accepted = sink.write(frame);
-			if (!accepted) draining = true;
-			return accepted;
-		}
-	});
-	const tick = setInterval(() => {
-		compositor.tick();
-	}, Math.max(1, Math.round(1e3 / plan.fps)));
-	tick.unref();
 	const urlByDeviceId = /* @__PURE__ */ new Map();
 	for (const [index, deviceId] of plan.sourceDeviceIds.entries()) {
 		const url = sources[index]?.url;
@@ -2328,7 +2380,7 @@ async function startGridCompositorChild(ctx, plan, sources, onEnded) {
 		await decoder.start();
 	};
 	const stopAll = async () => {
-		clearInterval(tick);
+		if (tick !== null) clearInterval(tick);
 		compositor.close();
 		await Promise.allSettled(decoders.map((d) => d.stop()));
 		await encoder.stop();
@@ -2672,12 +2724,24 @@ var CameraGridAddon = class extends BaseAddon {
 		for (const slot of slots) {
 			if (slot.sourceCamStreamId === null) continue;
 			const profiles = servedBy.get(slot.deviceId) ?? [];
-			profiles.push(slot.profile);
+			profiles.push({
+				profile: slot.profile,
+				width: slot.resolution?.width ?? 0,
+				height: slot.resolution?.height ?? 0
+			});
 			servedBy.set(slot.deviceId, profiles);
 		}
 		for (const instance of instances) {
 			const plan = gridSourceProfiles({
-				sourceDeviceIds: [...new Set(instance.cells.map((cell) => cell.deviceId))],
+				canvas: {
+					width: instance.width,
+					height: instance.height
+				},
+				cells: instance.cells.map((cell) => ({
+					deviceId: cell.deviceId,
+					source: cell.source,
+					cell: cell.cell
+				})),
 				profilesServedBy: (deviceId) => servedBy.get(deviceId) ?? null
 			});
 			const previous = this.planByInstanceId.get(instance.id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/system",
-  "version": "1.2.265",
+  "version": "1.2.267",
   "description": "Core addon for CamStack — builtins, pipeline, process management, auth, logging, events",
   "keywords": [
     "camstack",