most-box 0.2.7 → 0.2.9

package/README.md

@@ -278,7 +278,7 @@ git push origin vx.x.x
 
 1. **npm 包发布** — 发布 `most-box` 到 npm registry
 2. **Windows 打包** — 分别构建 `.exe` 安装包（x64 / arm64）并上传 Release
-3. **macOS 打包** — 构建 `.dmg` 安装包和 `.zip` 更新包（x64 + arm64）并上传 Release
+3. **macOS 打包** — 构建 `.dmg` 安装包（x64 + arm64）并上传 Release
 4. **Linux 打包** — 构建 `.AppImage` 安装包（x64 + arm64）并上传 Release
 5. **下载镜像** — 将 Release 资产同步到 Cloudflare R2，并生成 `releases/latest.json`
 
@@ -288,6 +288,14 @@ GitHub Release 是可信备用源；下载页优先读取 R2 的 `releases/lates
 
 R2 发布资产使用独立公开桶，默认 bucket 为 `most-box-releases`，默认公开域名为
 `https://download.most.box`。不要复用 `api.most.box` 项目的 `most-box-backup` 备份桶。
+Release workflow 不设置 Infrequent Access，R2 对象保持默认 Standard 存储层，并在上传后用
+`head-object` 校验存储层与缓存头。版本化安装包使用
+`public, max-age=31536000, immutable`；`releases/latest.json` 使用
+`public, max-age=60, stale-while-revalidate=300`。
+新发版只在 manifest 和 R2 中发布当前系统可手动打开的 installer（Windows `.exe`、
+macOS `.dmg`、Linux `.AppImage`），不再发布 updater / blockmap 资产。
+需要临时复查线上对象时，可手动运行 GitHub Actions 的 `Verify R2 Release` workflow；
+它复用仓库 R2 secrets 做只读 `head-object` 检查，不需要在本机输入 R2 密钥。
 
 在仓库 Settings → Secrets and variables → Actions 中添加：
 

package/electron/main.js

@@ -3,17 +3,16 @@ import {
   BrowserWindow,
   Menu,
   Tray,
-  ipcMain,
+  dialog,
   nativeImage,
   shell,
 } from 'electron'
-import { spawn } from 'node:child_process'
 import fs from 'node:fs'
 import path from 'node:path'
