@revideo/cli 0.2.14-alpha.933 → 0.2.14-alpha.937

package/dist/index.js

@@ -1,28 +1,38 @@
 #!/usr/bin/env node
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
+const telemetry_1 = require("@revideo/telemetry");
 const commander_1 = require("commander");
-const path_1 = __importDefault(require("path"));
-const Program = new commander_1.Command();
-Program.name('revideo')
+const index_1 = require("./server/index");
+const player_1 = require("./server/player");
+const program = new commander_1.Command();
+program
+    .name('revideo')
     .description('CLI to interact with the revideo service')
-    .version('1.0.0');
-Program.command('serve')
-    .description('Start the revideo server')
-    .option('--projectFile <path>', 'Path to the project file')
+    .version('0.2.13');
+program
+    .command('serve')
+    .description('UNSTABLE (still WIP): Start the revideo server in development mode. Watches for changes ' +
+    'in the project directory and re-builds the player on each change.')
+    .option('--projectFile <path>', 'Path to the project file', './vite.config.ts')
     .option('--port <number>', 'Port on which to start the server', '4000')
-    .action(options => {
+    .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;
-    (0, child_process_1.execSync)(`node ${path_1.default.join(__dirname, './server.js')}`, { stdio: 'inherit' });
+    (0, index_1.createServer)(options.watchDir).listen(port, () => {
+        console.log(`Server listening on port ${port}`);
+        console.log();
+    });
 });
-Program.parse(process.argv);
+program.parse(process.argv);

package/dist/server/download.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.download = void 0;
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+async function download(req, res) {
+    const { projectName } = req.params;
+    const resultFilePath = path_1.default.join(process.cwd(), `output/${projectName}`);
+    try {
+        await fs_1.promises.access(resultFilePath);
+        res.download(resultFilePath, `${projectName}`, async (err) => {
+            if (err) {
+                console.error(err);
+                res.status(500).send('Error downloading the file.');
+            }
+        });
+    }
+    catch (error) {
+        console.error(`File not found ${resultFilePath}:`, error);
+        res.status(404).send('File not found.');
+    }
+}
+exports.download = download;

package/dist/server/index.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createServer = void 0;
+const express_1 = __importDefault(require("express"));
+const download_1 = require("./download");
+const player_1 = require("./player");
+const render_1 = require("./render");
+function createServer(hotReloadDir) {
+    const app = (0, express_1.default)();
+    app.use(express_1.default.json());
+    app.post('/render', render_1.render);
+    app.get('/download/:projectName', download_1.download);
+    app.use('/player/project.js', player_1.player);
+    if (hotReloadDir) {
+        (0, player_1.createHotReloader)(hotReloadDir);
+    }
+    return app;
+}
+exports.createServer = createServer;

package/dist/server/player.js

@@ -0,0 +1,76 @@
+"use strict";
+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 YELLOW_DOT = '\u001b[33m•\u001b[0m';
+const GREEN_CHECK = '\u001b[32m✔\u001b[0m';
+const RED_CROSS = '\u001b[31m✘\u001b[0m';
+const fileNotFoundMessage = (filePath) => `${YELLOW_DOT} File ${filePath} not found. Building project...`;
+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();
+        });
+    });
+}
+exports.buildProject = buildProject;
+/**
+ * Watches the given directory for changes and rebuilds the project on each change.
+ * @param dir - Directory to watch for changes.
+ */
+async function createHotReloader(dir) {
+    const watcher = (0, chokidar_1.watch)(dir);
+    watcher.on('change', async (path) => {
+        const rebuildingMessage = fileChangedMessage(path);
+        process.stdout.write(rebuildingMessage);
+        const start = Date.now();
+        try {
+            await buildProject();
+            process.stdout.write(successMessage(Date.now() - start, rebuildingMessage.length + 1));
+        }
+        catch (e) {
+            // TODO: Add more detailed error message
+            console.error('Error building project. Try to run `npm run build` manually and check for errors.');
+        }
+    });
+}
+exports.createHotReloader = createHotReloader;
+async function player(_, res) {
+    const path = './dist/project.js';
+    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();
+    });
+    // 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');
+        error = true;
+    });
+    if (error) {
+        return;
+    }
+    // If we built the project, update the log message.
+    if (buildTime) {
+        process.stdout.write(successMessage(Date.now() - buildTime, fileNotFoundMessage(path).length + 1));
+    }
+    return res.sendFile('./dist/project.js', { root: './' });
+}
+exports.player = player;

