@jonathanleelx/meddle 0.4.0-beta.8 → 0.4.0

package/bin/commands/update.js

@@ -41,14 +41,35 @@ function isNpmInstall() {
     return installMethod === 'npm'
 }
 
+function formatBytes(bytes) {
+    if (bytes >= 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
+    if (bytes >= 1024) return `${(bytes / 1024).toFixed(1)} KB`
+    return `${bytes} B`
+}
+
+const PROGRESS_WIDTH = 40
+
+function drawProgressBar({ received, total, attempt, maxAttempts }) {
+    const label = attempt > 1 ? ` (第 ${attempt}/${maxAttempts} 次尝试)` : ''
+    if (total > 0) {
+        const ratio = Math.min(1, received / total)
+        const filled = Math.round(PROGRESS_WIDTH * ratio)
+        const bar = '#'.repeat(filled) + '-'.repeat(PROGRESS_WIDTH - filled)
+        const line = `    [${bar}] ${(ratio * 100).toFixed(1)}% ${formatBytes(received)}/${formatBytes(total)}${label}`
+        process.stdout.write(`\r${line}`)
+    } else {
+        process.stdout.write(`\r    下载中 ${formatBytes(received)}${label}...`)
+    }
+}
+
 function showHelp() {
     output.plain(`
 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 +79,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) {
@@ -84,17 +106,32 @@ async function installVersion(version) {
         const binDir = process.env.MEDDLE_BIN_DIR || path.join(home, 'bin')
         const destFile = path.join(binDir, os.platform() === 'win32' ? 'meddle.exe' : 'meddle')
         output.info(`下载 meddle ${version} (${os.platform()}/${os.arch()})...`)
+        let progressShown = false
+        const showProgress = output.isJsonMode() ? () => {} : drawProgressBar
         try {
             const result = await downloadBinaryAsset({
                 version,
                 destFile,
                 platform: os.platform(),
                 arch: os.arch(),
+                onAttempt: (attempt, maxAttempts) => {
+                    if (attempt > 1) {
+                        process.stdout.write('\n')
+                        progressShown = false
+                        output.info(`连接中断，正在重试 (${attempt}/${maxAttempts})...`)
+                    }
+                },
+                onProgress: (p) => {
+                    showProgress(p)
+                    progressShown = true
+                },
             })
+            if (progressShown) process.stdout.write('\n')
             output.success(`已安装 meddle ${version} 到 ${result.installed}`)
             if (result.backup) output.info(`旧版本已备份到 ${result.backup}`)
             output.info('重启 meddle 后新版本生效')
         } catch (err) {
+            if (progressShown) process.stdout.write('\n')
             output.error(`升级失败: ${err && err.message ? err.message : err}`)
             process.exit(1)
         }
@@ -123,6 +160,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 +169,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 +219,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

@@ -25,7 +25,7 @@ const DEFAULT_GITHUB_LATEST_URL = `https://github.com/${REPO}/releases/latest`
 const DEFAULT_DOWNLOAD_BASE_URL = `https://github.com/${REPO}/releases/download`
 const DEFAULT_CACHE_TTL_MS = 24 * 60 * 60 * 1000
 const DEFAULT_TIMEOUT_MS = 5000
-const DEFAULT_DOWNLOAD_TIMEOUT_MS = 120 * 1000
+const DEFAULT_DOWNLOAD_TIMEOUT_MS = 5 * 60 * 1000
 
 const VERSION_RE = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/
 
@@ -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,
@@ -267,10 +280,13 @@ function sha256Hex(buffer) {
  * 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.
+ * large (100MB+) and flaky connections drop mid-body. Progress is reported
+ * via `onProgress` while streaming (received/total bytes), and `onAttempt`
+ * fires before each attempt (skipping retries is visible to callers).
  * @param {{ version: string, destFile: string, platform: string, arch: string,
  *           baseUrl?: string, fetchImpl?: Function, timeoutMs?: number,
  *           retries?: number, retryDelayMs?: number,
+ *           onProgress?: Function, onAttempt?: Function,
  *           fsImpl?: object }} opts
  * @returns {Promise<{ installed: string, backup: string, version: string }>}
  */
@@ -282,6 +298,8 @@ async function downloadBinaryAsset(opts) {
     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 onProgress = typeof opts.onProgress === 'function' ? opts.onProgress : () => {}
+    const onAttempt = typeof opts.onAttempt === 'function' ? opts.onAttempt : () => {}
 
     const asset = getAssetName({ platform, arch })
     const assetUrl = `${baseUrl}/v${version}/${asset}`
@@ -291,16 +309,36 @@ async function downloadBinaryAsset(opts) {
     // timeout for the payload and the regular timeout for the metadata fetch.
     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))
+        for (let attempt = 1; attempt <= maxRetries + 1; attempt++) {
+            if (attempt > 1 && retryDelayMs > 0) {
+                await new Promise((r) => setTimeout(r, retryDelayMs * (attempt - 1)))
             }
+            onAttempt(attempt, maxRetries + 1)
             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())
+                const total = Number(response.headers.get('content-length')) || 0
+                const chunks = []
+                let received = 0
+                if (response.body && typeof response.body.getReader === 'function') {
+                    const reader = response.body.getReader()
+                    for (;;) {
+                        const { done, value } = await reader.read()
+                        if (done) break
+                        chunks.push(Buffer.from(value))
+                        received += value.byteLength
+                        onProgress({ received, total })
+                    }
+                } else {
+                    const buf = Buffer.from(await response.arrayBuffer())
+                    chunks.push(buf)
+                    received = buf.length
+                    onProgress({ received, total })
+                }
+                return Buffer.concat(chunks)
             } catch (err) {
                 lastError = err
+                if (attempt > maxRetries) break
             }
         }
         throw lastError || new Error(`download failed for ${assetUrl}`)

package/package.json

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