@remotion/lambda 3.0.0-lambda.41 → 3.0.0-lambda.419

package/dist/functions/helpers/get-browser-instance.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.quitBrowser = exports.closeBrowser = exports.getBrowserInstance = void 0;
+exports.getBrowserInstance = void 0;
 const renderer_1 = require("@remotion/renderer");
 const get_chromium_executable_path_1 = require("./get-chromium-executable-path");
 let _browserInstance;
@@ -19,35 +19,35 @@ const waitForLaunched = () => {
         check();
     });
 };
-const getBrowserInstance = async () => {
+const getBrowserInstance = async (shouldDumpIo, chromiumOptions) => {
     if (launching) {
         await waitForLaunched();
+        if (!_browserInstance) {
+            throw new Error('expected to launch');
+        }
+        return _browserInstance;
     }
     if (_browserInstance) {
         return _browserInstance;
     }
     launching = true;
     const execPath = await (0, get_chromium_executable_path_1.executablePath)();
-    _browserInstance = await renderer_1.RenderInternals.openBrowser('chrome', {
+    const actualChromiumOptions = {
+        gl: 'swiftshader',
+        ...chromiumOptions,
+    };
+    _browserInstance = await (0, renderer_1.openBrowser)('chrome', {
         browserExecutable: execPath,
+        shouldDumpIo,
+        chromiumOptions: actualChromiumOptions,
+    });
+    _browserInstance.on('disconnected', () => {
+        console.log('Browser disconnected / crashed');
+        _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.close().catch(() => undefined);
+        _browserInstance = null;
     });
     launching = false;
     return _browserInstance;
 };
 exports.getBrowserInstance = getBrowserInstance;
-const closeBrowser = async () => {
-    if (_browserInstance) {
-        const pages = await _browserInstance.pages();
-        await Promise.all(pages.map((p) => p.close()));
-    }
-};
-exports.closeBrowser = closeBrowser;
-const quitBrowser = async () => {
-    if (!_browserInstance) {
-        return;
-    }
-    await _browserInstance.close();
-    _browserInstance = null;
-};
-exports.quitBrowser = quitBrowser;
 //# sourceMappingURL=get-browser-instance.js.map

package/dist/functions/helpers/get-browser-instance.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-browser-instance.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-browser-instance.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AAEnD,iFAA8D;AAE9D,IAAI,gBAEI,CAAC;AAET,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB,MAAM,eAAe,GAAG,GAAG,EAAE;IAC5B,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,GAAG,EAAE,CAClB,UAAU,CAAC,GAAG,EAAE;YACf,IAAI,SAAS,EAAE;gBACd,OAAO,EAAE,CAAC;aACV;iBAAM;gBACN,KAAK,EAAE,CAAC;aACR;QACF,CAAC,EAAE,EAAE,CAAC,CAAC;QAER,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACvE,KAAK,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,KAAK,IAErC,EAAE;IACH,IAAI,SAAS,EAAE;QACd,MAAM,eAAe,EAAE,CAAC;KACxB;IAED,IAAI,gBAAgB,EAAE;QACrB,OAAO,gBAAgB,CAAC;KACxB;IAED,SAAS,GAAG,IAAI,CAAC;IAEjB,MAAM,QAAQ,GAAG,MAAM,IAAA,6CAAc,GAAE,CAAC;IACxC,gBAAgB,GAAG,MAAM,0BAAe,CAAC,WAAW,CAAC,QAAQ,EAAE;QAC9D,iBAAiB,EAAE,QAAQ;KAC3B,CAAC,CAAC;IACH,SAAS,GAAG,KAAK,CAAC;IAClB,OAAO,gBAAgB,CAAC;AACzB,CAAC,CAAC;AAnBW,QAAA,kBAAkB,sBAmB7B;AAEK,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;IACtC,IAAI,gBAAgB,EAAE;QACrB,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC7C,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;KAC/C;AACF,CAAC,CAAC;AALW,QAAA,YAAY,gBAKvB;AAEK,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;IACrC,IAAI,CAAC,gBAAgB,EAAE;QACtB,OAAO;KACP;IAED,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;IAC/B,gBAAgB,GAAG,IAAI,CAAC;AACzB,CAAC,CAAC;AAPW,QAAA,WAAW,eAOtB"}
+{"version":3,"file":"get-browser-instance.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-browser-instance.ts"],"names":[],"mappings":";;;AAAA,iDAAgE;AAEhE,iFAA8D;AAE9D,IAAI,gBAA8D,CAAC;AAEnE,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB,MAAM,eAAe,GAAG,GAAG,EAAE;IAC5B,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,GAAG,EAAE,CAClB,UAAU,CAAC,GAAG,EAAE;YACf,IAAI,SAAS,EAAE;gBACd,OAAO,EAAE,CAAC;aACV;iBAAM;gBACN,KAAK,EAAE,CAAC;aACR;QACF,CAAC,EAAE,EAAE,CAAC,CAAC;QAER,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACvE,KAAK,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,KAAK,EACtC,YAAqB,EACrB,eAAgC,EACC,EAAE;IACnC,IAAI,SAAS,EAAE;QACd,MAAM,eAAe,EAAE,CAAC;QACxB,IAAI,CAAC,gBAAgB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACtC;QAED,OAAO,gBAAgB,CAAC;KACxB;IAED,IAAI,gBAAgB,EAAE;QACrB,OAAO,gBAAgB,CAAC;KACxB;IAED,SAAS,GAAG,IAAI,CAAC;IAEjB,MAAM,QAAQ,GAAG,MAAM,IAAA,6CAAc,GAAE,CAAC;IAExC,MAAM,qBAAqB,GAAoB;QAC9C,EAAE,EAAE,aAAa;QACjB,GAAG,eAAe;KAClB,CAAC;IAEF,gBAAgB,GAAG,MAAM,IAAA,sBAAW,EAAC,QAAQ,EAAE;QAC9C,iBAAiB,EAAE,QAAQ;QAC3B,YAAY;QACZ,eAAe,EAAE,qBAAqB;KACtC,CAAC,CAAC;IACH,gBAAgB,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;QACxC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAC9C,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACjD,gBAAgB,GAAG,IAAI,CAAC;IACzB,CAAC,CAAC,CAAC;IACH,SAAS,GAAG,KAAK,CAAC;IAClB,OAAO,gBAAgB,CAAC;AACzB,CAAC,CAAC;AAtCW,QAAA,kBAAkB,sBAsC7B"}

package/dist/functions/helpers/get-chromium-executable-path.d.ts

@@ -1,2 +1,2 @@
-export declare const executablePath: () => Promise<string>;
+export declare const executablePath: () => Promise<string | undefined>;
 //# sourceMappingURL=get-chromium-executable-path.d.ts.map

package/dist/functions/helpers/get-chromium-executable-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-chromium-executable-path.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-chromium-executable-path.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,cAAc,QAAa,QAAQ,MAAM,CAErD,CAAC"}
+{"version":3,"file":"get-chromium-executable-path.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-chromium-executable-path.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,cAAc,QAAa,QAAQ,MAAM,GAAG,SAAS,CAEjE,CAAC"}

package/dist/functions/helpers/get-chromium-executable-path.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-chromium-executable-path.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-chromium-executable-path.ts"],"names":[],"mappings":";;;;AAAA,IACC,qCAAqC,CAAC,IAAI,CACzC,MAAA,OAAO,CAAC,GAAG,CAAC,iBAAiB,mCAAI,EAAE,CACnC,KAAK,IAAI,EACT;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC;KACrC;IAED,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,mBAAmB,CAAC;CAClD;AAEM,MAAM,cAAc,GAAG,KAAK,IAAqB,EAAE;IACzD,OAAO,mBAAmB,CAAC;AAC5B,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB"}
+{"version":3,"file":"get-chromium-executable-path.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-chromium-executable-path.ts"],"names":[],"mappings":";;;;AAAA,IACC,qCAAqC,CAAC,IAAI,CACzC,MAAA,OAAO,CAAC,GAAG,CAAC,iBAAiB,mCAAI,EAAE,CACnC,KAAK,IAAI,EACT;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC;KACrC;IAED,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,mBAAmB,CAAC;CAClD;AAEM,MAAM,cAAc,GAAG,KAAK,IAAiC,EAAE;IACrE,OAAO,mBAAmB,CAAC;AAC5B,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB"}

package/dist/functions/helpers/get-cleanup-progress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-cleanup-progress.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-cleanup-progress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAGnD,eAAO,MAAM,kBAAkB;cAMpB,OAAO,EAAE;YACX,MAAM,GAAG,IAAI;gBACT,MAAM;cACR,MAAM;MACb,IAAI,GAAG,WA4BV,CAAC"}
+{"version":3,"file":"get-cleanup-progress.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-cleanup-progress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAGnD,eAAO,MAAM,kBAAkB;cAMpB,OAAO,EAAE;YACX,MAAM,GAAG,IAAI;gBACT,MAAM;cACR,MAAM;MACb,IAAI,GAAG,WA+BV,CAAC"}

package/dist/functions/helpers/get-cleanup-progress.js

@@ -19,9 +19,9 @@ const getCleanupProgress = ({ contents, output, chunkCount, renderId, }) => {
             throw new Error('Unexpected in getCleanupProgress');
         });
     });
