@camstack/types 1.2.226 → 1.2.227

package/dist/deps/ffmpeg-downloader.d.ts

@@ -1,10 +1,36 @@
 import type { IScopedLogger } from '../interfaces/logging.js';
+/**
+ * One artifact per platform+arch: the URL, how it is packed, and what the
+ * binary inside is SUPPOSED to be able to do.
+ *
+ * It is a table rather than two functions computing strings because the three
+ * facts belong together and drifted apart when they did not:
+ *
+ * - the darwin branch computed an arch and then discarded it, handing an
+ *   Intel Mac an arm64 Mach-O it cannot execute under any translation;
+ * - a single `FFMPEG_VERSION = '7.1'` named the version of nothing — the linux
+ *   URL is unversioned and serves 7.0.2 — so the inner path built from it never
+ *   matched and only the extractor's recursive fallback saved it;
+ * - and nothing recorded what a download was expected to be capable of, which
+ *   is how a build with no VAAPI at all served every transcode on this fleet
+ *   for months (D536).
+ *
+ * `expectedHwaccels` is that missing claim. It is deliberately EMPTY for the
+ * linux static builds: they carry no hardware support and pretending otherwise
+ * would make the assertion a lie. That emptiness is the honest description of
+ * a portable build, and the reason a node that has an image prefers the image's
+ * ffmpeg over this one.
+ */
+export interface FfmpegArtifact {
+    readonly url: string;
+    readonly archiveFormat: 'zip' | 'tar.gz' | 'tar.xz';
+    /** `-hwaccels` names this artifact is built with. Empty = none, honestly. */
+    readonly expectedHwaccels: readonly string[];
+}
+/** The artifact for this node, or a refusal naming what was asked for. */
+export declare function getFfmpegArtifact(platform: string, arch: string): FfmpegArtifact;
+/** The URL alone, for a caller that wants nothing else. */
 export declare function getFfmpegDownloadUrl(platform: string, arch: string): string;
-export declare function getFfmpegArchiveInfo(platform: string): {
-    isArchive: boolean;
-    archiveFormat: 'zip' | 'tar.gz' | 'tar.xz';
-    archiveInnerPath: string;
-};
 /**
  * Ensure an ffmpeg binary WE provide is available on this node, and report
  * which one and what it can do.

package/dist/deps/index.d.ts

@@ -1,3 +1,3 @@
 export { ensureBinary, downloadBinary, findInPath, getPlatformInfo, buildBinaryPath, } from './binary-downloader.js';
-export { ensureFfmpeg, getFfmpegDownloadUrl } from './ffmpeg-downloader.js';
+export { ensureFfmpeg, getFfmpegArtifact, getFfmpegDownloadUrl } from './ffmpeg-downloader.js';
 export { ensurePython, installPythonPackages, installPythonRequirements, getPythonDownloadUrl, PYTHON_VERSION, } from './python-downloader.js';

package/dist/node.d.ts

@@ -1,6 +1,6 @@
 export type { PlatformInfo } from './deps/binary-downloader.js';
 export { buildBinaryPath, downloadBinary, ensureBinary, findInPath, getPlatformInfo, } from './deps/binary-downloader.js';
-export { ensureFfmpeg, getFfmpegDownloadUrl } from './deps/ffmpeg-downloader.js';
+export { ensureFfmpeg, getFfmpegArtifact, getFfmpegDownloadUrl } from './deps/ffmpeg-downloader.js';
 export { probeFfmpegBinary, parseFfmpegCapabilities, type FfmpegBinaryCapabilities, } from './ffmpeg/binary-capabilities.js';
 export { ensurePython, getPythonDownloadUrl, installPythonPackages, installPythonRequirements, PYTHON_VERSION, } from './deps/python-downloader.js';
 export type { Fmp4FragmentChildArgs, Fmp4FragmentChildDeps, } from './ffmpeg/fmp4-fragment-child.js';

package/dist/node.js

@@ -388,40 +388,42 @@ function bundledFfmpegPath(platform) {
 * - Linux: https://johnvansickle.com/ffmpeg/ (static builds)
 * - macOS: https://www.osxexperts.net/
 */