package/dist/{server.js → server/render.js}

@@ -3,16 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.render = void 0;
 const renderer_1 = require("@revideo/renderer");
 const axios_1 = __importDefault(require("axios"));
-const express_1 = __importDefault(require("express"));
-const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const uuid_1 = require("uuid");
-const App = (0, express_1.default)();
-const Port = process.env.REVIDEO_PORT || 3000;
-App.use(express_1.default.json());
-App.post('/render', async (req, res) => {
+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.');
@@ -21,7 +18,7 @@ App.post('/render', async (req, res) => {
     res.json({ jobId });
     try {
         const tempProjectName = (0, uuid_1.v4)();
-        await (0, renderer_1.renderVideo)(process.env.PROJECT_FILE || '', variables, {
+        await (0, renderer_1.renderVideo)(process.env.PROJECT_FILE || '', variables, () => { }, {
             name: tempProjectName,
         });
         const resultFilePath = path_1.default.join(process.cwd(), `output/${tempProjectName}.mp4`);
@@ -39,7 +36,7 @@ App.post('/render', async (req, res) => {
         if (response.status !== 200) {
             throw new Error('Callback URL responded with an error');
         }
-        scheduleCleanup(resultFilePath);
+        (0, utils_1.scheduleCleanup)(resultFilePath);
     }
     catch (error) {
         console.error(error);
@@ -54,36 +51,5 @@ App.post('/render', async (req, res) => {
             },
         });
     }
-});
-App.get('/download/:projectName', async (req, res) => {
-    const { projectName } = req.params;
-    const resultFilePath = path_1.default.join(process.cwd(), `output/${projectName}`);
-    try {
-        await fs_1.promises.access(resultFilePath);
-        res.download(resultFilePath, `${projectName}`, async (err) => {
-            if (err) {
-                console.error(err);
-                res.status(500).send('Error downloading the file.');
-            }
-        });
-    }
-    catch (error) {
-        console.error(`File not found ${resultFilePath}:`, error);
-        res.status(404).send('File not found.');
-    }
-});
-App.listen(Port, () => {
-    console.log(`Server running on port ${Port}`);
-});
-function scheduleCleanup(filePath) {
-    // wait 10 minutes before removing file
-    setTimeout(async () => {
-        try {
-            await fs_1.promises.unlink(filePath);
-            console.log(`Successfully deleted file: ${filePath}`);
-        }
-        catch (error) {
-            console.error(`Error deleting file ${filePath}: ${error}`);
-        }
-    }, 10 * 60 * 1000);
 }
+exports.render = render;

package/dist/utils.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scheduleCleanup = void 0;
+const fs_1 = require("fs");
+function scheduleCleanup(filePath) {
+    const clean = async () => {
+        try {
+            await fs_1.promises.unlink(filePath);
+            console.log(`Successfully deleted file: ${filePath}`);
+        }
+        catch (error) {
+            console.error(`Error deleting file ${filePath}: ${error}`);
+        }
+    };
+    // Wait 10 minutes before removing file.
+    setTimeout(clean, 10 * 60 * 1000);
+}
+exports.scheduleCleanup = scheduleCleanup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revideo/cli",
-  "version": "0.2.14-alpha.933+2129297",
+  "version": "0.2.14-alpha.937+a9767dd",
   "description": "A CLI for revideo",
   "main": "dist/index.js",
   "author": "revideo",
@@ -24,10 +24,11 @@
     "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@revideo/renderer": "^0.2.14-alpha.933+2129297",
+    "@revideo/renderer": "^0.2.14-alpha.937+a9767dd",
+    "@revideo/telemetry": "^0.2.14-alpha.937+a9767dd",
     "commander": "^12.0.0",
     "express": "^4.19.2",
     "uuid": "^9.0.1"
   },
-  "gitHead": "2129297c5dde033fd30431ab92d3cfffa372326d"
+  "gitHead": "a9767dda0cdc696547a1b2397a707a90a4f63a1a"
 }