@remotion/renderer 3.0.22 → 3.0.25

package/dist/render-frames.js

@@ -49,6 +49,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
             });
         }
     }
+    const downloadPromises = [];
     const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null);
     const frameCount = (0, get_duration_from_frame_range_1.getDurationFromFrameRange)(realFrameRange, composition.durationInFrames);
     const pages = new Array(actualParallelism).fill(true).map(async () => {
@@ -62,8 +63,8 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         const logCallback = (log) => {
             onBrowserLog === null || onBrowserLog === void 0 ? void 0 : onBrowserLog({
                 stackTrace: log.stackTrace(),
-                text: log.text(),
-                type: log.type(),
+                text: log.text,
+                type: log.type,
             });
         };
         if (onBrowserLog) {
@@ -142,7 +143,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
                     quality,
                     options: {
                         frame,
-                        output: undefined,
+                        output: null,
                     },
                 });
                 remotion_1.Internals.perf.stopPerfMeasure(id);
@@ -175,13 +176,13 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         const compressedAssets = collectedAssets.map((asset) => remotion_1.Internals.AssetCompression.compressAsset(assets.filter(remotion_1.Internals.truthy).flat(1), asset));
         assets[index] = compressedAssets;
         compressedAssets.forEach((asset) => {
-            (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
+            downloadPromises.push((0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
                 asset,
                 downloadDir,
                 onDownload,
             }).catch((err) => {
                 onError(new Error(`Error while downloading asset: ${err.stack}`));
-            });
+            }));
         });
         pool.release(freePage);
         framesRendered++;