-var FFMPEG_VERSION = "7.1";
-function getFfmpegDownloadUrl(platform, arch) {
-	switch (platform) {
-		case "linux": {
-			const a = {
-				x64: "amd64",
-				arm64: "arm64"
-			}[arch];
-			if (!a) throw new Error(`Unsupported Linux architecture: ${arch}`);
-			return `https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-${a}-static.tar.xz`;
-		}
-		case "darwin":
-			if (!{
-				arm64: "arm64",
-				x64: "amd64"
-			}[arch]) throw new Error(`Unsupported macOS architecture: ${arch}`);
-			return `https://www.osxexperts.net/ffmpeg${FFMPEG_VERSION.replace(".", "")}arm.zip`;
-		default: throw new Error(`Unsupported platform: ${platform}`);
+/**
+* johnvansickle for linux (unversioned "release" URLs, so no version appears
+* here), osxexperts for macOS — two different builds, and the Intel one is a
+* different file at a different version from the arm one.
+*/
+var FFMPEG_ARTIFACTS = {
+	"linux-x64": {
+		url: "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz",
+		archiveFormat: "tar.xz",
+		expectedHwaccels: []
+	},
+	"linux-arm64": {
+		url: "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-arm64-static.tar.xz",
+		archiveFormat: "tar.xz",
+		expectedHwaccels: []
+	},
+	"darwin-arm64": {
+		url: "https://www.osxexperts.net/ffmpeg71arm.zip",
+		archiveFormat: "zip",
+		expectedHwaccels: ["videotoolbox"]
+	},
+	"darwin-x64": {
+		url: "https://www.osxexperts.net/ffmpeg80intel.zip",
+		archiveFormat: "zip",
+		expectedHwaccels: ["videotoolbox"]
 	}
+};
+/** The artifact for this node, or a refusal naming what was asked for. */
+function getFfmpegArtifact(platform, arch) {
+	const artifact = FFMPEG_ARTIFACTS[`${platform}-${arch}`];
+	if (!artifact) throw new Error(`Unsupported platform/architecture for ffmpeg: ${platform}-${arch}`);
+	return artifact;
 }
-function getFfmpegArchiveInfo(platform) {
-	switch (platform) {
-		case "linux": return {
-			isArchive: true,
-			archiveFormat: "tar.xz",
-			archiveInnerPath: `ffmpeg-${FFMPEG_VERSION}-amd64-static/ffmpeg`
-		};
-		case "darwin": return {
-			isArchive: true,
-			archiveFormat: "zip",
-			archiveInnerPath: "ffmpeg"
-		};
-		default: throw new Error(`Unsupported platform: ${platform}`);
-	}
+/** The URL alone, for a caller that wants nothing else. */
+function getFfmpegDownloadUrl(platform, arch) {
+	return getFfmpegArtifact(platform, arch).url;
 }
 /**
 * Ensure an ffmpeg binary WE provide is available on this node, and report
@@ -450,13 +452,15 @@ async function ensureFfmpeg(dataDir, logger) {
 		exists: node_fs.existsSync
 	});
 	if (override !== void 0 && override.trim().length > 0 && chosen?.origin !== "override") logger.error(`${FFMPEG_PATH_ENV} names a binary that does not exist — ignoring it`, { meta: { [FFMPEG_PATH_ENV]: override } });
+	const artifact = chosen === null ? getFfmpegArtifact(platform, arch) : null;
 	const path = chosen?.path ?? await downloadBinary({
 		name: "ffmpeg",
-		url: getFfmpegDownloadUrl(platform, arch),
+		url: artifact?.url ?? getFfmpegDownloadUrl(platform, arch),
 		targetDir: depsDir,
 		targetName: `ffmpeg${ext}`,
 		logger,
-		...getFfmpegArchiveInfo(platform)
+		isArchive: true,
+		archiveFormat: artifact?.archiveFormat ?? "tar.xz"
 	});
 	const capabilities = await probeFfmpegBinary(path);
 	logger.info("ffmpeg binary resolved", { meta: {
@@ -465,6 +469,15 @@ async function ensureFfmpeg(dataDir, logger) {
 		version: capabilities.version,
 		hwaccels: [...capabilities.hwaccels].join(",") || "none"
 	} });
+	if (artifact !== null) {
+		const missing = artifact.expectedHwaccels.filter((name) => !capabilities.hwaccels.has(name));
+		if (missing.length > 0) logger.error("the ffmpeg we downloaded cannot do what this artifact is supposed to — the source changed under us", { meta: {
+			url: artifact.url,
+			expected: artifact.expectedHwaccels.join(","),
+			missing: missing.join(","),
+			got: [...capabilities.hwaccels].join(",") || "none"
+		} });
+	}
 	return path;
 }
 //#endregion
@@ -1964,6 +1977,7 @@ exports.ensureBinary = ensureBinary;
 exports.ensureFfmpeg = ensureFfmpeg;
 exports.ensurePython = ensurePython;
 exports.findInPath = findInPath;
+exports.getFfmpegArtifact = getFfmpegArtifact;
 exports.getFfmpegDownloadUrl = getFfmpegDownloadUrl;
 exports.getPlatformInfo = getPlatformInfo;
 exports.getPythonDownloadUrl = getPythonDownloadUrl;

package/dist/node.mjs

@@ -365,40 +365,42 @@ function bundledFfmpegPath(platform) {
 * - Linux: https://johnvansickle.com/ffmpeg/ (static builds)
 * - macOS: https://www.osxexperts.net/
 */
-var FFMPEG_VERSION = "7.1";
-function getFfmpegDownloadUrl(platform, arch) {
-	switch (platform) {
-		case "linux": {
-			const a = {
-				x64: "amd64",
-				arm64: "arm64"
-			}[arch];
-			if (!a) throw new Error(`Unsupported Linux architecture: ${arch}`);
-			return `https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-${a}-static.tar.xz`;
-		}
-		case "darwin":
-			if (!{
-				arm64: "arm64",
-				x64: "amd64"
-			}[arch]) throw new Error(`Unsupported macOS architecture: ${arch}`);
-			return `https://www.osxexperts.net/ffmpeg${FFMPEG_VERSION.replace(".", "")}arm.zip`;
-		default: throw new Error(`Unsupported platform: ${platform}`);
+/**
+* johnvansickle for linux (unversioned "release" URLs, so no version appears
+* here), osxexperts for macOS — two different builds, and the Intel one is a
+* different file at a different version from the arm one.
+*/
+var FFMPEG_ARTIFACTS = {
+	"linux-x64": {
+		url: "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz",
+		archiveFormat: "tar.xz",
+		expectedHwaccels: []
+	},
+	"linux-arm64": {
+		url: "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-arm64-static.tar.xz",
+		archiveFormat: "tar.xz",
+		expectedHwaccels: []
+	},
+	"darwin-arm64": {
+		url: "https://www.osxexperts.net/ffmpeg71arm.zip",
+		archiveFormat: "zip",
+		expectedHwaccels: ["videotoolbox"]
+	},
+	"darwin-x64": {
+		url: "https://www.osxexperts.net/ffmpeg80intel.zip",
+		archiveFormat: "zip",
+		expectedHwaccels: ["videotoolbox"]
 	}
+};
+/** The artifact for this node, or a refusal naming what was asked for. */
+function getFfmpegArtifact(platform, arch) {
+	const artifact = FFMPEG_ARTIFACTS[`${platform}-${arch}`];
+	if (!artifact) throw new Error(`Unsupported platform/architecture for ffmpeg: ${platform}-${arch}`);
+	return artifact;
 }
-function getFfmpegArchiveInfo(platform) {
-	switch (platform) {
-		case "linux": return {
-			isArchive: true,
-			archiveFormat: "tar.xz",
-			archiveInnerPath: `ffmpeg-${FFMPEG_VERSION}-amd64-static/ffmpeg`
-		};
-		case "darwin": return {
-			isArchive: true,
-			archiveFormat: "zip",
-			archiveInnerPath: "ffmpeg"
-		};
-		default: throw new Error(`Unsupported platform: ${platform}`);
-	}
+/** The URL alone, for a caller that wants nothing else. */
+function getFfmpegDownloadUrl(platform, arch) {
+	return getFfmpegArtifact(platform, arch).url;
 }
 /**
 * Ensure an ffmpeg binary WE provide is available on this node, and report
@@ -427,13 +429,15 @@ async function ensureFfmpeg(dataDir, logger) {
 		exists: existsSync
 	});
 	if (override !== void 0 && override.trim().length > 0 && chosen?.origin !== "override") logger.error(`${FFMPEG_PATH_ENV} names a binary that does not exist — ignoring it`, { meta: { [FFMPEG_PATH_ENV]: override } });
+	const artifact = chosen === null ? getFfmpegArtifact(platform, arch) : null;
 	const path = chosen?.path ?? await downloadBinary({
 		name: "ffmpeg",
-		url: getFfmpegDownloadUrl(platform, arch),
+		url: artifact?.url ?? getFfmpegDownloadUrl(platform, arch),
 		targetDir: depsDir,
 		targetName: `ffmpeg${ext}`,
 		logger,
-		...getFfmpegArchiveInfo(platform)
+		isArchive: true,
+		archiveFormat: artifact?.archiveFormat ?? "tar.xz"
 	});
 	const capabilities = await probeFfmpegBinary(path);
 	logger.info("ffmpeg binary resolved", { meta: {
@@ -442,6 +446,15 @@ async function ensureFfmpeg(dataDir, logger) {
 		version: capabilities.version,
 		hwaccels: [...capabilities.hwaccels].join(",") || "none"
 	} });
+	if (artifact !== null) {
+		const missing = artifact.expectedHwaccels.filter((name) => !capabilities.hwaccels.has(name));
+		if (missing.length > 0) logger.error("the ffmpeg we downloaded cannot do what this artifact is supposed to — the source changed under us", { meta: {
+			url: artifact.url,
+			expected: artifact.expectedHwaccels.join(","),
+			missing: missing.join(","),
+			got: [...capabilities.hwaccels].join(",") || "none"
+		} });
+	}
 	return path;
 }
 //#endregion
@@ -1924,4 +1937,4 @@ function resolveExportFingerprint(input) {
 	return input.persisted ?? input.fresh;
 }
 //#endregion
-export { ChildCostRegistry, FfmpegProcess, FilesystemStorageProvider, Fmp4FragmentChild, Fmp4FragmentPlane, NO_COST_CLAIM, PYTHON_VERSION, buildBinaryPath, canonicalDeviceFingerprint, canonicalHash, containsOrEquals, diffExportTargets, downloadBinary, ensureBinary, ensureFfmpeg, ensurePython, findInPath, getFfmpegDownloadUrl, getPlatformInfo, getPythonDownloadUrl, installPythonPackages, installPythonRequirements, nodeProcStatReader, parseFfmpegCapabilities, parseProcCpuSeconds, parseProcRssBytes, physicalRootOf, probeFfmpegBinary, readProcessCost, resolveExportFingerprint, signExpiringUrl, verifyExpiringUrl };
+export { ChildCostRegistry, FfmpegProcess, FilesystemStorageProvider, Fmp4FragmentChild, Fmp4FragmentPlane, NO_COST_CLAIM, PYTHON_VERSION, buildBinaryPath, canonicalDeviceFingerprint, canonicalHash, containsOrEquals, diffExportTargets, downloadBinary, ensureBinary, ensureFfmpeg, ensurePython, findInPath, getFfmpegArtifact, getFfmpegDownloadUrl, getPlatformInfo, getPythonDownloadUrl, installPythonPackages, installPythonRequirements, nodeProcStatReader, parseFfmpegCapabilities, parseProcCpuSeconds, parseProcRssBytes, physicalRootOf, probeFfmpegBinary, readProcessCost, resolveExportFingerprint, signExpiringUrl, verifyExpiringUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/types",
-  "version": "1.2.226",
+  "version": "1.2.227",
   "description": "Shared types, interfaces, and model catalogs for the CamStack detection ecosystem",
   "keywords": [
     "camstack",