@remotion/cli 4.0.0-lambda.1 → 4.0.0-newpathfunctions.13

package/dist/preview-server/project-info.js

@@ -6,16 +6,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectInfo = void 0;
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
-const getProjectInfo = () => {
+const getProjectInfo = (remotionRoot) => {
     var _a;
-    const pathsToLookFor = ['src/Video.tsx', 'src/Video.jsx'].map((p) => {
-        return path_1.default.join(process.cwd(), p);
+    const pathsToLookFor = [
+        'src/Root.tsx',
+        'src/Root.jsx',
+        'remotion/Root.tsx',
+        'remotion/Root.jsx',
+        'app/remotion/Root.tsx',
+        'src/Video.tsx',
+        'src/Video.jsx',
+    ].map((p) => {
+        return path_1.default.join(remotionRoot, p);
     });
     const videoFile = (_a = pathsToLookFor.find((p) => (0, fs_1.existsSync)(p))) !== null && _a !== void 0 ? _a : null;
     return Promise.resolve({
         videoFile,
         relativeVideoFile: videoFile
-            ? path_1.default.relative(process.cwd(), videoFile)
+            ? path_1.default.relative(remotionRoot, videoFile)
             : null,
     });
 };

package/dist/preview-server/public-folder.d.ts

@@ -0,0 +1,17 @@
+import type { StaticFile } from 'remotion';
+export declare const initPublicFolderWatch: ({ publicDir, onUpdate, staticHash, }: {
+    publicDir: string;
+    remotionRoot: string;
+    onUpdate: () => void;
+    staticHash: string;
+}) => void;
+export declare const fetchFolder: ({ publicDir, staticHash, }: {
+    publicDir: string;
+    staticHash: string;
+}) => void;
+export declare const watchPublicFolder: ({ publicDir, onUpdate, staticHash, }: {
+    publicDir: string;
+    onUpdate: () => void;
+    staticHash: string;
+}) => void;
+export declare const getFiles: () => StaticFile[];

package/dist/preview-server/public-folder.js

@@ -0,0 +1,56 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFiles = exports.watchPublicFolder = exports.fetchFolder = exports.initPublicFolderWatch = void 0;
+const bundler_1 = require("@remotion/bundler");
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+const env_supports_fs_recursive_1 = require("./env-supports-fs-recursive");
+let files = [];
+const initPublicFolderWatch = ({ publicDir, onUpdate, staticHash, }) => {
+    (0, exports.fetchFolder)({ publicDir, staticHash });
+    (0, exports.watchPublicFolder)({ publicDir, onUpdate, staticHash });
+};
+exports.initPublicFolderWatch = initPublicFolderWatch;
+const fetchFolder = ({ publicDir, staticHash, }) => {
+    files = bundler_1.BundlerInternals.readRecursively({
+        folder: '.',
+        startPath: publicDir,
+        staticHash,
+        limit: 1000,
+    }).map((f) => {
+        return {
+            ...f,
+            name: f.name.split(path_1.default.sep).join('/'),
+        };
+    });
+};
+exports.fetchFolder = fetchFolder;
+const watchPublicFolder = ({ publicDir, onUpdate, staticHash, }) => {
+    if (!(0, fs_1.existsSync)(publicDir)) {
+        const parentDir = path_1.default.dirname(publicDir);
+        const onDirChange = () => {
+            if ((0, fs_1.existsSync)(publicDir)) {
+                (0, exports.watchPublicFolder)({
+                    publicDir,
+                    onUpdate,
+                    staticHash,
+                });
+                watcher.close();
+            }
+        };
+        const watcher = (0, fs_1.watch)(parentDir, {}, onDirChange);
+        return;
+    }
+    (0, fs_1.watch)(publicDir, { recursive: (0, env_supports_fs_recursive_1.envSupportsFsRecursive)() }, () => {
+        (0, exports.fetchFolder)({ publicDir, staticHash });
+        onUpdate();
+    });
+};
+exports.watchPublicFolder = watchPublicFolder;
+const getFiles = () => {
+    return files;
+};
+exports.getFiles = getFiles;

package/dist/preview-server/render-queue/get-default-video-contexts.d.ts

@@ -0,0 +1,10 @@
+import type { Codec } from '@remotion/renderer';
+import type { RenderType } from '../../editor/components/RenderModal/RenderModal';
+export declare const getDefaultCodecs: ({ defaultCodec, isStill, }: {
+    defaultCodec: Codec;
+    isStill: boolean;
+}) => {
+    initialAudioCodec: Codec;
+    initialVideoCodec: Codec;
+    initialRenderType: RenderType;
+};

package/dist/preview-server/render-queue/get-default-video-contexts.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultCodecs = void 0;
+const client_1 = require("@remotion/renderer/client");
+const getDefaultCodecs = ({ defaultCodec, isStill, }) => {
+    const isAudioCodec = client_1.BrowserSafeApis.isAudioCodec(defaultCodec);
+    return {
+        initialAudioCodec: isAudioCodec ? defaultCodec : 'mp3',
+        initialVideoCodec: isAudioCodec ? 'h264' : defaultCodec,
+        initialRenderType: isStill ? 'still' : isAudioCodec ? 'audio' : 'video',
+    };
+};
+exports.getDefaultCodecs = getDefaultCodecs;

package/dist/preview-server/render-queue/job.d.ts

@@ -0,0 +1,86 @@
+import type { Codec, makeCancelSignal, StillImageFormat } from '@remotion/renderer';
+declare type RenderJobDynamicStatus = {
+    status: 'done';
+} | {
+    status: 'running';
+    progress: number;
+    message: string;
+} | {
+    status: 'idle';
+} | {
+    status: 'failed';
+    error: {
+        message: string;
+        stack: string | undefined;
+    };
+};
+export declare type JobProgressCallback = (options: {
+    progress: number;
+    message: string;
+}) => void;
+declare type RenderJobDynamicFields = {
+    type: 'still';
+    imageFormat: StillImageFormat;
+    quality: number | null;
+    frame: number;
+    scale: number;
+} | {
+    type: 'video';
+    imageFormat: StillImageFormat;
+    quality: number | null;
+    scale: number;
+    codec: Codec;
+};
+export declare type RenderJob = {
+    startedAt: number;
+    compositionId: string;
+    id: string;
+    outName: string;
+    deletedOutputLocation: boolean;
+    verbose: boolean;
+    cancelToken: ReturnType<typeof makeCancelSignal>;
+} & RenderJobDynamicStatus & RenderJobDynamicFields;
+export declare type RenderJobWithCleanup = RenderJob & {
+    cleanup: (() => void)[];
+};
+declare type AddRenderRequestDynamicFields = {
+    type: 'still';
+    imageFormat: StillImageFormat;
+    quality: number | null;
+    frame: number;
+    scale: number;
+    verbose: boolean;
+} | {
+    type: 'video';
+    codec: Codec;
+    imageFormat: StillImageFormat;
+    quality: number | null;
+    scale: number;
+    verbose: boolean;
+};
+export declare type CancelRenderRequest = {
+    jobId: string;
+};
+export declare type CancelRenderResponse = {};
+export declare type AddRenderRequest = {
+    compositionId: string;
+    outName: string;
+} & AddRenderRequestDynamicFields;
+export declare type RemoveRenderRequest = {
+    jobId: string;
+};
+export declare type OpenInFileExplorerRequest = {
+    directory: string;
+};
+export declare type SubscribeToFileExistenceRequest = {
+    file: string;
+    clientId: string;
+};
+export declare type SubscribeToFileExistenceResponse = {
+    exists: boolean;
+};
+export declare type UnsubscribeFromFileExistenceRequest = {
+    file: string;
+    clientId: string;
+};
+export {};

package/dist/preview-server/render-queue/job.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/preview-server/render-queue/make-retry-payload.d.ts

@@ -0,0 +1,3 @@
+import type { RenderModalState } from '../../editor/state/modals';
+import type { RenderJob } from './job';
+export declare const makeRetryPayload: (job: RenderJob) => RenderModalState;

package/dist/preview-server/render-queue/make-retry-payload.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeRetryPayload = void 0;
+const makeRetryPayload = (job) => {
+    if (job.type === 'still') {
+        return {
+            type: 'render',
+            compositionId: job.compositionId,
+            initialFrame: job.frame,
+            initialImageFormat: job.imageFormat,
+            initialQuality: job.quality,
+            initialOutName: job.outName,
+            initialScale: job.scale,
+            initialVerbose: job.verbose,
+            initialRenderType: 'still',
+            // TODO: take initial codec from config file
+            initialCodec: 'h264',
+        };
+    }
+    if (job.type === 'video') {
+        // TODO: Implement correct retry mechanism for video
+        return {
+            type: 'render',
+            compositionId: job.compositionId,
+            initialImageFormat: job.imageFormat,
+            initialQuality: job.quality,
+            initialOutName: job.outName,
+            initialScale: job.scale,
+            initialVerbose: job.verbose,
+            initialFrame: 0,
+            initialRenderType: 'video',
+            initialCodec: job.codec,
+        };
+    }
+    throw new Error(`Job ${JSON.stringify(job)} Not implemented`);
+};
+exports.makeRetryPayload = makeRetryPayload;

package/dist/preview-server/render-queue/open-directory-in-finder.d.ts

@@ -0,0 +1 @@
+export declare const openDirectoryInFinder: (dirToOpen: string) => Promise<void>;

package/dist/preview-server/render-queue/open-directory-in-finder.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.openDirectoryInFinder = void 0;
+const child_process_1 = require("child_process");
+const os_1 = require("os");
+const truthy_1 = require("../../truthy");
+const openDirectoryInFinder = (dirToOpen) => {
+    const command = (0, os_1.platform)() === 'darwin'
+        ? 'open'
+        : (0, os_1.platform)() === 'linux'
+            ? 'xdg-open'
+            : 'start';
+    const p = (0, child_process_1.spawn)(command, [(0, os_1.platform)() === 'darwin' ? '-R' : null, dirToOpen].filter(truthy_1.truthy));
+    const stderrChunks = [];
+    p.stderr.on('data', (d) => stderrChunks.push(d));
+    return new Promise((resolve, reject) => {
+        p.on('exit', (code) => {
+            if (code === 0) {
+                resolve();
+            }
+            else {
+                const message = Buffer.concat(stderrChunks).toString('utf-8');
+                reject(new Error(message));
+            }
+        });
+        p.on('error', (err) => {
+            p.kill();
+            if (err) {
+                reject(err);
+            }
+        });
+    });
+};
+exports.openDirectoryInFinder = openDirectoryInFinder;

package/dist/preview-server/render-queue/process-still.d.ts

@@ -0,0 +1,8 @@
+import type { JobProgressCallback, RenderJob } from './job';
+export declare const processStill: ({ job, remotionRoot, entryPoint, onProgress, addCleanupCallback, }: {
+    job: RenderJob;
+    remotionRoot: string;
+    entryPoint: string;
+    onProgress: JobProgressCallback;
+    addCleanupCallback: (cb: () => Promise<void>) => void;
+}) => Promise<void>;

package/dist/preview-server/render-queue/process-still.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processStill = void 0;
+const convert_entry_point_to_serve_url_1 = require("../../convert-entry-point-to-serve-url");
+const get_cli_options_1 = require("../../get-cli-options");
+const still_1 = require("../../render-flows/still");
+const processStill = async ({ job, remotionRoot, entryPoint, onProgress, addCleanupCallback, }) => {
+    var _a;
+    if (job.type !== 'still') {
+        throw new Error('Expected still job');
+    }
+    const { publicDir, browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, envVariables, inputProps, port, browser, puppeteerTimeout, } = await (0, get_cli_options_1.getCliOptions)({
+        isLambda: false,
+        type: 'still',
+        remotionRoot,
+    });
+    const fullEntryPoint = (0, convert_entry_point_to_serve_url_1.convertEntryPointToServeUrl)(entryPoint);
+    await (0, still_1.renderStillFlow)({
+        remotionRoot,
+        browser,
+        browserExecutable,
+        chromiumOptions,
+        entryPointReason: 'same as preview',
+        envVariables,
+        ffmpegExecutable,
+        ffprobeExecutable,
+        height: null,
+        fullEntryPoint,
+        inputProps,
+        overwrite: true,
+        port,
+        publicDir,
+        puppeteerTimeout,
+        quality: (_a = job.quality) !== null && _a !== void 0 ? _a : undefined,
+        remainingArgs: [],
+        scale: job.scale,
+        stillFrame: job.frame,
+        width: null,
+        compositionIdFromUi: job.compositionId,
+        imageFormatFromUi: job.imageFormat,
+        configFileImageFormat: undefined,
+        logLevel: job.verbose ? 'verbose' : 'info',
+        onProgress,
+        indentOutput: true,
+        addCleanupCallback,
+        cancelSignal: job.cancelToken.cancelSignal,
+    });
+    // TODO: Accept CLI options
+};
+exports.processStill = processStill;

package/dist/preview-server/render-queue/process-video.d.ts

@@ -0,0 +1,8 @@
+import type { JobProgressCallback, RenderJob } from './job';
+export declare const processVideoJob: ({ job, remotionRoot, entryPoint, onProgress, addCleanupCallback, }: {
+    job: RenderJob;
+    remotionRoot: string;
+    entryPoint: string;
+    onProgress: JobProgressCallback;
+    addCleanupCallback: (cb: () => Promise<void>) => void;
+}) => Promise<void>;

package/dist/preview-server/render-queue/process-video.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processVideoJob = void 0;
+const convert_entry_point_to_serve_url_1 = require("../../convert-entry-point-to-serve-url");
+const get_cli_options_1 = require("../../get-cli-options");
+const render_1 = require("../../render-flows/render");
+const processVideoJob = async ({ job, remotionRoot, entryPoint, onProgress, addCleanupCallback, }) => {
+    var _a;
+    if (job.type !== 'video') {
+        throw new Error('Expected video job');
+    }
+    const { publicDir, browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, envVariables, inputProps, port, browser, puppeteerTimeout, } = await (0, get_cli_options_1.getCliOptions)({
+        isLambda: false,
+        type: 'still',
+        remotionRoot,
+    });
+    const fullEntryPoint = (0, convert_entry_point_to_serve_url_1.convertEntryPointToServeUrl)(entryPoint);
+    await (0, render_1.renderCompFlow)({
+        remotionRoot,
+        browser,
+        browserExecutable,
+        chromiumOptions,
+        entryPointReason: 'same as preview',
+        envVariables,
+        ffmpegExecutable,
+        ffprobeExecutable,
+        height: null,
+        fullEntryPoint,
+        inputProps,
+        overwrite: true,
+        port,
+        publicDir,
+        puppeteerTimeout,
+        quality: (_a = job.quality) !== null && _a !== void 0 ? _a : undefined,
+        remainingArgs: [],
+        scale: job.scale,
+        width: null,
+        compositionIdFromUi: job.compositionId,
+        configFileImageFormat: undefined,
+        logLevel: job.verbose ? 'verbose' : 'info',
+        onProgress,
+        indent: true,
+        // TODO: Make configurable
+        concurrency: null,
+        // TODO: Make configurable
+        everyNthFrame: 1,
+        // TODO: Make configurable
+        frameRange: null,
+        quiet: false,
+        shouldOutputImageSequence: false,
+        addCleanupCallback,
+        outputLocationFromUI: job.outName,
+        uiCodec: job.codec,
+        uiImageFormat: job.imageFormat,
+        cancelSignal: job.cancelToken.cancelSignal,
+    });
+    // TODO: Accept CLI options
+};
+exports.processVideoJob = processVideoJob;

package/dist/preview-server/render-queue/queue.d.ts

@@ -0,0 +1,21 @@
+import type { JobProgressCallback, RenderJob, RenderJobWithCleanup } from './job';
+export declare const getRenderQueue: () => RenderJob[];
+export declare const notifyClientsOfJobUpdate: () => void;
+export declare const processJob: ({ job, remotionRoot, entryPoint, onProgress, addCleanupCallback, }: {
+    job: RenderJob;
+    remotionRoot: string;
+    entryPoint: string;
+    onProgress: JobProgressCallback;
+    addCleanupCallback: (cb: () => Promise<void>) => void;
+}) => Promise<void>;
+export declare const addJob: ({ job, entryPoint, remotionRoot, }: {
+    job: RenderJobWithCleanup;
+    entryPoint: string;
+    remotionRoot: string;
+}) => void;
+export declare const removeJob: (jobId: string) => void;
+export declare const cancelJob: (jobId: string) => void;
+export declare const processJobIfPossible: ({ remotionRoot, entryPoint, }: {
+    remotionRoot: string;
+    entryPoint: string;
+}) => Promise<void>;

package/dist/preview-server/render-queue/queue.js

@@ -0,0 +1,185 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processJobIfPossible = exports.cancelJob = exports.removeJob = exports.addJob = exports.processJob = exports.notifyClientsOfJobUpdate = exports.getRenderQueue = void 0;
+const path_1 = __importDefault(require("path"));
+const chalk_1 = require("../../chalk");
+const file_watcher_1 = require("../../file-watcher");
+const log_1 = require("../../log");
+const live_events_1 = require("../live-events");
+const process_still_1 = require("./process-still");
+const process_video_1 = require("./process-video");
+let jobQueue = [];
+const updateJob = (id, updater) => {
+    jobQueue = jobQueue.map((j) => {
+        if (id === j.id) {
+            return updater(j);
+        }
+        return j;
+    });
+    (0, exports.notifyClientsOfJobUpdate)();
+};
+const getRenderQueue = () => {
+    return jobQueue.map((j) => {
+        const { cleanup, ...rest } = j;
+        return rest;
+    });
+};
+exports.getRenderQueue = getRenderQueue;
+const notifyClientsOfJobUpdate = () => {
+    (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
+        listener.sendEventToClient({
+            type: 'render-queue-updated',
+            queue: (0, exports.getRenderQueue)(),
+        });
+    });
+};
+exports.notifyClientsOfJobUpdate = notifyClientsOfJobUpdate;
+const processJob = async ({ job, remotionRoot, entryPoint, onProgress, addCleanupCallback, }) => {
+    if (job.type === 'still') {
+        await (0, process_still_1.processStill)({
+            job,
+            remotionRoot,
+            entryPoint,
+            onProgress,
+            addCleanupCallback,
+        });
+        return;
+    }
+    if (job.type === 'video') {
+        await (0, process_video_1.processVideoJob)({
+            job,
+            remotionRoot,
+            entryPoint,
+            onProgress,
+            addCleanupCallback,
+        });
+        return;
+    }
+    throw new Error(`Unknown job ${JSON.stringify(job)}`);
+};
+exports.processJob = processJob;
+const addJob = ({ job, entryPoint, remotionRoot, }) => {
+    jobQueue.push(job);
+    (0, exports.processJobIfPossible)({ entryPoint, remotionRoot });
+    (0, exports.notifyClientsOfJobUpdate)();
+};
+exports.addJob = addJob;
+const removeJob = (jobId) => {
+    jobQueue = jobQueue.filter((job) => {
+        if (job.id === jobId) {
+            job.cleanup.forEach((c) => {
+                c();
+            });
+            return false;
+        }
+        return true;
+    });
+    (0, exports.notifyClientsOfJobUpdate)();
+};
+exports.removeJob = removeJob;
+const cancelJob = (jobId) => {
+    for (const job of jobQueue) {
+        if (job.id === jobId) {
+            if (job.status !== 'running') {
+                throw new Error('Job is not running');
+            }
+            job.cancelToken.cancel();
+            break;
+        }
+    }
+};
+exports.cancelJob = cancelJob;
+const processJobIfPossible = async ({ remotionRoot, entryPoint, }) => {
+    const nextJob = jobQueue.find((q) => {
+        return q.status === 'idle';
+    });
+    if (!nextJob) {
+        return;
+    }
+    const jobCleanups = [];
+    try {
+        updateJob(nextJob.id, (job) => {
+            return {
+                ...job,
+                status: 'running',
+                progress: 0,
+                message: 'Starting job...',
+            };
+        });
+        const startTime = Date.now();
+        log_1.Log.info(chalk_1.chalk.gray('╭─ Starting render '));
+        await (0, exports.processJob)({
+            job: nextJob,
+            entryPoint,
+            remotionRoot,
+            onProgress: ({ message, progress }) => {
+                updateJob(nextJob.id, (job) => {
+                    // Ignore late callbacks of progress updates after cancelling
+                    if (job.status === 'failed' || job.status === 'done') {
+                        return job;
+                    }
+                    return {
+                        ...job,
+                        status: 'running',
+                        progress,
+                        message,
+                    };
+                });
+            },
+            addCleanupCallback: (cleanup) => {
+                jobCleanups.push(cleanup);
+            },
+        });
+        log_1.Log.info(chalk_1.chalk.gray('╰─ Done in ' + (Date.now() - startTime) + 'ms.'));
+        const { unwatch } = (0, file_watcher_1.installFileWatcher)({
+            file: path_1.default.resolve(remotionRoot, nextJob.outName),
+            onChange: (type) => {
+                if (type === 'created') {
+                    updateJob(nextJob.id, (job) => ({
+                        ...job,
+                        deletedOutputLocation: false,
+                    }));
+                }
+                if (type === 'deleted') {
+                    updateJob(nextJob.id, (job) => ({
+                        ...job,
+                        deletedOutputLocation: true,
+                    }));
+                }
+            },
+        });
+        updateJob(nextJob.id, (job) => ({
+            ...job,
+            status: 'done',
+            cleanup: [...job.cleanup, unwatch],
+        }));
+    }
+    catch (err) {
+        // TODO: Tell to look in preview to find the error
+        log_1.Log.error(chalk_1.chalk.gray('╰─ Render failed:'), err);
+        updateJob(nextJob.id, (job) => {
+            return {
+                ...job,
+                status: 'failed',
+                error: {
+                    message: err.message,
+                    stack: err.stack,
+                },
+            };
+        });
+        (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
+            listener.sendEventToClient({
+                type: 'render-job-failed',
+                compositionId: nextJob.compositionId,
+                error: err,
+            });
+        });
+    }
+    finally {
+        await Promise.all(jobCleanups.map((c) => c()));
+    }
+};
+exports.processJobIfPossible = processJobIfPossible;

package/dist/preview-server/routes/add-render.d.ts

@@ -0,0 +1,3 @@
+import type { ApiHandler } from '../api-types';
+import type { AddRenderRequest } from '../render-queue/job';
+export declare const handleAddRender: ApiHandler<AddRenderRequest, undefined>;