-    const filesDeleted = filesToDelete.length - filesStillThere.length;
+    const filesDeleted = Math.max(0, filesToDelete.length - filesStillThere.length);
     return {
-        filesToDelete: filesToDelete.length,
+        minFilesToDelete: filesToDelete.length,
         filesDeleted,
         // We don't know. Only if post render data is saved, we know the timing
         doneIn: null,

package/dist/functions/helpers/get-cleanup-progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-cleanup-progress.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-cleanup-progress.ts"],"names":[],"mappings":";;;AAEA,+DAAuD;AAEhD,MAAM,kBAAkB,GAAG,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,GAMR,EAAsB,EAAE;IACxB,IAAI,MAAM,KAAK,IAAI,EAAE;QACpB,OAAO,IAAI,CAAC;KACZ;IAED,MAAM,aAAa,GAAG,IAAA,sCAAgB,EAAC,EAAC,UAAU,EAAE,QAAQ,EAAC,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7C,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;;YAC/B,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;gBACvB,OAAO,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,GAAG,CAAC;aACxB;YAED,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACxB,OAAO,MAAA,CAAC,CAAC,GAAG,0CAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aACjC;YAED,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;IAEnE,OAAO;QACN,aAAa,EAAE,aAAa,CAAC,MAAM;QACnC,YAAY;QACZ,uEAAuE;QACvE,MAAM,EAAE,IAAI;KACZ,CAAC;AACH,CAAC,CAAC;AAtCW,QAAA,kBAAkB,sBAsC7B"}
+{"version":3,"file":"get-cleanup-progress.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-cleanup-progress.ts"],"names":[],"mappings":";;;AAEA,+DAAuD;AAEhD,MAAM,kBAAkB,GAAG,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,GAMR,EAAsB,EAAE;IACxB,IAAI,MAAM,KAAK,IAAI,EAAE;QACpB,OAAO,IAAI,CAAC;KACZ;IAED,MAAM,aAAa,GAAG,IAAA,sCAAgB,EAAC,EAAC,UAAU,EAAE,QAAQ,EAAC,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7C,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;;YAC/B,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;gBACvB,OAAO,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,GAAG,CAAC;aACxB;YAED,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACxB,OAAO,MAAA,CAAC,CAAC,GAAG,0CAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aACjC;YAED,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAC5B,CAAC,EACD,aAAa,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAC7C,CAAC;IAEF,OAAO;QACN,gBAAgB,EAAE,aAAa,CAAC,MAAM;QACtC,YAAY;QACZ,uEAAuE;QACvE,MAAM,EAAE,IAAI;KACZ,CAAC;AACH,CAAC,CAAC;AAzCW,QAAA,kBAAkB,sBAyC7B"}

