@wwkit/opm 1.0.2 → 1.0.3

package/src/tools/ftp/index.js

@@ -1,14 +1,17 @@
 /**
  * opm ftp 命令组 — FTP 文件管理
  *
- * 命令：connect / upload / rsync / download / root / config
- * 各命令接口独立，不强制统一结构。
+ * 命令：version / installed / install / uninstall / upgrade /
+ *       connect / upload / rsync / download / root
  */
 
 import path from 'node:path'
 import fs from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import { createRequire } from 'node:module'
+import { spawnSync } from 'node:child_process'
 import { parseFlags } from '../../cli/helpers/args.js'
-import { getConfig } from '../../config.js'
+import { getActiveProxy, getActiveRegistry } from '../../config.js'
 import { output } from '../../formatter.js'
 import {
   getFtpConfig, checkConnection, uploadBuffer, uploadFile,
@@ -19,6 +22,31 @@ import {
   todayStr, readData, collectFiles,
 } from './util.js'
 
+const FTP_DEP = 'basic-ftp'
+
+/**
+ * 检查 basic-ftp 是否已安装，返回版本号或 null
+ * @returns {string|null}
+ */
+function checkBasicFtp() {
+  try {
+    const require = createRequire(import.meta.url)
+    const pkg = require(`${FTP_DEP}/package.json`)
+    return pkg.version || 'unknown'
+  } catch {
+    return null
+  }
+}
+
+/**
+ * 获取 opm 包根目录（package.json 所在目录）
+ * @returns {string}
+ */
+function getPkgRoot() {
+  const here = path.dirname(fileURLToPath(import.meta.url))
+  return path.resolve(here, '../../..')
+}
+
 export class FtpGroup {
   constructor() {
     this.name = 'ftp'
@@ -34,18 +62,26 @@ export class FtpGroup {
     }
 
     switch (action) {
+      case 'version':
+        return this._version()
+      case 'installed':
+        return this._installed()
+      case 'install':
+        return this._install(rest)
+      case 'uninstall':
+        return this._uninstall()
+      case 'upgrade':
+        return this._upgrade(rest)
       case 'connect':
-        return this._connect()
+        return this._guard(() => this._connect())
       case 'upload':
-        return this._upload(parseFlags(rest))
+        return this._guard(() => this._upload(parseFlags(rest)))
       case 'rsync':
-        return this._rsync(parseFlags(rest))
+        return this._guard(() => this._rsync(parseFlags(rest)))
       case 'download':
-        return this._download(parseFlags(rest))
+        return this._guard(() => this._download(parseFlags(rest)))
       case 'root':
         return this._root()
-      case 'config':
-        return this._config()
       default:
         console.error(`Unknown action: ${action}`)
         this.printHelp()
@@ -53,6 +89,102 @@ export class FtpGroup {
     }
   }
 
+  /**
+   * 检查 basic-ftp 是否可用，不可用则提示安装并退出
+   * @param {() => Promise<void>} fn
+   * @private
+   */
+  async _guard(fn) {
+    const ver = checkBasicFtp()
+    if (!ver) {
+      console.error(`basic-ftp is not installed. Run \`opm ftp install\` to install it.`)
+      process.exit(1)
+    }
+    return fn()
+  }
+
+  /**
+   * 解析 proxy（-p/--proxy 优先，否则回退配置 active proxy）
+   * @param {string[]} argv
+   * @returns {string}
+   * @private
+   */
+  _resolveProxy(argv) {
+    const parsed = parseFlags(argv)
+    let proxy = parsed.flags.proxy || parsed.flags.p || ''
+    if (proxy === 'true') proxy = ''
+    if (!proxy) proxy = getActiveProxy()
+    return proxy
+  }
+
+  /**
+   * 在 opm 包根目录执行 npm 命令（自动附加 registry + proxy）
+   * @param {string[]} args - npm 子命令参数
+   * @param {string} proxy
+   * @private
+   */
+  _npmExec(args, proxy) {
+    const registry = getActiveRegistry('npm')
+    const fullArgs = [...args]
+    if (registry) fullArgs.push('--registry', registry)
+    if (proxy) fullArgs.push('--proxy', proxy)
+
+    const pkgRoot = getPkgRoot()
+    const result = spawnSync('npm', fullArgs, { stdio: 'inherit', shell: true, cwd: pkgRoot })
+    if (result.error) {
+      throw new Error(result.error.message)
+    }
+    if (result.status !== 0) {
+      throw new Error(`npm ${fullArgs.join(' ')} exited with code ${result.status}`)
+    }
+  }
+
+  async _version() {
+    const ver = checkBasicFtp()
+    output(ver || '')
+  }
+
+  async _installed() {
+    const ver = checkBasicFtp()
+    output({
+      name: FTP_DEP,
+      installed: !!ver,
+      ...(ver ? { version: ver } : { hint: `Run \`opm ftp install\` to install` }),
+    })
+  }
+
+  async _install(rest) {
+    const ver = checkBasicFtp()
+    if (ver) {
+      output({ name: FTP_DEP, installed: true, version: ver })
+      return
+    }
+    const proxy = this._resolveProxy(rest)
+    console.log(`Installing ${FTP_DEP} ...`)
+    this._npmExec(['install', FTP_DEP], proxy)
+    const newVer = checkBasicFtp()
+    output({ name: FTP_DEP, installed: true, version: newVer || 'unknown', action: 'installed' })
+  }
+
+  async _uninstall() {
+    const ver = checkBasicFtp()
+    if (!ver) {
+      output({ name: FTP_DEP, installed: false, action: 'not installed' })
+      return
+    }
+    console.log(`Uninstalling ${FTP_DEP} ...`)
+    this._npmExec(['uninstall', FTP_DEP], '')
+    output({ name: FTP_DEP, action: 'uninstalled' })
+  }
+
+  async _upgrade(rest) {
+    const proxy = this._resolveProxy(rest)
+    console.log(`Upgrading ${FTP_DEP} ...`)
+    this._npmExec(['install', `${FTP_DEP}@latest`], proxy)
+    const newVer = checkBasicFtp()
+    output({ name: FTP_DEP, installed: true, version: newVer || 'unknown', action: 'upgraded' })
+  }
+
   async _connect() {
     const ok = await checkConnection()
     output({ connected: ok })
@@ -227,22 +359,21 @@ export class FtpGroup {
     output({ remote_root: cfg.remote_root })
   }
 
-  _config() {
-    const cfg = getFtpConfig()
-    output(cfg)
-  }
-
   printHelp() {
     console.log(`
 Usage: opm ftp <action> [args] [options]
 
 Actions:
+  version                              Show installed basic-ftp version
+  installed                            Check if basic-ftp is installed
+  install                              Install basic-ftp (uses opm npm registry + proxy)
+  uninstall                            Uninstall basic-ftp
+  upgrade                              Upgrade basic-ftp to latest (uses opm npm registry + proxy)
   connect                              Test FTP connection
   upload <file> [-n name] [-s subdir]  Upload file (local path or HTTP URL)
   rsync <local> [options]              Recursive upload directory (FTP-side dedup)
   download <remote> <local>            Download file from FTP
   root                                 Show configured remote root directory
-  config                               Show FTP config
   help                                 Show this help
 
 rsync options:
@@ -252,9 +383,14 @@ rsync options:
   --prune                              Delete remote files not in local
 
 Options:
+  -p, --proxy <url>                   Proxy for install/upgrade (overrides config proxy.active)
   -h, --help                           Show this help
 
 Examples:
+  opm ftp version
+  opm ftp installed
+  opm ftp install
+  opm ftp upgrade
   opm ftp connect
   opm ftp upload ./img.png
   opm ftp upload ./img.png -n cover -s banner
@@ -265,7 +401,6 @@ Examples:
   opm ftp rsync ./webwork/ --prune
   opm ftp download 20260913/cover.jpg ./cover.jpg
   opm ftp root
-  opm ftp config
 `)
   }
 }

package/src/tools/git/config.js

@@ -0,0 +1,374 @@
+/**
+ * git 配置管理 — config/user/init/export/mark/version/install/uninstall/upgrade 实现
+ *
+ * 通过 git config CLI 读写配置，支持 --global/--local/--system 作用域。
+ * init 根据 opm config 的 git 段一键初始化全局配置。
+ * export 保存两个 commit 之间的差异到文件（默认从 mark 到 HEAD）。
+ * mark 用 lightweight git tag（opm-diff-base）标记基准 commit。
+ * version/install/uninstall/upgrade 管理 git 自身的系统安装。
+ */
+
+import { execSync, spawnSync } from 'node:child_process'
+import fs from 'node:fs'
+import path from 'node:path'
+import { getConfig } from '../../config.js'
+
+const MARK_TAG = 'opm-diff-base'
+
+/**
+ * 作用域映射到 git config 参数
+ * @param {string} scope - global|local|system
+ * @returns {string}
+ */
+function scopeArg(scope) {
+  if (scope === 'local') return '--local'
+  if (scope === 'system') return '--system'
+  return '--global'
+}
+
+/**
+ * 执行 git config 命令（静默 stderr）
+ * @param {string[]} args
+ * @returns {string}
+ */
+function gitConfig(args) {
+  try {
+    return execSync(`git config ${args.join(' ')}`, { encoding: 'utf8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'] }).trim()
+  } catch {
+    return ''
+  }
+}
+
+/**
+ * 获取配置文件路径
+ * @param {string} scope
+ * @returns {string}
+ */
+function getConfigFile(scope) {
+  const raw = gitConfig([scopeArg(scope), '--list', '--show-origin'])
+  const firstLine = raw.split('\n')[0] || ''
+  const m = firstLine.match(/^file:([^\t]+)/)
+  return m ? m[1] : ''
+}
+
+/**
+ * 列出全部配置
+ * @param {string} scope
+ * @returns {{file: string, config: Record<string, string>}}
+ */
+export function listConfig(scope) {
+  const arg = scopeArg(scope)
+  const raw = gitConfig([arg, '--list'])
+  const config = {}
+  for (const line of raw.split('\n')) {
+    if (!line) continue
+    const idx = line.indexOf('=')
+    if (idx > 0) {
+      config[line.slice(0, idx)] = line.slice(idx + 1)
+    }
+  }
+  return { file: getConfigFile(scope), config }
+}
+
+/**
+ * 获取单个配置值
+ * @param {string} key
+ * @param {string} scope
+ * @returns {string}
+ */
+export function getConfigValue(key, scope) {
+  return gitConfig([scopeArg(scope), '--get', key])
+}
+
+/**
+ * 设置配置值
+ * @param {string} key
+ * @param {string} value
+ * @param {string} scope
+ * @returns {boolean}
+ */
+export function setConfigValue(key, value, scope) {
+  try {
+    execSync(`git config ${scopeArg(scope)} ${key} "${value}"`, { timeout: 5000 })
+    return true
+  } catch {
+    return false
+  }
+}
+
+/**
+ * 取消配置项
+ * @param {string} key
+ * @param {string} scope
+ * @returns {boolean}
+ */
+export function unsetConfigValue(key, scope) {
+  try {
+    execSync(`git config ${scopeArg(scope)} --unset ${key}`, { timeout: 5000 })
+    return true
+  } catch {
+    return false
+  }
+}
+
+/**
+ * 获取 user 信息
+ * @param {string} scope
+ * @returns {{name: string, email: string}}
+ */
+export function getUser(scope) {
+  return {
+    name: getConfigValue('user.name', scope),
+    email: getConfigValue('user.email', scope),
+  }
+}
+
+/**
+ * 设置 user 信息
+ * @param {string} name
+ * @param {string} email
+ * @param {string} scope
+ * @returns {{name: boolean, email: boolean}}
+ */
+export function setUser(name, email, scope) {
+  const result = {}
+  if (name) result.name = setConfigValue('user.name', name, scope)
+  if (email) result.email = setConfigValue('user.email', email, scope)
+  return result
+}
+
+/**
+ * 一键初始化 git 全局配置
+ * 根据 opm config 的 git 段设置 user/ssl/pull.rebase
+ * @param {boolean} force - 强制覆盖已有配置
+ * @returns {Promise<object>}
+ */
+export async function initGitConfig(force) {
+  const cfg = getConfig().git || {}
+  const scope = 'global'
+  const items = []
+  let set = 0
+  let skip = 0
+  let overwrite = 0
+
+  const tasks = [
+    { key: 'user.name', value: cfg.user?.name || '' },
+    { key: 'user.email', value: cfg.user?.email || '' },
+    { key: 'http.sslVerify', value: cfg.sslVerify === false ? 'false' : 'true' },
+    { key: 'pull.rebase', value: cfg.pullRebase === true ? 'true' : 'false' },
+  ]
+
+  for (const task of tasks) {
+    if (!task.value && task.value !== 'false') continue
+    const existing = getConfigValue(task.key, scope)
+    if (existing && !force) {
+      items.push({ key: task.key, value: task.value, action: 'skip', existing })
+      skip++
+    } else if (existing && force) {
+      setConfigValue(task.key, task.value, scope)
+      items.push({ key: task.key, value: task.value, action: 'overwrite', existing })
+      overwrite++
+    } else {
+      setConfigValue(task.key, task.value, scope)
+      items.push({ key: task.key, value: task.value, action: 'set' })
+      set++
+    }
+  }
+
+  return { scope, items, summary: { set, skip, overwrite } }
+}
+
+/**
+ * 获取 mark 标记的 commit 信息
+ * @param {string} workDir
+ * @returns {{commit: string, message: string}|null}
+ */
+export function getMark(workDir) {
+  const opts = { encoding: 'utf8', timeout: 5000, cwd: workDir, stdio: ['pipe', 'pipe', 'pipe'] }
+  try {
+    const hash = execSync(`git rev-list -n 1 ${MARK_TAG}`, opts).trim()
+    const message = execSync(`git log -1 --format=%s ${hash}`, opts).trim()
+    return { commit: hash, message }
+  } catch {
+    return null
+  }
+}
+
+/**
+ * 设置 mark 标记（在指定 commit 上打 tag，已存在则先删后打）
+ * @param {string} workDir
+ * @param {string} [ref='HEAD'] - commit ref
+ * @returns {{commit: string, message: string}}
+ */
+export function setMark(workDir, ref = 'HEAD') {
+  const opts = { encoding: 'utf8', timeout: 5000, cwd: workDir, stdio: ['pipe', 'pipe', 'pipe'] }
+  try {
+    execSync(`git tag -d ${MARK_TAG}`, opts)
+  } catch {}
+  execSync(`git tag ${MARK_TAG} ${ref}`, opts)
+  const hash = execSync(`git rev-list -n 1 ${MARK_TAG}`, opts).trim()
+  const message = execSync(`git log -1 --format=%s ${hash}`, opts).trim()
+  return { commit: hash, message }
+}
+
+/**
+ * 删除 mark 标记
+ * @param {string} workDir
+ * @returns {boolean}
+ */
+export function unsetMark(workDir) {
+  const opts = { encoding: 'utf8', timeout: 5000, cwd: workDir, stdio: ['pipe', 'pipe', 'pipe'] }
+  try {
+    execSync(`git tag -d ${MARK_TAG}`, opts)
+    return true
+  } catch {
+    return false
+  }
+}
+
+/**
+ * 导入 diff 文件到工作目录
+ * @param {string} workDir - git 仓库工作目录
+ * @param {string} diffFile - diff 文件路径
+ * @returns {{workDir: string, diffFile: string, applied: boolean, rejected: string[]}}
+ */
+export function importDiff(workDir, diffFile) {
+  const opts = { encoding: 'utf8', timeout: 30000, cwd: workDir, stdio: ['pipe', 'pipe', 'pipe'] }
+  const resolved = path.resolve(diffFile)
+  if (!fs.existsSync(resolved)) {
+    return { workDir, diffFile: resolved, applied: false, error: 'File not found' }
+  }
+
+  try {
+    execSync(`git apply --reject ${resolved}`, opts)
+    return { workDir, diffFile: resolved, applied: true, rejected: [] }
+  } catch (err) {
+    const stderr = err.stderr ? err.stderr.toString() : ''
+    const rejFiles = stderr.match(/\.rej/g) ? fs.readdirSync(workDir).filter(f => f.endsWith('.rej')) : []
+    return { workDir, diffFile: resolved, applied: false, rejected: rejFiles, error: stderr.trim() || err.message }
+  }
+}
+
+/**
+ * 保存两个 commit 之间的差异到文件
+ * 执行前若有未提交变更，自动 commit（含未跟踪文件），确保所有变动都在 HEAD 中。
+ * @param {string} workDir - git 仓库工作目录
+ * @param {string} outputFile - 输出文件路径
+ * @param {string} fromRef - 起始 commit ref（mark tag 或 HEAD~n）
+ * @returns {{workDir: string, file: string, lines: number, from: string, to: string, autoCommitted: boolean}}
+ */
+export function saveDiff(workDir, outputFile, fromRef) {
+  const opts = { encoding: 'utf8', maxBuffer: 50 * 1024 * 1024, timeout: 30000, cwd: workDir, stdio: ['pipe', 'pipe', 'pipe'] }
+
+  let autoCommitted = false
+  const status = execSync('git status --porcelain', { ...opts, timeout: 5000 }).trim()
+  if (status) {
+    execSync('git add -A', { ...opts, timeout: 5000 })
+    execSync('git commit -m "wip: auto-commit before export"', { ...opts, timeout: 10000 })
+    autoCommitted = true
+  }
+
+  const fromMessage = execSync(`git log -1 --format=%s ${fromRef}`, { ...opts, timeout: 5000 }).trim()
+  const diff = execSync(`git diff ${fromRef} HEAD`, opts)
+  fs.writeFileSync(outputFile, diff, 'utf8')
+  const lines = diff ? diff.split('\n').length : 0
+  return { workDir, file: outputFile, lines, from: fromRef, fromMessage, to: 'HEAD', autoCommitted }
+}
+
+/**
+ * 检测系统包管理器
+ * @returns {{cmd: string, installArgs: string[], uninstallArgs: string[], upgradeArgs: string[]}|null}
+ */
+function detectPm() {
+  const candidates = [
+    { cmd: 'dnf', install: ['install', '-y'], uninstall: ['remove', '-y'], upgrade: ['upgrade', '-y'] },
+    { cmd: 'yum', install: ['install', '-y'], uninstall: ['remove', '-y'], upgrade: ['upgrade', '-y'] },
+    { cmd: 'apt-get', install: ['install', '-y'], uninstall: ['remove', '-y'], upgrade: ['install', '--only-upgrade', '-y'] },
+    { cmd: 'apk', install: ['add'], uninstall: ['del'], upgrade: ['upgrade'] },
+  ]
+  for (const c of candidates) {
+    try {
+      execSync(`command -v ${c.cmd}`, { encoding: 'utf8', timeout: 3000, stdio: ['pipe', 'pipe', 'pipe'] })
+      return {
+        cmd: c.cmd,
+        installArgs: c.install,
+        uninstallArgs: c.uninstall,
+        upgradeArgs: c.upgrade,
+      }
+    } catch {}
+  }
+  return null
+}
+
+/**
+ * 查询 git 版本
+ * @returns {{installed: boolean, version?: string, path?: string, hint?: string}}
+ */
+export function getGitVersion() {
+  try {
+    const out = execSync('git --version', { encoding: 'utf8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'] }).trim()
+    const match = out.match(/(\d+(?:\.\d+)+)/)
+    let path = ''
+    try {
+      path = execSync('command -v git', { encoding: 'utf8', timeout: 3000, stdio: ['pipe', 'pipe', 'pipe'] }).trim()
+    } catch {}
+    return { installed: true, version: match ? match[1] : out, path }
+  } catch {
+    return { installed: false, hint: 'Run `opm git install` to install git' }
+  }
+}
+
+/**
+ * 安装 git（通过系统包管理器）
+ * @param {string} [proxy]
+ * @returns {{action: string, pm?: string, error?: string}}
+ */
+export function installGit(proxy) {
+  const pm = detectPm()
+  if (!pm) {
+    return { action: 'install', error: 'No supported package manager found (dnf/yum/apt-get/apk)' }
+  }
+  const args = [...pm.installArgs, 'git']
+  if (proxy && pm.cmd !== 'apk') args.push(`--proxy=${proxy}`)
+  const result = spawnSync(pm.cmd, args, { stdio: 'inherit', shell: true })
+  if (result.error || result.status !== 0) {
+    return { action: 'install', pm: pm.cmd, error: result.error ? result.error.message : `exited with code ${result.status}` }
+  }
+  return { action: 'installed', pm: pm.cmd }
+}
+
+/**
+ * 卸载 git（通过系统包管理器）
+ * @returns {{action: string, pm?: string, error?: string}}
+ */
+export function uninstallGit() {
+  const pm = detectPm()
+  if (!pm) {
+    return { action: 'uninstall', error: 'No supported package manager found (dnf/yum/apt-get/apk)' }
+  }
+  const args = [...pm.uninstallArgs, 'git']
+  const result = spawnSync(pm.cmd, args, { stdio: 'inherit', shell: true })
+  if (result.error || result.status !== 0) {
+    return { action: 'uninstall', pm: pm.cmd, error: result.error ? result.error.message : `exited with code ${result.status}` }
+  }
+  return { action: 'uninstalled', pm: pm.cmd }
+}
+
+/**
+ * 升级 git（通过系统包管理器）
+ * @param {string} [proxy]
+ * @returns {{action: string, pm?: string, error?: string}}
+ */
+export function upgradeGit(proxy) {
+  const pm = detectPm()
+  if (!pm) {
+    return { action: 'upgrade', error: 'No supported package manager found (dnf/yum/apt-get/apk)' }
+  }
+  const args = [...pm.upgradeArgs, 'git']
+  if (proxy && pm.cmd !== 'apk') args.push(`--proxy=${proxy}`)
+  const result = spawnSync(pm.cmd, args, { stdio: 'inherit', shell: true })
+  if (result.error || result.status !== 0) {
+    return { action: 'upgrade', pm: pm.cmd, error: result.error ? result.error.message : `exited with code ${result.status}` }
+  }
+  return { action: 'upgraded', pm: pm.cmd }
+}