@remotion/renderer 4.0.3 → 4.0.5

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

@@ -1,14 +1,12 @@
 import type { TAsset } from 'remotion';
-import { OffthreadVideoServerEmitter } from '../offthread-video-server';
 import type { DownloadMap } from './download-map';
 export type RenderMediaOnDownload = (src: string) => ((progress: {
     percent: number | null;
     downloaded: number;
     totalSize: number | null;
 }) => void) | undefined | void;
-export declare const downloadAsset: ({ src, downloadMap, emitter, }: {
+export declare const downloadAsset: ({ src, downloadMap, }: {
     src: string;
-    emitter: OffthreadVideoServerEmitter;
     downloadMap: DownloadMap;
 }) => Promise<string>;
 export declare const markAllAssetsAsDownloaded: (downloadMap: DownloadMap) => void;
@@ -23,4 +21,4 @@ export declare const downloadAndMapAssetsToFileUrl: ({ asset, onDownload, downlo
     onDownload: RenderMediaOnDownload | null;
     downloadMap: DownloadMap;
 }) => Promise<TAsset>;
-export declare const attachDownloadListenerToEmitter: (emitter: OffthreadVideoServerEmitter, onDownload: RenderMediaOnDownload | null) => () => void;
+export declare const attachDownloadListenerToEmitter: (downloadMap: DownloadMap, onDownload: RenderMediaOnDownload | null) => () => void;

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

@@ -33,7 +33,6 @@ const remotion_1 = require("remotion");
 const compress_assets_1 = require("../compress-assets");
 const ensure_output_directory_1 = require("../ensure-output-directory");
 const mime_types_1 = require("../mime-types");
-const offthread_video_server_1 = require("../offthread-video-server");
 const download_file_1 = require("./download-file");
 const sanitize_filepath_1 = require("./sanitize-filepath");
 const waitForAssetToBeDownloaded = ({ src, downloadDir, downloadMap, }) => {
@@ -116,7 +115,7 @@ function validateBufferEncoding(potentialEncoding, dataUrl) {
         throw new TypeError(errMessage);
     }
 }
-const downloadAsset = async ({ src, downloadMap, emitter, }) => {
+const downloadAsset = async ({ src, downloadMap, }) => {
     var _a, _b, _c;
     if ((0, compress_assets_1.isAssetCompressed)(src)) {
         return src;
@@ -146,7 +145,7 @@ const downloadAsset = async ({ src, downloadMap, emitter, }) => {
     if (process.env.NODE_ENV === 'test') {
         console.log('Actually downloading asset', src);
     }
-    emitter.dispatchDownload(src);
+    downloadMap.emitter.dispatchDownload(src);
     if (src.startsWith('data:')) {
         const [assetDetails, assetData] = src.substring('data:'.length).split(',');
         if (!assetDetails.includes(';')) {
@@ -176,7 +175,7 @@ const downloadAsset = async ({ src, downloadMap, emitter, }) => {
     const { to } = await (0, download_file_1.downloadFile)({
         url: src,
         onProgress: (progress) => {
-            emitter.dispatchDownloadProgress(src, progress.percent, progress.downloaded, progress.totalSize);
+            downloadMap.emitter.dispatchDownloadProgress(src, progress.percent, progress.downloaded, progress.totalSize);
         },
         to: (contentDisposition, contentType) => (0, exports.getSanitizedFilenameForAssetUrl)({
             contentDisposition,
@@ -243,11 +242,9 @@ const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, contentDisposition,
 };
 exports.getSanitizedFilenameForAssetUrl = getSanitizedFilenameForAssetUrl;
 const downloadAndMapAssetsToFileUrl = async ({ asset, onDownload, downloadMap, }) => {
-    const emitter = new offthread_video_server_1.OffthreadVideoServerEmitter();
-    const cleanup = (0, exports.attachDownloadListenerToEmitter)(emitter, onDownload);
+    const cleanup = (0, exports.attachDownloadListenerToEmitter)(downloadMap, onDownload);
     const newSrc = await (0, exports.downloadAsset)({
         src: asset.src,
-        emitter,
         downloadMap,
     });
     cleanup();
@@ -257,14 +254,21 @@ const downloadAndMapAssetsToFileUrl = async ({ asset, onDownload, downloadMap, }
     };
 };
 exports.downloadAndMapAssetsToFileUrl = downloadAndMapAssetsToFileUrl;
-const attachDownloadListenerToEmitter = (emitter, onDownload) => {
+const attachDownloadListenerToEmitter = (downloadMap, onDownload) => {
     const cleanup = [];
     if (!onDownload) {
         return () => undefined;
     }
-    const a = emitter.addEventListener('download', ({ detail: { src: initialSrc } }) => {
+    if (downloadMap.downloadListeners.includes(onDownload)) {
+        return () => undefined;
+    }
+    downloadMap.downloadListeners.push(onDownload);
+    cleanup.push(() => {
+        downloadMap.downloadListeners = downloadMap.downloadListeners.filter((l) => l !== onDownload);
+    });
+    const a = downloadMap.emitter.addEventListener('download', ({ detail: { src: initialSrc } }) => {
         const progress = onDownload(initialSrc);
-        const b = emitter.addEventListener('progress', ({ detail: { downloaded, percent, src: progressSrc, totalSize } }) => {
+        const b = downloadMap.emitter.addEventListener('progress', ({ detail: { downloaded, percent, src: progressSrc, totalSize } }) => {
             if (initialSrc === progressSrc) {
                 progress === null || progress === void 0 ? void 0 : progress({ downloaded, percent, totalSize });
             }

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

@@ -1,10 +1,14 @@
 import type { TAsset } from 'remotion';
+import { OffthreadVideoServerEmitter } from '../offthread-video-server';
+import type { RenderMediaOnDownload } from './download-and-map-assets-to-file';
 export type AudioChannelsAndDurationResultCache = {
     channels: number;
     duration: number | null;
 };
 export type DownloadMap = {
     id: string;
+    emitter: OffthreadVideoServerEmitter;
+    downloadListeners: RenderMediaOnDownload[];
     isDownloadingMap: {
         [src: string]: {
             [downloadDir: string]: boolean;

package/dist/assets/download-map.js

@@ -31,6 +31,7 @@ const node_fs_1 = __importStar(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const delete_directory_1 = require("../delete-directory");
 const tmp_dir_1 = require("../tmp-dir");
+const offthread_video_server_1 = require("../offthread-video-server");
 const makeAndReturn = (dir, name) => {
     const p = node_path_1.default.join(dir, name);
     (0, node_fs_1.mkdirSync)(p);
@@ -51,6 +52,7 @@ const makeDownloadMap = () => {
         durationOfAssetCache: {},
         id: String(Math.random()),
         assetDir: dir,
+        downloadListeners: [],
         downloadDir: makeAndReturn(dir, 'remotion-assets-dir'),
         complexFilter: makeAndReturn(dir, 'remotion-complex-filter'),
         preEncode: makeAndReturn(dir, 'pre-encode'),
@@ -59,6 +61,7 @@ const makeDownloadMap = () => {
         stitchFrames: makeAndReturn(dir, 'remotion-stitch-temp-dir'),
         compositingDir: makeAndReturn(dir, 'remotion-compositing-temp-dir'),
         compositorCache: {},
+        emitter: new offthread_video_server_1.OffthreadVideoServerEmitter(),
     };
 };
 exports.makeDownloadMap = makeDownloadMap;

package/dist/audio-codec.d.ts

@@ -5,7 +5,7 @@ export declare const supportedAudioCodecs: {
     readonly h264: readonly ["aac", "pcm-16"];
     readonly 'h264-mkv': readonly ["pcm-16"];
     readonly aac: readonly ["aac", "pcm-16"];
-    readonly gif: const[];
+    readonly gif: readonly [];
     readonly h265: readonly ["aac", "pcm-16"];
     readonly mp3: readonly ["mp3", "pcm-16"];
     readonly prores: readonly ["aac", "pcm-16"];

package/dist/client.d.ts

@@ -12,7 +12,7 @@ export declare const BrowserSafeApis: {
         readonly h264: readonly ["aac", "pcm-16"];
         readonly 'h264-mkv': readonly ["pcm-16"];
         readonly aac: readonly ["aac", "pcm-16"];
-        readonly gif: const[];
+        readonly gif: readonly [];
         readonly h265: readonly ["aac", "pcm-16"];
         readonly mp3: readonly ["mp3", "pcm-16"];
         readonly prores: readonly ["aac", "pcm-16"];
@@ -132,12 +132,7 @@ export declare const BrowserSafeApis: {
         };
         gif: {
             default: import("./file-extensions").FileExtension;
-            forAudioCodec: {
-                [x: string]: {
-                    possible: import("./file-extensions").FileExtension[];
-                    default: import("./file-extensions").FileExtension;
-                };
-            };
+            forAudioCodec: {};
         };
     };
     defaultAudioCodecs: {
@@ -178,8 +173,8 @@ export declare const BrowserSafeApis: {
             lossless: "pcm-16" | null;
         };
         gif: {
-            compressed: any;
-            lossless: any;
+            compressed: null;
+            lossless: null;
         };
     };
     defaultCodecsForFileExtension: Record<import("./file-extensions").FileExtension, "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">;

package/dist/get-compositions.js

@@ -12,7 +12,7 @@ const seek_to_frame_1 = require("./seek-to-frame");
 const set_props_and_env_1 = require("./set-props-and-env");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 const logger_1 = require("./logger");
-const innerGetCompositions = async ({ envVariables, serializedInputPropsWithCustomSchema, onBrowserLog, page, proxyPort, serveUrl, timeoutInMilliseconds, }) => {
+const innerGetCompositions = async ({ envVariables, serializedInputPropsWithCustomSchema, onBrowserLog, page, proxyPort, serveUrl, timeoutInMilliseconds, indent, logLevel, }) => {
     if (onBrowserLog) {
         page.on('console', (log) => {
             onBrowserLog({
@@ -34,6 +34,8 @@ const innerGetCompositions = async ({ envVariables, serializedInputPropsWithCust
         retriesRemaining: 2,
         audioEnabled: false,
         videoEnabled: false,
+        indent,
+        logLevel,
     });
     await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         page,
@@ -96,6 +98,8 @@ const internalGetCompositions = async ({ browserExecutable, chromiumOptions, env
                 proxyPort: offthreadPort,
                 serveUrl,
                 timeoutInMilliseconds,
+                indent,
+                logLevel,
             });
         })
             .then((comp) => {

package/dist/get-local-browser-executable.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalBrowserExecutable = exports.ensureLocalBrowser = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
 const BrowserFetcher_1 = require("./browser/BrowserFetcher");
 const create_browser_fetcher_1 = require("./browser/create-browser-fetcher");
 const revisions_1 = require("./browser/revisions");
@@ -28,6 +29,20 @@ const getSearchPathsForProduct = (product) => {
             process.platform === 'win32'
                 ? 'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe'
                 : null,
+            process.platform === 'win32'
+                ? node_os_1.default.homedir() +
+                    '\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe'
+                : null,
+            process.platform === 'win32'
+                ? 'C:\\Program Files\\Google\\Chrome SxS\\Application\\chrome.exe'
+                : null,
+            process.platform === 'win32'
+                ? 'C:\\Program Files (x86)\\Google\\Chrome SxS\\Application\\chrome.exe'
+                : null,
+            process.platform === 'win32'
+                ? node_os_1.default.homedir() +
+                    '\\AppData\\Local\\Google\\Chrome SxS\\Application\\chrome.exe'
+                : null,
         ].filter(Boolean);
     }
     if (product === 'firefox') {

package/dist/index.d.ts

@@ -43,13 +43,12 @@ 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;
         close: () => Promise<void>;
         compositor: import("./compositor/compositor").Compositor;
-        events: import("./offthread-video-server").OffthreadVideoServerEmitter;
     }>;
     validateEvenDimensionsWithCodec: ({ width, height, codec, scale, }: {
         width: number;
@@ -123,7 +122,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, }: {
@@ -262,19 +261,14 @@ export declare const RenderInternals: {
         };
         gif: {
             default: import("./file-extensions").FileExtension;
-            forAudioCodec: {
-                [x: string]: {
-                    possible: import("./file-extensions").FileExtension[];
-                    default: import("./file-extensions").FileExtension;
-                };
-            };
+            forAudioCodec: {};
         };
     };
     supportedAudioCodecs: {
         readonly h264: readonly ["aac", "pcm-16"];
         readonly 'h264-mkv': readonly ["pcm-16"];
         readonly aac: readonly ["aac", "pcm-16"];
-        readonly gif: const[];
+        readonly gif: readonly [];
         readonly h265: readonly ["aac", "pcm-16"];
         readonly mp3: readonly ["mp3", "pcm-16"];
         readonly prores: readonly ["aac", "pcm-16"];
@@ -357,24 +351,24 @@ 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;
     };
-    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;
@@ -383,7 +377,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: {
@@ -391,7 +385,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;
@@ -420,7 +414,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<{
@@ -433,7 +427,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;
@@ -446,7 +440,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<{
@@ -464,7 +458,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

@@ -18,6 +18,6 @@ export declare const Log: {
     warnAdvanced: (options: LogOptions, message?: any, ...optionalParams: any[]) => void;
     error: (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.d.ts

@@ -16,7 +16,6 @@ export declare const startOffthreadVideoServer: ({ downloadMap, concurrency, log
     listener: RequestListener;
     close: () => Promise<void>;
     compositor: Compositor;
-    events: OffthreadVideoServerEmitter;
 };
 type DownloadEventPayload = {
     src: string;

package/dist/offthread-video-server.js

@@ -30,7 +30,6 @@ const extractUrlAndSourceFromUrl = (url) => {
 };
 exports.extractUrlAndSourceFromUrl = extractUrlAndSourceFromUrl;
 const startOffthreadVideoServer = ({ downloadMap, concurrency, logLevel, indent, }) => {
-    const events = new OffthreadVideoServerEmitter();
     const compositor = (0, compositor_1.startCompositor)('StartLongRunningProcess', {
         concurrency,
         maximum_frame_cache_items: (0, compositor_1.getIdealMaximumFrameCacheItems)(),
@@ -70,7 +69,7 @@ const startOffthreadVideoServer = ({ downloadMap, concurrency, logLevel, indent,
                 return;
             }
             let extractStart = Date.now();
-            (0, download_and_map_assets_to_file_1.downloadAsset)({ src, emitter: events, downloadMap })
+            (0, download_and_map_assets_to_file_1.downloadAsset)({ src, downloadMap })
                 .then((to) => {
                 extractStart = Date.now();
                 return compositor.executeCommand('ExtractFrame', {
@@ -95,12 +94,11 @@ const startOffthreadVideoServer = ({ downloadMap, concurrency, logLevel, indent,
                 .catch((err) => {
                 res.writeHead(500);
                 res.end();
-                events.dispatchError(err);
+                downloadMap.emitter.dispatchError(err);
                 console.log('Error occurred', err);
             });
         },
         compositor,
-        events,
     };
 };
 exports.startOffthreadVideoServer = startOffthreadVideoServer;

package/dist/prepare-server.d.ts

@@ -1,7 +1,6 @@
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { DownloadMap } from './assets/download-map';
 import type { Compositor } from './compositor/compositor';
-import type { OffthreadVideoServerEmitter } from './offthread-video-server';
 import type { AnySourceMapConsumer } from './symbolicate-stacktrace';
 import type { LogLevel } from './log-level';
 export type RemotionServer = {
@@ -10,7 +9,6 @@ export type RemotionServer = {
     offthreadPort: number;
     compositor: Compositor;
     sourceMap: AnySourceMapConsumer | null;
-    events: OffthreadVideoServerEmitter;
     downloadMap: DownloadMap;
 };
 type PrepareServerOptions = {

package/dist/prepare-server.js

@@ -18,7 +18,7 @@ const prepareServer = async ({ webpackConfigOrServeUrl, port, remotionRoot, conc
     const downloadMap = (0, download_map_1.makeDownloadMap)();
     logger_1.Log.verboseAdvanced({ indent, logLevel }, 'Created directory for temporary files', downloadMap.assetDir);
     if ((0, is_serve_url_1.isServeUrl)(webpackConfigOrServeUrl)) {
-        const { port: offthreadPort, close: closeProxy, compositor: comp, events, } = await (0, serve_static_1.serveStatic)(null, {
+        const { port: offthreadPort, close: closeProxy, compositor: comp, } = await (0, serve_static_1.serveStatic)(null, {
             port,
             downloadMap,
             remotionRoot,
@@ -35,7 +35,6 @@ const prepareServer = async ({ webpackConfigOrServeUrl, port, remotionRoot, conc
             offthreadPort,
             compositor: comp,
             sourceMap: null,
-            events,
             downloadMap,
         });
     }
@@ -46,7 +45,7 @@ const prepareServer = async ({ webpackConfigOrServeUrl, port, remotionRoot, conc
         throw new Error(`Tried to serve the Webpack bundle on a HTTP server, but the file ${indexFile} does not exist. Is this a valid path to a Webpack bundle?`);
     }
     const sourceMap = (0, symbolicate_stacktrace_1.getSourceMapFromLocalFile)(node_path_1.default.join(webpackConfigOrServeUrl, remotion_1.Internals.bundleName));
-    const { port: serverPort, close, compositor, events: newEvents, } = await (0, serve_static_1.serveStatic)(webpackConfigOrServeUrl, {
+    const { port: serverPort, close, compositor, } = await (0, serve_static_1.serveStatic)(webpackConfigOrServeUrl, {
         port,
         downloadMap,
         remotionRoot,
@@ -67,15 +66,14 @@ const prepareServer = async ({ webpackConfigOrServeUrl, port, remotionRoot, conc
         offthreadPort: serverPort,
         compositor,
         sourceMap: await sourceMap,
-        events: newEvents,
         downloadMap,
     });
 };
 exports.prepareServer = prepareServer;
 const makeOrReuseServer = async (server, config, { onDownload, onError, }) => {
     if (server) {
-        const cleanupOnDownload = (0, download_and_map_assets_to_file_1.attachDownloadListenerToEmitter)(server.events, onDownload);
-        const cleanupError = server.events.addEventListener('error', ({ detail: { error } }) => {
+        const cleanupOnDownload = (0, download_and_map_assets_to_file_1.attachDownloadListenerToEmitter)(server.downloadMap, onDownload);
+        const cleanupError = server.downloadMap.emitter.addEventListener('error', ({ detail: { error } }) => {
             onError(error);
         });
         return {
@@ -88,8 +86,8 @@ const makeOrReuseServer = async (server, config, { onDownload, onError, }) => {
         };
     }
     const newServer = await (0, exports.prepareServer)(config);
-    const cleanupOnDownloadNew = (0, download_and_map_assets_to_file_1.attachDownloadListenerToEmitter)(newServer.events, onDownload);
-    const cleanupErrorNew = newServer.events.addEventListener('error', ({ detail: { error } }) => {
+    const cleanupOnDownloadNew = (0, download_and_map_assets_to_file_1.attachDownloadListenerToEmitter)(newServer.downloadMap, onDownload);
+    const cleanupErrorNew = newServer.downloadMap.emitter.addEventListener('error', ({ detail: { error } }) => {
         onError(error);
     });
     return {

package/dist/render-frames.js

@@ -79,6 +79,8 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
             retriesRemaining: 2,
             audioEnabled: !muted,
             videoEnabled: imageFormat !== 'none',
+            indent,
+            logLevel,
         });
         await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
             // eslint-disable-next-line max-params
@@ -338,9 +340,11 @@ const internalRenderFrames = ({ browserExecutable, cancelSignal, chromiumOptions
                     onError,
                 }),
                 browserInstance,
-            ]).then(([{ server: { serveUrl, offthreadPort, compositor, sourceMap, downloadMap, }, cleanupServer, }, pInstance,]) => {
+            ]).then(([{ server: openedServer, cleanupServer }, pInstance]) => {
+                const { serveUrl, offthreadPort, compositor, sourceMap, downloadMap } = openedServer;
                 const browserReplacer = (0, replace_browser_1.handleBrowserCrash)(pInstance, logLevel, indent);
-                cleanup.push((0, cycle_browser_tabs_1.cycleBrowserTabs)(browserReplacer, actualConcurrency, logLevel, indent).stopCycling);
+                cleanup.push((0, cycle_browser_tabs_1.cycleBrowserTabs)(browserReplacer, actualConcurrency, logLevel, indent)
+                    .stopCycling);
                 cleanup.push(() => cleanupServer(false));
                 return innerRenderFrames({
                     onError,

package/dist/render-media.js

@@ -404,7 +404,7 @@ exports.internalRenderMedia = internalRenderMedia;
  * @see [Documentation](https://www.remotion.dev/docs/renderer/render-media)
  */
 const renderMedia = ({ proResProfile, crf, composition, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, audioCodec, jpegQuality, concurrency, serveUrl, disallowParallelEncoding, everyNthFrame, imageFormat, numberOfGifLoops, dumpBrowserLogs, preferLossless, verbose, quality, logLevel, }) => {
-    var _a;
+    var _a, _b;
     if (quality !== undefined) {
         console.warn(`The "quality" option has been renamed. Please use "jpegQuality" instead.`);
     }
@@ -455,7 +455,7 @@ const renderMedia = ({ proResProfile, crf, composition, inputProps, pixelFormat,
         serializedResolvedPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
             indent: undefined,
             staticBase: null,
-            data: composition.props,
+            data: (_b = composition.props) !== null && _b !== void 0 ? _b : {},
         }).serializedString,
     });
 };

package/dist/render-still.js

@@ -144,6 +144,8 @@ const innerRenderStill = async ({ composition, imageFormat = image_format_1.DEFA
         retriesRemaining: 2,
         audioEnabled: false,
         videoEnabled: true,
+        indent,
+        logLevel,
     });
     await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         // eslint-disable-next-line max-params

package/dist/select-composition.d.ts

@@ -42,5 +42,5 @@ export declare const internalSelectComposition: (options: InternalSelectComposit
  * @description Gets a composition defined in a Remotion project based on a Webpack bundle.
  * @see [Documentation](https://www.remotion.dev/docs/renderer/select-composition)
  */
-export declare const selectComposition: (options: SelectCompositionOptions) => Promise<Omit<VideoConfig, 'defaultProps'>>;
+export declare const selectComposition: (options: SelectCompositionOptions) => Promise<VideoConfig>;
 export {};

package/dist/select-composition.js

@@ -34,6 +34,8 @@ const innerSelectComposition = async ({ page, onBrowserLog, serializedInputProps
         retriesRemaining: 2,
         audioEnabled: false,
         videoEnabled: false,
+        indent,
+        logLevel,
     });
     await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         page,

package/dist/serve-handler/index.js

@@ -169,7 +169,7 @@ const serveHandler = async (request, response, config) => {
         return sendError(absolutePath, response, {
             statusCode: 404,
             code: 'not_found',
-            message: 'The requested path could not be found',
+            message: 'The requested path (' + absolutePath + ') could not be found',
         });
     }
     let streamOpts = null;

package/dist/serve-static.d.ts

@@ -1,6 +1,5 @@
 import type { DownloadMap } from './assets/download-map';
 import type { Compositor } from './compositor/compositor';
-import type { OffthreadVideoServerEmitter } from './offthread-video-server';
 import type { LogLevel } from './log-level';
 export declare const serveStatic: (path: string | null, options: {
     port: number | null;
@@ -13,5 +12,4 @@ export declare const serveStatic: (path: string | null, options: {
     port: number;
     close: () => Promise<void>;
     compositor: Compositor;
-    events: OffthreadVideoServerEmitter;
 }>;

package/dist/serve-static.js

@@ -9,7 +9,7 @@ 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) => {
-    const { listener: offthreadRequest, close: closeCompositor, compositor, events, } = (0, offthread_video_server_1.startOffthreadVideoServer)({
+    const { listener: offthreadRequest, close: closeCompositor, compositor, } = (0, offthread_video_server_1.startOffthreadVideoServer)({
         downloadMap: options.downloadMap,
         concurrency: options.concurrency,
         logLevel: options.logLevel,
@@ -85,7 +85,7 @@ const serveStatic = async (path, options) => {
                     }),
                 ]);
             };
-            return { port: selectedPort, close, compositor, events };
+            return { port: selectedPort, close, compositor };
         }
         catch (err) {
             if (!(err instanceof Error)) {

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

@@ -1,4 +1,5 @@
 import type { Page } from './browser/BrowserPage';
+import type { LogLevel } from './log-level';
 type SetPropsAndEnv = {
     serializedInputPropsWithCustomSchema: string;
     envVariables: Record<string, string> | undefined;
@@ -10,6 +11,8 @@ type SetPropsAndEnv = {
     retriesRemaining: number;
     audioEnabled: boolean;
     videoEnabled: boolean;
+    indent: boolean;
+    logLevel: LogLevel;
 };
 export declare const setPropsAndEnv: (params: SetPropsAndEnv) => Promise<unknown>;
 export {};

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

@@ -8,7 +8,7 @@ const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const redirect_status_codes_1 = require("./redirect-status-codes");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 const logger_1 = require("./logger");
-const innerSetPropsAndEnv = async ({ serializedInputPropsWithCustomSchema, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, retriesRemaining, audioEnabled, videoEnabled, }) => {
+const innerSetPropsAndEnv = async ({ serializedInputPropsWithCustomSchema, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, retriesRemaining, audioEnabled, videoEnabled, indent, logLevel, }) => {
     (0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
     const actualTimeout = timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : TimeoutSettings_1.DEFAULT_TIMEOUT;
     page.setDefaultTimeout(actualTimeout);
@@ -61,12 +61,14 @@ const innerSetPropsAndEnv = async ({ serializedInputPropsWithCustomSchema, envVa
             timeoutInMilliseconds,
             audioEnabled,
             videoEnabled,
+            indent,
+            logLevel,
         });
     }
     if (!redirect_status_codes_1.redirectStatusCodes.every((code) => code !== status)) {
         throw new Error(`Error while getting compositions: Tried to go to ${urlToVisit} but the status code was ${status} instead of 200. Does the site you specified exist?`);
     }
-    const isRemotionFn = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+    const { value: isRemotionFn } = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: () => {
             return window.getStaticCompositions;
         },
@@ -74,8 +76,23 @@ const innerSetPropsAndEnv = async ({ serializedInputPropsWithCustomSchema, envVa
         frame: null,
         page,
     });
-    if (isRemotionFn === undefined) {
-        throw new Error(`Error while getting compositions: Tried to go to ${urlToVisit} and verify that it is a Remotion project by checking if window.getStaticCompositions is defined. However, the function was undefined, which indicates that this is not a valid Remotion project. Please check the URL you passed.`);
+    if (typeof isRemotionFn === 'undefined') {
+        const { value: body } = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+            pageFunction: () => {
+                return document.body.innerHTML;
+            },
+            args: [],
+            frame: null,
+            page,
+        });
+        const errorMessage = [
+            `Error while getting compositions: Tried to go to ${urlToVisit} and verify that it is a Remotion project by checking if window.getStaticCompositions is defined.`,
+            'However, the function was undefined, which indicates that this is not a valid Remotion project. Please check the URL you passed.',
+            'The page loaded contained the following markup:',
+            body.substring(0, 500) + (body.length > 500 ? '...' : ''),
+            'Does this look like a foreign page? If so, try to stop this server.',
+        ].join('\n');
+        throw new Error(errorMessage);
     }
     const { value: siteVersion } = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: () => {
@@ -99,10 +116,16 @@ const innerSetPropsAndEnv = async ({ serializedInputPropsWithCustomSchema, envVa
     }
     if (remotionVersion !== version_1.VERSION && process.env.NODE_ENV !== 'test') {
         if (remotionVersion) {
-            logger_1.Log.warn(`The site was bundled with version ${remotionVersion} of @remotion/bundler, while @remotion/renderer is on version ${version_1.VERSION}. You may not have the newest bugfixes and features. Re-bundle the site to fix this issue.`);
+            logger_1.Log.warnAdvanced({
+                indent,
+                logLevel,
+            }, `The site was bundled with version ${remotionVersion} of @remotion/bundler, while @remotion/renderer is on version ${version_1.VERSION}. You may not have the newest bugfixes and features. Re-bundle the site to fix this issue.`);
         }
         else {
-            logger_1.Log.warn(`The site was bundled with an old version of Remotion, while @remotion/renderer is on version ${version_1.VERSION}. You may not have the newest bugfixes and features. Re-bundle the site to fix this issue.`);
+            logger_1.Log.warnAdvanced({
+                indent,
+                logLevel,
+            }, `The site was bundled with an old version of Remotion, while @remotion/renderer is on version ${version_1.VERSION}. You may not have the newest bugfixes and features. Re-bundle the site to fix this issue.`);
         }
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "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.3"
+    "remotion": "4.0.5"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -42,13 +42,13 @@
     "zod": "^3.21.4"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-x64": "4.0.3",
-    "@remotion/compositor-darwin-arm64": "4.0.3",
-    "@remotion/compositor-linux-arm64-musl": "4.0.3",
-    "@remotion/compositor-linux-x64-gnu": "4.0.3",
-    "@remotion/compositor-linux-x64-musl": "4.0.3",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.3",
-    "@remotion/compositor-win32-x64-msvc": "4.0.3"
+    "@remotion/compositor-darwin-arm64": "4.0.5",
+    "@remotion/compositor-linux-arm64-musl": "4.0.5",
+    "@remotion/compositor-linux-x64-gnu": "4.0.5",
+    "@remotion/compositor-win32-x64-msvc": "4.0.5",
+    "@remotion/compositor-linux-x64-musl": "4.0.5",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.5",
+    "@remotion/compositor-darwin-x64": "4.0.5"
   },
   "keywords": [
     "remotion",