@wwkit/cft 1.0.22 → 1.0.24

package/bin/index.js

@@ -1,31 +1,28 @@
 #!/usr/bin/env node
 
 import { execSync } from 'node:child_process'
-import { readFileSync } from 'node:fs'
-import { install, status, clear, showConfig, showEnv, getProxy } from '../src/index.js'
+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'
 
-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)
-    }
+// 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}`)
   }
-  return proxy
 }
 
-if (command === 'install') {
-  const proxy = parseInstallArgs(process.argv)
+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((info) => {
+    .then(() => {
       console.log()
       console.log('  ✓ CFT 安装完成')
       process.exit(0)
@@ -34,24 +31,24 @@ if (command === 'install') {
       console.error(`  ✗ CFT 安装失败: ${err.message}`)
       process.exit(1)
     })
-} else if (command === 'status') {
+} else if (cmd === 'status') {
   const info = status()
   process.exit(info ? 0 : 1)
-} else if (command === 'clear') {
+} else if (cmd === 'clear') {
   clear()
   process.exit(0)
-} else if (command === 'config') {
+} else if (cmd === 'config') {
   showConfig()
-} else if (command === 'env') {
+} else if (cmd === 'env') {
   showEnv()
-} else if (command === 'upgrade') {
+} 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 (command === 'version') {
+} else if (cmd === 'version') {
   console.log(pkgVersion)
-} else if (command === 'help' || command === undefined) {
+} else if (cmd === 'help' || cmd === '-h' || cmd === '--help' || cmd === undefined) {
   console.log(`cft - Chrome for Testing 安装器
 
 用法:
@@ -65,9 +62,13 @@ if (command === 'install') {
   cft version    显示版本号
   cft help       显示本帮助
 
+Options:
+  -p, --proxy <url>  代理地址（install 时覆盖配置）
+  -h, --help          显示帮助
+
 安装目录: ~/.config/cft/`)
 } else {
-  console.error(`未知命令: ${command}`)
+  console.error(`未知命令: ${cmd}`)
   console.error('运行 cft help 查看用法')
   process.exit(1)
-}
+}

package/package.json

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

package/src/config.js

@@ -24,6 +24,14 @@ export function copyBuiltinConfig() {
   return _loader.copyBuiltinConfig()
 }
 
+/**
+ * 合并内置配置到用户配置文件（追加缺失 key，不覆盖已有值）
+ * @returns {boolean} 是否写入了文件
+ */
+export function mergeBuiltinConfig() {
+  return _loader.mergeBuiltinConfig()
+}
+
 export function getVersion() {
   return getConfig().version
 }

package/src/index.js

@@ -1,4 +1,4 @@
 export { install, status, clear } from './installer.js'
 export { getOs, isWindows, isMacos, isLinux, VALID_OS_TYPES } from './platform.js'
-export { getConfig, getVersion, getRegistry, getProxy, getLocation, copyBuiltinConfig, INSTALL_LOCATION, USER_CONFIG_FILE, showConfig } from './config.js'
+export { getConfig, getVersion, getRegistry, getProxy, getLocation, copyBuiltinConfig, mergeBuiltinConfig, INSTALL_LOCATION, USER_CONFIG_FILE, showConfig } from './config.js'
 export { showEnv } from './env.js'