package/dist/functions/helpers/get-current-architecture.d.ts

@@ -0,0 +1,3 @@
+import { LambdaArchitecture } from '../../shared/validate-architecture';
+export declare const getCurrentArchitecture: () => LambdaArchitecture;
+//# sourceMappingURL=get-current-architecture.d.ts.map

package/dist/functions/helpers/get-current-architecture.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-current-architecture.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-current-architecture.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,kBAAkB,EAAC,MAAM,oCAAoC,CAAC;AAEtE,eAAO,MAAM,sBAAsB,QAAO,kBAQzC,CAAC"}

package/dist/functions/helpers/get-current-architecture.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCurrentArchitecture = void 0;
+const is_in_lambda_1 = require("../../shared/is-in-lambda");
+const getCurrentArchitecture = () => {
+    if (!(0, is_in_lambda_1.isInsideLambda)()) {
+        throw new Error('Should not call getCurrentArchitecture() if not inside a lambda function');
+    }
+    return process.arch.includes('arm') ? 'arm64' : 'x86_64';
+};
+exports.getCurrentArchitecture = getCurrentArchitecture;
+//# sourceMappingURL=get-current-architecture.js.map

package/dist/functions/helpers/get-current-architecture.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-current-architecture.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-current-architecture.ts"],"names":[],"mappings":";;;AAAA,4DAAyD;AAGlD,MAAM,sBAAsB,GAAG,GAAuB,EAAE;IAC9D,IAAI,CAAC,IAAA,6BAAc,GAAE,EAAE;QACtB,MAAM,IAAI,KAAK,CACd,0EAA0E,CAC1E,CAAC;KACF;IAED,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC1D,CAAC,CAAC;AARW,QAAA,sBAAsB,0BAQjC"}

package/dist/functions/helpers/get-current-region.d.ts

@@ -1,2 +1,2 @@
-export declare const getCurrentRegionInFunction: () => "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2" | "af-south-1" | "ap-east-1" | "ap-south-1" | "ap-northeast-3" | "ap-northeast-2" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1" | "ca-central-1" | "eu-central-1" | "eu-west-1" | "eu-west-2" | "eu-south-1" | "eu-west-3" | "eu-north-1" | "me-south-1" | "sa-east-1";
+export declare const getCurrentRegionInFunction: () => "eu-central-1" | "eu-west-1" | "eu-west-2" | "us-east-1" | "us-east-2" | "us-west-2" | "ap-south-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1";
 //# sourceMappingURL=get-current-region.d.ts.map

package/dist/functions/helpers/get-current-region.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-current-region.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-current-region.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,0BAA0B,+UAYtC,CAAC"}
+{"version":3,"file":"get-current-region.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-current-region.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,0BAA0B,oKAYtC,CAAC"}

