@mkterswingman/5mghost-yonder 0.0.12 → 0.0.13

package/dist/download/downloader.d.ts

@@ -38,6 +38,7 @@ interface DownloadOneItemDeps {
         videoQuality: string;
         onProgress: (update: DownloadOneItemProgressUpdate) => void;
     }) => Promise<string>;
+    refreshCookies: () => Promise<boolean>;
     downloadSubtitles: (input: {
         videoId: string;
         sourceUrl: string;

package/dist/download/downloader.js

@@ -2,9 +2,11 @@ import { mkdir, rm, stat, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { downloadSubtitlesForLanguages, toReadableSubtitleJobError } from "../tools/subtitles.js";
 import { loadConfig } from "../utils/config.js";
+import { tryHeadlessRefresh } from "../utils/cookieRefresh.js";
 import { hasFfmpeg, isRuntimeMissingMessage } from "../utils/ffmpeg.js";
 import { formatBytes } from "../utils/formatters.js";
 import { hasYtDlp, runYtDlp, runYtDlpJson } from "../utils/ytdlp.js";
+import { appendDiagnosticLog, classifyYtDlpFailure } from "../utils/ytdlpFailures.js";
 import { parseYtDlpProgressLine } from "../utils/ytdlpProgress.js";
 export async function downloadOneItem(input) {
     const deps = resolveDeps(input.deps);
@@ -50,12 +52,28 @@ export async function downloadOneItem(input) {
         if (needsVideo(input.mode)) {
             currentStep = "download_video";
             manager?.updateItemProgress(jobId, input.item.video_id, currentStep, 0);
-            result.video_file = await deps.downloadVideo({
-                sourceUrl: input.item.source_url,
-                outputFile: videoFile,
-                videoQuality,
-                onProgress,
-            });
+            try {
+                result.video_file = await deps.downloadVideo({
+                    sourceUrl: input.item.source_url,
+                    outputFile: videoFile,
+                    videoQuality,
+                    onProgress,
+                });
+            }
+            catch (error) {
+                const failureKind = classifyVideoDownloadError(error);
+                if (failureKind != null && failureKind !== "RATE_LIMITED" && await deps.refreshCookies()) {
+                    result.video_file = await deps.downloadVideo({
+                        sourceUrl: input.item.source_url,
+                        outputFile: videoFile,
+                        videoQuality,
+                        onProgress,
+                    });
+                }
+                else {
+                    throw error;
+                }
+            }
             result.final_file_size = formatBytes((await deps.stat(result.video_file)).size);
         }
         if (needsSubtitles(input.mode)) {
@@ -103,6 +121,7 @@ function resolveDeps(overrides) {
         hasFfmpeg,
         fetchMetadata: fetchMetadataWithYtDlp,
         downloadVideo: downloadVideoWithYtDlp,
+        refreshCookies: tryHeadlessRefresh,
         downloadSubtitles: downloadSubtitlesWithYtDlp,
         mkdir: async (path, options) => {
             await mkdir(path, options);
@@ -166,7 +185,17 @@ async function downloadVideoWithYtDlp(input) {
         }
     });
     if (result.exitCode !== 0) {
-        throw new Error(result.stderr.slice(0, 500) || `yt-dlp exited with ${result.exitCode}`);
+        const failureKind = classifyYtDlpFailure(result.stderr);
+        if (failureKind === "RATE_LIMITED") {
+            throw new Error(appendDiagnosticLog("The current YouTube session has been rate-limited. Wait and retry later.", result.failureLogPath));
+        }
+        if (failureKind === "SIGN_IN_REQUIRED") {
+            throw new Error(appendDiagnosticLog("YouTube requested an additional sign-in confirmation for this video.", result.failureLogPath));
+        }
+        if (failureKind === "COOKIES_INVALID" || failureKind === "COOKIES_EXPIRED") {
+            throw new Error(appendDiagnosticLog("YouTube rejected the current cookies for video download.", result.failureLogPath));
+        }
+        throw new Error(appendDiagnosticLog(result.stderr.slice(0, 500) || `yt-dlp exited with ${result.exitCode}`, result.failureLogPath));
     }
     return resolveYtDlpOutputPath(input.outputFile, result.stdout);
 }
@@ -259,6 +288,10 @@ function sortSubtitleFiles(files) {
         .sort(([left], [right]) => left.localeCompare(right))
         .map(([format, paths]) => [format, [...paths].sort()]));
 }
+function classifyVideoDownloadError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return classifyYtDlpFailure(message);
+}
 function toErrorMessage(error) {
     return toReadableSubtitleJobError(error);
 }

package/dist/tools/subtitles.js

@@ -5,12 +5,15 @@ import { PATHS } from "../utils/config.js";
 import { runYtDlp } from "../utils/ytdlp.js";
 import { hasSIDCookies, areCookiesExpired } from "../utils/cookies.js";
 import { tryHeadlessRefresh } from "../utils/cookieRefresh.js";
+import { appendDiagnosticLog, classifyYtDlpFailure } from "../utils/ytdlpFailures.js";
 import { resolveVideoInput, normalizeVideoInputs } from "../utils/videoInput.js";
 const AUTH_REQUIRED_MSG = "❌ 未认证。请先登录：\n• OAuth: npx @mkterswingman/5mghost-yonder setup\n• PAT: 设置环境变量 YT_MCP_TOKEN 或在 https://mkterswingman.com/pat/login 生成 token";
 const COOKIE_SETUP_COMMAND = "yt-mcp setup-cookies";
 const COOKIE_MISSING_MESSAGE = `No valid YouTube cookies found.\nPlease run in your terminal: ${COOKIE_SETUP_COMMAND}`;
 const COOKIE_EXPIRED_MESSAGE = `YouTube cookies have expired and auto-refresh failed.\nPlease run in your terminal: ${COOKIE_SETUP_COMMAND}`;
 const COOKIE_INVALID_MESSAGE = `YouTube rejected the current cookies and auto-refresh failed.\nPlease run in your terminal: ${COOKIE_SETUP_COMMAND}`;
+const SIGN_IN_REQUIRED_MESSAGE = `YouTube requested an additional sign-in confirmation and auto-refresh failed.\nPlease run in your terminal: ${COOKIE_SETUP_COMMAND}`;
+const RATE_LIMITED_MESSAGE = "The current YouTube session has been rate-limited. Wait and retry later.";
 const COOKIE_JOB_MESSAGE = `YouTube cookies are missing, expired, or invalid.\nPlease run in your terminal: ${COOKIE_SETUP_COMMAND}`;
 function toolOk(payload) {
     return {
@@ -56,30 +59,20 @@ function isCookieFailureText(error) {
         normalized.includes("login") ||
         normalized.includes("not a bot"));
 }
-function appendDiagnosticLog(message, logPath) {
-    return logPath ? `${message}\nDiagnostic log: ${logPath}` : message;
-}
 function classifyYtDlpCookieFailure(stderr) {
-    const normalized = stderr.toLowerCase();
-    if (normalized.includes("cookies are no longer valid") ||
-        normalized.includes("cookie has expired") ||
-        normalized.includes("cookies have expired") ||
-        normalized.includes("session expired")) {
-        return {
-            code: "COOKIES_EXPIRED",
-            message: COOKIE_EXPIRED_MESSAGE,
-        };
-    }
-    if (normalized.includes("sign in") ||
-        normalized.includes("login") ||
-        normalized.includes("cookies") ||
-        normalized.includes("not a bot")) {
-        return {
-            code: "COOKIES_INVALID",
-            message: COOKIE_INVALID_MESSAGE,
-        };
+    const kind = classifyYtDlpFailure(stderr);
+    switch (kind) {
+        case "COOKIES_EXPIRED":
+            return { code: kind, message: COOKIE_EXPIRED_MESSAGE };
+        case "COOKIES_INVALID":
+            return { code: kind, message: COOKIE_INVALID_MESSAGE };
+        case "SIGN_IN_REQUIRED":
+            return { code: kind, message: SIGN_IN_REQUIRED_MESSAGE };
+        case "RATE_LIMITED":
+            return { code: kind, message: RATE_LIMITED_MESSAGE };
+        default:
+            return null;
     }
-    return null;
 }
 export function toReadableSubtitleJobError(error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -367,7 +360,7 @@ export async function downloadSubtitlesForLanguages(input) {
                 outputStem: `${lang}`,
                 targetFile,
             });
-            if (result.cookieFailureCode) {
+            if (result.cookieFailureCode && result.cookieFailureCode !== "RATE_LIMITED") {
                 const refreshed = await tryRefreshSubtitleCookies();
                 if (refreshed) {
                     result = await downloadSubtitle(input.videoId, lang, format, {
@@ -467,7 +460,14 @@ export function registerSubtitleTools(server, config, tokenManager) {
                     }
                     // Retry also failed with expired cookies — give up
                 }
-                return toolErr(dl.cookieFailureCode, dl.error ?? (dl.cookieFailureCode === "COOKIES_EXPIRED" ? COOKIE_EXPIRED_MESSAGE : COOKIE_INVALID_MESSAGE));
+                return toolErr(dl.cookieFailureCode, dl.error ??
+                    (dl.cookieFailureCode === "COOKIES_EXPIRED"
+                        ? COOKIE_EXPIRED_MESSAGE
+                        : dl.cookieFailureCode === "SIGN_IN_REQUIRED"
+                            ? SIGN_IN_REQUIRED_MESSAGE
+                            : dl.cookieFailureCode === "RATE_LIMITED"
+                                ? RATE_LIMITED_MESSAGE
+                                : COOKIE_INVALID_MESSAGE));
             }
             if (!dl.ok) {
                 // When using default languages, silently skip unavailable ones
@@ -554,6 +554,9 @@ export function registerSubtitleTools(server, config, tokenManager) {
                     lastError = dl.error;
                 }
             }
+            if (cookieFailureCode === "RATE_LIMITED") {
+                return toolErr("RATE_LIMITED", RATE_LIMITED_MESSAGE);
+            }
             if (cookieFailureCode) {
                 const refreshed = await tryRefreshSubtitleCookies();
                 if (refreshed) {
@@ -571,7 +574,11 @@ export function registerSubtitleTools(server, config, tokenManager) {
                     }
                 }
                 if (cookieFailureCode) {
-                    return toolErr(cookieFailureCode, cookieFailureCode === "COOKIES_EXPIRED" ? COOKIE_EXPIRED_MESSAGE : COOKIE_INVALID_MESSAGE);
+                    return toolErr(cookieFailureCode, cookieFailureCode === "COOKIES_EXPIRED"
+                        ? COOKIE_EXPIRED_MESSAGE
+                        : cookieFailureCode === "SIGN_IN_REQUIRED"
+                            ? SIGN_IN_REQUIRED_MESSAGE
+                            : COOKIE_INVALID_MESSAGE);
                 }
             }
             if (langFound.length > 0) {

package/dist/utils/ytdlpFailures.d.ts

@@ -0,0 +1,3 @@
+export type YtDlpFailureKind = "COOKIES_EXPIRED" | "COOKIES_INVALID" | "SIGN_IN_REQUIRED" | "RATE_LIMITED";
+export declare function classifyYtDlpFailure(stderr: string): YtDlpFailureKind | null;
+export declare function appendDiagnosticLog(message: string, logPath?: string): string;

package/dist/utils/ytdlpFailures.js

@@ -0,0 +1,27 @@
+export function classifyYtDlpFailure(stderr) {
+    const normalized = stderr.toLowerCase();
+    if (normalized.includes("cookies are no longer valid") ||
+        normalized.includes("cookie has expired") ||
+        normalized.includes("cookies have expired") ||
+        normalized.includes("session expired")) {
+        return "COOKIES_EXPIRED";
+    }
+    if (normalized.includes("rate-limited by youtube") ||
+        normalized.includes("current session has been rate-limited")) {
+        return "RATE_LIMITED";
+    }
+    if (normalized.includes("sign in to confirm you're not a bot") ||
+        normalized.includes("sign in to confirm you’re not a bot")) {
+        return "SIGN_IN_REQUIRED";
+    }
+    if (normalized.includes("sign in") ||
+        normalized.includes("login") ||
+        normalized.includes("cookies") ||
+        normalized.includes("not a bot")) {
+        return "COOKIES_INVALID";
+    }
+    return null;
+}
+export function appendDiagnosticLog(message, logPath) {
+    return logPath ? `${message}\nDiagnostic log: ${logPath}` : message;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mkterswingman/5mghost-yonder",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "Internal MCP client with local data tools and remote API proxy",
   "type": "module",
   "bin": {