@jonathanleelx/meddle 0.4.0-beta.3 → 0.4.0-beta.6

package/bin/commands/update.js

@@ -3,6 +3,7 @@
  *
  * Usage:
  *   meddle update                    check and upgrade to the latest version
+ *   meddle update --beta             check and upgrade to the latest beta version
  *   meddle update --check            only check, print the available version
  *   meddle update --version <x.y.z>  install a specific version
  *   meddle update --auto on|off      enable/disable auto-update (default off)
@@ -23,6 +24,7 @@ const {
     downloadBinaryAsset,
     getAutoUpdate,
     setAutoUpdate,
+    inferChannel,
 } = require('../lib/update-check')
 
 const PACKAGE_NAME = '@jonathanleelx/meddle'
@@ -44,8 +46,11 @@ function showHelp() {
 meddle update - 检查并升级 meddle
 
 用法:
-  meddle update                   检查并升级到最新版本
+  meddle update                   检查并升级（beta 版本默认走 beta 频道）
+  meddle update --beta            强制使用 beta 测试频道
+  meddle update --stable          强制使用稳定频道
   meddle update --check           仅检查，提示可用版本 (有新版本时退出码为 2)
+  meddle update --check --beta    仅检查 beta 版本
   meddle update --version <x.y.z> 安装指定版本
   meddle update --auto on|off     启用/禁用自动更新 (默认关闭)
   meddle update status            查看安装方式、当前版本和自动更新开关
@@ -53,12 +58,13 @@ meddle update - 检查并升级 meddle
 `)
 }
 
-async function resolveLatest({ force = false, notify = true } = {}) {
+async function resolveLatest({ force = false, notify = true, channel = 'stable' } = {}) {
     const info = await checkForUpdate({
         home,
         installMethod,
         current,
         force,
+        channel,
     })
     if (notify) {
         if (info.outdated) {
@@ -114,6 +120,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 channel = args.includes('--beta') ? 'beta' : args.includes('--stable') ? 'stable' : inferChannel(current)
 
     if (flag === '--help' || flag === '-h') {
         showHelp()
@@ -121,9 +128,10 @@ async function run() {
     }
 
     if (flag === 'status') {
-        const info = await resolveLatest({ notify: false })
+        const info = await resolveLatest({ notify: false, channel })
         output.header('Meddle Update Status')
         output.kv('Install method', installMethod)
+        output.kv('Channel', channel)
         output.kv('Current', info.current)
         output.kv('Latest', info.latest)
         output.kv('Auto-update', getAutoUpdate(home) ? 'on' : 'off')
@@ -170,13 +178,13 @@ async function run() {
     }
 
     if (flag === '--check') {
-        const info = await resolveLatest()
+        const info = await resolveLatest({ channel })
         if (info.outdated) process.exit(2)
         return
     }
 
     // default: check + upgrade
-    const info = await resolveLatest()
+    const info = await resolveLatest({ channel })
     if (!info.outdated) return
     await installVersion(info.latest)
 }

package/bin/lib/update-check.js

@@ -20,6 +20,7 @@ const { resolveMeddleHome } = require('./meddle-home')
 const PACKAGE_NAME = '@jonathanleelx/meddle'
 const REPO = 'JonathanLee-LX/meddle'
 const DEFAULT_NPM_REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`
+const DEFAULT_NPM_BETA_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/beta`
 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
@@ -95,12 +96,15 @@ function compareVersions(a, b) {
 
 /**
  * Fetch the latest version from the npm registry.
- * @param {{ fetchImpl?: Function, registryUrl?: string, timeoutMs?: number }} opts
+ * @param {{ fetchImpl?: Function, registryUrl?: string, timeoutMs?: number, distTag?: string }} opts
  * @returns {Promise<string>}
  */
-async function getLatestVersionNpm({ fetchImpl, registryUrl, timeoutMs } = {}) {
+async function getLatestVersionNpm({ fetchImpl, registryUrl, timeoutMs, distTag } = {}) {
     const doFetch = fetchImpl || fetch
-    const url = registryUrl || process.env.MEDDLE_NPM_REGISTRY_URL || DEFAULT_NPM_REGISTRY_URL
+    const url = registryUrl
+        || (distTag === 'beta'
+            ? (process.env.MEDDLE_NPM_BETA_REGISTRY_URL || process.env.MEDDLE_NPM_REGISTRY_URL || DEFAULT_NPM_BETA_URL)
+            : (process.env.MEDDLE_NPM_REGISTRY_URL || DEFAULT_NPM_REGISTRY_URL))
     const response = await doFetch(url, { signal: AbortSignal.timeout(timeoutMs || DEFAULT_TIMEOUT_MS) })
     if (!response.ok) throw new Error(`npm registry responded ${response.status}`)
     const data = await response.json()
@@ -110,7 +114,9 @@ async function getLatestVersionNpm({ fetchImpl, registryUrl, timeoutMs } = {}) {
 }
 
 /**
- * Fetch the latest version from the GitHub releases/latest redirect.
+ * Fetch the latest stable version from the GitHub releases/latest redirect
+ * (prereleases are excluded by GitHub). Beta versions resolve through the npm
+ * registry `beta` dist-tag instead — see checkForUpdate.
  * @param {{ fetchImpl?: Function, latestUrl?: string, timeoutMs?: number }} opts
  * @returns {Promise<string>}
  */
@@ -149,11 +155,22 @@ function updateCachePath(home) {
     return path.join(home, '.cache', 'update-check.json')
 }
 
+/**
+ * Infer the update channel from the current version: prerelease versions
+ * (e.g. 0.4.0-beta.4) default to the beta channel, releases to stable.
+ * @param {string} current
+ * @returns {'stable' | 'beta'}
+ */
+function inferChannel(current) {
+    return isValidVersion(current) && parseVersion(current).prerelease.length > 0 ? 'beta' : 'stable'
+}
+
 /**
  * @param {{ home: string, fetchImpl?: Function, installMethod: string, current: string,
  *           now?: number, ttlMs?: number, force?: boolean,
- *           registryUrl?: string, latestUrl?: string, timeoutMs?: number }} opts
- * @returns {Promise<{ current: string, latest: string, outdated: boolean, fromCache: boolean, checkedAt: number }>}
+ *           registryUrl?: string, latestUrl?: string, timeoutMs?: number,
+ *           channel?: string }} opts
+ * @returns {Promise<{ current: string, latest: string, outdated: boolean, fromCache: boolean, checkedAt: number, channel: string }>}
  */
 async function checkForUpdate(opts) {
     const {
@@ -167,6 +184,7 @@ async function checkForUpdate(opts) {
         registryUrl,
         latestUrl,
         timeoutMs,
+        channel = inferChannel(current),
     } = opts
 
     const cacheFile = updateCachePath(home)
@@ -175,7 +193,8 @@ async function checkForUpdate(opts) {
         cached = JSON.parse(fs.readFileSync(cacheFile, 'utf8'))
     } catch (_) {}
 
-    if (!force && cached && typeof cached.version === 'string' && typeof cached.checkedAt === 'number') {
+    if (!force && cached && typeof cached.version === 'string' && typeof cached.checkedAt === 'number'
+        && (cached.channel || 'stable') === channel) {
         if (now - cached.checkedAt < ttlMs) {
             return {
                 current,
@@ -183,18 +202,25 @@ async function checkForUpdate(opts) {
                 outdated: compareVersions(cached.version, current) > 0,
                 fromCache: true,
                 checkedAt: cached.checkedAt,
+                channel,
             }
         }
     }
 
-    const latest = installMethod === 'binary'
-        ? await getLatestVersionGithub({ fetchImpl, latestUrl, timeoutMs })
-        : await getLatestVersionNpm({ fetchImpl, registryUrl, timeoutMs })
+    // Beta channel always resolves via the npm registry `beta` dist-tag — the
+    // GitHub releases API is rate-limited (403) for unauthenticated callers.
+    // Binary installs still download assets from GitHub, but resolve the
+    // version number from npm where it is published in lockstep with releases.
+    const latest = channel === 'beta'
+        ? await getLatestVersionNpm({ fetchImpl, registryUrl, timeoutMs, distTag: 'beta' })
+        : installMethod === 'binary'
+            ? await getLatestVersionGithub({ fetchImpl, latestUrl, timeoutMs })
+            : await getLatestVersionNpm({ fetchImpl, registryUrl, timeoutMs })
 
     const checkedAt = now
     try {
         fs.mkdirSync(path.dirname(cacheFile), { recursive: true })
-        fs.writeFileSync(cacheFile, JSON.stringify({ version: latest, checkedAt }), 'utf8')
+        fs.writeFileSync(cacheFile, JSON.stringify({ version: latest, checkedAt, channel }), 'utf8')
     } catch (_) {}
 
     return {
@@ -203,6 +229,7 @@ async function checkForUpdate(opts) {
         outdated: compareVersions(latest, current) > 0,
         fromCache: false,
         checkedAt,
+        channel,
     }
 }
 
@@ -425,6 +452,7 @@ module.exports = {
     compareVersions,
     isValidVersion,
     parseVersion,
+    inferChannel,
     getLatestVersionNpm,
     getLatestVersionGithub,
     getInstallMethod,

package/package.json

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