@remotion/renderer 3.0.22 → 3.0.23

package/dist/browser/BrowserFetcher.js

@@ -60,28 +60,25 @@ const http = __importStar(require("http"));
 const https = __importStar(require("https"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
+const util = __importStar(require("util"));
 const extract_zip_1 = __importDefault(require("extract-zip"));
 const URL = __importStar(require("url"));
 const util_1 = require("util");
 const assert_1 = require("./assert");
 const delete_directory_1 = require("../delete-directory");
 const get_download_destination_1 = require("./get-download-destination");
+const { PUPPETEER_EXPERIMENTAL_CHROMIUM_MAC_ARM } = process.env;
 const downloadURLs = {
     chrome: {
         linux: '%s/chromium-browser-snapshots/Linux_x64/%d/%s.zip',
-        linux_arm: '%s/chromium-browser-snapshots/Linux_x64/%d/%s.zip',
         mac: '%s/chromium-browser-snapshots/Mac/%d/%s.zip',
-        mac_arm: 'https://github.com/Alex313031/Thorium-Special/releases/download/M103.0.5037.0-1/Thorium_MacOS_ARM64.dmg',
+        mac_arm: '%s/chromium-browser-snapshots/Mac_Arm/%d/%s.zip',
         win32: '%s/chromium-browser-snapshots/Win/%d/%s.zip',
         win64: '%s/chromium-browser-snapshots/Win_x64/%d/%s.zip',
     },
     firefox: {
         linux: '%s/firefox-%s.en-US.%s-x86_64.tar.bz2',
-        // TODO
-        linux_arm: '%s/firefox-%s.en-US.%s-x86_64.tar.bz2',
         mac: '%s/firefox-%s.en-US.%s.dmg',
-        // TODO
-        mac_arm: '%s/firefox-%s.en-US.%s.dmg',
         win32: '%s/firefox-%s.en-US.%s.zip',
         win64: '%s/firefox-%s.en-US.%s.zip',
     },
@@ -100,7 +97,6 @@ function archiveName(product, platform, revision) {
     switch (product) {
         case 'chrome':
             switch (platform) {
-                case 'linux_arm':
                 case 'linux':
                     return 'chrome-linux';
                 case 'mac_arm':
@@ -121,12 +117,27 @@ function archiveName(product, platform, revision) {
             throw new Error('unknown browser');
     }
 }
-function _downloadURL(product, platform) {
-    const url = downloadURLs[product][platform];
+function _downloadURL(product, platform, host, revision) {
+    const url = util.format(downloadURLs[product][platform], host, revision, archiveName(product, platform, revision));
     return url;
 }
-const readdirAsync = fs.promises.readdir;
-const mkdirAsync = fs.promises.mkdir;
+function handleArm64() {
+    let exists = fs.existsSync('/usr/bin/chromium-browser');
+    if (exists) {
+        return;
+    }
+    exists = fs.existsSync('/usr/bin/chromium');
+    if (exists) {
+        return;
+    }
+    console.error('The chromium binary is not available for arm64.' +
+        '\nIf you are on Ubuntu, you can install with: ' +
+        '\n\n sudo apt install chromium\n' +
+        '\n\n sudo apt install chromium-browser\n');
+    throw new Error();
+}
+const readdirAsync = (0, util_1.promisify)(fs.readdir.bind(fs));
+const mkdirAsync = (0, util_1.promisify)(fs.mkdir.bind(fs));
 const unlinkAsync = (0, util_1.promisify)(fs.unlink.bind(fs));
 const chmodAsync = (0, util_1.promisify)(fs.chmod.bind(fs));
 function existsAsync(filePath) {
@@ -157,7 +168,9 @@ class BrowserFetcher {
                 case 'darwin':
                     switch (__classPrivateFieldGet(this, _BrowserFetcher_product, "f")) {
                         case 'chrome':
-                            __classPrivateFieldSet(this, _BrowserFetcher_platform, os.arch() === 'arm64' ? 'mac_arm' : 'mac', "f");
+                            __classPrivateFieldSet(this, _BrowserFetcher_platform, os.arch() === 'arm64' && PUPPETEER_EXPERIMENTAL_CHROMIUM_MAC_ARM
+                                ? 'mac_arm'
+                                : 'mac', "f");
                             break;
                         case 'firefox':
                             __classPrivateFieldSet(this, _BrowserFetcher_platform, 'mac', "f");
@@ -167,7 +180,7 @@ class BrowserFetcher {
                     }
                     break;
                 case 'linux':
-                    __classPrivateFieldSet(this, _BrowserFetcher_platform, os.arch() === 'arm64' ? 'linux_arm' : 'linux', "f");
+                    __classPrivateFieldSet(this, _BrowserFetcher_platform, 'linux', "f");
                     break;
                 case 'win32':
                     __classPrivateFieldSet(this, _BrowserFetcher_platform, os.arch() === 'x64' ? 'win64' : 'win32', "f");
@@ -206,8 +219,8 @@ class BrowserFetcher {
      * @returns A promise that resolves to `true` if the revision could be downloaded
      * from the host.
      */
-    canDownload() {
-        const url = _downloadURL(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"));
+    canDownload(revision) {
+        const url = _downloadURL(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), __classPrivateFieldGet(this, _BrowserFetcher_downloadHost, "f"), revision);
         return new Promise((resolve) => {
             const request = httpRequest(url, 'HEAD', (response) => {
                 resolve(response.statusCode === 200);
@@ -229,7 +242,7 @@ class BrowserFetcher {
      * and extracted.
      */
     async download(revision, progressCallback = () => undefined) {
-        const url = _downloadURL(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"));
+        const url = _downloadURL(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), __classPrivateFieldGet(this, _BrowserFetcher_downloadHost, "f"), revision);
         const fileName = url.split('/').pop();
         (0, assert_1.assert)(fileName, `A malformed download URL was found: ${url}.`);
         const archivePath = path.join(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f"), fileName);
@@ -238,9 +251,12 @@ class BrowserFetcher {
             return this.revisionInfo(revision);
         }
         if (!(await existsAsync(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f")))) {
-            await mkdirAsync(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f"), {
-                recursive: true,
-            });
+            await mkdirAsync(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f"));
+        }
+        // Use system Chromium builds on Linux ARM devices
+        if (os.platform() !== 'darwin' && os.arch() === 'arm64') {
+            handleArm64();
+            return;
         }
         try {
             await _downloadFile(url, archivePath, progressCallback);
@@ -301,9 +317,9 @@ class BrowserFetcher {
         let executablePath = '';
         if (__classPrivateFieldGet(this, _BrowserFetcher_product, "f") === 'chrome') {
             if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'mac' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'mac_arm') {
-                executablePath = path.join(folderPath, 'Thorium.app', 'Contents', 'MacOS', 'Thorium');
+                executablePath = path.join(folderPath, archiveName(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), revision), 'Chromium.app', 'Contents', 'MacOS', 'Chromium');
             }
-            else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'linux' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'linux_arm') {
+            else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'linux') {
                 executablePath = path.join(folderPath, archiveName(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), revision), 'chrome');
             }
             else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'win32' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'win64') {
@@ -317,7 +333,7 @@ class BrowserFetcher {
             if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'mac' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'mac_arm') {
                 executablePath = path.join(folderPath, 'Firefox Nightly.app', 'Contents', 'MacOS', 'firefox');
             }
-            else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'linux' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'linux_arm') {
+            else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'linux') {
                 executablePath = path.join(folderPath, 'firefox', 'firefox');
             }
             else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'win32' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'win64') {
@@ -330,8 +346,16 @@ class BrowserFetcher {
         else {
             throw new Error('Unsupported product: ' + __classPrivateFieldGet(this, _BrowserFetcher_product, "f"));
         }
-        const url = _downloadURL(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"));
+        const url = _downloadURL(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), __classPrivateFieldGet(this, _BrowserFetcher_downloadHost, "f"), revision);
         const local = fs.existsSync(folderPath);
+        console.log({
+            revision,
+            executablePath,
+            folderPath,
+            local,
+            url,
+            product: __classPrivateFieldGet(this, _BrowserFetcher_product, "f"),
+        });
         return {
             revision,
             executablePath,
@@ -367,7 +391,6 @@ function _downloadFile(url, destinationPath, progressCallback) {
     });
     let downloadedBytes = 0;
     let totalBytes = 0;
-    let lastProgress = Date.now();
     const request = httpRequest(url, 'GET', (response) => {
         if (response.statusCode !== 200) {
             const error = new Error(`Download failed: server returned code ${response.statusCode}. URL: ${url}`);
@@ -393,10 +416,7 @@ function _downloadFile(url, destinationPath, progressCallback) {
     return promise;
     function onData(chunk) {
         downloadedBytes += chunk.length;
-        if (Date.now() - lastProgress > 1000) {
-            progressCallback(downloadedBytes, totalBytes);
-            lastProgress = Date.now();
-        }
+        progressCallback(downloadedBytes, totalBytes);
     }
 }
 function install(archivePath, folderPath) {

package/dist/browser/Connection.d.ts

@@ -1,10 +1,10 @@
-import type { Protocol } from 'devtools-protocol';
-import type { ProtocolMapping } from 'devtools-protocol/types/protocol-mapping';
+import { Protocol } from 'devtools-protocol';
+import { ProtocolMapping } from 'devtools-protocol/types/protocol-mapping';
+import { ConnectionTransport } from './ConnectionTransport';
 import { EventEmitter } from './EventEmitter';
-import { NodeWebSocketTransport } from './NodeWebSocketTransport';
 export declare class Connection extends EventEmitter {
     #private;
-    constructor(url: string, transport: NodeWebSocketTransport);
+    constructor(url: string, transport: ConnectionTransport);
     static fromSession(session: CDPSession): Connection | undefined;
     get _closed(): boolean;
     /**

package/dist/browser/Connection.js

@@ -164,7 +164,7 @@ _Connection_url = new WeakMap(), _Connection_transport = new WeakMap(), _Connect
     __classPrivateFieldGet(this, _Connection_transport, "f").onmessage = undefined;
     __classPrivateFieldGet(this, _Connection_transport, "f").onclose = undefined;
     for (const callback of __classPrivateFieldGet(this, _Connection_callbacks, "f").values()) {
-        callback.reject(rewriteError(callback.error, `Protocol error (${callback.method}): Target closed. https://www.remotion.dev/docs/target-closed`));
+        callback.reject(rewriteError(callback.error, `Protocol error (${callback.method}): Target closed.`));
     }
     __classPrivateFieldGet(this, _Connection_callbacks, "f").clear();
     for (const session of __classPrivateFieldGet(this, _Connection_sessions, "f").values()) {
@@ -236,7 +236,7 @@ class CDPSession extends EventEmitter_1.EventEmitter {
     }
     _onClosed() {
         for (const callback of __classPrivateFieldGet(this, _CDPSession_callbacks, "f").values()) {
-            callback.reject(rewriteError(callback.error, `Protocol error (${callback.method}): Target closed. https://www.remotion.dev/docs/target-closed`));
+            callback.reject(rewriteError(callback.error, `Protocol error (${callback.method}): Target closed.`));
         }
         __classPrivateFieldGet(this, _CDPSession_callbacks, "f").clear();
         __classPrivateFieldSet(this, _CDPSession_connection, undefined, "f");

package/dist/browser/ConsoleMessage.d.ts

@@ -15,17 +15,41 @@
  */
 import { JSHandle } from './JSHandle';
 export interface ConsoleMessageLocation {
+    /**
+     * URL of the resource if known or `undefined` otherwise.
+     */
     url?: string;
+    /**
+     * 0-based line number in the resource if known or `undefined` otherwise.
+     */
     lineNumber?: number;
+    /**
+     * 0-based column number in the resource if known or `undefined` otherwise.
+     */
     columnNumber?: number;
 }
 export declare type ConsoleMessageType = 'log' | 'debug' | 'info' | 'error' | 'warning' | 'dir' | 'dirxml' | 'table' | 'trace' | 'clear' | 'startGroup' | 'startGroupCollapsed' | 'endGroup' | 'assert' | 'profile' | 'profileEnd' | 'count' | 'timeEnd' | 'verbose';
 export declare class ConsoleMessage {
     #private;
-    type: ConsoleMessageType;
-    text: string;
-    args: JSHandle[];
     constructor(type: ConsoleMessageType, text: string, args: JSHandle[], stackTraceLocations: ConsoleMessageLocation[]);
+    /**
+     * @returns The type of the console message.
+     */
+    type(): ConsoleMessageType;
+    /**
+     * @returns The text of the console message.
+     */
+    text(): string;
+    /**
+     * @returns An array of arguments passed to the console.
+     */
+    args(): JSHandle[];
+    /**
+     * @returns The location of the console message.
+     */
     location(): ConsoleMessageLocation;
+    /**
+     * @returns The array of locations on the stack of the console message.
+     */
     stackTrace(): ConsoleMessageLocation[];
 }

package/dist/browser/ConsoleMessage.js

@@ -25,24 +25,51 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _ConsoleMessage_stackTraceLocations;
+var _ConsoleMessage_type, _ConsoleMessage_text, _ConsoleMessage_args, _ConsoleMessage_stackTraceLocations;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleMessage = void 0;
 class ConsoleMessage {
     constructor(type, text, args, stackTraceLocations) {
+        _ConsoleMessage_type.set(this, void 0);
+        _ConsoleMessage_text.set(this, void 0);
+        _ConsoleMessage_args.set(this, void 0);
         _ConsoleMessage_stackTraceLocations.set(this, void 0);
-        this.type = type;
-        this.text = text;
-        this.args = args;
+        __classPrivateFieldSet(this, _ConsoleMessage_type, type, "f");
+        __classPrivateFieldSet(this, _ConsoleMessage_text, text, "f");
+        __classPrivateFieldSet(this, _ConsoleMessage_args, args, "f");
         __classPrivateFieldSet(this, _ConsoleMessage_stackTraceLocations, stackTraceLocations, "f");
     }
+    /**
+     * @returns The type of the console message.
+     */
+    type() {
+        return __classPrivateFieldGet(this, _ConsoleMessage_type, "f");
+    }
+    /**
+     * @returns The text of the console message.
+     */
+    text() {
+        return __classPrivateFieldGet(this, _ConsoleMessage_text, "f");
+    }
+    /**
+     * @returns An array of arguments passed to the console.
+     */
+    args() {
+        return __classPrivateFieldGet(this, _ConsoleMessage_args, "f");
+    }
+    /**
+     * @returns The location of the console message.
+     */
     location() {
         var _a;
         return (_a = __classPrivateFieldGet(this, _ConsoleMessage_stackTraceLocations, "f")[0]) !== null && _a !== void 0 ? _a : {};
     }
+    /**
+     * @returns The array of locations on the stack of the console message.
+     */
     stackTrace() {
         return __classPrivateFieldGet(this, _ConsoleMessage_stackTraceLocations, "f");
     }
 }
 exports.ConsoleMessage = ConsoleMessage;
-_ConsoleMessage_stackTraceLocations = new WeakMap();
+_ConsoleMessage_type = new WeakMap(), _ConsoleMessage_text = new WeakMap(), _ConsoleMessage_args = new WeakMap(), _ConsoleMessage_stackTraceLocations = new WeakMap();

package/dist/browser/Coverage.d.ts

@@ -0,0 +1,180 @@
+/**
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Protocol } from 'devtools-protocol';
+import { CDPSession } from './Connection';
+import { PuppeteerEventListener } from './util';
+/**
+ * @internal
+ */
+export { PuppeteerEventListener };
+/**
+ * The CoverageEntry class represents one entry of the coverage report.
+ * @public
+ */
+export interface CoverageEntry {
+    /**
+     * The URL of the style sheet or script.
+     */
+    url: string;
+    /**
+     * The content of the style sheet or script.
+     */
+    text: string;
+    /**
+     * The covered range as start and end positions.
+     */
+    ranges: Array<{
+        start: number;
+        end: number;
+    }>;
+}
+/**
+ * The CoverageEntry class for JavaScript
+ * @public
+ */
+export interface JSCoverageEntry extends CoverageEntry {
+    /**
+     * Raw V8 script coverage entry.
+     */
+    rawScriptCoverage?: Protocol.Profiler.ScriptCoverage;
+}
+/**
+ * Set of configurable options for JS coverage.
+ * @public
+ */
+export interface JSCoverageOptions {
+    /**
+     * Whether to reset coverage on every navigation.
+     */
+    resetOnNavigation?: boolean;
+    /**
+     * Whether anonymous scripts generated by the page should be reported.
+     */
+    reportAnonymousScripts?: boolean;
+    /**
+     * Whether the result includes raw V8 script coverage entries.
+     */
+    includeRawScriptCoverage?: boolean;
+}
+/**
+ * Set of configurable options for CSS coverage.
+ * @public
+ */
+export interface CSSCoverageOptions {
+    /**
+     * Whether to reset coverage on every navigation.
+     */
+    resetOnNavigation?: boolean;
+}
+/**
+ * The Coverage class provides methods to gathers information about parts of
+ * JavaScript and CSS that were used by the page.
+ *
+ * @remarks
+ * To output coverage in a form consumable by {@link https://github.com/istanbuljs | Istanbul},
+ * see {@link https://github.com/istanbuljs/puppeteer-to-istanbul | puppeteer-to-istanbul}.
+ *
+ * @example
+ * An example of using JavaScript and CSS coverage to get percentage of initially
+ * executed code:
+ * ```js
+ * // Enable both JavaScript and CSS coverage
+ * await Promise.all([
+ *   page.coverage.startJSCoverage(),
+ *   page.coverage.startCSSCoverage()
+ * ]);
+ * // Navigate to page
+ * await page.goto('https://example.com');
+ * // Disable both JavaScript and CSS coverage
+ * const [jsCoverage, cssCoverage] = await Promise.all([
+ *   page.coverage.stopJSCoverage(),
+ *   page.coverage.stopCSSCoverage(),
+ * ]);
+ * let totalBytes = 0;
+ * let usedBytes = 0;
+ * const coverage = [...jsCoverage, ...cssCoverage];
+ * for (const entry of coverage) {
+ *   totalBytes += entry.text.length;
+ *   for (const range of entry.ranges)
+ *     usedBytes += range.end - range.start - 1;
+ * }
+ * console.log(`Bytes used: ${usedBytes / totalBytes * 100}%`);
+ * ```
+ * @public
+ */
+export declare class Coverage {
+    #private;
+    constructor(client: CDPSession);
+    /**
+     * @param options - Set of configurable options for coverage defaults to
+     * `resetOnNavigation : true, reportAnonymousScripts : false`
+     * @returns Promise that resolves when coverage is started.
+     *
+     * @remarks
+     * Anonymous scripts are ones that don't have an associated url. These are
+     * scripts that are dynamically created on the page using `eval` or
+     * `new Function`. If `reportAnonymousScripts` is set to `true`, anonymous
+     * scripts will have `pptr://__puppeteer_evaluation_script__` as their URL.
+     */
+    startJSCoverage(options?: JSCoverageOptions): Promise<void>;
+    /**
+     * @returns Promise that resolves to the array of coverage reports for
+     * all scripts.
+     *
+     * @remarks
+     * JavaScript Coverage doesn't include anonymous scripts by default.
+     * However, scripts with sourceURLs are reported.
+     */
+    stopJSCoverage(): Promise<JSCoverageEntry[]>;
+    /**
+     * @param options - Set of configurable options for coverage, defaults to
+     * `resetOnNavigation : true`
+     * @returns Promise that resolves when coverage is started.
+     */
+    startCSSCoverage(options?: CSSCoverageOptions): Promise<void>;
+    /**
+     * @returns Promise that resolves to the array of coverage reports
+     * for all stylesheets.
+     * @remarks
+     * CSS Coverage doesn't include dynamically injected style tags
+     * without sourceURLs.
+     */
+    stopCSSCoverage(): Promise<CoverageEntry[]>;
+}
+/**
+ * @public
+ */
+export declare class JSCoverage {
+    #private;
+    constructor(client: CDPSession);
+    start(options?: {
+        resetOnNavigation?: boolean;
+        reportAnonymousScripts?: boolean;
+        includeRawScriptCoverage?: boolean;
+    }): Promise<void>;
+    stop(): Promise<JSCoverageEntry[]>;
+}
+/**
+ * @public
+ */
+export declare class CSSCoverage {
+    #private;
+    constructor(client: CDPSession);
+    start(options?: {
+        resetOnNavigation?: boolean;
+    }): Promise<void>;
+    stop(): Promise<CoverageEntry[]>;
+}