yo-moss-ai 0.0.11 → 0.0.13

package/bin/bootstrap-deps.mjs

@@ -7,6 +7,7 @@ import { spawn } from 'node:child_process'
 import { pipeline } from 'node:stream/promises'
 
 export const PROGRESS_BAR_WIDTH = 28
+export const MEDIA_PACKAGE_NAME = 'yo-moss-ai-media'
 
 export function mediaCacheDir() {
   return process.env.MOSS_MEDIA_ROOT || path.join(os.homedir(), '.moss-desktop', 'media')
@@ -24,15 +25,29 @@ export function formatProgressBar(label, ratio, width = PROGRESS_BAR_WIDTH) {
   return `${label} [${bar}] ${pct}%`
 }
 
-function renderBar(label, ratio) {
-  process.stdout.write(`\r\x1b[2K${formatProgressBar(label, ratio)}`)
+/** 终端单行刷新；非 TTY（部分 npx 环境）按步进换行，避免长时间无输出 */
+export function createProgressReporter(label) {
+  let lastPct = -1
+  return (ratio) => {
+    const pct = Math.min(100, Math.max(0, Math.round(ratio * 100)))
+    const line = formatProgressBar(label, ratio)
+    if (process.stdout.isTTY) {
+      process.stdout.write(`\r\x1b[2K${line}`)
+      return
+    }
+    if (lastPct < 0 || pct >= lastPct + 10 || pct === 100) {
+      console.log(line)
+      lastPct = pct
+    }
+  }
 }
 
+/** @deprecated 单文件 CDN 对大体积 npm 包不可靠，保留仅供测试/兜底 */
 export function cdnUrls(version, relativePath) {
   const encoded = relativePath.split('/').map((part) => encodeURIComponent(part)).join('/')
   return [
-    `https://cdn.jsdelivr.net/npm/yo-moss-ai-media@${version}/${encoded}`,
-    `https://unpkg.com/yo-moss-ai-media@${version}/${encoded}`,
+    `https://cdn.jsdelivr.net/npm/${MEDIA_PACKAGE_NAME}@${version}/${encoded}`,
+    `https://unpkg.com/${MEDIA_PACKAGE_NAME}@${version}/${encoded}`,
   ]
 }
 
@@ -90,14 +105,41 @@ export function fileReady(filePath, expectedSize) {
   }
 }
 
-function runNpmInstall(cwd) {
+export function dirByteSize(dir) {
+  if (!fs.existsSync(dir)) return 0
+  let total = 0
+  for (const name of fs.readdirSync(dir)) {
+    const full = path.join(dir, name)
+    const stat = fs.statSync(full)
+    if (stat.isDirectory()) total += dirByteSize(full)
+    else total += stat.size
+  }
+  return total
+}
+
+export function copyTree(src, dest) {
+  fs.mkdirSync(dest, { recursive: true })
+  for (const name of fs.readdirSync(src)) {
+    if (name.startsWith('.')) continue
+    const from = path.join(src, name)
+    const to = path.join(dest, name)
+    if (fs.statSync(from).isDirectory()) copyTree(from, to)
+    else fs.copyFileSync(from, to)
+  }
+}
+
+function runNpmInstall(cwd, extraArgs = []) {
   return new Promise((resolve, reject) => {
     const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm'
-    const child = spawn(npmCmd, ['install', '--omit=dev', '--no-audit', '--no-fund', '--loglevel=error'], {
-      cwd,
-      stdio: ['ignore', 'ignore', 'pipe'],
-      shell: process.platform === 'win32',
-    })
+    const child = spawn(
+      npmCmd,
+      ['install', '--omit=dev', '--no-audit', '--no-fund', '--loglevel=error', ...extraArgs],
+      {
+        cwd,
+        stdio: ['ignore', 'ignore', 'pipe'],
+        shell: process.platform === 'win32',
+      },
+    )
     let errText = ''
     child.stderr.on('data', (chunk) => {
       errText += String(chunk)
@@ -109,7 +151,84 @@ function runNpmInstall(cwd) {
   })
 }
 
-export async function ensureRuntimeNpmDeps(npmDeps, depsRoot = runtimeDepsRoot(), installImpl = runNpmInstall) {
+/**
+ * 通过 npm registry 安装 yo-moss-ai-media 整包（比 CDN 单文件拉取可靠）。
+ */
+export const NPM_REGISTRIES = [
+  'https://registry.npmjs.org',
+  'https://registry.npmmirror.com',
+]
+
+export async function installMediaBundleFromNpm(
+  version,
+  cacheDir,
+  { totalBytes = 0, onProgress, installImpl } = {},
+) {
+  const staging = path.join(cacheDir, '.npm-staging')
+  fs.rmSync(staging, { recursive: true, force: true })
+  fs.mkdirSync(staging, { recursive: true })
+  fs.writeFileSync(
+    path.join(staging, 'package.json'),
+    `${JSON.stringify({
+      name: 'yo-moss-ai-media-staging',
+      private: true,
+      dependencies: { [MEDIA_PACKAGE_NAME]: version },
+    }, null, 2)}\n`,
+  )
+
+  const expected = totalBytes > 0 ? totalBytes : 56_000_000
+  let tick = 0
+  const poll = setInterval(() => {
+    tick += 1
+    const size = dirByteSize(path.join(staging, 'node_modules', MEDIA_PACKAGE_NAME))
+    if (size > 0) {
+      onProgress?.(Math.min(0.92, size / expected))
+    } else {
+      // npm 解压前 node_modules 为空，用轻量动画避免长时间 0%
+      onProgress?.(0.02 + (tick % 6) * 0.012)
+    }
+  }, 350)
+
+  let lastError
+  try {
+    for (const registry of NPM_REGISTRIES) {
+      try {
+        const installer = installImpl || ((cwd) => runNpmInstall(cwd, ['--registry', registry]))
+        await installer(staging)
+        lastError = null
+        break
+      } catch (err) {
+        lastError = err
+        fs.rmSync(path.join(staging, 'node_modules'), { recursive: true, force: true })
+      }
+    }
+    if (lastError) {
+      throw new Error(`运行资源自动安装失败（${MEDIA_PACKAGE_NAME}@${version}），请检查网络后重试 npx yo-moss-ai`)
+    }
+  } finally {
+    clearInterval(poll)
+  }
+
+  const pkgRoot = path.join(staging, 'node_modules', MEDIA_PACKAGE_NAME)
+  if (!fs.existsSync(pkgRoot)) {
+    throw new Error(`运行资源自动安装失败（${MEDIA_PACKAGE_NAME}@${version}），请检查网络后重试 npx yo-moss-ai`)
+  }
+
+  onProgress?.(0.95)
+  for (const dir of ['models', 'textures', 'stl']) {
+    const from = path.join(pkgRoot, dir)
+    if (!fs.existsSync(from)) continue
+    copyTree(from, path.join(cacheDir, dir))
+  }
+  fs.rmSync(staging, { recursive: true, force: true })
+  onProgress?.(1)
+}
+
+export async function ensureRuntimeNpmDeps(
+  npmDeps,
+  depsRoot = runtimeDepsRoot(),
+  { installImpl = runNpmInstall, onProgress } = {},
+) {
   fs.mkdirSync(depsRoot, { recursive: true })
   const pkgPath = path.join(depsRoot, 'package.json')
   const deps = Object.fromEntries(npmDeps.map((item) => [item.name, item.version]))
@@ -128,7 +247,21 @@ export async function ensureRuntimeNpmDeps(npmDeps, depsRoot = runtimeDepsRoot()
     if (fs.existsSync(nutEntry)) return
   }
 
-  await installImpl(depsRoot)
+  let tick = 0
+  const poll = onProgress
+    ? setInterval(() => {
+        tick += 1
+        const size = dirByteSize(path.join(depsRoot, 'node_modules'))
+        if (size > 0) onProgress(Math.min(0.95, size / 80_000_000))
+        else onProgress(0.02 + (tick % 6) * 0.012)
+      }, 350)
+    : null
+  try {
+    await installImpl(depsRoot)
+  } finally {
+    if (poll) clearInterval(poll)
+  }
+  onProgress?.(1)
   fs.writeFileSync(marker, nextMarker)
 }
 
@@ -164,8 +297,8 @@ export async function bootstrapRuntimeDeps(opts) {
     version,
     cacheDir = mediaCacheDir(),
     depsRoot = runtimeDepsRoot(),
-    downloadFile = followDownload,
-    installNpmDeps = (npmDeps) => ensureRuntimeNpmDeps(npmDeps, depsRoot),
+    installMediaBundle = installMediaBundleFromNpm,
+    installNpmDeps = (npmDeps, onProgress) => ensureRuntimeNpmDeps(npmDeps, depsRoot, { onProgress }),
   } = opts
 
   const distDir = path.join(root, 'dist')
@@ -195,57 +328,36 @@ export async function bootstrapRuntimeDeps(opts) {
   console.log('')
   if (needMedia) {
     const mb = (totalBytes / 1024 / 1024).toFixed(0)
-    console.log(`正在下载运行资源（约 ${mb} MB），完成后自动启动服务…`)
+    console.log(`首次运行：正在下载 UI 资源（约 ${mb} MB），完成后自动启动…`)
   } else if (needNpm) {
-    console.log('正在安装扩展依赖，完成后自动启动服务…')
+    console.log('首次运行：正在安装扩展组件，完成后自动启动…')
   }
 
   if (needMedia) {
-    let doneBytes = 0
-    renderBar('下载资源', 0)
-
-    for (const file of mediaFiles) {
-      const dest = path.join(cacheDir, file.path)
-      if (fileReady(dest, file.size)) {
-        doneBytes += file.size || 0
-        renderBar('下载资源', totalBytes ? doneBytes / totalBytes : 1)
-        continue
-      }
-
-      const fileSize = file.size || 0
-      let fileDone = 0
-      let lastError
-      for (const url of cdnUrls(mediaVersion, file.path)) {
-        try {
-          await downloadFile(url, dest, (chunkLen) => {
-            fileDone += chunkLen
-            const current = doneBytes + Math.min(fileDone, fileSize || fileDone)
-            renderBar('下载资源', totalBytes ? current / totalBytes : 1)
-          })
-          lastError = null
-          break
-        } catch (err) {
-          lastError = err
-          fileDone = 0
-        }
-      }
-      if (lastError) throw new Error(`无法下载 ${file.path}: ${lastError.message}`)
+    const reportMedia = createProgressReporter('下载资源')
+    reportMedia(0.02)
+    await installMediaBundle(mediaVersion, cacheDir, {
+      totalBytes,
+      onProgress: reportMedia,
+    })
+    if (process.stdout.isTTY) process.stdout.write('\n')
+    else console.log(formatProgressBar('下载资源', 1))
 
-      doneBytes += fileSize || fs.statSync(dest).size
-      renderBar('下载资源', totalBytes ? doneBytes / totalBytes : 1)
+    if (!mediaCacheReady(mediaFiles, cacheDir)) {
+      throw new Error('资源校验失败，请删除 ~/.moss-desktop/media 文件夹后重试')
     }
-    process.stdout.write('\n')
   }
 
   if (needNpm) {
-    renderBar('安装扩展依赖', 0)
+    const reportNpm = createProgressReporter('安装扩展依赖')
+    reportNpm(0.02)
     try {
-      await installNpmDeps(npmDeps)
-      renderBar('安装扩展依赖', 1)
-      process.stdout.write('\n')
+      await installNpmDeps(npmDeps, reportNpm)
+      if (process.stdout.isTTY) process.stdout.write('\n')
+      else console.log(formatProgressBar('安装扩展依赖', 1))
     } catch (err) {
-      process.stdout.write('\n')
-      console.warn('扩展依赖安装失败，快捷键/媒体键可能不可用：', err.message)
+      if (process.stdout.isTTY) process.stdout.write('\n')
+      console.warn('扩展组件安装失败，快捷键/媒体键可能不可用：', err.message)
     }
   }
 

package/bin/runtime-manifest.json

@@ -1,5 +1,5 @@
 {
-  "mediaVersion": "0.0.11",
+  "mediaVersion": "0.0.13",
   "mediaFiles": [
     {
       "path": "models/mediapipe/blaze_face_full_range.tflite",

package/bin/yo-moss-ai.mjs

@@ -28,11 +28,13 @@ if (!fs.existsSync(server)) {
 }
 
 console.log(`yo-moss-ai${pkgVersion ? ` v${pkgVersion}` : ''}`)
+if (typeof process.stdout.write === 'function') process.stdout.write('')
 
 try {
   await bootstrapRuntimeDeps({ root, version: pkg.version })
 } catch (err) {
-  console.error('\n运行资源准备失败：', err?.message || err)
+  console.error('\n启动准备失败：', err?.message || err)
+  console.error('请检查网络连接后重新运行：npx yo-moss-ai')
   process.exit(1)
 }