@jonathanleelx/meddle 0.4.0-beta.7 → 0.4.0-beta.9

package/bin/commands/update.js

@@ -47,8 +47,8 @@ meddle update - 检查并升级 meddle
 
 用法:
   meddle update                   检查并升级（beta 版本默认走 beta 频道）
-  meddle update --beta            强制使用 beta 测试频道
-  meddle update --stable          强制使用稳定频道
+  meddle update --beta            切换到 beta 频道并升级到最新 beta 版本
+  meddle update --stable          切换到稳定频道并升级到最新稳定版本（可降级）
   meddle update --check           仅检查，提示可用版本 (有新版本时退出码为 2)
   meddle update --check --beta    仅检查 beta 版本
   meddle update --version <x.y.z> 安装指定版本
@@ -58,13 +58,14 @@ meddle update - 检查并升级 meddle
 `)
 }
 
-async function resolveLatest({ force = false, notify = true, channel = 'stable' } = {}) {
+async function resolveLatest({ force = false, notify = true, channel = 'stable', explicitChannel = false } = {}) {
     const info = await checkForUpdate({
         home,
         installMethod,
         current,
         force,
         channel,
+        explicitChannel,
     })
     if (notify) {
         if (info.outdated) {
@@ -123,6 +124,7 @@ async function run() {
     const flag = args.find((a) => a === '--check' || a === 'status' || a === '--help' || a === '-h')
     const versionFlagIndex = args.indexOf('--version')
     const autoFlagIndex = args.indexOf('--auto')
+    const explicitChannel = args.includes('--beta') || args.includes('--stable')
     const channel = args.includes('--beta') ? 'beta' : args.includes('--stable') ? 'stable' : inferChannel(current)
 
     if (flag === '--help' || flag === '-h') {
@@ -131,7 +133,7 @@ async function run() {
     }
 
     if (flag === 'status') {
-        const info = await resolveLatest({ notify: false, channel })
+        const info = await resolveLatest({ notify: false, channel, explicitChannel })
         output.header('Meddle Update Status')
         output.kv('Install method', installMethod)
         output.kv('Channel', channel)
@@ -181,13 +183,13 @@ async function run() {
     }
 
     if (flag === '--check') {
-        const info = await resolveLatest({ channel })
+        const info = await resolveLatest({ channel, explicitChannel })
         if (info.outdated) process.exit(2)
         return
     }
 
     // default: check + upgrade
-    const info = await resolveLatest({ channel })
+    const info = await resolveLatest({ channel, explicitChannel })
     if (!info.outdated) return
     await installVersion(info.latest)
 }

package/bin/lib/update-check.js

@@ -165,11 +165,23 @@ function inferChannel(current) {
     return isValidVersion(current) && parseVersion(current).prerelease.length > 0 ? 'beta' : 'stable'
 }
 
+/**
+ * Decide whether the install should move to `latest`. Explicit channel flags
+ * (--beta/--stable) mean "switch channels", so a different channel always
+ * triggers the move (even a downgrade); the inferred channel only upgrades.
+ * @param {{ latest: string, current: string, channel: string, explicitChannel: boolean }} opts
+ * @returns {boolean}
+ */
+function outdatedByChannel({ latest, current, channel, explicitChannel }) {
+    if (explicitChannel && channel !== inferChannel(current)) return true
+    return compareVersions(latest, current) > 0
+}
+
 /**
  * @param {{ home: string, fetchImpl?: Function, installMethod: string, current: string,
  *           now?: number, ttlMs?: number, force?: boolean,
  *           registryUrl?: string, latestUrl?: string, timeoutMs?: number,
- *           channel?: string }} opts
+ *           channel?: string, explicitChannel?: boolean }} opts
  * @returns {Promise<{ current: string, latest: string, outdated: boolean, fromCache: boolean, checkedAt: number, channel: string }>}
  */
 async function checkForUpdate(opts) {
@@ -185,6 +197,7 @@ async function checkForUpdate(opts) {
         latestUrl,
         timeoutMs,
         channel = inferChannel(current),
+        explicitChannel = false,
     } = opts
 
     const cacheFile = updateCachePath(home)
@@ -199,7 +212,7 @@ async function checkForUpdate(opts) {
             return {
                 current,
                 latest: cached.version,
-                outdated: compareVersions(cached.version, current) > 0,
+                outdated: outdatedByChannel({ latest: cached.version, current, channel, explicitChannel }),
                 fromCache: true,
                 checkedAt: cached.checkedAt,
                 channel,
@@ -226,7 +239,7 @@ async function checkForUpdate(opts) {
     return {
         current,
         latest,
-        outdated: compareVersions(latest, current) > 0,
+        outdated: outdatedByChannel({ latest, current, channel, explicitChannel }),
         fromCache: false,
         checkedAt,
         channel,
@@ -265,8 +278,12 @@ function sha256Hex(buffer) {
  * the existing binary. The previous binary is kept as `<destFile>.bak`. When
  * the final replace fails the backup is restored and a descriptive error is
  * thrown (Windows commonly fails with EPERM on a running binary).
+ *
+ * The payload download is retried (default 3 attempts) because binaries are
+ * large (100MB+) and flaky connections drop mid-body.
  * @param {{ version: string, destFile: string, platform: string, arch: string,
  *           baseUrl?: string, fetchImpl?: Function, timeoutMs?: number,
+ *           retries?: number, retryDelayMs?: number,
  *           fsImpl?: object }} opts
  * @returns {Promise<{ installed: string, backup: string, version: string }>}
  */
@@ -276,6 +293,8 @@ async function downloadBinaryAsset(opts) {
     const doFetch = opts.fetchImpl || fetch
     const fsImpl = opts.fsImpl || fs
     const payloadTimeout = opts.timeoutMs || DEFAULT_DOWNLOAD_TIMEOUT_MS
+    const maxRetries = opts.retries === undefined ? 3 : opts.retries
+    const retryDelayMs = opts.retryDelayMs === undefined ? 1000 : opts.retryDelayMs
 
     const asset = getAssetName({ platform, arch })
     const assetUrl = `${baseUrl}/v${version}/${asset}`
@@ -283,14 +302,27 @@ async function downloadBinaryAsset(opts) {
 
     // The binary is large (100MB+); the checksum sidecar is tiny. Use a long
     // timeout for the payload and the regular timeout for the metadata fetch.
-    const [binaryResponse, shaResponse] = await Promise.all([
-        doFetch(assetUrl, { signal: AbortSignal.timeout(payloadTimeout) }),
-        doFetch(shaUrl, { signal: AbortSignal.timeout(DEFAULT_TIMEOUT_MS) }),
-    ])
-    if (!binaryResponse.ok) throw new Error(`download failed (${binaryResponse.status})`)
+    const fetchPayload = async () => {
+        let lastError = null
+        for (let attempt = 0; attempt <= maxRetries; attempt++) {
+            if (attempt > 0 && retryDelayMs > 0) {
+                await new Promise((r) => setTimeout(r, retryDelayMs * attempt))
+            }
+            try {
+                const response = await doFetch(assetUrl, { signal: AbortSignal.timeout(payloadTimeout) })
+                if (!response.ok) throw new Error(`download failed (${response.status})`)
+                return Buffer.from(await response.arrayBuffer())
+            } catch (err) {
+                lastError = err
+            }
+        }
+        throw lastError || new Error(`download failed for ${assetUrl}`)
+    }
+
+    const shaResponse = await doFetch(shaUrl, { signal: AbortSignal.timeout(DEFAULT_TIMEOUT_MS) })
     if (!shaResponse.ok) throw new Error(`checksum sidecar missing (${shaResponse.status})`)
 
-    const payload = Buffer.from(await binaryResponse.arrayBuffer())
+    const payload = await fetchPayload()
     const shaText = await shaResponse.text()
     const expected = shaText.trim().split(/\s+/)[0]
     if (!/^[0-9a-f]{64}$/i.test(expected)) throw new Error(`invalid checksum sidecar`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jonathanleelx/meddle",
-  "version": "0.4.0-beta.7",
+  "version": "0.4.0-beta.9",
   "description": "A simple development proxy server with custom routing rules, mock responses, HTTPS interception, and a plugin system",
   "type": "commonjs",
   "main": "index.js",