@remotion/lambda 4.0.186 → 4.0.188

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

@@ -1,6 +1,7 @@
-import type { RenderMetadata } from '../../defaults';
-import type { CustomCredentials } from '../../shared/aws-clients';
-export declare const getOutputUrlFromMetadata: (renderMetadata: RenderMetadata, bucketName: string, customCredentials: CustomCredentials | null) => {
+import type { CloudProvider } from '@remotion/serverless';
+import type { RenderMetadata } from '@remotion/serverless/client';
+import { type CustomCredentials } from '@remotion/serverless/client';
+export declare const getOutputUrlFromMetadata: <Provider extends CloudProvider<string, Record<string, unknown>>>(renderMetadata: RenderMetadata<Provider>, bucketName: string, customCredentials: CustomCredentials<Provider> | null, currentRegion: Provider["region"]) => {
     url: string;
     key: string;
 };

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

@@ -1,12 +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, customCredentials) => {
-    const { key, renderBucketName } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials);
+const client_1 = require("@remotion/serverless/client");
+const getOutputUrlFromMetadata = (renderMetadata, bucketName, customCredentials, currentRegion) => {
+    const { key, renderBucketName } = (0, client_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials);
     return {
-        url: `https://s3.${(0, get_current_region_1.getCurrentRegionInFunction)()}.amazonaws.com/${renderBucketName}/${key}`,
+        url: `https://s3.${currentRegion}.amazonaws.com/${renderBucketName}/${key}`,
         key,
     };
 };

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

@@ -1,8 +1,9 @@
-import type { AwsRegion } from '../../client';
+import type { CloudProvider, ProviderSpecifics } from '@remotion/serverless';
 import type { OverallRenderProgress } from './overall-render-progress';
-export declare const getOverallProgressS3: ({ renderId, bucketName, expectedBucketOwner, region, }: {
+export declare const getOverallProgressS3: <Provider extends CloudProvider<string, Record<string, unknown>>>({ renderId, bucketName, expectedBucketOwner, region, providerSpecifics, }: {
     renderId: string;
     expectedBucketOwner: string;
     bucketName: string;
-    region: AwsRegion;
-}) => Promise<OverallRenderProgress>;
+    region: Provider["region"];
+    providerSpecifics: ProviderSpecifics<Provider>;
+}) => Promise<OverallRenderProgress<Provider>>;

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

