npm - reelforge - Versions diffs - 0.1.0 → 0.2.1 - Mend

reelforge 0.1.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/commands/auth.js CHANGED Viewed

@@ -1,30 +1,135 @@
+import http from "node:http";
+import crypto from "node:crypto";
+import os from "node:os";
+import { spawn } from "node:child_process";
 import { get, setApiKey, setServer, getServer } from "../client.js";
 import { loadConfig, saveConfig, deleteConfig, getConfigPath } from "../utils/config-file.js";
 import { info, success, print, table } from "../utils/output.js";
+function openBrowser(url) {
+    const cmd = process.platform === "darwin"
+        ? "open"
+        : process.platform === "win32"
+            ? "rundll32"
+            : "xdg-open";
+    const args = process.platform === "win32"
+        ? ["url.dll,FileProtocolHandler", url]
+        : [url];
+    try {
+        spawn(cmd, args, { detached: true, stdio: "ignore" }).unref();
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Browser-based OAuth-style login:
+ *   1. Start a local HTTP server on 127.0.0.1:<random>
+ *   2. Open the server's /cli-auth page with callback + state
+ *   3. After the user approves in the browser, our local server receives
+ *      the token via redirect, validates the state nonce, and returns it.
+ */
+async function browserOAuthFlow(serverUrl) {
+    const state = crypto.randomBytes(16).toString("hex");
+    const hostname = (os.hostname() || "device").slice(0, 64);
+    return new Promise((resolve, reject) => {
+        let timer = null;
+        const server = http.createServer((req, res) => {
+            const url = new URL(req.url || "/", "http://127.0.0.1");
+            if (url.pathname !== "/cb") {
+                res.writeHead(404, { "Content-Type": "text/plain" }).end("Not found");
+                return;
+            }
+            const gotState = url.searchParams.get("state");
+            const token = url.searchParams.get("token");
+            const errCode = url.searchParams.get("error");
+            const finish = (statusCode, title, body, outcome) => {
+                res.writeHead(statusCode, { "Content-Type": "text/html; charset=utf-8" }).end(`<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><title>ReelForge CLI</title><style>body{font-family:-apple-system,system-ui,"Segoe UI",sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;margin:0;background:#fafaf7;color:#222}div{text-align:center;max-width:24rem;padding:1.5rem}h1{font-size:1.5rem;margin:0 0 .5rem;font-weight:600}p{color:#666;font-size:.875rem;line-height:1.5}</style></head><body><div><h1>${title}</h1><p>${body}</p></div><script>setTimeout(()=>window.close?.(),2000)</script></body></html>`);
+                if (timer)
+                    clearTimeout(timer);
+                server.close();
+                if (outcome.ok)
+                    resolve(outcome.token);
+                else
+                    reject(outcome.err);
+            };
+            if (gotState !== state) {
+                finish(400, "授权失败", "state 不匹配，可能是 CSRF。请重新跑 reelforge login。", {
+                    ok: false,
+                    err: new Error("state mismatch"),
+                });
+                return;
+            }
+            if (errCode || !token) {
+                finish(400, "授权被取消", "可以关闭此页面回到 CLI。", {
+                    ok: false,
+                    err: new Error(errCode || "no token returned"),
+                });
+                return;
+            }
+            finish(200, "✓ 授权成功", "可以关闭此页面，CLI 已自动接收 key。", {
+                ok: true,
+                token,
+            });
+        });
+        server.listen(0, "127.0.0.1", () => {
+            const addr = server.address();
+            const port = typeof addr === "object" && addr ? addr.port : 0;
+            const callback = `http://127.0.0.1:${port}/cb`;
+            const authUrl = new URL("/cli-auth", serverUrl);
+            authUrl.searchParams.set("callback", callback);
+            authUrl.searchParams.set("state", state);
+            authUrl.searchParams.set("hostname", hostname);
+            info(`Listening on ${callback}`);
+            info("正在打开浏览器完成授权...");
+            const opened = openBrowser(authUrl.toString());
+            if (!opened) {
+                info("(打开浏览器失败，请手动访问以下 URL):");
+                info(authUrl.toString());
+            }
+            else {
+                info(`(如果浏览器没自动弹出，请手动访问: ${authUrl.toString()})`);
+            }
+        });
+        // 5-minute timeout
+        timer = setTimeout(() => {
+            server.close();
+            reject(new Error("授权超时（5 分钟）。请重新跑 reelforge login"));
+        }, 5 * 60 * 1000);
+    });
+}
 export function registerAuth(program) {
     program
-        .command("login <api_key>")
-        .description("Save your API key (and optionally server URL) to ~/.reelforge/config.json")
+        .command("login [api_key]")
+        .description("Login: with no argument opens browser for OAuth; with api_key saves it directly")
         .helpOption("-h, --help", "show help")
         .option("--server <url>", "also persist a custom server URL")
         .addHelpText("after", [
         "",
         "Examples:",
-        "  reelforge login JK1234567890ABCDEF                            # bind key, use default server",
-        "  reelforge login JK1234567890ABCDEF --server http://nas:8501   # bind key + custom server",
+        "  reelforge login                            # browser OAuth (recommended)",
+        "  reelforge login JK1234567890ABCDEF         # manual paste (SSH / headless)",
+        "  reelforge login --server http://nas:8501   # OAuth against a self-hosted server",
         "",
-        "The key is verified against /api/v1/me before being saved.",
+        "The token is verified against /api/v1/me before being saved.",
     ].join("\n"))
         .action(async (apiKey, opts) => {
         if (opts.server)
             setServer(opts.server);
-        setApiKey(apiKey);
-        // verify
+        let token;
+        if (apiKey) {
+            token = apiKey;
+        }
+        else {
+            info(`Starting browser OAuth against ${getServer()}`);
+            token = await browserOAuthFlow(getServer());
+        }
+        setApiKey(token);
         const me = await get("/api/v1/me");
         const existing = await loadConfig();
         const saved = await saveConfig({
             ...existing,
-            api_key: apiKey,
+            api_key: token,
             ...(opts.server ? { server: opts.server } : {}),
         });
         success(`Saved → ${saved}`);

package/dist/index.js CHANGED Viewed

@@ -4,9 +4,14 @@
  * Every leaf command supports `--help`. Sub-groups (e.g. `reelforge llm`) print
  * a list of their sub-commands when invoked without arguments OR with `--help`.
  */
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import path from "node:path";
 import { Command } from "commander";
 import { setServer, setApiKey } from "./client.js";
 import { setOutputOptions } from "./utils/output.js";
+const pkgPath = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "package.json");
+const pkgVersion = JSON.parse(readFileSync(pkgPath, "utf-8")).version;
 import { registerAuth } from "./commands/auth.js";
 import { registerCreate } from "./commands/create.js";
 import { registerLlm } from "./commands/llm.js";
@@ -39,7 +44,7 @@ program
     "",
     "Run `reelforge <command> --help` for sub-command details, e.g. `reelforge llm chat --help`.",
 ].join("\n"))
-    .version("0.1.0", "-v, --version", "show CLI version")
+    .version(pkgVersion, "-v, --version", "show CLI version")
     .helpOption("-h, --help", "show help")
     .addHelpCommand("help [command]", "show help for a command")
     .showHelpAfterError("(use `reelforge <command> --help` to see usage)")

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "reelforge",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "CLI for ReelForge Studio — AI video engine. Every REST API exposed as a command, with --help on every level.",
   "license": "Apache-2.0",
   "type": "module",