@wwkit/opm 1.0.12 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/opm",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "author": "bluesliu <langcai163@163.com>",
   "description": "Unified CLI — package management (npm/pip/dnf/apt) + config view + opencode maintenance",
   "type": "module",
@@ -35,7 +35,7 @@
     "basic-ftp": "^6.2.1",
     "extract-zip": "^2.0.1",
     "systeminformation": "^5.23.0",
-    "@wwkit/shared": "1.0.16"
+    "@wwkit/shared": "1.0.18"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/src/cli/groups/ping.js

@@ -46,6 +46,14 @@ function isUrl(addr) {
   return /^https?:\/\//i.test(addr)
 }
 
+// HTTP 状态码 → 可达性判断：2xx/3xx 视为可达，allowlist 中的状态码
+// 虽非成功响应但证明服务器已响应（如 404 表示主机/代理存活）
+const REACHABLE_ALLOWLIST = [404]
+
+function httpReachable(httpCode) {
+  return (httpCode >= 200 && httpCode < 400) || REACHABLE_ALLOWLIST.includes(httpCode)
+}
+
 /**
  * 获取所有含 registry 配置的工具名列表
  * @returns {string[]}
@@ -82,14 +90,16 @@ function checkByPing(host, count) {
     let stderr = ''
     child.stdout.on('data', (d) => { stdout += d })
     child.stderr.on('data', (d) => { stderr += d })
-    child.on('close', () => {
+    child.on('close', (code) => {
       const raw = stdout + stderr
       let received = 0
       let rttMin = ''
       let rttAvg = ''
       let rttMax = ''
 
+      // English: "1 packets received" / Chinese: "已接收 = 1"
       const recvMatch = raw.match(/(\d+)\s+packets?\s+received/)
+        || raw.match(/(\d+)\s*已接收/)
       if (recvMatch) received = parseInt(recvMatch[1], 10)
 
       if (!isWin) {
@@ -100,7 +110,10 @@ function checkByPing(host, count) {
           rttMax = rttMatch[3]
         }
       } else {
+        // English: "Minimum = 28ms, Maximum = 28ms, Average = 28ms"
+        // Chinese: "最小 = 28ms，最大 = 28ms，平均 = 28ms"
         const msMatch = raw.match(/Minimum\s*=\s*(\d+)ms.*?Maximum\s*=\s*(\d+)ms.*?Average\s*=\s*(\d+)ms/s)
+          || raw.match(/最小\s*=\s*(\d+)ms.*?最大\s*=\s*(\d+)ms.*?平均\s*=\s*(\d+)ms/s)
         if (msMatch) {
           rttMin = msMatch[1]
           rttAvg = msMatch[3]
@@ -108,8 +121,12 @@ function checkByPing(host, count) {
         }
       }
 
+      // Use exit code as primary signal (language-independent);
+      // regex-based received count as secondary fallback
+      const reachable = code === 0 || received > 0
+
       resolve({
-        reachable: received > 0,
+        reachable,
         sent: count,
         received,
         loss: count - received,
@@ -150,8 +167,7 @@ function checkByCurl(url, proxy) {
       const httpCode = parseInt(parts[0], 10) || 0
       const timeTotal = parseFloat(parts[1]) || 0
       const proxyAuthRequired = httpCode === 407
-      const allowlist = [404]
-      const reachable = (httpCode >= 200 && httpCode < 400) || allowlist.includes(httpCode)
+      const reachable = httpReachable(httpCode)
       const rttMs = reachable ? String(Math.round(timeTotal * 1000)) : ''
       resolve({
         reachable,
@@ -183,7 +199,7 @@ function checkByCurl(url, proxy) {
  */
 function checkByWget(url, proxy) {
   return new Promise((resolve) => {
-    const args = ['-q', '--spider', '--timeout=5']
+    const args = ['-q', '--spider', '-S', '--timeout=5']
     if (proxy) {
       args.push('-e', `use_proxy=yes`, '-e', `https_proxy=${proxy}`, '-e', `http_proxy=${proxy}`)
     }
@@ -194,7 +210,11 @@ function checkByWget(url, proxy) {
     child.stdout.on('data', (d) => { stdout += d })
     child.stderr.on('data', (d) => { stderr += d })
     child.on('close', (code) => {
-      const reachable = code === 0
+      // -S 输出响应头，从中提取 HTTP 状态码（wget 退出码无法区分 404/网络错误）
+      const httpMatch = stderr.match(/HTTP\/\S+\s+(\d{3})/)
+        || stderr.match(/awaiting response\.\.\.\s*(\d{3})/)
+      const httpCode = httpMatch ? parseInt(httpMatch[1], 10) : 0
+      const reachable = httpCode ? httpReachable(httpCode) : code === 0
       resolve({
         reachable,
         sent: 1,
@@ -204,7 +224,7 @@ function checkByWget(url, proxy) {
         rttMin: '',
         rttAvg: '',
         rttMax: '',
-        raw: stderr.trim() || (reachable ? 'OK' : 'Failed'),
+        raw: httpCode ? `HTTP ${httpCode}` : (stderr.trim() || (reachable ? 'OK' : 'Failed')),
       })
     })
     child.on('error', () => {
@@ -225,6 +245,7 @@ function checkByWget(url, proxy) {
  * @returns {Promise<object>}
  */
 async function checkReachability(address, tool, count, proxy) {
+  console.log(`  [CHECK] ${tool}` + (proxy ? ` via proxy ${proxy}` : '') + ` → ${address}`)
   if (tool === 'ping') {
     let host = address
     if (isUrl(address)) {
@@ -442,7 +463,7 @@ Options:
   -d, --detail             Output full JSON details (default: compact [{tool, address, proxy, reachable}])
   -h, --help               Show this help
 
-Tool detection: ping > curl > wget (auto-detected)
+Tool detection: curl > wget > ping (auto-detected)
 
 Output:
   default (no -d)          [{ "tool": "npm", "address": "https://...", "proxy": "", "reachable": true }]

package/src/harnesses/opencode/index.js

@@ -39,21 +39,22 @@ function findConfigFile() {
 
 /**
  * 获取 env 变量当前值
- * 优先级：系统环境变量 > opm config opencode.env
+ * 优先级：opm config opencode.env > 系统环境变量
+ * 用户在配置文件中设置的值优先，无需手动管理环境变量。
  * @returns {Record<string, string>}
  */
 function getEnvVars() {
   const cfgEnv = (getConfig().opencode?.env) || {}
   const result = {}
   for (const key of ENV_VARS) {
-    result[key] = process.env[key] || cfgEnv[key] || ''
+    result[key] = cfgEnv[key] || process.env[key] || ''
   }
   return result
 }
 
 /**
  * 在指定工作目录启动 opencode TUI
- * 自动注入有值的环境变量（系统 env > opm config）
+ * 自动注入有值的环境变量（opm config 优先，系统 env 回退）
  * @param {string} workDir - 工作目录
  * @param {string[]} [passThroughArgs=[]] - Extra args passed to opencode
  */

package/src/tools/webwork/index.js

@@ -5,9 +5,9 @@
  * 由 blues-lib 提供的 ww init / ww init -u 全权处理，不再单独安装/检查。
  *
  * install 流程（5 步）：
- *   镜像检查(必查 npm/pip/cft + 按需 nvm/node/uv) → ensure node/python → 写 NPM/PIP/CFT_REGISTRY → 装 blues-lib → ww init
+ *   镜像检查(必查 npm/pip + 按需 nvm/node/uv) → ensure node/python → 写 NPM/PIP_REGISTRY/REGISTRY_PROXY → 装 blues-lib → ww init
  * upgrade 流程（4 步）：
- *   镜像检查(必查 npm/pip/cft) → 写 NPM/PIP/CFT_REGISTRY → pip 升级 blues-lib → ww init -u
+ *   镜像检查(必查 npm/pip) → 写 NPM/PIP_REGISTRY/REGISTRY_PROXY → pip 升级 blues-lib → ww init -u
  *
  * 命令: version / versions / installed / install / uninstall / upgrade / help
  */
@@ -184,8 +184,8 @@ export class WebworkGroup {
       console.log(`  → python ${env.python.provided} 已满足`)
     }
 
-    console.log('\n========== 步骤 3/5: 写入 NPM_REGISTRY / PIP_REGISTRY / CFT_REGISTRY ==========')
-    this._writeRegistryEnv()
+    console.log('\n========== 步骤 3/5: 写入 NPM_REGISTRY / PIP_REGISTRY / REGISTRY_PROXY ==========')
+    this._writeRegistryEnv(proxy)
 
     console.log('\n========== 步骤 4/5: 安装 blues-lib ==========')
     const blue = await this._installPipPackage('blues-lib', proxy)
@@ -196,7 +196,7 @@ export class WebworkGroup {
     }
 
     console.log('\n========== 步骤 5/5: ww init ==========')
-    execSync('ww init', { encoding: 'utf8', stdio: 'inherit' })
+    this._runWwInit('init')
 
     output({ action: 'install', env, ensured, bluesLib: blue, init: 'ww init' })
   }
@@ -207,32 +207,44 @@ export class WebworkGroup {
     console.log('\n========== 步骤 1/4: 镜像可达检查 ==========')
     await this._checkMirrors(proxy, null)
 
-    console.log('\n========== 步骤 2/4: 写入 NPM_REGISTRY / PIP_REGISTRY / CFT_REGISTRY ==========')
-    this._writeRegistryEnv()
+    console.log('\n========== 步骤 2/4: 写入 NPM_REGISTRY / PIP_REGISTRY / REGISTRY_PROXY ==========')
+    this._writeRegistryEnv(proxy)
 
     console.log('\n========== 步骤 3/4: 升级 blues-lib ==========')
     const blue = await this._upgradePipPackage('blues-lib', proxy)
     console.log(`  ✓ blues-lib 升级完成`)
 
     console.log('\n========== 步骤 4/4: ww init -u ==========')
-    execSync('ww init -u', { encoding: 'utf8', stdio: 'inherit' })
+    this._runWwInit('init -u')
 
     output({ action: 'upgrade', bluesLib: blue, init: 'ww init -u' })
   }
 
   /**
-   * 将 NPM_REGISTRY / PIP_REGISTRY / CFT_REGISTRY 写入 shell profile（与 SELENIUM_CFT_DIR 同机制）
-   * blues-lib 的相关命令依赖镜像，写入后保持与 opm 配置一致
+   * 执行 ww init/init -u
+   * 镜像与代理配置通过 NPM_REGISTRY/PIP_REGISTRY/REGISTRY_PROXY 环境变量传递（见 _writeRegistryEnv）
+   * @param {string} action - 'init' 或 'init -u'
+   * @private
+   */
+  _runWwInit(action) {
+    execSync(`ww ${action}`, { encoding: 'utf8', stdio: 'inherit' })
+  }
+
+  /**
+   * 将 NPM_REGISTRY / PIP_REGISTRY / REGISTRY_PROXY 写入 shell profile，并同步到当前会话 env
+   * blues-lib 的相关命令依赖镜像，写入后保持与 opm 配置一致；代理同理，ww init 用同一机制读取
+   * @param {string} [proxy] - 代理地址（来自 -p/--proxy 或 opm 配置 proxy.active），空则跳过
    */
-  _writeRegistryEnv() {
+  _writeRegistryEnv(proxy = '') {
     const entries = [
       ['NPM_REGISTRY', getActiveRegistry('npm')],
       ['PIP_REGISTRY', getActiveRegistry('pip')],
-      ['CFT_REGISTRY', getActiveRegistry('cft')],
+      ['REGISTRY_PROXY', proxy],
     ]
     for (const [name, url] of entries) {
       if (!url) continue
       shell.setEnvVar(name, url)
+      process.env[name] = url
       console.log(`  [OK] ${name}=${url}`)
     }
   }
@@ -268,8 +280,9 @@ export class WebworkGroup {
 
   /**
    * 检查镜像可达性（HEAD 请求，不可达则抛错）
-   * 必查：npm / pip / cft（blues-lib 依赖，环境必然可用）
+   * 必查：npm / pip（blues-lib 依赖，环境必然可用）
    * 条件查：nvm + node（仅 env.node 不满足时）、uv（仅 env.python 不满足时）
+   * cft 不查：由 ww init 全权处理插件安装，不再单独检查。
    * @param {string} proxy
    * @param {{ node: { satisfied: boolean }, python: { satisfied: boolean } } | null} env
    *        null 表示不做条件检查（upgrade 场景，不装 runtime）
@@ -277,7 +290,7 @@ export class WebworkGroup {
   async _checkMirrors(proxy, env) {
     const tool = shell.getNetProbeTool()
     if (!tool) {
-      console.log('  [WARN] No network probe tool (ping/curl/wget), skipping mirror check')
+      console.log('  [WARN] No network probe tool (curl/wget/ping), skipping mirror check')
       return
     }
 
@@ -287,7 +300,6 @@ export class WebworkGroup {
     const checks = [
       { name: 'npm', url: getActiveRegistry('npm') },
       { name: 'pip', url: getActiveRegistry('pip') },
-      { name: 'cft', url: getActiveRegistry('cft') },
       ...(needNode ? [
         { name: 'nvm', url: getActiveRegistry('nvm') },
         { name: 'node', url: getActiveRegistry('node') },
@@ -318,7 +330,10 @@ export class WebworkGroup {
     }
 
     if (!allOk) {
-      throw new Error('Some mirrors unreachable, aborting. Check network or set proxy with -p')
+      const hint = proxy
+        ? `Proxy (${proxy}) was used for ${tool}-based checks. Ensure the proxy is working and mirrors are accessible through it.`
+        : `No proxy configured. If behind a proxy, set config proxy.active or use -p <url>. Current tool: ${tool}.`
+      throw new Error(`Some mirrors unreachable, aborting. ${hint}`)
     }
   }