@42ailab/42cc 0.2.1 → 0.3.9

package/README.md

@@ -1,92 +1,69 @@
 # 42cc
 
-Claude Code 模型配置工具 - npm 安装器
+Claude Code model configuration tool - A simple tray application for managing LLM model settings.
 
-## 安装
-
-### npm
-
-```bash
-npm install -g @42ailab/42cc
-```
-
-### bun
+## Installation
 
 ```bash
-bun add -g --trust @42ailab/42cc
-```
+# Using bun (recommended)
+bun add -g @42ailab/42cc
 
-### 其他包管理器
+# Using npm
+npm install -g @42ailab/42cc
 
-```bash
-# yarn
+# Using yarn
 yarn global add @42ailab/42cc
 
-# pnpm
+# Using pnpm
 pnpm add -g @42ailab/42cc
 ```
 
-## 使用
-
-安装完成后，应用会自动安装并启动。安装包已内置在 npm 包中，无需额外下载。
+## Usage
 
-### macOS
+```bash
+# Start the tray application
+42cc
 
-- 自动安装到 `/Applications/42cc.app`
-- 自动启动应用（首次需要确认 Gatekeeper 安全提示）
-- 下次可从 Launchpad 或访达搜索 "42cc" 启动
+# Show version
+42cc --version
 
-### Windows
+# Show help
+42cc --help
+```
 
-- 自动安装到 `%LocalAppData%\42cc`
-- 自动创建开始菜单快捷方式
-- 自动启动应用
-- 下次可从开始菜单搜索 "42cc" 启动
+## Supported Platforms
 
-## 系统要求
+| Platform | Architecture | Status |
+|----------|--------------|--------|
+| macOS    | ARM64 (Apple Silicon) | Supported |
+| macOS    | x64 (Intel) | Supported |
+| Windows  | x64 | Supported |
 
-- **macOS**: 10.13 (High Sierra) 或更高
-- **Windows**: Windows 10 或更高
-- **Node.js**: 14.0.0 或更高
+## How It Works
 
-## 注意事项
+This package uses platform-specific optional dependencies to deliver the correct binary for your system:
 
-- **macOS**: 首次运行时需要在 Gatekeeper 安全提示中点击"打开"
-- **Windows**: 如遇到 SmartScreen 提示，点击"仍要运行"
-- 安装过程中可能需要管理员权限
+- `@42ailab/42cc-darwin-universal` - macOS Universal Binary (ARM64 + x64)
+- `@42ailab/42cc-win32-x64` - Windows x64
 
-## 其他安装方式
+When you install `@42ailab/42cc`, your package manager automatically downloads only the binary for your platform.
 
