@wwkit/cft 1.0.18 → 1.0.20

package/bin/index.js

@@ -2,7 +2,7 @@
 
 import { execSync } from 'node:child_process'
 import { readFileSync } from 'node:fs'
-import { install, status, clear, showConfig, showEnv } from '../src/index.js'
+import { install, status, clear, showConfig, showEnv, getProxy } from '../src/index.js'
 
 const pkgVersion = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version
 
@@ -45,7 +45,10 @@ if (command === 'install') {
 } else if (command === 'env') {
   showEnv()
 } else if (command === 'upgrade') {
-  execSync('npm install -g @wwkit/cft@latest', { stdio: 'inherit' })
+  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 (command === 'version') {
   console.log(pkgVersion)
 } else if (command === 'help' || command === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/cft",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "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.18"
+    "@wwkit/shared": "1.0.20"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/src/config.js

@@ -9,6 +9,8 @@ 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

package/src/installer.js

@@ -9,7 +9,7 @@ import { getOs, VALID_OS_TYPES } from './platform.js'
 import { find as findExe } from './exefinder.js'
 import { check as checkDeps, mapToPackages, install as installDeps, isSupported as depsSupported, detectPackageManager } from './depchecker.js'
 import { getVersion, getRegistry, getProxy, getLocation, copyBuiltinConfig } from './config.js'
-import { parseProxy, openTunnel } from './proxy.js'
+import { parseProxy, openTunnel } from '@wwkit/shared'
 
 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 属性上'
@@ -75,6 +75,9 @@ function checkUrlReachable(url, proxyValue) {
       response.resume()
       if (response.statusCode >= 200 && response.statusCode < 400) {
         resolve(true)
+      } else if (response.statusCode === 405) {
+        // 405 Method Not Allowed — 服务器已响应，仅不支持 HEAD
+        resolve(true)
       } else {
         resolve(false)
       }
@@ -253,7 +256,7 @@ export async function install(opts = {}) {
   const registry = getRegistry()
   const location = getLocation()
   const osType = getOs()
-  const proxy = opts.proxy ?? getProxy()
+  const proxy = opts.proxy || getProxy()
 
   if (!VALID_OS_TYPES.includes(osType)) {
     throw new Error(`Unsupported OS: ${osType}`)

package/src/proxy.js

@@ -1,72 +0,0 @@
-import net from 'node:net'
-import http from 'node:http'
-
-export function parseProxy(raw) {
-  if (!raw) return null
-  try {
-    const u = new URL(raw)
-    if (!u.hostname) return null
-    if (u.protocol !== 'http:' && u.protocol !== 'https:' && u.protocol !== 'socks5:' && u.protocol !== 'socks:') {
-      return null
-    }
-    return u
-  } catch {
-    return null
-  }
-}
-
-function socks5Connect(proxy, host, port) {
-  return new Promise((resolve, reject) => {
-    const sock = net.connect(Number(proxy.port) || 1080, proxy.hostname)
-    let phase = 'greeting'
-    const cleanup = (err) => { sock.removeAllListeners(); sock.destroy(); reject(err) }
-    sock.once('error', cleanup)
-    sock.once('connect', () => {
-      sock.write(Buffer.from([0x05, 0x01, 0x00]))
-    })
-    sock.on('data', (data) => {
-      if (phase === 'greeting') {
-        if (data[0] !== 0x05 || data[1] !== 0x00) { cleanup(new Error(`socks5 代理拒绝无认证 (method=${data[1]})`)); return }
-        phase = 'connect'
-        const hostBuf = Buffer.from(host, 'utf8')
-        const req = Buffer.alloc(7 + hostBuf.length)
-        req[0] = 0x05; req[1] = 0x01; req[2] = 0x00; req[3] = 0x03
-        req[4] = hostBuf.length
-        hostBuf.copy(req, 5)
-        req.writeUInt16BE(port, 5 + hostBuf.length)
-        sock.write(req)
-      } else if (phase === 'connect') {
-        if (data[0] !== 0x05 || data[1] !== 0x00) { cleanup(new Error(`socks5 连接失败 (code=${data[1]})`)); return }
-        sock.removeAllListeners('data')
-        sock.removeListener('error', cleanup)
-        resolve(sock)
-      }
-    })
-  })
-}
-
-function httpConnect(proxy, host, port) {
-  return new Promise((resolve, reject) => {
-    const req = http.request({
-      method: 'CONNECT',
-      host: proxy.hostname,
-      port: Number(proxy.port) || 80,
-      path: `${host}:${port}`,
-    })
-    req.once('error', reject)
-    req.once('connect', (res, socket) => {
-      if (res.statusCode !== 200) { socket.destroy(); reject(new Error(`HTTP 代理 CONNECT 返回 ${res.statusCode}`)); return }
-      resolve(socket)
-    })
-    req.end()
-  })
-}
-
-export async function openTunnel(proxy, target) {
-  const host = target.hostname
-  const port = Number(target.port) || (target.protocol === 'https:' ? 443 : 80)
-  if (proxy.protocol === 'socks5:' || proxy.protocol === 'socks:') {
-    return socks5Connect(proxy, host, port)
-  }
-  return httpConnect(proxy, host, port)
-}