@remotion/serverless 4.0.471 → 4.0.473

package/dist/find-output-file-in-bucket.d.ts

@@ -1,7 +1,5 @@
-import type { CloudProvider, CustomCredentials, ProviderSpecifics, RenderMetadata } from '@remotion/serverless-client';
-export type OutputFileMetadata = {
-    url: string;
-};
+import type { CloudProvider, CustomCredentials, OutputFileMetadata, ProviderSpecifics, RenderMetadata } from '@remotion/serverless-client';
+export type { OutputFileMetadata } from '@remotion/serverless-client';
 export declare const findOutputFileInBucket: <Provider extends CloudProvider<string, Record<string, unknown>, Record<string, unknown>, string, object>>({ region, renderMetadata, bucketName, customCredentials, currentRegion, providerSpecifics, forcePathStyle, requestHandler, }: {
     region: Provider["region"];
     renderMetadata: RenderMetadata<Provider>;

package/dist/find-output-file-in-bucket.js

@@ -2,46 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findOutputFileInBucket = void 0;
 const serverless_client_1 = require("@remotion/serverless-client");
-const findOutputFileInBucket = async ({ region, renderMetadata, bucketName, customCredentials, currentRegion, providerSpecifics, forcePathStyle, requestHandler, }) => {
+const findOutputFileInBucket = ({ region, renderMetadata, bucketName, customCredentials, currentRegion, providerSpecifics, forcePathStyle, requestHandler, }) => {
     if (!renderMetadata) {
         throw new Error('unexpectedly did not get renderMetadata');
     }
-    const { renderBucketName, key } = (0, serverless_client_1.getExpectedOutName)({
+    return (0, serverless_client_1.findOutputFileInBucket)({
+        region,
         renderMetadata,
         bucketName,
         customCredentials,
-        bucketNamePrefix: providerSpecifics.getBucketPrefix(),
+        currentRegion,
+        providerSpecifics,
+        forcePathStyle,
+        requestHandler,
     });
-    try {
-        await providerSpecifics.headFile({
-            bucketName,
-            key,
-            region,
-            customCredentials,
-            forcePathStyle,
-            requestHandler,
-        });
-        return {
-            url: providerSpecifics.getOutputUrl({
-                renderMetadata,
-                bucketName,
-                customCredentials,
-                currentRegion,
-            }).url,
-        };
-    }
-    catch (err) {
-        if (err.name === 'NotFound') {
-            return null;
-        }
-        if (err.message === 'UnknownError' ||
-            err.$metadata
-                .httpStatusCode === 403) {
-            throw new Error(`Unable to access item "${key}" from bucket "${renderBucketName}" ${(customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.endpoint)
-                ? `(S3 Endpoint = ${customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.endpoint})`
-                : ''} - got a 403 error when heading the file. Check your credentials and permissions. The Lambda role must have permission for both "s3:GetObject" and "s3:ListBucket" actions.`, { cause: err });
-        }
-        throw err;
-    }
 };
 exports.findOutputFileInBucket = findOutputFileInBucket;

package/dist/merge-chunks.js

@@ -82,6 +82,7 @@ const mergeChunksAndFinishRender = async (options) => {
         errorExplanations,
         timeToDelete: (await cleanupProm).reduce((a, b) => Math.max(a, b), 0),
         outputFile: {
+            sizeInBytes: outputSize,
             url: outputUrl,
         },
         outputSize,

package/dist/overall-render-progress.js

@@ -3,6 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeOverallRenderProgress = exports.makeInitialOverallRenderProgress = void 0;
 const renderer_1 = require("@remotion/renderer");
 const serverless_client_1 = require("@remotion/serverless-client");
+const progressUploadAttempts = 3;
+const wait = (duration) => {
+    return new Promise((resolve) => {
+        setTimeout(resolve, duration);
+    });
+};
 const makeInitialOverallRenderProgress = (timeoutTimestamp) => {
     return {
         chunks: [],
@@ -41,17 +47,12 @@ const makeOverallRenderProgress = ({ renderId, bucketName, expectedBucketOwner,
         dirty = true;
         dirtyReasons.push(reason);
     };
-    const runUploadLoop = async () => {
-        while (dirty) {
-            dirty = false;
-            const reasons = dirtyReasons.join(', ');
-            dirtyReasons = [];
-            const toWrite = JSON.stringify(renderProgress);
-            renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `Uploading progress - ${reasons} (${toWrite.length} bytes)`);
+    const uploadWithRetries = async (body, reasons) => {
+        for (let attempt = 1; attempt <= progressUploadAttempts; attempt++) {
             const start = Date.now();
             try {
                 await providerSpecifics.writeFile({
-                    body: toWrite,
+                    body,
                     bucketName,
                     customCredentials: null,
                     downloadBehavior: null,
@@ -64,17 +65,31 @@ const makeOverallRenderProgress = ({ renderId, bucketName, expectedBucketOwner,
                     requestHandler: null,
                 });
                 renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `Uploaded progress in ${Date.now() - start}ms`);
-                // Space out the requests a bit
-                await new Promise((resolve) => {
-                    setTimeout(resolve, Math.max(0, 250 - (Date.now() - start)));
-                });
+                return;
             }
             catch (err) {
-                // If an error occurs in uploading the state that contains the errors,
-                // that is unfortunate. We just log it.
-                renderer_1.RenderInternals.Log.error({ indent: false, logLevel }, 'Error uploading progress', err);
+                const willRetry = attempt < progressUploadAttempts;
+                renderer_1.RenderInternals.Log.error({ indent: false, logLevel }, willRetry
+                    ? `Error uploading progress (${reasons}), retrying (${attempt}/${progressUploadAttempts})`
+                    : `Error uploading progress (${reasons})`, err);
+                if (willRetry) {
+                    await wait(100 * 2 ** (attempt - 1));
+                }
             }
         }
+    };
+    const runUploadLoop = async () => {
+        while (dirty) {
+            dirty = false;
+            const reasons = dirtyReasons.join(', ');
+            dirtyReasons = [];
+            const toWrite = JSON.stringify(renderProgress);
+            renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `Uploading progress - ${reasons} (${toWrite.length} bytes)`);
+            const start = Date.now();
+            await uploadWithRetries(toWrite, reasons);
+            // Space out the requests a bit
+            await wait(Math.max(0, 250 - (Date.now() - start)));
+        }
         uploadLoopPromise = null;
     };
     const upload = async (reason) => {

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/serverless"
 	},
 	"name": "@remotion/serverless",
-	"version": "4.0.471",
+	"version": "4.0.473",
 	"description": "A runtime for distributed rendering",
 	"main": "dist",
 	"scripts": {
@@ -23,13 +23,13 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@remotion/renderer": "4.0.471",
-		"@remotion/bundler": "4.0.471",
-		"@remotion/licensing": "4.0.471",
-		"@remotion/serverless-client": "4.0.471"
+		"@remotion/renderer": "4.0.473",
+		"@remotion/bundler": "4.0.473",
+		"@remotion/licensing": "4.0.473",
+		"@remotion/serverless-client": "4.0.473"
 	},
 	"devDependencies": {
-		"@remotion/eslint-config-internal": "4.0.471",
+		"@remotion/eslint-config-internal": "4.0.473",
 		"eslint": "9.19.0",
 		"@typescript/native-preview": "7.0.0-dev.20260217.1"
 	},