@revideo/cli 0.3.3-alpha.979 → 0.3.3

package/dist/index.js

@@ -9,7 +9,7 @@ const program = new commander_1.Command();
 program
     .name('revideo')
     .description('CLI to interact with the revideo service')
-    .version('0.2.13');
+    .version('0.3.3');
 program
     .command('serve')
     .description('UNSTABLE (still WIP): Start the revideo server in development mode. Watches for changes ' +
@@ -19,17 +19,12 @@ program
     .option('--watchDir <path>', 'Directory to watch for changes', 'src')
     .action(async (options) => {
     (0, telemetry_1.sendEvent)(telemetry_1.EventName.CLICommand);
-    if (!options.projectFile) {
-        console.error('Error: --projectFile option must be specified.');
-        process.exit(1);
-    }
-    await (0, player_1.buildProject)().catch(() => {
-        console.error('Error building project');
-        process.exit(1);
-    });
     const { projectFile, port } = options;
     process.env.PROJECT_FILE = projectFile;
     process.env.REVIDEO_PORT = port;
+    await (0, player_1.buildProject)().catch(() => {
+        process.exit(1);
+    });
     (0, index_1.createServer)(options.watchDir).listen(port, () => {
         console.log(`Server listening on port ${port}`);
         console.log();

package/dist/server/index.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServer = void 0;
+const cors_1 = __importDefault(require("cors"));
 const express_1 = __importDefault(require("express"));
 const download_1 = require("./download");
 const player_1 = require("./player");
@@ -11,9 +12,10 @@ const render_1 = require("./render");
 function createServer(hotReloadDir) {
     const app = (0, express_1.default)();
     app.use(express_1.default.json());
+    app.use((0, cors_1.default)());
     app.post('/render', render_1.render);
     app.get('/download/:projectName', download_1.download);
-    app.use('/player/project.js', player_1.player);
+    app.get('/player/:file', player_1.player);
     if (hotReloadDir) {
         (0, player_1.createHotReloader)(hotReloadDir);
     }

package/dist/server/player.js

@@ -1,9 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.player = exports.createHotReloader = exports.buildProject = void 0;
-const child_process_1 = require("child_process");
 const chokidar_1 = require("chokidar");
 const fs_1 = require("fs");
+const path = __importStar(require("path"));
+const vite_1 = require("vite");
 const YELLOW_DOT = '\u001b[33m•\u001b[0m';
 const GREEN_CHECK = '\u001b[32m✔\u001b[0m';
 const RED_CROSS = '\u001b[31m✘\u001b[0m';
@@ -11,20 +35,27 @@ const fileNotFoundMessage = (filePath) => `${YELLOW_DOT} File ${filePath} not fo
 const fileNotFoundAfterBuildingMessage = (filePath, padding) => `\r${RED_CROSS} File ${filePath} still not found after building project...`.padEnd(padding, ' ') + '\n';
 const fileChangedMessage = (filePath) => `${YELLOW_DOT} File ${filePath} has changed. Rebuilding...`;
 const successMessage = (time, padding) => `\r${GREEN_CHECK} Project built successfully. ${time}ms`.padEnd(padding, ' ') + '\n';
-/**
- * Runs `npm run build`.
- */
 async function buildProject() {
-    const buildProcess = (0, child_process_1.spawn)('npm', ['run', 'build']);
-    return new Promise((resolve, reject) => {
-        buildProcess.on('close', code => {
-            if (code === 0) {
-                resolve();
-                return;
-            }
-            reject();
+    try {
+        await (0, vite_1.build)({
+            configFile: path.join(process.cwd(), process.env.PROJECT_FILE || ''),
+            publicDir: false,
+            build: {
+                outDir: 'dist',
+                rollupOptions: {
+                    output: {
+                        entryFileNames: '[name].js',
+                        chunkFileNames: '[name].js',
+                        assetFileNames: '[name].[ext]',
+                    },
+                },
+            },
         });
-    });
+    }
+    catch (error) {
+        console.error('Error building project:', error);
+        throw error;
+    }
 }
 exports.buildProject = buildProject;
 /**
@@ -32,7 +63,9 @@ exports.buildProject = buildProject;
  * @param dir - Directory to watch for changes.
  */
 async function createHotReloader(dir) {
-    const watcher = (0, chokidar_1.watch)(dir);
+    const watcher = (0, chokidar_1.watch)(dir, {
+        ignored: ['**/*.meta'],
+    });
     watcher.on('change', async (path) => {
         const rebuildingMessage = fileChangedMessage(path);
         process.stdout.write(rebuildingMessage);
@@ -48,20 +81,22 @@ async function createHotReloader(dir) {
     });
 }
 exports.createHotReloader = createHotReloader;
-async function player(_, res) {
-    const path = './dist/project.js';
+async function player(req, res) {
+    const path = `./dist/${req.params.file}`;
     let buildTime = undefined;
     let error = false;
     // Check if the file exists and build the project if it doesn't.
     await fs_1.promises.access(path).catch(async () => {
         buildTime = Date.now();
         process.stdout.write(fileNotFoundMessage(path));
-        await buildProject();
+        await buildProject().catch(() => {
+            res.status(500).send('Error building project');
+        });
     });
     // If the file still doesn't exist, send an error response.
     await fs_1.promises.access(path).catch(() => {
         process.stdout.write(fileNotFoundAfterBuildingMessage(path, fileNotFoundMessage(path).length + 1));
-        res.status(500).send('Error building project');
+        res.status(404).send(`File ${path} not found`);
         error = true;
     });
     if (error) {
@@ -71,6 +106,6 @@ async function player(_, res) {
     if (buildTime) {
         process.stdout.write(successMessage(Date.now() - buildTime, fileNotFoundMessage(path).length + 1));
     }
-    return res.sendFile('./dist/project.js', { root: './' });
+    return res.sendFile(path, { root: './' });
 }
 exports.player = player;

package/dist/server/render.js

@@ -10,21 +10,28 @@ const path_1 = __importDefault(require("path"));
 const uuid_1 = require("uuid");
 const utils_1 = require("../utils");
 async function render(req, res) {
-    const { variables, callbackUrl } = req.body;
-    if (!callbackUrl) {
-        return res.status(400).send('Callback URL is required.');
+    const { callbackUrl } = req.body;
+    if (callbackUrl) {
+        await renderWithCallback(req, res);
     }
-    const jobId = (0, uuid_1.v4)();
-    res.json({ jobId });
+    else {
+        await renderWithoutCallback(req, res);
+    }
+}
+exports.render = render;
+async function renderWithCallback(req, res) {
+    const { variables, callbackUrl, settings } = req.body;
+    const tempProjectName = (0, uuid_1.v4)();
+    res.json({ tempProjectName });
     try {
-        const tempProjectName = (0, uuid_1.v4)();
         await (0, renderer_1.renderVideo)(process.env.PROJECT_FILE || '', variables, () => { }, {
+            ...settings,
             name: tempProjectName,
         });
         const resultFilePath = path_1.default.join(process.cwd(), `output/${tempProjectName}.mp4`);
         const downloadLink = `${req.protocol}://${req.get('host')}/download/${tempProjectName}.mp4`;
         const response = await axios_1.default.post(callbackUrl, {
-            jobId,
+            tempProjectName,
             status: 'success',
             downloadLink,
         }, {
@@ -41,7 +48,7 @@ async function render(req, res) {
     catch (error) {
         console.error(error);
         await axios_1.default.post(callbackUrl, {
-            jobId,
+            tempProjectName,
             status: 'error',
             error: error.message,
         }, {
@@ -52,4 +59,59 @@ async function render(req, res) {
         });
     }
 }
-exports.render = render;
+async function renderWithoutCallback(req, res) {
+    const { variables, streamProgress, settings } = req.body;
+    const tempProjectName = (0, uuid_1.v4)();
+    const resultFilePath = path_1.default.join(process.cwd(), `output/${tempProjectName}.mp4`);
+    if (streamProgress) {
+        res.writeHead(200, {
+            // eslint-disable-next-line
+            'Content-Type': 'text/event-stream',
+            // eslint-disable-next-line
+            'Cache-Control': 'no-cache',
+            // eslint-disable-next-line
+            Connection: 'keep-alive',
+        });
+        const sendProgress = (worker, progress) => {
+            res.write(`event: progress\n`);
+            res.write(`data: ${JSON.stringify({ worker, progress })}\n\n`);
+        };
+        try {
+            await (0, renderer_1.renderVideo)(process.env.PROJECT_FILE || '', variables, sendProgress, {
+                ...settings,
+                name: tempProjectName,
+            });
+            const downloadLink = `${req.protocol}://${req.get('host')}/download/${tempProjectName}.mp4`;
+            res.write(`event: completed\n`);
+            res.write(`data: ${JSON.stringify({ status: 'success', downloadLink })}\n\n`);
+            res.end();
+            (0, utils_1.scheduleCleanup)(resultFilePath);
+        }
+        catch (error) {
+            console.error(error);
+            res.write(`event: error\n`);
+            res.write(`data: ${JSON.stringify({ status: 'error', message: error.message })}\n\n`);
+            res.end();
+        }
+    }
+    else {
+        try {
+            await (0, renderer_1.renderVideo)(process.env.PROJECT_FILE || '', variables, () => { }, {
+                name: tempProjectName,
+            });
+            const downloadLink = `${req.protocol}://${req.get('host')}/download/${tempProjectName}.mp4`;
+            res.json({
+                status: 'success',
+                downloadLink: downloadLink,
+            });
+            (0, utils_1.scheduleCleanup)(resultFilePath);
+        }
+        catch (error) {
+            console.error(error);
+            res.status(500).json({
+                status: 'error',
+                message: error.message,
+            });
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revideo/cli",
-  "version": "0.3.3-alpha.979+34e5f45a",
+  "version": "0.3.3",
   "description": "A CLI for revideo",
   "main": "dist/index.js",
   "author": "revideo",
@@ -20,15 +20,18 @@
     "types"
   ],
   "devDependencies": {
+    "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@revideo/renderer": "^0.3.3-alpha.979+34e5f45a",
-    "@revideo/telemetry": "^0.3.3-alpha.979+34e5f45a",
+    "@revideo/renderer": "0.3.3",
+    "@revideo/telemetry": "0.3.3",
+    "chokidar": "^3.5.3",
     "commander": "^12.0.0",
+    "cors": "^2.8.5",
     "express": "^4.19.2",
     "uuid": "^9.0.1"
   },
-  "gitHead": "34e5f45a09b495ee9bb6045effaa658e6195a522"
+  "gitHead": "25ca91f5fb514ee0ce08277b5d8dd51c0712274f"
 }