package/dist/functions/helpers/get-current-region.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurrentRegionInFunction = void 0;
-const tmpdir_1 = require("../../shared/tmpdir");
+const is_in_lambda_1 = require("../../shared/is-in-lambda");
 const getCurrentRegionInFunction = () => {
-    if (!tmpdir_1.isInLambda) {
+    if (!(0, is_in_lambda_1.isInsideLambda)()) {
         throw new Error('Should not call getCurrentRegion() if not inside a lambda function');
     }
     if (!process.env.AWS_REGION) {

package/dist/functions/helpers/get-current-region.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-current-region.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-current-region.ts"],"names":[],"mappings":";;;AACA,gDAA+C;AAExC,MAAM,0BAA0B,GAAG,GAAG,EAAE;IAC9C,IAAI,CAAC,mBAAU,EAAE;QAChB,MAAM,IAAI,KAAK,CACd,oEAAoE,CACpE,CAAC;KACF;IAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;KACjE;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,UAAuB,CAAC;AAC5C,CAAC,CAAC;AAZW,QAAA,0BAA0B,8BAYrC"}
+{"version":3,"file":"get-current-region.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-current-region.ts"],"names":[],"mappings":";;;AACA,4DAAyD;AAElD,MAAM,0BAA0B,GAAG,GAAG,EAAE;IAC9C,IAAI,CAAC,IAAA,6BAAc,GAAE,EAAE;QACtB,MAAM,IAAI,KAAK,CACd,oEAAoE,CACpE,CAAC;KACF;IAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;KACjE;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,UAAuB,CAAC;AAC5C,CAAC,CAAC;AAZW,QAAA,0BAA0B,8BAYrC"}

package/dist/functions/helpers/get-files-to-delete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-files-to-delete.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-files-to-delete.ts"],"names":[],"mappings":"AAOA,oBAAY,UAAU,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,gBAAgB;gBAIhB,MAAM;cACR,MAAM;MACb,UAAU,EAwCb,CAAC"}
+{"version":3,"file":"get-files-to-delete.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-files-to-delete.ts"],"names":[],"mappings":"AAOA,oBAAY,UAAU,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,gBAAgB;gBAIhB,MAAM;cACR,MAAM;MACb,UAAU,EAgCb,CAAC"}

package/dist/functions/helpers/get-files-to-delete.js

@@ -3,10 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFilesToDelete = void 0;
 const constants_1 = require("../../shared/constants");
 const getFilesToDelete = ({ chunkCount, renderId, }) => {
-    const initialized = new Array(chunkCount).fill(true).map((x, i) => (0, constants_1.lambdaInitializedKey)({
-        chunk: i,
-        renderId,
-    }));
     const chunks = new Array(chunkCount).fill(true).map((x, i) => (0, constants_1.chunkKeyForIndex)({
         index: i,
         renderId,
@@ -15,12 +11,10 @@ const getFilesToDelete = ({ chunkCount, renderId, }) => {
         .fill(true)
         .map((x, i) => (0, constants_1.lambdaTimingsPrefixForChunk)(renderId, i));
     return [
-        ...initialized.map((i) => {
-            return {
-                name: i,
-                type: 'exact',
-            };
-        }),
+        {
+            name: (0, constants_1.lambdaInitializedPrefix)(renderId),
+            type: 'prefix',
+        },
         ...chunks.map((i) => {
             return {
                 name: i,

package/dist/functions/helpers/get-files-to-delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-files-to-delete.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-files-to-delete.ts"],"names":[],"mappings":";;;AAAA,sDAKgC;AAOzB,MAAM,gBAAgB,GAAG,CAAC,EAChC,UAAU,EACV,QAAQ,GAIR,EAAgB,EAAE;IAClB,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACjE,IAAA,gCAAoB,EAAC;QACpB,KAAK,EAAE,CAAC;QACR,QAAQ;KACR,CAAC,CACF,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC5D,IAAA,4BAAgB,EAAC;QAChB,KAAK,EAAE,CAAC;QACR,QAAQ;KACR,CAAC,CACF,CAAC;IACF,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC;SACzC,IAAI,CAAC,IAAI,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,uCAA2B,EAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1D,OAAO;QACN,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACxB,OAAO;gBACN,IAAI,EAAE,CAAC;gBACP,IAAI,EAAE,OAAgB;aACtB,CAAC;QACH,CAAC,CAAC;QACF,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACnB,OAAO;gBACN,IAAI,EAAE,CAAC;gBACP,IAAI,EAAE,OAAgB;aACtB,CAAC;QACH,CAAC,CAAC;QACF,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1B,OAAO;gBACN,IAAI,EAAE,CAAC;gBACP,IAAI,EAAE,QAAiB;aACvB,CAAC;QACH,CAAC,CAAC;QACF;YACC,IAAI,EAAE,IAAA,+BAAmB,EAAC,QAAQ,CAAC;YACnC,IAAI,EAAE,OAAO;SACb;KACD,CAAC;AACH,CAAC,CAAC;AA9CW,QAAA,gBAAgB,oBA8C3B"}
+{"version":3,"file":"get-files-to-delete.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-files-to-delete.ts"],"names":[],"mappings":";;;AAAA,sDAKgC;AAOzB,MAAM,gBAAgB,GAAG,CAAC,EAChC,UAAU,EACV,QAAQ,GAIR,EAAgB,EAAE;IAClB,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC5D,IAAA,4BAAgB,EAAC;QAChB,KAAK,EAAE,CAAC;QACR,QAAQ;KACR,CAAC,CACF,CAAC;IACF,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC;SACzC,IAAI,CAAC,IAAI,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,uCAA2B,EAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1D,OAAO;QACN;YACC,IAAI,EAAE,IAAA,mCAAuB,EAAC,QAAQ,CAAC;YACvC,IAAI,EAAE,QAAiB;SACvB;QACD,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACnB,OAAO;gBACN,IAAI,EAAE,CAAC;gBACP,IAAI,EAAE,OAAgB;aACtB,CAAC;QACH,CAAC,CAAC;QACF,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1B,OAAO;gBACN,IAAI,EAAE,CAAC;gBACP,IAAI,EAAE,QAAiB;aACvB,CAAC;QACH,CAAC,CAAC;QACF;YACC,IAAI,EAAE,IAAA,+BAAmB,EAAC,QAAQ,CAAC;YACnC,IAAI,EAAE,OAAO;SACb;KACD,CAAC;AACH,CAAC,CAAC;AAtCW,QAAA,gBAAgB,oBAsC3B"}

package/dist/functions/helpers/get-lambdas-invoked-stats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-lambdas-invoked-stats.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-lambdas-invoked-stats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAI3C,oBAAY,iBAAiB,GAAG;IAC/B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,sBAAsB,aACxB,OAAO,EAAE,YACT,MAAM,oCACkB,MAAM,GAAG,IAAI,aACpC,MAAM,GAAG,IAAI,KACtB,iBAmBF,CAAC"}
+{"version":3,"file":"get-lambdas-invoked-stats.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-lambdas-invoked-stats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAK3C,oBAAY,iBAAiB,GAAG;IAC/B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,sBAAsB,aACxB,OAAO,EAAE,YACT,MAAM,oCACkB,MAAM,GAAG,IAAI,aACpC,MAAM,GAAG,IAAI,KACtB,iBAkBF,CAAC"}

package/dist/functions/helpers/get-lambdas-invoked-stats.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLambdasInvokedStats = void 0;
-const renderer_1 = require("@remotion/renderer");
 const constants_1 = require("../../shared/constants");
+const parse_lambda_initialized_key_1 = require("../../shared/parse-lambda-initialized-key");
+const min_max_1 = require("./min-max");
 const getLambdasInvokedStats = (contents, renderId, estimatedRenderLambdaInvokations, startDate) => {
-    const lambdasInvoked = contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaInitializedPrefix)(renderId)); });
+    const lambdasInvoked = contents
+        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaInitializedPrefix)(renderId)); })
+        .filter((c) => (0, parse_lambda_initialized_key_1.parseLambdaInitializedKey)(c.Key).attempt === 1);
     const allLambdasInvoked = lambdasInvoked.length === estimatedRenderLambdaInvokations;
     const timeToInvokeLambdas = allLambdasInvoked && startDate
-        ? renderer_1.RenderInternals.max(lambdasInvoked.map((l) => { var _a; return (_a = l.LastModified) === null || _a === void 0 ? void 0 : _a.getTime(); })) - startDate
+        ? (0, min_max_1.max)(lambdasInvoked.map((l) => { var _a; return (_a = l.LastModified) === null || _a === void 0 ? void 0 : _a.getTime(); })) -
+            startDate
         : null;
     return {
         timeToInvokeLambdas,

package/dist/functions/helpers/get-lambdas-invoked-stats.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-lambdas-invoked-stats.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-lambdas-invoked-stats.ts"],"names":[],"mappings":";;;AACA,iDAAmD;AACnD,sDAA+D;AAQxD,MAAM,sBAAsB,GAAG,CACrC,QAAmB,EACnB,QAAgB,EAChB,gCAA+C,EAC/C,SAAwB,EACJ,EAAE;IACtB,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAC5C,OAAA,MAAA,CAAC,CAAC,GAAG,0CAAE,UAAU,CAAC,IAAA,mCAAuB,EAAC,QAAQ,CAAC,CAAC,CAAA,EAAA,CACpD,CAAC;IACF,MAAM,iBAAiB,GACtB,cAAc,CAAC,MAAM,KAAK,gCAAgC,CAAC;IAE5D,MAAM,mBAAmB,GACxB,iBAAiB,IAAI,SAAS;QAC7B,CAAC,CAAC,0BAAe,CAAC,GAAG,CACnB,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,YAAY,0CAAE,OAAO,EAAY,CAAA,EAAA,CAAC,CAC7D,GAAG,SAAS;QACf,CAAC,CAAC,IAAI,CAAC;IAET,OAAO;QACN,mBAAmB;QACnB,iBAAiB;QACjB,cAAc,EAAE,cAAc,CAAC,MAAM;KACrC,CAAC;AACH,CAAC,CAAC;AAxBW,QAAA,sBAAsB,0BAwBjC"}
+{"version":3,"file":"get-lambdas-invoked-stats.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-lambdas-invoked-stats.ts"],"names":[],"mappings":";;;AACA,sDAA+D;AAC/D,4FAAoF;AACpF,uCAA8B;AAQvB,MAAM,sBAAsB,GAAG,CACrC,QAAmB,EACnB,QAAgB,EAChB,gCAA+C,EAC/C,SAAwB,EACJ,EAAE;IACtB,MAAM,cAAc,GAAG,QAAQ;SAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,GAAG,0CAAE,UAAU,CAAC,IAAA,mCAAuB,EAAC,QAAQ,CAAC,CAAC,CAAA,EAAA,CAAC;SACnE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,wDAAyB,EAAC,CAAC,CAAC,GAAa,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC;IAC1E,MAAM,iBAAiB,GACtB,cAAc,CAAC,MAAM,KAAK,gCAAgC,CAAC;IAE5D,MAAM,mBAAmB,GACxB,iBAAiB,IAAI,SAAS;QAC7B,CAAC,CAAC,IAAA,aAAG,EAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,YAAY,0CAAE,OAAO,EAAY,CAAA,EAAA,CAAC,CAAC;YACnE,SAAS;QACX,CAAC,CAAC,IAAI,CAAC;IAET,OAAO;QACN,mBAAmB;QACnB,iBAAiB;QACjB,cAAc,EAAE,cAAc,CAAC,MAAM;KACrC,CAAC;AACH,CAAC,CAAC;AAvBW,QAAA,sBAAsB,0BAuBjC"}

package/dist/functions/helpers/get-output-url-from-metadata.d.ts

@@ -0,0 +1,3 @@
+import { RenderMetadata } from '../../defaults';
+export declare const getOutputUrlFromMetadata: (renderMetadata: RenderMetadata, bucketName: string) => string;
+//# sourceMappingURL=get-output-url-from-metadata.d.ts.map

package/dist/functions/helpers/get-output-url-from-metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-output-url-from-metadata.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-output-url-from-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAI9C,eAAO,MAAM,wBAAwB,mBACpB,cAAc,cAClB,MAAM,WAMlB,CAAC"}

package/dist/functions/helpers/get-output-url-from-metadata.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOutputUrlFromMetadata = void 0;
+const expected_out_name_1 = require("./expected-out-name");
+const get_current_region_1 = require("./get-current-region");
+const getOutputUrlFromMetadata = (renderMetadata, bucketName) => {
+    const outname = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName);
+    return `https://s3.${(0, get_current_region_1.getCurrentRegionInFunction)()}.amazonaws.com/${outname.renderBucketName}/${outname.key}`;
+};
+exports.getOutputUrlFromMetadata = getOutputUrlFromMetadata;
+//# sourceMappingURL=get-output-url-from-metadata.js.map

package/dist/functions/helpers/get-output-url-from-metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-output-url-from-metadata.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-output-url-from-metadata.ts"],"names":[],"mappings":";;;AACA,2DAAuD;AACvD,6DAAgE;AAEzD,MAAM,wBAAwB,GAAG,CACvC,cAA8B,EAC9B,UAAkB,EACjB,EAAE;IACH,MAAM,OAAO,GAAG,IAAA,sCAAkB,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAC/D,OAAO,cAAc,IAAA,+CAA0B,GAAE,kBAChD,OAAO,CAAC,gBACT,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;AACnB,CAAC,CAAC;AARW,QAAA,wBAAwB,4BAQnC"}

package/dist/functions/helpers/get-post-render-data.d.ts

@@ -1,4 +1,4 @@
-import { AwsRegion } from '../..';
+import { AwsRegion } from '../../pricing/aws-regions';
 import { PostRenderData } from '../../shared/constants';
 export declare const getPostRenderData: ({ bucketName, renderId, region, expectedBucketOwner, }: {
     bucketName: string;

package/dist/functions/helpers/get-post-render-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-post-render-data.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-post-render-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAChC,OAAO,EAAC,cAAc,EAAoB,MAAM,wBAAwB,CAAC;AAIzE,eAAO,MAAM,iBAAiB;gBAMjB,MAAM;cACR,MAAM;YACR,SAAS;yBACI,MAAM;MACxB,QAAQ,cAAc,GAAG,IAAI,CAahC,CAAC"}
+{"version":3,"file":"get-post-render-data.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-post-render-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAC,cAAc,EAAoB,MAAM,wBAAwB,CAAC;AAIzE,eAAO,MAAM,iBAAiB;gBAMjB,MAAM;cACR,MAAM;YACR,SAAS;yBACI,MAAM;MACxB,QAAQ,cAAc,GAAG,IAAI,CAahC,CAAC"}

package/dist/functions/helpers/get-progress.d.ts

@@ -1,10 +1,11 @@
-import { AwsRegion } from '../..';
+import { AwsRegion } from '../../pricing/aws-regions';
 import { RenderProgress } from '../../shared/constants';
-export declare const getProgress: ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, }: {
+export declare const getProgress: ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMiliseconds, }: {
     bucketName: string;
     renderId: string;
     expectedBucketOwner: string;
     region: AwsRegion;
     memorySizeInMb: number;
+    timeoutInMiliseconds: number;
 }) => Promise<RenderProgress>;
 //# sourceMappingURL=get-progress.d.ts.map

package/dist/functions/helpers/get-progress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-progress.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-progress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAChC,OAAO,EAIN,cAAc,EAEd,MAAM,wBAAwB,CAAC;AAkBhC,eAAO,MAAM,WAAW;gBAOX,MAAM;cACR,MAAM;yBACK,MAAM;YACnB,SAAS;oBACD,MAAM;MACnB,QAAQ,cAAc,CAgLzB,CAAC"}
+{"version":3,"file":"get-progress.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-progress.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAKN,cAAc,EAEd,MAAM,wBAAwB,CAAC;AAqBhC,eAAO,MAAM,WAAW;gBAQX,MAAM;cACR,MAAM;yBACK,MAAM;YACnB,SAAS;oBACD,MAAM;0BACA,MAAM;MACzB,QAAQ,cAAc,CAoOzB,CAAC"}

package/dist/functions/helpers/get-progress.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProgress = void 0;
+const remotion_1 = require("remotion");
 const constants_1 = require("../../shared/constants");
 const calculate_chunk_times_1 = require("./calculate-chunk-times");
 const calculate_price_from_bucket_1 = require("./calculate-price-from-bucket");
+const expected_out_name_1 = require("./expected-out-name");
 const find_output_file_in_bucket_1 = require("./find-output-file-in-bucket");
 const format_costs_info_1 = require("./format-costs-info");
 const get_cleanup_progress_1 = require("./get-cleanup-progress");
+const get_current_architecture_1 = require("./get-current-architecture");
 const get_current_region_1 = require("./get-current-region");
 const get_encoding_metadata_1 = require("./get-encoding-metadata");
 const get_final_encoding_status_1 = require("./get-final-encoding-status");
@@ -14,12 +17,12 @@ const get_lambdas_invoked_stats_1 = require("./get-lambdas-invoked-stats");
 const get_overall_progress_1 = require("./get-overall-progress");
 const get_post_render_data_1 = require("./get-post-render-data");
 const get_render_metadata_1 = require("./get-render-metadata");
+const get_retry_stats_1 = require("./get-retry-stats");
 const get_time_to_finish_1 = require("./get-time-to-finish");
 const inspect_errors_1 = require("./inspect-errors");
 const io_1 = require("./io");
-const is_fatal_error_1 = require("./is-fatal-error");
-const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMiliseconds, }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const postRenderData = await (0, get_post_render_data_1.getPostRenderData)({
         bucketName,
         region,
@@ -27,6 +30,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         expectedBucketOwner,
     });
     if (postRenderData) {
+        const outData = (0, expected_out_name_1.getExpectedOutName)(postRenderData.renderMetadata, bucketName);
         return {
             bucket: bucketName,
             renderSize: postRenderData.renderSize,
@@ -34,7 +38,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
             cleanup: {
                 doneIn: postRenderData.timeToCleanUp,
                 filesDeleted: postRenderData.filesCleanedUp,
-                filesToDelete: postRenderData.filesCleanedUp,
+                minFilesToDelete: postRenderData.filesCleanedUp,
             },
             costs: {
                 accruedSoFar: postRenderData.cost.estimatedCost,
@@ -60,6 +64,9 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
             timeToFinishChunks: postRenderData.timeToRenderChunks,
             timeToInvokeLambdas: postRenderData.timeToInvokeLambdas,
             overallProgress: 1,
+            retriesInfo: postRenderData.retriesInfo,
+            outKey: outData.key,
+            outBucket: outData.renderBucketName,
         };
     }
     const contents = await (0, io_1.lambdaLs)({
@@ -93,34 +100,44 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
             expectedBucketOwner,
         }),
     ]);
