yo-moss-ai 0.0.24 → 0.0.25

package/bin/bootstrap-deps.mjs

@@ -4,8 +4,11 @@ import path from 'node:path'
 import http from 'node:http'
 import https from 'node:https'
 import { spawn } from 'node:child_process'
+import { createRequire } from 'node:module'
 import { pipeline } from 'node:stream/promises'
 
+export const RUNTIME_PACKAGE_NAMES = ['express', 'cors', 'ws', 'onvif', 'qrcode', 'bonjour-service']
+
 export const PROGRESS_BAR_WIDTH = 28
 export const MEDIA_PACKAGE_NAME = 'yo-moss-ai-media'
 
@@ -128,9 +131,7 @@ export function copyTree(src, dest) {
   }
 }
 
-export const NPM_INSTALL_TIMEOUT_MS = 60_000
-
-function runNpmInstall(cwd, extraArgs = [], timeoutMs = NPM_INSTALL_TIMEOUT_MS) {
+function runNpmInstall(cwd, extraArgs = []) {
   return new Promise((resolve, reject) => {
     const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm'
     const child = spawn(
@@ -143,20 +144,10 @@ function runNpmInstall(cwd, extraArgs = [], timeoutMs = NPM_INSTALL_TIMEOUT_MS)
       },
     )
     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}`))
     })
@@ -300,6 +291,33 @@ export function mediaCacheReady(files, cacheDir = mediaCacheDir()) {
   return files.every((file) => fileReady(path.join(cacheDir, file.path), file.size))
 }
 
+/** 源码仓库（npx 会优先跑本地 bin，而不是 npm 上的已发布包） */
+export function isSourceCheckout(root) {
+  return fs.existsSync(path.join(root, 'server', 'index.mjs'))
+    && fs.existsSync(path.join(root, 'package.json'))
+}
+
+/** Node 能否从该包根解析运行时 npm 依赖（pnpm 未 hoist / node_modules 损坏时为 false） */
+export function runtimePackagesResolvable(root, names = RUNTIME_PACKAGE_NAMES) {
+  try {
+    const req = createRequire(path.join(root, 'package.json'))
+    for (const name of names) req.resolve(name)
+    return true
+  } catch {
+    return false
+  }
+}
+
+export function missingRuntimeDepsMessage(root) {
+  if (isSourceCheckout(root)) {
+    return [
+      '当前目录是源码仓库，npx 会启动本地构建，但 node_modules 里缺少 express 等运行依赖。',
+      '请先在本目录执行 pnpm install 后再运行；或换到其他目录执行 npx yo-moss-ai 使用已发布版本。',
+    ].join('\n')
+  }
+  return '运行依赖未安装完整，请重新执行 npx yo-moss-ai 让 npm 自动安装。'
+}
+
 /**
  * npx 安装精简包后，启动服务前下载媒体资源与扩展 npm 依赖。
  */
@@ -311,26 +329,24 @@ 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')
-  if (process.env.MOSS_SKIP_BOOTSTRAP === '1') {
+  if (process.env.MOSS_SKIP_BOOTSTRAP === '1' || hasBundledMedia(distDir)) {
     return { skipped: true }
   }
 
-  const bundled = hasBundledMedia(distDir)
   const manifest = loadManifest(root)
-  if (!manifest && !bundled) {
+  if (!manifest) {
     console.warn('缺少 bin/runtime-manifest.json，跳过资源预下载')
     return { skipped: true }
   }
 
-  const mediaVersion = manifest?.mediaVersion || version
-  const mediaFiles = manifest?.mediaFiles || []
-  const npmDeps = manifest?.npmDeps || []
+  const mediaVersion = manifest.mediaVersion || version
+  const mediaFiles = manifest.mediaFiles || []
+  const npmDeps = manifest.npmDeps || []
   const totalBytes = mediaFiles.reduce((sum, file) => sum + (file.size || 0), 0)
-  const needMedia = !bundled && mediaFiles.length > 0 && !mediaCacheReady(mediaFiles, cacheDir)
+  const needMedia = !mediaCacheReady(mediaFiles, cacheDir)
   const needNpm = !runtimeDepsReady(npmDeps, depsRoot)
 
   if (!needMedia && !needNpm) {
@@ -343,10 +359,8 @@ export async function bootstrapRuntimeDeps(opts) {
   if (needMedia) {
     const mb = (totalBytes / 1024 / 1024).toFixed(0)
     console.log(`首次运行：正在下载 UI 资源（约 ${mb} MB），完成后自动启动…`)
-  } else if (needNpm && !deferNpm) {
+  } else if (needNpm) {
     console.log('首次运行：正在安装扩展组件，完成后自动启动…')
-  } else if (needNpm && deferNpm) {
-    console.log('正在打开界面；快捷键组件在后台安装，不影响使用。')
   }
 
   if (needMedia) {
@@ -367,17 +381,14 @@ export async function bootstrapRuntimeDeps(opts) {
   if (needNpm) {
     const reportNpm = createProgressReporter('安装扩展依赖')
     reportNpm(0.02)
-    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
+    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)
+    }
   }
 
   process.env.MOSS_MEDIA_ROOT = cacheDir

package/bin/runtime-manifest.json

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

package/bin/yo-moss-ai.mjs

@@ -1,8 +1,15 @@
 #!/usr/bin/env node
 import fs from 'node:fs'
+import os from 'node:os'
 import path from 'node:path'
+import { spawn } from 'node:child_process'
 import { fileURLToPath, pathToFileURL } from 'node:url'
-import { bootstrapRuntimeDeps } from './bootstrap-deps.mjs'
+import {
+  bootstrapRuntimeDeps,
+  isSourceCheckout,
+  missingRuntimeDepsMessage,
+  runtimePackagesResolvable,
+} from './bootstrap-deps.mjs'
 
 const root = path.join(path.dirname(fileURLToPath(import.meta.url)), '..')
 let pkgVersion = ''
@@ -27,11 +34,26 @@ if (!fs.existsSync(server)) {
   process.exit(1)
 }
 
+if (!runtimePackagesResolvable(root)) {
+  if (isSourceCheckout(root) && process.env.MOSS_NO_SOURCE_FALLBACK !== '1') {
+    console.log(`yo-moss-ai${pkgVersion ? ` v${pkgVersion}` : ''}  本地依赖不完整，改用 npm 已发布版本…`)
+    try {
+      process.exit(await runPublishedFromTemp(pkg.version))
+    } catch (err) {
+      console.error(missingRuntimeDepsMessage(root))
+      console.error(err?.message || err)
+      process.exit(1)
+    }
+  }
+  console.error(missingRuntimeDepsMessage(root))
+  process.exit(1)
+}
+
 console.log(`yo-moss-ai${pkgVersion ? ` v${pkgVersion}` : ''}`)
 if (typeof process.stdout.write === 'function') process.stdout.write('')
 
 try {
-  await bootstrapRuntimeDeps({ root, version: pkg.version, deferNpm: true })
+  await bootstrapRuntimeDeps({ root, version: pkg.version })
 } catch (err) {
   console.error('\n启动准备失败：', err?.message || err)
   console.error('请检查网络连接后重新运行：npx yo-moss-ai')
@@ -42,4 +64,27 @@ process.env.NODE_ENV = 'production'
 process.env.MOSS_OPEN_BROWSER = process.env.MOSS_OPEN_BROWSER || '1'
 process.env.MOSS_VERSION = pkg.version
 
-await import(pathToFileURL(server).href)
+try {
+  await import(pathToFileURL(server).href)
+} catch (err) {
+  if (err?.code === 'ERR_MODULE_NOT_FOUND') {
+    console.error(missingRuntimeDepsMessage(root))
+    console.error(err.message)
+    process.exit(1)
+  }
+  throw err
+}
+
+function runPublishedFromTemp(version) {
+  return new Promise((resolve, reject) => {
+    const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx'
+    const child = spawn(npxCmd, ['--yes', `yo-moss-ai@${version}`], {
+      cwd: os.tmpdir(),
+      stdio: 'inherit',
+      shell: process.platform === 'win32',
+      env: { ...process.env, MOSS_NO_SOURCE_FALLBACK: '1' },
+    })
+    child.on('error', reject)
+    child.on('exit', (code) => resolve(code ?? 1))
+  })
+}