@remotion/renderer 4.0.36 → 4.0.38

package/dist/browser/Connection.js

@@ -66,7 +66,6 @@ class Connection extends EventEmitter_1.EventEmitter {
             __classPrivateFieldGet(this, _Connection_callbacks, "f").set(id, {
                 resolve,
                 reject,
-                error: new Errors_1.ProtocolError(),
                 method,
                 returnSize: true,
             });
@@ -136,7 +135,7 @@ _Connection_transport = new WeakMap(), _Connection_lastId = new WeakMap(), _Conn
         if (callback) {
             __classPrivateFieldGet(this, _Connection_callbacks, "f").delete(object.id);
             if (object.error) {
-                callback.reject(createProtocolError(callback.error, callback.method, object));
+                callback.reject(createProtocolError(callback.method, object));
             }
             else if (callback.returnSize) {
                 callback.resolve({ value: object.result, size: message.length });
@@ -156,7 +155,7 @@ _Connection_transport = new WeakMap(), _Connection_lastId = new WeakMap(), _Conn
     __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(new Errors_1.ProtocolError(), `Protocol error (${callback.method}): Target closed. https://www.remotion.dev/docs/target-closed`));
     }
     __classPrivateFieldGet(this, _Connection_callbacks, "f").clear();
     for (const session of __classPrivateFieldGet(this, _Connection_sessions, "f").values()) {
@@ -197,7 +196,6 @@ class CDPSession extends EventEmitter_1.EventEmitter {
             __classPrivateFieldGet(this, _CDPSession_callbacks, "f").set(id, {
                 resolve,
                 reject,
-                error: new Errors_1.ProtocolError(),
                 method,
                 returnSize: true,
             });
@@ -208,7 +206,7 @@ class CDPSession extends EventEmitter_1.EventEmitter {
         if (object.id && callback) {
             __classPrivateFieldGet(this, _CDPSession_callbacks, "f").delete(object.id);
             if (object.error) {
-                callback.reject(createProtocolError(callback.error, callback.method, object));
+                callback.reject(createProtocolError(callback.method, object));
             }
             else if (callback.returnSize) {
                 callback.resolve({ value: object.result, size });
@@ -225,7 +223,7 @@ 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`));
+            callback.reject(rewriteError(new Errors_1.ProtocolError(), `Protocol error (${callback.method}): Target closed. https://www.remotion.dev/docs/target-closed`));
         }
         __classPrivateFieldGet(this, _CDPSession_callbacks, "f").clear();
         this.emit(exports.CDPSessionEmittedEvents.Disconnected);
@@ -236,12 +234,12 @@ class CDPSession extends EventEmitter_1.EventEmitter {
 }
 exports.CDPSession = CDPSession;
 _CDPSession_sessionId = new WeakMap(), _CDPSession_targetType = new WeakMap(), _CDPSession_callbacks = new WeakMap(), _CDPSession_connection = new WeakMap();
-function createProtocolError(error, method, object) {
+function createProtocolError(method, object) {
     let message = `Protocol error (${method}): ${object.error.message}`;
     if ('data' in object.error) {
         message += ` ${object.error.data}`;
     }
-    return rewriteError(error, message, object.error.message);
+    return rewriteError(new Errors_1.ProtocolError(), message, object.error.message);
 }
 function rewriteError(error, message, originalMessage) {
     error.message = message;

package/dist/browser/HTTPRequest.d.ts

@@ -20,6 +20,7 @@ export declare class HTTPRequest {
     #private;
     _requestId: string;
     _response: HTTPResponse | null;
+    _url: string | null;
     _fromMemoryCache: boolean;
     constructor(frame: Frame | null, event: RequestWillBeSentEvent);
     response(): HTTPResponse | null;

package/dist/browser/HTTPRequest.js

@@ -16,12 +16,14 @@ exports.HTTPRequest = void 0;
 class HTTPRequest {
     constructor(frame, event) {
         this._response = null;
+        this._url = null;
         this._fromMemoryCache = false;
         _HTTPRequest_isNavigationRequest.set(this, void 0);
         _HTTPRequest_frame.set(this, void 0);
         this._requestId = event.requestId;
         __classPrivateFieldSet(this, _HTTPRequest_isNavigationRequest, event.requestId === event.loaderId && event.type === 'Document', "f");
         __classPrivateFieldSet(this, _HTTPRequest_frame, frame, "f");
+        this._url = event.request.url;
     }
     response() {
         return this._response;

package/dist/browser/NetworkManager.js

@@ -28,6 +28,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _NetworkManager_instances, _NetworkManager_client, _NetworkManager_frameManager, _NetworkManager_networkEventManager, _NetworkManager_onRequestWillBeSent, _NetworkManager_onRequestPaused, _NetworkManager_patchRequestEventHeaders, _NetworkManager_onRequest, _NetworkManager_onRequestServedFromCache, _NetworkManager_handleRequestRedirect, _NetworkManager_emitResponseEvent, _NetworkManager_onResponseReceived, _NetworkManager_onResponseReceivedExtraInfo, _NetworkManager_forgetRequest, _NetworkManager_onLoadingFinished, _NetworkManager_emitLoadingFinished, _NetworkManager_onLoadingFailed, _NetworkManager_emitLoadingFailed;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkManager = exports.NetworkManagerEmittedEvents = void 0;
+const logger_1 = require("../logger");
 const EventEmitter_1 = require("./EventEmitter");
 const HTTPRequest_1 = require("./HTTPRequest");
 const HTTPResponse_1 = require("./HTTPResponse");
@@ -227,5 +228,6 @@ _NetworkManager_client = new WeakMap(), _NetworkManager_frameManager = new WeakM
     if (!request) {
         return;
     }
+    logger_1.Log.warn(`Browser failed to load ${request._url}: ${event.errorText}`);
     __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_forgetRequest).call(this, request, true);
 };

package/dist/get-cpu-count.js

@@ -9,7 +9,7 @@ const node_os_1 = require("node:os");
 // We also get it from nproc and use the minimum of the two.
 const getConcurrencyFromNProc = () => {
     try {
-        return parseInt((0, node_child_process_1.execSync)('nproc').toString().trim(), 10);
+        return parseInt((0, node_child_process_1.execSync)('nproc', { stdio: 'pipe' }).toString().trim(), 10);
     }
     catch (error) {
         return null;

package/dist/get-local-browser-executable.js

@@ -71,7 +71,7 @@ const getBrowserStatus = (browserExecutablePath) => {
 const ensureLocalBrowser = async (preferredBrowserExecutable) => {
     const status = getBrowserStatus(preferredBrowserExecutable);
     if (status.type === 'no-browser') {
-        logger_1.Log.info('No local browser could be found. Downloading Thorium https://www.remotion.dev/docs/thorium-browser');
+        logger_1.Log.info('No local browser could be found. Downloading Thorium https://www.remotion.dev/docs/miscellaneous/thorium-browser');
         await (0, BrowserFetcher_1.downloadBrowser)();
     }
 };

package/dist/puppeteer-evaluate.d.ts

@@ -1,10 +1,16 @@
 import type { Page } from './browser/BrowserPage';
-export declare function puppeteerEvaluateWithCatch<ReturnType>({ page, pageFunction, frame, args, }: {
+type PuppeteerCatchOptions = {
     page: Page;
     pageFunction: Function | string;
     frame: number | null;
     args: unknown[];
-}): Promise<{
+};
+export declare function puppeteerEvaluateWithCatchAndTimeout<ReturnType>({ args, frame, page, pageFunction, }: PuppeteerCatchOptions): Promise<{
     value: ReturnType;
     size: number;
 }>;
+export declare function puppeteerEvaluateWithCatch<ReturnType>({ page, pageFunction, frame, args, }: PuppeteerCatchOptions): Promise<{
+    value: ReturnType;
+    size: number;
+}>;
+export {};

package/dist/puppeteer-evaluate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.puppeteerEvaluateWithCatch = void 0;
+exports.puppeteerEvaluateWithCatch = exports.puppeteerEvaluateWithCatchAndTimeout = void 0;
 const JSHandle_1 = require("./browser/JSHandle");
 const symbolicateable_error_1 = require("./error-handling/symbolicateable-error");
 const parse_browser_error_stack_1 = require("./parse-browser-error-stack");
@@ -29,6 +29,22 @@ function valueFromRemoteObject(remoteObject) {
 function isString(obj) {
     return typeof obj === 'string' || obj instanceof String;
 }
+function puppeteerEvaluateWithCatchAndTimeout({ args, frame, page, pageFunction, }) {
+    return Promise.race([
+        new Promise((_, reject) => {
+            setTimeout(() => {
+                reject(new Error('timeout exceeded'));
+            }, 5000);
+        }),
+        puppeteerEvaluateWithCatch({
+            args,
+            frame,
+            page,
+            pageFunction,
+        }),
+    ]);
+}
+exports.puppeteerEvaluateWithCatchAndTimeout = puppeteerEvaluateWithCatchAndTimeout;
 async function puppeteerEvaluateWithCatch({ page, pageFunction, frame, args, }) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const contextId = (await page.mainFrame().executionContext())._contextId;
@@ -95,8 +111,9 @@ async function puppeteerEvaluateWithCatch({ page, pageFunction, frame, args, })
     }
     catch (error) {
         if (error instanceof TypeError &&
-            error.message.startsWith('Converting circular structure to JSON'))
+            error.message.startsWith('Converting circular structure to JSON')) {
             error.message += ' Are you passing a nested JSHandle?';
+        }
         throw error;
     }
     try {

package/dist/seek-to-frame.js

@@ -19,11 +19,13 @@ const waitForReady = ({ page, timeoutInMilliseconds, frame, }) => {
                 : `the page to render the React component at frame ${frame}`,
             shouldClosePage: false,
         })
-            .then((a) => resolve(a))
+            .then((a) => {
+            return resolve(a);
+        })
             .catch((err) => {
             if (err.message.includes('timeout') &&
                 err.message.includes('exceeded')) {
-                (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+                (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatchAndTimeout)({
                     pageFunction: () => {
                         return Object.keys(window.remotion_delayRenderTimeouts)
                             .map((id, i) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.36",
+  "version": "4.0.38",
   "description": "Renderer for Remotion",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "extract-zip": "2.0.1",
     "source-map": "^0.8.0-beta.0",
     "ws": "8.7.0",
-    "remotion": "4.0.36"
+    "remotion": "4.0.38"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -40,13 +40,13 @@
     "vitest": "0.31.1"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-x64": "4.0.36",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.36",
-    "@remotion/compositor-linux-arm64-musl": "4.0.36",
-    "@remotion/compositor-linux-x64-gnu": "4.0.36",
-    "@remotion/compositor-linux-x64-musl": "4.0.36",
-    "@remotion/compositor-win32-x64-msvc": "4.0.36",
-    "@remotion/compositor-darwin-arm64": "4.0.36"
+    "@remotion/compositor-darwin-arm64": "4.0.38",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.38",
+    "@remotion/compositor-darwin-x64": "4.0.38",
+    "@remotion/compositor-linux-arm64-musl": "4.0.38",
+    "@remotion/compositor-linux-x64-gnu": "4.0.38",
+    "@remotion/compositor-linux-x64-musl": "4.0.38",
+    "@remotion/compositor-win32-x64-msvc": "4.0.38"
   },
   "keywords": [
     "remotion",

package/dist/browser/Product.d.ts

@@ -1,16 +0,0 @@
-/**
- * Copyright 2020 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.
- */
-export type Product = 'chrome' | 'firefox';

package/dist/browser/Product.js

@@ -1,17 +0,0 @@
-"use strict";
-/**
- * Copyright 2020 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.
- */
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/browser/create-browser-fetcher.d.ts

@@ -1,17 +0,0 @@
-/**
- * Copyright 2020 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 type { Product } from './Product';
-export declare function downloadBrowser(product: Product): Promise<void>;

package/dist/browser/create-browser-fetcher.js

@@ -1,58 +0,0 @@
-"use strict";
-/**
- * Copyright 2020 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.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadBrowser = void 0;
-const BrowserFetcher_1 = require("./BrowserFetcher");
-const revisions_1 = require("./revisions");
-const supportedProducts = {
-    chrome: 'Chromium',
-    firefox: 'Firefox Nightly',
-};
-function getRevision(product) {
-    if (product === 'chrome') {
-        return revisions_1.PUPPETEER_REVISIONS.chromium;
-    }
-    throw new Error(`Unsupported product ${product}`);
-}
-async function downloadBrowser(product) {
-    const revision = getRevision(product);
-    const revisionInfo = (0, BrowserFetcher_1.getRevisionInfo)(revision, product);
-    await (0, BrowserFetcher_1.download)({
-        revision: revisionInfo.revision,
-        progressCallback: (downloadedBytes, totalBytes) => {
-            console.log('Downloading', supportedProducts[product], toMegabytes(downloadedBytes) + '/' + toMegabytes(totalBytes));
-        },
-        product,
-        platform: (0, BrowserFetcher_1.getPlatform)(product),
-        downloadHost: (0, BrowserFetcher_1.getDownloadHost)(product),
-        downloadsFolder: (0, BrowserFetcher_1.getDownloadsFolder)(product),
-    });
-    const _localRevisions = await (0, BrowserFetcher_1.localRevisions)((0, BrowserFetcher_1.getDownloadsFolder)(product), product, (0, BrowserFetcher_1.getPlatform)(product));
-    console.log(`${supportedProducts[product]} (${revisionInfo.revision}) downloaded to ${revisionInfo.folderPath}`);
-    await Promise.all(_localRevisions
-        .filter((__revision) => {
-        return __revision !== revisionInfo.revision;
-    })
-        .map((__revision) => {
-        return (0, BrowserFetcher_1.removeBrowser)(__revision, (0, BrowserFetcher_1.getFolderPath)(revision, (0, BrowserFetcher_1.getDownloadsFolder)(product), (0, BrowserFetcher_1.getPlatform)(product)));
-    }));
-}
-exports.downloadBrowser = downloadBrowser;
-function toMegabytes(bytes) {
-    const mb = bytes / 1024 / 1024;
-    return `${Math.round(mb * 10) / 10} Mb`;
-}

package/dist/browser/revisions.d.ts

@@ -1,20 +0,0 @@
-/**
- * Copyright 2020 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.
- */
-type Revisions = Readonly<{
-    readonly chromium: string;
-}>;
-export declare const PUPPETEER_REVISIONS: Revisions;
-export {};

package/dist/browser/revisions.js

@@ -1,21 +0,0 @@
-"use strict";
-/**
- * Copyright 2020 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.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PUPPETEER_REVISIONS = void 0;
-exports.PUPPETEER_REVISIONS = {
-    chromium: '1002410',
-};