@wwkit/opm 1.0.14 → 1.0.16

package/src/cli/groups/ping.js

@@ -18,6 +18,9 @@ import { getActiveProxy, getActiveRegistry, getConfig } from '../../config.js'
 
 const shell = new Shell()
 
+// 跨平台 null device（curl -o 丢弃输出体）
+const NULL_DEV = process.platform === 'win32' ? 'NUL' : '/dev/null'
+
 /**
  * 从 URL 或 deb 行中提取主机名和端口（用于 ping 目标）
  * @param {string} url
@@ -47,8 +50,9 @@ function isUrl(addr) {
 }
 
 // HTTP 状态码 → 可达性判断：2xx/3xx 视为可达，allowlist 中的状态码
-// 虽非成功响应但证明服务器已响应（如 404 表示主机/代理存活）
-const REACHABLE_ALLOWLIST = [404]
+// 虽非成功响应但证明服务器已响应（如 404 表示主机/代理存活，
+// 429 表示临时限流，服务器实际存活）
+const REACHABLE_ALLOWLIST = [404, 429]
 
 function httpReachable(httpCode) {
   return (httpCode >= 200 && httpCode < 400) || REACHABLE_ALLOWLIST.includes(httpCode)
@@ -85,7 +89,16 @@ function checkByPing(host, count) {
       ? ['-n', String(count), '-w', '2000', host]
       : ['-c', String(count), '-W', '2', host]
 
-    const child = spawn('ping', args, { stdio: ['pipe', 'pipe', 'pipe'] })
+    let child
+    try {
+      child = spawn('ping', args, { stdio: ['pipe', 'pipe', 'pipe'], shell: true })
+    } catch {
+      resolve({
+        reachable: false, sent: count, received: 0, loss: count,
+        lossPercent: 100, rttMin: '', rttAvg: '', rttMax: '', raw: 'ping command failed to execute',
+      })
+      return
+    }
     let stdout = ''
     let stderr = ''
     child.stdout.on('data', (d) => { stdout += d })
@@ -154,10 +167,19 @@ function checkByPing(host, count) {
  */
 function checkByCurl(url, proxy) {
   return new Promise((resolve) => {
-    const args = ['-k', '-L', '-s', '-o', '/dev/null', '-w', '%{http_code} %{time_total}', '--connect-timeout', '2', '--max-time', '5']
+    const args = ['-k', '-L', '-s', '-o', NULL_DEV, '-w', '%{http_code} %{time_total}', '--connect-timeout', '2', '--max-time', '5']
     if (proxy) args.push('-x', proxy)
     args.push(url)
-    const child = spawn('curl', args, { stdio: ['pipe', 'pipe', 'pipe'] })
+    let child
+    try {
+      child = spawn('curl', args, { stdio: ['pipe', 'pipe', 'pipe'], shell: true })
+    } catch {
+      resolve({
+        reachable: false, sent: 1, received: 0, loss: 1,
+        lossPercent: 100, rttMin: '', rttAvg: '', rttMax: '', raw: 'curl failed to execute',
+      })
+      return
+    }
     let stdout = ''
     let stderr = ''
     child.stdout.on('data', (d) => { stdout += d })
@@ -204,7 +226,16 @@ function checkByWget(url, proxy) {
       args.push('-e', `use_proxy=yes`, '-e', `https_proxy=${proxy}`, '-e', `http_proxy=${proxy}`)
     }
     args.push(url)
-    const child = spawn('wget', args, { stdio: ['pipe', 'pipe', 'pipe'] })
+    let child
+    try {
+      child = spawn('wget', args, { stdio: ['pipe', 'pipe', 'pipe'], shell: true })
+    } catch {
+      resolve({
+        reachable: false, sent: 1, received: 0, loss: 1,
+        lossPercent: 100, rttMin: '', rttAvg: '', rttMax: '', raw: 'wget failed to execute',
+      })
+      return
+    }
     let stdout = ''
     let stderr = ''
     child.stdout.on('data', (d) => { stdout += d })
@@ -271,7 +302,7 @@ async function checkReachability(address, tool, count, proxy) {
   return { reachable: false, sent: 0, received: 0, loss: 0, lossPercent: 0, rttMin: '', rttAvg: '', rttMax: '', raw: 'No tool available' }
 }
 
-export { checkReachability, extractHostPort }
+export { checkReachability, extractHostPort, httpReachable }
 
 export class PingGroup {
   constructor() {
@@ -298,12 +329,9 @@ export class PingGroup {
     const n = (isNaN(count) || count < 1) ? 4 : count
     const detail = !!(parsed.flags.d || parsed.flags.detail)
 
-    let proxy = ''
-    if ('p' in parsed.flags || 'proxy' in parsed.flags) {
-      let raw = parsed.flags.proxy || parsed.flags.p || ''
-      if (raw === 'true') raw = ''
-      proxy = raw || getActiveProxy()
-    }
+    let proxy = parsed.flags.proxy || parsed.flags.p || ''
+    if (proxy === 'true') proxy = ''
+    if (!proxy) proxy = getActiveProxy()
 
     if (target === 'proxy') {
       return this._pingProxy(n, detail, tool)
@@ -318,7 +346,8 @@ export class PingGroup {
     }
 
     if (proxy) {
-      const usable = await this._checkProxyUsable(proxy, tool, n)
+      const testUrl = isUrl(target) ? target : undefined
+      const usable = await this._checkProxyUsable(proxy, tool, n, testUrl)
       if (!usable.ok) {
         console.error(`[opm] Proxy not usable: ${usable.reason}`)
         process.exit(1)
@@ -331,12 +360,16 @@ export class PingGroup {
   }
 
   /**
-   * 检查代理是否可用：通过代理访问 npm active registry 测试
+   * 检查代理是否可用：通过代理访问指定 URL 测试
+   * @param {string} proxyUrl - 代理地址
+   * @param {string} tool - 检测工具
+   * @param {number} count - ping 包数量
+   * @param {string} [testUrl] - 测试 URL（默认 npm active registry）
    * @returns {{ ok: boolean, reason: string }}
    */
-  async _checkProxyUsable(proxyUrl, tool, count) {
-    const testUrl = getActiveRegistry('npm')
-    const result = await checkReachability(testUrl, tool, count, proxyUrl)
+  async _checkProxyUsable(proxyUrl, tool, count, testUrl) {
+    const url = testUrl || getActiveRegistry('npm')
+    const result = await checkReachability(url, tool, count, proxyUrl)
     if (result.proxyAuthRequired) {
       return { ok: false, reason: 'authentication required (HTTP 407)' }
     }
@@ -376,7 +409,13 @@ export class PingGroup {
     const tools = getRegistryTools()
 
     if (proxy) {
-      const usable = await this._checkProxyUsable(proxy, tool, 1)
+      // 用首个可用 registry URL 作为代理可用性测试目标（而非硬编码 npm）
+      let testUrl = ''
+      for (const t of tools) {
+        const u = getActiveRegistry(t)
+        if (u) { testUrl = u; break }
+      }
+      const usable = await this._checkProxyUsable(proxy, tool, 1, testUrl)
       if (!usable.ok) {
         console.error(`[opm] Proxy not usable: ${usable.reason}`)
         process.exit(1)
@@ -459,7 +498,8 @@ Actions:
 
 Options:
   -c, --count <n>          Number of packets to send (ping only; default: 4)
-  -p, --proxy <url>        Record proxy used for the check (informational)
+  -p, --proxy <url>        Proxy address for the check (overrides config proxy.active;
+                           routes curl/wget requests through the proxy and pre-validates usability)
   -d, --detail             Output full JSON details (default: compact [{tool, address, proxy, reachable}])
   -h, --help               Show this help
 

package/src/cli/index.js

@@ -21,6 +21,7 @@ import { EnsureGroup } from './groups/ensure.js'
 import { PingGroup } from './groups/ping.js'
 import { ProcGroup } from './groups/proc.js'
 import { OverlayGroup } from './groups/overlay.js'
+import { EnvGroup } from './groups/env.js'
 import { FtpGroup } from '../tools/ftp/index.js'
 import { GitGroup } from '../tools/git/index.js'
 import { ShareGroup } from '../tools/share/index.js'
@@ -66,6 +67,7 @@ const GROUPS = {
   ping: new PingGroup(),
   proc: new ProcGroup(),
   overlay: new OverlayGroup(),
+  env: new EnvGroup(),
 }
 
 class CLI {
@@ -130,7 +132,7 @@ ${groupLines}
 
 Options:
   -g, --global    Global operation (npm: global node_modules; pip: system Python)
-  -p, --proxy <url>  Proxy address (search/info/versions/outdated/install/upgrade)
+  -p, --proxy <url>  Proxy address (search/info/versions/install/upgrade)
   -h, --help      Show help
 
 Run "opm <command> help" for command details.

package/src/index.js

@@ -23,6 +23,7 @@ export { DockerGroup } from './cli/groups/docker.js'
 export { PingGroup } from './cli/groups/ping.js'
 export { ProcGroup } from './cli/groups/proc.js'
 export { OverlayGroup } from './cli/groups/overlay.js'
+export { EnvGroup, parseEnvBlocks, parseRegOutput, isValidEnvKey } from './cli/groups/env.js'
 export { FtpGroup } from './tools/ftp/index.js'
 export { GitGroup } from './tools/git/index.js'
 export { ShareGroup } from './tools/share/index.js'
@@ -62,7 +63,7 @@ export {
 } from './presets.js'
 export { PROXY_PRESETS } from './proxy-presets.js'
 export { output } from './formatter.js'
-export { downloadToFile, fetchText } from './managers/http.js'
+export { downloadToFile, fetchText } from '@wwkit/shared'
 export {
   getConfig, getSection, copyBuiltinConfig, getActiveRegistry, setActiveRegistry,
   getUserConfigDir, getUserConfigFile, getActiveProxy,

package/src/managers/apt.js

@@ -326,23 +326,6 @@ export class AptManager extends PackageManager {
     return { name, versions, registry }
   }
 
-  async listOutdated(opts = {}) {
-    const out = this._exec(['list', '--upgradable', ...this._proxyArgs(opts.proxy)], { allowNonZero: true })
-    const items = []
-    for (const line of this._parseLines(out)) {
-      const m = line.match(/^(\S+?)\/(\S+)\s+(\S+)\s+(\S+)\s+\[(.*?)\]$/)
-      if (m) {
-        const from = m[5].match(/upgradable from:\s*(\S+)/)
-        items.push({
-          name: m[1],
-          current: from ? from[1] : '',
-          latest: m[3]
-        })
-      }
-    }
-    return items
-  }
-
   async install(name, version, opts = {}) {
     const spec = version ? `${name}=${version}` : name
     const args = ['get', 'install', '-y', spec, ...this._proxyArgs(opts.proxy)]

package/src/managers/base.js

@@ -30,12 +30,6 @@
  * @typedef {Object} InstalledItem
  * @property {string} name - 包名
  * @property {string} version - 版本
- *
- * @typedef {Object} OutdatedItem
- * @property {string} name - 包名
- * @property {string} current - 当前版本
- * @property {string} [wanted] - 期望版本
- * @property {string} latest - 最新版本
  */
 export class PackageManager {
   constructor() {
@@ -132,15 +126,6 @@ export class PackageManager {
     throw new Error(`${this.name}: listInstalled not implemented`)
   }
 
-  /**
-   * 列出过期包
-   * @param {{ global?: boolean, proxy?: string }} [opts] - 选项
-   * @returns {Promise<OutdatedItem[]>}
-   */
-  async listOutdated(opts) {
-    throw new Error(`${this.name}: listOutdated not implemented`)
-  }
-
   /**
    * 安装包
    * @param {string} name - 包名

package/src/managers/brew.js

@@ -166,6 +166,7 @@ export class BrewManager extends PackageManager {
   _execInherit(args, opts = {}) {
     const result = spawnSync(this._brewBin(), args, {
       stdio: 'inherit',
+      shell: true,
       env: this._buildEnv(opts.proxy),
     })
     if (result.error) {
@@ -213,33 +214,6 @@ export class BrewManager extends PackageManager {
     return items
   }
 
-  /**
-   * 解析 brew outdated --json=v2 输出为过期项数组（formulae + casks）
-   * @param {string} text
-   * @returns {{ name: string, current: string, latest: string }[]}
-   * @private
-   */
-  _parseOutdatedJson(text) {
-    let data
-    try {
-      data = JSON.parse(text)
-    } catch {
-      return []
-    }
-    const items = []
-    for (const group of ['formulae', 'casks']) {
-      const list = Array.isArray(data[group]) ? data[group] : []
-      for (const item of list) {
-        items.push({
-          name: item.name,
-          current: (Array.isArray(item.installed_versions) ? item.installed_versions : []).join(', '),
-          latest: item.current_version || '',
-        })
-      }
-    }
-    return items
-  }
-
   async getVersion() {
     try {
       const out = this._exec(['--version'], { allowNonZero: true })
@@ -340,11 +314,6 @@ export class BrewManager extends PackageManager {
     return { name, versions, registry }
   }
 
-  async listOutdated(opts = {}) {
-    const out = this._exec(['outdated', '--json=v2'], { allowNonZero: true, proxy: opts.proxy })
-    return this._parseOutdatedJson(out)
-  }
-
   async install(name, version, opts = {}) {
     if (!isHomebrewInstalled()) {
       console.log('[opm] Homebrew not installed, auto-installing...')

package/src/managers/bun.js

@@ -2,7 +2,7 @@
  * bun 包管理器实现
  *
  * Bun 是全栈 JS 工具链（runtime + 包管理器 + 打包器）。
- * 包管理命令通过 bun CLI 实现，源查询通过 HTTP 直接查 npm registry。
+ * 包管理命令通过 bun CLI 实现，源查询通过共享 fetchText 查 npm registry。
  * 镜像通过 BUN_CONFIG_REGISTRY 环境变量传递给 bun 命令。
  */
 
@@ -11,6 +11,7 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import { PackageManager } from './base.js'
+import { fetchText } from '@wwkit/shared'
 import { getActiveRegistry, setActiveRegistry } from '../config.js'
 
 export class BunManager extends PackageManager {
@@ -108,52 +109,24 @@ export class BunManager extends PackageManager {
 
   /**
    * 通过 HTTP 查询 npm registry 获取包元数据
+   * 使用共享 fetchText（支持 HTTP/SOCKS5 代理隧道，与 pip/composer 一致）
    * @param {string} pkgName
    * @param {{ proxy?: string }} [opts]
    * @returns {Promise<object|null>}
    * @private
    */
   async _fetchRegistryMetadata(pkgName, opts = {}) {
-    const registry = getActiveRegistry('bun').replace(/\/$/, '')
+    const registry = (getActiveRegistry('bun') || 'https://registry.npmjs.org').replace(/\/$/, '')
     const url = `${registry}/${encodeURIComponent(pkgName).replace('%40', '@')}`
     try {
-      const { default: http } = await import('node:http')
-      const { default: https } = await import('node:https')
-      const client = url.startsWith('https') ? https : http
-      const proxyAgent = opts.proxy ? await this._getProxyAgent(opts.proxy) : null
-      return new Promise((resolve) => {
-        const req = client.get(url, { agent: proxyAgent }, (res) => {
-          let data = ''
-          res.on('data', (chunk) => (data += chunk))
-          res.on('end', () => {
-            try {
-              resolve(JSON.parse(data))
-            } catch {
-              resolve(null)
-            }
-          })
-        })
-        req.on('error', () => resolve(null))
-        req.setTimeout(15000, () => {
-          req.destroy()
-          resolve(null)
-        })
-      })
+      const text = await fetchText(url, { proxy: opts.proxy })
+      if (!text) return null
+      return JSON.parse(text)
     } catch {
       return null
     }
   }
 
-  /**
-   * 获取 proxy agent（简化实现，仅支持 http proxy）
-   * @param {string} proxy
-   * @returns {Promise<undefined>}
-   * @private
-   */
-  async _getProxyAgent(proxy) {
-    return undefined
-  }
-
   async getVersion() {
     try {
       const version = this._exec(['--version'], { allowNonZero: true }).trim()
@@ -269,30 +242,6 @@ export class BunManager extends PackageManager {
     return { name, versions, registry }
   }
 
-  async listOutdated(opts = {}) {
-    const args = ['outdated']
-    if (opts.global) args.push('-g')
-    try {
-      const out = this._exec(args, { allowNonZero: true, proxy: opts.proxy })
-      const items = []
-      const lines = out.split('\n')
-      for (const line of lines) {
-        const parts = line.trim().split(/\s+/)
-        if (parts.length >= 3 && parts[0] !== 'package' && parts[0] !== 'name') {
-          items.push({
-            name: parts[0],
-            current: parts[1] || 'unknown',
-            wanted: parts[1] || '',
-            latest: parts[2] || 'unknown',
-          })
-        }
-      }
-      return items
-    } catch {
-      return []
-    }
-  }
-
   async install(name, version, opts = {}) {
     const spec = version ? `${name}@${version}` : name
     const args = ['add', spec]

package/src/managers/composer.js

@@ -14,7 +14,7 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import { PackageManager } from './base.js'
-import { fetchText } from './http.js'
+import { fetchText } from '@wwkit/shared'
 import { getActiveRegistry, setActiveRegistry } from '../config.js'
 
 export class ComposerManager extends PackageManager {
@@ -298,21 +298,6 @@ export class ComposerManager extends PackageManager {
     return { name, versions, registry }
   }
 
-  async listOutdated(opts = {}) {
-    const out = this._exec(['outdated', '--format=json'], { allowNonZero: true, proxy: opts.proxy })
-    try {
-      const data = JSON.parse(out)
-      const installed = Array.isArray(data.installed) ? data.installed : []
-      return installed.map((item) => ({
-        name: item.name,
-        current: item.version || '',
-        latest: item.latest || '',
-      }))
-    } catch {
-      return []
-    }
-  }
-
   async install(name, version, opts = {}) {
     const spec = version ? `${name}:${version}` : name
     this._execInherit(['require', spec, '--no-interaction'], { proxy: opts.proxy })

package/src/managers/dnf.js

@@ -319,23 +319,6 @@ export class DnfManager extends PackageManager {
     return { name, versions, registry }
   }
 
-  async listOutdated(opts = {}) {
-    const args = ['list', '--upgrades', ...this._proxyArgs(opts.proxy)]
-    const out = this._exec(args, { allowNonZero: true })
-    const items = []
-    for (const line of this._parseLines(out)) {
-      const parts = line.split(/\s+/)
-      if (parts.length >= 3 && parts[1].includes('-')) {
-        items.push({
-          name: parts[0].replace(ARCH_SUFFIX, ''),
-          current: parts[1],
-          latest: parts[2]
-        })
-      }
-    }
-    return items
-  }
-
   async install(name, version, opts = {}) {
     const spec = version ? `${name}-${version}` : name
     const args = ['install', '-y', spec, ...this._proxyArgs(opts.proxy)]

package/src/managers/npm.js

@@ -422,26 +422,6 @@ export class NpmManager extends PackageManager {
     return { name, versions: [], registry }
   }
 
-  async listOutdated(opts = {}) {
-    try {
-      const args = ['outdated']
-      if (opts.global) args.push('-g')
-      args.push(...this._proxyArgs(opts.proxy))
-      args.push(...this._registryArgs())
-      const data = this._execJson(args)
-      if (!data) return []
-      const items = Object.entries(data).map(([name, info]) => ({
-        name,
-        current: info.current || 'missing',
-        wanted: info.wanted || '',
-        latest: info.latest || ''
-      }))
-      return items
-    } catch (err) {
-      throw new Error(`npm outdated failed: ${err.message}`)
-    }
-  }
-
   /**
    * 查询 npm 主版本号（缓存），用于判断是否支持 --allow-scripts（npm >= 11）
    * @returns {number}

package/src/managers/pip.js

@@ -9,7 +9,7 @@ import { execSync, spawnSync } from 'node:child_process'
 import path from 'node:path'
 import { URL } from 'node:url'
 import { PackageManager } from './base.js'
-import { fetchText } from './http.js'
+import { fetchText } from '@wwkit/shared'
 import { getActiveRegistry, setActiveRegistry } from '../config.js'
 
 export class PipManager extends PackageManager {
@@ -511,27 +511,6 @@ export class PipManager extends PackageManager {
     return { name, versions: [], registry }
   }
 
-  async listOutdated(opts = {}) {
-    try {
-      const args = ['list', '--outdated', '--format=json']
-      if (opts.proxy) args.push('--proxy', opts.proxy)
-      const jsonOut = this._execPip(args, { ...opts, allowNonZero: true })
-      const parsed = JSON.parse(jsonOut)
-      if (!Array.isArray(parsed)) return []
-      return parsed.map((item) => ({
-        name: item.name || '',
-        current: item.version || '',
-        latest: item.latest_version || '',
-        ...(opts.global ? { global: true } : {})
-      }))
-    } catch (err) {
-      if (err.message.includes('No packages') || err.message.includes('No broken')) {
-        return []
-      }
-      throw new Error(`pip list --outdated failed: ${err.message}`)
-    }
-  }
-
   async install(name, version, opts = {}) {
     const spec = version ? `${name}==${version}` : name
     const args = ['install', spec]

package/src/managers/proc.js

@@ -52,7 +52,13 @@ export async function getPortMap() {
   const args = shell.isWindows ? ['-ano'] : ['-tlnp']
 
   return new Promise((resolve) => {
-    const child = spawn(fallback, args, { stdio: ['pipe', 'pipe', 'pipe'] })
+    let child
+    try {
+      child = spawn(fallback, args, { stdio: ['pipe', 'pipe', 'pipe'], shell: true })
+    } catch {
+      resolve(map)
+      return
+    }
     let stdout = ''
     child.stdout.on('data', (d) => { stdout += d })
     child.on('close', () => {

package/src/managers/runtime.js

@@ -237,10 +237,6 @@ export class RuntimeManager extends PackageManager {
     return this._parseInstalled(out)
   }
 
-  async listOutdated(opts = {}) {
-    return []
-  }
-
   async install(name, version, opts = {}) {
     if (!version) {
       throw new Error(this.cfg.installUsage)

package/src/managers/winget.js

@@ -221,20 +221,6 @@ export class WingetManager extends PackageManager {
     }
   }
 
-  async listOutdated(opts = {}) {
-    const out = this._exec(
-      ['list', '--upgrade-available', '--accept-source-agreements', '--disable-interactivity'],
-      { allowNonZero: true }
-    )
-    return this._parseTable(out).map((r) => ({
-      name: r.Name || r.Id,
-      id: r.Id,
-      current: r.Version || '',
-      latest: r.Available || '',
-      source: r.Source || '',
-    }))
-  }
-
   async install(name, version, opts = {}) {
     const args = ['install', name, '--accept-package-agreements', '--accept-source-agreements']
     if (version) args.push('--version', version)