@wwkit/opm 1.0.16 → 1.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/opm",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "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.21"
+    "@wwkit/shared": "1.0.23"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/src/cli/groups/package.js

@@ -102,13 +102,14 @@ export class PackageGroup {
    * 打印当前 registry 和 proxy（诊断信息，输出到 stderr）
    * 在涉及网络请求的命令执行前调用，便于连接失败时定位。
    * 输出到 stderr 不污染 JSON stdout。
+   * registry 通过 getEffectiveRegistry() 解析，含管理器自身配置回退（opm 配置 → 管理器全局配置 → 官方源）
    * @param {PackageManager} manager
    * @param {string} [proxy]
    * @private
    */
   async _printEndpoint(manager, proxy) {
     try {
-      const { registry } = await manager.getRegistry()
+      const { registry } = await manager.getEffectiveRegistry()
       if (registry) {
         console.error(`[opm] registry: ${registry}`)
       }

package/src/config.json5

@@ -30,8 +30,8 @@
     registry: {
       official: "https://pypi.org/simple",
       tsinghua: "https://pypi.tuna.tsinghua.edu.cn/simple",
-      huawei: "https://cmc.centralrepo.rnd.huawei.com/artifactory/api/pypi/pypi-repo/simple",
-      active: "tsinghua",
+      huawei: "https://mirrors.huaweicloud.com/repository/pypi/simple/",
+      active: "huawei",
     },
   },
 

package/src/managers/base.js

@@ -52,6 +52,16 @@ export class PackageManager {
     throw new Error(`${this.name}: getRegistry not implemented`)
   }
 
+  /**
+   * 查询生效的 registry 地址（打印诊断用）
+   * 默认委托 getRegistry()；子类可覆写以增加管理器自身配置回退。
+   * 仅用于 _printEndpoint 打印，不影响实际 install/upgrade 的 registry 传参。
+   * @returns {Promise<{ registry: string }>}
+   */
+  async getEffectiveRegistry() {
+    return this.getRegistry()
+  }
+
   /**
    * 设置镜像地址
    * @param {string} url - 镜像 URL 或预设名

package/src/managers/composer.js

@@ -162,6 +162,31 @@ export class ComposerManager extends PackageManager {
     return { registry: getActiveRegistry('composer') }
   }
 
+  /**
+   * 查询生效的 registry（打印诊断用）
+   * 回退链：opm 配置 → composer config --global repo.packagist → 官方源
+   * 仅用于 _printEndpoint 打印，不影响实际 install/upgrade 的仓库配置
+   * @returns {Promise<{ registry: string }>}
+   */
+  async getEffectiveRegistry() {
+    let registry = getActiveRegistry('composer')
+    if (!registry) {
+      try {
+        const out = this._exec(['config', '--global', 'repo.packagist'], { allowNonZero: true }).trim()
+        try {
+          const data = JSON.parse(out)
+          registry = data.url || ''
+        } catch {
+          if (out) registry = out
+        }
+      } catch {}
+    }
+    if (!registry) {
+      registry = 'https://repo.packagist.org'
+    }
+    return { registry }
+  }
+
   async setRegistry(url) {
     const resolved = setActiveRegistry('composer', url)
     return { registry: resolved }

package/src/managers/npm.js

@@ -96,6 +96,25 @@ export class NpmManager extends PackageManager {
     return { registry: getActiveRegistry('npm') }
   }
 
+  /**
+   * 查询生效的 registry（打印诊断用）
+   * 回退链：opm 配置 → npm config get registry → 官方源
+   * 仅用于 _printEndpoint 打印，不影响实际 install/upgrade 的 --registry 传参
+   * @returns {Promise<{ registry: string }>}
+   */
+  async getEffectiveRegistry() {
+    let registry = getActiveRegistry('npm')
+    if (!registry) {
+      try {
+        registry = this._exec(['config', 'get', 'registry'], { allowNonZero: true }).trim()
+      } catch {}
+    }
+    if (!registry) {
+      registry = 'https://registry.npmjs.org/'
+    }
+    return { registry }
+  }
+
   async getVersion() {
     try {
       const version = this._exec(['--version'], { allowNonZero: true }).trim()

package/src/managers/pip.js

@@ -277,6 +277,25 @@ export class PipManager extends PackageManager {
     return { registry }
   }
 
+  /**
+   * 查询生效的 registry（打印诊断用）
+   * 回退链：opm 配置 → pip config get global.index-url → 官方源
+   * 仅用于 _printEndpoint 打印，不影响实际 install/upgrade 的 --index-url 传参
+   * @returns {Promise<{ registry: string }>}
+   */
+  async getEffectiveRegistry() {
+    let registry = getActiveRegistry('pip')
+    if (!registry) {
+      try {
+        registry = this._exec(['config', 'get', 'global.index-url'], { allowNonZero: true }).trim()
+      } catch {}
+    }
+    if (!registry) {
+      registry = 'https://pypi.org/simple'
+    }
+    return { registry }
+  }
+
   async getVersion() {
     try {
       const out = this._exec(['--version'], { allowNonZero: true }).trim()

package/src/tools/webwork/index.js

@@ -6,8 +6,8 @@
  *
  * install 流程（5 步）：
  *   镜像检查(必查 npm/pip + 按需 nvm/node/uv) → ensure node/python → 写 NPM/PIP_REGISTRY/REGISTRY_PROXY → 装 blues-lib → ww init
- * upgrade 流程（4 步）：
- *   镜像检查(必查 npm/pip) → 写 NPM/PIP_REGISTRY/REGISTRY_PROXY → pip 升级 blues-lib → ww init -u
+ * upgrade 流程（3 步）：
+ *   镜像检查(必查 npm/pip) → 写 NPM/PIP_REGISTRY/REGISTRY_PROXY → ww upgrade
  *
  * 命令: version / versions / installed / install / uninstall / upgrade / help
  */
@@ -37,7 +37,7 @@ const ACTIONS = {
   installed: { desc: 'Show install status (true/false) of each component' },
   install:   { desc: 'Mirror check + ensure runtime + write registry env + blues-lib + ww init' },
   uninstall: { desc: 'Uninstall all components in reverse order' },
-  upgrade:   { desc: 'Upgrade blues-lib + ww init -u' },
+  upgrade:   { desc: 'Mirror check + write registry env + ww upgrade' },
   help:      { desc: 'Show this help' },
 }
 
@@ -204,26 +204,22 @@ export class WebworkGroup {
   async _upgrade(parsed) {
     const proxy = this._resolveProxy(parsed)
 
-    console.log('\n========== 步骤 1/4: 镜像可达检查 ==========')
+    console.log('\n========== 步骤 1/3: 镜像可达检查 ==========')
     await this._checkMirrors(proxy, null)
 
-    console.log('\n========== 步骤 2/4: 写入 NPM_REGISTRY / PIP_REGISTRY / REGISTRY_PROXY ==========')
+    console.log('\n========== 步骤 2/3: 写入 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========== 步骤 3/3: ww upgrade ==========')
+    this._runWwInit('upgrade')
 
-    console.log('\n========== 步骤 4/4: ww init -u ==========')
-    this._runWwInit('init -u')
-
-    output({ action: 'upgrade', bluesLib: blue, init: 'ww init -u' })
+    output({ action: 'upgrade', upgrade: 'ww upgrade' })
   }
 
   /**
-   * 执行 ww init/init -u
+   * 执行 ww init / init -u / upgrade
    * 镜像与代理配置通过 NPM_REGISTRY/PIP_REGISTRY/REGISTRY_PROXY 环境变量传递（见 _writeRegistryEnv）
-   * @param {string} action - 'init' 或 'init -u'
+   * @param {string} action - 'init' / 'init -u' / 'upgrade'
    * @private
    */
   _runWwInit(action) {
@@ -539,7 +535,7 @@ Examples:
   opm webwork installed     Show install status of all components
   opm webwork install       Mirror check + ensure runtime + registry env + blues-lib + ww init
   opm webwork uninstall     Uninstall all components in reverse order
-  opm webwork upgrade       Upgrade blues-lib + ww init -u
+  opm webwork upgrade       Mirror check + write registry env + ww upgrade
 `)
   }
 }