@remotion/renderer 3.3.0 → 3.3.1

package/dist/assets/download-file.d.ts

@@ -1,3 +1,7 @@
+declare type Response = {
+    sizeInBytes: number;
+    to: string;
+};
 export declare const downloadFile: ({ onProgress, url, to: toFn, }: {
     url: string;
     to: (contentDisposition: string | null, contentType: string | null) => string;
@@ -6,7 +10,5 @@ export declare const downloadFile: ({ onProgress, url, to: toFn, }: {
         downloaded: number;
         totalSize: number | null;
     }) => void) | undefined;
-}) => Promise<{
-    sizeInBytes: number;
-    to: string;
-}>;
+}) => Promise<Response>;
+export {};

package/dist/assets/download-file.js

@@ -6,6 +6,35 @@ const ensure_output_directory_1 = require("../ensure-output-directory");
 const read_file_1 = require("./read-file");
 const downloadFile = ({ onProgress, url, to: toFn, }) => {
     return new Promise((resolve, reject) => {
+        let rejected = false;
+        let resolved = false;
+        let timeout;
+        const resolveAndFlag = (val) => {
+            resolved = true;
+            resolve(val);
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+        };
+        const rejectAndFlag = (err) => {
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            reject(err);
+            rejected = true;
+        };
+        const refreshTimeout = () => {
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            timeout = setTimeout(() => {
+                if (resolved) {
+                    return;
+                }
+                rejectAndFlag(new Error(`Tried to download file ${url}, but the server sent no data for 20 seconds`));
+            }, 20000);
+        };
+        refreshTimeout();
         (0, read_file_1.readFile)(url)
             .then((res) => {
             var _a, _b;
@@ -21,16 +50,20 @@ const downloadFile = ({ onProgress, url, to: toFn, }) => {
             // concise method to avoid this problem
             // https://github.com/remotion-dev/remotion/issues/384#issuecomment-844398183
             writeStream.on('close', () => {
+                if (rejected) {
+                    return;
+                }
                 onProgress === null || onProgress === void 0 ? void 0 : onProgress({
                     downloaded,
                     percent: 1,
                     totalSize: downloaded,
                 });
-                return resolve({ sizeInBytes: downloaded, to });
+                refreshTimeout();
+                return resolveAndFlag({ sizeInBytes: downloaded, to });
             });
-            writeStream.on('error', (err) => reject(err));
-            res.on('error', (err) => reject(err));
-            res.pipe(writeStream).on('error', (err) => reject(err));
+            writeStream.on('error', (err) => rejectAndFlag(err));
+            res.on('error', (err) => rejectAndFlag(err));
+            res.pipe(writeStream).on('error', (err) => rejectAndFlag(err));
             res.on('data', (d) => {
                 downloaded += d.length;
                 onProgress === null || onProgress === void 0 ? void 0 : onProgress({
@@ -39,9 +72,15 @@ const downloadFile = ({ onProgress, url, to: toFn, }) => {
                     totalSize,
                 });
             });
+            res.on('close', () => {
+                if (totalSize !== null && downloaded !== totalSize) {
+                    rejectAndFlag(new Error(`Download finished with ${downloaded} bytes, but expected ${totalSize} bytes from 'Content-Length'.`));
+                }
+                writeStream.close();
+            });
         })
             .catch((err) => {
-            reject(err);
+            rejectAndFlag(err);
         });
     });
 };

package/dist/browser/Browser.js

@@ -135,7 +135,6 @@ class Browser extends EventEmitter_1.EventEmitter {
     async close(silent) {
         await __classPrivateFieldGet(this, _Browser_closeCallback, "f").call(null);
         (await this.pages()).forEach((page) => {
-            console.log('disposing', page.id);
             page.emit("disposed" /* PageEmittedEvents.Disposed */);
             page.closed = true;
         });

package/dist/extract-frame-from-video.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/dist/ffmpeg-flags.js

@@ -105,7 +105,7 @@ const waitForFfmpegToBeDownloaded = (url) => {
     });
 };
 const onProgress = (downloadedBytes, totalBytesToDownload, binary) => {
-    console.log('Downloading ', [binary], `${toMegabytes(downloadedBytes)}/${toMegabytes(totalBytesToDownload)}`);
+    console.log('Downloading ', binary, `${toMegabytes(downloadedBytes)}/${toMegabytes(totalBytesToDownload)}`);
 };
 const downloadBinary = async (remotionRoot, url, binary) => {
     const destinationPath = getFfmpegAbsolutePath(remotionRoot, binary);

package/dist/guess-extension-for-media.d.ts

@@ -2,4 +2,4 @@ export declare const guessExtensionForVideo: ({ src, remotionRoot, ffprobeBinary
     src: string;
     remotionRoot: string;
     ffprobeBinary: string | null;
-}) => Promise<"mp3" | "wav" | "mp4" | "webm">;
+}) => Promise<"mp3" | "wav" | "webm" | "mp4">;

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import execa from 'execa';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
 import { mimeContentType, mimeLookup } from './mime-types';
@@ -114,8 +113,8 @@ export declare const RenderInternals: {
     validPixelFormats: readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"];
     DEFAULT_BROWSER: import("./browser").Browser;
     validateFrameRange: (frameRange: import("./frame-range").FrameRange | null) => void;
-    DEFAULT_OPENGL_RENDERER: "angle" | "swangle" | "egl" | "swiftshader" | null;
-    validateOpenGlRenderer: (option: "angle" | "swangle" | "egl" | "swiftshader" | null) => "angle" | "swangle" | "egl" | "swiftshader" | null;
+    DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | null;
+    validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | null) => "swangle" | "angle" | "egl" | "swiftshader" | null;
     validImageFormats: readonly ["png", "jpeg", "none"];
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "gif"];
     DEFAULT_PIXEL_FORMAT: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le";

