reelforge 1.24.0 → 1.24.2

package/dist/commands/files.js

@@ -1,8 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
-import { del, get, uploadMultipart } from "../client.js";
+import { del, get, post, uploadMultipart } from "../client.js";
+import { uploadToOss } from "../utils/oss-upload.js";
 import { downloadTo } from "../utils/download.js";
-import { print, table, success, bytes } from "../utils/output.js";
+import { print, table, success, bytes, warn } from "../utils/output.js";
 export function registerFiles(program) {
     const files = program
         .command("files")
@@ -28,10 +29,23 @@ export function registerFiles(program) {
         .helpOption("-h, --help", "show help")
         .action(async (file) => {
         const abs = path.resolve(file);
-        const buf = fs.readFileSync(abs);
         const name = path.basename(abs);
-        const fileObj = new File([new Uint8Array(buf)], name);
-        const r = await uploadMultipart("/api/v1/files", { file: fileObj });
+        let key = null;
+        try {
+            key = await uploadToOss(abs);
+        }
+        catch (e) {
+            warn(`OSS 直传不可用,回退 multipart 上传 (${e instanceof Error ? e.message : e})`);
+        }
+        let r;
+        if (key) {
+            r = await post("/api/v1/files", { key, filename: name });
+        }
+        else {
+            const buf = fs.readFileSync(abs);
+            const fileObj = new File([new Uint8Array(buf)], name);
+            r = await uploadMultipart("/api/v1/files", { file: fileObj });
+        }
         success(`Uploaded → ${r.relative_path}`);
         print(r);
     });

package/dist/commands/images.js

@@ -2,14 +2,16 @@ import fs from "node:fs/promises";
 import fsSync from "node:fs";
 import path from "node:path";
 import { post } from "../client.js";
+import { uploadToOss } from "../utils/oss-upload.js";
 import { downloadTo } from "../utils/download.js";
-import { print, success } from "../utils/output.js";
+import { print, success, warn } from "../utils/output.js";
+const MAX_REF_BYTES = 15 * 1024 * 1024;
 async function resolveImageRef(input) {
     const t = input.trim();
     if (!t)
         throw new Error("--image: empty value");
     if (/^https?:\/\//i.test(t) || t.startsWith("data:"))
-        return t;
+        return { url: t };
     const abs = path.resolve(t);
     if (!fsSync.existsSync(abs)) {
         throw new Error(`--image: local file not found: ${abs}`);
@@ -22,8 +24,19 @@ async function resolveImageRef(input) {
     if (!mime) {
         throw new Error(`--image: unsupported extension ${ext} (use png/jpg/jpeg/webp)`);
     }
-    const buf = await fs.readFile(abs);
-    return `data:${mime};base64,${buf.toString("base64")}`;
+    try {
+        const key = await uploadToOss(abs);
+        return { key };
+    }
+    catch (e) {
+        const sz = (await fs.stat(abs)).size;
+        if (sz > MAX_REF_BYTES) {
+            throw new Error(`--image ${path.basename(abs)} 直传 OSS 失败 (${e instanceof Error ? e.message : e}),且文件超过内联回退上限 ${MAX_REF_BYTES} 字节。`);
+        }
+        warn(`--image ${path.basename(abs)}: OSS 直传不可用,回退内联上传 (${e instanceof Error ? e.message : e})`);
+        const buf = await fs.readFile(abs);
+        return { url: `data:${mime};base64,${buf.toString("base64")}` };
+    }
 }
 export function registerImages(program) {
     const images = program
@@ -69,7 +82,13 @@ export function registerImages(program) {
             if (opts.image.length > 3) {
                 throw new Error(`--image accepts at most 3 refs (got ${opts.image.length})`);
             }
-            body.image_urls = await Promise.all(opts.image.map(resolveImageRef));
+            const resolved = await Promise.all(opts.image.map(resolveImageRef));
+            const urls = resolved.filter((r) => r.url).map((r) => r.url);
+            const keys = resolved.filter((r) => r.key).map((r) => r.key);
+            if (urls.length)
+                body.image_urls = urls;
+            if (keys.length)
+                body.image_keys = keys;
         }
         const r = await post("/api/v1/images/generate", body);
         if (opts.output && r.images?.[0]) {

package/dist/commands/media.js

@@ -2,7 +2,8 @@ import fs from "node:fs/promises";
 import fsSync from "node:fs";
 import path from "node:path";
 import { post } from "../client.js";
-import { info, isJson, print } from "../utils/output.js";
+import { uploadToOss } from "../utils/oss-upload.js";
+import { info, isJson, print, warn } from "../utils/output.js";
 const MEDIA_EXT_TO_MIME = {
     ".mp4": "video/mp4",
     ".mov": "video/quicktime",
@@ -112,8 +113,15 @@ export function registerMedia(program) {
                 throw new Error(`unsupported extension "${ext}". Supported: ${Object.keys(MEDIA_EXT_TO_MIME).join(" / ")}, ` +
                     `or pass a URL.`);
             }
-            const buf = await fs.readFile(abs);
-            body = { data_uri: `data:${mime};base64,${buf.toString("base64")}` };
+            try {
+                const key = await uploadToOss(abs);
+                body = { key };
+            }
+            catch (e) {
+                warn(`${path.basename(abs)}: OSS 直传不可用,回退内联上传 (${e instanceof Error ? e.message : e})`);
+                const buf = await fs.readFile(abs);
+                body = { data_uri: `data:${mime};base64,${buf.toString("base64")}` };
+            }
             label = path.basename(abs);
         }
         const r = await post("/api/v1/media/probe", body);

package/dist/utils/file-upload.js

@@ -1,6 +1,7 @@
 import fs from "node:fs/promises";
 import fsSync from "node:fs";
 import path from "node:path";
+import { uploadToOss } from "./oss-upload.js";
 export const EXT_TO_MIME = {
     ".png": "image/png",
     ".jpg": "image/jpeg",
@@ -57,3 +58,45 @@ export function fmtSize(bytes) {
         return `${(bytes / 1024).toFixed(1)} KB`;
     return `${(bytes / 1024 / 1024).toFixed(1)} MB`;
 }
+export async function resolveUploadInput(input, opts) {
+    const t = input.trim();
+    if (!t)
+        throw new Error(`${opts.flagName}: empty value`);
+    if (/^https?:\/\//i.test(t))
+        return { url: t, kind: "http-url" };
+    if (t.startsWith("data:"))
+        return { url: t, kind: "data-uri" };
+    const abs = path.resolve(t);
+    if (!fsSync.existsSync(abs)) {
+        throw new Error(`${opts.flagName}: local file not found: ${abs}\n` +
+            `  (Acceptable forms: local path / https:// URL / data: URI. ` +
+            `Server-side paths like 'data/uploads/...' do NOT work — CLI commands ` +
+            `auto-upload local files, so just pass the local path directly.)`);
+    }
+    const ext = path.extname(abs).toLowerCase();
+    const map = opts.extToMime ?? EXT_TO_MIME;
+    const mime = map[ext];
+    if (!mime) {
+        throw new Error(`${opts.flagName}: unsupported file extension "${ext}" (path: ${abs}). ` +
+            `Supported: ${Object.keys(map).join(" / ")}`);
+    }
+    const bytes = (await fs.stat(abs)).size;
+    try {
+        const key = await uploadToOss(abs);
+        return { key, bytes, kind: "oss-key" };
+    }
+    catch (e) {
+        const reason = e instanceof Error ? e.message : String(e);
+        opts.onFallback?.(opts.flagName, reason);
+        const buf = await fs.readFile(abs);
+        return { url: `data:${mime};base64,${buf.toString("base64")}`, bytes, kind: "local-file-inline" };
+    }
+}
+export async function resolveUploadInputs(inputs, opts) {
+    const resolved = [];
+    for (const input of inputs) {
+        resolved.push(await resolveUploadInput(input, opts));
+    }
+    const totalBytes = resolved.reduce((n, r) => n + (r.bytes ?? 0), 0);
+    return { resolved, totalBytes };
+}

package/dist/utils/oss-upload.js

@@ -0,0 +1,44 @@
+import fs from "node:fs/promises";
+import fsSync from "node:fs";
+import path from "node:path";
+import { post } from "../client.js";
+const EXT_TO_MIME = {
+    ".mp4": "video/mp4",
+    ".mov": "video/quicktime",
+    ".webm": "video/webm",
+    ".mkv": "video/x-matroska",
+    ".m4v": "video/mp4",
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".png": "image/png",
+    ".webp": "image/webp",
+    ".mp3": "audio/mpeg",
+    ".wav": "audio/wav",
+    ".m4a": "audio/mp4",
+    ".ogg": "audio/ogg",
+    ".flac": "audio/flac",
+    ".pdf": "application/pdf",
+};
+export function mimeForFile(filePath) {
+    return EXT_TO_MIME[path.extname(filePath).toLowerCase()] || "application/octet-stream";
+}
+export async function uploadToOss(filePath) {
+    if (!fsSync.existsSync(filePath))
+        throw new Error(`file not found: ${filePath}`);
+    const ext = path.extname(filePath).toLowerCase();
+    const contentType = mimeForFile(filePath);
+    const signed = await post("/api/v1/uploads/sign", { ext, content_type: contentType });
+    if (!signed?.put_url || !signed?.key)
+        throw new Error("uploads/sign returned no put_url/key");
+    const bytes = await fs.readFile(filePath);
+    const res = await fetch(signed.put_url, {
+        method: "PUT",
+        headers: { "Content-Type": contentType },
+        body: bytes,
+    });
+    if (!res.ok) {
+        const detail = await res.text().catch(() => "");
+        throw new Error(`OSS PUT failed: ${res.status} ${res.statusText} ${detail.slice(0, 200)}`);
+    }
+    return signed.key;
+}

package/package.json

@@ -1,44 +1,44 @@
-{
-  "name": "reelforge",
-  "version": "1.24.0",
-  "description": "AI 视频生成 CLI。一句话主题或自己的脚本 → 自动出抖音/TikTok/视频号竖屏 MP4。安装即用：`reelforge` 或短别名 `rf`。",
-  "license": "Apache-2.0",
-  "type": "module",
-  "bin": {
-    "reelforge": "./bin/reelforge.js",
-    "rf": "./bin/reelforge.js"
-  },
-  "files": [
-    "bin",
-    "dist",
-    "README.md"
-  ],
-  "engines": {
-    "node": ">=22"
-  },
-  "scripts": {
-    "build": "tsc -p tsconfig.json && node scripts/copy-docs.mjs",
-    "dev": "tsc -p tsconfig.json --watch",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "clean": "rimraf dist",
-    "prepublishOnly": "npm run clean && npm run build"
-  },
-  "dependencies": {
-    "commander": "^12.1.0",
-    "kleur": "^4.1.5"
-  },
-  "devDependencies": {
-    "@types/node": "^20.14.0",
-    "rimraf": "^6.0.1",
-    "typescript": "^5.5.0"
-  },
-  "keywords": [
-    "reelforge",
-    "ai-video",
-    "douyin",
-    "tiktok",
-    "shorts",
-    "vertical-video",
-    "cli"
-  ]
-}
+{
+  "name": "reelforge",
+  "version": "1.24.2",
+  "description": "AI 视频生成 CLI。一句话主题或自己的脚本 → 自动出抖音/TikTok/视频号竖屏 MP4。安装即用：`reelforge` 或短别名 `rf`。",
+  "license": "Apache-2.0",
+  "type": "module",
+  "bin": {
+    "reelforge": "./bin/reelforge.js",
+    "rf": "./bin/reelforge.js"
+  },
+  "files": [
+    "bin",
+    "dist",
+    "README.md"
+  ],
+  "engines": {
+    "node": ">=22"
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json && node scripts/copy-docs.mjs",
+    "dev": "tsc -p tsconfig.json --watch",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "clean": "rimraf dist",
+    "prepublishOnly": "npm run clean && npm run build"
+  },
+  "dependencies": {
+    "commander": "^12.1.0",
+    "kleur": "^4.1.5"
+  },
+  "devDependencies": {
+    "@types/node": "^20.14.0",
+    "rimraf": "^6.0.1",
+    "typescript": "^5.5.0"
+  },
+  "keywords": [
+    "reelforge",
+    "ai-video",
+    "douyin",
+    "tiktok",
+    "shorts",
+    "vertical-video",
+    "cli"
+  ]
+}