@wwkit/cft 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/cft",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "bluesliu <langcai163@163.com>",
   "description": "Chrome for Testing (CFT) installer — download, extract, chmod, dep-check",
   "type": "module",
@@ -11,6 +11,7 @@
   "files": [
     "bin",
     "src",
+    "scripts",
     "README.md",
     "LICENSE"
   ],
@@ -35,12 +36,13 @@
   },
   "dependencies": {
     "extract-zip": "^2.0.1",
-    "@wwkit/shared": "1.0.1"
+    "@wwkit/shared": "1.0.2"
   },
   "devDependencies": {
     "jest": "^29.7.0"
   },
   "scripts": {
+    "postinstall": "node scripts/postinstall.js",
     "start": "node bin/index.js",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --no-cache tests/unit",
     "test:all": "node --experimental-vm-modules node_modules/jest/bin/jest.js --no-cache tests/unit",

package/scripts/postinstall.js

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+import { spawnSync } from 'node:child_process'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const bin = path.join(__dirname, '..', 'bin', 'index.js')
+
+const result = spawnSync('node', [bin, 'install'], { stdio: 'inherit' })
+if (result.status !== 0) {
+  console.error('cft: postinstall (cft install) failed')
+  process.exit(1)
+}

package/src/depchecker.js

@@ -17,13 +17,13 @@ const APT_MAP = {
   'libasound.so.2': 'libasound2t64',
   'libpango-1.0.so.0': 'libpango-1.0-0',
   'libcairo.so.2': 'libcairo2',
-  'libpangoft2-1.0.so.0': 'libpango1.0-0',
+  'libpangoft2-1.0.so.0': 'libpangoft2-1.0-0',
   'libharfbuzz.so.0': 'libharfbuzz0b',
-  'libxss.so.1': 'libxss1',
+  'libXss.so.1': 'libxss1',
   'libatspi.so.0': 'libatspi2.0-0t64',
   'libxcb.so.1': 'libxcb1',
-  'libx11.so.6': 'libx11-6',
-  'libxext.so.6': 'libxext6',
+  'libX11.so.6': 'libx11-6',
+  'libXext.so.6': 'libxext6',
   'libnssutil3.so': 'libnss3',
   'libsmime3.so': 'libnss3',
   'libnspr4.so': 'libnspr4',
@@ -32,7 +32,6 @@ const APT_MAP = {
   'libxrender.so.1': 'libxrender1',
   'libglib-2.0.so.0': 'libglib2.0-0',
   'libgobject-2.0.so.0': 'libglib2.0-0',
-  'libpango-1.0-0.so.0': 'libpango-1.0-0',
 }
 
 const DNF_MAP = {
@@ -52,11 +51,11 @@ const DNF_MAP = {
   'libcairo.so.2': 'cairo',
   'libpangoft2-1.0.so.0': 'pango',
   'libharfbuzz.so.0': 'harfbuzz',
-  'libxss.so.1': 'libXScrnSaver',
+  'libXss.so.1': 'libXScrnSaver',
   'libatspi.so.0': 'at-spi2-core',
   'libxcb.so.1': 'libxcb',
-  'libx11.so.6': 'libX11',
-  'libxext.so.6': 'libXext',
+  'libX11.so.6': 'libX11',
+  'libXext.so.6': 'libXext',
   'libnssutil3.so': 'nss',
   'libsmime3.so': 'nss',
   'libnspr4.so': 'nspr',
@@ -71,6 +70,8 @@ export function isSupported() {
   return process.platform === 'linux'
 }
 
+export { APT_MAP, DNF_MAP }
+
 export function check(binaryPath) {
   if (!isSupported()) return []
   if (!binaryPath || !fs.existsSync(binaryPath)) return []
@@ -81,7 +82,7 @@ export function check(binaryPath) {
   }
   let result
   try {
-    result = execSync(`ldd "${binaryPath}"`, { captureOutput: true, timeout: 20000 })
+    result = execSync(`ldd "${binaryPath}"`, { stdio: 'pipe', timeout: 20000 })
   } catch {
     return []
   }
@@ -95,6 +96,9 @@ export function check(binaryPath) {
 }
 
 export function mapToPackages(libs, packageManager) {
+  if (packageManager !== 'apt' && packageManager !== 'dnf') {
+    return { packages: [], unknown: [...libs] }
+  }
   const table = packageManager === 'apt' ? APT_MAP : DNF_MAP
   const packages = []
   const unknown = []
@@ -111,23 +115,36 @@ export function mapToPackages(libs, packageManager) {
   return { packages, unknown }
 }
 
-export function install(packages, packageManager) {
-  if (!packages.length) return true
-  const cmd = packageManager === 'apt'
-    ? ['apt-get', 'install', '-y', ...packages]
-    : ['dnf', 'install', '-y', ...packages]
+export function fallbackPackages(packages, packageManager) {
+  if (packageManager !== 'apt') return []
+  const fb = packages.map((p) => p.replace(/t64$/, ''))
+  return fb.some((p, i) => p !== packages[i]) ? fb : []
+}
+
+function runInstall(packages, packageManager) {
+  const tool = packageManager === 'apt' ? 'apt-get' : 'dnf'
+  const args = [tool, 'install', '-y', ...packages]
+  const cmd = process.getuid && process.getuid() === 0 ? args : ['sudo', ...args]
   try {
-    const result = execSync(['sudo', ...cmd].join(' '), { timeout: 600000 })
+    execSync(cmd.join(' '), { stdio: 'pipe', timeout: 600000 })
     return true
   } catch {
     return false
   }
 }
 
+export function install(packages, packageManager) {
+  if (!packages.length) return true
+  if (packageManager !== 'apt' && packageManager !== 'dnf') return false
+  if (runInstall(packages, packageManager)) return true
+  const fb = fallbackPackages(packages, packageManager)
+  return fb.length ? runInstall(fb, packageManager) : false
+}
+
 function detectPackageManager() {
   try { execSync('which apt-get', { stdio: 'pipe' }); return 'apt' } catch {}
   try { execSync('which dnf', { stdio: 'pipe' }); return 'dnf' } catch {}
-  return 'apt'
+  return null
 }
 
 export { detectPackageManager }

package/src/installer.js

@@ -146,6 +146,10 @@ function checkSystemDeps(chromeExe, driverExe) {
     if (!exePath || !fs.existsSync(exePath)) continue
     const missing = checkDeps(exePath)
     if (!missing.length) continue
+    if (!packageManager) {
+      log(`${label}: 缺少系统依赖 ${missing.join(', ')}，未检测到 apt-get/dnf，请手动安装`)
+      continue
+    }
     const { packages, unknown } = mapToPackages(missing, packageManager)
     if (packages.length) {
       log(`${label}: 自动安装系统依赖 ${packages.join(', ')}`)
@@ -168,6 +172,10 @@ export async function install() {
     throw new Error(`Unsupported OS: ${osType}`)
   }
 
+  if (process.platform === 'linux' && process.arch !== 'x64') {
+    throw new Error(`Chrome for Testing 仅提供 linux64 (x86_64) 构建，不支持 linux-${process.arch}`)
+  }
+
   const { installed, info } = checkInstalled(version, location, osType)
   if (installed) {
     log(`CFT ${version} 已安装，跳过`)