@camstack/system 1.2.265 → 1.2.266

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

@@ -2243,6 +2243,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 +2285,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 +2344,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();

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

@@ -2238,6 +2238,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 +2280,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 +2339,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();

package/package.json

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