@remotion/renderer 4.0.0-fastlambda.8 → 4.0.0-lambda.3

package/dist/serve-handler/is-path-inside.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPathInside = void 0;
+const path_1 = __importDefault(require("path"));
+const isPathInside = function (thePath, potentialParent) {
+    // For inside-directory checking, we want to allow trailing slashes, so normalize.
+    thePath = stripTrailingSep(thePath);
+    potentialParent = stripTrailingSep(potentialParent);
+    // Node treats only Windows as case-insensitive in its path module; we follow those conventions.
+    if (process.platform === 'win32') {
+        thePath = thePath.toLowerCase();
+        potentialParent = potentialParent.toLowerCase();
+    }
+    return (thePath.lastIndexOf(potentialParent, 0) === 0 &&
+        (thePath[potentialParent.length] === path_1.default.sep ||
+            thePath[potentialParent.length] === undefined));
+};
+exports.isPathInside = isPathInside;
+function stripTrailingSep(thePath) {
+    if (thePath[thePath.length - 1] === path_1.default.sep) {
+        return thePath.slice(0, -1);
+    }
+    return thePath;
+}

package/dist/serve-handler/range-parser.d.ts

@@ -0,0 +1,13 @@
+/*!
+ * range-parser
+ * Copyright(c) 2012-2014 TJ Holowaychuk
+ * Copyright(c) 2015-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+export declare const rangeParser: (size: number, str: string) => -1 | {
+    type: string;
+    ranges: {
+        start: number;
+        end: number;
+    }[];
+} | -2;

package/dist/serve-handler/range-parser.js

@@ -0,0 +1,57 @@
+"use strict";
+/*!
+ * range-parser
+ * Copyright(c) 2012-2014 TJ Holowaychuk
+ * Copyright(c) 2015-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rangeParser = void 0;
+const rangeParser = (size, str) => {
+    if (typeof str !== 'string') {
+        throw new TypeError('argument str must be a string');
+    }
+    const index = str.indexOf('=');
+    if (index === -1) {
+        return -2;
+    }
+    // split the range string
+    const arr = str.slice(index + 1).split(',');
+    const ranges = [];
+    // add ranges type
+    const type = str.slice(0, index);
+    // parse all ranges
+    for (let i = 0; i < arr.length; i++) {
+        const range = arr[i].split('-');
+        let start = parseInt(range[0], 10);
+        let end = parseInt(range[1], 10);
+        // -nnn
+        if (isNaN(start)) {
+            start = size - end;
+            end = size - 1;
+            // nnn-
+        }
+        else if (isNaN(end)) {
+            end = size - 1;
+        }
+        // limit last-byte-pos to current length
+        if (end > size - 1) {
+            end = size - 1;
+        }
+        // invalid or unsatisifiable
+        if (isNaN(start) || isNaN(end) || start > end || start < 0) {
+            continue;
+        }
+        // add range
+        ranges.push({
+            start,
+            end,
+        });
+    }
+    if (ranges.length < 1) {
+        // unsatisifiable
+        return -1;
+    }
+    return { ranges, type };
+};
+exports.rangeParser = rangeParser;

package/dist/serve-static.d.ts

@@ -1,6 +1,13 @@
-export declare const serveStatic: (path: string, options?: {
-    port?: number | undefined;
-} | undefined) => Promise<{
+import { FfmpegExecutable } from 'remotion';
+import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+export declare const serveStatic: (path: string | null, options: {
+    port: number | null;
+    ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
+    downloadDir: string;
+    onDownload: RenderMediaOnDownload;
+    onError: (err: Error) => void;
+}) => Promise<{
     port: number;
     close: () => Promise<void>;
 }>;

package/dist/serve-static.js

@@ -6,18 +6,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serveStatic = void 0;
 const http_1 = __importDefault(require("http"));
 const remotion_1 = require("remotion");
-const serve_handler_1 = __importDefault(require("serve-handler"));
 const get_port_1 = require("./get-port");
+const offthread_video_server_1 = require("./offthread-video-server");
+const serve_handler_1 = require("./serve-handler");
 const serveStatic = async (path, options) => {
     var _a, _b;
     const port = await (0, get_port_1.getDesiredPort)((_b = (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : remotion_1.Internals.getServerPort()) !== null && _b !== void 0 ? _b : undefined, 3000, 3100);
+    const offthreadRequest = (0, offthread_video_server_1.startOffthreadVideoServer)({
+        ffmpegExecutable: options.ffmpegExecutable,
+        ffprobeExecutable: options.ffprobeExecutable,
+        downloadDir: options.downloadDir,
+        onDownload: options.onDownload,
+        onError: options.onError,
+    });
     try {
         const server = http_1.default
             .createServer((request, response) => {
-            (0, serve_handler_1.default)(request, response, {
+            var _a;
+            if ((_a = request.url) === null || _a === void 0 ? void 0 : _a.startsWith('/proxy')) {
+                return offthreadRequest(request, response);
+            }
+            if (path === null) {
+                response.writeHead(404);
+                response.end('Server only supports /proxy');
+                return;
+            }
+            (0, serve_handler_1.serveHandler)(request, response, {
                 public: path,
-                directoryListing: false,
-                cleanUrls: false,
             }).catch(() => {
                 response.statusCode = 500;
                 response.end('Error serving file');
@@ -28,6 +43,9 @@ const serveStatic = async (path, options) => {
             return new Promise((resolve, reject) => {
                 server.close((err) => {
                     if (err) {
+                        if (err.code === 'ERR_SERVER_NOT_RUNNING') {
+                            return resolve();
+                        }
                         reject(err);
                     }
                     else {

package/dist/set-props-and-env.d.ts

@@ -1,9 +1,11 @@
 import { Page } from 'puppeteer-core';
-export declare const setPropsAndEnv: ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, }: {
+export declare const setPropsAndEnv: ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, retriesRemaining, }: {
     inputProps: unknown;
     envVariables: Record<string, string> | undefined;
     page: Page;
     serveUrl: string;
     initialFrame: number;
     timeoutInMilliseconds: number | undefined;
+    proxyPort: number;
+    retriesRemaining: number;
 }) => Promise<void>;

package/dist/set-props-and-env.js

@@ -5,7 +5,7 @@ const remotion_1 = require("remotion");
 const normalize_serve_url_1 = require("./normalize-serve-url");
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
-const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, }) => {
+const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, retriesRemaining, }) => {
     (0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
     const actualTimeout = timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : remotion_1.Internals.DEFAULT_PUPPETEER_TIMEOUT;
     page.setDefaultTimeout(actualTimeout);
@@ -24,11 +24,33 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
             window.remotion_envVariables = input;
         }, [JSON.stringify(envVariables)]);
     }
-    await page.evaluateOnNewDocument((key, value) => {
-        window.localStorage.setItem(key, value);
-    }, [remotion_1.Internals.INITIAL_FRAME_LOCAL_STORAGE_KEY, initialFrame]);
+    await page.evaluateOnNewDocument((key) => {
+        window.remotion_initialFrame = key;
+    }, [initialFrame]);
+    await page.evaluateOnNewDocument((port) => {
+        window.remotion_proxyPort = port;
+    }, [proxyPort]);
     const pageRes = await page.goto(urlToVisit);
     const status = pageRes.status();
+    // S3 in rare occasions returns a 500 or 503 error code for GET operations.
+    // Usually it is fixed by retrying.
+    if (status >= 500 && status <= 504 && retriesRemaining > 0) {
+        await new Promise((resolve) => {
+            setTimeout(() => {
+                resolve();
+            }, 2000);
+        });
+        return (0, exports.setPropsAndEnv)({
+            envVariables,
+            initialFrame,
+            inputProps,
+            page,
+            proxyPort,
+            retriesRemaining: retriesRemaining - 1,
+            serveUrl,
+            timeoutInMilliseconds,
+        });
+    }
     if (status !== 200 &&
         status !== 301 &&
         status !== 302 &&
@@ -55,8 +77,8 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
         frame: null,
         page,
     });
-    if (siteVersion !== '2') {
-        throw new Error(`Incompatible site: When visiting ${urlToVisit}, a bundle was found, but one that is not compatible with this version of Remotion. The bundle format changed in versions from March 2022 onwards. To resolve this error, please bundle and deploy again.`);
+    if (siteVersion !== '3') {
+        throw new Error(`Incompatible site: When visiting ${urlToVisit}, a bundle was found, but one that is not compatible with this version of Remotion. The bundle format changed in version 3.0.11. To resolve this error, please bundle and deploy again.`);
     }
 };
 exports.setPropsAndEnv = setPropsAndEnv;

package/dist/stitch-frames-to-video.d.ts

@@ -1,5 +1,6 @@
 import { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
 import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import { CancelSignal } from './make-cancel-signal';
 export declare type StitcherOptions = {
     fps: number;
     width: number;
@@ -15,14 +16,16 @@ export declare type StitcherOptions = {
     proResProfile?: ProResProfile;
     verbose?: boolean;
     ffmpegExecutable?: FfmpegExecutable;
+    ffprobeExecutable?: FfmpegExecutable;
     dir?: string;
+    cancelSignal?: CancelSignal;
     internalOptions?: {
         preEncodedFileLocation: string | null;
         imageFormat: ImageFormat;
     };
 };
 declare type ReturnType = {
-    task: Promise<unknown>;
+    task: Promise<void>;
     getLogs: () => string;
 };
 export declare const spawnFfmpeg: (options: StitcherOptions) => Promise<ReturnType>;

package/dist/stitch-frames-to-video.js

@@ -25,7 +25,7 @@ const packageJsonPath = path_1.default.join(__dirname, '..', 'package.json');
 const packageJson = fs_1.default.existsSync(packageJsonPath)
     ? JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
     : null;
-const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, onProgress, }) => {
+const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, }) => {
     const fileUrlAssets = await (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
         assets,
         downloadDir,
@@ -45,6 +45,7 @@ const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFra
         const filterFile = path_1.default.join(tempPath, `${index}.wav`);
         const result = await (0, preprocess_audio_track_1.preprocessAudioTrack)({
             ffmpegExecutable: ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null,
+            ffprobeExecutable: ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : null,
             outName: filterFile,
             asset,
             expectedFrames,
@@ -68,7 +69,7 @@ const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFra
     return outName;
 };
 const spawnFfmpeg = async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateFps(options.fps, 'passed to `stitchFramesToVideo()`');
@@ -115,21 +116,29 @@ const spawnFfmpeg = async (options) => {
         expectedFrames,
         verbose: (_f = options.verbose) !== null && _f !== void 0 ? _f : false,
         ffmpegExecutable: (_g = options.ffmpegExecutable) !== null && _g !== void 0 ? _g : null,
+        ffprobeExecutable: (_h = options.ffprobeExecutable) !== null && _h !== void 0 ? _h : null,
         onProgress: (prog) => updateProgress(prog, 0),
     });
     if (isAudioOnly) {
         if (!audioCodecName) {
             throw new TypeError('exporting audio but has no audio codec name. Report this in the Remotion repo.');
         }
-        await (0, execa_1.default)('ffmpeg', [
+        const ffmpegTask = (0, execa_1.default)('ffmpeg', [
             '-i',
             audio,
             '-c:a',
             audioCodecName,
+            // Set bitrate up to 320k, for aac it might effectively be lower
+            '-b:a',
+            '320k',
             options.force ? '-y' : null,
             options.outputLocation,
         ].filter(remotion_1.Internals.truthy));
-        (_h = options.onProgress) === null || _h === void 0 ? void 0 : _h.call(options, expectedFrames);
+        (_j = options.cancelSignal) === null || _j === void 0 ? void 0 : _j.call(options, () => {
+            ffmpegTask.kill();
+        });
+        await ffmpegTask;
+        (_k = options.onProgress) === null || _k === void 0 ? void 0 : _k.call(options, expectedFrames);
         return {
             getLogs: () => '',
             task: Promise.resolve(),
@@ -137,8 +146,8 @@ const spawnFfmpeg = async (options) => {
     }
     const ffmpegArgs = [
         ['-r', String(options.fps)],
-        ...(((_j = options.internalOptions) === null || _j === void 0 ? void 0 : _j.preEncodedFileLocation)
-            ? [['-i', (_k = options.internalOptions) === null || _k === void 0 ? void 0 : _k.preEncodedFileLocation]]
+        ...(((_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation)
+            ? [['-i', (_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation]]
             : [
                 ['-f', 'image2'],
                 ['-s', `${options.width}x${options.height}`],
@@ -149,7 +158,7 @@ const spawnFfmpeg = async (options) => {
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...(((_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation)
+        ...(((_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation)
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
@@ -160,7 +169,10 @@ const spawnFfmpeg = async (options) => {
                 pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
                 ['-b:v', '1M'],
             ]),
+        codec === 'h264' ? ['-movflags', 'faststart'] : null,
         audioCodecName ? ['-c:a', audioCodecName] : null,
+        // Set max bitrate up to 1024kbps, will choose lower if that's too much
+        audioCodecName ? ['-b:a', '512K'] : null,
         // Ignore metadata that may come from remote media
         ['-map_metadata', '-1'],
         [
@@ -176,12 +188,15 @@ const spawnFfmpeg = async (options) => {
         console.log(ffmpegArgs);
     }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
-    const task = (0, execa_1.default)((_m = options.ffmpegExecutable) !== null && _m !== void 0 ? _m : 'ffmpeg', ffmpegString, {
+    const task = (0, execa_1.default)((_p = options.ffmpegExecutable) !== null && _p !== void 0 ? _p : 'ffmpeg', ffmpegString, {
         cwd: options.dir,
     });
+    (_q = options.cancelSignal) === null || _q === void 0 ? void 0 : _q.call(options, () => {
+        task.kill();
+    });
     let ffmpegOutput = '';
     let isFinished = false;
-    (_o = task.stderr) === null || _o === void 0 ? void 0 : _o.on('data', (data) => {
+    (_r = task.stderr) === null || _r === void 0 ? void 0 : _r.on('data', (data) => {
         var _a;
         const str = data.toString();
         ffmpegOutput += str;
@@ -203,16 +218,22 @@ const spawnFfmpeg = async (options) => {
             }
         }
     });
-    return { task, getLogs: () => ffmpegOutput };
+    return { task: task.then(() => undefined), getLogs: () => ffmpegOutput };
 };
 exports.spawnFfmpeg = spawnFfmpeg;
 const stitchFramesToVideo = async (options) => {
     const { task, getLogs } = await (0, exports.spawnFfmpeg)(options);
-    try {
-        await task;
-    }
-    catch (err) {
+    const happyPath = task.catch(() => {
         throw new Error(getLogs());
-    }
+    });
+    return Promise.race([
+        happyPath,
+        new Promise((_resolve, reject) => {
+            var _a;
+            (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
+                reject(new Error('stitchFramesToVideo() got cancelled'));
+            });
+        }),
+    ]);
 };
 exports.stitchFramesToVideo = stitchFramesToVideo;

package/dist/stringify-ffmpeg-filter.js

@@ -11,6 +11,7 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
         volume,
         startInVideo,
         fps,
+        trimLeft,
     });
     // Avoid setting filters if possible, as combining them can create noise
     const chunkLength = durationInFrames / fps;
@@ -37,6 +38,8 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
                     .fill((startInVideoSeconds * 1000).toFixed(0))
                     .join('|')}`,
             // set the volume if needed
+            // The timings for volume must include whatever is in atrim, unless the volume
+            // filter gets applied before atrim
             volumeFilter.value === '1'
                 ? null
                 : `volume=${volumeFilter.value}:eval=${volumeFilter.eval}`,

package/dist/tmp-dir.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/validate-fps-for-gif.d.ts

@@ -0,0 +1,2 @@
+import { Codec } from 'remotion';
+export declare const validateFpsForGif: (codec: Codec, fps: number) => void;

package/dist/validate-fps-for-gif.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateFpsForGif = void 0;
+const validateFpsForGif = (codec, fps) => {
+    if (codec === 'gif' && (fps > 50 || fps < 1)) {
+        throw new Error(`To render a GIF, the FPS must be less than or equal to 50 and greater than 0 but got ${fps} instead`);
+    }
+};
+exports.validateFpsForGif = validateFpsForGif;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "4.0.0-fastlambda.8+64cb75673",
+	"version": "4.0.0-lambda.3+32da0b782",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -20,11 +20,10 @@
 		"url": "https://github.com/remotion-dev/remotion/issues"
 	},
 	"dependencies": {
-		"@remotion/bundler": "4.0.0-fastlambda.8+64cb75673",
 		"execa": "5.1.1",
+		"mime-types": "2.1.35",
 		"puppeteer-core": "13.5.1",
-		"remotion": "4.0.0-fastlambda.8+64cb75673",
-		"serve-handler": "6.1.3",
+		"remotion": "4.0.0-lambda.3+32da0b782",
 		"source-map": "^0.8.0-beta.0"
 	},
 	"peerDependencies": {
@@ -36,10 +35,10 @@
 		"@testing-library/dom": "^8.7.2",
 		"@testing-library/react": "13.1.1",
 		"@types/jest": "^27.4.0",
+		"@types/mime-types": "2.1.1",
 		"@types/node": "^16.7.5",
 		"@types/react": "18.0.1",
 		"@types/react-dom": "18.0.0",
-		"@types/serve-handler": "^6.1.0",
 		"eslint": "8.13.0",
 		"jest": "^27.2.4",
 		"prettier": "^2.0.5",
@@ -47,7 +46,7 @@
 		"react": "18.0.0",
 		"react-dom": "18.0.0",
 		"ts-jest": "^27.0.5",
-		"typescript": "^4.5.5"
+		"typescript": "^4.7.0"
 	},
 	"keywords": [
 		"remotion",
@@ -60,5 +59,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "64cb756734b43bfdfae52544d40255c31a4a51c3"
+	"gitHead": "32da0b782094e5eac82cdc1b1469a80bb763b392"
 }