@remotion/renderer 4.0.0-alpha4 → 4.0.0-alpha6

package/README.md

@@ -1,47 +1,9 @@
-# Rust development
+# Renderer
 
-To participate in the development of the Rust parts of Remotion, you need to do additional steps. If you don't want to change the Rust code, you don't have to set anything up.
+Contains TypeScript + Rust code for rendering a Remotion video.
 
-## Setup
+See the public APIs here: https://remotion.dev/docs/renderer
 
-These are instructions for macOS. Contributions for other platforms are appreciated.
+## Development
 
-First, install Cargo, if you don't have it, or upgrade to a version that supports `edition-2021`:
-
-```
-curl https://sh.rustup.rs -sSf | sh
-```
-
-Second, install components that allow for cross-compilation:
-
-```sh
-sh install_platforms.sh
-```
-
-Third, install linkers for cross compilation:
-
-```sh
-brew install MaterializeInc/crosstools/x86_64-unknown-linux-gnu
-brew install MaterializeInc/crosstools/aarch64-unknown-linux-gnu
-brew install messense/macos-cross-toolchains/x86_64-unknown-linux-musl
-brew install messense/macos-cross-toolchains/aarch64-unknown-linux-musl
-brew install mingw-w64
-```
-
-> This will take a few minutes.
-
-## Building
-
-To build the Rust parts for your operating system, run:
-
-```
-node build.mjs
-```
-
-To build the Rust binaries for all supported platforms, run:
-
-```
-node build.mjs --all
-```
-
-The resulting artifacts should be checked into Git.
+For developing the Rust parts, see https://remotion.dev/docs/contributing/rust.

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

