yo-moss-ai 0.0.22 → 0.0.24

package/bin/bootstrap-deps.mjs

@@ -128,7 +128,9 @@ export function copyTree(src, dest) {
   }
 }
 
-function runNpmInstall(cwd, extraArgs = []) {
+export const NPM_INSTALL_TIMEOUT_MS = 60_000
+
+function runNpmInstall(cwd, extraArgs = [], timeoutMs = NPM_INSTALL_TIMEOUT_MS) {
   return new Promise((resolve, reject) => {
     const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm'
     const child = spawn(
@@ -141,10 +143,20 @@ function runNpmInstall(cwd, extraArgs = []) {
       },
     )
     let errText = ''
+    let settled = false
+    const timer = setTimeout(() => {
+      if (settled) return
+      settled = true
+      child.kill()
+      reject(new Error(`npm install 超时（${Math.round(timeoutMs / 1000)}s）`))
+    }, timeoutMs)
     child.stderr.on('data', (chunk) => {
       errText += String(chunk)
     })
     child.on('exit', (code) => {
+      clearTimeout(timer)
+      if (settled) return
+      settled = true
       if (code === 0) resolve()
       else reject(new Error(errText.trim() || `npm install 失败，退出码 ${code}`))
     })
@@ -299,6 +311,7 @@ export async function bootstrapRuntimeDeps(opts) {
     depsRoot = runtimeDepsRoot(),
     installMediaBundle = installMediaBundleFromNpm,
     installNpmDeps = (npmDeps, onProgress) => ensureRuntimeNpmDeps(npmDeps, depsRoot, { onProgress }),
+    deferNpm = false,
   } = opts
 
   const distDir = path.join(root, 'dist')
@@ -330,8 +343,10 @@ export async function bootstrapRuntimeDeps(opts) {
   if (needMedia) {
     const mb = (totalBytes / 1024 / 1024).toFixed(0)
     console.log(`首次运行：正在下载 UI 资源（约 ${mb} MB），完成后自动启动…`)
-  } else if (needNpm) {
+  } else if (needNpm && !deferNpm) {
     console.log('首次运行：正在安装扩展组件，完成后自动启动…')
+  } else if (needNpm && deferNpm) {
+    console.log('正在打开界面；快捷键组件在后台安装，不影响使用。')
   }
 
   if (needMedia) {
@@ -352,14 +367,17 @@ export async function bootstrapRuntimeDeps(opts) {
   if (needNpm) {
     const reportNpm = createProgressReporter('安装扩展依赖')
     reportNpm(0.02)
-    try {
-      await installNpmDeps(npmDeps, reportNpm)
-      if (process.stdout.isTTY) process.stdout.write('\n')
-      else console.log(formatProgressBar('安装扩展依赖', 1))
-    } catch (err) {
-      if (process.stdout.isTTY) process.stdout.write('\n')
-      console.warn('扩展组件安装失败，快捷键/媒体键可能不可用：', err.message)
-    }
+    const work = Promise.resolve()
+      .then(() => installNpmDeps(npmDeps, reportNpm))
+      .then(() => {
+        if (process.stdout.isTTY) process.stdout.write('\n')
+        else console.log(formatProgressBar('安装扩展依赖', 1))
+      })
+      .catch((err) => {
+        if (process.stdout.isTTY) process.stdout.write('\n')
+        console.warn('扩展组件安装失败，快捷键/媒体键可能不可用：', err.message)
+      })
+    if (!deferNpm) await work
   }
 
   process.env.MOSS_MEDIA_ROOT = cacheDir

package/bin/runtime-manifest.json

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

package/bin/yo-moss-ai.mjs

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