@wwkit/cft 1.0.28 → 1.0.29

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2025 bluesliu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2025 bluesliu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

package/README.md

@@ -1,68 +1,68 @@
-# @wwkit/cft
-
-Chrome for Testing (CFT) 安装器 — 下载、解压、chmod、Linux 依赖检查。
-
-## 用法
-
-```bash
-cft install    # 下载并安装 Chrome for Testing（已装同版本则跳过）
-cft status     # 显示安装状态
-cft clear      # 删除安装产物（~/.config/cft/）
-cft help       # 显示帮助
-```
-
-## 安装目录
-
-`~/.config/cft/`（或 `$XDG_CONFIG_HOME/cft/`）
-
-## installed.json
-
-安装完成后生成 `~/.config/cft/installed.json`：
-
-```json
-{
-  "location": "~/.config/cft",
-  "version": "141.0.7390.54",
-  "os": "mac-arm64",
-  "chrome_path": ".../chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing",
-  "driver_path": ".../chromedriver-mac-arm64/chromedriver"
-}
-```
-
-## 配置
-
-版本和镜像源硬编码在包内，不接受外部参数。
-
-- 默认版本: `141.0.7390.54`
-- 默认镜像: `https://npmmirror.com/mirrors/chrome-for-testing`
-
-## 本地开发
-
-### 环境要求
-
-- Node.js >= 18
-- pnpm（workspace 根目录 `pnpm install` 自动链接 `@wwkit/shared`）
-
-### 直接调用命令
-
-```bash
-# 通过 bin 入口（推荐，模拟 npm 全局安装后的行为）
-node bin status
-node bin install
-node bin help
-
-# 或通过 pnpm script
-pnpm start install
-```
-
-### 运行测试
-
-```bash
-pnpm run ut        # 单元测试（pnpm test 为其别名）
-```
-
-### 发布
-
-```bash
-pnpm release       # pnpm version patch && pnpm publish
+# @wwkit/cft
+
+Chrome for Testing (CFT) 安装器 — 下载、解压、chmod、Linux 依赖检查。
+
+## 用法
+
+```bash
+cft install    # 下载并安装 Chrome for Testing（已装同版本则跳过）
+cft status     # 显示安装状态
+cft clear      # 删除安装产物（~/.config/cft/）
+cft help       # 显示帮助
+```
+
+## 安装目录
+
+`~/.config/cft/`（或 `$XDG_CONFIG_HOME/cft/`）
+
+## installed.json
+
+安装完成后生成 `~/.config/cft/installed.json`：
+
+```json
+{
+  "location": "~/.config/cft",
+  "version": "141.0.7390.54",
+  "os": "mac-arm64",
+  "chrome_path": ".../chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing",
+  "driver_path": ".../chromedriver-mac-arm64/chromedriver"
+}
+```
+
+## 配置
+
+版本和镜像源硬编码在包内，不接受外部参数。
+
+- 默认版本: `141.0.7390.54`
+- 默认镜像: `https://npmmirror.com/mirrors/chrome-for-testing`
+
+## 本地开发
+
+### 环境要求
+
+- Node.js >= 18
+- pnpm（workspace 根目录 `pnpm install` 自动链接 `@wwkit/shared`）
+
+### 直接调用命令
+
+```bash
+# 通过 bin 入口（推荐，模拟 npm 全局安装后的行为）
+node bin status
+node bin install
+node bin help
+
+# 或通过 pnpm script
+pnpm start install
+```
+
+### 运行测试
+
+```bash
+pnpm run ut        # 单元测试（pnpm test 为其别名）
+```
+
+### 发布
+
+```bash
+pnpm release       # pnpm version patch && pnpm publish
 ```

package/bin/index.js