@@ -27,8 +27,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadAndMapAssetsToFileUrl = exports.getSanitizedFilenameForAssetUrl = exports.markAllAssetsAsDownloaded = exports.downloadAsset = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importStar(require("path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importStar(require("node:path"));
 const remotion_1 = require("remotion");
 const compress_assets_1 = require("../compress-assets");
 const ensure_output_directory_1 = require("../ensure-output-directory");
@@ -124,7 +124,7 @@ const downloadAsset = async ({ src, onDownload, downloadMap, }) => {
     if ((_a = downloadMap.hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
         const claimedDownloadLocation = (_b = downloadMap.hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir];
         // The OS might have deleted the file since even though we marked it as downloaded. In that case we reset the state and download it again
-        if (fs_1.default.existsSync(claimedDownloadLocation)) {
+        if (node_fs_1.default.existsSync(claimedDownloadLocation)) {
             return claimedDownloadLocation;
         }
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -168,7 +168,7 @@ const downloadAsset = async ({ src, onDownload, downloadMap, }) => {
         });
         (0, ensure_output_directory_1.ensureOutputDirectory)(output);
         const buff = Buffer.from(assetData, encoding);
-        await fs_1.default.promises.writeFile(output, buff);
+        await node_fs_1.default.promises.writeFile(output, buff);
         notifyAssetIsDownloaded({ src, downloadMap, downloadDir, to: output });
         return output;
     }
@@ -212,7 +212,7 @@ const getFilename = ({ contentDisposition, src, contentType, }) => {
         };
     }
     const { pathname, search } = new URL(src);
-    const ext = (0, path_1.extname)(pathname);
+    const ext = (0, node_path_1.extname)(pathname);
     // Has no file extension, check if we can derive it from contentType
     if (!ext && contentType) {
         const matchedExt = (0, mime_types_1.getExt)(contentType);
@@ -238,7 +238,7 @@ const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, contentDisposition,
         : '';
     const hashedFileName = String((0, remotion_1.random)(`${pathname}${search}`)).replace('0.', '');
     const filename = hashedFileName + fileExtension;
-    return path_1.default.join(downloadDir, (0, sanitize_filepath_1.sanitizeFilePath)(filename));
+    return node_path_1.default.join(downloadDir, (0, sanitize_filepath_1.sanitizeFilePath)(filename));
 };
 exports.getSanitizedFilenameForAssetUrl = getSanitizedFilenameForAssetUrl;
 const downloadAndMapAssetsToFileUrl = async ({ asset, onDownload, downloadMap, }) => {

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

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

package/dist/assets/download-file.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadFile = void 0;
-const fs_1 = require("fs");
+const node_fs_1 = require("node:fs");
 const ensure_output_directory_1 = require("../ensure-output-directory");
 const read_file_1 = require("./read-file");
-const downloadFile = ({ onProgress, url, to: toFn, }) => {
+const downloadFileWithoutRetries = ({ onProgress, url, to: toFn }) => {
     return new Promise((resolve, reject) => {
         let rejected = false;
         let resolved = false;
@@ -44,7 +44,7 @@ const downloadFile = ({ onProgress, url, to: toFn, }) => {
             (0, ensure_output_directory_1.ensureOutputDirectory)(to);
             const sizeHeader = res.headers['content-length'];
             const totalSize = typeof sizeHeader === 'undefined' ? null : Number(sizeHeader);
-            const writeStream = (0, fs_1.createWriteStream)(to);
+            const writeStream = (0, node_fs_1.createWriteStream)(to);
             let downloaded = 0;
             // Listen to 'close' event instead of more
             // concise method to avoid this problem
@@ -86,4 +86,19 @@ const downloadFile = ({ onProgress, url, to: toFn, }) => {
         });
     });
 };
+const downloadFile = async (options, retries = 2) => {
+    try {
+        const res = await downloadFileWithoutRetries(options);
+        return res;
+    }
+    catch (err) {
+        if (err.message === 'aborted') {
+            if (retries === 0) {
+                throw err;
+            }
+            return (0, exports.downloadFile)(options, retries - 1);
+        }
+        throw err;
+    }
+};
 exports.downloadFile = downloadFile;

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

@@ -1,21 +1,4 @@
-/// <reference types="node" />
 import type { TAsset } from 'remotion';
-declare type EncodingStatus = {
-    type: 'encoding';
-} | {
-    type: 'done';
-    src: string;
-} | undefined;
-export declare type SpecialVCodecForTransparency = 'vp9' | 'vp8' | 'none';
-export declare type NeedsResize = [number, number] | null;
-export declare type Vp9Result = {
-    specialVcodecForTransparency: SpecialVCodecForTransparency;
-    needsResize: NeedsResize;
-};
-export declare type VideoDurationResult = {
-    duration: number | null;
-    fps: number | null;
-};
 export declare type AudioChannelsAndDurationResultCache = {
     channels: number;
     duration: number | null;
@@ -37,14 +20,6 @@ export declare type DownloadMap = {
             [downloadDir: string]: (() => void)[];
         };
     };
-    lastFrameMap: Record<string, {
-        lastAccessed: number;
-        data: Buffer;
-    }>;
-    isBeyondLastFrameMap: Record<string, number>;
-    isVp9VideoCache: Record<string, Vp9Result>;
-    ensureFileHasPresentationTimestamp: Record<string, EncodingStatus>;
-    videoDurationResultCache: Record<string, VideoDurationResult>;
     durationOfAssetCache: Record<string, AudioChannelsAndDurationResultCache>;
     downloadDir: string;
     preEncode: string;
@@ -66,4 +41,3 @@ export declare type RenderAssetInfo = {
 };
 export declare const makeDownloadMap: () => DownloadMap;
 export declare const cleanDownloadMap: (downloadMap: DownloadMap) => void;
-export {};

package/dist/assets/download-map.js

@@ -27,18 +27,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanDownloadMap = exports.makeDownloadMap = void 0;
-const fs_1 = __importStar(require("fs"));
-const path_1 = __importDefault(require("path"));
+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 makeAndReturn = (dir, name) => {
-    const p = path_1.default.join(dir, name);
-    (0, fs_1.mkdirSync)(p);
+    const p = node_path_1.default.join(dir, name);
+    (0, node_fs_1.mkdirSync)(p);
     return p;
 };
-const packageJsonPath = path_1.default.join(__dirname, '..', '..', 'package.json');
-const packageJson = fs_1.default.existsSync(packageJsonPath)
-    ? JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
+const packageJsonPath = node_path_1.default.join(__dirname, '..', '..', 'package.json');
+const packageJson = node_fs_1.default.existsSync(packageJsonPath)
+    ? JSON.parse(node_fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
     : null;
 const makeDownloadMap = () => {
     const dir = (0, tmp_dir_1.tmpDir)(packageJson
@@ -48,11 +48,6 @@ const makeDownloadMap = () => {
         isDownloadingMap: {},
         hasBeenDownloadedMap: {},
         listeners: {},
-        lastFrameMap: {},
-        isBeyondLastFrameMap: {},
-        ensureFileHasPresentationTimestamp: {},
-        isVp9VideoCache: {},
-        videoDurationResultCache: {},
         durationOfAssetCache: {},
         id: String(Math.random()),
         assetDir: dir,

package/dist/assets/get-audio-channels.d.ts

@@ -1,3 +1,2 @@
-import type { FfmpegExecutable } from '../ffmpeg-executable';
 import type { AudioChannelsAndDurationResultCache, DownloadMap } from './download-map';
-export declare const getAudioChannelsAndDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable, remotionRoot: string) => Promise<AudioChannelsAndDurationResultCache>;
+export declare const getAudioChannelsAndDuration: (downloadMap: DownloadMap, src: string) => Promise<AudioChannelsAndDurationResultCache>;

package/dist/assets/get-audio-channels.js

@@ -1,14 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAudioChannelsAndDuration = void 0;
-const execa_1 = __importDefault(require("execa"));
-const ffmpeg_flags_1 = require("../ffmpeg-flags");
+const call_ffmpeg_1 = require("../call-ffmpeg");
 const p_limit_1 = require("../p-limit");
 const limit = (0, p_limit_1.pLimit)(1);
-async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot) {
+async function getAudioChannelsAndDurationUnlimited(downloadMap, src) {
     if (downloadMap.durationOfAssetCache[src]) {
         return downloadMap.durationOfAssetCache[src];
     }
@@ -20,7 +16,7 @@ async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExe
     ]
         .reduce((acc, val) => acc.concat(val), [])
         .filter(Boolean);
-    const task = await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffprobeExecutable, remotionRoot, 'ffprobe'), args);
+    const task = await (0, call_ffmpeg_1.callFf)('ffprobe', args);
     const channels = task.stdout.match(/channels=([0-9]+)/);
     const duration = task.stdout.match(/duration=([0-9.]+)/);
     const result = {
@@ -30,7 +26,7 @@ async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExe
     downloadMap.durationOfAssetCache[src] = result;
     return result;
 }
-const getAudioChannelsAndDuration = (downloadMap, src, ffprobeExecutable, remotionRoot) => {
-    return limit(() => getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot));
+const getAudioChannelsAndDuration = (downloadMap, src) => {
+    return limit(() => getAudioChannelsAndDurationUnlimited(downloadMap, src));
 };
 exports.getAudioChannelsAndDuration = getAudioChannelsAndDuration;

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

@@ -1,2 +1,2 @@
-import http from 'http';
+import http from 'node:http';
 export declare const readFile: (url: string, redirectsSoFar?: number) => Promise<http.IncomingMessage>;

package/dist/assets/read-file.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readFile = void 0;
-const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
+const node_http_1 = __importDefault(require("node:http"));
 const redirect_status_codes_1 = require("../redirect-status-codes");
 const getClient = (url) => {
     if (url.startsWith('https://')) {
         return https_1.default.get;
     }
     if (url.startsWith('http://')) {
-        return http_1.default.get;
+        return node_http_1.default.get;
     }
     throw new Error('Can only download URLs starting with http:// or https://');
 };

package/dist/assets/sanitize-filepath.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sanitizeFilePath = void 0;
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const sanitize_filename_1 = require("./sanitize-filename");
 const pathSeparators = /[/\\]/;
 const sanitizeFilePath = (pathToSanitize) => {
     return pathToSanitize
         .split(pathSeparators)
         .map((s) => (0, sanitize_filename_1.sanitizeFilename)(s))
-        .join(path_1.default.sep);
+        .join(node_path_1.default.sep);
 };
 exports.sanitizeFilePath = sanitizeFilePath;

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: readonly [];
+    readonly gif: ("pcm-16" | "aac" | "mp3" | "opus")[];
     readonly h265: readonly ["aac", "pcm-16"];
     readonly mp3: readonly ["mp3", "pcm-16"];
     readonly prores: readonly ["aac", "pcm-16"];
@@ -13,8 +13,8 @@ export declare const supportedAudioCodecs: {
     readonly vp9: readonly ["opus", "pcm-16"];
     readonly wav: readonly ["pcm-16"];
 };
-export declare const audioCodecNames: readonly ["pcm_s16le", "aac", "libmp3lame", "libopus"];
-export declare type FfmpegAudioCodecName = typeof audioCodecNames[number];
+declare const audioCodecNames: readonly ["pcm_s16le", "aac", "libmp3lame", "libopus"];
+declare type FfmpegAudioCodecName = typeof audioCodecNames[number];
 export declare const mapAudioCodecToFfmpegAudioCodecName: (audioCodec: AudioCodec) => FfmpegAudioCodecName;
 export declare const defaultAudioCodecs: {
     [key in Codec]: {
@@ -25,3 +25,4 @@ export declare const getDefaultAudioCodec: ({ codec, preferLossless, }: {
     codec: Codec;
     preferLossless: boolean;
 }) => AudioCodec | null;
+export {};

package/dist/audio-codec.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultAudioCodec = exports.defaultAudioCodecs = exports.mapAudioCodecToFfmpegAudioCodecName = exports.audioCodecNames = exports.supportedAudioCodecs = exports.validAudioCodecs = void 0;
+exports.getDefaultAudioCodec = exports.defaultAudioCodecs = exports.mapAudioCodecToFfmpegAudioCodecName = exports.supportedAudioCodecs = exports.validAudioCodecs = void 0;
 exports.validAudioCodecs = ['pcm-16', 'aac', 'mp3', 'opus'];
 exports.supportedAudioCodecs = {
     h264: ['aac', 'pcm-16'],
@@ -18,12 +18,7 @@ const _satisfies = exports.supportedAudioCodecs;
 if (_satisfies) {
     // Just for type checking
 }
-exports.audioCodecNames = [
-    'pcm_s16le',
-    'aac',
-    'libmp3lame',
-    'libopus',
-];
+const audioCodecNames = ['pcm_s16le', 'aac', 'libmp3lame', 'libopus'];
 const mapAudioCodecToFfmpegAudioCodecName = (audioCodec) => {
     if (audioCodec === 'aac') {
         return 'aac';
@@ -67,8 +62,7 @@ exports.defaultAudioCodecs = {
     },
     prores: {
         lossless: 'pcm-16',
-        // V4.0: Make pcm the default
-        compressed: 'aac',
+        compressed: 'pcm-16',
     },
     vp8: {
         lossless: 'pcm-16',

package/dist/browser/BrowserFetcher.d.ts

@@ -38,5 +38,4 @@ export declare const localRevisions: (downloadsFolder: string, product: Product,
 export declare const removeBrowser: (revision: string, folderPath: string) => Promise<void>;
 export declare const getFolderPath: (revision: string, downloadsFolder: string, platform: Platform) => string;
 export declare const getRevisionInfo: (revision: string, product: Product) => BrowserFetcherRevisionInfo;
-export declare function _downloadFile(url: string, destinationPath: string, progressCallback: (x: number, y: number) => void): Promise<number>;
 export {};

package/dist/browser/BrowserFetcher.js

@@ -41,17 +41,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._downloadFile = exports.getRevisionInfo = exports.getFolderPath = exports.removeBrowser = exports.localRevisions = exports.download = exports.getDownloadHost = exports.getDownloadsFolder = exports.getPlatform = void 0;
-const childProcess = __importStar(require("child_process"));
-const fs = __importStar(require("fs"));
-const http = __importStar(require("http"));
+exports.getRevisionInfo = exports.getFolderPath = exports.removeBrowser = exports.localRevisions = exports.download = exports.getDownloadHost = exports.getDownloadsFolder = exports.getPlatform = void 0;
 const https = __importStar(require("https"));
-const os = __importStar(require("os"));
-const path = __importStar(require("path"));
-const util_1 = __importDefault(require("util"));
+const childProcess = __importStar(require("node:child_process"));
+const fs = __importStar(require("node:fs"));
+const http = __importStar(require("node:http"));
+const os = __importStar(require("node:os"));
+const path = __importStar(require("node:path"));
+const node_util_1 = __importDefault(require("node:util"));
 const extract_zip_1 = __importDefault(require("extract-zip"));
-const URL = __importStar(require("url"));
-const util_2 = require("util");
+const URL = __importStar(require("node:url"));
+const node_util_2 = require("node:util");
 const assert_1 = require("./assert");
 const delete_directory_1 = require("../delete-directory");
 const get_download_destination_1 = require("./get-download-destination");
@@ -109,7 +109,7 @@ function _downloadURL(product, platform, host, revision) {
     if (platform === 'win64' || platform === 'win32') {
         return 'https://remotionchromium-binaries.s3.eu-central-1.amazonaws.com/thorium-107.zip';
     }
-    return util_1.default.format(downloadURLs[product][platform], host, revision, archiveName(product, platform, revision));
+    return node_util_1.default.format(downloadURLs[product][platform], host, revision, archiveName(product, platform, revision));
 }
 function handleArm64() {
     let exists = fs.existsSync('/usr/bin/chromium-browser');
@@ -126,10 +126,10 @@ function handleArm64() {
         '\n\n sudo apt install chromium-browser\n');
     throw new Error();
 }
-const readdirAsync = (0, util_2.promisify)(fs.readdir.bind(fs));
-const mkdirAsync = (0, util_2.promisify)(fs.mkdir.bind(fs));
-const unlinkAsync = (0, util_2.promisify)(fs.unlink.bind(fs));
-const chmodAsync = (0, util_2.promisify)(fs.chmod.bind(fs));
+const readdirAsync = (0, node_util_2.promisify)(fs.readdir.bind(fs));
+const mkdirAsync = (0, node_util_2.promisify)(fs.mkdir.bind(fs));
+const unlinkAsync = (0, node_util_2.promisify)(fs.unlink.bind(fs));
+const chmodAsync = (0, node_util_2.promisify)(fs.chmod.bind(fs));
 function existsAsync(filePath) {
     return new Promise((resolve) => {
         fs.access(filePath, (err) => {
@@ -331,7 +331,6 @@ function _downloadFile(url, destinationPath, progressCallback) {
     });
     return promise;
 }
-exports._downloadFile = _downloadFile;
 function install(archivePath, folderPath) {
     if (archivePath.endsWith('.zip')) {
         return (0, extract_zip_1.default)(archivePath, { dir: folderPath });

package/dist/browser/BrowserRunner.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /// <reference types="node" />
-import * as childProcess from 'child_process';
+import * as childProcess from 'node:child_process';
 import { Connection } from './Connection';
 import type { LaunchOptions } from './LaunchOptions';
 export declare class BrowserRunner {

package/dist/browser/BrowserRunner.js

@@ -51,8 +51,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _BrowserRunner_executablePath, _BrowserRunner_processArguments, _BrowserRunner_userDataDir, _BrowserRunner_closed, _BrowserRunner_listeners, _BrowserRunner_processClosing;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrowserRunner = void 0;
-const childProcess = __importStar(require("child_process"));
-const fs = __importStar(require("fs"));
+const childProcess = __importStar(require("node:child_process"));
+const fs = __importStar(require("node:fs"));
 const readline = __importStar(require("readline"));
 const delete_directory_1 = require("../delete-directory");
 const assert_1 = require("./assert");
@@ -105,8 +105,14 @@ class BrowserRunner {
             stdio,
         });
         if (dumpio) {
-            (_a = this.proc.stderr) === null || _a === void 0 ? void 0 : _a.pipe(process.stderr);
-            (_b = this.proc.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
+            (_a = this.proc.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (d) => {
+                process.stdout.write(options.indentationString);
+                process.stdout.write(d.toString().trimStart());
+            });
+            (_b = this.proc.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (d) => {
+                process.stderr.write(options.indentationString);
+                process.stderr.write(d.toString().trimStart());
+            });
         }
         __classPrivateFieldSet(this, _BrowserRunner_closed, false, "f");
         __classPrivateFieldSet(this, _BrowserRunner_processClosing, new Promise((fulfill, reject) => {

package/dist/browser/FrameManager.js

@@ -33,6 +33,7 @@ const Connection_1 = require("./Connection");
 const DOMWorld_1 = require("./DOMWorld");
 const EventEmitter_1 = require("./EventEmitter");
 const ExecutionContext_1 = require("./ExecutionContext");
+const is_target_closed_err_1 = require("./is-target-closed-err");
 const LifecycleWatcher_1 = require("./LifecycleWatcher");
 const NetworkManager_1 = require("./NetworkManager");
 const util_1 = require("./util");
@@ -135,9 +136,7 @@ class FrameManager extends EventEmitter_1.EventEmitter {
         }
         catch (error) {
             // The target might have been closed before the initialization finished.
-            if ((0, util_1.isErrorLike)(error) &&
-                (error.message.includes('Target closed') ||
-                    error.message.includes('Session closed'))) {
+            if ((0, util_1.isErrorLike)(error) && (0, is_target_closed_err_1.isTargetClosedErr)(error)) {
                 return;
             }
             throw error;

package/dist/browser/LaunchOptions.d.ts

@@ -29,5 +29,6 @@ export interface LaunchOptions {
     env?: Record<string, string | undefined>;
     pipe?: boolean;
     product?: Product;
+    indentationString: string;
 }
 export declare type PuppeteerNodeLaunchOptions = BrowserLaunchArgumentOptions & LaunchOptions & BrowserConnectOptions;

package/dist/browser/Launcher.js

@@ -42,9 +42,9 @@ exports.ChromeLauncher = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const fs_1 = __importDefault(require("fs"));
-const os = __importStar(require("os"));
-const path = __importStar(require("path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const os = __importStar(require("node:os"));
+const path = __importStar(require("node:path"));
 const assert_1 = require("./assert");
 const Browser_1 = require("./Browser");
 const BrowserRunner_1 = require("./BrowserRunner");
@@ -57,7 +57,7 @@ class ChromeLauncher {
         this._preferredRevision = preferredRevision;
     }
     async launch(options) {
-        const { args = [], dumpio = false, executablePath, pipe = false, env = process.env, defaultViewport, timeout = 60000, debuggingPort, } = options;
+        const { args = [], dumpio = false, executablePath, pipe = false, env = process.env, defaultViewport, timeout = 60000, debuggingPort, indentationString, } = options;
         const chromeArguments = args;
         if (!chromeArguments.some((argument) => {
             return argument.startsWith('--remote-debugging-');
@@ -72,7 +72,7 @@ class ChromeLauncher {
         }
         // Check for the user data dir argument, which will always be set even
         // with a custom directory specified via the userDataDir option.
-        const userDataDir = await fs_1.default.promises.mkdtemp(path.join(tmpDir(), 'puppeteer_dev_chrome_profile-'));
+        const userDataDir = await node_fs_1.default.promises.mkdtemp(path.join(tmpDir(), 'puppeteer_dev_chrome_profile-'));
         chromeArguments.push(`--user-data-dir=${userDataDir}`);
         let chromeExecutable = executablePath;
         if (!chromeExecutable) {
@@ -91,6 +91,7 @@ class ChromeLauncher {
             dumpio,
             env,
             pipe: false,
+            indentationString,
         });
         let browser;
         try {

package/dist/browser/NodeWebSocketTransport.js

@@ -28,8 +28,8 @@ exports.NodeWebSocketTransport = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const dns_1 = require("dns");
-const url_1 = require("url");
+const node_dns_1 = require("node:dns");
+const node_url_1 = require("node:url");
 const ws_types_1 = require("../ws/ws-types");
 class NodeWebSocketTransport {
     constructor(ws) {
@@ -56,9 +56,9 @@ class NodeWebSocketTransport {
         // manually with the previous behavior according to:
         // - https://nodejs.org/api/dns.html#dnslookuphostname-options-callback
         // because of https://bugzilla.mozilla.org/show_bug.cgi?id=1769994.
-        const url = new url_1.URL(urlString);
+        const url = new node_url_1.URL(urlString);
         if (url.hostname === 'localhost') {
-            const { address } = await dns_1.promises.lookup(url.hostname, { verbatim: false });
+            const { address } = await node_dns_1.promises.lookup(url.hostname, { verbatim: false });
             url.hostname = address;
         }
         return new Promise((resolve, reject) => {

package/dist/browser/devtools-commands.d.ts

@@ -1,4 +1,4 @@
-import type { ActivateTargetRequest, AddScriptToEvaluateOnNewDocumentRequest, AddScriptToEvaluateOnNewDocumentResponse, CallFunctionOnRequest, CallFunctionOnResponse, CaptureScreenshotRequest, CaptureScreenshotResponse, CloseTargetRequest, CloseTargetResponse, CreateIsolatedWorldRequest, CreateIsolatedWorldResponse, DetachFromTargetRequest, DevtoolsRemoteObject, EnableRequest, ExceptionDetails, GetFrameTreeResponse, NavigateRequest, NavigateResponse, ReleaseObjectRequest, SetAutoAttachRequest, SetDefaultBackgroundColorOverrideRequest, SetDeviceMetricsOverrideRequest, SetLifecycleEventsEnabledRequest } from './devtools-types';
+import type { ActivateTargetRequest, AddScriptToEvaluateOnNewDocumentRequest, AddScriptToEvaluateOnNewDocumentResponse, CallFunctionOnRequest, CallFunctionOnResponse, CaptureScreenshotRequest, CaptureScreenshotResponse, CloseTargetRequest, CloseTargetResponse, CreateIsolatedWorldRequest, CreateIsolatedWorldResponse, DetachFromTargetRequest, DevtoolsRemoteObject, EnableRequest, ExceptionDetails, GetFrameTreeResponse, NavigateRequest, NavigateResponse, PrintPDFRequest, PrintPDFResponse, ReleaseObjectRequest, SetAutoAttachRequest, SetDefaultBackgroundColorOverrideRequest, SetDeviceMetricsOverrideRequest, SetLifecycleEventsEnabledRequest } from './devtools-types';
 export interface Commands {
     /**
      * Does nothing.
@@ -216,6 +216,10 @@ export interface Commands {
         paramsType: [CaptureScreenshotRequest?];
         returnType: CaptureScreenshotResponse;
     };
+    'Page.printToPDF': {
+        paramsType: [PrintPDFRequest];
+        returnType: PrintPDFResponse;
+    };
     'Target.activateTarget': {
         paramsType: [ActivateTargetRequest];
         returnType: void;