package/dist/last-frame-from-video-cache.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap, SpecialVCodecForTransparency } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/dist/provide-screenshot.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { Page } from './browser/BrowserPage';
 import type { ImageFormat } from './image-format';
 export declare const provideScreenshot: ({ page, imageFormat, options, quality, }: {

package/dist/puppeteer-screenshot.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { Page } from './browser/BrowserPage';
 import type { ScreenshotOptions } from './browser/ScreenshotOptions';
 export declare const screenshot: (page: Page, options: ScreenshotOptions) => Promise<Buffer | string | void>;

package/dist/render-media.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { SmallTCompMetadata } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { DownloadMap } from './assets/download-map';

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { Page } from './browser/BrowserPage';
 import type { ImageFormat } from './image-format';
 export declare const screenshotDOMElement: ({ page, imageFormat, quality, opts, }: {

package/dist/screenshot-task.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { Page } from './browser/BrowserPage';
 import type { ScreenshotOptions } from './browser/ScreenshotOptions';
 import type { StillImageFormat } from './image-format';

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

@@ -1,12 +1,34 @@
 "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);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stitchFramesToVideo = exports.spawnFfmpeg = void 0;
 const execa_1 = __importDefault(require("execa"));
-const fs_1 = __importDefault(require("fs"));
-const promises_1 = require("fs/promises");
+const fs_1 = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const remotion_1 = require("remotion");
 const calculate_asset_positions_1 = require("./assets/calculate-asset-positions");
@@ -182,7 +204,8 @@ const spawnFfmpeg = async (options, remotionRoot) => {
         }
         const file = await new Promise((resolve, reject) => {
             if (tempFile) {
-                (0, promises_1.readFile)(tempFile)
+                fs_1.promises
+                    .readFile(tempFile)
                     .then((f) => {
                     return resolve(f);
                 })
@@ -295,7 +318,8 @@ const spawnFfmpeg = async (options, remotionRoot) => {
                 (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames);
                 return null;
             }
-            return (0, promises_1.readFile)(tempFile)
+            return fs_1.promises
+                .readFile(tempFile)
                 .then((file) => {
                 return Promise.all([
                     file,

package/dist/validate-ffmpeg.js

@@ -69,7 +69,7 @@ const validateFfmpeg = async (customFfmpegBinary, remotionRoot, binary) => {
     }
     const binaryUrl = (0, ffmpeg_flags_1.getBinaryDownloadUrl)(binary);
     if (binaryUrl) {
-        await (0, ffmpeg_flags_1.downloadBinary)(remotionRoot, binaryUrl.url, 'ffmpeg');
+        await (0, ffmpeg_flags_1.downloadBinary)(remotionRoot, binaryUrl.url, binary);
         return (0, exports.validateFfmpeg)(customFfmpegBinary, remotionRoot, binary);
     }
     throw new Error(`${binary} could not be installed automatically. Your architecture and OS combination (os = ${os_1.default.platform()}, arch = ${process.arch}) is not supported. Please install ${binary} manually and add "${binary}" to your PATH.`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.3.0",
+	"version": "3.3.1",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.3.0",
+		"remotion": "3.3.1",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "29322c95729df0229eecc5f674d019145a783b46"
+	"gitHead": "f56a29f8ab19e279e1a9950d3a3ccbb3c8ae42e0"
 }