@wwkit/cft 1.0.30 → 1.0.31

package/src/depchecker.js

@@ -1,176 +1,176 @@
-import { execSync } from 'node:child_process'
-import fs from 'node:fs'
-import process from 'node:process'
-
-const APT_MAP = {
-  'libnss3.so': 'libnss3',
-  'libatk-1.0.so.0': 'libatk1.0-0t64',
-  'libatk-bridge-2.0.so.0': 'libatk-bridge2.0-0t64',
-  'libcups.so.2': 'libcups2t64',
-  'libdrm.so.2': 'libdrm2',
-  'libgbm.so.1': 'libgbm1',
-  'libxkbcommon.so.0': 'libxkbcommon0',
-  'libXcomposite.so.1': 'libxcomposite1',
-  'libXdamage.so.1': 'libxdamage1',
-  'libXfixes.so.3': 'libxfixes3',
-  'libXrandr.so.2': 'libxrandr2',
-  'libasound.so.2': 'libasound2t64',
-  'libpango-1.0.so.0': 'libpango-1.0-0',
-  'libcairo.so.2': 'libcairo2',
-  'libpangoft2-1.0.so.0': 'libpangoft2-1.0-0',
-  'libharfbuzz.so.0': 'libharfbuzz0b',
-  'libXss.so.1': 'libxss1',
-  'libatspi.so.0': 'libatspi2.0-0t64',
-  'libxcb.so.1': 'libxcb1',
-  'libX11.so.6': 'libx11-6',
-  'libXext.so.6': 'libxext6',
-  'libnssutil3.so': 'libnss3',
-  'libsmime3.so': 'libnss3',
-  'libnspr4.so': 'libnspr4',
-  'libdbus-1.so.3': 'libdbus-1-3',
-  'libexpat.so.1': 'libexpat1',
-  'libxrender.so.1': 'libxrender1',
-  'libglib-2.0.so.0': 'libglib2.0-0',
-  'libgobject-2.0.so.0': 'libglib2.0-0',
-}
-
-const DNF_MAP = {
-  'libnss3.so': 'nss',
-  'libatk-1.0.so.0': 'atk',
-  'libatk-bridge-2.0.so.0': 'at-spi2-atk',
-  'libcups.so.2': 'libcups',
-  'libdrm.so.2': 'libdrm',
-  'libgbm.so.1': 'mesa-libgbm',
-  'libxkbcommon.so.0': 'libxkbcommon',
-  'libXcomposite.so.1': 'libXcomposite',
-  'libXdamage.so.1': 'libXdamage',
-  'libXfixes.so.3': 'libXfixes',
-  'libXrandr.so.2': 'libXrandr',
-  'libasound.so.2': 'alsa-lib',
-  'libpango-1.0.so.0': 'pango',
-  'libcairo.so.2': 'cairo',
-  'libpangoft2-1.0.so.0': 'pango',
-  'libharfbuzz.so.0': 'harfbuzz',
-  'libXss.so.1': 'libXScrnSaver',
-  'libatspi.so.0': 'at-spi2-core',
-  'libxcb.so.1': 'libxcb',
-  'libX11.so.6': 'libX11',
-  'libXext.so.6': 'libXext',
-  'libnssutil3.so': 'nss',
-  'libsmime3.so': 'nss',
-  'libnspr4.so': 'nspr',
-  'libdbus-1.so.3': 'dbus-libs',
-  'libexpat.so.1': 'expat',
-  'libxrender.so.1': 'libXrender',
-  'libglib-2.0.so.0': 'glib2',
-  'libgobject-2.0.so.0': 'glib2',
-}
-
-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 []
-  try {
-    execSync('which ldd', { stdio: 'pipe' })
-  } catch {
-    return []
-  }
-  let result
-  try {
-    result = execSync(`ldd "${binaryPath}"`, { stdio: 'pipe', timeout: 20000 })
-  } catch {
-    return []
-  }
-  const stdout = result.stdout?.toString() || ''
-  const missing = []
-  for (const line of stdout.split('\n')) {
-    const m = line.match(/^\s*(\S+)\s+=>\s+not found/)
-    if (m) missing.push(m[1])
-  }
-  return missing
-}
-
-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 = []
-  const seen = new Set()
-  for (const lib of libs) {
-    const pkg = table[lib]
-    if (pkg && !seen.has(pkg)) {
-      seen.add(pkg)
-      packages.push(pkg)
-    } else if (!pkg) {
-      unknown.push(lib)
-    }
-  }
-  return { packages, unknown }
-}
-
-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 {
-    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 null
-}
-
-export { detectPackageManager }
-
-export function verify(binaryPath) {
-  if (!isSupported()) {
-    return { missing: [], packages: [], unknown: [], ok: true }
-  }
-  const packageManager = detectPackageManager()
-  const missing = check(binaryPath)
-  const result = { missing, packages: [], unknown: [], ok: !missing.length }
-  if (!missing.length) return result
-
-  const { packages, unknown } = mapToPackages(missing, packageManager)
-  result.packages = packages
-  result.unknown = unknown
-
-  if (packages.length) {
-    if (install(packages, packageManager)) {
-      const stillMissing = check(binaryPath)
-      result.ok = !stillMissing.length
-    } else {
-      result.ok = false
-    }
-  } else {
-    result.ok = false
-  }
-  return result
+import { execSync } from 'node:child_process'
+import fs from 'node:fs'
+import process from 'node:process'
+
+const APT_MAP = {
+  'libnss3.so': 'libnss3',
+  'libatk-1.0.so.0': 'libatk1.0-0t64',
+  'libatk-bridge-2.0.so.0': 'libatk-bridge2.0-0t64',
+  'libcups.so.2': 'libcups2t64',
+  'libdrm.so.2': 'libdrm2',
+  'libgbm.so.1': 'libgbm1',
+  'libxkbcommon.so.0': 'libxkbcommon0',
+  'libXcomposite.so.1': 'libxcomposite1',
+  'libXdamage.so.1': 'libxdamage1',
+  'libXfixes.so.3': 'libxfixes3',
+  'libXrandr.so.2': 'libxrandr2',
+  'libasound.so.2': 'libasound2t64',
+  'libpango-1.0.so.0': 'libpango-1.0-0',
+  'libcairo.so.2': 'libcairo2',
+  'libpangoft2-1.0.so.0': 'libpangoft2-1.0-0',
+  'libharfbuzz.so.0': 'libharfbuzz0b',
+  'libXss.so.1': 'libxss1',
+  'libatspi.so.0': 'libatspi2.0-0t64',
+  'libxcb.so.1': 'libxcb1',
+  'libX11.so.6': 'libx11-6',
+  'libXext.so.6': 'libxext6',
+  'libnssutil3.so': 'libnss3',
+  'libsmime3.so': 'libnss3',
+  'libnspr4.so': 'libnspr4',
+  'libdbus-1.so.3': 'libdbus-1-3',
+  'libexpat.so.1': 'libexpat1',
+  'libxrender.so.1': 'libxrender1',
+  'libglib-2.0.so.0': 'libglib2.0-0',
+  'libgobject-2.0.so.0': 'libglib2.0-0',
+}
+
+const DNF_MAP = {
+  'libnss3.so': 'nss',
+  'libatk-1.0.so.0': 'atk',
+  'libatk-bridge-2.0.so.0': 'at-spi2-atk',
+  'libcups.so.2': 'libcups',
+  'libdrm.so.2': 'libdrm',
+  'libgbm.so.1': 'mesa-libgbm',
+  'libxkbcommon.so.0': 'libxkbcommon',
+  'libXcomposite.so.1': 'libXcomposite',
+  'libXdamage.so.1': 'libXdamage',
+  'libXfixes.so.3': 'libXfixes',
+  'libXrandr.so.2': 'libXrandr',
+  'libasound.so.2': 'alsa-lib',
+  'libpango-1.0.so.0': 'pango',
+  'libcairo.so.2': 'cairo',
+  'libpangoft2-1.0.so.0': 'pango',
+  'libharfbuzz.so.0': 'harfbuzz',
+  'libXss.so.1': 'libXScrnSaver',
+  'libatspi.so.0': 'at-spi2-core',
+  'libxcb.so.1': 'libxcb',
+  'libX11.so.6': 'libX11',
+  'libXext.so.6': 'libXext',
+  'libnssutil3.so': 'nss',
+  'libsmime3.so': 'nss',
+  'libnspr4.so': 'nspr',
+  'libdbus-1.so.3': 'dbus-libs',
+  'libexpat.so.1': 'expat',
+  'libxrender.so.1': 'libXrender',
+  'libglib-2.0.so.0': 'glib2',
+  'libgobject-2.0.so.0': 'glib2',
+}
+
+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 []
+  try {
+    execSync('which ldd', { stdio: 'pipe' })
+  } catch {
+    return []
+  }
+  let result
+  try {
+    result = execSync(`ldd "${binaryPath}"`, { stdio: 'pipe', timeout: 20000 })
+  } catch {
+    return []
+  }
+  const stdout = result.stdout?.toString() || ''
+  const missing = []
+  for (const line of stdout.split('\n')) {
+    const m = line.match(/^\s*(\S+)\s+=>\s+not found/)
+    if (m) missing.push(m[1])
+  }
+  return missing
+}
+
+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 = []
+  const seen = new Set()
+  for (const lib of libs) {
+    const pkg = table[lib]
+    if (pkg && !seen.has(pkg)) {
+      seen.add(pkg)
+      packages.push(pkg)
+    } else if (!pkg) {
+      unknown.push(lib)
+    }
+  }
+  return { packages, unknown }
+}
+
+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 {
+    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 null
+}
+
+export { detectPackageManager }
+
+export function verify(binaryPath) {
+  if (!isSupported()) {
+    return { missing: [], packages: [], unknown: [], ok: true }
+  }
+  const packageManager = detectPackageManager()
+  const missing = check(binaryPath)
+  const result = { missing, packages: [], unknown: [], ok: !missing.length }
+  if (!missing.length) return result
+
+  const { packages, unknown } = mapToPackages(missing, packageManager)
+  result.packages = packages
+  result.unknown = unknown
+
+  if (packages.length) {
+    if (install(packages, packageManager)) {
+      const stillMissing = check(binaryPath)
+      result.ok = !stillMissing.length
+    } else {
+      result.ok = false
+    }
+  } else {
+    result.ok = false
+  }
+  return result
 }

