@remotion/renderer 4.0.11 → 4.0.14

package/dist/assets/calculate-asset-positions.d.ts

@@ -1,3 +1,3 @@
-import type { TAsset } from 'remotion';
+import type { TRenderAsset } from 'remotion';
 import type { Assets } from './types';
-export declare const calculateAssetPositions: (frames: TAsset[][]) => Assets;
+export declare const calculateAssetPositions: (frames: TRenderAsset[][]) => Assets;

package/dist/assets/calculate-asset-positions.js

@@ -7,19 +7,19 @@ const types_1 = require("./types");
 const areEqual = (a, b) => {
     return a.id === b.id;
 };
-const findFrom = (target, asset) => {
-    const index = target.findIndex((a) => areEqual(a, asset));
+const findFrom = (target, renderAsset) => {
+    const index = target.findIndex((a) => areEqual(a, renderAsset));
     if (index === -1) {
         return false;
     }
     target.splice(index, 1);
     return true;
 };
-const copyAndDeduplicateAssets = (assets) => {
+const copyAndDeduplicateAssets = (renderAssets) => {
     const deduplicated = [];
-    for (const asset of assets) {
-        if (!deduplicated.find((d) => d.id === asset.id)) {
-            deduplicated.push(asset);
+    for (const renderAsset of renderAssets) {
+        if (!deduplicated.find((d) => d.id === renderAsset.id)) {
+            deduplicated.push(renderAsset);
         }
     }
     return deduplicated;

package/dist/assets/convert-assets-to-file-urls.d.ts

@@ -1,8 +1,8 @@
-import type { TAsset } from 'remotion';
+import type { TRenderAsset } from 'remotion';
 import type { RenderMediaOnDownload } from './download-and-map-assets-to-file';
 import type { DownloadMap } from './download-map';
 export declare const convertAssetsToFileUrls: ({ assets, onDownload, downloadMap, }: {
-    assets: TAsset[][];
+    assets: TRenderAsset[][];
     onDownload: RenderMediaOnDownload;
     downloadMap: DownloadMap;
-}) => Promise<TAsset[][]>;
+}) => Promise<TRenderAsset[][]>;

package/dist/assets/convert-assets-to-file-urls.js

@@ -16,7 +16,7 @@ const convertAssetsToFileUrls = async ({ assets, onDownload, downloadMap, }) =>
         const result = await Promise.all(ch.map((assetsForFrame) => {
             return Promise.all(assetsForFrame.map((a) => {
                 return (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
-                    asset: a,
+                    renderAsset: a,
                     onDownload,
                     downloadMap,
                 });

package/dist/assets/download-and-map-assets-to-file.d.ts

@@ -1,4 +1,4 @@
-import type { TAsset } from 'remotion';
+import type { TRenderAsset } from 'remotion';
 import type { DownloadMap } from './download-map';
 export type RenderMediaOnDownload = (src: string) => ((progress: {
     percent: number | null;
@@ -16,9 +16,9 @@ export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, conte
     contentDisposition: string | null;
     contentType: string | null;
 }) => string;
-export declare const downloadAndMapAssetsToFileUrl: ({ asset, onDownload, downloadMap, }: {
-    asset: TAsset;
+export declare const downloadAndMapAssetsToFileUrl: ({ renderAsset, onDownload, downloadMap, }: {
+    renderAsset: TRenderAsset;
     onDownload: RenderMediaOnDownload | null;
     downloadMap: DownloadMap;
-}) => Promise<TAsset>;
+}) => Promise<TRenderAsset>;
 export declare const attachDownloadListenerToEmitter: (downloadMap: DownloadMap, onDownload: RenderMediaOnDownload | null) => () => void;

package/dist/assets/download-and-map-assets-to-file.js

@@ -241,15 +241,15 @@ const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, contentDisposition,
     return node_path_1.default.join(downloadDir, (0, sanitize_filepath_1.sanitizeFilePath)(filename));
 };
 exports.getSanitizedFilenameForAssetUrl = getSanitizedFilenameForAssetUrl;
-const downloadAndMapAssetsToFileUrl = async ({ asset, onDownload, downloadMap, }) => {
+const downloadAndMapAssetsToFileUrl = async ({ renderAsset, onDownload, downloadMap, }) => {
     const cleanup = (0, exports.attachDownloadListenerToEmitter)(downloadMap, onDownload);
     const newSrc = await (0, exports.downloadAsset)({
-        src: asset.src,
+        src: renderAsset.src,
         downloadMap,
     });
     cleanup();
     return {
-        ...asset,
+        ...renderAsset,
         src: newSrc,
     };
 };

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

@@ -1,4 +1,4 @@
-import type { TAsset } from 'remotion';
+import type { TRenderAsset } from 'remotion';
 import { OffthreadVideoServerEmitter } from '../offthread-video-server';
 import type { RenderMediaOnDownload } from './download-and-map-assets-to-file';
 export type AudioChannelsAndDurationResultCache = {
@@ -38,7 +38,7 @@ export type DownloadMap = {
     };
 };
 export type RenderAssetInfo = {
-    assets: TAsset[][];
+    assets: TRenderAsset[][];
     imageSequenceName: string;
     firstFrameIndex: number;
     downloadMap: DownloadMap;

package/dist/assets/types.d.ts

@@ -1,5 +1,5 @@
-import type { TAsset } from 'remotion';
-export type UnsafeAsset = Omit<TAsset, 'frame' | 'id' | 'volume' | 'mediaFrame'> & {
+import type { TRenderAsset } from 'remotion';
+export type UnsafeAsset = Omit<TRenderAsset, 'frame' | 'id' | 'volume' | 'mediaFrame'> & {
     startInVideo: number;
     duration: number | null;
     trimLeft: number;
@@ -13,5 +13,5 @@ export type MediaAsset = Omit<UnsafeAsset, 'duration' | 'volume'> & {
     duration: number;
     volume: AssetVolume;
 };
-export declare const uncompressMediaAsset: (allAssets: TAsset[], assetToUncompress: TAsset) => TAsset;
+export declare const uncompressMediaAsset: (allRenderAssets: TRenderAsset[], assetToUncompress: TRenderAsset) => TRenderAsset;
 export type Assets = MediaAsset[];

package/dist/assets/types.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uncompressMediaAsset = void 0;
-const uncompressMediaAsset = (allAssets, assetToUncompress) => {
+const uncompressMediaAsset = (allRenderAssets, assetToUncompress) => {
     const isCompressed = assetToUncompress.src.match(/same-as-(.*)-([0-9]+)$/);
     if (!isCompressed) {
         return assetToUncompress;
     }
     const [, id, frame] = isCompressed;
-    const assetToFill = allAssets.find((a) => a.id === id && String(a.frame) === frame);
+    const assetToFill = allRenderAssets.find((a) => a.id === id && String(a.frame) === frame);
     if (!assetToFill) {
         console.log('List of assets:');
-        console.log(allAssets);
+        console.log(allRenderAssets);
         throw new TypeError(`Cannot uncompress asset, asset list seems corrupt. Please file a bug in the Remotion repo with the debug information above.`);
     }
     return {

package/dist/combine-videos.js

@@ -7,6 +7,7 @@ const node_path_1 = require("node:path");
 const audio_codec_1 = require("./audio-codec");
 const call_ffmpeg_1 = require("./call-ffmpeg");
 const is_audio_codec_1 = require("./is-audio-codec");
+const logger_1 = require("./logger");
 const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
 const truthy_1 = require("./truthy");
 const combineVideos = async (options) => {
@@ -49,7 +50,10 @@ const combineVideos = async (options) => {
         (_a = task.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
             if (onProgress) {
                 const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString('utf8'));
-                if (parsed !== undefined) {
+                if (parsed === undefined) {
+                    logger_1.Log.verbose(data.toString('utf8'));
+                }
+                else {
                     onProgress(parsed);
                 }
             }

package/dist/compositor/compositor.js

@@ -16,9 +16,10 @@ const get_executable_path_1 = require("./get-executable-path");
 const make_nonce_1 = require("./make-nonce");
 const getIdealMaximumFrameCacheItems = () => {
     const freeMemory = node_os_1.default.freemem();
-    // Assuming 1 frame is approximately 6MB
+    // Assuming 1 frame is approximately 24MB
+    // (4K video)
     // Assuming only half the available memory should be used
-    const max = Math.floor(freeMemory / (1024 * 1024 * 6));
+    const max = Math.floor(freeMemory / (1024 * 1024 * 24));
     // Never store more than 2000 frames
     // But 60 is needed even if it's going to swap
     return Math.max(60, Math.min(max, 2000));
@@ -145,7 +146,7 @@ const startCompositor = (type, payload, logLevel, indent) => {
     });
     let resolve = null;
     let reject = null;
-    child.on('close', (code) => {
+    child.on('close', (code, signal) => {
         const waitersToKill = Array.from(waiters.values());
         if (code === 0) {
             runningStatus = { type: 'quit-without-error' };
@@ -156,9 +157,12 @@ const startCompositor = (type, payload, logLevel, indent) => {
             waiters.clear();
         }
         else {
-            const errorMessage = Buffer.concat(stderrChunks).toString('utf-8');
+            const errorMessage = Buffer.concat(stderrChunks).toString('utf-8') +
+                outputBuffer.toString('utf-8');
             runningStatus = { type: 'quit-with-error', error: errorMessage };
-            const error = new Error(`Compositor panicked with code ${code}: ${errorMessage}`);
+            const error = code === null
+                ? new Error(`Compositor exited with signal ${signal}`)
+                : new Error(`Compositor panicked with code ${code}: ${errorMessage}`);
             for (const waiter of waitersToKill) {
                 waiter.reject(error);
             }

package/dist/compress-assets.d.ts

@@ -2,6 +2,6 @@
  * Since audio or video can be base64-encoded, those can be really long strings.
  * Since we track the `src` property for every frame, Node.JS can run out of memory easily. Instead of duplicating the src for every frame, we save memory by replacing the full base 64 encoded data with a string `same-as-[asset-id]-[frame]` referencing a previous asset with the same src.
  */
-import type { TAsset } from 'remotion';
-export declare const compressAsset: (previousAssets: TAsset[], newAsset: TAsset) => TAsset;
+import type { TRenderAsset } from 'remotion';
+export declare const compressAsset: (previousRenderAssets: TRenderAsset[], newRenderAsset: TRenderAsset) => TRenderAsset;
 export declare const isAssetCompressed: (src: string) => boolean;

package/dist/compress-assets.js

@@ -5,16 +5,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAssetCompressed = exports.compressAsset = void 0;
-const compressAsset = (previousAssets, newAsset) => {
-    if (newAsset.src.length < 400) {
-        return newAsset;
+const compressAsset = (previousRenderAssets, newRenderAsset) => {
+    if (newRenderAsset.src.length < 400) {
+        return newRenderAsset;
     }
-    const assetWithSameSrc = previousAssets.find((a) => a.src === newAsset.src);
+    const assetWithSameSrc = previousRenderAssets.find((a) => a.src === newRenderAsset.src);
     if (!assetWithSameSrc) {
-        return newAsset;
+        return newRenderAsset;
     }
     return {
-        ...newAsset,
+        ...newRenderAsset,
         src: `same-as-${assetWithSameSrc.id}-${assetWithSameSrc.frame}`,
     };
 };

package/dist/index.d.ts

@@ -44,7 +44,7 @@ export declare const RenderInternals: {
         downloadMap: import("./assets/download-map").DownloadMap;
         remotionRoot: string;
         concurrency: number;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
         indent: boolean;
     }) => Promise<{
         port: number;
@@ -123,7 +123,7 @@ export declare const RenderInternals: {
     DEFAULT_CODEC: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     isAudioCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif" | undefined) => boolean;
     logLevels: readonly ["verbose", "info", "warn", "error"];
-    isEqualOrBelowLogLevel: (currentLevel: "error" | "verbose" | "info" | "warn", level: "error" | "verbose" | "info" | "warn") => boolean;
+    isEqualOrBelowLogLevel: (currentLevel: "verbose" | "info" | "warn" | "error", level: "verbose" | "info" | "warn" | "error") => boolean;
     isValidLogLevel: (level: string) => boolean;
     perf: typeof perf;
     convertToPositiveFrameIndex: ({ frame, durationInFrames, }: {
@@ -352,30 +352,30 @@ export declare const RenderInternals: {
         verbose: (message?: any, ...optionalParams: any[]) => void;
         verboseAdvanced: (options: {
             indent: boolean;
-            logLevel: "error" | "verbose" | "info" | "warn";
+            logLevel: "verbose" | "info" | "warn" | "error";
         } & {
             tag?: string | undefined;
         }, message?: any, ...optionalParams: any[]) => void;
         info: (message?: any, ...optionalParams: any[]) => void;
         infoAdvanced: (options: {
             indent: boolean;
-            logLevel: "error" | "verbose" | "info" | "warn";
+            logLevel: "verbose" | "info" | "warn" | "error";
         }, message?: any, ...optionalParams: any[]) => void;
         warn: (message?: any, ...optionalParams: any[]) => void;
         warnAdvanced: (options: {
             indent: boolean;
-            logLevel: "error" | "verbose" | "info" | "warn";
+            logLevel: "verbose" | "info" | "warn" | "error";
         }, message?: any, ...optionalParams: any[]) => void;
         error: (message?: any, ...optionalParams: any[]) => void;
         errorAdvanced: (options: {
             indent: boolean;
-            logLevel: "error" | "verbose" | "info" | "warn";
+            logLevel: "verbose" | "info" | "warn" | "error";
         } & {
             tag?: string | undefined;
         }, message?: any, ...optionalParams: any[]) => void;
     };
-    getLogLevel: () => "error" | "verbose" | "info" | "warn";
-    setLogLevel: (newLogLevel: "error" | "verbose" | "info" | "warn") => void;
+    getLogLevel: () => "verbose" | "info" | "warn" | "error";
+    setLogLevel: (newLogLevel: "verbose" | "info" | "warn" | "error") => void;
     INDENT_TOKEN: string;
     isColorSupported: () => boolean;
     HeadlessBrowser: typeof HeadlessBrowser;
@@ -384,7 +384,7 @@ export declare const RenderInternals: {
         port: number | null;
         remotionRoot: string;
         concurrency: number;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
         indent: boolean;
     }) => Promise<import("./prepare-server").RemotionServer>;
     makeOrReuseServer: (server: import("./prepare-server").RemotionServer | undefined, config: {
@@ -392,7 +392,7 @@ export declare const RenderInternals: {
         port: number | null;
         remotionRoot: string;
         concurrency: number;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
         indent: boolean;
     }, { onDownload, onError, }: {
         onError: (err: Error) => void;
@@ -421,7 +421,7 @@ export declare const RenderInternals: {
         cancelSignal: import("./make-cancel-signal").CancelSignal | null;
         indent: boolean;
         server: import("./prepare-server").RemotionServer | undefined;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
         serveUrl: string;
         port: number | null;
     }) => Promise<{
@@ -434,7 +434,7 @@ export declare const RenderInternals: {
         viewport: import("./browser/PuppeteerViewport").Viewport | null;
         indent: boolean;
         browser: import("./browser").Browser;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
     }) => Promise<HeadlessBrowser>;
     internalSelectComposition: (options: {
         serializedInputPropsWithCustomSchema: string;
@@ -447,7 +447,7 @@ export declare const RenderInternals: {
         port: number | null;
         indent: boolean;
         server: import("./prepare-server").RemotionServer | undefined;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
         serveUrl: string;
         id: string;
     }) => Promise<{
@@ -465,7 +465,7 @@ export declare const RenderInternals: {
         port: number | null;
         server: import("./prepare-server").RemotionServer | undefined;
         indent: boolean;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
         serveUrlOrWebpackUrl: string;
     }) => Promise<import("remotion").VideoConfig[]>;
     internalRenderFrames: ({ browserExecutable, cancelSignal, chromiumOptions, composition, concurrency, envVariables, everyNthFrame, frameRange, imageFormat, indent, jpegQuality, muted, onBrowserLog, onDownload, onFrameBuffer, onFrameUpdate, onStart, outputDir, port, puppeteerInstance, scale, server, timeoutInMilliseconds, logLevel, webpackBundleOrServeUrl, serializedInputPropsWithCustomSchema, serializedResolvedPropsWithCustomSchema, }: import("./render-frames").InternalRenderFramesOptions) => Promise<import("./types").RenderFramesOutput>;

package/dist/logger.d.ts

@@ -19,6 +19,6 @@ export declare const Log: {
     error: (message?: any, ...optionalParams: any[]) => void;
     errorAdvanced: (options: VerboseLogOptions, message?: any, ...optionalParams: any[]) => void;
 };
-export declare const getLogLevel: () => "error" | "verbose" | "info" | "warn";
+export declare const getLogLevel: () => "verbose" | "info" | "warn" | "error";
 export declare const setLogLevel: (newLogLevel: LogLevel) => void;
 export {};

package/dist/offthread-video-server.js

@@ -38,8 +38,17 @@ const startOffthreadVideoServer = ({ downloadMap, concurrency, logLevel, indent,
     }, logLevel, indent);
     return {
         close: () => {
-            compositor.finishCommands();
-            return compositor.waitForDone();
+            // Note: This is being used as a promise:
+            //     .close().then()
+            // but if finishCommands() fails, it acts like a sync function,
+            // therefore we have to catch an error and put a promise rejection
+            try {
+                compositor.finishCommands();
+                return compositor.waitForDone();
+            }
+            catch (err) {
+                return Promise.reject(err);
+            }
         },
         listener: (req, response) => {
             if (!req.url) {

package/dist/render-frames.js

@@ -199,9 +199,9 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
         (0, perf_1.stopPerfMeasure)(id);
         const compressedAssets = collectedAssets.map((asset) => (0, compress_assets_1.compressAsset)(assets.filter(truthy_1.truthy).flat(1), asset));
         assets[index] = compressedAssets;
-        compressedAssets.forEach((asset) => {
+        compressedAssets.forEach((renderAsset) => {
             (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
-                asset,
+                renderAsset,
                 onDownload,
                 downloadMap,
             }).catch((err) => {

package/dist/symbolicate-stacktrace.js

@@ -44,7 +44,13 @@ const getSourceMap = (filePath, fileContents, type) => {
             throw new Error('Sorry, non-base64 inline source-map encoding is not supported.');
         }
         const converted = window.atob(sm.substring(match2[0].length));
-        return Promise.resolve(new source_map_1.SourceMapConsumer(JSON.parse(converted)));
+        try {
+            const sourceMapConsumer = new source_map_1.SourceMapConsumer(JSON.parse(converted));
+            return Promise.resolve(sourceMapConsumer);
+        }
+        catch (_a) {
+            return Promise.resolve(null);
+        }
     }
     if (type === 'local') {
         // Find adjacent file: bundle.js -> bundle.js.map

package/dist/take-frame-and-compose.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { TAsset } from 'remotion';
+import type { TRenderAsset } from 'remotion';
 import type { DownloadMap } from './assets/download-map';
 import type { Page } from './browser/BrowserPage';
 import type { Compositor } from './compositor/compositor';
@@ -18,5 +18,5 @@ export declare const takeFrameAndCompose: ({ freePage, imageFormat, jpegQuality,
     compositor: Compositor;
 }) => Promise<{
     buffer: Buffer | null;
-    collectedAssets: TAsset[];
+    collectedAssets: TRenderAsset[];
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.11",
+  "version": "4.0.14",
   "description": "Renderer for Remotion",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "extract-zip": "2.0.1",
     "source-map": "^0.8.0-beta.0",
     "ws": "8.7.0",
-    "remotion": "4.0.11"
+    "remotion": "4.0.14"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -42,13 +42,13 @@
     "zod": "^3.21.4"
   },
   "optionalDependencies": {
-    "@remotion/compositor-linux-arm64-musl": "4.0.11",
-    "@remotion/compositor-darwin-arm64": "4.0.11",
-    "@remotion/compositor-linux-x64-gnu": "4.0.11",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.11",
-    "@remotion/compositor-darwin-x64": "4.0.11",
-    "@remotion/compositor-linux-x64-musl": "4.0.11",
-    "@remotion/compositor-win32-x64-msvc": "4.0.11"
+    "@remotion/compositor-darwin-arm64": "4.0.14",
+    "@remotion/compositor-darwin-x64": "4.0.14",
+    "@remotion/compositor-linux-arm64-musl": "4.0.14",
+    "@remotion/compositor-linux-x64-gnu": "4.0.14",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.14",
+    "@remotion/compositor-win32-x64-msvc": "4.0.14",
+    "@remotion/compositor-linux-x64-musl": "4.0.14"
   },
   "keywords": [
     "remotion",