@jonathanleelx/meddle 0.4.0 → 0.4.1-beta.2

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'
@@ -103,7 +104,7 @@ 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

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 = 5 * 60 * 1000
+const DEFAULT_DOWNLOAD_TIMEOUT_MS = 120 * 1000
 
 const VERSION_RE = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/
 
@@ -305,8 +305,10 @@ async function downloadBinaryAsset(opts) {
     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 = 1; attempt <= maxRetries + 1; attempt++) {
@@ -314,8 +316,18 @@ async function downloadBinaryAsset(opts) {
                 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})`)
                 const total = Number(response.headers.get('content-length')) || 0
                 const chunks = []
@@ -323,6 +335,7 @@ async function downloadBinaryAsset(opts) {
                 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))
@@ -330,13 +343,16 @@ async function downloadBinaryAsset(opts) {
                         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
             }
@@ -344,11 +360,16 @@ async function downloadBinaryAsset(opts) {
         throw lastError || new Error(`download failed for ${assetUrl}`)
     }
 
+    // Fetch the tiny checksum sidecar and CONSUME its body right away. The
+    // sidecar timeout must not span the (potentially multi-minute) payload
+    // download — otherwise the sidecar body stream aborts before it is read
+    // and the whole install fails with "operation aborted" right after the
+    // payload reached 100%.
     const shaResponse = await doFetch(shaUrl, { signal: AbortSignal.timeout(DEFAULT_TIMEOUT_MS) })
     if (!shaResponse.ok) throw new Error(`checksum sidecar missing (${shaResponse.status})`)
+    const shaText = await shaResponse.text()
 
     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`)
     if (sha256Hex(payload) !== expected.toLowerCase()) {
@@ -433,6 +454,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
@@ -455,7 +494,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()
@@ -518,6 +557,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",
+  "version": "0.4.1-beta.2",
   "description": "A simple development proxy server with custom routing rules, mock responses, HTTPS interception, and a plugin system",
   "type": "commonjs",
   "main": "index.js",