@revideo/cli 0.4.7-two.1024 → 0.4.8-alpha.1032

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.4.6');
+    .version('0.4.7');
 program
     .command('serve')
     .description('UNSTABLE (still WIP): Start the revideo server in development mode. Watches for changes ' +

package/dist/server/download.js

@@ -1,30 +1,26 @@
-'use strict';
-var __importDefault =
-  (this && this.__importDefault) ||
-  function (mod) {
-    return mod && mod.__esModule ? mod : {default: mod};
-  };
-Object.defineProperty(exports, '__esModule', {value: true});
+"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'));
+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.');
-  }
+    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

@@ -1,26 +1,24 @@
-'use strict';
-var __importDefault =
-  (this && this.__importDefault) ||
-  function (mod) {
-    return mod && mod.__esModule ? mod : {default: mod};
-  };
-Object.defineProperty(exports, '__esModule', {value: true});
+"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 cors_1 = __importDefault(require('cors'));
-const express_1 = __importDefault(require('express'));
-const download_1 = require('./download');
-const player_1 = require('./player');
-const render_1 = require('./render');
+const cors_1 = __importDefault(require("cors"));
+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({limit: '50mb'}));
-  app.use((0, cors_1.default)());
-  app.post('/render', render_1.render);
-  app.get('/download/:projectName', download_1.download);
-  app.get('/player/*', player_1.player);
-  if (hotReloadDir) {
-    (0, player_1.createHotReloader)(hotReloadDir);
-  }
-  return app;
+    const app = (0, express_1.default)();
+    app.use(express_1.default.json({ limit: '50mb' }));
+    app.use((0, cors_1.default)());
+    app.post('/render', render_1.render);
+    app.get('/download/:projectName', download_1.download);
+    app.get('/player/*', player_1.player);
+    if (hotReloadDir) {
+        (0, player_1.createHotReloader)(hotReloadDir);
+    }
+    return app;
 }
 exports.createServer = createServer;

package/dist/server/player.js

