@remotion/renderer 4.0.0-alpha.4 → 4.0.0-alpha10

package/dist/browser/BrowserRunner.js

@@ -48,60 +48,41 @@ 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 _BrowserRunner_product, _BrowserRunner_executablePath, _BrowserRunner_processArguments, _BrowserRunner_userDataDir, _BrowserRunner_isTempUserDataDir, _BrowserRunner_closed, _BrowserRunner_listeners, _BrowserRunner_processClosing;
+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 path = __importStar(require("path"));
+const childProcess = __importStar(require("node:child_process"));
+const fs = __importStar(require("node:fs"));
 const readline = __importStar(require("readline"));
-const util_1 = require("util");
 const delete_directory_1 = require("../delete-directory");
+const logger_1 = require("../logger");
 const assert_1 = require("./assert");
 const Connection_1 = require("./Connection");
 const Errors_1 = require("./Errors");
 const NodeWebSocketTransport_1 = require("./NodeWebSocketTransport");
-const util_2 = require("./util");
-const renameAsync = (0, util_1.promisify)(fs.rename);
-const unlinkAsync = (0, util_1.promisify)(fs.unlink);
+const util_1 = require("./util");
 const PROCESS_ERROR_EXPLANATION = `Puppeteer was unable to kill the process which ran the browser binary.
  This means that, on future Puppeteer launches, Puppeteer might not be able to launch the browser.
  Please check your open processes and ensure that the browser processes that Puppeteer launched have been killed.
  If you think this is a bug, please report it on the Puppeteer issue tracker.`;
 class BrowserRunner {
-    constructor({ product, executablePath, processArguments, userDataDir, isTempUserDataDir, }) {
-        _BrowserRunner_product.set(this, void 0);
+    constructor({ executablePath, processArguments, userDataDir, }) {
         _BrowserRunner_executablePath.set(this, void 0);
         _BrowserRunner_processArguments.set(this, void 0);
         _BrowserRunner_userDataDir.set(this, void 0);
-        _BrowserRunner_isTempUserDataDir.set(this, void 0);
         _BrowserRunner_closed.set(this, true);
         _BrowserRunner_listeners.set(this, []);
         _BrowserRunner_processClosing.set(this, void 0);
-        __classPrivateFieldSet(this, _BrowserRunner_product, product, "f");
         __classPrivateFieldSet(this, _BrowserRunner_executablePath, executablePath, "f");
         __classPrivateFieldSet(this, _BrowserRunner_processArguments, processArguments, "f");
         __classPrivateFieldSet(this, _BrowserRunner_userDataDir, userDataDir, "f");
-        __classPrivateFieldSet(this, _BrowserRunner_isTempUserDataDir, isTempUserDataDir, "f");
     }
     start(options) {
         var _a, _b;
-        const { handleSIGINT, handleSIGTERM, handleSIGHUP, dumpio, env, pipe } = options;
-        let stdio;
-        if (pipe) {
-            if (dumpio) {
-                stdio = ['ignore', 'pipe', 'pipe', 'pipe', 'pipe'];
-            }
-            else {
-                stdio = ['ignore', 'ignore', 'ignore', 'pipe', 'pipe'];
-            }
-        }
-        else if (dumpio) {
-            stdio = ['pipe', 'pipe', 'pipe'];
-        }
-        else {
-            stdio = ['pipe', 'ignore', 'pipe'];
-        }
+        const { dumpio, env } = options;
+        const stdio = dumpio
+            ? ['ignore', 'pipe', 'pipe']
+            : ['pipe', 'ignore', 'pipe'];
         (0, assert_1.assert)(!this.proc, 'This process has previously been started.');
         this.proc = childProcess.spawn(__classPrivateFieldGet(this, _BrowserRunner_executablePath, "f"), __classPrivateFieldGet(this, _BrowserRunner_processArguments, "f"), {
             // On non-windows platforms, `detached: true` makes child process a
@@ -113,74 +94,45 @@ 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) => {
+                logger_1.Log.verboseAdvanced({ indent: options.indent, logLevel: (0, logger_1.getLogLevel)(), tag: 'chrome' }, d.toString().trim());
+            });
+            (_b = this.proc.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (d) => {
+                logger_1.Log.verboseAdvanced({ indent: options.indent, logLevel: (0, logger_1.getLogLevel)(), tag: 'chrome' }, d.toString().trim());
+            });
         }
         __classPrivateFieldSet(this, _BrowserRunner_closed, false, "f");
         __classPrivateFieldSet(this, _BrowserRunner_processClosing, new Promise((fulfill, reject) => {
-            this.proc.once('exit', async () => {
+            this.proc.once('exit', () => {
                 __classPrivateFieldSet(this, _BrowserRunner_closed, true, "f");
                 // Cleanup as processes exit.
-                if (__classPrivateFieldGet(this, _BrowserRunner_isTempUserDataDir, "f")) {
-                    try {
-                        await (0, delete_directory_1.deleteDirectory)(__classPrivateFieldGet(this, _BrowserRunner_userDataDir, "f"));
-                        fulfill();
-                    }
-                    catch (error) {
-                        reject(error);
-                    }
-                }
-                else {
-                    if (__classPrivateFieldGet(this, _BrowserRunner_product, "f") === 'firefox') {
-                        try {
-                            // When an existing user profile has been used remove the user
-                            // preferences file and restore possibly backuped preferences.
-                            await unlinkAsync(path.join(__classPrivateFieldGet(this, _BrowserRunner_userDataDir, "f"), 'user.js'));
-                            const prefsBackupPath = path.join(__classPrivateFieldGet(this, _BrowserRunner_userDataDir, "f"), 'prefs.js.puppeteer');
-                            if (fs.existsSync(prefsBackupPath)) {
-                                const prefsPath = path.join(__classPrivateFieldGet(this, _BrowserRunner_userDataDir, "f"), 'prefs.js');
-                                await unlinkAsync(prefsPath);
-                                await renameAsync(prefsBackupPath, prefsPath);
-                            }
-                        }
-                        catch (error) {
-                            reject(error);
-                        }
+                try {
+                    if (fs.existsSync(__classPrivateFieldGet(this, _BrowserRunner_userDataDir, "f"))) {
+                        (0, delete_directory_1.deleteDirectory)(__classPrivateFieldGet(this, _BrowserRunner_userDataDir, "f"));
                     }
                     fulfill();
                 }
+                catch (error) {
+                    reject(error);
+                }
             });
         }), "f");
-        __classPrivateFieldSet(this, _BrowserRunner_listeners, [(0, util_2.addEventListener)(process, 'exit', this.kill.bind(this))], "f");
-        if (handleSIGINT) {
-            __classPrivateFieldGet(this, _BrowserRunner_listeners, "f").push((0, util_2.addEventListener)(process, 'SIGINT', () => {
-                this.kill();
-                process.exit(130);
-            }));
-        }
-        if (handleSIGTERM) {
-            __classPrivateFieldGet(this, _BrowserRunner_listeners, "f").push((0, util_2.addEventListener)(process, 'SIGTERM', this.close.bind(this)));
-        }
-        if (handleSIGHUP) {
-            __classPrivateFieldGet(this, _BrowserRunner_listeners, "f").push((0, util_2.addEventListener)(process, 'SIGHUP', this.close.bind(this)));
-        }
+        __classPrivateFieldSet(this, _BrowserRunner_listeners, [(0, util_1.addEventListener)(process, 'exit', this.kill.bind(this))], "f");
+        __classPrivateFieldGet(this, _BrowserRunner_listeners, "f").push((0, util_1.addEventListener)(process, 'SIGINT', () => {
+            this.kill();
+            process.exit(130);
+        }));
+        __classPrivateFieldGet(this, _BrowserRunner_listeners, "f").push((0, util_1.addEventListener)(process, 'SIGTERM', this.close.bind(this)));
+        __classPrivateFieldGet(this, _BrowserRunner_listeners, "f").push((0, util_1.addEventListener)(process, 'SIGHUP', this.close.bind(this)));
     }
     close() {
         if (__classPrivateFieldGet(this, _BrowserRunner_closed, "f")) {
             return Promise.resolve();
         }
-        if (__classPrivateFieldGet(this, _BrowserRunner_isTempUserDataDir, "f")) {
-            this.kill();
-        }
-        else if (this.connection) {
-            // Attempt to close the browser gracefully
-            this.connection.send('Browser.close').catch(() => {
-                this.kill();
-            });
-        }
+        this.kill();
         // Cleanup this listener last, as that makes sure the full callback runs. If we
         // perform this earlier, then the previous function calls would not happen.
-        (0, util_2.removeEventListeners)(__classPrivateFieldGet(this, _BrowserRunner_listeners, "f"));
+        (0, util_1.removeEventListeners)(__classPrivateFieldGet(this, _BrowserRunner_listeners, "f"));
         return __classPrivateFieldGet(this, _BrowserRunner_processClosing, "f");
     }
     kill() {
@@ -217,19 +169,17 @@ class BrowserRunner {
                 }
             }
             catch (error) {
-                throw new Error(`${PROCESS_ERROR_EXPLANATION}\nError cause: ${(0, util_2.isErrorLike)(error) ? error.stack : error}`);
+                throw new Error(`${PROCESS_ERROR_EXPLANATION}\nError cause: ${(0, util_1.isErrorLike)(error) ? error.stack : error}`);
             }
         }
         // Attempt to remove temporary profile directory to avoid littering.
         try {
-            if (__classPrivateFieldGet(this, _BrowserRunner_isTempUserDataDir, "f")) {
-                fs.rmSync(__classPrivateFieldGet(this, _BrowserRunner_userDataDir, "f"), { recursive: true, force: true });
-            }
+            fs.rmSync(__classPrivateFieldGet(this, _BrowserRunner_userDataDir, "f"), { recursive: true, force: true });
         }
         catch (error) { }
         // Cleanup this listener last, as that makes sure the full callback runs. If we
         // perform this earlier, then the previous function calls would not happen.
-        (0, util_2.removeEventListeners)(__classPrivateFieldGet(this, _BrowserRunner_listeners, "f"));
+        (0, util_1.removeEventListeners)(__classPrivateFieldGet(this, _BrowserRunner_listeners, "f"));
     }
     async setupConnection(options) {
         (0, assert_1.assert)(this.proc, 'BrowserRunner not started.');
@@ -241,21 +191,21 @@ class BrowserRunner {
     }
 }
 exports.BrowserRunner = BrowserRunner;
-_BrowserRunner_product = new WeakMap(), _BrowserRunner_executablePath = new WeakMap(), _BrowserRunner_processArguments = new WeakMap(), _BrowserRunner_userDataDir = new WeakMap(), _BrowserRunner_isTempUserDataDir = new WeakMap(), _BrowserRunner_closed = new WeakMap(), _BrowserRunner_listeners = new WeakMap(), _BrowserRunner_processClosing = new WeakMap();
+_BrowserRunner_executablePath = new WeakMap(), _BrowserRunner_processArguments = new WeakMap(), _BrowserRunner_userDataDir = new WeakMap(), _BrowserRunner_closed = new WeakMap(), _BrowserRunner_listeners = new WeakMap(), _BrowserRunner_processClosing = new WeakMap();
 function waitForWSEndpoint(browserProcess, timeout, preferredRevision) {
     (0, assert_1.assert)(browserProcess.stderr, '`browserProcess` does not have stderr.');
     const rl = readline.createInterface(browserProcess.stderr);
     let stderr = '';
     return new Promise((resolve, reject) => {
         const listeners = [
-            (0, util_2.addEventListener)(rl, 'line', onLine),
-            (0, util_2.addEventListener)(rl, 'close', () => {
+            (0, util_1.addEventListener)(rl, 'line', onLine),
+            (0, util_1.addEventListener)(rl, 'close', () => {
                 return onClose();
             }),
-            (0, util_2.addEventListener)(browserProcess, 'exit', () => {
+            (0, util_1.addEventListener)(browserProcess, 'exit', () => {
                 return onClose();
             }),
-            (0, util_2.addEventListener)(browserProcess, 'error', (error) => {
+            (0, util_1.addEventListener)(browserProcess, 'error', (error) => {
                 return onClose(error);
             }),
         ];
@@ -289,7 +239,7 @@ function waitForWSEndpoint(browserProcess, timeout, preferredRevision) {
             if (timeoutId) {
                 clearTimeout(timeoutId);
             }
-            (0, util_2.removeEventListeners)(listeners);
+            (0, util_1.removeEventListeners)(listeners);
         }
     });
 }
@@ -298,7 +248,7 @@ function pidExists(pid) {
         return process.kill(pid, 0);
     }
     catch (error) {
-        if ((0, util_2.isErrnoException)(error)) {
+        if ((0, util_1.isErrnoException)(error)) {
             if (error.code && error.code === 'ESRCH') {
                 return false;
             }

package/dist/browser/Connection.js

@@ -215,11 +215,11 @@ class CDPSession extends EventEmitter_1.EventEmitter {
         }
     }
     _onClosed() {
+        __classPrivateFieldSet(this, _CDPSession_connection, undefined, "f");
         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`));
         }
         __classPrivateFieldGet(this, _CDPSession_callbacks, "f").clear();
-        __classPrivateFieldSet(this, _CDPSession_connection, undefined, "f");
         this.emit(exports.CDPSessionEmittedEvents.Disconnected);
     }
     id() {

package/dist/browser/DOMWorld.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { Browser } from './Browser';
+import type { HeadlessBrowser } from './Browser';
 import type { EvaluateFn, EvaluateFnReturnType, EvaluateHandleFn, SerializableOrJSHandle, UnwrapPromiseLike } from './EvalTypes';
 import type { ExecutionContext } from './ExecutionContext';
 import type { Frame } from './FrameManager';
@@ -30,7 +30,7 @@ export declare class DOMWorld {
     executionContext(): Promise<ExecutionContext>;
     evaluateHandle<HandlerType extends JSHandle = JSHandle>(pageFunction: EvaluateHandleFn, ...args: SerializableOrJSHandle[]): Promise<HandlerType>;
     evaluate<T extends EvaluateFn>(pageFunction: T, ...args: SerializableOrJSHandle[]): Promise<UnwrapPromiseLike<EvaluateFnReturnType<T>>>;
-    waitForFunction(browser: Browser, pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
+    waitForFunction(browser: HeadlessBrowser, pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
     title(): Promise<string>;
 }
 interface WaitTaskOptions {
@@ -38,7 +38,7 @@ interface WaitTaskOptions {
     predicateBody: Function | string;
     title: string;
     timeout: number;
-    browser: Browser;
+    browser: HeadlessBrowser;
     args: SerializableOrJSHandle[];
 }
 declare class WaitTask {
@@ -46,7 +46,8 @@ declare class WaitTask {
     promise: Promise<JSHandle>;
     constructor(options: WaitTaskOptions);
     onBrowserClose: () => void;
-    terminate(error: Error): void;
+    onBrowserCloseSilent: () => void;
+    terminate(error: Error | null): void;
     rerun(): Promise<void>;
 }
 export {};

package/dist/browser/DOMWorld.js

@@ -131,6 +131,9 @@ class WaitTask {
         this.onBrowserClose = () => {
             return this.terminate(new Error('Browser was closed'));
         };
+        this.onBrowserCloseSilent = () => {
+            return this.terminate(null);
+        };
         function getPredicateBody(predicateBody) {
             if ((0, util_1.isString)(predicateBody)) {
                 return `return (${predicateBody});`;
@@ -157,11 +160,14 @@ class WaitTask {
         }
         __classPrivateFieldSet(this, _WaitTask_browser, options.browser, "f");
         __classPrivateFieldGet(this, _WaitTask_browser, "f").on("closed" /* BrowserEmittedEvents.Closed */, this.onBrowserClose);
+        __classPrivateFieldGet(this, _WaitTask_browser, "f").on("closed-silent" /* BrowserEmittedEvents.ClosedSilent */, this.onBrowserCloseSilent);
         this.rerun();
     }
     terminate(error) {
         __classPrivateFieldSet(this, _WaitTask_terminated, true, "f");
-        __classPrivateFieldGet(this, _WaitTask_reject, "f").call(this, error);
+        if (error) {
+            __classPrivateFieldGet(this, _WaitTask_reject, "f").call(this, error);
+        }
         __classPrivateFieldGet(this, _WaitTask_instances, "m", _WaitTask_cleanup).call(this);
     }
     async rerun() {
@@ -242,6 +248,7 @@ _WaitTask_domWorld = new WeakMap(), _WaitTask_timeout = new WeakMap(), _WaitTask
         clearTimeout(__classPrivateFieldGet(this, _WaitTask_timeoutTimer, "f"));
     }
     __classPrivateFieldGet(this, _WaitTask_browser, "f").off("closed" /* BrowserEmittedEvents.Closed */, this.onBrowserClose);
+    __classPrivateFieldGet(this, _WaitTask_browser, "f").off("closed-silent" /* BrowserEmittedEvents.ClosedSilent */, this.onBrowserCloseSilent);
     __classPrivateFieldGet(this, _WaitTask_domWorld, "f")._waitTasks.delete(this);
 };
 function waitForPredicatePageFunction(predicateBody, timeout, ...args) {

package/dist/browser/FrameManager.d.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { Browser } from './Browser';
 import type { Page } from './BrowserPage';
 import type { CDPSession } from './Connection';
 import type { Frame as TFrame } from './devtools-types';
@@ -83,7 +82,6 @@ export declare class Frame {
     evaluate<T extends EvaluateFn>(pageFunction: T, ...args: SerializableOrJSHandle[]): Promise<UnwrapPromiseLike<EvaluateFnReturnType<T>>>;
     url(): string;
     childFrames(): Frame[];
-    waitForFunction(browser: Browser, pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
     _navigated(framePayload: TFrame): void;
     _navigatedWithinDocument(url: string): void;
     _onLifecycleEvent(loaderId: string, name: string): void;

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;
@@ -460,9 +459,6 @@ class Frame {
     childFrames() {
         return Array.from(this._childFrames);
     }
-    waitForFunction(browser, pageFunction, ...args) {
-        return this._mainWorld.waitForFunction(browser, pageFunction, ...args);
-    }
     _navigated(framePayload) {
         this._name = framePayload.name;
         __classPrivateFieldSet(this, _Frame_url, `${framePayload.url}${framePayload.urlFragment || ''}`, "f");

package/dist/browser/LaunchOptions.d.ts

@@ -24,14 +24,10 @@ export interface BrowserLaunchArgumentOptions {
 }
 export interface LaunchOptions {
     executablePath?: string;
-    handleSIGINT?: boolean;
-    handleSIGTERM?: boolean;
-    handleSIGHUP?: boolean;
     timeout?: number;
     dumpio?: boolean;
     env?: Record<string, string | undefined>;
-    pipe?: boolean;
     product?: Product;
-    extraPrefsFirefox?: Record<string, unknown>;
+    indent: boolean;
 }
 export declare type PuppeteerNodeLaunchOptions = BrowserLaunchArgumentOptions & LaunchOptions & BrowserConnectOptions;

package/dist/browser/Launcher.d.ts

@@ -1,9 +1,15 @@
-import { Browser } from './Browser';
+import { HeadlessBrowser } from './Browser';
 import type { PuppeteerNodeLaunchOptions } from './LaunchOptions';
 import type { Product } from './Product';
 export interface ProductLauncher {
-    launch(object: PuppeteerNodeLaunchOptions): Promise<Browser>;
+    launch(object: PuppeteerNodeLaunchOptions): Promise<HeadlessBrowser>;
     executablePath: (path?: any) => string;
     product: Product;
 }
-export default function Launcher(preferredRevision: string, product?: string): ProductLauncher;
+export declare class ChromeLauncher implements ProductLauncher {
+    _preferredRevision: string;
+    constructor(preferredRevision: string);
+    launch(options: PuppeteerNodeLaunchOptions): Promise<HeadlessBrowser>;
+    executablePath(): string;
+    get product(): Product;
+}