+    const outputFile = renderMetadata
+        ? await (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
+            bucketName,
+            renderMetadata,
+            region,
+        })
+        : null;
     const accruedSoFar = Number((0, calculate_price_from_bucket_1.estimatePriceFromBucket)({
-        renderId,
         contents,
         renderMetadata,
-        bucketName,
         memorySizeInMb,
+        outputFileMetadata: outputFile,
+        architecture: (0, get_current_architecture_1.getCurrentArchitecture)(),
+        lambdasInvoked: (_a = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.estimatedRenderLambdaInvokations) !== null && _a !== void 0 ? _a : 0,
+        // We cannot determine the ephemeral storage size, so we
+        // overestimate the price, but will only have a miniscule effect (~0.2%)
+        diskSizeInMb: constants_1.MAX_EPHEMERAL_STORAGE_IN_MB,
     }));
-    const outputFile = (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
-        bucketName,
-        contents,
-        renderMetadata,
-    });
     const cleanup = (0, get_cleanup_progress_1.getCleanupProgress)({
-        chunkCount: (_a = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _a !== void 0 ? _a : 0,
+        chunkCount: (_b = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _b !== void 0 ? _b : 0,
         contents,
-        output: (_b = outputFile === null || outputFile === void 0 ? void 0 : outputFile.url) !== null && _b !== void 0 ? _b : null,
+        output: (_c = outputFile === null || outputFile === void 0 ? void 0 : outputFile.url) !== null && _c !== void 0 ? _c : null,
         renderId,
     });
     const timeToFinish = (0, get_time_to_finish_1.getTimeToFinish)({
-        lastModified: (_c = outputFile === null || outputFile === void 0 ? void 0 : outputFile.lastModified) !== null && _c !== void 0 ? _c : null,
+        lastModified: (_d = outputFile === null || outputFile === void 0 ? void 0 : outputFile.lastModified) !== null && _d !== void 0 ? _d : null,
         renderMetadata,
     });
     const chunks = contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.chunkKey)(renderId)); });