package/src/env.js

@@ -1,84 +1,84 @@
-import fs from 'node:fs'
-import path from 'node:path'
-import process from 'node:process'
-
-import { Shell } from '@wwkit/shared'
-
-import { getLocation } from './config.js'
-import { getOs } from './platform.js'
-
-const CFT_ENV_VARS = [
-  'SELENIUM_CFT_DIR',
-  'SELENIUM_CFT_CHROME_DIR',
-  'SELENIUM_CFT_DRIVER_DIR',
-]
-
-/**
- * 计算 cft 期望写入的环境变量值（与 postinstall 逻辑一致）。
- */
-function expectedValues() {
-  const installDir = getLocation()
-  const osType = getOs()
-  return {
-    SELENIUM_CFT_DIR: installDir,
-    SELENIUM_CFT_CHROME_DIR: path.join(installDir, `chrome-${osType}`),
-    SELENIUM_CFT_DRIVER_DIR: path.join(installDir, `chromedriver-${osType}`),
-  }
-}
-
-/**
- * 从 shell profile 文件中提取 cft 实际写入的环境变量值。
- * 遍历 Shell.getProfiles() 返回的所有 profile，解析 wwkit marker 块。
- */
-function profileValues() {
-  const shell = new Shell()
-  const result = {}
-  for (const { path: profilePath } of shell.getProfiles()) {
-    let content = ''
-    try {
-      content = fs.readFileSync(profilePath, 'utf8')
-    } catch {
-      continue
-    }
-    for (const name of CFT_ENV_VARS) {
-      if (result[name]) continue
-      const beginMarker = `# >>> wwkit ${name} >>>`
-      const endMarker = `# <<< wwkit ${name} <<<`
-      const beginIdx = content.indexOf(beginMarker)
-      if (beginIdx === -1) continue
-      const endIdx = content.indexOf(endMarker, beginIdx)
-      if (endIdx === -1) continue
-      const block = content.slice(beginIdx, endIdx)
-      // 提取引号内的值（兼容 export NAME="val" 与 fish set -gx NAME "val"）
-      const m = block.match(/"([^"]*)"/)
-      if (m) {
-        result[name] = { value: m[1], profile: profilePath }
-      }
-    }
-  }
-  return result
-}
-
-/**
- * 显示 cft 创建的全局环境变量：期望值、profile 实际写入值、当前 shell 值。
- */
-export function showEnv() {
-  const expected = expectedValues()
-  const profVals = profileValues()
-  console.log('cft 管理的环境变量（由 postinstall 写入 shell profile）:\n')
-  for (const name of CFT_ENV_VARS) {
-    const exp = expected[name]
-    const prof = profVals[name]
-    const env = process.env[name] || ''
-    console.log(`  ${name}`)
-    console.log(`    期望值:       ${exp}`)
-    if (prof) {
-      console.log(`    profile 写入: ${prof.value}`)
-      console.log(`                  ← ${prof.profile}`)
-    } else {
-      console.log(`    profile 写入: （未写入，请运行 cft install 或重新安装包）`)
-    }
-    console.log(`    当前 shell:   ${env || '（未设置 — 请重新打开终端或 source 你的 profile）'}`)
-    console.log()
-  }
-}
+import fs from 'node:fs'
+import path from 'node:path'
+import process from 'node:process'
+
+import { Shell } from '@wwkit/shared'
+
+import { getLocation } from './config.js'
+import { getOs } from './platform.js'
+
+const CFT_ENV_VARS = [
+  'SELENIUM_CFT_DIR',
+  'SELENIUM_CFT_CHROME_DIR',
+  'SELENIUM_CFT_DRIVER_DIR',
+]
+
+/**
+ * 计算 cft 期望写入的环境变量值（与 postinstall 逻辑一致）。
+ */
+function expectedValues() {
+  const installDir = getLocation()
+  const osType = getOs()
+  return {
+    SELENIUM_CFT_DIR: installDir,
+    SELENIUM_CFT_CHROME_DIR: path.join(installDir, `chrome-${osType}`),
+    SELENIUM_CFT_DRIVER_DIR: path.join(installDir, `chromedriver-${osType}`),
+  }
+}
+
+/**
+ * 从 shell profile 文件中提取 cft 实际写入的环境变量值。
+ * 遍历 Shell.getProfiles() 返回的所有 profile，解析 wwkit marker 块。
+ */
+function profileValues() {
+  const shell = new Shell()
+  const result = {}
+  for (const { path: profilePath } of shell.getProfiles()) {
+    let content = ''
+    try {
+      content = fs.readFileSync(profilePath, 'utf8')
+    } catch {
+      continue
+    }
+    for (const name of CFT_ENV_VARS) {
+      if (result[name]) continue
+      const beginMarker = `# >>> wwkit ${name} >>>`
+      const endMarker = `# <<< wwkit ${name} <<<`
+      const beginIdx = content.indexOf(beginMarker)
+      if (beginIdx === -1) continue
+      const endIdx = content.indexOf(endMarker, beginIdx)
+      if (endIdx === -1) continue
+      const block = content.slice(beginIdx, endIdx)
+      // 提取引号内的值（兼容 export NAME="val" 与 fish set -gx NAME "val"）
+      const m = block.match(/"([^"]*)"/)
+      if (m) {
+        result[name] = { value: m[1], profile: profilePath }
+      }
+    }
+  }
+  return result
+}
+
+/**
+ * 显示 cft 创建的全局环境变量：期望值、profile 实际写入值、当前 shell 值。
+ */
+export function showEnv() {
+  const expected = expectedValues()
+  const profVals = profileValues()
+  console.log('cft 管理的环境变量（由 postinstall 写入 shell profile）:\n')
+  for (const name of CFT_ENV_VARS) {
+    const exp = expected[name]
+    const prof = profVals[name]
+    const env = process.env[name] || ''
+    console.log(`  ${name}`)
+    console.log(`    期望值:       ${exp}`)
+    if (prof) {
+      console.log(`    profile 写入: ${prof.value}`)
+      console.log(`                  ← ${prof.profile}`)
+    } else {
+      console.log(`    profile 写入: （未写入，请运行 cft install 或重新安装包）`)
+    }
+    console.log(`    当前 shell:   ${env || '（未设置 — 请重新打开终端或 source 你的 profile）'}`)
+    console.log()
+  }
+}