@shun-js/remotion-server 0.6.4 → 0.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/remotion-server",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "remotion.cool server",
   "license": "MIT",
   "author": "uikoo9 <uikoo9@qq.com>",
@@ -23,7 +23,6 @@
     "@shun-js/shun-config": "^0.3.1",
     "@shun-js/shun-service": "^0.3.1",
     "@supabase/supabase-js": "^2.93.3",
-    "qiao-file": "^5.0.6",
     "qiao-log": "^5.1.9",
     "qiao-timer": "^5.8.4",
     "qiao-z": "^5.8.9"
@@ -32,5 +31,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "260326ec9d0cb743db2fb84bb240828ee4caab84"
+  "gitHead": "326e09eaf91c306ba1fc1cc128659fdfeeb14d0d"
 }

package/server/service/RemotionService.js

@@ -20,7 +20,6 @@ exports.genVideo = async () => {
 
   // rows
   const rows = await fetchPendingWorks();
-  logger.info(methodName, 'rows', rows);
   if (!rows || !rows.length) return;
 
   // work

package/server/util/feishu.js

@@ -11,67 +11,15 @@ exports.feishuMsg = (msg) => {
   feishuBot({
     url: global.QZ_CONFIG.feishu.url,
     feishuUrl: global.QZ_CONFIG.feishu.feishuUrl,
-    feishuMsg: msg,
+    feishuMsg: `【通知】${msg}`,
   });
 };
 
-// is bot
-function isBot(req) {
-  const ua = req.useragent;
-  const hasOSName = ua && ua.os && ua.os.name;
-  const isGoogleBot = ua && ua.browser && ua.browser.name === 'Googlebot';
-  const isMetaBot = ua && ua.browser && ua.browser.name === 'meta-externalagent';
-  const isSafariBot = ua && ua.engine && ua.engine.name === 'WebKit' && ua.engine.version === '605.1.15';
-  return !hasOSName || isGoogleBot || isMetaBot || isSafariBot;
-}
-
 /**
  * errorFeishuMsg
- * @param {*} req
  * @param {*} msg
  * @returns
  */
-exports.errorFeishuMsg = (req, msg) => {
-  // check
-  if (isBot(req)) return;
-
-  // msg
-  const uaJson = JSON.stringify(req.useragent || {});
-  exports.feishuMsg(`【通知】服务异常，${msg}，请查看日志，ua：${uaJson}`);
-};
-
-/**
- * chatFeishuMsg
- * @param {*} req
- * @returns
- */
-exports.chatFeishuMsg = (req) => {
-  // check
-  if (isBot(req)) return;
-
-  // msg
-  const uaJson = JSON.stringify(req.useragent || {});
-  const userid = req.headers.userid;
-  const prompt = decodeURIComponent(req.body.userPrompt);
-
-  const msg = `【通知】/chat被访问\nuserid:${userid}\nua:\n${uaJson}\nprompt:\n${prompt}`;
-  exports.feishuMsg(msg);
-};
-
-/**
- * chatResFeishuMsg
- * @param {*} req
- * @returns
- */
-exports.chatResFeishuMsg = (req, chatRes) => {
-  // check
-  if (isBot(req)) return;
-
-  // msg
-  const uaJson = JSON.stringify(req.useragent || {});
-  const userid = req.headers.userid;
-  const prompt = decodeURIComponent(req.body.userPrompt);
-
-  const msg = `【通知】/chat生成成功\nuserid:${userid}\nua:\n${uaJson}\nprompt:\n${prompt}\nres:${chatRes}`;
-  exports.feishuMsg(msg);
+exports.errorFeishuMsg = (msg) => {
+  exports.feishuMsg(`【通知】服务异常，${msg}，请查看日志。`);
 };

package/server/util/renderer.js

@@ -11,6 +11,51 @@ const Logger = require('qiao-log');
 const logOptions = require('../log-options.js')();
 const logger = Logger(logOptions);
 
+// 浏览器配置 - 使用固定的全局路径，避免每次重新下载
+const BROWSER_EXECUTABLE_PATH = path.join(
+  '/home/ubuntu/remotions/browser',
+  'chrome-headless-shell',
+  'linux-arm64',
+  'chrome-headless-shell-linux-arm64',
+  'headless_shell',
+);
+
+/**
+ * 初始化浏览器 - 如果全局浏览器不存在，从 node_modules 复制
+ */
+function ensureBrowserExists() {
+  const methodName = 'ensureBrowserExists';
+
+  // 如果全局浏览器已存在，直接返回
+  if (fs.existsSync(BROWSER_EXECUTABLE_PATH)) {
+    logger.info(methodName, 'Browser already exists at:', BROWSER_EXECUTABLE_PATH);
+    return;
+  }
+
+  logger.info(methodName, 'Global browser not found, attempting to copy from node_modules...');
+
+  // 查找 node_modules 中的浏览器
+  const nodeModulesBrowserPath = path.join(__dirname, '..', '..', 'node_modules', '.remotion', 'chrome-headless-shell');
+
+  if (fs.existsSync(nodeModulesBrowserPath)) {
+    // 创建目标目录
+    const globalBrowserDir = path.join('/home/ubuntu/remotions/browser');
+    fs.mkdirSync(globalBrowserDir, { recursive: true });
+
+    // 复制浏览器文件
+    logger.info(methodName, 'Copying browser from:', nodeModulesBrowserPath);
+    logger.info(methodName, 'Copying browser to:', globalBrowserDir);
+
+    fs.cpSync(nodeModulesBrowserPath, path.join(globalBrowserDir, 'chrome-headless-shell'), {
+      recursive: true,
+    });
+
+    logger.info(methodName, 'Browser copied successfully to:', BROWSER_EXECUTABLE_PATH);
+  } else {
+    logger.warn(methodName, 'Browser not found in node_modules, will download on first use');
+  }
+}
+
 /**
  * 渲染 Remotion 视频
  * @param {Object} options
@@ -24,10 +69,13 @@ exports.renderVideo = async ({ sourceCode, outputPath, width, height, fps }) =>
   const methodName = 'renderVideo';
 
   // const
-  const tempDir = path.join(__dirname, 'temp', Date.now().toString());
+  const tempDir = path.join('/tmp', 'remotion-render', Date.now().toString());
   const entryPoint = path.join(tempDir, 'src', 'Root.jsx');
 
   try {
+    // 0. 确保浏览器存在（首次运行时自动复制到全局目录）
+    ensureBrowserExists();
+
     // 1. 创建临时项目结构
     fs.mkdirSync(path.join(tempDir, 'src'), { recursive: true });
 
@@ -41,27 +89,37 @@ exports.renderVideo = async ({ sourceCode, outputPath, width, height, fps }) =>
       version: '1.0.0',
       dependencies: {
         react: '^18.2.0',
+        'react-dom': '^18.2.0',
         remotion: '^4.0.0',
       },
     };
     fs.writeFileSync(path.join(tempDir, 'package.json'), JSON.stringify(packageJson, null, 2));
 
-    // 4. Bundle 代码
+    // 4. 创建 remotion.config.js (可选但推荐)
+    const remotionConfig = `
+module.exports = {
+  // Remotion 配置
+};
+`;
+    fs.writeFileSync(path.join(tempDir, 'remotion.config.js'), remotionConfig);
+
+    // 5. Bundle 代码
     logger.info(methodName, 'Bundling code...');
     const bundleLocation = await bundle({
       entryPoint,
       webpackOverride: (config) => config,
     });
 
-    // 5. 获取 composition
+    // 6. 获取 composition
     logger.info(methodName, 'Getting composition...');
     const composition = await selectComposition({
       serveUrl: bundleLocation,
       id: 'MyComposition', // 默认 composition ID
       inputProps: {},
+      browserExecutable: fs.existsSync(BROWSER_EXECUTABLE_PATH) ? BROWSER_EXECUTABLE_PATH : undefined,
     });
 
-    // 6. 渲染视频
+    // 7. 渲染视频
     logger.info(methodName, 'Rendering frames...');
     await renderMedia({
       composition: {
@@ -75,6 +133,7 @@ exports.renderVideo = async ({ sourceCode, outputPath, width, height, fps }) =>
       codec: 'h264',
       outputLocation: outputPath,
       inputProps: {},
+      browserExecutable: fs.existsSync(BROWSER_EXECUTABLE_PATH) ? BROWSER_EXECUTABLE_PATH : undefined,
       onProgress: ({ progress }) => {
         if (progress % 0.1 < 0.01) {
           // 每10%打印一次
@@ -98,13 +157,13 @@ exports.renderVideo = async ({ sourceCode, outputPath, width, height, fps }) =>
 function wrapUserCode(sourceCode) {
   return `
 import React from 'react';
-import { Composition, AbsoluteFill, useCurrentFrame, interpolate, useVideoConfig } from 'remotion';
+import { Composition, registerRoot, AbsoluteFill, useCurrentFrame, interpolate, useVideoConfig } from 'remotion';
 
 // 用户代码
 ${sourceCode}
 
 // Root 组件 - Remotion 入口
-export const RemotionRoot = () => {
+const RemotionRoot = () => {
   return (
     <>
       <Composition
@@ -118,5 +177,8 @@ export const RemotionRoot = () => {
     </>
   );
 };
+
+// 注册 Root 组件（Remotion 4.x 要求）
+registerRoot(RemotionRoot);
 `;
 }

package/server/util/work.js

@@ -11,6 +11,9 @@ const { uploadToR2 } = require('./uploader.js');
 // model
 const { updateRenderStatus } = require('../model/RemotionModel.js');
 
+// feishu
+const { feishuMsg, errorFeishuMsg } = require('../util/feishu.js');
+
 // logger
 const Logger = require('qiao-log');
 const logOptions = require('../log-options.js')();
@@ -26,6 +29,7 @@ exports.processWork = async (work) => {
   // const
   const workId = work.id;
   const outputPath = path.join(global.QZ_CONFIG.OUTPUT_DIR, `${workId}.mp4`);
+  feishuMsg(`${workId} start`);
   logger.info(methodName, `\n[${new Date().toISOString()}] Processing work: ${workId}`);
   logger.info(methodName, `Title: ${work.title}`);
   logger.info(methodName, `Status: ${work.status}, Render Status: ${work.render_status}`);
@@ -40,7 +44,7 @@ exports.processWork = async (work) => {
       height: work.height || 1080,
       fps: work.fps || 30,
     });
-
+    feishuMsg(`${workId} render ok`);
     logger.info(methodName, 'Video rendered successfully');
 
     // 2. 上传到 R2
@@ -49,7 +53,7 @@ exports.processWork = async (work) => {
       filePath: outputPath,
       workId: workId,
     });
-
+    feishuMsg(`${workId} upload ok, ${videoUrl}`);
     logger.info(methodName, 'Video uploaded:', videoUrl);
 
     // 3. 获取视频信息
@@ -63,13 +67,15 @@ exports.processWork = async (work) => {
       duration_in_frames: durationInFrames,
       duration_seconds: durationInFrames / (work.fps || 30),
     });
-
+    feishuMsg(`${workId} db ok`);
     logger.info(methodName, `✅ Work ${workId} completed successfully`);
     logger.info(methodName, `   Status: ${work.status}, Render Status: completed`);
 
     // 5. 清理本地文件
     fs.unlinkSync(outputPath);
+    feishuMsg(`${workId} clear ok`);
   } catch (error) {
+    errorFeishuMsg(`${workId} \n ${error}`);
     logger.error(methodName, `❌ Error processing work ${workId}:`, error);
 
     // 更新为渲染失败状态