@@ -1,18 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOverallProgressS3 = void 0;
-const constants_1 = require("../../shared/constants");
-const stream_to_string_1 = require("../../shared/stream-to-string");
-const io_1 = require("./io");
-const getOverallProgressS3 = async ({ renderId, bucketName, expectedBucketOwner, region, }) => {
+const client_1 = require("@remotion/serverless/client");
+const getOverallProgressS3 = async ({ renderId, bucketName, expectedBucketOwner, region, providerSpecifics, }) => {
     try {
-        const Body = await (0, io_1.lambdaReadFile)({
+        const Body = await providerSpecifics.readFile({
             bucketName,
-            key: (0, constants_1.overallProgressKey)(renderId),
+            key: (0, client_1.overallProgressKey)(renderId),
             expectedBucketOwner,
             region,
         });
-        const str = await (0, stream_to_string_1.streamToString)(Body);
+        const str = await (0, client_1.streamToString)(Body);
         return JSON.parse(str);
     }
     catch (err) {

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

@@ -1,12 +1,13 @@
-import type { AwsRegion } from '../../pricing/aws-regions';
-import type { CustomCredentials } from '../../shared/aws-clients';
-import type { RenderProgress } from '../../shared/constants';
-export declare const getProgress: ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, }: {
+import type { CloudProvider, ProviderSpecifics } from '@remotion/serverless';
+import { type CustomCredentials } from '@remotion/serverless/client';
+import type { GenericRenderProgress } from '../../shared/constants';
+export declare const getProgress: <Provider extends CloudProvider<string, Record<string, unknown>>>({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, providerSpecifics, }: {
     bucketName: string;
     renderId: string;
     expectedBucketOwner: string;
-    region: AwsRegion;
+    region: Provider["region"];
     memorySizeInMb: number;
     timeoutInMilliseconds: number;
-    customCredentials: CustomCredentials | null;
-}) => Promise<RenderProgress>;
+    customCredentials: CustomCredentials<Provider> | null;
+    providerSpecifics: ProviderSpecifics<Provider>;
+}) => Promise<GenericRenderProgress<Provider>>;

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

@@ -2,31 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProgress = void 0;
 const renderer_1 = require("@remotion/renderer");
+const client_1 = require("@remotion/serverless/client");
 const no_react_1 = require("remotion/no-react");
 const constants_1 = require("../../shared/constants");
-const truthy_1 = require("../../shared/truthy");
 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 format_costs_info_1 = require("./format-costs-info");
 const get_overall_progress_1 = require("./get-overall-progress");
 const get_overall_progress_s3_1 = require("./get-overall-progress-s3");
 const inspect_errors_1 = require("./inspect-errors");
 const make_timeout_error_1 = require("./make-timeout-error");
 const render_has_audio_video_1 = require("./render-has-audio-video");
-const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, }) => {
+const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, providerSpecifics, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     const overallProgress = await (0, get_overall_progress_s3_1.getOverallProgressS3)({
         renderId,
         bucketName,
         expectedBucketOwner,
         region,
+        providerSpecifics,
     });
     if (overallProgress.postRenderData) {
         if (!overallProgress.renderMetadata) {
             throw new Error('No render metadata found even though render is finished');
         }
-        const outData = (0, expected_out_name_1.getExpectedOutName)(overallProgress.renderMetadata, bucketName, customCredentials);
+        const outData = (0, client_1.getExpectedOutName)(overallProgress.renderMetadata, bucketName, customCredentials);
         const totalFrameCount = overallProgress.renderMetadata.type === 'still'
             ? 1
             : renderer_1.RenderInternals.getFramesToRender(overallProgress.renderMetadata.frameRange, overallProgress.renderMetadata.everyNthFrame).length;
@@ -95,6 +95,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         // overestimate the price, but will only have a miniscule effect (~0.2%)
         diskSizeInMb: constants_1.MAX_EPHEMERAL_STORAGE_IN_MB,
         timings: (_c = overallProgress.timings) !== null && _c !== void 0 ? _c : [],
+        providerSpecifics,
     });
     const { hasAudio, hasVideo } = renderMetadata
         ? (0, render_has_audio_video_1.lambdaRenderHasAudioVideo)(renderMetadata)
@@ -104,7 +105,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         minFilesToDelete: 0,
         filesDeleted: 0,
     };
-    const chunkMultiplier = [hasAudio, hasVideo].filter(truthy_1.truthy).length;
+    const chunkMultiplier = [hasAudio, hasVideo].filter(client_1.truthy).length;
     const allChunks = ((_d = overallProgress.chunks) !== null && _d !== void 0 ? _d : []).length / chunkMultiplier ===
         ((_e = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _e !== void 0 ? _e : Infinity);
     const frameCount = renderMetadata
@@ -136,6 +137,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
                 renderMetadata,
                 renderId,
                 missingChunks: missingChunks !== null && missingChunks !== void 0 ? missingChunks : [],
+                providerSpecifics,
             })
             : null,
         ...errorExplanations,

package/dist/functions/helpers/inspect-errors.d.ts

@@ -1,4 +1,4 @@
-import type { EnhancedErrorInfo, LambdaErrorInfo } from './write-lambda-error';
+import { type EnhancedErrorInfo, type LambdaErrorInfo } from '@remotion/serverless';
 export declare const inspectErrors: ({ errors, }: {
     errors: LambdaErrorInfo[];
 }) => EnhancedErrorInfo[];

