@jonathanleelx/meddle 0.4.0-beta.9 → 0.4.1-beta.1

package/README.md

@@ -34,7 +34,7 @@ irm https://raw.githubusercontent.com/JonathanLee-LX/meddle/main/scripts/install
 | Windows x64 | `meddle-windows-x64.exe` |
 | Windows ARM64 | `meddle-windows-arm64.exe` |
 
-二进制产物随 [GitHub Release](https://github.com/JonathanLee-LX/meddle/releases) 发布，也可手动下载。安装目录默认 `~/.meddle/bin`，可通过 `MEDDLE_BIN_DIR` 环境变量自定义。
+二进制产物随 [GitHub Release](https://github.com/JonathanLee-LX/meddle/releases) 发布，也可手动下载。安装目录默认 `~/.local/bin`（已有 `~/.meddle/bin` 旧安装时原地升级），可通过 `MEDDLE_BIN_DIR` 环境变量自定义。`meddle update` 始终更新到当前运行二进制所在目录。
 
 ### 命令
 

package/bin/commands/update.js

@@ -25,6 +25,7 @@ const {
     getAutoUpdate,
     setAutoUpdate,
     inferChannel,
+    resolveUpdateBinDir,
 } = require('../lib/update-check')
 
 const PACKAGE_NAME = '@jonathanleelx/meddle'
@@ -41,6 +42,27 @@ 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
@@ -82,20 +104,35 @@ async function resolveLatest({ force = false, notify = true, channel = 'stable',
 
 async function installVersion(version) {
     if (!isNpmInstall()) {
-        const binDir = process.env.MEDDLE_BIN_DIR || path.join(home, 'bin')
+        const binDir = resolveUpdateBinDir({ home })
         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)
         }

package/bin/lib/update-check.js

@@ -280,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 }>}
  */
@@ -295,25 +298,63 @@ 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}`
     const shaUrl = `${assetUrl}.sha256`
 
-    // 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.
+    // The binary is large (100MB+); the checksum sidecar is tiny. Use an IDLE
+    // timeout for the payload (reset on every received chunk — a slow-but-steady
+    // transfer is never killed by a total wall-time budget) 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)
+            let idleTimer = null
+            const controller = new AbortController()
+            const resetIdle = () => {
+                if (idleTimer) clearTimeout(idleTimer)
+                idleTimer = setTimeout(() => {
+                    controller.abort(new Error('download stalled (idle timeout)'))
+                }, payloadTimeout)
+                if (typeof idleTimer.unref === 'function') idleTimer.unref()
+            }
+            resetIdle()
             try {
-                const response = await doFetch(assetUrl, { signal: AbortSignal.timeout(payloadTimeout) })
+                const response = await doFetch(assetUrl, { signal: controller.signal })
                 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 (;;) {
+                        resetIdle()
+                        const { done, value } = await reader.read()
+                        if (done) break
+                        chunks.push(Buffer.from(value))
+                        received += value.byteLength
+                        onProgress({ received, total })
+                    }
+                } else {
+                    resetIdle()
+                    const buf = Buffer.from(await response.arrayBuffer())
+                    chunks.push(buf)
+                    received = buf.length
+                    onProgress({ received, total })
+                }
+                if (idleTimer) clearTimeout(idleTimer)
+                return Buffer.concat(chunks)
             } catch (err) {
+                if (idleTimer) clearTimeout(idleTimer)
                 lastError = err
+                if (attempt > maxRetries) break
             }
         }
         throw lastError || new Error(`download failed for ${assetUrl}`)
@@ -408,6 +449,24 @@ function printUpdateNotice(info) {
     )
 }
 
+/**
+ * Resolve where `meddle update` should install the new binary.
+ *   1. MEDDLE_BIN_DIR env (explicit override)
+ *   2. the directory of the RUNNING binary — in-place updates, so installs on
+ *      legacy (~/.meddle/bin) or custom paths stay where they are
+ *   3. <home>/bin fallback (npm installs / no running binary)
+ * @param {{ home: string, execPath?: string, platform?: string }} opts
+ * @returns {string}
+ */
+function resolveUpdateBinDir({ home, execPath = process.execPath, platform = os.platform() } = {}) {
+    if (process.env.MEDDLE_BIN_DIR) return process.env.MEDDLE_BIN_DIR
+    const p = platform === 'win32' ? path.win32 : path
+    const exeName = p.basename(execPath).toLowerCase()
+    const expected = platform === 'win32' ? 'meddle.exe' : 'meddle'
+    if (exeName === expected) return p.dirname(execPath)
+    return p.join(home, 'bin')
+}
+
 /**
  * Fire-and-forget startup check. Never blocks, never throws, never keeps the
  * process alive. When auto-update is enabled (binary installs) the new binary
@@ -430,7 +489,7 @@ function isSameBinary(a, b) {
 function runAsyncUpdateCheck(opts) {
     const home = opts.home || resolveMeddleHome()
     const installMethod = opts.installMethod || getInstallMethod({ moduleDir: __dirname })
-    const binDir = opts.binDir || process.env.MEDDLE_BIN_DIR || path.join(home, 'bin')
+    const binDir = opts.binDir || resolveUpdateBinDir({ home, execPath: opts.execPath || process.execPath })
     const delayMs = opts.delayMs === undefined ? 1500 : opts.delayMs
     const execPath = opts.execPath || process.execPath
     const exeBase = path.basename(execPath).toLowerCase()
@@ -493,6 +552,7 @@ module.exports = {
     downloadBinaryAsset,
     getAutoUpdate,
     setAutoUpdate,
+    resolveUpdateBinDir,
     runAsyncUpdateCheck,
     DEFAULT_DOWNLOAD_TIMEOUT_MS,
 }

package/package.json

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