@revideo/cli 0.3.7-alpha.975 → 0.3.7-beta.987

package/dist/index.js

@@ -14,7 +14,7 @@ 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('--projectFile <path>', 'Path to the project file', './src/project.ts')
     .option('--port <number>', 'Port on which to start the server', '4000')
     .option('--watchDir <path>', 'Directory to watch for changes', 'src')
     .action(async (options) => {

package/dist/server/download.js

@@ -1,26 +1,30 @@
-"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/player.js

@@ -1,61 +1,91 @@
-"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) {
+'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);
+    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 });
+  };
+Object.defineProperty(exports, '__esModule', {value: true});
 exports.player = exports.createHotReloader = exports.buildProject = void 0;
-const chokidar_1 = require("chokidar");
-const fs_1 = require("fs");
-const path = __importStar(require("path"));
-const vite_1 = require("vite");
+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';
-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: 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;
-    }
+  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;
 /**
@@ -63,49 +93,62 @@ 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) {
-    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().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;
+  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().catch(() => {
+      res.status(500).send('Error building project');
     });
-    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

@@ -20,13 +20,18 @@ async function render(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)();
     res.json({ tempProjectName });
     try {
-        await (0, renderer_1.renderVideo)(process.env.PROJECT_FILE || '', variables, () => { }, {
-            ...settings,
-            name: tempProjectName,
+        await (0, renderer_1.renderVideo)({
+            projectFile: process.env.PROJECT_FILE || '',
+            variables,
+            settings: {
+                ...settings,
+                outFile: tempProjectName,
+            },
         });
         const resultFilePath = path_1.default.join(process.cwd(), `output/${tempProjectName}.mp4`);
         const downloadLink = `${req.protocol}://${req.get('host')}/download/${tempProjectName}.mp4`;
@@ -60,8 +65,9 @@ async function renderWithCallback(req, res) {
     }
 }
 async function renderWithoutCallback(req, res) {
+    // TODO: validate request body
     const { variables, streamProgress, settings } = req.body;
-    const tempProjectName = (0, uuid_1.v4)();
+    const tempProjectName = `${(0, uuid_1.v4)()}.mp4`;
     const resultFilePath = path_1.default.join(process.cwd(), `output/${tempProjectName}.mp4`);
     if (streamProgress) {
         res.writeHead(200, {
@@ -77,9 +83,14 @@ async function renderWithoutCallback(req, res) {
             res.write(`data: ${JSON.stringify({ worker, progress })}\n\n`);
         };
         try {
-            await (0, renderer_1.renderVideo)(process.env.PROJECT_FILE || '', variables, sendProgress, {
-                ...settings,
-                name: tempProjectName,
+            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}.mp4`;
             res.write(`event: completed\n`);
@@ -96,8 +107,13 @@ async function renderWithoutCallback(req, res) {
     }
     else {
         try {
-            await (0, renderer_1.renderVideo)(process.env.PROJECT_FILE || '', variables, () => { }, {
-                name: tempProjectName,
+            await (0, renderer_1.renderVideo)({
+                projectFile: process.env.PROJECT_FILE || '',
+                variables,
+                settings: {
+                    ...settings,
+                    outFile: tempProjectName,
+                },
             });
             const downloadLink = `${req.protocol}://${req.get('host')}/download/${tempProjectName}.mp4`;
             res.json({

package/dist/server.js

@@ -0,0 +1,109 @@
+'use strict';
+var __importDefault =
+  (this && this.__importDefault) ||
+  function (mod) {
+    return mod && mod.__esModule ? mod : {default: mod};
+  };
+Object.defineProperty(exports, '__esModule', {value: true});
+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 {variables, callbackUrl} = req.body;
+  if (!callbackUrl) {
+    return res.status(400).send('Callback URL is required.');
+  }
+  const jobId = (0, uuid_1.v4)();
+  res.json({jobId});
+  try {
+    const tempProjectName = (0, uuid_1.v4)();
+    await (0, renderer_1.renderVideo)(
+      process.env.PROJECT_FILE || '',
+      variables,
+      {
+        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,
+        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');
+    }
+    scheduleCleanup(resultFilePath);
+  } catch (error) {
+    console.error(error);
+    await axios_1.default.post(
+      callbackUrl,
+      {
+        jobId,
+        status: 'error',
+        error: error.message,
+      },
+      {
+        headers: {
+          // eslint-disable-next-line
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+  }
+});
+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,
+  );
+}

package/dist/utils.js

@@ -1,18 +1,17 @@
-"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.3.7-alpha.975+b1cc4ddb",
+  "version": "0.3.7-beta.987+48e808f",
   "description": "A CLI for revideo",
   "main": "dist/index.js",
   "author": "revideo",
@@ -25,13 +25,13 @@
     "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@revideo/renderer": "^0.3.7-alpha.975+b1cc4ddb",
-    "@revideo/telemetry": "^0.3.7-alpha.975+b1cc4ddb",
+    "@revideo/renderer": "^0.3.7-beta.987+48e808f",
+    "@revideo/telemetry": "^0.3.7-beta.987+48e808f",
     "chokidar": "^3.5.3",
     "commander": "^12.0.0",
     "cors": "^2.8.5",
     "express": "^4.19.2",
     "uuid": "^9.0.1"
   },
-  "gitHead": "b1cc4ddb81c3fd2fe5b878fec66f74a24c616456"
+  "gitHead": "48e808fd7b34bb02659214d502b2b7765076a76b"
 }