@@ -1,74 +1,74 @@
-#!/usr/bin/env node
-
-import { execSync } from 'node:child_process'
-import { existsSync, readFileSync } from 'node:fs'
-import { parseFlags } from '@wwkit/shared'
-import { install, status, clear, showConfig, showEnv, getProxy, USER_CONFIG_FILE, mergeBuiltinConfig } from '../src/index.js'
-
-// Lazy-init: if user config doesn't exist (postinstall skipped), create it now
-if (!existsSync(USER_CONFIG_FILE)) {
-  if (mergeBuiltinConfig()) {
-    console.log(`cft: config initialized at ${USER_CONFIG_FILE}`)
-  }
-}
-
-const pkgVersion = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version
-
-const args = process.argv.slice(2)
-const cmd = args[0] ?? 'help'
-
-if (cmd === 'install') {
-  const { flags } = parseFlags(args.slice(1))
-  let proxy = flags.proxy || flags.p || ''
-  if (proxy === 'true') proxy = ''
-  install(proxy ? { proxy } : {})
-    .then(() => {
-      console.log()
-      console.log('  ✓ CFT 安装完成')
-      process.exit(0)
-    })
-    .catch((err) => {
-      console.error(`  ✗ CFT 安装失败: ${err.message}`)
-      process.exit(1)
-    })
-} else if (cmd === 'status') {
-  const info = status()
-  process.exit(info ? 0 : 1)
-} else if (cmd === 'clear') {
-  clear()
-  process.exit(0)
-} else if (cmd === 'config') {
-  showConfig()
-} else if (cmd === 'env') {
-  showEnv()
-} else if (cmd === 'upgrade') {
-  const proxy = getProxy()
-  const npmArgs = ['install', '-g', '@wwkit/cft@latest']
-  if (proxy) npmArgs.push('--proxy', proxy)
-  execSync(`npm ${npmArgs.join(' ')}`, { stdio: 'inherit', shell: true })
-} else if (cmd === 'version') {
-  console.log(pkgVersion)
-} else if (cmd === 'help' || cmd === '-h' || cmd === '--help' || cmd === undefined) {
-  console.log(`cft - Chrome for Testing 安装器
-
-用法:
-  cft install    下载并安装 Chrome for Testing（已装同版本则跳过）
-  cft install -p <proxy>   指定代理下载安装（socks5://host:port|http://host:port），覆盖配置
-  cft status     显示安装状态
-  cft config     显示用户配置（~/.config/cft/config.json5）
-  cft env        显示 cft 创建的全局环境变量
-  cft clear      删除安装产物（~/.config/cft/）
-  cft upgrade    升级 cft 自身（npm install -g @wwkit/cft@latest）
-  cft version    显示版本号
-  cft help       显示本帮助
-
-Options:
-  -p, --proxy <url>  代理地址（install 时覆盖配置）
-  -h, --help          显示帮助
-
-安装目录: ~/.config/cft/`)
-} else {
-  console.error(`未知命令: ${cmd}`)
-  console.error('运行 cft help 查看用法')
-  process.exit(1)
-}
+#!/usr/bin/env node
+
+import { execSync } from 'node:child_process'
+import { existsSync, readFileSync } from 'node:fs'
+import { parseFlags } from '@wwkit/shared'
+import { install, status, clear, showConfig, showEnv, getProxy, USER_CONFIG_FILE, mergeBuiltinConfig } from '../src/index.js'
+
+// Lazy-init: if user config doesn't exist (postinstall skipped), create it now
+if (!existsSync(USER_CONFIG_FILE)) {
+  if (mergeBuiltinConfig()) {
+    console.log(`cft: config initialized at ${USER_CONFIG_FILE}`)
+  }
+}
+
+const pkgVersion = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version
+
+const args = process.argv.slice(2)
+const cmd = args[0] ?? 'help'
+
+if (cmd === 'install') {
+  const { flags } = parseFlags(args.slice(1))
+  let proxy = flags.proxy || flags.p || ''
+  if (proxy === 'true') proxy = ''
+  install(proxy ? { proxy } : {})
+    .then(() => {
+      console.log()
+      console.log('  ✓ CFT 安装完成')
+      process.exit(0)
+    })
+    .catch((err) => {
+      console.error(`  ✗ CFT 安装失败: ${err.message}`)
+      process.exit(1)
+    })
+} else if (cmd === 'status') {
+  const info = status()
+  process.exit(info ? 0 : 1)
+} else if (cmd === 'clear') {
+  clear()
+  process.exit(0)
+} else if (cmd === 'config') {
+  showConfig()
+} else if (cmd === 'env') {
+  showEnv()
+} else if (cmd === 'upgrade') {
+  const proxy = getProxy()
+  const npmArgs = ['install', '-g', '@wwkit/cft@latest']
+  if (proxy) npmArgs.push('--proxy', proxy)
+  execSync(`npm ${npmArgs.join(' ')}`, { stdio: 'inherit', shell: true })
+} else if (cmd === 'version') {
+  console.log(pkgVersion)
+} else if (cmd === 'help' || cmd === '-h' || cmd === '--help' || cmd === undefined) {
+  console.log(`cft - Chrome for Testing 安装器
+
+用法:
+  cft install    下载并安装 Chrome for Testing（已装同版本则跳过）
+  cft install -p <proxy>   指定代理下载安装（socks5://host:port|http://host:port），覆盖配置
+  cft status     显示安装状态
+  cft config     显示用户配置（~/.config/cft/config.json5）
+  cft env        显示 cft 创建的全局环境变量
+  cft clear      删除安装产物（~/.config/cft/）
+  cft upgrade    升级 cft 自身（npm install -g @wwkit/cft@latest）
+  cft version    显示版本号
+  cft help       显示本帮助
+
+Options:
+  -p, --proxy <url>  代理地址（install 时覆盖配置）
+  -h, --help          显示帮助
+
+安装目录: ~/.config/cft/`)
+} else {
+  console.error(`未知命令: ${cmd}`)
+  console.error('运行 cft help 查看用法')
+  process.exit(1)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/cft",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "author": "bluesliu <langcai163@163.com>",
   "description": "Chrome for Testing (CFT) installer — download, extract, chmod, dep-check",
   "type": "module",
@@ -35,8 +35,8 @@
     "access": "public"
   },
   "dependencies": {
-    "extract-zip": "^2.0.1",
-    "@wwkit/shared": "1.0.28"
+    "@wwkit/shared": "1.0.29",
+    "extract-zip": "^2.0.1"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/scripts/postinstall.js

@@ -1,50 +1,50 @@
-#!/usr/bin/env node
-
-import { spawnSync } from 'node:child_process'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { Shell } from '@wwkit/shared'
-import { getLocation, getOs, getProxy } from '../src/index.js'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const bin = path.join(__dirname, '..', 'bin', 'index.js')
-
-// 回退链：npm 安装参数 --proxy（npm_config_proxy）> cft 配置 proxy
-const proxy = process.env.npm_config_proxy || getProxy()
-const args = [bin, 'install']
-if (proxy) args.push('-p', proxy)
-
-const result = spawnSync('node', args, { stdio: 'inherit' })
-if (result.status !== 0) {
-  console.error('cft: postinstall (cft install) failed')
-  process.exit(1)
-}
-
-// 参考 harness postinstall：将 cft 安装相关目录写入环境变量。
-// 安装目录由 getXdgConfigDir('cft') 决定（~/.config/cft 或 $XDG_CONFIG_HOME/cft），
-// 不走 config.json5，保持 location 不可配置的设计一致。
-// chrome/driver 目录与 installer.js 的计算逻辑一致：
-//   chrome-${osType} / chromedriver-${osType}（osType 来自 getOs()）。
-// setEnvVar 自带 marker 块幂等：值相同则跳过，值变化则原地替换。
-const installDir = getLocation()
-const osType = getOs()
-const chromeDir = path.join(installDir, `chrome-${osType}`)
-const driverDir = path.join(installDir, `chromedriver-${osType}`)
-const shell = new Shell()
-
-function setEnv(name, value) {
-  try {
-    const wrote = shell.setEnvVar(name, value)
-    console.log(
-      wrote
-        ? `cft: set ${name}=${value}`
-        : `cft: ${name} already set to ${value}`
-    )
-  } catch (e) {
-    console.warn(`cft: failed to set ${name} — ${e.message}`)
-  }
-}
-
-setEnv('SELENIUM_CFT_DIR', installDir)
-setEnv('SELENIUM_CFT_CHROME_DIR', chromeDir)
+#!/usr/bin/env node
+
+import { spawnSync } from 'node:child_process'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { Shell } from '@wwkit/shared'
+import { getLocation, getOs, getProxy } from '../src/index.js'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const bin = path.join(__dirname, '..', 'bin', 'index.js')
+
+// 回退链：npm 安装参数 --proxy（npm_config_proxy）> cft 配置 proxy
+const proxy = process.env.npm_config_proxy || getProxy()
+const args = [bin, 'install']
+if (proxy) args.push('-p', proxy)
+
+const result = spawnSync('node', args, { stdio: 'inherit' })
+if (result.status !== 0) {
+  console.error('cft: postinstall (cft install) failed')
+  process.exit(1)
+}
+
+// 参考 harness postinstall：将 cft 安装相关目录写入环境变量。
+// 安装目录由 getXdgConfigDir('cft') 决定（~/.config/cft 或 $XDG_CONFIG_HOME/cft），
+// 不走 config.json5，保持 location 不可配置的设计一致。
+// chrome/driver 目录与 installer.js 的计算逻辑一致：
+//   chrome-${osType} / chromedriver-${osType}（osType 来自 getOs()）。
+// setEnvVar 自带 marker 块幂等：值相同则跳过，值变化则原地替换。
+const installDir = getLocation()
+const osType = getOs()
+const chromeDir = path.join(installDir, `chrome-${osType}`)
+const driverDir = path.join(installDir, `chromedriver-${osType}`)
+const shell = new Shell()
+
+function setEnv(name, value) {
+  try {
+    const wrote = shell.setEnvVar(name, value)
+    console.log(
+      wrote
+        ? `cft: set ${name}=${value}`
+        : `cft: ${name} already set to ${value}`
+    )
+  } catch (e) {
+    console.warn(`cft: failed to set ${name} — ${e.message}`)
+  }
+}
+
+setEnv('SELENIUM_CFT_DIR', installDir)
+setEnv('SELENIUM_CFT_CHROME_DIR', chromeDir)
 setEnv('SELENIUM_CFT_DRIVER_DIR', driverDir)

package/src/config.js

@@ -1,55 +1,55 @@
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { createConfigLoader, getXdgConfigDir } from '@wwkit/shared'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-const INSTALL_DIR = getXdgConfigDir('cft')
-
-const _loader = createConfigLoader({
-  builtinConfigPath: path.join(__dirname, 'config.json5'),
-  userConfigDir: INSTALL_DIR,
-  envContentVar: 'CFT_CONFIG_CONTENT',
-  envDirVar: 'CFT_CONFIG_DIR',
-})
-
-export const INSTALL_LOCATION = INSTALL_DIR
-export const USER_CONFIG_FILE = path.join(INSTALL_DIR, 'config.json5')
-
-export function getConfig() {
-  return _loader.getConfig()
-}
-
-export function copyBuiltinConfig() {
-  return _loader.copyBuiltinConfig()
-}
-
-/**
- * 合并内置配置到用户配置文件（追加缺失 key，不覆盖已有值）
- * @returns {boolean} 是否写入了文件
- */
-export function mergeBuiltinConfig() {
-  return _loader.mergeBuiltinConfig()
-}
-
-export function getVersion() {
-  return getConfig().version
-}
-
-export function getRegistry() {
-  return getConfig().registry
-}
-
-export function getProxy() {
-  return getConfig().proxy || ''
-}
-
-export function getLocation() {
-  return INSTALL_LOCATION
-}
-
-export function showConfig() {
-  console.log(`用户配置文件: ${USER_CONFIG_FILE}`)
-  console.log()
-  console.log(JSON.stringify(getConfig(), null, 2))
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { createConfigLoader, getXdgConfigDir } from '@wwkit/shared'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+
+const INSTALL_DIR = getXdgConfigDir('cft')
+
+const _loader = createConfigLoader({
+  builtinConfigPath: path.join(__dirname, 'config.json5'),
+  userConfigDir: INSTALL_DIR,
+  envContentVar: 'CFT_CONFIG_CONTENT',
+  envDirVar: 'CFT_CONFIG_DIR',
+})
+
+export const INSTALL_LOCATION = INSTALL_DIR
+export const USER_CONFIG_FILE = path.join(INSTALL_DIR, 'config.json5')
+
+export function getConfig() {
+  return _loader.getConfig()
+}
+
+export function copyBuiltinConfig() {
+  return _loader.copyBuiltinConfig()
+}
+
+/**
+ * 合并内置配置到用户配置文件（追加缺失 key，不覆盖已有值）
+ * @returns {boolean} 是否写入了文件
+ */
+export function mergeBuiltinConfig() {
+  return _loader.mergeBuiltinConfig()
+}
+
+export function getVersion() {
+  return getConfig().version
+}
+
+export function getRegistry() {
+  return getConfig().registry
+}
+
+export function getProxy() {
+  return getConfig().proxy || ''
+}
+
+export function getLocation() {
+  return INSTALL_LOCATION
+}
+
+export function showConfig() {
+  console.log(`用户配置文件: ${USER_CONFIG_FILE}`)
+  console.log()
+  console.log(JSON.stringify(getConfig(), null, 2))
 }

package/src/config.json5

@@ -1,5 +1,5 @@
-{
-  version: "141.0.7390.54",
-  registry: "http://deepbluenet.com/mirrors/chrome-for-testing",
-  proxy: "",
+{
+  version: "141.0.7390.54",
+  registry: "http://deepbluenet.com/mirrors/chrome-for-testing",
+  proxy: "",
 }