-### Homebrew (macOS)
+## Uninstall
 
 ```bash
-brew tap 42ailab/42cc
-brew install --cask 42cc
-```
-
-### 直接下载
-
-访问 [https://get.42plugin.com/42cc/](https://get.42plugin.com/42cc/) 下载安装包。
+# Using bun
+bun remove -g @42ailab/42cc
 
-## 功能
-
-42cc 是一款极简的 Claude Code 模型配置工具：
-
-- 选择模型供应商
-- 输入 API 密钥
-- 一键完成配置
-
-支持的模型供应商：
-- GLM (智谱)
-- MiniMax
-- Anthropic 官方
-- 自定义供应商
+# Using npm
+npm uninstall -g @42ailab/42cc
+```
 
-## 链接
+## Links
 
-- **主页**: https://42cc.42ailab.com
-- **问题反馈**: https://cnb.cool/42ailab/42plugin/meta/-/issues
+- Homepage: https://42cc.42ailab.com
+- Issues: https://cnb.cool/42ailab/42plugin/meta/-/issues
+- Repository: https://cnb.cool/42ailab/42plugin/42cc
 
-## LICENSE
+## License
 
-Proprietary
+Proprietary - 42ailab

package/bin/42cc.js

@@ -1,134 +1,195 @@
 #!/usr/bin/env node
 
-const { execSync } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-const https = require('https');
-
-const platform = process.platform;
-const VERSION_URL = 'https://get.42plugin.com/42cc/version.json';
-
-function showHelp() {
-  console.log(`
-42cc - Claude Code 模型配置工具
+/**
+ * 42cc CLI Launcher
+ *
+ * Claude Code model configuration tool - CLI launcher for the 42cc tray application.
+ * Uses platform-specific packages via optionalDependencies for optimal installation.
+ *
+ * Usage:
+ *   42cc              - Start the tray application
+ *   42cc --version    - Show version
+ *   42cc --help       - Show help
+ */
+
+const { spawn } = require("child_process");
+const path = require("path");
+const fs = require("fs");
+
+// =============================================================================
+// Constants
+// =============================================================================
+
+const VERSION = require("../package.json").version;
+
+// Platform to package mapping
+const PLATFORM_PACKAGES = {
+  "darwin-arm64": "@42ailab/42cc-darwin-universal",
+  "darwin-x64": "@42ailab/42cc-darwin-universal",
+  "win32-x64": "@42ailab/42cc-win32-x64",
+};
+
+// =============================================================================
+// Console Output
+// =============================================================================
+
+const colors = {
+  reset: "\x1b[0m",
+  green: "\x1b[32m",
+  yellow: "\x1b[33m",
+  red: "\x1b[31m",
+  dim: "\x1b[2m",
+};
+
+function log(msg, color = "reset") {
+  console.log(`${colors[color]}${msg}${colors.reset}`);
+}
 
-用法:
-  42cc           启动应用（仅 macOS）
-  42cc --help    显示帮助信息
-  42cc --version 显示版本信息
-  42cc --update  检查并更新到最新版本
+function logError(msg) {
+  console.error(`${colors.red}${msg}${colors.reset}`);
+}
 
-安装位置:
-  macOS:   /Applications/42cc.app
-  Windows: 请从开始菜单启动
+// =============================================================================
+// Platform Detection
+// =============================================================================
 
-更多信息: https://42ailab.com
-  `);
+function getPlatformKey() {
+  return `${process.platform}-${process.arch}`;
 }
 
-function getVersion() {
-  const pkg = require('../package.json');
-  console.log(`v${pkg.version}`);
+function getPackageDir(pkgName) {
+  try {
+    const pkgPath = require.resolve(`${pkgName}/package.json`);
+    return path.dirname(pkgPath);
+  } catch {
+    return null;
+  }
 }
 
-function launch() {
-  if (platform === 'darwin') {
-    try {
-      execSync('open -a 42cc', { stdio: 'inherit' });
-    } catch (error) {
-      console.error('错误: 未找到 42cc 应用');
-      console.error('请尝试重新安装: npm install -g @42ailab/42cc');
-      process.exit(1);
-    }
-  } else if (platform === 'win32') {
-    console.log('Windows: 请从开始菜单启动 42cc');
-    console.log('或运行安装目录下的 42cc.exe');
-  } else {
-    console.error('不支持的平台');
+// =============================================================================
+// Launch Application
+// =============================================================================
+
+function launchApp() {
+  const platformKey = getPlatformKey();
+  const pkgName = PLATFORM_PACKAGES[platformKey];
+
+  if (!pkgName) {
+    logError(`Unsupported platform: ${platformKey}`);
+    logError("");
+    logError("42cc supports:");
+    logError("  - macOS (ARM64 / x64)");
+    logError("  - Windows (x64)");
     process.exit(1);
   }
-}
 
-// 获取本地已安装的版本号
-function getLocalVersion() {
-  const homeDir = process.env.HOME || process.env.USERPROFILE;
+  const pkgDir = getPackageDir(pkgName);
 
-  let versionFile;
-  if (platform === 'darwin') {
-    versionFile = path.join(homeDir, '.42cc', 'version');
-  } else {
-    versionFile = path.join(process.env.APPDATA || homeDir, '42cc', 'version');
+  if (!pkgDir) {
+    logError(`Platform package not found: ${pkgName}`);
+    logError("");
+    logError("This may be a packaging issue. Try reinstalling:");
+    logError("  bun remove -g @42ailab/42cc && bun add -g @42ailab/42cc");
+    logError("  # or");
+    logError("  npm uninstall -g @42ailab/42cc && npm install -g @42ailab/42cc");
+    process.exit(1);
   }
 
-  try {
-    return fs.readFileSync(versionFile, 'utf8').trim();
-  } catch (e) {
-    return null;
+  if (process.platform === "darwin") {
+    // macOS: Use 'open' to launch .app bundle
+    // This ensures Info.plist settings (LSUIElement, etc.) are respected
+    const appPath = path.join(pkgDir, "42cc.app");
+
+    if (!fs.existsSync(appPath)) {
+      logError(`Application not found: ${appPath}`);
+      process.exit(1);
+    }
+
+    const child = spawn("open", ["-a", appPath], {
+      detached: true,
+      stdio: "ignore",
+    });
+    child.unref();
+
+    log("42cc started", "green");
+  } else if (process.platform === "win32") {
+    // Windows: Launch exe with hidden console
+    const exePath = path.join(pkgDir, "bin", "42cc.exe");
+
+    if (!fs.existsSync(exePath)) {
+      logError(`Executable not found: ${exePath}`);
+      process.exit(1);
+    }
+
+    const child = spawn(exePath, [], {
+      detached: true,
+      stdio: "ignore",
+      windowsHide: true, // Hide console window flash
+    });
+    child.unref();
+
+    log("42cc started", "green");
   }
+
+  process.exit(0);
 }
 
-// 获取远程最新版本号
-function fetchRemoteVersion() {
-  return new Promise((resolve, reject) => {
-    https.get(VERSION_URL, (res) => {
-      // 检查 HTTP 状态码
-      if (res.statusCode !== 200) {
-        reject(new Error(`HTTP 请求失败: ${res.statusCode}`));
-        return;
-      }
-
-      let data = '';
-      res.on('data', (chunk) => data += chunk);
-      res.on('end', () => {
-        try {
-          const json = JSON.parse(data);
-          resolve(json.version);
-        } catch (e) {
-          reject(new Error('解析版本信息失败'));
-        }
-      });
-    }).on('error', (err) => {
-      reject(new Error(`网络请求失败: ${err.message}`));
-    });
-  });
+// =============================================================================
+// Commands
+// =============================================================================
+
+function showVersion() {
+  console.log(VERSION);
 }
 
-// 检查并更新
-async function checkAndUpdate() {
-  console.log('检查更新中...\n');
+function showHelp() {
+  console.log(`
+42cc - Claude Code Model Configuration Tool
 
-  try {
-    const localVersion = getLocalVersion();
-    const remoteVersion = await fetchRemoteVersion();
+Usage:
+  42cc              Start the tray application
+  42cc --version    Show version information
+  42cc --help       Show this help message
 
-    console.log(`本地版本: ${localVersion || '未安装'}`);
-    console.log(`最新版本: ${remoteVersion}`);
+Installation:
+  bun add -g @42ailab/42cc
+  # or
+  npm install -g @42ailab/42cc
 
-    if (localVersion === remoteVersion) {
-      console.log('\n已是最新版本，无需更新。');
-      return;
-    }
+Uninstall:
+  bun remove -g @42ailab/42cc
+  # or
+  npm uninstall -g @42ailab/42cc
 
-    console.log('\n发现新版本，开始更新...\n');
+Supported Platforms:
+  - macOS (ARM64 / x64) - Universal Binary
+  - Windows (x64)
 
-    // 调用 install.js 进行安装
-    const installScript = path.join(__dirname, '..', 'scripts', 'install.js');
-    require(installScript).install();
+More info: https://42cc.42ailab.com
+`);
+}
 
-  } catch (error) {
-    console.error(`更新失败: ${error.message}`);
-    process.exit(1);
+// =============================================================================
+// Main
+// =============================================================================
+
+function main() {
+  const args = process.argv.slice(2);
+  const cmd = args[0];
+
+  switch (cmd) {
+    case "--version":
+    case "-v":
+      showVersion();
+      break;
+    case "--help":
+    case "-h":
+      showHelp();
+      break;
+    default:
+      launchApp();
+      break;
   }
 }
 
-const arg = process.argv[2];
-
-if (arg === '--help' || arg === '-h') {
-  showHelp();
-} else if (arg === '--version' || arg === '-v') {
-  getVersion();
-} else if (arg === '--update' || arg === '-u') {
-  checkAndUpdate();
-} else {
-  launch();
-}
+main();

package/package.json

@@ -1,45 +1,46 @@
 {
   "name": "@42ailab/42cc",
-  "version": "0.2.1",
-  "description": "Claude Code model configuration tool - Installer | Claude Code \u6a21\u578b\u914d\u7f6e\u5de5\u5177 - \u5b89\u88c5\u5668",
-  "main": "index.js",
+  "version": "0.3.9",
+  "description": "Claude Code model configuration tool - CLI launcher for the 42cc tray application",
   "bin": {
     "42cc": "./bin/42cc.js"
   },
-  "scripts": {
-    "postinstall": "node scripts/install.js",
-    "test": "bash test.sh"
+  "files": [
+    "bin/",
+    "README.md"
+  ],
+  "optionalDependencies": {
+    "@42ailab/42cc-darwin-universal": "0.3.9",
+    "@42ailab/42cc-win32-x64": "0.3.9"
+  },
+  "os": [
+    "darwin",
+    "win32"
+  ],
+  "engines": {
+    "node": ">=14.0.0"
   },
   "keywords": [
     "claude-code",
+    "claude",
     "ai",
     "model-configuration",
     "42plugin",
-    "42ailab"
+    "42ailab",
+    "tray-app",
+    "cli"
   ],
   "author": "42ailab <email@huoshuiai.com>",
   "license": "Proprietary",
   "homepage": "https://42cc.42ailab.com",
   "repository": {
     "type": "git",
-    "url": "https://github.com/42ailab/get.42plugin.com.git",
-    "directory": "npm-package"
+    "url": "https://cnb.cool/42ailab/42plugin/42cc"
   },
   "bugs": {
     "url": "https://cnb.cool/42ailab/42plugin/meta/-/issues"
   },
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "os": [
-    "darwin",
-    "win32"
-  ],
-  "files": [
-    "bin/",
-    "scripts/install.js",
-    "assets/",
-    "index.js",
-    "README.md"
-  ]
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/index.js

@@ -1,5 +0,0 @@
-// npm 包主入口（用于 require('42cc')）
-module.exports = {
-  version: require('./package.json').version,
-  install: require('./scripts/install.js').install
-};

package/scripts/install.js

@@ -1,252 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-const path = require('path');
-const { execSync } = require('child_process');
-
-const ASSETS_DIR = path.join(__dirname, '..', 'assets');
-const APP_VERSION = require('../package.json').version;
-
-// 颜色输出
-const colors = {
-  reset: '\x1b[0m',
-  green: '\x1b[32m',
-  yellow: '\x1b[33m',
-  blue: '\x1b[34m',
-  red: '\x1b[31m'
-};
-
-function log(msg, color = 'reset') {
-  console.log(`${colors[color]}${msg}${colors.reset}`);
-}
-
-function getPlatform() {
-  const platform = process.platform;
-  if (platform === 'darwin') return 'macos';
-  if (platform === 'win32') return 'windows';
-  throw new Error(`不支持的平台: ${platform}`);
-}
-
-// 保存已安装的版本号到本地文件
-function saveInstalledVersion(version) {
-  const homeDir = process.env.HOME || process.env.USERPROFILE;
-  const platform = process.platform;
-
-  let versionDir;
-  if (platform === 'darwin') {
-    versionDir = path.join(homeDir, '.42cc');
-  } else {
-    versionDir = path.join(process.env.APPDATA || homeDir, '42cc');
-  }
-
-  const versionFile = path.join(versionDir, 'version');
-
-  try {
-    if (!fs.existsSync(versionDir)) {
-      fs.mkdirSync(versionDir, { recursive: true });
-    }
-    fs.writeFileSync(versionFile, version, 'utf8');
-  } catch (e) {
-    // 写入版本文件失败不影响安装流程
-  }
-}
-
-// macOS 自动安装
-async function autoInstallMacOS() {
-  const dmgPath = path.join(ASSETS_DIR, '42cc.dmg');
-
-  if (!fs.existsSync(dmgPath)) {
-    throw new Error('未找到安装文件: ' + dmgPath);
-  }
-
-  log('\n开始安装...', 'yellow');
-
-  try {
-    // 1. 挂载 DMG
-    log('1. 挂载 DMG...', 'blue');
-    execSync(`hdiutil attach "${dmgPath}" -nobrowse -quiet`);
-
-    // 2. 找到挂载点
-    const volumes = fs.readdirSync('/Volumes');
-    const mountPoint = volumes.find(v => v.includes('42cc'));
-    if (!mountPoint) {
-      throw new Error('未找到挂载点');
-    }
-    const mountPath = `/Volumes/${mountPoint}`;
-
-    // 3. 复制到 Applications
-    log('2. 安装到 Applications...', 'blue');
-    const appPath = `${mountPath}/42cc.app`;
-    const targetPath = '/Applications/42cc.app';
-
-    // 检查是否已存在
-    if (fs.existsSync(targetPath)) {
-      log('检测到已安装的版本，将替换...', 'yellow');
-      try {
-        execSync(`rm -rf "${targetPath}"`);
-      } catch (e) {
-        log('需要管理员权限删除旧版本，请输入密码：', 'yellow');
-        try {
-          execSync(`sudo rm -rf "${targetPath}"`);
-        } catch (sudoErr) {
-          throw new Error('删除旧版本失败，请手动删除 /Applications/42cc.app 后重试');
-        }
-      }
-    }
-
-    // 复制应用
-    try {
-      execSync(`cp -R "${appPath}" /Applications/`);
-      log('+ 安装成功', 'green');
-    } catch (e) {
-      log('需要管理员权限，请输入密码：', 'yellow');
-      try {
-        execSync(`sudo cp -R "${appPath}" /Applications/`);
-        log('+ 安装成功', 'green');
-      } catch (sudoErr) {
-        throw new Error('安装失败，请检查 /Applications 目录权限');
-      }
-    }
-
-    // 4. 卸载 DMG
-    log('3. 清理...', 'blue');
-    execSync(`hdiutil detach "${mountPath}" -quiet`);
-
-    // 5. 启动应用
-    log('4. 启动应用...', 'blue');
-    log('\nGatekeeper 安全提示：', 'yellow');
-    log('即将弹出安全确认窗口，请点击"打开"', 'yellow');
-    log('（此提示仅首次运行时出现）\n', 'blue');
-
-    execSync('open -a 42cc');
-
-    log('\n+ 安装完成', 'green');
-    log('=====================================', 'blue');
-    log('');
-    log('+ 安装位置: /Applications/42cc.app', 'green');
-    log('+ 应用已启动并显示在菜单栏', 'green');
-    log('+ 下次可从 Launchpad 搜索 "42cc" 启动', 'green');
-    log('');
-    log('=====================================\n', 'blue');
-
-    return true;
-  } catch (error) {
-    log(`\n安装失败: ${error.message}`, 'red');
-    return false;
-  }
-}
-
-// Windows 自动安装
-async function autoInstallWindows() {
-  const exePath = path.join(ASSETS_DIR, '42cc.exe');
-
-  if (!fs.existsSync(exePath)) {
-    throw new Error('未找到安装文件: ' + exePath);
-  }
-
-  log('\n开始安装...', 'yellow');
-
-  try {
-    const userProfile = process.env.USERPROFILE || process.env.HOME;
-    const installDir = path.join(userProfile, 'AppData', 'Local', '42cc');
-    const targetPath = path.join(installDir, '42cc.exe');
-
-    log('1. 安装到用户目录...', 'blue');
-
-    // 创建目录
-    if (!fs.existsSync(installDir)) {
-      fs.mkdirSync(installDir, { recursive: true });
-    }
-
-    // 复制可执行文件
-    fs.copyFileSync(exePath, targetPath);
-    log(`+ 已安装到: ${installDir}`, 'green');
-
-    // 创建开始菜单快捷方式
-    log('\n2. 创建开始菜单快捷方式...', 'blue');
-    try {
-      const startMenuDir = path.join(userProfile, 'AppData', 'Roaming', 'Microsoft', 'Windows', 'Start Menu', 'Programs');
-      const shortcutPath = path.join(startMenuDir, '42cc.lnk');
-
-      // 使用 PowerShell 创建快捷方式
-      const psScript = `
-        $WshShell = New-Object -ComObject WScript.Shell
-        $Shortcut = $WshShell.CreateShortcut("${shortcutPath.replace(/\\/g, '\\\\')}")
-        $Shortcut.TargetPath = "${targetPath.replace(/\\/g, '\\\\')}"
-        $Shortcut.WorkingDirectory = "${installDir.replace(/\\/g, '\\\\')}"
-        $Shortcut.Description = "42cc - Claude Code 模型配置工具"
-        $Shortcut.Save()
-      `;
-
-      execSync(`powershell -Command "${psScript}"`, { stdio: 'ignore' });
-      log('+ 已添加到开始菜单', 'green');
-    } catch (e) {
-      log('x 创建开始菜单快捷方式失败，可手动创建', 'yellow');
-    }
-
-    // 直接运行应用
-    log('\n3. 启动应用...', 'blue');
-    try {
-      execSync(`start "" "${targetPath}"`, { stdio: 'ignore' });
-
-      log('\n+ 安装完成', 'green');
-      log('=====================================', 'blue');
-      log('');
-      log('+ 安装位置: ' + installDir, 'green');
-      log('+ 应用已启动并显示在系统托盘', 'green');
-      log('+ 下次可从开始菜单搜索 "42cc" 启动', 'green');
-      log('');
-      log('=====================================\n', 'blue');
-    } catch (e) {
-      log('\n+ 安装完成', 'green');
-      log('=====================================', 'blue');
-      log('');
-      log('+ 安装位置: ' + installDir, 'green');
-      log('+ 可从开始菜单搜索 "42cc" 启动', 'green');
-      log('x 自动启动失败，请手动打开', 'yellow');
-      log('');
-      log('=====================================\n', 'blue');
-    }
-
-    return true;
-  } catch (error) {
-    log(`\n安装失败: ${error.message}`, 'red');
-    return false;
-  }
-}
-
-async function install() {
-  try {
-    log('\n42cc 安装程序', 'blue');
-    log('================\n', 'blue');
-
-    const platform = getPlatform();
-    log(`平台: ${platform}`, 'green');
-    log(`版本: ${APP_VERSION}`, 'green');
-
-    let success = false;
-    if (platform === 'macos') {
-      success = await autoInstallMacOS();
-    } else {
-      success = await autoInstallWindows();
-    }
-
-    if (success) {
-      saveInstalledVersion(APP_VERSION);
-    }
-
-    log('\n更多信息: https://42ailab.com\n', 'blue');
-
-  } catch (error) {
-    log(`\n错误: ${error.message}`, 'red');
-    log('\n如需帮助，请访问: https://cnb.cool/42ailab/42plugin/meta/-/issues\n', 'yellow');
-    process.exit(1);
-  }
-}
-
-// 仅在 postinstall 时运行
-if (require.main === module) {
-  install();
-}
-
-module.exports = { install };