@koda-sl/baker-cli 0.200.0-dev.0a9adf6f7 → 0.201.0-dev.0a9adf6f7

package/dist/cli.js

@@ -51,8 +51,9 @@ import {
   supportsReferenceToVideo,
   toModelSafeImage,
   ulid,
-  validateCanvasDeep
-} from "./chunk-ONFW7HIK.js";
+  validateCanvasDeep,
+  ytDlpBlockSignal
+} from "./chunk-CAWFJ5X3.js";
 import {
   csvOrJson,
   daysAgoIso,
@@ -42480,6 +42481,10 @@ function isToolingOrBlockFailure(detail) {
   const haystack = detail.toLowerCase();
   return TOOLING_OR_BLOCK_SIGNATURES.some((signature) => haystack.includes(signature));
 }
+var NOT_ABOUT_THE_URL = ["UNAUTHORIZED", "FORBIDDEN", "RATE_LIMITED", "INTERNAL", "VALIDATION_ERROR", "NOT_FOUND"];
+function worthDownloadingInstead(errorCode) {
+  return !NOT_ABOUT_THE_URL.includes(errorCode);
+}
 function safePathname(rawUrl) {
   try {
     return new URL(rawUrl).pathname.toLowerCase();
@@ -42541,6 +42546,18 @@ async function runVideoIngest(opts) {
     externalId: opts.externalId,
     externalUrl: opts.externalUrl ?? (direct ? void 0 : url)
   };
+  const validation = videosIngestRequestSchema.safeParse({ ...args, url });
+  if (!validation.success) {
+    const problem = validation.error.issues[0];
+    writeJson({
+      ok: false,
+      error: {
+        code: "VALIDATION_ERROR",
+        message: problem ? `${problem.path.join(".") || "request"}: ${problem.message}` : "Invalid request"
+      }
+    });
+    process.exit(1);
+  }
   if (opts.dryRun) {
     writeJson({
       ok: true,
@@ -42569,7 +42586,7 @@ async function ingestByRoute(args, direct) {
   try {
     return { ...await ingestUrl(args), via: "direct" };
   } catch (err) {
-    if (!(err instanceof ApiError)) throw err;
+    if (!(err instanceof ApiError) || !worthDownloadingInstead(err.code)) throw err;
     return { ...await downloadThenIngest(args), via: "download", fallbackFrom: err.message };
   }
 }
@@ -42579,7 +42596,19 @@ function reportIngestFailure(err) {
     process.exit(1);
   }
   if (err instanceof YtDlpError) {
-    const toolingOrBlock = isToolingOrBlockFailure(`${err.stderrTail} ${err.message}`);
+    const detail = `${err.stderrTail} ${err.message}`;
+    if (isProxyFailure(ytDlpBlockSignal(detail))) {
+      writeJson({
+        ok: false,
+        error: {
+          code: "INGEST_FAILED",
+          message: "Couldn't download that video: our connection to the internet was refused.",
+          fix: "This is Baker's egress proxy, not the link \u2014 its credentials look wrong or expired. The link is probably fine. Report it; retrying won't help until the proxy is fixed."
+        }
+      });
+      process.exit(1);
+    }
+    const toolingOrBlock = isToolingOrBlockFailure(detail);
     writeJson({
       ok: false,
       error: {
@@ -42605,7 +42634,7 @@ function ingestUrl(args) {
 async function downloadThenIngest(args) {
   const workDir = await mkdtemp2(path35.join(tmpdir3(), "videos-ingest-"));
   try {
-    const { filePath, info } = await runYtDlp({
+    const { filePath, info, tier } = await runYtDlp({
       url: args.url,
       audioOnly: false,
       workDir,
@@ -42621,7 +42650,10 @@ async function downloadThenIngest(args) {
     const bytes = await readFile24(filePath);
     const publicUrl = await uploadToAssetStore(bytes);
     const externalId = args.externalId ?? (typeof info.id === "string" ? `${args.source}:${info.id}` : void 0);
-    return await ingestUrl({ ...args, url: publicUrl, externalId, externalUrl: args.externalUrl ?? args.url });
+    return {
+      ...await ingestUrl({ ...args, url: publicUrl, externalId, externalUrl: args.externalUrl ?? args.url }),
+      egress: tier
+    };
   } finally {
     await rm7(workDir, { recursive: true, force: true }).catch(() => {
     });