@wwkit/cft 1.0.16 → 1.0.18

package/bin/index.js

@@ -1,12 +1,30 @@
 #!/usr/bin/env node
 
 import { execSync } from 'node:child_process'
+import { readFileSync } from 'node:fs'
 import { install, status, clear, showConfig, showEnv } from '../src/index.js'
 
+const pkgVersion = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version
+
 const command = process.argv[2]
 
+function parseInstallArgs(args) {
+  let proxy = ''
+  for (let i = 3; i < args.length; i++) {
+    const arg = args[i]
+    if (arg === '-p' || arg === '--proxy') {
+      proxy = args[i + 1] || ''
+      i++
+    } else if (arg.startsWith('--proxy=')) {
+      proxy = arg.slice('--proxy='.length)
+    }
+  }
+  return proxy
+}
+
 if (command === 'install') {
-  install()
+  const proxy = parseInstallArgs(process.argv)
+  install(proxy ? { proxy } : {})
     .then((info) => {
       console.log()
       console.log('  ✓ CFT 安装完成')
@@ -28,16 +46,20 @@ if (command === 'install') {
   showEnv()
 } else if (command === 'upgrade') {
   execSync('npm install -g @wwkit/cft@latest', { stdio: 'inherit' })
+} else if (command === 'version') {
+  console.log(pkgVersion)
 } else if (command === 'help' || command === 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       显示本帮助
 
 安装目录: ~/.config/cft/`)

package/package.json

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

package/scripts/postinstall.js

@@ -4,12 +4,17 @@ import { spawnSync } from 'node:child_process'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { Shell } from '@wwkit/shared'
-import { getLocation, getOs } from '../src/index.js'
+import { getLocation, getOs, getProxy } from '../src/index.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const bin = path.join(__dirname, '..', 'bin', 'index.js')
 
-const result = spawnSync('node', [bin, 'install'], { stdio: 'inherit' })
+// 回退链：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)

package/src/installer.js

@@ -12,39 +12,43 @@ import { getVersion, getRegistry, getProxy, getLocation, copyBuiltinConfig } fro
 import { parseProxy, openTunnel } from './proxy.js'
 
 const USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36 cft-installer'
+const MANUAL_DOWNLOAD_HINT = '资源下载失败，请在 http://deepbluenet.com/webwork/#/mirror 手动下载资源，并将资源解压到 ~/.config/cft 目录，然后将地址添加到 ~/.config/webwork/webwork.json5 中的 env.SELENIUM_CFT_DIR 属性上'
 
 function log(msg) {
   console.log(`  ${msg}`)
 }
 
-function sendRequest(url, cb) {
-  const proxy = parseProxy(getProxy())
+function sendRequest(url, proxyValue, cb, method = 'GET') {
+  const proxy = parseProxy(proxyValue)
   const target = new URL(url)
   const headers = { 'user-agent': USER_AGENT }
   const onError = (e) => cb(e, null)
 
   if (!proxy) {
     const proto = target.protocol === 'https:' ? https : http
-    const req = proto.get(url, { headers }, (res) => cb(null, res))
+    const req = proto.request(url, { headers, method }, (res) => cb(null, res))
     req.on('error', onError)
+    req.end()
     return
   }
 
   if (proxy.protocol === 'http:' && target.protocol === 'http:') {
-    const req = http.get({
+    const req = http.request({
       host: proxy.hostname,
       port: Number(proxy.port) || 80,
       path: url,
+      method,
       headers: { ...headers, host: target.host },
     }, (res) => cb(null, res))
     req.on('error', onError)
+    req.end()
     return
   }
 
   openTunnel(proxy, target).then((socket) => {
     const proto = target.protocol === 'https:' ? https : http
     const req = proto.request({
-      method: 'GET',
+      method,
       hostname: target.hostname,
       port: Number(target.port) || (target.protocol === 'https:' ? 443 : 80),
       path: target.pathname + target.search,
@@ -58,7 +62,37 @@ function sendRequest(url, cb) {
   }).catch(onError)
 }
 
-function downloadFile(url, destPath, redirects = 0) {
+/**
+ * 访问前预检完整路径是否可达（HEAD 请求，非 2xx/3xx 视为不可达）
+ * @param {string} url - 完整下载 URL
+ * @param {string} [proxyValue] - 代理地址
+ * @returns {Promise<boolean>}
+ */
+function checkUrlReachable(url, proxyValue) {
+  return new Promise((resolve) => {
+    sendRequest(url, proxyValue, (err, response) => {
+      if (err) { resolve(false); return }
+      response.resume()
+      if (response.statusCode >= 200 && response.statusCode < 400) {
+        resolve(true)
+      } else {
+        resolve(false)
+      }
+    }, 'HEAD')
+  })
+}
+
+/**
+ * 下载失败时的统一终止提示
+ * @param {Error} [cause] - 原始错误
+ */
+function downloadError(cause) {
+  const err = new Error(MANUAL_DOWNLOAD_HINT)
+  if (cause) err.cause = cause
+  return err
+}
+
+function downloadFile(url, destPath, proxyValue, redirects = 0) {
   return new Promise((resolve, reject) => {
     if (redirects > 5) {
       reject(new Error(`Too many redirects: ${url}`))
@@ -67,7 +101,7 @@ function downloadFile(url, destPath, redirects = 0) {
     const filename = path.basename(destPath)
     log(`下载 ${filename} ...`)
 
-    sendRequest(url, (err, response) => {
+    sendRequest(url, proxyValue, (err, response) => {
       if (err) { reject(err); return }
       if (response.statusCode === 301 || response.statusCode === 302 || response.statusCode === 307 || response.statusCode === 308) {
         const location = response.headers.location
@@ -76,7 +110,7 @@ function downloadFile(url, destPath, redirects = 0) {
           reject(new Error(`Redirect without Location header: ${url}`))
           return
         }
-        downloadFile(location, destPath, redirects + 1).then(resolve).catch(reject)
+        downloadFile(location, destPath, proxyValue, redirects + 1).then(resolve).catch(reject)
         return
       }
       if (response.statusCode !== 200) {
@@ -108,9 +142,9 @@ function downloadFile(url, destPath, redirects = 0) {
   })
 }
 
-async function downloadExtract(url, saveDir, filename, extractDir) {
+async function downloadExtract(url, saveDir, filename, extractDir, proxyValue) {
   const filePath = path.join(saveDir, filename)
-  await downloadFile(url, filePath)
+  await downloadFile(url, filePath, proxyValue)
 
   log(`解压到 ${path.basename(extractDir)}`)
   if (fs.existsSync(extractDir)) {
@@ -207,12 +241,19 @@ function checkSystemDeps(chromeExe, driverExe) {
   }
 }
 
-export async function install() {
+/**
+ * 安装 CFT（Chrome + ChromeDriver）
+ * @param {object} [opts]
+ * @param {string} [opts.proxy] - 显式代理地址（socks5://host:port 等）；传入则直接使用，不读配置
+ * @returns {Promise<object>}
+ */
+export async function install(opts = {}) {
   copyBuiltinConfig()
   const version = getVersion()
   const registry = getRegistry()
   const location = getLocation()
   const osType = getOs()
+  const proxy = opts.proxy ?? getProxy()
 
   if (!VALID_OS_TYPES.includes(osType)) {
     throw new Error(`Unsupported OS: ${osType}`)
@@ -228,13 +269,28 @@ export async function install() {
 
   const chromeUrl = `${registry}/${version}/${osType}/chrome-${osType}.zip`
   const driverUrl = `${registry}/${version}/${osType}/chromedriver-${osType}.zip`
-  log(`从网络下载 CFT ${version} (${osType})`)
-
   const chromeDir = path.join(location, `chrome-${osType}`)
   const driverDir = path.join(location, `chromedriver-${osType}`)
 
-  await downloadExtract(chromeUrl, location, `chrome-${osType}.zip`, chromeDir)
-  await downloadExtract(driverUrl, location, `chromedriver-${osType}.zip`, driverDir)
+  log(`从网络下载 CFT ${version} (${osType})`)
+  if (proxy) log(`使用代理: ${proxy}`)
+
+  for (const url of [chromeUrl, driverUrl]) {
+    const ok = await checkUrlReachable(url, proxy)
+    if (ok) {
+      log(`[OK] 资源可达: ${url}`)
+    } else {
+      log(`[FAIL] 资源不可达: ${url}`)
+      throw downloadError()
+    }
+  }
+
+  try {
+    await downloadExtract(chromeUrl, location, `chrome-${osType}.zip`, chromeDir, proxy)
+    await downloadExtract(driverUrl, location, `chromedriver-${osType}.zip`, driverDir, proxy)
+  } catch (cause) {
+    throw downloadError(cause)
+  }
 
   const chromeExe = findExe(chromeDir, 'chrome')
   const driverExe = findExe(driverDir, 'chromedriver')