@remotion/lambda 4.0.499 → 4.0.500

package/dist/api/deploy-site.js

@@ -12,54 +12,82 @@ const full_client_implementation_1 = require("../functions/full-client-implement
 const deploy_site_with_bundle_1 = require("../shared/deploy-site-with-bundle");
 const mandatoryDeploySite = async ({ bucketName, entryPoint, siteName, options, region, privacy, gitSource, throwIfSiteExists, providerSpecifics, forcePathStyle, fullClientSpecifics, requestHandler, }) => {
     let generatedBundleDir = null;
-    const result = await (0, deploy_site_with_bundle_1.deploySiteWithBundle)({
-        bucketName,
-        region,
-        siteName,
-        options,
-        privacy,
-        throwIfSiteExists,
-        providerSpecifics,
-        forcePathStyle,
-        fullClientSpecifics,
-        requestHandler,
-        getBundle: async () => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-            generatedBundleDir = await fullClientSpecifics.bundleSite({
-                publicPath: `/${(0, constants_1.getSitesKey)(siteName)}/`,
-                bundlerOverride: (_a = options.bundlerOverride) !== null && _a !== void 0 ? _a : ((f) => f),
-                rspackOverride: (_b = options.rspackOverride) !== null && _b !== void 0 ? _b : ((f) => f),
-                webpackOverride: (_c = options.webpackOverride) !== null && _c !== void 0 ? _c : ((f) => f),
-                enableCaching: (_d = options.enableCaching) !== null && _d !== void 0 ? _d : true,
-                publicDir: (_e = options.publicDir) !== null && _e !== void 0 ? _e : null,
-                rootDir: (_f = options.rootDir) !== null && _f !== void 0 ? _f : null,
-                ignoreRegisterRootWarning: (_g = options.ignoreRegisterRootWarning) !== null && _g !== void 0 ? _g : false,
-                onProgress: (_h = options.onBundleProgress) !== null && _h !== void 0 ? _h : (() => undefined),
-                entryPoint,
-                gitSource,
-                bufferStateDelayInMilliseconds: null,
-                maxTimelineTracks: null,
-                onDirectoryCreated: () => undefined,
-                onPublicDirCopyProgress: () => undefined,
-                onSymlinkDetected: () => undefined,
-                outDir: null,
-                askAIEnabled: (_j = options.askAIEnabled) !== null && _j !== void 0 ? _j : true,
-                interactivityEnabled: (_k = options.interactivityEnabled) !== null && _k !== void 0 ? _k : true,
-                audioLatencyHint: null,
-                keyboardShortcutsEnabled: (_l = options.keyboardShortcutsEnabled) !== null && _l !== void 0 ? _l : true,
-                renderDefaults: null,
-                rspack: (_m = options.rspack) !== null && _m !== void 0 ? _m : false,
-                symlinkPublicDir: false,
-            });
-            return generatedBundleDir;
-        },
-    });
-    if (generatedBundleDir && node_fs_1.default.existsSync(generatedBundleDir)) {
-        node_fs_1.default.rmSync(generatedBundleDir, {
-            recursive: true,
+    let deploymentOutcome;
+    try {
+        const result = await (0, deploy_site_with_bundle_1.deploySiteWithBundle)({
+            bucketName,
+            region,
+            siteName,
+            options,
+            privacy,
+            throwIfSiteExists,
+            providerSpecifics,
+            forcePathStyle,
+            fullClientSpecifics,
+            requestHandler,
+            getBundle: async () => {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+                const bundleDir = await fullClientSpecifics.bundleSite({
+                    publicPath: `/${(0, constants_1.getSitesKey)(siteName)}/`,
+                    bundlerOverride: (_a = options.bundlerOverride) !== null && _a !== void 0 ? _a : ((f) => f),
+                    rspackOverride: (_b = options.rspackOverride) !== null && _b !== void 0 ? _b : ((f) => f),
+                    webpackOverride: (_c = options.webpackOverride) !== null && _c !== void 0 ? _c : ((f) => f),
+                    enableCaching: (_d = options.enableCaching) !== null && _d !== void 0 ? _d : true,
+                    publicDir: (_e = options.publicDir) !== null && _e !== void 0 ? _e : null,
+                    rootDir: (_f = options.rootDir) !== null && _f !== void 0 ? _f : null,
+                    ignoreRegisterRootWarning: (_g = options.ignoreRegisterRootWarning) !== null && _g !== void 0 ? _g : false,
+                    onProgress: (_h = options.onBundleProgress) !== null && _h !== void 0 ? _h : (() => undefined),
+                    entryPoint,
+                    gitSource,
+                    bufferStateDelayInMilliseconds: null,
+                    maxTimelineTracks: null,
+                    onDirectoryCreated: (directory) => {
+                        generatedBundleDir = directory;
+                    },
+                    onPublicDirCopyProgress: () => undefined,
+                    onSymlinkDetected: () => undefined,
+                    outDir: null,
+                    askAIEnabled: (_j = options.askAIEnabled) !== null && _j !== void 0 ? _j : true,
+                    interactivityEnabled: (_k = options.interactivityEnabled) !== null && _k !== void 0 ? _k : true,
+                    audioLatencyHint: null,
+                    keyboardShortcutsEnabled: (_l = options.keyboardShortcutsEnabled) !== null && _l !== void 0 ? _l : true,
+                    renderDefaults: null,
+                    rspack: (_m = options.rspack) !== null && _m !== void 0 ? _m : false,
+                    symlinkPublicDir: false,
+                });
+                generatedBundleDir = bundleDir;
+                return bundleDir;
+            },
         });
+        deploymentOutcome = { type: 'success', result };
+    }
+    catch (error) {
+        deploymentOutcome = { type: 'failure', error };
+    }
+    let cleanupFailed = false;
+    let cleanupError;
+    if (generatedBundleDir !== null) {
+        try {
+            node_fs_1.default.rmSync(generatedBundleDir, {
+                force: true,
+                recursive: true,
+            });
+        }
+        catch (error) {
+            cleanupFailed = true;
+            cleanupError = error;
+        }
+    }
+    if (deploymentOutcome.type === 'failure') {
+        if (cleanupFailed) {
+            throw new AggregateError([deploymentOutcome.error, cleanupError], 'Deploying the site failed, and removing the generated bundle also failed.', { cause: deploymentOutcome.error });
+        }
+        throw deploymentOutcome.error;
+    }
+    if (cleanupFailed) {
+        throw cleanupError;
     }
-    return result;
+    return deploymentOutcome.result;
 };
 exports.internalDeploySite = (0, error_handling_1.wrapWithErrorHandling)(mandatoryDeploySite);
 /*

package/dist/api/upload-dir.js

@@ -11,6 +11,7 @@ const lambda_client_1 = require("@remotion/lambda-client");
 const mime_types_1 = __importDefault(require("mime-types"));
 const make_s3_key_1 = require("../shared/make-s3-key");
 const multipart_upload_part_size_1 = require("../shared/multipart-upload-part-size");
+const wait_for_promises_to_finish_1 = require("../shared/wait-for-promises-to-finish");
 async function getFiles(directory, originalDirectory, toUpload) {
     const dirents = await node_fs_1.promises.readdir(directory, { withFileTypes: true });
     const _files = await Promise.all(dirents
@@ -96,12 +97,9 @@ const uploadDir = async ({ bucket, region, localDir, onProgress, keyPrefix, priv
             throw error;
         }
     };
-    const uploadAll = (async () => {
-        const uploads = files.map((filePath) => limit(async () => {
-            await uploadWithRetry(filePath);
-        }));
-        await Promise.all(uploads);
-    })();
+    const uploads = files.map((filePath) => limit(async () => {
+        await uploadWithRetry(filePath);
+    }));
     const interval = setInterval(() => {
         onProgress({
             totalSize: files.map((f) => f.size).reduce((a, b) => a + b, 0),
@@ -110,7 +108,11 @@ const uploadDir = async ({ bucket, region, localDir, onProgress, keyPrefix, priv
             filesUploaded: files.filter((f) => progresses[f.name] === f.size).length,
         });
     }, 1000);
-    await uploadAll;
-    clearInterval(interval);
+    try {
+        await (0, wait_for_promises_to_finish_1.waitForPromisesToFinish)(uploads);
+    }
+    finally {
+        clearInterval(interval);
+    }
 };
 exports.uploadDir = uploadDir;

package/dist/esm/index.mjs

@@ -8604,7 +8604,7 @@ var require_package = __commonJS((exports, module) => {
       url: "https://github.com/remotion-dev/remotion/tree/main/packages/lambda"
     },
     name: "@remotion/lambda",
-    version: "4.0.499",
+    version: "4.0.500",
     description: "Render Remotion videos on AWS Lambda",
     main: "dist/index.js",
     scripts: {
@@ -9691,6 +9691,16 @@ var makeS3Key = (folder, dir, filePath) => {
 // src/shared/multipart-upload-part-size.ts
 var multipartUploadPartSize = 40 * 1024 * 1024;
 
+// src/shared/wait-for-promises-to-finish.ts
+var waitForPromisesToFinish = async (promises) => {
+  try {
+    return await Promise.all(promises);
+  } catch (error) {
+    await Promise.allSettled(promises);
+    throw error;
+  }
+};
+
 // src/api/upload-dir.ts
 async function getFiles(directory, originalDirectory, toUpload) {
   const dirents = await fs.readdir(directory, { withFileTypes: true });
@@ -9776,12 +9786,9 @@ var uploadDir = async ({
       throw error;
     }
   };
-  const uploadAll = (async () => {
-    const uploads = files.map((filePath) => limit(async () => {
-      await uploadWithRetry(filePath);
-    }));
-    await Promise.all(uploads);
-  })();
+  const uploads = files.map((filePath) => limit(async () => {
+    await uploadWithRetry(filePath);
+  }));
   const interval = setInterval(() => {
     onProgress({
       totalSize: files.map((f) => f.size).reduce((a, b) => a + b, 0),
@@ -9790,8 +9797,11 @@ var uploadDir = async ({
       filesUploaded: files.filter((f) => progresses[f.name] === f.size).length
     });
   }, 1000);
-  await uploadAll;
-  clearInterval(interval);
+  try {
+    await waitForPromisesToFinish(uploads);
+  } finally {
+    clearInterval(interval);
+  }
 };
 
 // src/shared/read-dir.ts
@@ -10154,16 +10164,18 @@ var deploySiteWithBundle = async ({
     throw new Error(`No bucket with the name ${bucketName} exists`);
   }
   const subFolder = getSitesKey2(siteName);
-  const [files, bundleDir] = await Promise.all([
-    providerSpecifics.listObjects({
-      bucketName,
-      expectedBucketOwner: accountId,
-      region,
-      prefix: `${subFolder}/`,
-      forcePathStyle,
-      requestHandler
-    }),
-    getBundle()
+  const filesPromise = providerSpecifics.listObjects({
+    bucketName,
+    expectedBucketOwner: accountId,
+    region,
+    prefix: `${subFolder}/`,
+    forcePathStyle,
+    requestHandler
+  });
+  const bundlePromise = getBundle();
+  const [files, bundleDir] = await waitForPromisesToFinish([
+    filesPromise,
+    bundlePromise
   ]);
   if (throwIfSiteExists && files.length > 0) {
     throw new Error("`throwIfSiteExists` was passed as true, but there are already files in this folder: " + files.slice(0, 5).map((f) => f.Key).join(", "));
@@ -10205,7 +10217,7 @@ var deploySiteWithBundle = async ({
   await upload(assetsToUpload);
   await upload(indexHtmlToUpload);
   const limit2 = LambdaClientInternals6.pLimit(deleteConcurrency);
-  await Promise.all(toDelete.map((d) => {
+  const deletePromises = toDelete.map((d) => {
     return limit2(() => {
       return providerSpecifics.deleteFile({
         bucketName,
@@ -10216,7 +10228,8 @@ var deploySiteWithBundle = async ({
         requestHandler
       });
     });
-  }));
+  });
+  await waitForPromisesToFinish(deletePromises);
   return {
     serveUrl: LambdaClientInternals6.makeS3ServeUrl({
       bucketName,
@@ -10248,61 +10261,85 @@ var mandatoryDeploySite = async ({
   requestHandler
 }) => {
   let generatedBundleDir = null;
-  const result = await deploySiteWithBundle({
-    bucketName,
-    region,
-    siteName,
-    options,
-    privacy,
-    throwIfSiteExists,
-    providerSpecifics,
-    forcePathStyle,
-    fullClientSpecifics,
-    requestHandler,
-    getBundle: async () => {
-      generatedBundleDir = await fullClientSpecifics.bundleSite({
-        publicPath: `/${getSitesKey3(siteName)}/`,
-        bundlerOverride: options.bundlerOverride ?? ((f) => f),
-        rspackOverride: options.rspackOverride ?? ((f) => f),
-        webpackOverride: options.webpackOverride ?? ((f) => f),
-        enableCaching: options.enableCaching ?? true,
-        publicDir: options.publicDir ?? null,
-        rootDir: options.rootDir ?? null,
-        ignoreRegisterRootWarning: options.ignoreRegisterRootWarning ?? false,
-        onProgress: options.onBundleProgress ?? (() => {
-          return;
-        }),
-        entryPoint,
-        gitSource,
-        bufferStateDelayInMilliseconds: null,
-        maxTimelineTracks: null,
-        onDirectoryCreated: () => {
-          return;
-        },
-        onPublicDirCopyProgress: () => {
-          return;
-        },
-        onSymlinkDetected: () => {
-          return;
-        },
-        outDir: null,
-        askAIEnabled: options.askAIEnabled ?? true,
-        interactivityEnabled: options.interactivityEnabled ?? true,
-        audioLatencyHint: null,
-        keyboardShortcutsEnabled: options.keyboardShortcutsEnabled ?? true,
-        renderDefaults: null,
-        rspack: options.rspack ?? false,
-        symlinkPublicDir: false
+  let deploymentOutcome;
+  try {
+    const result = await deploySiteWithBundle({
+      bucketName,
+      region,
+      siteName,
+      options,
+      privacy,
+      throwIfSiteExists,
+      providerSpecifics,
+      forcePathStyle,
+      fullClientSpecifics,
+      requestHandler,
+      getBundle: async () => {
+        const bundleDir = await fullClientSpecifics.bundleSite({
+          publicPath: `/${getSitesKey3(siteName)}/`,
+          bundlerOverride: options.bundlerOverride ?? ((f) => f),
+          rspackOverride: options.rspackOverride ?? ((f) => f),
+          webpackOverride: options.webpackOverride ?? ((f) => f),
+          enableCaching: options.enableCaching ?? true,
+          publicDir: options.publicDir ?? null,
+          rootDir: options.rootDir ?? null,
+          ignoreRegisterRootWarning: options.ignoreRegisterRootWarning ?? false,
+          onProgress: options.onBundleProgress ?? (() => {
+            return;
+          }),
+          entryPoint,
+          gitSource,
+          bufferStateDelayInMilliseconds: null,
+          maxTimelineTracks: null,
+          onDirectoryCreated: (directory) => {
+            generatedBundleDir = directory;
+          },
+          onPublicDirCopyProgress: () => {
+            return;
+          },
+          onSymlinkDetected: () => {
+            return;
+          },
+          outDir: null,
+          askAIEnabled: options.askAIEnabled ?? true,
+          interactivityEnabled: options.interactivityEnabled ?? true,
+          audioLatencyHint: null,
+          keyboardShortcutsEnabled: options.keyboardShortcutsEnabled ?? true,
+          renderDefaults: null,
+          rspack: options.rspack ?? false,
+          symlinkPublicDir: false
+        });
+        generatedBundleDir = bundleDir;
+        return bundleDir;
+      }
+    });
+    deploymentOutcome = { type: "success", result };
+  } catch (error) {
+    deploymentOutcome = { type: "failure", error };
+  }
+  let cleanupFailed = false;
+  let cleanupError;
+  if (generatedBundleDir !== null) {
+    try {
+      fs4.rmSync(generatedBundleDir, {
+        force: true,
+        recursive: true
       });
-      return generatedBundleDir;
+    } catch (error) {
+      cleanupFailed = true;
+      cleanupError = error;
     }
-  });
-  if (generatedBundleDir && fs4.existsSync(generatedBundleDir)) {
-    fs4.rmSync(generatedBundleDir, {
-      recursive: true
-    });
   }
-  return result;
+  if (deploymentOutcome.type === "failure") {
+    if (cleanupFailed) {
+      throw new AggregateError([deploymentOutcome.error, cleanupError], "Deploying the site failed, and removing the generated bundle also failed.", { cause: deploymentOutcome.error });
+    }
+    throw deploymentOutcome.error;
+  }
+  if (cleanupFailed) {
+    throw cleanupError;
+  }
+  return deploymentOutcome.result;
 };
 var internalDeploySite = wrapWithErrorHandling2(mandatoryDeploySite);
 var deploySite = (args) => {

package/dist/shared/deploy-site-with-bundle.js

@@ -6,6 +6,7 @@ const constants_1 = require("@remotion/lambda-client/constants");
 const serverless_1 = require("@remotion/serverless");
 const get_s3_operations_1 = require("./get-s3-operations");
 const validate_site_name_1 = require("./validate-site-name");
+const wait_for_promises_to_finish_1 = require("./wait-for-promises-to-finish");
 const deleteConcurrency = 10;
 const deploySiteWithBundle = async ({ bucketName, region, siteName, options, privacy, throwIfSiteExists, providerSpecifics, forcePathStyle, fullClientSpecifics, requestHandler, getBundle, }) => {
     var _a, _b;
@@ -31,17 +32,19 @@ const deploySiteWithBundle = async ({ bucketName, region, siteName, options, pri
         throw new Error(`No bucket with the name ${bucketName} exists`);
     }
     const subFolder = (0, constants_1.getSitesKey)(siteName);
-    const [files, bundleDir] = await Promise.all([
-        providerSpecifics.listObjects({
-            bucketName,
-            expectedBucketOwner: accountId,
-            region,
-            // The `/` is important to not accidentally delete sites with the same name but containing a suffix.
-            prefix: `${subFolder}/`,
-            forcePathStyle,
-            requestHandler,
-        }),
-        getBundle(),
+    const filesPromise = providerSpecifics.listObjects({
+        bucketName,
+        expectedBucketOwner: accountId,
+        region,
+        // The `/` is important to not accidentally delete sites with the same name but containing a suffix.
+        prefix: `${subFolder}/`,
+        forcePathStyle,
+        requestHandler,
+    });
+    const bundlePromise = getBundle();
+    const [files, bundleDir] = await (0, wait_for_promises_to_finish_1.waitForPromisesToFinish)([
+        filesPromise,
+        bundlePromise,
     ]);
     if (throwIfSiteExists && files.length > 0) {
         throw new Error('`throwIfSiteExists` was passed as true, but there are already files in this folder: ' +
@@ -87,7 +90,7 @@ const deploySiteWithBundle = async ({ bucketName, region, siteName, options, pri
     await upload(assetsToUpload);
     await upload(indexHtmlToUpload);
     const limit = lambda_client_1.LambdaClientInternals.pLimit(deleteConcurrency);
-    await Promise.all(toDelete.map((d) => {
+    const deletePromises = toDelete.map((d) => {
         return limit(() => {
             return providerSpecifics.deleteFile({
                 bucketName,
@@ -98,7 +101,8 @@ const deploySiteWithBundle = async ({ bucketName, region, siteName, options, pri
                 requestHandler,
             });
         });
-    }));
+    });
+    await (0, wait_for_promises_to_finish_1.waitForPromisesToFinish)(deletePromises);
     return {
         serveUrl: lambda_client_1.LambdaClientInternals.makeS3ServeUrl({
             bucketName,

package/dist/shared/wait-for-promises-to-finish.d.ts

@@ -0,0 +1 @@
+export declare const waitForPromisesToFinish: <T extends readonly PromiseLike<unknown>[]>(promises: T) => Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>;

package/dist/shared/wait-for-promises-to-finish.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForPromisesToFinish = void 0;
+const waitForPromisesToFinish = async (promises) => {
+    try {
+        return await Promise.all(promises);
+    }
+    catch (error) {
+        await Promise.allSettled(promises);
+        throw error;
+    }
+};
+exports.waitForPromisesToFinish = waitForPromisesToFinish;

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/lambda"
 	},
 	"name": "@remotion/lambda",
-	"version": "4.0.499",
+	"version": "4.0.500",
 	"description": "Render Remotion videos on AWS Lambda",
 	"main": "dist/index.js",
 	"scripts": {
@@ -28,22 +28,22 @@
 		"@aws-sdk/client-cloudwatch-logs": "3.986.0",
 		"@aws-sdk/client-service-quotas": "3.986.0",
 		"@aws-sdk/lib-storage": "3.986.0",
-		"@remotion/bundler": "4.0.499",
-		"@remotion/cli": "4.0.499",
-		"@remotion/lambda-client": "4.0.499",
-		"@remotion/renderer": "4.0.499",
-		"@remotion/serverless": "4.0.499",
-		"@remotion/streaming": "4.0.499",
+		"@remotion/bundler": "4.0.500",
+		"@remotion/cli": "4.0.500",
+		"@remotion/lambda-client": "4.0.500",
+		"@remotion/renderer": "4.0.500",
+		"@remotion/serverless": "4.0.500",
+		"@remotion/streaming": "4.0.500",
 		"@smithy/abort-controller": "4.0.1",
-		"remotion": "4.0.499",
+		"remotion": "4.0.500",
 		"zod": "4.4.3"
 	},
 	"devDependencies": {
-		"@remotion/bundler": "4.0.499",
+		"@remotion/bundler": "4.0.500",
 		"@types/express": "5.0.1",
 		"express": "4.21.0",
-		"@remotion/compositor-linux-arm64-gnu": "4.0.499",
-		"@remotion/eslint-config-internal": "4.0.499",
+		"@remotion/compositor-linux-arm64-gnu": "4.0.500",
+		"@remotion/eslint-config-internal": "4.0.500",
 		"mime-types": "2.1.34",
 		"@types/mime-types": "2.1.1",
 		"@types/minimist": "1.2.2",
@@ -54,7 +54,7 @@
 		"@typescript/native-preview": "7.0.0-dev.20260217.1"
 	},
 	"peerDependencies": {
-		"@remotion/bundler": "4.0.499"
+		"@remotion/bundler": "4.0.500"
 	},
 	"publishConfig": {
 		"access": "public"