package/dist/functions/helpers/inspect-errors.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectErrors = void 0;
+const serverless_1 = require("@remotion/serverless");
 const docs_url_1 = require("../../shared/docs-url");
-const is_enosp_err_1 = require("./is-enosp-err");
 const FAILED_TO_LAUNCH_TOKEN = 'Failed to launch browser.';
 const getExplanation = (stack) => {
     if (stack.includes('FATAL:zygote_communication_linux.cc')) {
@@ -16,13 +16,13 @@ const getExplanation = (stack) => {
     if (stack.includes('TooManyRequestsException')) {
         return `AWS returned an "TooManyRequestsException" error message which could mean you reached the concurrency limit of AWS Lambda. You can increase the limit - read this troubleshooting page: ${docs_url_1.DOCS_URL}/docs/lambda/troubleshooting/rate-limit`;
     }
-    if ((0, is_enosp_err_1.errorIsOutOfSpaceError)(stack)) {
+    if ((0, serverless_1.errorIsOutOfSpaceError)(stack)) {
         return `Your lambda function reached the storage limit. Reduce the amount of space needed per lambda function or increase the storage limit: ${docs_url_1.DOCS_URL}/docs/lambda/disk-size.`;
     }
-    if ((0, is_enosp_err_1.isErrInsufficientResourcesErr)(stack)) {
+    if ((0, serverless_1.isErrInsufficientResourcesErr)(stack)) {
         return 'The lambda ran out of memory. Deploy a new function with more memory.';
     }
-    if ((0, is_enosp_err_1.isBrowserCrashedError)(stack)) {
+    if ((0, serverless_1.isBrowserCrashedError)(stack)) {
         return 'The browser crashed while rendering the video. Deploy a new function with memory to give the browser more resources.';
     }
     return null;

package/dist/functions/helpers/io.d.ts

@@ -1,12 +1,6 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import type { _Object } from '@aws-sdk/client-s3';
-import type { ReadStream } from 'node:fs';
-import type { Readable } from 'stream';
-import type { AwsRegion } from '../../pricing/aws-regions';
-import type { CustomCredentials } from '../../shared/aws-clients';
-import type { Privacy } from '../../shared/constants';
-import type { DownloadBehavior } from '../../shared/content-disposition-header';
+import type { CustomCredentials } from '@remotion/serverless/client';
+import type { AwsRegion } from '../../regions';
 export type LambdaLSInput = {
     bucketName: string;
     prefix: string;
@@ -15,39 +9,12 @@ export type LambdaLSInput = {
     continuationToken?: string;
 };
 export type LambdaLsReturnType = Promise<_Object[]>;
-export declare const lambdaLs: ({ bucketName, prefix, region, expectedBucketOwner, continuationToken, }: LambdaLSInput) => LambdaLsReturnType;
-export declare const lambdaDeleteFile: ({ bucketName, key, region, customCredentials, }: {
-    region: AwsRegion;
-    bucketName: string;
-    key: string;
-    customCredentials: CustomCredentials | null;
-}) => Promise<void>;
-type LambdaWriteFileInput = {
-    bucketName: string;
-    key: string;
-    body: ReadStream | string | Uint8Array;
-    region: AwsRegion;
-    privacy: Privacy;
-    expectedBucketOwner: string | null;
-    downloadBehavior: DownloadBehavior | null;
-    customCredentials: CustomCredentials | null;
-};
-export declare const lambdaWriteFile: (params: LambdaWriteFileInput & {
-    retries?: number;
-}) => Promise<void>;
-export declare const lambdaReadFile: ({ bucketName, key, region, expectedBucketOwner, }: {
-    bucketName: string;
-    key: string;
-    region: AwsRegion;
-    expectedBucketOwner: string;
-}) => Promise<Readable>;
 export declare const lambdaHeadCommand: ({ bucketName, key, region, customCredentials, }: {
     bucketName: string;
     key: string;
     region: AwsRegion;
-    customCredentials: CustomCredentials | null;
+    customCredentials: CustomCredentials<AwsRegion> | null;
 }) => Promise<{
     LastModified?: Date | undefined;
     ContentLength?: number | undefined;
 }>;
-export {};

package/dist/functions/helpers/io.js

@@ -1,111 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lambdaHeadCommand = exports.lambdaReadFile = exports.lambdaWriteFile = exports.lambdaDeleteFile = exports.lambdaLs = void 0;
+exports.lambdaHeadCommand = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
-const mime_types_1 = __importDefault(require("mime-types"));
-const aws_clients_1 = require("../../shared/aws-clients");
-const content_disposition_header_1 = require("../../shared/content-disposition-header");
-const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, continuationToken, }) => {
-    var _a, _b, _c;
-    try {
-        const list = await (0, aws_clients_1.getS3Client)(region, null).send(new client_s3_1.ListObjectsV2Command({
-            Bucket: bucketName,
-            Prefix: prefix,
-            ExpectedBucketOwner: expectedBucketOwner !== null && expectedBucketOwner !== void 0 ? expectedBucketOwner : undefined,
-            ContinuationToken: continuationToken,
-        }));
-        if (list.NextContinuationToken) {
-            return [
-                ...((_a = list.Contents) !== null && _a !== void 0 ? _a : []),
-                ...(await (0, exports.lambdaLs)({
-                    bucketName,
-                    prefix,
-                    expectedBucketOwner,
-                    region,
-                    continuationToken: list.NextContinuationToken,
-                })),
-            ];
-        }
-        return (_b = list.Contents) !== null && _b !== void 0 ? _b : [];
-    }
-    catch (err) {
-        if (!expectedBucketOwner) {
-            throw err;
-        }
-        // Prevent from accessing a foreign bucket, retry without ExpectedBucketOwner and see if it works. If it works then it's an owner mismatch.
-        if ((_c = err.stack) === null || _c === void 0 ? void 0 : _c.includes('AccessDenied')) {
-            await (0, aws_clients_1.getS3Client)(region, null).send(new client_s3_1.ListObjectsV2Command({
-                Bucket: bucketName,
-                Prefix: prefix,
-            }));
-            throw new Error(`Bucket owner mismatch: Expected the bucket ${bucketName} to be owned by you (AWS Account ID: ${expectedBucketOwner}) but it's not the case. Did you accidentially specify the wrong bucket?`);
-        }
-        throw err;
-    }
-};
-exports.lambdaLs = lambdaLs;
-const lambdaDeleteFile = async ({ bucketName, key, region, customCredentials, }) => {
-    await (0, aws_clients_1.getS3Client)(region, customCredentials).send(new client_s3_1.DeleteObjectCommand({
-        Bucket: bucketName,
-        Key: key,
-    }));
-};
-exports.lambdaDeleteFile = lambdaDeleteFile;
-const tryLambdaWriteFile = async ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, customCredentials, }) => {
-    await (0, aws_clients_1.getS3Client)(region, customCredentials).send(new client_s3_1.PutObjectCommand({
-        Bucket: bucketName,
-        Key: key,
-        Body: body,
-        ACL: privacy === 'no-acl'
-            ? undefined
-            : privacy === 'private'
-                ? 'private'
-                : 'public-read',
-        ExpectedBucketOwner: customCredentials
-            ? undefined
-            : expectedBucketOwner !== null && expectedBucketOwner !== void 0 ? expectedBucketOwner : undefined,
-        ContentType: mime_types_1.default.lookup(key) || 'application/octet-stream',
-        ContentDisposition: (0, content_disposition_header_1.getContentDispositionHeader)(downloadBehavior),
-    }));
-};
-const lambdaWriteFile = async (params) => {
-    var _a;
-    const remainingRetries = (_a = params.retries) !== null && _a !== void 0 ? _a : 2;
-    try {
-        await tryLambdaWriteFile(params);
-    }
-    catch (err) {
-        if (remainingRetries === 0) {
-            throw err;
-        }
-        const backoff = 2 ** (2 - remainingRetries) * 2000;
-        await new Promise((resolve) => {
-            setTimeout(resolve, backoff);
-        });
-        console.warn('Failed to write file to Lambda:');
-        console.warn(err);
-        console.warn(`Retrying (${remainingRetries} retries remaining)...`);
-        return (0, exports.lambdaWriteFile)({
-            ...params,
-            retries: remainingRetries - 1,
-        });
-    }
-};
-exports.lambdaWriteFile = lambdaWriteFile;
-const lambdaReadFile = async ({ bucketName, key, region, expectedBucketOwner, }) => {
-    const { Body } = await (0, aws_clients_1.getS3Client)(region, null).send(new client_s3_1.GetObjectCommand({
-        Bucket: bucketName,
-        Key: key,
-        ExpectedBucketOwner: expectedBucketOwner,
-    }));
-    return Body;
-};
-exports.lambdaReadFile = lambdaReadFile;
+const get_s3_client_1 = require("../../shared/get-s3-client");
 const lambdaHeadCommand = async ({ bucketName, key, region, customCredentials, }) => {
-    const head = await (0, aws_clients_1.getS3Client)(region, customCredentials).send(new client_s3_1.HeadObjectCommand({
+    const head = await (0, get_s3_client_1.getS3Client)(region, customCredentials).send(new client_s3_1.HeadObjectCommand({
         Bucket: bucketName,
         Key: key,
     }));

package/dist/functions/helpers/lifecycle.d.ts

@@ -1,12 +1,6 @@
 import type { LifecycleRule } from '@aws-sdk/client-s3';
-declare const expiryDays: {
-    readonly '1-day': 1;
-    readonly '3-days': 3;
-    readonly '7-days': 7;
-    readonly '30-days': 30;
-};
-export type DeleteAfter = keyof typeof expiryDays;
+import type { CloudProvider, ProviderSpecifics } from '@remotion/serverless';
+import type { DeleteAfter } from '@remotion/serverless/client';
 export declare const getLifeCycleRules: () => LifecycleRule[];
-export declare const generateRandomHashWithLifeCycleRule: (deleteAfter: DeleteAfter | null) => string;
+export declare const generateRandomHashWithLifeCycleRule: <Provider extends CloudProvider<string, Record<string, unknown>>>(deleteAfter: DeleteAfter | null, providerSpecifics: ProviderSpecifics<Provider>) => string;
 export declare const validateDeleteAfter: (lifeCycleValue: unknown) => void;
-export {};

package/dist/functions/helpers/lifecycle.js

@@ -1,15 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateDeleteAfter = exports.generateRandomHashWithLifeCycleRule = exports.getLifeCycleRules = void 0;
-const random_hash_1 = require("../../shared/random-hash");
-const truthy_1 = require("../../shared/truthy");
-// Needs to be in sync with renderer/src/options/delete-after.ts#L7
-const expiryDays = {
-    '1-day': 1,
-    '3-days': 3,
-    '7-days': 7,
-    '30-days': 30,
-};
+const client_1 = require("@remotion/serverless/client");
 const getEnabledLifeCycleRule = ({ key, value, }) => {
     return {
         Expiration: {
@@ -23,13 +15,11 @@ const getEnabledLifeCycleRule = ({ key, value, }) => {
     };
 };
 const getLifeCycleRules = () => {
-    return Object.entries(expiryDays).map(([key, value]) => getEnabledLifeCycleRule({ key, value }));
+    return Object.entries(client_1.expiryDays).map(([key, value]) => getEnabledLifeCycleRule({ key, value }));
 };
 exports.getLifeCycleRules = getLifeCycleRules;
-const generateRandomHashWithLifeCycleRule = (deleteAfter) => {
-    return [deleteAfter, (0, random_hash_1.randomHash)({ randomInTests: true })]
-        .filter(truthy_1.truthy)
-        .join('-');
+const generateRandomHashWithLifeCycleRule = (deleteAfter, providerSpecifics) => {
+    return [deleteAfter, providerSpecifics.randomHash()].filter(client_1.truthy).join('-');
 };
 exports.generateRandomHashWithLifeCycleRule = generateRandomHashWithLifeCycleRule;
 const validateDeleteAfter = (lifeCycleValue) => {
@@ -42,8 +32,8 @@ const validateDeleteAfter = (lifeCycleValue) => {
     if (typeof lifeCycleValue !== 'string') {
         throw new TypeError(`Expected life cycle value to be a string, got ${JSON.stringify(lifeCycleValue)}`);
     }
-    if (!(lifeCycleValue in expiryDays)) {
-        throw new TypeError(`Expected deleteAfter value to be one of ${Object.keys(expiryDays).join(', ')}, got ${lifeCycleValue}`);
+    if (!(lifeCycleValue in client_1.expiryDays)) {
+        throw new TypeError(`Expected deleteAfter value to be one of ${Object.keys(client_1.expiryDays).join(', ')}, got ${lifeCycleValue}`);
     }
 };
 exports.validateDeleteAfter = validateDeleteAfter;

package/dist/functions/helpers/make-aws-artifact.d.ts

@@ -0,0 +1,3 @@
+import type { MakeArtifactWithDetails } from '@remotion/serverless';
+import type { AwsProvider } from '../aws-implementation';
+export declare const makeAwsArtifact: MakeArtifactWithDetails<AwsProvider>;

package/dist/functions/helpers/make-aws-artifact.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeAwsArtifact = void 0;
+const makeAwsArtifact = ({ region, renderBucketName, storageKey, artifact, }) => {
+    return {
+        filename: artifact.filename,
+        sizeInBytes: artifact.content.length,
+        s3Url: `https://s3.${region}.amazonaws.com/${renderBucketName}/${storageKey}`,
+        s3Key: storageKey,
+    };
+};
+exports.makeAwsArtifact = makeAwsArtifact;

package/dist/functions/helpers/make-timeout-error.d.ts

@@ -1,8 +1,9 @@
-import type { RenderMetadata } from '../../defaults';
-import type { EnhancedErrorInfo } from './write-lambda-error';
-export declare const makeTimeoutError: ({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, }: {
+import type { CloudProvider, EnhancedErrorInfo, ProviderSpecifics } from '@remotion/serverless';
+import type { RenderMetadata } from '@remotion/serverless/client';
+export declare const makeTimeoutError: <Provider extends CloudProvider<string, Record<string, unknown>>>({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, providerSpecifics, }: {
     timeoutInMilliseconds: number;
-    renderMetadata: RenderMetadata;
+    renderMetadata: RenderMetadata<Provider>;
     renderId: string;
     missingChunks: number[];
+    providerSpecifics: ProviderSpecifics<Provider>;
 }) => EnhancedErrorInfo;

package/dist/functions/helpers/make-timeout-error.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTimeoutError = void 0;
 const make_timeout_message_1 = require("./make-timeout-message");
-const makeTimeoutError = ({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, }) => {
+const makeTimeoutError = ({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, providerSpecifics, }) => {
     const message = (0, make_timeout_message_1.makeTimeoutMessage)({
         missingChunks,
         renderMetadata,
         timeoutInMilliseconds,
         renderId,
+        providerSpecifics,
     });
     const error = new Error(message);
     return {

package/dist/functions/helpers/make-timeout-message.d.ts

@@ -1,7 +1,9 @@
-import type { RenderMetadata } from '../../defaults';
-export declare const makeTimeoutMessage: ({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, }: {
+import type { CloudProvider, ProviderSpecifics } from '@remotion/serverless';
+import type { RenderMetadata } from '@remotion/serverless/client';
+export declare const makeTimeoutMessage: <Provider extends CloudProvider<string, Record<string, unknown>>>({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, providerSpecifics, }: {
     timeoutInMilliseconds: number;
     missingChunks: number[];
-    renderMetadata: RenderMetadata;
+    renderMetadata: RenderMetadata<Provider>;
     renderId: string;
+    providerSpecifics: ProviderSpecifics<Provider>;
 }) => string;

package/dist/functions/helpers/make-timeout-message.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTimeoutMessage = void 0;
-const defaults_1 = require("../../defaults");
+const client_1 = require("@remotion/serverless/client");
 const docs_url_1 = require("../../shared/docs-url");
 const get_aws_urls_1 = require("../../shared/get-aws-urls");
-const get_current_region_1 = require("./get-current-region");
 const MAX_MISSING_CHUNKS = 5;
-const makeChunkMissingMessage = ({ missingChunks, renderMetadata, }) => {
+const makeChunkMissingMessage = ({ missingChunks, renderMetadata, providerSpecifics, }) => {
     if (missingChunks.length === 0) {
         return 'All chunks have been successfully rendered, but the main function has timed out.';
     }
@@ -26,7 +25,7 @@ const makeChunkMissingMessage = ({ missingChunks, renderMetadata, }) => {
                 msg,
                 `▸ Logs for chunk ${ch}: ${(0, get_aws_urls_1.getCloudwatchRendererUrl)({
                     functionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
-                    region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+                    region: providerSpecifics.getCurrentRegionInFunction(),
                     rendererFunctionName: null,
                     renderId: renderMetadata.renderId,
                     chunk: ch,
@@ -36,24 +35,24 @@ const makeChunkMissingMessage = ({ missingChunks, renderMetadata, }) => {
             .slice(0, 5),
     ].join('\n');
 };
-const makeTimeoutMessage = ({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, }) => {
+const makeTimeoutMessage = ({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, providerSpecifics, }) => {
     const cloudWatchRendererUrl = (0, get_aws_urls_1.getCloudwatchRendererUrl)({
         renderId,
         functionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
-        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        region: providerSpecifics.getCurrentRegionInFunction(),
         rendererFunctionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
         chunk: null,
     });
     const cloudWatchLaunchUrl = (0, get_aws_urls_1.getCloudwatchMethodUrl)({
         renderId,
         functionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
-        method: defaults_1.LambdaRoutines.launch,
-        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        method: client_1.ServerlessRoutines.launch,
+        region: providerSpecifics.getCurrentRegionInFunction(),
         rendererFunctionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
     });
     const message = [
         `The main function timed out after ${timeoutInMilliseconds}ms.`,
-        makeChunkMissingMessage({ missingChunks, renderMetadata }),
+        makeChunkMissingMessage({ missingChunks, renderMetadata, providerSpecifics }),
         '',
         `Consider increasing the timeout of your function.`,
         `▸ You can use the "--timeout" parameter when deploying a function via CLI, or the "timeoutInSeconds" parameter when using the deployFunction() API.`,

package/dist/functions/helpers/merge-chunks.d.ts

@@ -1,27 +1,26 @@
 import type { AudioCodec, LogLevel } from '@remotion/renderer';
-import type { CustomCredentials } from '../../shared/aws-clients';
-import type { PostRenderData, Privacy, RenderMetadata, SerializedInputProps } from '../../shared/constants';
-import type { DownloadBehavior } from '../../shared/content-disposition-header';
-import type { LambdaCodec } from '../../shared/validate-lambda-codec';
+import type { CloudProvider, ProviderSpecifics } from '@remotion/serverless';
+import type { CustomCredentials, DownloadBehavior, Privacy, RenderMetadata, SerializedInputProps, ServerlessCodec } from '@remotion/serverless/client';
+import type { PostRenderData } from '../../shared/constants';
 import type { OverallProgressHelper } from './overall-render-progress';
-export declare const mergeChunksAndFinishRender: (options: {
+export declare const mergeChunksAndFinishRender: <Provider extends CloudProvider<string, Record<string, unknown>>>(options: {
     bucketName: string;
     renderId: string;
     expectedBucketOwner: string;
     numberOfFrames: number;
-    codec: LambdaCodec;
+    codec: ServerlessCodec;
     chunkCount: number;
     fps: number;
     numberOfGifLoops: number | null;
     audioCodec: AudioCodec | null;
     renderBucketName: string;
-    customCredentials: CustomCredentials | null;
+    customCredentials: CustomCredentials<Provider> | null;
     downloadBehavior: DownloadBehavior;
     key: string;
     privacy: Privacy;
     inputProps: SerializedInputProps;
     serializedResolvedProps: SerializedInputProps;
-    renderMetadata: RenderMetadata;
+    renderMetadata: RenderMetadata<Provider>;
     audioBitrate: string | null;
     logLevel: LogLevel;
     framesPerLambda: number;
@@ -30,6 +29,7 @@ export declare const mergeChunksAndFinishRender: (options: {
     compositionStart: number;
     outdir: string;
     files: string[];
-    overallProgress: OverallProgressHelper;
+    overallProgress: OverallProgressHelper<Provider>;
     startTime: number;
-}) => Promise<PostRenderData>;
+    providerSpecifics: ProviderSpecifics<Provider>;
+}) => Promise<PostRenderData<Provider>>;

package/dist/functions/helpers/merge-chunks.js

@@ -8,10 +8,8 @@ const fs_1 = __importDefault(require("fs"));
 const cleanup_props_1 = require("./cleanup-props");
 const concat_videos_1 = require("./concat-videos");
 const create_post_render_data_1 = require("./create-post-render-data");
-const get_current_region_1 = require("./get-current-region");
 const get_output_url_from_metadata_1 = require("./get-output-url-from-metadata");
 const inspect_errors_1 = require("./inspect-errors");
-const io_1 = require("./io");
 const timer_1 = require("./timer");
 const mergeChunksAndFinishRender = async (options) => {
     const onProgress = (framesEncoded) => {
@@ -41,28 +39,29 @@ const mergeChunksAndFinishRender = async (options) => {
     const encodingStop = Date.now();
     options.overallProgress.setTimeToCombine(encodingStop - encodingStart);
     const outputSize = fs_1.default.statSync(outfile).size;
-    const writeToS3 = (0, timer_1.timer)(`Writing to S3 (${outputSize} bytes)`, options.logLevel);
-    await (0, io_1.lambdaWriteFile)({
+    const writeToBucket = (0, timer_1.timer)(`Writing to bucket (${outputSize} bytes)`, options.logLevel);
+    await options.providerSpecifics.writeFile({
         bucketName: options.renderBucketName,
         key: options.key,
         body: fs_1.default.createReadStream(outfile),
-        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        region: options.providerSpecifics.getCurrentRegionInFunction(),
         privacy: options.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
         downloadBehavior: options.downloadBehavior,
         customCredentials: options.customCredentials,
     });
-    writeToS3.end();
+    writeToBucket.end();
     const errorExplanations = (0, inspect_errors_1.inspectErrors)({
         errors: options.overallProgress.get().errors,
     });
     const cleanupProm = (0, cleanup_props_1.cleanupProps)({
         inputProps: options.inputProps,
         serializedResolvedProps: options.serializedResolvedProps,
+        providerSpecifics: options.providerSpecifics,
     });
-    const { url: outputUrl } = (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(options.renderMetadata, options.bucketName, options.customCredentials);
+    const { url: outputUrl } = (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(options.renderMetadata, options.bucketName, options.customCredentials, options.providerSpecifics.getCurrentRegionInFunction());
     const postRenderData = (0, create_post_render_data_1.createPostRenderData)({
-        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        region: options.providerSpecifics.getCurrentRegionInFunction(),
         memorySizeInMb: Number(process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE),
         renderMetadata: options.renderMetadata,
         errorExplanations,