@remotion/renderer 4.0.0-webhook.26 → 4.0.0

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

@@ -5,8 +5,9 @@ const version_1 = require("remotion/version");
 const TimeoutSettings_1 = require("./browser/TimeoutSettings");
 const normalize_serve_url_1 = require("./normalize-serve-url");
 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 setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, retriesRemaining, audioEnabled, videoEnabled, }) => {
+const innerSetPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, retriesRemaining, audioEnabled, videoEnabled, }) => {
     (0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
     const actualTimeout = timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : TimeoutSettings_1.DEFAULT_TIMEOUT;
     page.setDefaultTimeout(actualTimeout);
@@ -15,6 +16,9 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
     await page.evaluateOnNewDocument((timeout) => {
         window.remotion_puppeteerTimeout = timeout;
     }, actualTimeout);
+    if (typeof inputProps === 'string') {
+        throw new Error('Input props should be an object, not a string.');
+    }
     if (inputProps) {
         await page.evaluateOnNewDocument((input) => {
             window.remotion_inputProps = input;
@@ -50,7 +54,7 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
                 resolve();
             }, 2000);
         });
-        return (0, exports.setPropsAndEnv)({
+        return innerSetPropsAndEnv({
             envVariables,
             initialFrame,
             inputProps,
@@ -63,13 +67,7 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
             videoEnabled,
         });
     }
-    if (status !== 200 &&
-        status !== 301 &&
-        status !== 302 &&
-        status !== 303 &&
-        status !== 304 &&
-        status !== 307 &&
-        status !== 308) {
+    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)({
@@ -83,7 +81,7 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
     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.`);
     }
-    const siteVersion = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+    const { value: siteVersion } = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: () => {
             return window.siteVersion;
         },
@@ -91,7 +89,7 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
         frame: null,
         page,
     });
-    const remotionVersion = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+    const { value: remotionVersion } = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: () => {
             return window.remotion_version;
         },
@@ -99,7 +97,7 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
         frame: null,
         page,
     });
-    const requiredVersion = '4';
+    const requiredVersion = '7';
     if (siteVersion !== requiredVersion) {
         throw new Error(`Incompatible site: When visiting ${urlToVisit}, a bundle was found, but one that is not compatible with this version of Remotion. Found version: ${siteVersion} - Required version: ${requiredVersion}. To resolve this error, please bundle and deploy again.`);
     }
@@ -112,4 +110,14 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
         }
     }
 };
+const setPropsAndEnv = (params) => {
+    return Promise.race([
+        innerSetPropsAndEnv(params),
+        new Promise((_, reject) => {
+            setTimeout(() => {
+                reject(new Error(`Timed out after ${params.timeoutInMilliseconds} while setting up the headless browser. This could be because the you specified takes a long time to load (or network resources that it includes like fonts) or because the browser is not responding. Optimize the site or increase the browser timeout.`));
+            }, params.timeoutInMilliseconds);
+        }),
+    ]);
+};
 exports.setPropsAndEnv = setPropsAndEnv;

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

@@ -1,14 +1,43 @@
 /// <reference types="node" />
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { RenderAssetInfo } from './assets/download-map';
+import type { AudioCodec } from './audio-codec';
 import type { Codec } from './codec';
-import type { FfmpegExecutable } from './ffmpeg-executable';
 import type { FfmpegOverrideFn } from './ffmpeg-override';
-import type { ImageFormat } from './image-format';
 import type { CancelSignal } from './make-cancel-signal';
 import type { PixelFormat } from './pixel-format';
 import type { ProResProfile } from './prores-profile';
-export declare type StitcherOptions = {
+import type { LogLevel } from './log-level';
+type InternalStitchFramesToVideoOptions = {
+    audioBitrate: string | null;
+    videoBitrate: string | null;
+    fps: number;
+    width: number;
+    height: number;
+    outputLocation: string | null;
+    force: boolean;
+    assetsInfo: RenderAssetInfo;
+    pixelFormat: PixelFormat;
+    numberOfGifLoops: number | null;
+    codec: Codec;
+    audioCodec: AudioCodec | null;
+    crf: number | null;
+    onProgress?: null | ((progress: number) => void);
+    onDownload: undefined | RenderMediaOnDownload;
+    proResProfile: undefined | ProResProfile;
+    logLevel: LogLevel;
+    dir: string;
+    cancelSignal: CancelSignal | null;
+    preEncodedFileLocation: string | null;
+    preferLossless: boolean;
+    indent: boolean;
+    muted: boolean;
+    enforceAudioTrack: boolean;
+    ffmpegOverride: null | FfmpegOverrideFn;
+};
+export type StitchFramesToVideoOptions = {
+    audioBitrate?: string | null;
+    videoBitrate?: string | null;
     fps: number;
     width: number;
     height: number;
@@ -18,27 +47,22 @@ export declare type StitcherOptions = {
     pixelFormat?: PixelFormat;
     numberOfGifLoops?: number | null;
     codec?: Codec;
+    audioCodec?: AudioCodec | null;
     crf?: number | null;
     onProgress?: (progress: number) => void;
     onDownload?: RenderMediaOnDownload;
     proResProfile?: ProResProfile;
     verbose?: boolean;
-    ffmpegExecutable?: FfmpegExecutable;
-    ffprobeExecutable?: FfmpegExecutable;
-    dir?: string;
+    dir: string;
     cancelSignal?: CancelSignal;
-    internalOptions?: {
-        preEncodedFileLocation: string | null;
-        imageFormat: ImageFormat;
-    };
     muted?: boolean;
     enforceAudioTrack?: boolean;
     ffmpegOverride?: FfmpegOverrideFn;
 };
-declare type ReturnType = {
-    task: Promise<Buffer | null>;
-    getLogs: () => string;
-};
-export declare const spawnFfmpeg: (options: StitcherOptions) => Promise<ReturnType>;
-export declare const stitchFramesToVideo: (options: StitcherOptions) => Promise<Buffer | null>;
+export declare const internalStitchFramesToVideo: (options: InternalStitchFramesToVideoOptions) => Promise<Buffer | null>;
+/**
+ * @description Takes a series of images and audio information generated by renderFrames() and encodes it to a video.
+ * @see [Documentation](https://www.remotion.dev/docs/renderer/stitch-frames-to-video)
+ */
+export declare const stitchFramesToVideo: ({ assetsInfo, force, fps, height, width, audioBitrate, audioCodec, cancelSignal, codec, crf, dir, enforceAudioTrack, ffmpegOverride, muted, numberOfGifLoops, onDownload, onProgress, outputLocation, pixelFormat, proResProfile, verbose, videoBitrate, }: StitchFramesToVideoOptions) => Promise<Buffer | null>;
 export {};