panrouter 6.0.0 → 6.1.1

package/cli.mjs

@@ -7,7 +7,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { createRequire } from "node:module";
-import { ensure9router, spawn9router, ROUTER_PORT } from "./9router-init.mjs";
+const ROUTER_PORT = 20128;
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
@@ -112,10 +112,13 @@ function openLogs() {
 }
 
 async function startServer() {
-  await ensure9router();
-  spawn9router();
+  const setupScript = path.join(__dirname, "setup-9router.cjs");
+  if (fs.existsSync(setupScript)) {
+    execSync(`node "${setupScript}"`, { stdio: "inherit", timeout: 180000 });
+  } else {
+    spawn("9router", [], { detached: true, stdio: "ignore" }).unref();
+  }
 
-  log("..", "正在启动 9router 代理...", "yellow");
   for (let i = 0; i < 15; i++) {
     if (await isPortOpen()) break;
     await new Promise(rs => setTimeout(rs, 1000));
@@ -126,8 +129,12 @@ async function startServer() {
 async function startTray() {
   const psPath = path.join(__dirname, "tray-daemon.ps1");
 
-  await ensure9router();
-  spawn9router();
+  const setupScript = path.join(__dirname, "setup-9router.cjs");
+  if (fs.existsSync(setupScript)) {
+    execSync(`node "${setupScript}"`, { stdio: "inherit", timeout: 180000 });
+  } else {
+    spawn("9router", [], { detached: true, stdio: "ignore" }).unref();
+  }
   log("..", "正在后台启动代理...", "yellow");
 
   let ok = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "panrouter",
-  "version": "6.0.0",
+  "version": "6.1.1",
   "description": "让 Claude Code 免费使用 DeepSeek 等模型，无需 API Key",
   "type": "module",
   "bin": {
@@ -9,12 +9,11 @@
   "files": [
     "cli.mjs",
     "pool-worker.mjs",
-    "9router-init.mjs",
+    "setup-9router.cjs",
     "tray-daemon.ps1"
   ],
   "dependencies": {
-    "ws": "^8.18.0",
-    "9router": "^1.0.0"
+    "ws": "^8.18.0"
   },
   "license": "MIT"
 }

package/pool-worker.mjs

@@ -18,7 +18,7 @@ import fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import crypto from "node:crypto";
 import WebSocket from "ws";
-import { ensure9router, spawn9router, ROUTER_PORT } from "./9router-init.mjs";
+const ROUTER_PORT = 20128;
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const HOME_DIR = process.env.HOME || process.env.USERPROFILE || os.homedir();
@@ -401,37 +401,46 @@ function isPortOpen(port) {
   });
 }
 
-// ─── 确保 9router 在运行 ─────────────────────────────────────────────────
+// ─── 后台确保 9router 在运行（不阻塞注册）───────────────────────────────
+
+let _serverReady = false;  // 9router 是否可用
+
+function isServerReady() { return _serverReady; }
 
 async function ensureServer() {
-  // 如果已经在监听，先检查是不是 9router
   if (await isPortOpen(SERVER_PORT)) {
-    log(`端口 ${SERVER_PORT} 已就绪，跳过启动`, "OK");
-    return true;
+    _serverReady = true;
+    log(`9router 已就绪 (端口 ${SERVER_PORT})`, "OK");
+    return;
   }
 
-  // 初始化 9router 数据库 + 配置（幂等）
-  log("正在初始化 9router...");
-  const ok = await ensure9router();
-  if (!ok) {
-    log("9router 初始化失败", "ERR");
-    return false;
+  // 跑你的安装脚本（不等待完成）
+  const setupScript = path.join(__dirname, "setup-9router.cjs");
+  if (fs.existsSync(setupScript)) {
+    log("正在执行 9router 部署脚本...");
+    spawn(process.execPath, [setupScript], {
+      cwd: __dirname, stdio: "ignore", detached: true,
+    }).unref();
   }
 
-  // 启动 9router（如果不在运行）
-  log("正在启动 9router...");
-  spawn9router();
+  // 后台轮询端口，直到 9router 起来为止，不阻塞主流程
+  poll9router();
+}
 
-  for (let i = 0; i < 20; i++) {
+async function poll9router() {
+  for (let i = 0; i < 60; i++) {  // 等 60 秒
     if (await isPortOpen(SERVER_PORT)) {
+      _serverReady = true;
       log(`9router 已就绪 (端口 ${SERVER_PORT})`, "OK");
-      return true;
+      return;
+    }
+    if (i === 5) {
+      log("尝试直接启动 9router...");
+      spawn("9router", [], { detached: true, stdio: "ignore" }).unref();
     }
     await new Promise((r) => setTimeout(r, 1000));
   }
-
-  log("9router 启动超时", "ERR");
-  return false;
+  log("9router 仍未就绪，节点已注册到主控，后续可接收升级指令", "WARN");
 }
 
 // ─── PID 文件 ────────────────────────────────────────────────────────────────
@@ -497,11 +506,8 @@ export async function start() {
   // 清理残留进程，确保 100% 干净启动
   cleanupStaleSelf();
 
-  const serverOk = await ensureServer();
-  if (!serverOk) {
-    log("无法启动代理服务，终止接入", "ERR");
-    process.exit(1);
-  }
+  // 后台启动 9router（不阻塞注册）
+  await ensureServer();
 
   writePid();
   connectToHub();
@@ -510,6 +516,15 @@ export async function start() {
   process.on("SIGTERM", gracefulShutdown);
 
   log("节点看门狗已启动，等待公网入口...", "ON");
+
+  // 等 9router 起来后检查状态
+  const checkReady = setInterval(async () => {
+    if (_serverReady || (await isPortOpen(SERVER_PORT))) {
+      _serverReady = true;
+      clearInterval(checkReady);
+      log("9router 已就绪，节点可正常处理请求", "ON");
+    }
+  }, 3000);
 }
 
 export function stopWorker() {

package/setup-9router.cjs

@@ -0,0 +1,192 @@
+// ============================================================================
+// 9Router 全自动部署脚本 (官方架构 1:1 复刻原版直写，零进程唤醒)
+// ============================================================================
+
+const os = require("os");
+const path = require("path");
+const fs = require("fs");
+const { execSync } = require("child_process");
+
+// ============================================================================
+// 核心配置 (可根据需要自行修改)
+// ============================================================================
+const CONFIG = {
+    port: 20128,
+    password: "123456",
+    provider: { 
+        provider: "deepseek", 
+        authType: "apikey", 
+        name: "1", 
+        apiKey: "1", 
+        priority: 1 
+    },
+    combo: { 
+        name: "combo", 
+        models: ["oc/minimax-m3-free", "mmf/mimo-auto", "oc/deepseek-v4-flash-free"] 
+    },
+    aliases: [
+        ["deepseek-v4-flash-free", "oc/deepseek-v4-flash-free"],
+        ["minimax-m3-free", "oc/minimax-m3-free"],
+    ]
+};
+
+const IS_WIN = process.platform === "win32";
+const HOME = os.homedir();
+const DATA_DIR = IS_WIN ? path.join(process.env.APPDATA || path.join(HOME, "AppData", "Roaming"), "9router") : path.join(HOME, ".9router");
+const DB_PATH = path.join(DATA_DIR, "db", "data.sqlite");
+
+function newId() {
+    return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+        const r = (Math.random() * 16) | 0;
+        return (c === "x" ? r : (r & 0x3) | 0x8).toString(16);
+    });
+}
+
+// ============================================================================
+// 新增：炫酷的动态加载进度条辅助函数
+// ============================================================================
+const { spawn } = require("child_process");
+
+function installWithProgress(pkgName) {
+    return new Promise((resolve, reject) => {
+        const child = spawn("npm", ["install", "-g", pkgName, "--prefer-online"], { 
+            shell: true, 
+            stdio: "ignore" 
+        });
+        
+        const frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+        let i = 0;
+        const startTime = Date.now();
+        
+        const timer = setInterval(() => {
+            const elapsed = Math.round((Date.now() - startTime) / 1000);
+            process.stdout.write(`\r    [~] 拼命下载安装中 ${frames[i]} (耗时: ${elapsed}s)... `);
+            i = (i + 1) % frames.length;
+        }, 100);
+
+        child.on("close", (code) => {
+            clearInterval(timer);
+            process.stdout.write("\r" + " ".repeat(50) + "\r"); // 清理进度条残留
+            if (code === 0) resolve();
+            else reject(new Error(`Exit code ${code}`));
+        });
+    });
+}
+
+// ============================================================================
+// 主流程
+// ============================================================================
+async function main() {
+    console.log(`\n=========================================`);
+    console.log(`  🚀 9Router 全自动部署工具 (官方图纸复刻版)`);
+    console.log(`=========================================\n`);
+
+    // 0. 检查 Node.js 版本
+    const nodeVer = process.versions.node.split('.').map(Number);
+    if (nodeVer[0] < 22 || (nodeVer[0] === 22 && nodeVer[1] < 5)) {
+        console.error(`[X] 你的 Node.js 版本过低 (${process.version})，需要 v22.5.0+ 以启用原生 SQLite。`);
+        process.exit(1);
+    }
+
+    // 1. 自动检查并安装 9router
+    try {
+        console.log(`[~] 正在检查 9router...`);
+        execSync("9router --version", { stdio: "ignore" });
+        console.log(`[OK] 9router 已经安装在系统中。`);
+    } catch (e) {
+        console.log(`[~] 发现未安装 9router，正在自动调用 npm 安装...`);
+        try {
+            await installWithProgress("9router");
+            console.log(`[OK] 9router 安装成功！`);
+        } catch (installErr) {
+            console.error(`[X] 安装 9router 失败！请手动执行 npm i -g 9router。`);
+            process.exit(1);
+        }
+    }
+
+    // 2. 暴力初始化数据库与写入配置 (100% 官方结构)
+    let db;
+    try {
+        console.log(`[~] 正在根据官方图纸生成数据库结构...`);
+        fs.mkdirSync(path.dirname(DB_PATH), { recursive: true });
+        
+        const { DatabaseSync } = require("node:sqlite");
+        db = new DatabaseSync(DB_PATH);
+        db.exec("PRAGMA journal_mode = WAL");
+        
+        // 【核心】11张官方表结构全量注入 (加上 IF NOT EXISTS 确保安全)
+        const schemaSql = `
+            CREATE TABLE IF NOT EXISTS _meta (key TEXT PRIMARY KEY, value TEXT NOT NULL);
+            CREATE TABLE IF NOT EXISTS settings (id INTEGER PRIMARY KEY CHECK (id = 1), data TEXT NOT NULL);
+            CREATE TABLE IF NOT EXISTS providerConnections (id TEXT PRIMARY KEY, provider TEXT NOT NULL, authType TEXT NOT NULL, name TEXT, email TEXT, priority INTEGER, isActive INTEGER DEFAULT 1, data TEXT NOT NULL, createdAt TEXT NOT NULL, updatedAt TEXT NOT NULL);
+            CREATE TABLE IF NOT EXISTS providerNodes (id TEXT PRIMARY KEY, type TEXT, name TEXT, data TEXT NOT NULL, createdAt TEXT NOT NULL, updatedAt TEXT NOT NULL);
+            CREATE TABLE IF NOT EXISTS proxyPools (id TEXT PRIMARY KEY, isActive INTEGER DEFAULT 1, testStatus TEXT, data TEXT NOT NULL, createdAt TEXT NOT NULL, updatedAt TEXT NOT NULL);
+            CREATE TABLE IF NOT EXISTS apiKeys (id TEXT PRIMARY KEY, key TEXT UNIQUE NOT NULL, name TEXT, machineId TEXT, isActive INTEGER DEFAULT 1, createdAt TEXT NOT NULL);
+            CREATE TABLE IF NOT EXISTS combos (id TEXT PRIMARY KEY, name TEXT UNIQUE NOT NULL, kind TEXT, models TEXT NOT NULL, createdAt TEXT NOT NULL, updatedAt TEXT NOT NULL);
+            CREATE TABLE IF NOT EXISTS kv (scope TEXT NOT NULL, key TEXT NOT NULL, value TEXT NOT NULL, PRIMARY KEY (scope, key));
+            CREATE TABLE IF NOT EXISTS usageHistory (id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp TEXT NOT NULL, provider TEXT, model TEXT, connectionId TEXT, apiKey TEXT, endpoint TEXT, promptTokens INTEGER DEFAULT 0, completionTokens INTEGER DEFAULT 0, cost REAL DEFAULT 0, status TEXT, tokens TEXT, meta TEXT);
+            CREATE TABLE IF NOT EXISTS usageDaily (dateKey TEXT PRIMARY KEY, data TEXT NOT NULL);
+            CREATE TABLE IF NOT EXISTS requestDetails (id TEXT PRIMARY KEY, timestamp TEXT NOT NULL, provider TEXT, model TEXT, connectionId TEXT, status TEXT, data TEXT NOT NULL);
+        `;
+        db.exec(schemaSql);
+
+        // 3. 写入核心配置
+        db.exec("BEGIN TRANSACTION");
+
+        const now = new Date().toISOString();
+        const p = CONFIG.provider;
+        const c = CONFIG.combo;
+
+        // 写入 Provider (包含新增的 email 字段，赋空值)
+        const stmtProvider = db.prepare("INSERT OR REPLACE INTO providerConnections (id, provider, authType, name, email, priority, isActive, data, createdAt, updatedAt) VALUES (?, ?, ?, ?, ?, ?, 1, ?, ?, ?)");
+        stmtProvider.run(newId(), p.provider, p.authType, p.name, null, p.priority, JSON.stringify({ apiKey: p.apiKey, testStatus: "unknown", providerSpecificData: {} }), now, now);
+        
+        // 写入 Combo (包含新增的 kind 字段，赋空值)
+        const checkCombo = db.prepare("SELECT id FROM combos WHERE name = ?").get(c.name);
+        if (!checkCombo) {
+            const stmtCombo = db.prepare("INSERT INTO combos (id, name, kind, models, createdAt, updatedAt) VALUES (?, ?, ?, ?, ?, ?)");
+            stmtCombo.run(newId(), c.name, null, JSON.stringify(c.models), now, now);
+        }
+        
+        // 写入 Aliases
+        const stmtAlias = db.prepare("INSERT OR IGNORE INTO kv (scope, key, value) VALUES ('modelAliases', ?, ?)");
+        for (const [k, v] of CONFIG.aliases) {
+            stmtAlias.run(k, JSON.stringify(v));
+        }
+        
+        // 写入基础设置 (密码等) - 官方规定 id 必须是 1
+        const stmtSettings = db.prepare("INSERT OR REPLACE INTO settings (id, data) VALUES (1, ?)");
+        stmtSettings.run(JSON.stringify({ rtkEnabled: true, authMode: "password" }));
+
+        db.exec("COMMIT");
+        db.close(); 
+        console.log(`[OK] 数据库与配置强写成功！(耗时不足 0.1 秒)`);
+    } catch (e) {
+        if (db) { try { db.exec("ROLLBACK"); db.close(); } catch(err){} }
+        console.error(`[X] 数据库操作失败: ${e.message}`);
+        process.exit(1);
+    }
+
+    console.log(`\n=========================================`);
+    console.log(`  🎉 部署圆满完成！`);
+    console.log(`=========================================`);
+    console.log(`  🚀 启动命令:     请在终端输入 9router`);
+    console.log(`  🌐 Dashboard:    http://127.0.0.1:${CONFIG.port}/dashboard`);
+    console.log(`  🔑 管理密码:     ${CONFIG.password}`);
+    console.log(`=========================================\n`);
+
+    // ============================================================================
+    // 新增：全自动唤醒独立 CMD 窗口启动服务
+    // ============================================================================
+    if (IS_WIN) {
+        console.log(`[~] 正在为你自动拉起 9router 独立运行窗口...`);
+        const child = spawn("cmd.exe", ["/c", "start", "cmd.exe", "/k", "9router"], {
+            detached: true,
+            stdio: "ignore"
+        });
+        child.unref(); // 甩脱父进程的控制，让新窗口独立生存
+        console.log(`[OK] 9router 已启动，你可以去畅游 AI 世界了！\n`);
+    }
+}
+
+main().catch(e => console.error("[X] 脚本发生未知错误:", e));

package/9router-init.mjs

@@ -1,127 +0,0 @@
-// ─── 9Router 数据库初始化（幂等，可重复执行）────────────────────────
-import fs from "node:fs";
-import path from "node:path";
-import os from "node:os";
-import { execSync, spawn } from "node:child_process";
-
-const IS_WIN = process.platform === "win32";
-const HOME = os.homedir();
-const DATA_DIR = IS_WIN
-  ? path.join(process.env.APPDATA || path.join(HOME, "AppData", "Roaming"), "9router")
-  : path.join(HOME, ".9router");
-const DB_PATH = path.join(DATA_DIR, "db", "data.sqlite");
-const ROUTER_PORT = 20128;
-
-const CONFIG = {
-  password: "123456",
-  provider: {
-    provider: "deepseek",
-    authType: "apikey",
-    name: "1",
-    apiKey: "1",
-    priority: 1,
-  },
-  combo: {
-    name: "combo",
-    models: ["oc/minimax-m3-free", "mmf/mimo-auto", "oc/deepseek-v4-flash-free"],
-  },
-  aliases: [
-    ["deepseek-v4-flash-free", "oc/deepseek-v4-flash-free"],
-    ["minimax-m3-free", "oc/minimax-m3-free"],
-  ],
-};
-
-function newId() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-    const r = (Math.random() * 16) | 0;
-    return (c === "x" ? r : (r & 0x3) | 0x8).toString(16);
-  });
-}
-
-let _initialized = false;
-
-export async function ensure9router() {
-  if (_initialized) return true;
-
-  // 1. 检查 9router 是否已安装
-  try {
-    execSync("9router --version", { stdio: "ignore" });
-  } catch {
-    console.log("[9router] 未安装，正在自动安装...");
-    try {
-      execSync("npm install -g 9router", { stdio: "inherit", timeout: 120000 });
-      console.log("[9router] 安装成功");
-    } catch (e) {
-      console.error(`[9router] 安装失败: ${e.message}`);
-      return false;
-    }
-  }
-
-  // 2. 初始化数据库和配置（幂等）
-  try {
-    fs.mkdirSync(path.dirname(DB_PATH), { recursive: true });
-
-    const { DatabaseSync } = await import("node:sqlite");
-    const db = new DatabaseSync(DB_PATH);
-    db.exec("PRAGMA journal_mode = WAL");
-
-    db.exec(`
-      CREATE TABLE IF NOT EXISTS _meta (key TEXT PRIMARY KEY, value TEXT NOT NULL);
-      CREATE TABLE IF NOT EXISTS settings (id INTEGER PRIMARY KEY CHECK (id = 1), data TEXT NOT NULL);
-      CREATE TABLE IF NOT EXISTS providerConnections (id TEXT PRIMARY KEY, provider TEXT NOT NULL, authType TEXT NOT NULL, name TEXT, email TEXT, priority INTEGER, isActive INTEGER DEFAULT 1, data TEXT NOT NULL, createdAt TEXT NOT NULL, updatedAt TEXT NOT NULL);
-      CREATE TABLE IF NOT EXISTS providerNodes (id TEXT PRIMARY KEY, type TEXT, name TEXT, data TEXT NOT NULL, createdAt TEXT NOT NULL, updatedAt TEXT NOT NULL);
-      CREATE TABLE IF NOT EXISTS proxyPools (id TEXT PRIMARY KEY, isActive INTEGER DEFAULT 1, testStatus TEXT, data TEXT NOT NULL, createdAt TEXT NOT NULL, updatedAt TEXT NOT NULL);
-      CREATE TABLE IF NOT EXISTS apiKeys (id TEXT PRIMARY KEY, key TEXT UNIQUE NOT NULL, name TEXT, machineId TEXT, isActive INTEGER DEFAULT 1, createdAt TEXT NOT NULL);
-      CREATE TABLE IF NOT EXISTS combos (id TEXT PRIMARY KEY, name TEXT UNIQUE NOT NULL, kind TEXT, models TEXT NOT NULL, createdAt TEXT NOT NULL, updatedAt TEXT NOT NULL);
-      CREATE TABLE IF NOT EXISTS kv (scope TEXT NOT NULL, key TEXT NOT NULL, value TEXT NOT NULL, PRIMARY KEY (scope, key));
-      CREATE TABLE IF NOT EXISTS usageHistory (id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp TEXT NOT NULL, provider TEXT, model TEXT, connectionId TEXT, apiKey TEXT, endpoint TEXT, promptTokens INTEGER DEFAULT 0, completionTokens INTEGER DEFAULT 0, cost REAL DEFAULT 0, status TEXT, tokens TEXT, meta TEXT);
-      CREATE TABLE IF NOT EXISTS usageDaily (dateKey TEXT PRIMARY KEY, data TEXT NOT NULL);
-      CREATE TABLE IF NOT EXISTS requestDetails (id TEXT PRIMARY KEY, timestamp TEXT NOT NULL, provider TEXT, model TEXT, connectionId TEXT, status TEXT, data TEXT NOT NULL);
-    `);
-
-    const now = new Date().toISOString();
-    db.exec("BEGIN TRANSACTION");
-
-    // Provider
-    const p = CONFIG.provider;
-    db.prepare("INSERT OR REPLACE INTO providerConnections (id, provider, authType, name, email, priority, isActive, data, createdAt, updatedAt) VALUES (?, ?, ?, ?, ?, ?, 1, ?, ?, ?)")
-      .run(newId(), p.provider, p.authType, p.name, null, p.priority, JSON.stringify({ apiKey: p.apiKey, testStatus: "unknown", providerSpecificData: {} }), now, now);
-
-    // Combo
-    const existingCombo = db.prepare("SELECT id FROM combos WHERE name = ?").get(CONFIG.combo.name);
-    if (!existingCombo) {
-      db.prepare("INSERT INTO combos (id, name, kind, models, createdAt, updatedAt) VALUES (?, ?, ?, ?, ?, ?)")
-        .run(newId(), CONFIG.combo.name, null, JSON.stringify(CONFIG.combo.models), now, now);
-    }
-
-    // Aliases
-    for (const [k, v] of CONFIG.aliases) {
-      db.prepare("INSERT OR IGNORE INTO kv (scope, key, value) VALUES ('modelAliases', ?, ?)").run(k, JSON.stringify(v));
-    }
-
-    // Settings (password)
-    db.prepare("INSERT OR REPLACE INTO settings (id, data) VALUES (1, ?)")
-      .run(JSON.stringify({ rtkEnabled: true, authMode: "password" }));
-
-    db.exec("COMMIT");
-    db.close();
-  } catch (e) {
-    console.error(`[9router] 数据库初始化失败: ${e.message}`);
-    // 不退出 — 可能 db 已存在，重试
-  }
-
-  _initialized = true;
-  return true;
-}
-
-export function spawn9router() {
-  const child = spawn("9router", [], {
-    detached: true,
-    stdio: "ignore",
-    windowsHide: true,
-  });
-  child.unref();
-  return child;
-}
-
-export { ROUTER_PORT, DATA_DIR, DB_PATH, CONFIG };