qwenproxy-cli 1.1.0 → 1.2.0

package/src/tui/views/sync-view.ts

@@ -12,7 +12,7 @@ import {
   inspectClientSyncStatus,
 } from "../../sync/index.ts";
 import type { SyncClientName } from "../../sync/types.ts";
-import { fetchLiveModels } from "../proxy-client.ts";
+import { fetchLiveModels, DEFAULT_FALLBACK_MODELS } from "../proxy-client.ts";
 
 interface ClientOption {
   id: SyncClientName;
@@ -30,18 +30,17 @@ export class SyncView implements TuiView {
   private clients: ClientOption[] = [];
   private selectedRowIndex = 0; // 0..9 for clients, 10 for model, 11 for scope, 12 for sync, 13 for restore
   private hoveredActionRow: number | null = null;
-  private availableModels = [
-    "qwen3.8-max",
-    "qwen3.7-plus",
-    "qwen3.7-max",
-    "z-image-turbo",
-    "qwen-image-3.0-pro",
-    "wan3.0-video",
-  ];
+  private availableModels = [...DEFAULT_FALLBACK_MODELS];
   private modelIndex = 0;
   private syncAllModels = true;
   private actionLog: string[] = [];
   private lastLeftW = 46;
+  private lastClientStartRow = 8;
+  private lastClientEndRow = 17;
+  private lastModelRow = 20;
+  private lastScopeRow = 21;
+  private lastSyncRow = 24;
+  private lastRestoreRow = 25;
   constructor() {
     this.detectClients();
   }
@@ -50,11 +49,14 @@ export class SyncView implements TuiView {
     this.detectClients();
     void this.refreshModels();
   }
-  private async refreshModels(): Promise<void> {
+  public async refreshModels(): Promise<void> {
     try {
       const live = await fetchLiveModels();
       if (live && live.length > 0) {
+        const current = this.availableModels[this.modelIndex];
         this.availableModels = live;
+        const foundIdx = this.availableModels.indexOf(current);
+        this.modelIndex = foundIdx !== -1 ? foundIdx : 0;
       }
     } catch {}
   }
@@ -103,27 +105,62 @@ export class SyncView implements TuiView {
       const { row, col } = key.mouse;
       const leftW = this.lastLeftW || 46;
       if (col >= 2 && col <= leftW - 1) {
-        if (row >= 8 && row <= 17) {
-          const targetRow = row - 8;
+        if (row >= this.lastClientStartRow && row <= this.lastClientEndRow) {
+          const targetRow = row - this.lastClientStartRow;
+          let changed = false;
           if (this.selectedRowIndex !== targetRow) {
             this.selectedRowIndex = targetRow;
-            return true;
+            changed = true;
+          }
+          if (this.hoveredActionRow !== null) {
+            this.hoveredActionRow = null;
+            changed = true;
           }
-        } else if (row === 20 || row === 14) {
+          if (changed) return true;
+        } else if (row === this.lastModelRow) {
+          let changed = false;
           if (this.selectedRowIndex !== 10) {
             this.selectedRowIndex = 10;
-            return true;
+            changed = true;
           }
-        } else if (row === 21 || row === 15) {
+          if (this.hoveredActionRow !== null) {
+            this.hoveredActionRow = null;
+            changed = true;
+          }
+          if (changed) return true;
+        } else if (row === this.lastScopeRow) {
+          let changed = false;
           if (this.selectedRowIndex !== 11) {
             this.selectedRowIndex = 11;
-            return true;
+            changed = true;
           }
-        } else if (row === 24 || row === 18 || row === 25 || row === 19) {
-          if (this.hoveredActionRow !== row) {
-            this.hoveredActionRow = row;
-            return true;
+          if (this.hoveredActionRow !== null) {
+            this.hoveredActionRow = null;
+            changed = true;
+          }
+          if (changed) return true;
+        } else if (row === this.lastSyncRow) {
+          let changed = false;
+          if (this.selectedRowIndex !== 12) {
+            this.selectedRowIndex = 12;
+            changed = true;
+          }
+          if (this.hoveredActionRow !== this.lastSyncRow) {
+            this.hoveredActionRow = this.lastSyncRow;
+            changed = true;
+          }
+          if (changed) return true;
+        } else if (row === this.lastRestoreRow) {
+          let changed = false;
+          if (this.selectedRowIndex !== 13) {
+            this.selectedRowIndex = 13;
+            changed = true;
           }
+          if (this.hoveredActionRow !== this.lastRestoreRow) {
+            this.hoveredActionRow = this.lastRestoreRow;
+            changed = true;
+          }
+          if (changed) return true;
         } else if (this.hoveredActionRow !== null) {
           this.hoveredActionRow = null;
           return true;
@@ -140,35 +177,40 @@ export class SyncView implements TuiView {
       const leftW = this.lastLeftW || 46;
       if (col >= 2 && col <= leftW - 1) {
         // Rows 8..17: Toggle client
-        if (row >= 8 && row <= 17) {
-          const client = this.clients[row - 8];
+        if (row >= this.lastClientStartRow && row <= this.lastClientEndRow) {
+          const client = this.clients[row - this.lastClientStartRow];
           if (client) {
             client.selected = !client.selected;
-            this.selectedRowIndex = row - 8;
+            this.selectedRowIndex = row - this.lastClientStartRow;
+            this.hoveredActionRow = null;
             return true;
           }
         }
         // Model selector
-        if (row === 20 || row === 14) {
+        if (row === this.lastModelRow) {
           this.modelIndex = (this.modelIndex + 1) % this.availableModels.length;
           this.selectedRowIndex = 10;
+          this.hoveredActionRow = null;
           return true;
         }
         // Scope selector
-        if (row === 21 || row === 15) {
+        if (row === this.lastScopeRow) {
           this.syncAllModels = !this.syncAllModels;
           this.selectedRowIndex = 11;
+          this.hoveredActionRow = null;
           return true;
         }
         // Sincronizar button
-        if (row === 24 || row === 18) {
+        if (row === this.lastSyncRow) {
           this.selectedRowIndex = 12;
+          this.hoveredActionRow = this.lastSyncRow;
           this.executeSync();
           return true;
         }
         // Restaurar button
-        if (row === 25 || row === 19) {
+        if (row === this.lastRestoreRow) {
           this.selectedRowIndex = 13;
+          this.hoveredActionRow = this.lastRestoreRow;
           this.executeRollback();
           return true;
         }
@@ -282,9 +324,16 @@ export class SyncView implements TuiView {
   }
 
   private executeRollback(): void {
-    this.actionLog.unshift(theme.yellow("⏳ Restaurando backups anteriores de configuração..."));
+    const selectedTargets = this.clients
+      .filter((c) => c.selected)
+      .map((c) => c.id);
+
+    const targetDesc = selectedTargets.length > 0 ? `[${selectedTargets.join(", ")}]` : "todos os clientes";
+    this.actionLog.unshift(theme.yellow(`⏳ Restaurando backups anteriores de ${targetDesc}...`));
     try {
-      const res = restoreAllClients();
+      const res = restoreAllClients({
+        targets: selectedTargets.length > 0 ? selectedTargets : undefined,
+      });
       this.actionLog.unshift(
         theme.green(`✓ Rollback concluído: ${res.restoredCount} arquivo(s) restaurados com sucesso.`),
       );
@@ -298,6 +347,12 @@ export class SyncView implements TuiView {
     const contentH = Math.max(22, height);
     const leftW = Math.max(48, Math.floor(width * 0.52));
     this.lastLeftW = leftW;
+    this.lastClientStartRow = 8;
+    this.lastClientEndRow = 8 + this.clients.length - 1;
+    this.lastModelRow = this.lastClientEndRow + 3;
+    this.lastScopeRow = this.lastModelRow + 1;
+    this.lastSyncRow = this.lastScopeRow + 3;
+    this.lastRestoreRow = this.lastSyncRow + 1;
     const rightW = Math.max(30, width - leftW - 1);
 
     // Left Panel: Options and Selectors
@@ -351,13 +406,13 @@ export class SyncView implements TuiView {
     leftContent.push(`  ${theme.bold("Ações:")}`);
     // Row index 12: Sincronizar
     const isSyncFocused = this.selectedRowIndex === 12;
-    const isSyncHovered = this.hoveredActionRow === 24 || this.hoveredActionRow === 18;
+    const isSyncHovered = this.hoveredActionRow === this.lastSyncRow;
     const syncLine = `    ${isSyncHovered || isSyncFocused ? theme.bgHover(` ${theme.cyan("[ Enter ] Sincronizar")} `) : `${theme.cyan("[ Enter ]")} Sincronizar`}`;
     leftContent.push(syncLine);
 
     // Row index 13: Restaurar
     const isRestoreFocused = this.selectedRowIndex === 13;
-    const isRestoreHovered = this.hoveredActionRow === 25 || this.hoveredActionRow === 19;
+    const isRestoreHovered = this.hoveredActionRow === this.lastRestoreRow;
     const restoreLine = `    ${isRestoreHovered || isRestoreFocused ? theme.bgHover(` ${theme.yellow("[ R ] Restaurar")} `) : `${theme.yellow("[ R ]")} Restaurar`}`;
     leftContent.push(restoreLine);
 

package/src/update-cli.ts

@@ -1,161 +1,17 @@
-import { spawnSync } from "node:child_process";
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const packageRoot = path.resolve(__dirname, "..");
-const packageJsonPath = path.join(packageRoot, "package.json");
-
 export type PackageManager = "bun" | "pnpm" | "yarn" | "npm";
 
-export function detectPackageManager(): PackageManager {
-  const userAgent = process.env.npm_config_user_agent || "";
-  if (userAgent.startsWith("bun")) return "bun";
-  if (userAgent.startsWith("pnpm")) return "pnpm";
-  if (userAgent.startsWith("yarn")) return "yarn";
-
-  // Check which executable is actually running the script or installed in PATH
-  const execPath = process.execPath.toLowerCase();
-  if (execPath.includes("bun")) return "bun";
-
-  // Check if installation path contains pnpm / bun / yarn markers
-  const currentPath = packageRoot.toLowerCase();
-  if (currentPath.includes(".pnpm") || currentPath.includes("pnpm")) return "pnpm";
-  if (currentPath.includes(".bun") || currentPath.includes("bun")) return "bun";
-  if (currentPath.includes("yarn")) return "yarn";
-
-  return "npm";
-}
-export function getUpdateArgs(
-  pm: PackageManager,
-  packageName: string,
-  targetVersion?: string,
-): { cmd: string; args: string[] } {
-  const versionTag = targetVersion ? `@${targetVersion}` : "@latest";
-  switch (pm) {
-    case "bun":
-      return { cmd: "bun", args: ["add", "-g", `${packageName}${versionTag}`] };
-    case "pnpm":
-      return {
-        cmd: "pnpm",
-        args: targetVersion
-          ? ["add", "-g", `${packageName}@${targetVersion}`]
-          : ["update", "-g", packageName],
-      };
-    case "yarn":
-      return {
-        cmd: "yarn",
-        args: targetVersion
-          ? ["global", "add", `${packageName}@${targetVersion}`]
-          : ["global", "upgrade", packageName],
-      };
-    case "npm":
-    default:
-      return { cmd: "npm", args: ["install", "-g", `${packageName}${versionTag}`] };
-  }
-}
-
-export function isNewerVersion(current: string, latest: string): boolean {
-  const c = current.replace(/^v/i, "").split(".").map((n) => parseInt(n, 10));
-  const l = latest.replace(/^v/i, "").split(".").map((n) => parseInt(n, 10));
-  for (let i = 0; i < 3; i++) {
-    const cv = c[i] || 0;
-    const lv = l[i] || 0;
-    if (lv > cv) return true;
-    if (lv < cv) return false;
-  }
-  return false;
-}
-
-export async function fetchLatestNpmVersion(packageName: string): Promise<string> {
-  // 1. Direct fast HTTP query to registry.npmjs.org (bypasses child process & Windows npm.cmd cold start)
-  try {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), 6000);
-    const res = await fetch(`https://registry.npmjs.org/${packageName}/latest`, {
-      headers: { Accept: "application/json" },
-      signal: controller.signal,
-    });
-    clearTimeout(timer);
-    if (res.ok) {
-      const data = (await res.json()) as { version?: string };
-      if (data.version && typeof data.version === "string") {
-        return data.version.trim();
-      }
-    }
-  } catch {}
-
-  // 2. Fallback: npm view via CLI with a generous 30s timeout and clean semver extraction
-  try {
-    const fullCmd = `npm view ${packageName} version`;
-    const res = spawnSync(fullCmd, {
-      encoding: "utf-8",
-      shell: true,
-      timeout: 30000,
-    });
-    if (res.stdout) {
-      const lines = res.stdout.trim().split(/\r?\n/);
-      for (const line of lines.reverse()) {
-        const cleaned = line.trim().replace(/^v/i, "");
-        if (/^\d+\.\d+\.\d+/.test(cleaned)) {
-          return cleaned;
-        }
-      }
-    }
-  } catch {}
+export {
+  detectPackageManager,
+  getUpdateArgs,
+  isNewerVersion,
+  fetchLatestNpmVersion,
+  runUpdateCommand,
+} from "../bin/update.js";
 
-  return "";
-}
-
-export async function runUpdateCommand(): Promise<void> {
-  let pkg: any = { name: "qwenproxy-cli", version: "1.0.0" };
-  try {
-    pkg = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
-  } catch {}
-
-  const currentVersion = pkg.version || "1.0.0";
-  const packageName = pkg.name || "qwenproxy-cli";
-  const pm = detectPackageManager();
-
-  console.log(`\n📦 [QwenProxy] Versão local instalada: v${currentVersion}`);
-  console.log(`⚙️ [QwenProxy] Gerenciador de pacotes detectado: ${pm}`);
-  console.log(`🔍 [QwenProxy] Verificando se há novas versões de ${packageName} no npm registry...`);
-
-  const latestVersion = await fetchLatestNpmVersion(packageName);
-
-  if (!latestVersion) {
-    console.warn("⚠️  [QwenProxy] Não foi possível consultar o registro online.");
-    const manual = getUpdateArgs(pm, packageName);
-    console.log(`👉 Você pode forçar a atualização manualmente com:\n   ${manual.cmd} ${manual.args.join(" ")}\n`);
-    return;
-  }
-
-  console.log(`🌐 [QwenProxy] Versão mais recente disponível: v${latestVersion}`);
-
-  if (!isNewerVersion(currentVersion, latestVersion)) {
-    console.log(`\n✨ Você já está utilizando a versão mais recente (v${currentVersion})!\n`);
-    return;
-  }
-
-  console.log(`\n🚀 Nova versão disponível: v${currentVersion} ➔ v${latestVersion}`);
-  const { cmd, args } = getUpdateArgs(pm, packageName, latestVersion);
-  console.log(`⏳ Atualizando globalmente via ${pm} (${cmd} ${args.join(" ")})...`);
-  const fullUpdateCmd = `${cmd} ${args.join(" ")}`;
-  const updateProc = spawnSync(fullUpdateCmd, {
-    stdio: "inherit",
-    shell: true,
-  });
-  if (updateProc.status === 0) {
-    console.log(`\n✅ [QwenProxy] Atualizado com sucesso para a versão v${latestVersion}!`);
-    console.log("👉 Digite 'qpx' para iniciar a nova versão.\n");
-  } else {
-    console.error(`\n❌ [QwenProxy] Falha ao atualizar automaticamente com ${cmd}.`);
-    console.log(`👉 Tente executar manualmente:\n   ${cmd} ${args.join(" ")}\n`);
-  }
-}
+import { runUpdateCommand } from "../bin/update.js";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 
-// Execute if run directly via CLI runner, not when imported in unit tests
 const isDirectRun =
   Boolean(process.argv[1]) &&
   (fileURLToPath(import.meta.url) === path.resolve(process.argv[1]) ||