@remotion/renderer 4.0.0-prefetch.10 → 4.0.0-prefetch.12

package/LICENSE.md

@@ -1,34 +1,34 @@
 # Remotion License
 
-Depending on the type of your legal entity, you are granted permission to use Remotion for your project. Individuals and small companies are allowed to use Remotion create videos for free (even commercial), while a company license is required for for-profit organisations of a certain size. This two-tier system was designed to ensure funding for this project while still allowing the source code to be available and the program to be free for most. Read below for the exact terms of use.
+Depending on the type of your legal entity, you are granted permission to use Remotion for your project. Individuals and small companies are allowed to use Remotion to create videos for free (even commercial), while a company license is required for for-profit organizations of a certain size. This two-tier system was designed to ensure funding for this project while still allowing the source code to be available and the program to be free for most. Read below for the exact terms of use.
 
 - [Free license](#free-license)
 - [Company license](#company-license)
 
 ## Free license
 
-Copyright © 2022 [Jonny Burger](https://jonny.io)
+Copyright © 2022 [Remotion](https://www.remotion.dev/)
 
 ### Eligibility
 
 You are eligible to use Remotion for free if you are:
 
 - an individual
-- a for-profit organisation with up to 3 employees
-- a non-profit or not-for-profit organisation
+- a for-profit organization with up to 3 employees
+- a non-profit or not-for-profit organization
 - evaluating whether Remotion is a good fit, and are not yet using it in a commercial way
 
 ### Allowed use cases
 
-Permission is hereby granted, free of charge, to any person eligible for the "Free license", to use the software non-commercially or commercially for the purpose of creating videos and images and to modify and the software to their own liking, for the purpose of fulfilling their custom use case or to contribute bug fixes or improvements back to Remotion.
+Permission is hereby granted, free of charge, to any person eligible for the "Free license", to use the software non-commercially or commercially for the purpose of creating videos and images and to modify the software to their own liking, for the purpose of fulfilling their custom use case or to contribute bug fixes or improvements back to Remotion.
 
 ### Disallowed use cases
 
-It is not allowed to copy or modify Remotion code for the purpose of selling, renting, licensing, relicensing, sublicensing your own derivate of Remotion.
+It is not allowed to copy or modify Remotion code for the purpose of selling, renting, licensing, relicensing, or sublicensing your own derivate of Remotion.
 
 ### Warranty notice
 
-The software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the author or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
+The software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and non-infringement. In no event shall the author or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
 
 ### Support
 

package/dist/browser/BrowserFetcher.js

@@ -60,10 +60,10 @@ 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 util_1 = __importDefault(require("util"));
 const extract_zip_1 = __importDefault(require("extract-zip"));
 const URL = __importStar(require("url"));
-const util_1 = require("util");
+const util_2 = require("util");
 const assert_1 = require("./assert");
 const delete_directory_1 = require("../delete-directory");
 const get_download_destination_1 = require("./get-download-destination");
@@ -106,7 +106,7 @@ function archiveName(product, platform, revision) {
                 case 'win64':
                     // Windows archive name changed at r591479.
                     return parseInt(revision, 10) > 591479
-                        ? 'chrome-win'
+                        ? 'Thorium_107.0.5271.0\\BIN'
                         : 'chrome-win32';
                 default:
                     throw new Error('unknown browser');
@@ -118,8 +118,10 @@ function archiveName(product, platform, revision) {
     }
 }
 function _downloadURL(product, platform, host, revision) {
-    const url = util.format(downloadURLs[product][platform], host, revision, archiveName(product, platform, revision));
-    return url;
+    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));
 }
 function handleArm64() {
     let exists = fs.existsSync('/usr/bin/chromium-browser');
@@ -136,10 +138,10 @@ function handleArm64() {
         '\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));
+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));
 function existsAsync(filePath) {
     return new Promise((resolve) => {
         fs.access(filePath, (err) => {
@@ -325,7 +327,7 @@ class BrowserFetcher {
                 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') {
-                executablePath = path.join(folderPath, archiveName(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), revision), 'chrome.exe');
+                executablePath = path.join(folderPath, archiveName(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), revision), 'thorium.exe');
             }
             else {
                 throw new Error('Unsupported platform: ' + __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"));

package/dist/browser/BrowserRunner.d.ts

@@ -17,17 +17,14 @@
 import * as childProcess from 'child_process';
 import { Connection } from './Connection';
 import type { LaunchOptions } from './LaunchOptions';
-import type { Product } from './Product';
 export declare class BrowserRunner {
     #private;
     proc?: childProcess.ChildProcess;
     connection?: Connection;
-    constructor({ product, executablePath, processArguments, userDataDir, isTempUserDataDir, }: {
-        product: Product;
+    constructor({ executablePath, processArguments, userDataDir, }: {
         executablePath: string;
         processArguments: string[];
         userDataDir: string;
-        isTempUserDataDir?: boolean;
     });
     start(options: LaunchOptions): void;
     close(): Promise<void>;

package/dist/browser/BrowserRunner.js

@@ -48,45 +48,37 @@ 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 readline = __importStar(require("readline"));
-const util_1 = require("util");
 const delete_directory_1 = require("../delete-directory");
 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;
+        const { dumpio, env, pipe } = options;
         let stdio;
         if (pipe) {
             if (dumpio) {
@@ -121,66 +113,33 @@ class BrowserRunner {
             this.proc.once('exit', async () => {
                 __classPrivateFieldSet(this, _BrowserRunner_closed, true, "f");
                 // Cleanup as processes exit.
-                if (__classPrivateFieldGet(this, _BrowserRunner_isTempUserDataDir, "f")) {
-                    try {
+                try {
+                    if (fs.existsSync(__classPrivateFieldGet(this, _BrowserRunner_userDataDir, "f"))) {
                         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);
-                        }
                     }
                     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 +176,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 +198,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 +246,7 @@ function waitForWSEndpoint(browserProcess, timeout, preferredRevision) {
             if (timeoutId) {
                 clearTimeout(timeoutId);
             }
-            (0, util_2.removeEventListeners)(listeners);
+            (0, util_1.removeEventListeners)(listeners);
         }
     });
 }
@@ -298,7 +255,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/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>;
 }
 export declare type PuppeteerNodeLaunchOptions = BrowserLaunchArgumentOptions & LaunchOptions & BrowserConnectOptions;

package/dist/browser/Launcher.d.ts

@@ -6,4 +6,4 @@ export interface ProductLauncher {
     executablePath: (path?: any) => string;
     product: Product;
 }
-export default function Launcher(preferredRevision: string, product?: string): ProductLauncher;
+export default function Launcher(preferredRevision: string): ProductLauncher;