@jackwener/opencli 1.5.6 → 1.5.7

package/src/registry.ts

@@ -33,6 +33,7 @@ export type CommandArgs = Record<string, any>;
 export interface CliCommand {
   site: string;
   name: string;
+  aliases?: string[];
   description: string;
   domain?: string;
   strategy?: Strategy;
@@ -85,9 +86,11 @@ const _registry: Map<string, CliCommand> =
 export function cli(opts: CliOptions): CliCommand {
   const strategy = opts.strategy ?? (opts.browser === false ? Strategy.PUBLIC : Strategy.COOKIE);
   const browser = opts.browser ?? (strategy !== Strategy.PUBLIC);
+  const aliases = normalizeAliases(opts.aliases, opts.name);
   const cmd: CliCommand = {
     site: opts.site,
     name: opts.name,
+    aliases,
     description: opts.description ?? '',
     domain: opts.domain,
     strategy,
@@ -104,8 +107,7 @@ export function cli(opts: CliOptions): CliCommand {
     navigateBefore: opts.navigateBefore,
   };
 
-  const key = fullName(cmd);
-  _registry.set(key, cmd);
+  registerCommand(cmd);
   return cmd;
 }
 
@@ -122,5 +124,32 @@ export function strategyLabel(cmd: CliCommand): string {
 }
 
 export function registerCommand(cmd: CliCommand): void {
-  _registry.set(fullName(cmd), cmd);
+  const canonicalKey = fullName(cmd);
+  const existing = _registry.get(canonicalKey);
+  if (existing) {
+    for (const [key, value] of _registry.entries()) {
+      if (value === existing && key !== canonicalKey) _registry.delete(key);
+    }
+  }
+
+  const aliases = normalizeAliases(cmd.aliases, cmd.name);
+  cmd.aliases = aliases.length > 0 ? aliases : undefined;
+  _registry.set(canonicalKey, cmd);
+  for (const alias of aliases) {
+    _registry.set(`${cmd.site}/${alias}`, cmd);
+  }
+}
+
+function normalizeAliases(aliases: string[] | undefined, commandName: string): string[] {
+  if (!Array.isArray(aliases) || aliases.length === 0) return [];
+
+  const seen = new Set<string>();
+  const normalized: string[] = [];
+  for (const alias of aliases) {
+    const value = typeof alias === 'string' ? alias.trim() : '';
+    if (!value || value === commandName || seen.has(value)) continue;
+    seen.add(value);
+    normalized.push(value);
+  }
+  return normalized;
 }

package/src/runtime.ts

@@ -1,13 +1,15 @@
 import { BrowserBridge, CDPBridge } from './browser/index.js';
 import type { IPage } from './types.js';
 import { TimeoutError } from './errors.js';
+import { isElectronApp } from './electron-apps.js';
 
 /**
- * Returns the appropriate browser factory based on environment config.
- * Uses CDPBridge when OPENCLI_CDP_ENDPOINT is set, otherwise BrowserBridge.
+ * Returns the appropriate browser factory based on site type.
+ * Uses CDPBridge for registered Electron apps, otherwise BrowserBridge.
  */
-export function getBrowserFactory(): new () => IBrowserFactory {
-  return process.env.OPENCLI_CDP_ENDPOINT ? CDPBridge : BrowserBridge;
+export function getBrowserFactory(site?: string): new () => IBrowserFactory {
+  if (site && isElectronApp(site)) return CDPBridge;
+  return BrowserBridge;
 }
 
 function parseEnvTimeout(envVar: string, fallback: number): number {
@@ -61,18 +63,22 @@ export function withTimeoutMs<T>(
 
 /** Interface for browser factory (BrowserBridge or test mocks) */
 export interface IBrowserFactory {
-  connect(opts?: { timeout?: number; workspace?: string }): Promise<IPage>;
+  connect(opts?: { timeout?: number; workspace?: string; cdpEndpoint?: string }): Promise<IPage>;
   close(): Promise<void>;
 }
 
 export async function browserSession<T>(
   BrowserFactory: new () => IBrowserFactory,
   fn: (page: IPage) => Promise<T>,
-  opts: { workspace?: string } = {},
+  opts: { workspace?: string; cdpEndpoint?: string } = {},
 ): Promise<T> {
   const mcp = new BrowserFactory();
   try {
-    const page = await mcp.connect({ timeout: DEFAULT_BROWSER_CONNECT_TIMEOUT, workspace: opts.workspace });
+    const page = await mcp.connect({
+      timeout: DEFAULT_BROWSER_CONNECT_TIMEOUT,
+      workspace: opts.workspace,
+      cdpEndpoint: opts.cdpEndpoint,
+    });
     return await fn(page);
   } finally {
     await mcp.close().catch(() => {});

package/src/serialization.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import type { CliCommand } from './registry.js';
 import { Strategy } from './registry.js';
-import { formatRegistryHelpText } from './serialization.js';
+import { formatRegistryHelpText, serializeCommand } from './serialization.js';
 
 describe('formatRegistryHelpText', () => {
   it('summarizes long choices lists so help text stays readable', () => {
@@ -23,4 +23,22 @@ describe('formatRegistryHelpText', () => {
 
     expect(formatRegistryHelpText(cmd)).toContain('--field: all-fields, topic, title, author, ... (+3 more)');
   });
+
+  it('includes aliases in structured serialization and help text', () => {
+    const cmd: CliCommand = {
+      site: 'demo',
+      name: 'get',
+      aliases: ['metadata'],
+      description: 'Demo command',
+      strategy: Strategy.COOKIE,
+      browser: true,
+      args: [],
+    };
+
+    expect(serializeCommand(cmd)).toMatchObject({
+      command: 'demo/get',
+      aliases: ['metadata'],
+    });
+    expect(formatRegistryHelpText(cmd)).toContain('Aliases: metadata');
+  });
 });

package/src/serialization.ts

@@ -39,6 +39,7 @@ export function serializeCommand(cmd: CliCommand) {
     command: fullName(cmd),
     site: cmd.site,
     name: cmd.name,
+    aliases: cmd.aliases ?? [],
     description: cmd.description,
     strategy: strategyLabel(cmd),
     browser: !!cmd.browser,
@@ -82,6 +83,7 @@ export function formatRegistryHelpText(cmd: CliCommand): string {
   if (cmd.domain) meta.push(`Domain: ${cmd.domain}`);
   if (cmd.deprecated) meta.push(`Deprecated: ${typeof cmd.deprecated === 'string' ? cmd.deprecated : 'yes'}`);
   if (cmd.replacedBy) meta.push(`Use instead: ${cmd.replacedBy}`);
+  if (cmd.aliases?.length) meta.push(`Aliases: ${cmd.aliases.join(', ')}`);
   lines.push(meta.join(' | '));
   if (cmd.columns?.length) lines.push(`Output columns: ${cmd.columns.join(', ')}`);
   return '\n' + lines.join('\n') + '\n';

package/src/tui.test.ts

@@ -0,0 +1,23 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { confirmPrompt } from './tui.js';
+
+describe('confirmPrompt', () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it('returns defaultYes when stdin is not TTY', async () => {
+    const result = await confirmPrompt('Restart?', true);
+    expect(result).toBe(true);
+  });
+
+  it('returns false when defaultYes is false and non-TTY', async () => {
+    const result = await confirmPrompt('Restart?', false);
+    expect(result).toBe(false);
+  });
+
+  it('defaults to true when defaultYes is omitted and non-TTY', async () => {
+    const result = await confirmPrompt('Restart?');
+    expect(result).toBe(true);
+  });
+});

package/src/tui.ts

@@ -170,3 +170,68 @@ export async function checkboxPrompt(
     draw();
   });
 }
+
+/**
+ * Simple yes/no confirmation prompt.
+ *
+ * In non-TTY environments, returns `defaultYes` (defaults to true) without blocking.
+ * In TTY, waits for a single keypress: y/Enter → true, n/Esc/q → false.
+ */
+export async function confirmPrompt(
+  message: string,
+  defaultYes: boolean = true,
+): Promise<boolean> {
+  const { stdin, stdout } = process;
+  if (!stdin.isTTY) return defaultYes;
+
+  const hint = defaultYes ? '[Y/n]' : '[y/N]';
+  stdout.write(`  ${message} ${chalk.dim(hint)} `);
+
+  return new Promise<boolean>((resolve) => {
+    const wasRaw = stdin.isRaw;
+    stdin.setRawMode(true);
+    stdin.resume();
+
+    function cleanup() {
+      stdin.setRawMode(wasRaw ?? false);
+      stdin.pause();
+      stdin.removeListener('data', onData);
+      stdout.write('\n');
+    }
+
+    function onData(data: Buffer) {
+      const key = data.toString();
+
+      // Ctrl+C
+      if (key === '\x03') {
+        cleanup();
+        process.exit(EXIT_CODES.INTERRUPTED);
+      }
+
+      // Enter — use default
+      if (key === '\r' || key === '\n') {
+        cleanup();
+        resolve(defaultYes);
+        return;
+      }
+
+      // y/Y — yes
+      if (key === 'y' || key === 'Y') {
+        cleanup();
+        resolve(true);
+        return;
+      }
+
+      // n/N/q/Esc — no
+      if (key === 'n' || key === 'N' || key === 'q' || key === '\x1b') {
+        cleanup();
+        resolve(false);
+        return;
+      }
+
+      // Ignore other keys
+    }
+
+    stdin.on('data', onData);
+  });
+}

package/src/weixin-download.test.ts

@@ -61,4 +61,31 @@ describe('weixin publish time extraction', () => {
       'var create_time = "1711291080";',
     )).toBe('2026年3月24日 22:38');
   });
+
+  it('detects WeChat verification gate pages', async () => {
+    const mod = await loadModule();
+
+    expect(mod.detectWechatAccessIssue(
+      '环境异常 当前环境异常，完成验证后即可继续访问。 去验证',
+      '<html><body><a id="js_verify">去验证</a></body></html>',
+    )).toBe('environment verification required');
+  });
+
+  it('browser access detector matches the server-side verifier', async () => {
+    const mod = await loadModule();
+
+    const detectInPage = eval(mod.buildDetectWechatAccessIssueJs()) as (pageText: string, htmlStr: string) => string;
+
+    expect(detectInPage(
+      '环境异常 当前环境异常，完成验证后即可继续访问。 去验证',
+      '<html>secitptpage/verify.html<a id="js_verify">去验证</a></html>',
+    )).toBe('environment verification required');
+  });
+
+  it('picks the first non-empty WeChat metadata field', async () => {
+    const mod = await loadModule();
+
+    expect(mod.pickFirstWechatMetaText('', 'Name cleared', '数字生命卡兹克')).toBe('数字生命卡兹克');
+    expect(mod.pickFirstWechatMetaText('', '  聊聊刚刚上线的PixVerse V6视频模型。  ')).toBe('聊聊刚刚上线的PixVerse V6视频模型。');
+  });
 });

package/tests/e2e/browser-public-extended.test.ts

@@ -126,9 +126,13 @@ describe('browser extended public-data commands E2E', () => {
   }, 60_000);
 
   // ── ctrip ──
-  it('ctrip search returns flights', async () => {
-    const data = await tryBrowserCommand(['ctrip', 'search', '-f', 'json']);
+  it('ctrip search returns destination suggestions', async () => {
+    const data = await tryBrowserCommand(['ctrip', 'search', '苏州', '--limit', '3', '-f', 'json']);
     expectDataOrSkip(data, 'ctrip search');
+    if (data) {
+      expect(data[0]).toHaveProperty('name');
+      expect(data[0]).toHaveProperty('type');
+    }
   }, 60_000);
 
   // ── coupang ──

package/chatwise-opencli.ps1

@@ -1,82 +0,0 @@
-[CmdletBinding()]
-param(
-  [Parameter(ValueFromRemainingArguments = $true)]
-  [string[]]$OpenCliArgs
-)
-
-$ErrorActionPreference = 'Stop'
-
-$chatwiseExe = 'C:\Program Files\ChatWise\ChatWise.exe'
-if (-not (Test-Path $chatwiseExe)) {
-  throw "ChatWise executable not found at $chatwiseExe"
-}
-
-$opencli = Get-Command opencli -ErrorAction SilentlyContinue
-if (-not $opencli) {
-  throw 'opencli was not found in PATH'
-}
-
-function Clear-LocalProxyEnv {
-  $vars = 'http_proxy','https_proxy','HTTP_PROXY','HTTPS_PROXY'
-  foreach ($name in $vars) {
-    Set-Item -Path "Env:$name" -Value ''
-  }
-  $noProxy = '127.0.0.1,localhost'
-  Set-Item -Path 'Env:NO_PROXY' -Value $noProxy
-  Set-Item -Path 'Env:no_proxy' -Value $noProxy
-}
-
-function Stop-ChatWiseTree {
-  $candidates = Get-CimInstance Win32_Process |
-    Where-Object { $_.Name -match '^ChatWise\.exe$|^chatwise\.exe$' }
-
-  foreach ($proc in $candidates) {
-    try {
-      Stop-Process -Id $proc.ProcessId -Force -ErrorAction Stop
-    } catch {}
-  }
-
-  Start-Sleep -Seconds 2
-}
-
-function Wait-ChatWiseDebugPort {
-  param(
-    [int]$Port = 9228,
-    [int]$TimeoutSeconds = 20
-  )
-
-  $deadline = (Get-Date).AddSeconds($TimeoutSeconds)
-  while ((Get-Date) -lt $deadline) {
-    try {
-      $resp = Invoke-WebRequest -UseBasicParsing -TimeoutSec 2 -Uri "http://127.0.0.1:$Port/json/version"
-      if ($resp.StatusCode -ge 200 -and $resp.StatusCode -lt 300) {
-        return
-      }
-    } catch {}
-    Start-Sleep -Milliseconds 500
-  }
-
-  throw "ChatWise debugging endpoint did not come up on 127.0.0.1:$Port"
-}
-
-Clear-LocalProxyEnv
-Stop-ChatWiseTree
-
-$proc = Start-Process -FilePath $chatwiseExe -ArgumentList '--remote-debugging-port=9228' -PassThru
-Start-Sleep -Seconds 4
-
-if ($proc.HasExited) {
-  throw "ChatWise exited early with code $($proc.ExitCode)"
-}
-
-Wait-ChatWiseDebugPort
-
-$env:OPENCLI_CDP_ENDPOINT = 'http://127.0.0.1:9228'
-
-if (-not $OpenCliArgs -or $OpenCliArgs.Count -eq 0) {
-  & $opencli.Source 'chatwise' 'status'
-  exit $LASTEXITCODE
-}
-
-& $opencli.Source @OpenCliArgs
-exit $LASTEXITCODE

package/dist/clis/chatwise/shared.d.ts

@@ -1,2 +0,0 @@
-import type { RequiredEnv } from '../../registry.js';
-export declare const chatwiseRequiredEnv: RequiredEnv[];

package/dist/clis/chatwise/shared.js

@@ -1,6 +0,0 @@
-export const chatwiseRequiredEnv = [
-    {
-        name: 'OPENCLI_CDP_ENDPOINT',
-        help: 'Launch ChatWise with --remote-debugging-port=9228, then run OPENCLI_CDP_ENDPOINT=http://127.0.0.1:9228 opencli chatwise status. If you use a local proxy, also set NO_PROXY=127.0.0.1,localhost.',
-    },
-];

package/src/clis/chatwise/shared.ts

@@ -1,8 +0,0 @@
-import type { RequiredEnv } from '../../registry.js';
-
-export const chatwiseRequiredEnv: RequiredEnv[] = [
-  {
-    name: 'OPENCLI_CDP_ENDPOINT',
-    help: 'Launch ChatWise with --remote-debugging-port=9228, then run OPENCLI_CDP_ENDPOINT=http://127.0.0.1:9228 opencli chatwise status. If you use a local proxy, also set NO_PROXY=127.0.0.1,localhost.',
-  },
-];