-    const allChunks = chunks.length === ((_d = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _d !== void 0 ? _d : Infinity);
+    const allChunks = chunks.length === ((_e = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _e !== void 0 ? _e : Infinity);
     const renderSize = contents
         .map((c) => { var _a; return (_a = c.Size) !== null && _a !== void 0 ? _a : 0; })
         .reduce((a, b) => a + b, 0);
-    const lambdasInvokedStats = (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)(contents, renderId, (_e = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.estimatedRenderLambdaInvokations) !== null && _e !== void 0 ? _e : null, (_f = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.startedDate) !== null && _f !== void 0 ? _f : null);
+    const lambdasInvokedStats = (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)(contents, renderId, (_f = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.estimatedRenderLambdaInvokations) !== null && _f !== void 0 ? _f : null, (_g = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.startedDate) !== null && _g !== void 0 ? _g : null);
+    const retriesInfo = (0, get_retry_stats_1.getRetryStats)({
+        contents,
+        renderId,
+    });
     const finalEncodingStatus = (0, get_final_encoding_status_1.getFinalEncodingStatus)({
         encodingStatus,
         outputFileExists: Boolean(outputFile),
@@ -128,8 +145,29 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         lambdaInvokeStatus: lambdasInvokedStats,
     });
     const chunkCount = outputFile
-        ? (_g = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _g !== void 0 ? _g : 0
+        ? (_h = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _h !== void 0 ? _h : 0
         : chunks.length;
+    // We add a 20 second buffer for it, since AWS timeshifts can be quite a lot. Once it's 20sec over the limit, we consider it timed out
+    const isBeyondTimeout = renderMetadata &&
+        Date.now() > renderMetadata.startedDate + timeoutInMiliseconds + 20000;
+    const allErrors = [
+        isBeyondTimeout
+            ? {
+                attempt: 1,
+                chunk: null,
+                explanation: `The main function timed out after ${timeoutInMiliseconds}ms. Consider increasing the timeout of your function.`,
+                frame: null,
+                isFatal: true,
+                s3Location: '',
+                stack: new Error().stack,
+                tmpDir: null,
+                totalAttempts: 1,
+                type: 'stitcher',
+                willRetry: false,
+            }
+            : null,
+        ...errorExplanations,
+    ].filter(remotion_1.Internals.truthy);
     return {
         chunks: chunkCount,
         done: false,
@@ -138,10 +176,10 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         renderId,
         renderMetadata,
         bucket: bucketName,
-        outputFile: (_h = outputFile === null || outputFile === void 0 ? void 0 : outputFile.url) !== null && _h !== void 0 ? _h : null,
+        outputFile: (_j = outputFile === null || outputFile === void 0 ? void 0 : outputFile.url) !== null && _j !== void 0 ? _j : null,
         timeToFinish,
-        errors: errorExplanations,
-        fatalErrorEncountered: errorExplanations.some(is_fatal_error_1.isFatalError),
+        errors: allErrors,
+        fatalErrorEncountered: allErrors.some((f) => f.isFatal && !f.willRetry),
         currentTime: Date.now(),
         renderSize,
         lambdasInvoked: lambdasInvokedStats.lambdasInvoked,
@@ -153,9 +191,9 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
                 type: 'absolute-time',
             })
             : null,
-        timeToInvokeLambdas: (_j = encodingStatus === null || encodingStatus === void 0 ? void 0 : encodingStatus.timeToInvoke) !== null && _j !== void 0 ? _j : lambdasInvokedStats.timeToInvokeLambdas,
+        timeToInvokeLambdas: (_k = encodingStatus === null || encodingStatus === void 0 ? void 0 : encodingStatus.timeToInvoke) !== null && _k !== void 0 ? _k : lambdasInvokedStats.timeToInvokeLambdas,
         overallProgress: (0, get_overall_progress_1.getOverallProgress)({
-            cleanup: cleanup ? cleanup.filesDeleted / cleanup.filesToDelete : 0,
+            cleanup: cleanup ? cleanup.filesDeleted / cleanup.minFilesToDelete : 0,
             encoding: finalEncodingStatus && renderMetadata
                 ? finalEncodingStatus.framesEncoded /
                     renderMetadata.videoConfig.durationInFrames
@@ -166,6 +204,13 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
                 : 0,
             rendering: renderMetadata ? chunkCount / renderMetadata.totalChunks : 0,
         }),
+        retriesInfo,
+        outKey: outputFile && renderMetadata
+            ? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName).key
+            : null,
+        outBucket: outputFile && renderMetadata
+            ? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName).renderBucketName
+            : null,
     };
 };
 exports.getProgress = getProgress;

package/dist/functions/helpers/get-progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-progress.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-progress.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-progress.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-progress.ts"],"names":[],"mappings":"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"}