@@ -203,7 +204,11 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         return returnValue;
     });
     return Promise.race([
-        happyPath,
+        happyPath
+            .then(() => {
+            return Promise.all(downloadPromises);
+        })
+            .then(() => happyPath),
         new Promise((_resolve, reject) => {
             cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
                 reject(new Error('renderFrames() got cancelled'));
@@ -240,7 +245,9 @@ const renderFrames = (options) => {
     return new Promise((resolve, reject) => {
         var _a, _b, _c;
         const cleanup = [];
-        const onError = (err) => reject(err);
+        const onError = (err) => {
+            reject(err);
+        };
         Promise.all([
             (0, prepare_server_1.prepareServer)({
                 webpackConfigOrServeUrl: selectedServeUrl,
@@ -262,7 +269,7 @@ const renderFrames = (options) => {
                 closeServer();
             });
             cleanup.push(closeServer);
-            const renderFramesProm = innerRenderFrames({
+            return innerRenderFrames({
                 ...options,
                 puppeteerInstance,
                 onError,
@@ -274,9 +281,10 @@ const renderFrames = (options) => {
                 downloadDir,
                 proxyPort: offthreadPort,
             });
-            return renderFramesProm;
         })
-            .then((res) => resolve(res))
+            .then((res) => {
+            return resolve(res);
+        })
             .catch((err) => reject(err))
             .finally(() => {
             // If browser instance was passed in, we close all the pages

package/dist/render-media.d.ts

@@ -1,11 +1,11 @@
-import type { Browser as PuppeteerBrowser } from 'puppeteer-core';
-import { BrowserExecutable, Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
-import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
-import { BrowserLog } from './browser-log';
-import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
-import { CancelSignal } from './make-cancel-signal';
-import { ChromiumOptions } from './open-browser';
-import { OnStartData } from './types';
+import type { BrowserExecutable, Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
+import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { BrowserLog } from './browser-log';
+import type { Browser as PuppeteerBrowser } from './browser/Browser';
+import type { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
+import type { CancelSignal } from './make-cancel-signal';
+import type { ChromiumOptions } from './open-browser';
+import type { OnStartData } from './types';
 export declare type StitchingState = 'encoding' | 'muxing';
 export declare type RenderMediaOnProgress = (progress: {
     renderedFrames: number;

package/dist/render-still.d.ts

@@ -1,9 +1,9 @@
-import { Browser as PuppeteerBrowser } from 'puppeteer-core';
-import { BrowserExecutable, FfmpegExecutable, SmallTCompMetadata, StillImageFormat } from 'remotion';
-import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
-import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
-import { CancelSignal } from './make-cancel-signal';
-import { ChromiumOptions } from './open-browser';
+import type { BrowserExecutable, FfmpegExecutable, SmallTCompMetadata, StillImageFormat } from 'remotion';
+import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { Browser as PuppeteerBrowser } from './browser/Browser';
+import type { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
+import type { CancelSignal } from './make-cancel-signal';
+import type { ChromiumOptions } from './open-browser';
 declare type InnerStillOptions = {
     composition: SmallTCompMetadata;
     output: string;

package/dist/screenshot-dom-element.d.ts

@@ -1,12 +1,11 @@
 /// <reference types="node" />
-import puppeteer from 'puppeteer-core';
-import { ImageFormat } from 'remotion';
+import type { ImageFormat } from 'remotion';
+import type { Page } from './browser/Page';
 export declare const screenshotDOMElement: ({ page, imageFormat, quality, opts, }: {
-    page: puppeteer.Page;
+    page: Page;
     imageFormat: ImageFormat;
     quality: number | undefined;
-    opts?: {
-        path?: string | undefined;
-        selector?: string | undefined;
-    } | undefined;
+    opts: {
+        path: string | null;
+    };
 }) => Promise<Buffer>;

package/dist/screenshot-dom-element.js

@@ -3,11 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.screenshotDOMElement = void 0;
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const puppeteer_screenshot_1 = require("./puppeteer-screenshot");
-const screenshotDOMElement = async ({ page, imageFormat, quality, opts = {}, }) => {
-    const path = 'path' in opts ? opts.path : undefined;
-    const { selector } = opts;
-    if (!selector)
-        throw Error('Please provide a selector.');
+const screenshotDOMElement = async ({ page, imageFormat, quality, opts, }) => {
+    const { path } = opts;
     if (imageFormat === 'png') {
         await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
             pageFunction: () => {
@@ -33,7 +30,7 @@ const screenshotDOMElement = async ({ page, imageFormat, quality, opts = {}, })
     }
     return (0, puppeteer_screenshot_1.screenshot)(page, {
         omitBackground: imageFormat === 'png',
-        path,
+        path: path !== null && path !== void 0 ? path : undefined,
         type: imageFormat,
         quality,
     });

package/dist/screenshot-task.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
-import { Page, ScreenshotOptions } from 'puppeteer-core';
-import { StillImageFormat } from 'remotion';
+import type { StillImageFormat } from 'remotion';
+import type { Page } from './browser/Page';
+import type { ScreenshotOptions } from './browser/ScreenshotOptions';
 export declare const _screenshotTask: (page: Page, format: StillImageFormat, options: ScreenshotOptions) => Promise<Buffer | string>;

package/dist/screenshot-task.js

@@ -7,8 +7,8 @@ exports._screenshotTask = void 0;
 const fs_1 = __importDefault(require("fs"));
 const remotion_1 = require("remotion");
 const _screenshotTask = async (page, format, options) => {
-    const client = page._client;
-    const target = page._target;
+    const client = page._client();
+    const target = page.target();
     const perfTarget = remotion_1.Internals.perf.startPerfMeasure('activate-target');
     await client.send('Target.activateTarget', {
         targetId: target._targetId,
@@ -30,9 +30,7 @@ const _screenshotTask = async (page, format, options) => {
     if (shouldSetDefaultBackground)
         await client.send('Emulation.setDefaultBackgroundColorOverride');
     const saveMarker = remotion_1.Internals.perf.startPerfMeasure('save');
-    const buffer = options.encoding === 'base64'
-        ? result.data
-        : Buffer.from(result.data, 'base64');
+    const buffer = Buffer.from(result.data, 'base64');
     if (options.path)
         await fs_1.default.promises.writeFile(options.path, buffer);
     remotion_1.Internals.perf.stopPerfMeasure(saveMarker);

package/dist/seek-to-frame.d.ts

@@ -1,5 +1,5 @@
-import puppeteer from 'puppeteer-core';
+import type { Page } from './browser/Page';
 export declare const seekToFrame: ({ frame, page, }: {
     frame: number;
-    page: puppeteer.Page;
+    page: Page;
 }) => Promise<void>;

package/dist/serve-handler/index.d.ts

@@ -1,4 +1,4 @@
-import { IncomingMessage, ServerResponse } from 'http';
+import type { IncomingMessage, ServerResponse } from 'http';
 export declare const serveHandler: (request: IncomingMessage, response: ServerResponse, config: {
     public: string;
 }) => Promise<void>;

package/dist/serve-handler/index.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serveHandler = void 0;
-// Native
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const url_1 = __importDefault(require("url"));

package/dist/serve-static.d.ts

@@ -1,5 +1,5 @@
-import { FfmpegExecutable } from 'remotion';
-import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { FfmpegExecutable } from 'remotion';
+import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 export declare const serveStatic: (path: string | null, options: {
     port: number | null;
     ffmpegExecutable: FfmpegExecutable;

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

@@ -1,4 +1,4 @@
-import { Page } from 'puppeteer-core';
+import type { Page } from './browser/Page';
 export declare const setPropsAndEnv: ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, retriesRemaining, }: {
     inputProps: unknown;
     envVariables: Record<string, string> | undefined;

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

@@ -31,6 +31,9 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
         window.remotion_proxyPort = port;
     }, [proxyPort]);
     const pageRes = await page.goto(urlToVisit);
+    if (pageRes === null) {
+        throw new Error(`Visited "${urlToVisit}" but got no response.`);
+    }
     const status = pageRes.status();
     // S3 in rare occasions returns a 500 or 503 error code for GET operations.
     // Usually it is fixed by retrying.

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

@@ -1,6 +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';
+import type { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
+import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { CancelSignal } from './make-cancel-signal';
 export declare type StitcherOptions = {
     fps: number;
     width: number;

package/dist/stringify-ffmpeg-filter.d.ts

@@ -1,4 +1,4 @@
-import { AssetVolume } from './assets/types';
+import type { AssetVolume } from './assets/types';
 export declare const stringifyFfmpegFilter: ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, }: {
     trimLeft: number;
     trimRight: number;
@@ -9,4 +9,4 @@ export declare const stringifyFfmpegFilter: ({ trimLeft, trimRight, channels, st
     durationInFrames: number;
     playbackRate: number;
     assetDuration: number | null;
-}) => string;
+}) => string | null;

package/dist/stringify-ffmpeg-filter.js

@@ -7,6 +7,9 @@ const ffmpeg_volume_expression_1 = require("./assets/ffmpeg-volume-expression");
 const sample_rate_1 = require("./sample-rate");
 const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, }) => {
     const startInVideoSeconds = startInVideo / fps;
+    if (assetDuration && trimLeft >= assetDuration) {
+        return null;
+    }
     const volumeFilter = (0, ffmpeg_volume_expression_1.ffmpegVolumeExpression)({
         volume,
         startInVideo,

package/dist/symbolicate-stacktrace.d.ts

@@ -1,4 +1,4 @@
-import { UnsymbolicatedStackFrame } from './parse-browser-error-stack';
+import type { UnsymbolicatedStackFrame } from './parse-browser-error-stack';
 declare type ScriptLine = {
     lineNumber: number;
     content: string;

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import { RenderAssetInfo } from 'remotion';
+import type { RenderAssetInfo } from 'remotion';
 export declare type RenderFramesOutput = {
     frameCount: number;
     assetsInfo: RenderAssetInfo;

package/dist/validate-even-dimensions-with-codec.d.ts

@@ -1,4 +1,4 @@
-import { Codec } from 'remotion';
+import type { Codec } from 'remotion';
 export declare const validateEvenDimensionsWithCodec: ({ width, height, codec, scale, }: {
     width: number;
     height: number;

package/dist/validate-output-filename.d.ts

@@ -1,2 +1,2 @@
-import { Codec } from 'remotion';
+import type { Codec } from 'remotion';
 export declare const validateOutputFilename: (codec: Codec, extension: string | null) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.0.22",
+	"version": "3.0.25",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -21,24 +21,28 @@
 	},
 	"dependencies": {
 		"execa": "5.1.1",
+		"extract-zip": "2.0.1",
 		"mime-types": "2.1.35",
-		"puppeteer-core": "13.5.1",
-		"remotion": "3.0.22",
-		"source-map": "^0.8.0-beta.0"
+		"remotion": "3.0.25",
+		"source-map": "^0.8.0-beta.0",
+		"ws": "8.7.0"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
 		"react-dom": ">=16.8.0"
 	},
 	"devDependencies": {
-		"@jonny/eslint-config": "3.0.259",
+		"@jonny/eslint-config": "3.0.266",
 		"@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/progress": "2.0.5",
 		"@types/react": "18.0.1",
 		"@types/react-dom": "18.0.0",
+		"@types/ws": "8.5.3",
+		"devtools-protocol": "0.0.1001819",
 		"eslint": "8.13.0",
 		"jest": "^27.2.4",
 		"prettier": "^2.0.5",
@@ -59,5 +63,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "e79cfa299f58a26c84a637174875941898cdab97"
+	"gitHead": "27ec369ebe9cf3d063095383c1e30dc83c60f010"
 }