-import { Readable } from 'node:stream'
 import { fileURLToPath } from 'node:url'
 
 import {
+  formatBytes,
   getAvailableUpdate,
   getCurrentArch,
   getCurrentPlatform,
@@ -23,7 +22,6 @@ import {
   createMostDeepLinkTarget,
   findMostDeepLinkArg,
 } from './deepLink.js'
-import { calculateCid } from '../server/src/core/cid.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const PORT = 1976
@@ -34,16 +32,6 @@ let tray = null
 let isQuitting = false
 let hasCheckedForUpdates = false
 let pendingDeepLinkUrl = ''
-let updateState = {
-  status: 'idle',
-  version: '',
-  filename: '',
-  source: '',
-  progress: 0,
-  error: '',
-  path: '',
-  cid: '',
-}
 
 const gotSingleInstanceLock = app.requestSingleInstanceLock()
 
@@ -101,57 +89,6 @@ function getInitialWindowUrl() {
   return initialUrl
 }
 
-function getPublicUpdateState() {
-  return {
-    status: updateState.status,
-    version: updateState.version,
-    filename: updateState.filename,
-    source: updateState.source,
-    progress: updateState.progress,
-    error: updateState.error,
-    cid: updateState.cid,
-  }
-}
-
-function setUpdateState(patch) {
-  updateState = {
-    ...updateState,
-    ...patch,
-  }
-  mainWindow?.webContents.send('updates:state', getPublicUpdateState())
-}
-
-function getUpdateAssetFilename(update) {
-  return path.basename(
-    update.asset.filename ||
-      `MostBox-${update.version}-${getCurrentPlatform()}-${getCurrentArch()}`
-  )
-}
-
-function getSafeVersionDir(version) {
-  return String(version || 'unknown').replace(/[^a-zA-Z0-9._-]/g, '_')
-}
-
-function getUpdateCachePath(update) {
-  const filename = getUpdateAssetFilename(update)
-  return path.join(
-    app.getPath('userData'),
-    'updates',
-    getSafeVersionDir(update.version),
-    filename
-  )
-}
-
-async function verifyFileCid(filePath, expectedCid) {
-  const { cid } = await calculateCid(filePath)
-  const actualCid = cid.toString()
-  if (actualCid !== expectedCid) {
-    throw new Error(
-      `Update CID mismatch. Expected ${expectedCid}, got ${actualCid}.`
-    )
-  }
-}
-
 function registerMostProtocolClient() {
   if (process.defaultApp && process.argv.length >= 2) {
     app.setAsDefaultProtocolClient('most', process.execPath, [
@@ -163,14 +100,6 @@ function registerMostProtocolClient() {
   app.setAsDefaultProtocolClient('most')
 }
 
-function registerUpdateIpc() {
-  ipcMain.handle('updates:get-state', () => getPublicUpdateState())
-  ipcMain.handle('updates:install-and-restart', async () => {
-    await installDownloadedUpdate()
-    return getPublicUpdateState()
-  })
-}
-
 function openMostDeepLink(link) {
   const targetUrl = createMostDeepLinkTarget(
     link,
@@ -272,348 +201,14 @@ async function fetchReleaseManifest(manifestUrl) {
   }
 }
 
-async function downloadUpdateFromHttp(update, targetPath) {
-  if (!update.downloadUrl) {
-    throw new Error('No HTTP fallback URL is available for this update')
-  }
-
-  const tempPath = `${targetPath}.http.part`
-  fs.rmSync(tempPath, { force: true })
-  fs.mkdirSync(path.dirname(targetPath), { recursive: true })
-
-  const response = await fetch(update.downloadUrl, { cache: 'no-store' })
-  if (!response.ok || !response.body) {
-    throw new Error(`HTTP update download failed: ${response.status}`)
-  }
-
-  const total = Number(response.headers.get('content-length')) || 0
-  let loaded = 0
-
-  await new Promise((resolve, reject) => {
-    const rs = Readable.fromWeb(response.body)
-    const ws = fs.createWriteStream(tempPath)
-
-    const cleanup = err => {
-      rs.destroy(err)
-      ws.destroy()
-      fs.unlink(tempPath, () => {})
-    }
-
-    rs.on('data', chunk => {
-      loaded += chunk.length
-      if (total > 0) {
-        setUpdateState({
-          status: 'downloading',
-          source: 'http',
-          progress: Math.min(99, Math.round((loaded / total) * 100)),
-        })
-      }
-    })
-
-    rs.on('error', err => {
-      cleanup(err)
-      reject(err)
-    })
-    ws.on('error', err => {
-      cleanup(err)
-      reject(err)
-    })
-    ws.on('finish', resolve)
-    rs.pipe(ws)
-  })
-
-  try {
-    await verifyFileCid(tempPath, update.cid)
-    fs.rmSync(targetPath, { force: true })
-    fs.renameSync(tempPath, targetPath)
-  } catch (error) {
-    fs.rmSync(tempPath, { force: true })
-    throw error
-  }
-
-  try {
-    await engine?.seedCidFileFromPath(update.cid, targetPath, {
-      fileName: getUpdateAssetFilename(update),
-      source: 'update',
-    })
-  } catch (error) {
-    console.warn('[Electron] Update downloaded but seeding failed:', error)
-  }
-}
-
-async function downloadUpdateByCid(update, targetPath) {
-  if (!engine?.downloadCidToPath) {
-    throw new Error('MostBox engine update download API is unavailable')
-  }
-
-  const taskId = `update_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`
-  const filename = getUpdateAssetFilename(update)
-
-  const onProgress = data => {
-    if (data?.taskId !== taskId) return
-    setUpdateState({
-      status: 'downloading',
-      source: 'cid',
-      progress: Math.min(99, Number(data.percent) || 0),
-    })
-  }
-  const onStatus = data => {
-    if (data?.taskId !== taskId) return
-    setUpdateState({
-      status: 'downloading',
-      source: 'cid',
-      filename,
-    })
-  }
-
-  engine.on('download:progress', onProgress)
-  engine.on('download:status', onStatus)
-  try {
-    await engine.downloadCidToPath({
-      cid: update.cid,
-      fileName: filename,
-      targetPath,
-      taskId,
-      timeout: 30000,
-      overwrite: true,
-      source: 'update',
-    })
-  } finally {
-    engine.off('download:progress', onProgress)
-    engine.off('download:status', onStatus)
-  }
-}
-
-async function downloadUpdate(update) {
-  const targetPath = getUpdateCachePath(update)
-  const filename = getUpdateAssetFilename(update)
-
-  setUpdateState({
-    status: 'downloading',
-    version: update.version,
-    filename,
-    source: 'cid',
-    progress: 0,
-    error: '',
-    path: '',
-    cid: update.cid,
-  })
-
-  try {
-    await downloadUpdateByCid(update, targetPath)
-  } catch (cidError) {
-    console.warn('[Electron] CID update download failed, trying fallback:', cidError)
-    setUpdateState({
-      status: 'downloading',
-      source: 'http',
-      progress: 0,
-      error: '',
-    })
-    await downloadUpdateFromHttp(update, targetPath)
-  }
-
-  await verifyFileCid(targetPath, update.cid)
-  setUpdateState({
-    status: 'downloaded',
-    version: update.version,
-    filename,
-    source: updateState.source || 'cid',
-    progress: 100,
-    error: '',
-    path: targetPath,
-    cid: update.cid,
-  })
-}
-
-function quitForUpdate() {
-  isQuitting = true
-  if (tray) {
-    tray.destroy()
-    tray = null
-  }
-  app.quit()
-}
-
-function getPowerShellPath() {
-  if (process.env.SystemRoot) {
-    const candidate = path.join(
-      process.env.SystemRoot,
-      'System32',
-      'WindowsPowerShell',
-      'v1.0',
-      'powershell.exe'
-    )
-    if (fs.existsSync(candidate)) return candidate
-  }
-
-  return 'powershell.exe'
-}
-
-function installWindowsUpdate(updatePath) {
-  const scriptPath = path.join(
-    app.getPath('userData'),
-    'updates',
-    'install-windows.ps1'
-  )
-  const exePath = app.getPath('exe')
-  const script = `param(
-  [Parameter(Mandatory=$true)][string]$UpdatePath,
-  [Parameter(Mandatory=$true)][int]$AppPid,
-  [Parameter(Mandatory=$true)][string]$ExePath
-)
-
-$ErrorActionPreference = "Stop"
-try {
-  Wait-Process -Id $AppPid -ErrorAction SilentlyContinue
-} catch {}
-
-$installer = Start-Process -FilePath $UpdatePath -ArgumentList "/S" -Wait -PassThru
-if (($null -eq $installer.ExitCode -or $installer.ExitCode -eq 0) -and (Test-Path -LiteralPath $ExePath)) {
-  Start-Process -FilePath $ExePath
-}
-`
-
-  fs.mkdirSync(path.dirname(scriptPath), { recursive: true })
-  fs.writeFileSync(scriptPath, script, 'utf8')
-  const child = spawn(
-    getPowerShellPath(),
-    [
-      '-NoProfile',
-      '-ExecutionPolicy',
-      'Bypass',
-      '-File',
-      scriptPath,
-      updatePath,
-      String(process.pid),
-      exePath,
-    ],
-    {
-      detached: true,
-      stdio: 'ignore',
-      windowsHide: true,
-    }
-  )
-  child.unref()
-  quitForUpdate()
-}
-
-function getMacAppBundlePath() {
-  return path.resolve(app.getPath('exe'), '../../..')
-}
-
-function installMacUpdate(updatePath) {
-  const scriptPath = path.join(app.getPath('userData'), 'updates', 'install-mac.sh')
-  const appBundlePath = getMacAppBundlePath()
-  const script = `#!/bin/bash
-set -e
-APP_PATH="$1"
-ZIP_PATH="$2"
-TMP_DIR="$(mktemp -d)"
-cleanup() {
-  rm -rf "$TMP_DIR"
-}
-trap cleanup EXIT
-while pgrep -f "$APP_PATH/Contents/MacOS" >/dev/null 2>&1; do
-  sleep 1
-done
-ditto -x -k "$ZIP_PATH" "$TMP_DIR"
-NEW_APP="$(find "$TMP_DIR" -maxdepth 1 -name "*.app" -type d | head -n 1)"
-if [ -z "$NEW_APP" ]; then
-  exit 1
-fi
-rm -rf "$APP_PATH"
-ditto "$NEW_APP" "$APP_PATH"
-open "$APP_PATH"
-`
-
-  fs.mkdirSync(path.dirname(scriptPath), { recursive: true })
-  fs.writeFileSync(scriptPath, script, { mode: 0o755 })
-  const child = spawn('/bin/bash', [scriptPath, appBundlePath, updatePath], {
-    detached: true,
-    stdio: 'ignore',
-  })
-  child.unref()
-  quitForUpdate()
-}
-
-function installLinuxUpdate(updatePath) {
-  const currentAppImage = process.env.APPIMAGE
-  if (!currentAppImage) {
-    shell.openPath(updatePath).catch(() => {})
-    throw new Error('当前 Linux 运行方式不支持自动替换 AppImage')
-  }
-
-  const scriptPath = path.join(app.getPath('userData'), 'updates', 'install-linux.sh')
-  const script = `#!/bin/sh
-set -e
-APPIMAGE_PATH="$1"
-UPDATE_PATH="$2"
-APP_PID="$3"
-while kill -0 "$APP_PID" >/dev/null 2>&1; do
-  sleep 1
-done
-cp "$UPDATE_PATH" "$APPIMAGE_PATH"
-chmod +x "$APPIMAGE_PATH"
-nohup "$APPIMAGE_PATH" >/dev/null 2>&1 &
-`
-
-  fs.mkdirSync(path.dirname(scriptPath), { recursive: true })
-  fs.writeFileSync(scriptPath, script, { mode: 0o755 })
-  const child = spawn('/bin/sh', [scriptPath, currentAppImage, updatePath, String(process.pid)], {
-    detached: true,
-    stdio: 'ignore',
-  })
-  child.unref()
-  quitForUpdate()
-}
-
-async function installDownloadedUpdate() {
-  if (updateState.status !== 'downloaded' || !updateState.path) {
-    throw new Error('No downloaded update is ready to install')
-  }
-
-  setUpdateState({ status: 'installing', error: '' })
-
-  try {
-    if (process.platform === 'win32') {
-      installWindowsUpdate(updateState.path)
-      return
-    }
-    if (process.platform === 'darwin') {
-      installMacUpdate(updateState.path)
-      return
-    }
-    if (process.platform === 'linux') {
-      installLinuxUpdate(updateState.path)
-      return
-    }
-
-    throw new Error('当前平台不支持自动安装更新')
-  } catch (error) {
-    setUpdateState({
-      status: 'error',
-      error: error?.message || 'Update install failed',
-    })
-    throw error
-  }
-}
-
 async function checkForUpdates() {
   if (hasCheckedForUpdates) return
   hasCheckedForUpdates = true
 
   try {
-    setUpdateState({
-      status: 'checking',
-      progress: 0,
-      error: '',
-    })
     const platform = getCurrentPlatform()
     const arch = getCurrentArch()
-    if (!platform || !arch) {
-      setUpdateState({ status: 'idle' })
-      return
-    }
+    if (!platform || !arch) return
 
     const manifest = await fetchReleaseManifest(getReleaseManifestUrl())
     const update = getAvailableUpdate(manifest, {
@@ -622,19 +217,35 @@ async function checkForUpdates() {
       arch,
     })
 
-    if (!update) {
-      setUpdateState({ status: 'idle' })
-      return
-    }
+    if (!update) return
+
+    const sizeText = formatBytes(update.asset.size)
+    const detail = [
+      `当前版本：${app.getVersion()}`,
+      `最新版本：${update.version}`,
+      sizeText ? `安装包大小：${sizeText}` : null,
+      '',
+      '是否现在下载当前系统版本的安装包？下载完成后请手动打开安装。',
+    ]
+      .filter(line => line !== null)
+      .join('\n')
+
+    const result = await dialog.showMessageBox(mainWindow, {
+      type: 'info',
+      buttons: ['立即下载', '稍后'],
+      defaultId: 0,
+      cancelId: 1,
+      title: '发现 MostBox 新版本',
+      message: `MostBox ${update.version} 已可下载`,
+      detail,
+      noLink: true,
+    })
 
-    await downloadUpdate(update)
+    if (result.response === 0) {
+      await shell.openExternal(update.downloadUrl)
+    }
   } catch (error) {
-    console.warn('[Electron] Update check failed:', error)
-    setUpdateState({
-      status: 'error',
-      error: error?.message || 'Update check failed',
-      progress: 0,
-    })
+    console.warn('[Electron] Update check skipped:', error)
   }
 }
 
@@ -643,7 +254,6 @@ if (!gotSingleInstanceLock) {
   app.quit()
 } else {
   registerMostProtocolClient()
-  registerUpdateIpc()
   openMostDeepLink(findMostDeepLinkArg(process.argv))
 
   app.on('second-instance', (_event, commandLine) => {

package/electron/preload.js

@@ -1,21 +1,6 @@
-import { contextBridge, ipcRenderer } from 'electron'
+import { contextBridge } from 'electron'
 
 contextBridge.exposeInMainWorld('electronAPI', {
   platform: process.platform,
   isElectron: true,
-  updates: {
-    getState: () => ipcRenderer.invoke('updates:get-state'),
-    installAndRestart: () => ipcRenderer.invoke('updates:install-and-restart'),
-    onStateChange: callback => {
-      if (typeof callback !== 'function') return () => {}
-
-      const listener = (_event, state) => {
-        callback(state)
-      }
-      ipcRenderer.on('updates:state', listener)
-      return () => {
-        ipcRenderer.off('updates:state', listener)
-      }
-    },
-  },
 })

package/electron/updateChecker.js

@@ -1,5 +1,5 @@
 import {
-  findCompatibleUpdateAsset,
+  getInstallerReleaseAssets,
   isReleaseManifest,
   resolveReleaseAssetDownload,
 } from '../server/src/core/releaseManifest.js'
@@ -50,7 +50,11 @@ export function isNewerVersion(candidateVersion, currentVersion) {
 }
 
 export function findUpdateAsset(manifest, platform, arch) {
-  return findCompatibleUpdateAsset(manifest, platform, arch)
+  return (
+    getInstallerReleaseAssets(manifest).find(
+      asset => asset.platform === platform && asset.arch === arch
+    ) || null
+  )
 }
 
 export function formatBytes(size) {
@@ -81,7 +85,6 @@ export function getAvailableUpdate(manifest, options = {}) {
   return {
     version: manifest.version,
     asset,
-    cid: asset.cid,
     downloadUrl,
   }
 }