@@ -1,54 +1,41 @@
-'use strict';
-var __importDefault =
-  (this && this.__importDefault) ||
-  function (mod) {
-    return mod && mod.__esModule ? mod : {default: mod};
-  };
-Object.defineProperty(exports, '__esModule', {value: true});
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.player = exports.createHotReloader = exports.buildProject = void 0;
-const vite_plugin_1 = __importDefault(require('@revideo/vite-plugin'));
-const chokidar_1 = require('chokidar');
-const fs_1 = require('fs');
-const vite_1 = require('vite');
+const vite_plugin_1 = __importDefault(require("@revideo/vite-plugin"));
+const chokidar_1 = require("chokidar");
+const fs_1 = require("fs");
+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';
-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';
+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';
 async function buildProject() {
-  try {
-    await (0, vite_1.build)({
-      configFile: false,
-      plugins: [
-        (0, vite_plugin_1.default)({project: process.env.PROJECT_FILE}),
-      ],
-      build: {
-        outDir: 'dist',
-        rollupOptions: {
-          output: {
-            entryFileNames: '[name].js',
-            chunkFileNames: '[name].js',
-            assetFileNames: '[name].[ext]',
-          },
-        },
-      },
-    });
-  } catch (error) {
-    console.error('Error building project:', error);
-    throw error;
-  }
+    try {
+        await (0, vite_1.build)({
+            configFile: false,
+            plugins: [(0, vite_plugin_1.default)({ project: process.env.PROJECT_FILE })],
+            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;
 /**
@@ -56,69 +43,56 @@ exports.buildProject = buildProject;
  * @param dir - Directory to watch for changes.
  */
 async function createHotReloader(dir) {
-  const watcher = (0, chokidar_1.watch)(dir, {
-    ignored: ['**/*.meta'],
-  });
-  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.',
-      );
-    }
-  });
+    const watcher = (0, chokidar_1.watch)(dir, {
+        ignored: ['**/*.meta'],
+    });
+    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(req, res) {
-  let path = `./dist/${req.params[0]}`;
-  if (req.params[0] === 'project.js') {
-    const playerFileName = (process.env.PROJECT_FILE ?? '')
-      .split('/')
-      .pop()
-      ?.replace('.ts', '.js');
-    path = `./dist/${playerFileName}`;
-  }
-  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().catch(() => {
-      res.status(500).send('Error building project');
+    let path = `./dist/${req.params[0]}`;
+    if (req.params[0] === 'project.js') {
+        const playerFileName = (process.env.PROJECT_FILE ?? '')
+            .split('/')
+            .pop()
+            ?.replace('.ts', '.js');
+        path = `./dist/${playerFileName}`;
+    }
+    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().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(404).send(`File ${path} not found`);
-    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(path, {root: './'});
+    // 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(404).send(`File ${path} not found`);
+        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(path, { root: './' });
 }
 exports.player = player;

package/dist/server/render.js

@@ -1,149 +1,134 @@
-'use strict';
-var __importDefault =
-  (this && this.__importDefault) ||
-  function (mod) {
-    return mod && mod.__esModule ? mod : {default: mod};
-  };
-Object.defineProperty(exports, '__esModule', {value: true});
+"use strict";
+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 path_1 = __importDefault(require('path'));
-const uuid_1 = require('uuid');
-const utils_1 = require('../utils');
+const renderer_1 = require("@revideo/renderer");
+const axios_1 = __importDefault(require("axios"));
+const path_1 = __importDefault(require("path"));
+const uuid_1 = require("uuid");
+const utils_1 = require("../utils");
 async function render(req, res) {
-  const {callbackUrl} = req.body;
-  if (callbackUrl) {
-    await renderWithCallback(req, res);
-  } else {
-    await renderWithoutCallback(req, res);
-  }
+    const { callbackUrl } = req.body;
+    if (callbackUrl) {
+        await renderWithCallback(req, res);
+    }
+    else {
+        await renderWithoutCallback(req, res);
+    }
 }
 exports.render = render;
 async function renderWithCallback(req, res) {
-  // TODO: validate request body
-  const {variables, callbackUrl, settings} = req.body;
-  const tempProjectName = (0, uuid_1.v4)();
-  const outputFileName = `${tempProjectName}.mp4`;
-  res.json({tempProjectName});
-  try {
-    await (0, renderer_1.renderVideo)({
-      projectFile: process.env.PROJECT_FILE || '',
-      variables,
-      settings: {
-        ...settings,
-        outFile: outputFileName,
-      },
-    });
-    const resultFilePath = path_1.default.join(
-      process.cwd(),
-      `output/${outputFileName}`,
-    );
-    const downloadLink = `${req.protocol}://${req.get('host')}/download/${outputFileName}`;
-    const response = await axios_1.default.post(
-      callbackUrl,
-      {
-        tempProjectName,
-        status: 'success',
-        downloadLink,
-      },
-      {
-        headers: {
-          // eslint-disable-next-line
-          'Content-Type': 'application/json',
-        },
-      },
-    );
-    if (response.status !== 200) {
-      throw new Error('Callback URL responded with an error');
+    // TODO: validate request body
+    const { variables, callbackUrl, settings } = req.body;
+    const tempProjectName = (0, uuid_1.v4)();
+    const outputFileName = `${tempProjectName}.mp4`;
+    res.json({ tempProjectName });
+    try {
+        await (0, renderer_1.renderVideo)({
+            projectFile: process.env.PROJECT_FILE || '',
+            variables,
+            settings: {
+                ...settings,
+                outFile: outputFileName,
+            },
+        });
+        const resultFilePath = path_1.default.join(process.cwd(), `output/${outputFileName}`);
+        const downloadLink = `${req.protocol}://${req.get('host')}/download/${outputFileName}`;
+        const response = await axios_1.default.post(callbackUrl, {
+            tempProjectName,
+            status: 'success',
+            downloadLink,
+        }, {
+            headers: {
+                // eslint-disable-next-line
+                'Content-Type': 'application/json',
+            },
+        });
+        if (response.status !== 200) {
+            throw new Error('Callback URL responded with an error');
+        }
+        (0, utils_1.scheduleCleanup)(resultFilePath);
+    }
+    catch (error) {
+        console.error(error);
+        await axios_1.default.post(callbackUrl, {
+            tempProjectName,
+            status: 'error',
+            error: error.message,
+        }, {
+            headers: {
+                // eslint-disable-next-line
+                'Content-Type': 'application/json',
+            },
+        });
     }
-    (0, utils_1.scheduleCleanup)(resultFilePath);
-  } catch (error) {
-    console.error(error);
-    await axios_1.default.post(
-      callbackUrl,
-      {
-        tempProjectName,
-        status: 'error',
-        error: error.message,
-      },
-      {
-        headers: {
-          // eslint-disable-next-line
-          'Content-Type': 'application/json',
-        },
-      },
-    );
-  }
 }
 async function renderWithoutCallback(req, res) {
-  // TODO: validate request body
-  const {variables, streamProgress, settings} = req.body;
-  const tempProjectName = `${(0, uuid_1.v4)()}.mp4`;
-  const resultFilePath = path_1.default.join(
-    process.cwd(),
-    `output/${tempProjectName}`,
-  );
-  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)({
-        projectFile: process.env.PROJECT_FILE || '',
-        variables,
-        settings: {
-          ...settings,
-          outFile: tempProjectName,
-          progressCallback: sendProgress,
-        },
-      });
-      const downloadLink = `${req.protocol}://${req.get('host')}/download/${tempProjectName}`;
-      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();
+    // TODO: validate request body
+    const { variables, streamProgress, settings } = req.body;
+    const tempProjectName = `${(0, uuid_1.v4)()}.mp4`;
+    const resultFilePath = path_1.default.join(process.cwd(), `output/${tempProjectName}`);
+    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)({
+                projectFile: process.env.PROJECT_FILE || '',
+                variables,
+                settings: {
+                    ...settings,
+                    outFile: tempProjectName,
+                    progressCallback: sendProgress,
+                },
+            });
+            const downloadLink = `${req.protocol}://${req.get('host')}/download/${tempProjectName}`;
+            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)({
-        projectFile: process.env.PROJECT_FILE || '',
-        variables,
-        settings: {
-          ...settings,
-          outFile: tempProjectName,
-        },
-      });
-      const downloadLink = `${req.protocol}://${req.get('host')}/download/${tempProjectName}`;
-      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,
-      });
+    else {
+        try {
+            await (0, renderer_1.renderVideo)({
+                projectFile: process.env.PROJECT_FILE || '',
+                variables,
+                settings: {
+                    ...settings,
+                    outFile: tempProjectName,
+                },
+            });
+            const downloadLink = `${req.protocol}://${req.get('host')}/download/${tempProjectName}`;
+            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/dist/utils.js

@@ -1,17 +1,18 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', {value: true});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.scheduleCleanup = void 0;
-const fs_1 = require('fs');
+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);
+    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.4.7-two.1024+6b376d6f",
+  "version": "0.4.8-alpha.1032+c87f8411",
   "description": "A CLI for revideo",
   "main": "dist/index.js",
   "author": "revideo",
@@ -25,13 +25,13 @@
     "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@revideo/renderer": "^0.4.7-two.1024+6b376d6f",
-    "@revideo/telemetry": "^0.4.7-two.1024+6b376d6f",
+    "@revideo/renderer": "^0.4.8-alpha.1032+c87f8411",
+    "@revideo/telemetry": "^0.4.8-alpha.1032+c87f8411",
     "chokidar": "^3.5.3",
     "commander": "^12.0.0",
     "cors": "^2.8.5",
     "express": "^4.19.2",
     "uuid": "^9.0.1"
   },
-  "gitHead": "6b376d6fd166f21e381296f17f0a8f89e2db83ca"
+  "gitHead": "c87f841121fcdf09215d782516482ee0090ca11a"
 }