@remotion/lambda 4.0.140 → 4.0.142

package/dist/api/deploy-site.d.ts

@@ -1,13 +1,16 @@
 import type { GitSource, WebpackOverrideFn } from '@remotion/bundler';
-import type { LogLevel } from '@remotion/renderer';
+import type { ToOptions } from '@remotion/renderer';
+import type { BrowserSafeApis } from '@remotion/renderer/client';
 import type { AwsRegion } from '../pricing/aws-regions';
 import type { UploadDirProgress } from './upload-dir';
-export type DeploySiteInput = {
+type MandatoryParameters = {
     entryPoint: string;
     bucketName: string;
     region: AwsRegion;
-    siteName?: string;
-    options?: {
+};
+type OptionalParameters = {
+    siteName: string;
+    options: {
         onBundleProgress?: (progress: number) => void;
         onUploadProgress?: (upload: UploadDirProgress) => void;
         webpackOverride?: WebpackOverrideFn;
@@ -17,10 +20,11 @@ export type DeploySiteInput = {
         rootDir?: string;
         bypassBucketNameValidation?: boolean;
     };
-    privacy?: 'public' | 'no-acl';
-    gitSource?: GitSource | null;
-    logLevel?: LogLevel;
-};
+    privacy: 'public' | 'no-acl';
+    gitSource: GitSource | null;
+    indent: boolean;
+} & ToOptions<typeof BrowserSafeApis.optionsMap.deploySiteLambda>;
+export type DeploySiteInput = MandatoryParameters & Partial<OptionalParameters>;
 export type DeploySiteOutput = Promise<{
     serveUrl: string;
     siteName: string;
@@ -30,6 +34,61 @@ export type DeploySiteOutput = Promise<{
         untouchedFiles: number;
     };
 }>;
+export declare const internalDeploySite: (args_0: MandatoryParameters & {
+    siteName: string;
+    options: {
+        onBundleProgress?: ((progress: number) => void) | undefined;
+        onUploadProgress?: ((upload: UploadDirProgress) => void) | undefined;
+        webpackOverride?: WebpackOverrideFn | undefined;
+        ignoreRegisterRootWarning?: boolean | undefined;
+        enableCaching?: boolean | undefined;
+        publicDir?: string | null | undefined;
+        rootDir?: string | undefined;
+        bypassBucketNameValidation?: boolean | undefined;
+    };
+    privacy: 'public' | 'no-acl';
+    gitSource: GitSource | null;
+    indent: boolean;
+} & ToOptions<{
+    readonly logLevel: {
+        cliFlag: "log";
+        name: string;
+        ssrName: string;
+        description: () => import("react/jsx-runtime").JSX.Element;
+        docLink: string;
+        getValue: ({ commandLine }: {
+            commandLine: Record<string, unknown>;
+        }) => {
+            value: "verbose" | "info" | "warn" | "error";
+            source: string;
+        };
+        setConfig: (newLogLevel: "verbose" | "info" | "warn" | "error") => void;
+        type: "verbose" | "info" | "warn" | "error";
+    };
+    readonly throwIfSiteExists: {
+        cliFlag: string;
+        description: () => string;
+        docLink: string;
+        getValue: ({ commandLine }: {
+            commandLine: Record<string, unknown>;
+        }) => {
+            source: string;
+            value: boolean;
+        };
+        name: string;
+        setConfig: () => never;
+        ssrName: string;
+        type: boolean;
+    };
+}>) => Promise<{
+    serveUrl: string;
+    siteName: string;
+    stats: {
+        uploadedFiles: number;
+        deletedFiles: number;
+        untouchedFiles: number;
+    };
+}>;
 /**
  * @description Deploys a Remotion project to an S3 bucket to prepare it for rendering on AWS Lambda.
  * @see [Documentation](https://remotion.dev/docs/lambda/deploysite)
@@ -39,4 +98,13 @@ export type DeploySiteOutput = Promise<{
  * @param {string} params.siteName The name of the folder in which the project gets deployed to.
  * @param {object} params.options Further options, see documentation page for this function.
  */
-export declare const deploySite: (args: DeploySiteInput) => DeploySiteOutput;
+export declare const deploySite: (args: DeploySiteInput) => Promise<{
+    serveUrl: string;
+    siteName: string;
+    stats: {
+        uploadedFiles: number;
+        deletedFiles: number;
+        untouchedFiles: number;
+    };
+}>;
+export {};

package/dist/api/deploy-site.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deploySite = void 0;
+exports.deploySite = exports.internalDeploySite = void 0;
 const pure_1 = require("@remotion/renderer/pure");
 const node_fs_1 = __importDefault(require("node:fs"));
 const io_1 = require("../functions/helpers/io");
@@ -19,15 +19,13 @@ const validate_privacy_1 = require("../shared/validate-privacy");
 const validate_site_name_1 = require("../shared/validate-site-name");
 const bucket_exists_1 = require("./bucket-exists");
 const upload_dir_1 = require("./upload-dir");
-const internalDeploySite = async ({ bucketName, entryPoint, siteName, options, region, privacy: passedPrivacy, gitSource, }) => {
+const mandatoryDeploySite = async ({ bucketName, entryPoint, siteName, options, region, privacy, gitSource, throwIfSiteExists, }) => {
     var _a, _b, _c, _d;
     (0, validate_aws_region_1.validateAwsRegion)(region);
     (0, validate_bucketname_1.validateBucketName)(bucketName, {
         mustStartWithRemotion: !(options === null || options === void 0 ? void 0 : options.bypassBucketNameValidation),
     });
-    const siteId = siteName !== null && siteName !== void 0 ? siteName : (0, random_hash_1.randomHash)();
-    (0, validate_site_name_1.validateSiteName)(siteId);
-    const privacy = passedPrivacy !== null && passedPrivacy !== void 0 ? passedPrivacy : 'public';
+    (0, validate_site_name_1.validateSiteName)(siteName);
     (0, validate_privacy_1.validatePrivacy)(privacy, false);
     const accountId = await (0, get_account_id_1.getAccountId)({ region });
     const bucketExists = await (0, bucket_exists_1.bucketExistsInRegion)({
@@ -38,7 +36,7 @@ const internalDeploySite = async ({ bucketName, entryPoint, siteName, options, r
     if (!bucketExists) {
         throw new Error(`No bucket with the name ${bucketName} exists`);
     }
-    const subFolder = (0, constants_1.getSitesKey)(siteId);
+    const subFolder = (0, constants_1.getSitesKey)(siteName);
     const [files, bundled] = await Promise.all([
         (0, io_1.lambdaLs)({
             bucketName,
@@ -59,6 +57,13 @@ const internalDeploySite = async ({ bucketName, entryPoint, siteName, options, r
             gitSource,
         }),
     ]);
+    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(', '));
+    }
     const { toDelete, toUpload, existingCount } = await (0, get_s3_operations_1.getS3DiffOperations)({
         objects: files,
         bundle: bundled,
@@ -90,7 +95,7 @@ const internalDeploySite = async ({ bucketName, entryPoint, siteName, options, r
     }
     return {
         serveUrl: (0, make_s3_url_1.makeS3ServeUrl)({ bucketName, subFolder, region }),
-        siteName: siteId,
+        siteName,
         stats: {
             uploadedFiles: toUpload.length,
             deletedFiles: toDelete.length,
@@ -98,19 +103,7 @@ const internalDeploySite = async ({ bucketName, entryPoint, siteName, options, r
         },
     };
 };
-const deploySiteRaw = (args) => {
-    return internalDeploySite({
-        bucketName: args.bucketName,
-        entryPoint: args.entryPoint,
-        region: args.region,
-        gitSource: args.gitSource,
-        options: args.options,
-        privacy: args.privacy,
-        siteName: args.siteName,
-        indent: false,
-        logLevel: 'info',
-    });
-};
+exports.internalDeploySite = pure_1.NoReactAPIs.wrapWithErrorHandling(mandatoryDeploySite);
 /**
  * @description Deploys a Remotion project to an S3 bucket to prepare it for rendering on AWS Lambda.
  * @see [Documentation](https://remotion.dev/docs/lambda/deploysite)
@@ -120,4 +113,19 @@ const deploySiteRaw = (args) => {
  * @param {string} params.siteName The name of the folder in which the project gets deployed to.
  * @param {object} params.options Further options, see documentation page for this function.
  */
-exports.deploySite = pure_1.NoReactAPIs.wrapWithErrorHandling(internalDeploySite);
+const deploySite = (args) => {
+    var _a, _b, _c, _d, _e;
+    return (0, exports.internalDeploySite)({
+        bucketName: args.bucketName,
+        entryPoint: args.entryPoint,
+        region: args.region,
+        gitSource: (_a = args.gitSource) !== null && _a !== void 0 ? _a : null,
+        options: (_b = args.options) !== null && _b !== void 0 ? _b : {},
+        privacy: (_c = args.privacy) !== null && _c !== void 0 ? _c : 'public',
+        siteName: (_d = args.siteName) !== null && _d !== void 0 ? _d : (0, random_hash_1.randomHash)(),
+        indent: false,
+        logLevel: 'info',
+        throwIfSiteExists: (_e = args.throwIfSiteExists) !== null && _e !== void 0 ? _e : false,
+    });
+};
+exports.deploySite = deploySite;

package/dist/api/render-still-on-lambda.d.ts

@@ -42,6 +42,7 @@ export type RenderStillOnLambdaInput = MandatoryParameters & Partial<OptionalPar
 export type RenderStillOnLambdaOutput = {
     estimatedPrice: CostsInfo;
     url: string;
+    outKey: string;
     sizeInBytes: number;
     bucketName: string;
     renderId: string;

package/dist/api/render-still-on-lambda.js

@@ -39,6 +39,7 @@ const internalRenderStillOnLambda = async (input) => {
         return {
             estimatedPrice: res.estimatedPrice,
             url: res.output,
+            outKey: res.outKey,
             sizeInBytes: res.size,
             bucketName: res.bucketName,
             renderId: res.renderId,
@@ -102,7 +103,7 @@ const renderStillOnLambda = (input) => {
         logLevel: input.dumpBrowserLogs ? 'verbose' : (_o = input.logLevel) !== null && _o !== void 0 ? _o : 'info',
         offthreadVideoCacheSizeInBytes: (_p = input.offthreadVideoCacheSizeInBytes) !== null && _p !== void 0 ? _p : null,
         scale: (_q = input.scale) !== null && _q !== void 0 ? _q : 1,
-        timeoutInMilliseconds: (_r = input.timeoutInMilliseconds) !== null && _r !== void 0 ? _r : constants_1.DEFAULT_TIMEOUT,
+        timeoutInMilliseconds: (_r = input.timeoutInMilliseconds) !== null && _r !== void 0 ? _r : 30000,
         dumpBrowserLogs: false,
     });
 };

package/dist/cli/commands/sites/create.js

@@ -5,9 +5,10 @@ const cli_1 = require("@remotion/cli");
 const config_1 = require("@remotion/cli/config");
 const client_1 = require("@remotion/renderer/client");
 const no_react_1 = require("remotion/no-react");
-const deploy_site_1 = require("../../../api/deploy-site");
 const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
+const internals_1 = require("../../../internals");
 const constants_1 = require("../../../shared/constants");
+const random_hash_1 = require("../../../shared/random-hash");
 const validate_site_name_1 = require("../../../shared/validate-site-name");
 const args_1 = require("../../args");
 const get_aws_region_1 = require("../../get-aws-region");
@@ -15,9 +16,9 @@ const progress_bar_1 = require("../../helpers/progress-bar");
 const quit_1 = require("../../helpers/quit");
 const log_1 = require("../../log");
 exports.SITES_CREATE_SUBCOMMAND = 'create';
-const { folderExpiryOption, publicDirOption } = client_1.BrowserSafeApis.options;
+const { folderExpiryOption, publicDirOption, throwIfSiteExistsOption } = client_1.BrowserSafeApis.options;
 const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const { file, reason } = cli_1.CliInternals.findEntryPoint({
         args,
         remotionRoot,
@@ -83,9 +84,12 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
     const publicDir = publicDirOption.getValue({
         commandLine: cli_1.CliInternals.parsedCli,
     }).value;
-    const { serveUrl, siteName, stats } = await (0, deploy_site_1.deploySite)({
+    const throwIfSiteExists = throwIfSiteExistsOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const { serveUrl, siteName, stats } = await internals_1.LambdaInternals.internalDeploySite({
         entryPoint: file,
-        siteName: desiredSiteName,
+        siteName: desiredSiteName !== null && desiredSiteName !== void 0 ? desiredSiteName : (0, random_hash_1.randomHash)(),
         bucketName,
         options: {
             publicDir,
@@ -114,8 +118,11 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
             bypassBucketNameValidation: Boolean(args_1.parsedLambdaCli['force-bucket-name']),
         },
         region: (0, get_aws_region_1.getAwsRegion)(),
-        privacy: args_1.parsedLambdaCli.privacy,
+        privacy: (_d = args_1.parsedLambdaCli.privacy) !== null && _d !== void 0 ? _d : 'public',
         gitSource: null,
+        indent: false,
+        logLevel,
+        throwIfSiteExists,
     });
     const uploadDuration = Date.now() - uploadStart;
     multiProgress.deployProgress = {

package/dist/cli/log.d.ts

@@ -1,10 +1,10 @@
 export declare const Log: {
     verbose: (options: import("@remotion/renderer").LogOptions & {
         tag?: string | undefined;
-    }, message?: any, ...optionalParams: any[]) => void;
-    info: (options: import("@remotion/renderer").LogOptions, message?: any, ...optionalParams: any[]) => void;
-    warn: (options: import("@remotion/renderer").LogOptions, message?: any, ...optionalParams: any[]) => void;
+    }, ...args: any[]) => void;
+    info: (options: import("@remotion/renderer").LogOptions, ...args: any[]) => void;
+    warn: (options: import("@remotion/renderer").LogOptions, ...args: any[]) => void;
     error: (options: import("@remotion/renderer").LogOptions & {
         tag?: string | undefined;
-    }, message?: any, ...optionalParams: any[]) => void;
+    }, ...args: any[]) => void;
 };

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

@@ -20,7 +20,7 @@ const findOutputFileInBucket = async ({ region, renderMetadata, bucketName, cust
         return {
             lastModified: (_a = head.LastModified) === null || _a === void 0 ? void 0 : _a.getTime(),
             size: head.ContentLength,
-            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName, customCredentials),
+            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName, customCredentials).url,
         };
     }
     catch (err) {

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

@@ -1,3 +1,6 @@
 import type { RenderMetadata } from '../../defaults';
 import type { CustomCredentials } from '../../shared/aws-clients';
-export declare const getOutputUrlFromMetadata: (renderMetadata: RenderMetadata, bucketName: string, customCredentials: CustomCredentials | null) => string;
+export declare const getOutputUrlFromMetadata: (renderMetadata: RenderMetadata, bucketName: string, customCredentials: CustomCredentials | null) => {
+    url: string;
+    key: string;
+};

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

@@ -4,7 +4,10 @@ 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 outname = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials);
-    return `https://s3.${(0, get_current_region_1.getCurrentRegionInFunction)()}.amazonaws.com/${outname.renderBucketName}/${outname.key}`;
+    const { key, renderBucketName } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials);
+    return {
+        url: `https://s3.${(0, get_current_region_1.getCurrentRegionInFunction)()}.amazonaws.com/${renderBucketName}/${key}`,
+        key,
+    };
 };
 exports.getOutputUrlFromMetadata = getOutputUrlFromMetadata;

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

@@ -180,7 +180,7 @@ const mergeChunksAndFinishRender = async (options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         serialized: options.serializedResolvedProps,
     });
-    const 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);
     const postRenderData = (0, create_post_render_data_1.createPostRenderData)({
         expectedBucketOwner: options.expectedBucketOwner,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),

package/dist/functions/still.d.ts

@@ -7,6 +7,7 @@ type Options = {
 type RenderStillLambdaResponsePayload = {
     type: 'success';
     output: string;
+    outKey: string;
     size: number;
     bucketName: string;
     estimatedPrice: CostsInfo;

package/dist/functions/still.js

@@ -204,13 +204,15 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
         // overestimate the price, but will only have a miniscule effect (~0.2%)
         diskSizeInMb: constants_1.MAX_EPHEMERAL_STORAGE_IN_MB,
     });
+    const { key: outKey, url } = (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName, customCredentials);
     return {
         type: 'success',
-        output: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName, customCredentials),
+        output: url,
         size,
         bucketName,
         estimatedPrice: (0, format_costs_info_1.formatCostsInfo)(estimatedPrice),
         renderId,
+        outKey,
     };
 };
 const stillHandler = async (options) => {

package/dist/internals.d.ts

@@ -27,4 +27,63 @@ export declare const LambdaInternals: {
         offthreadVideoCacheSizeInBytes: number | null;
         deleteAfter: "1-day" | "3-days" | "7-days" | "30-days" | null;
     }>;
+    internalDeploySite: (args_0: {
+        entryPoint: string;
+        bucketName: string;
+        region: "eu-central-1" | "eu-west-1" | "eu-west-2" | "eu-west-3" | "eu-south-1" | "eu-north-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2" | "af-south-1" | "ap-south-1" | "ap-east-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1" | "ap-northeast-2" | "ap-northeast-3" | "ca-central-1" | "me-south-1" | "sa-east-1";
+    } & {
+        siteName: string;
+        options: {
+            onBundleProgress?: ((progress: number) => void) | undefined;
+            onUploadProgress?: ((upload: import("./api/upload-dir").UploadDirProgress) => void) | undefined;
+            webpackOverride?: import("@remotion/bundler").WebpackOverrideFn | undefined;
+            ignoreRegisterRootWarning?: boolean | undefined;
+            enableCaching?: boolean | undefined;
+            publicDir?: string | null | undefined;
+            rootDir?: string | undefined;
+            bypassBucketNameValidation?: boolean | undefined;
+        };
+        privacy: "public" | "no-acl";
+        gitSource: import("@remotion/bundler").GitSource | null;
+        indent: boolean;
+    } & import("@remotion/renderer").ToOptions<{
+        readonly logLevel: {
+            cliFlag: "log";
+            name: string;
+            ssrName: string;
+            description: () => import("react/jsx-runtime").JSX.Element;
+            docLink: string;
+            getValue: ({ commandLine }: {
+                commandLine: Record<string, unknown>;
+            }) => {
+                value: "verbose" | "info" | "warn" | "error";
+                source: string;
+            };
+            setConfig: (newLogLevel: "verbose" | "info" | "warn" | "error") => void;
+            type: "verbose" | "info" | "warn" | "error";
+        };
+        readonly throwIfSiteExists: {
+            cliFlag: string;
+            description: () => string;
+            docLink: string;
+            getValue: ({ commandLine }: {
+                commandLine: Record<string, unknown>;
+            }) => {
+                source: string;
+                value: boolean;
+            };
+            name: string;
+            setConfig: () => never;
+            ssrName: string;
+            type: boolean;
+        };
+    }>) => Promise<{
+        serveUrl: string;
+        siteName: string;
+        stats: {
+            uploadedFiles: number;
+            deletedFiles: number;
+            untouchedFiles: number;
+        };
+    }>;
 };

package/dist/internals.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LambdaInternals = void 0;
+const deploy_site_1 = require("./api/deploy-site");
 const make_lambda_payload_1 = require("./api/make-lambda-payload");
 const index_1 = require("./cli/index");
 exports.LambdaInternals = {
@@ -8,4 +9,5 @@ exports.LambdaInternals = {
     makeLambdaRenderMediaPayload: make_lambda_payload_1.makeLambdaRenderMediaPayload,
     getRenderProgressPayload: make_lambda_payload_1.getRenderProgressPayload,
     makeLambdaRenderStillPayload: make_lambda_payload_1.makeLambdaRenderStillPayload,
+    internalDeploySite: deploy_site_1.internalDeploySite,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.140",
+  "version": "4.0.142",
   "description": "Distributed renderer for Remotion based on AWS Lambda",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -26,16 +26,17 @@
     "aws-policies": "^1.0.1",
     "mime-types": "2.1.34",
     "zod": "3.22.3",
-    "@remotion/bundler": "4.0.140",
-    "@remotion/cli": "4.0.140",
-    "@remotion/renderer": "4.0.140",
-    "remotion": "4.0.140"
+    "@remotion/bundler": "4.0.142",
+    "@remotion/cli": "4.0.142",
+    "@remotion/renderer": "4.0.142",
+    "remotion": "4.0.142"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.281",
     "@types/mime-types": "2.1.1",
     "@types/minimist": "1.2.2",
     "@types/node": "18.14.6",
+    "@types/react": "18.2.48",
     "@types/prompt": "^1.1.0",
     "eslint": "8.56.0",
     "prettier": "3.2.5",
@@ -44,11 +45,11 @@
     "ts-node": "10.9.2",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/bundler": "4.0.140",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.140"
+    "@remotion/bundler": "4.0.142",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.142"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.140"
+    "@remotion/bundler": "4.0.142"
   },
   "publishConfig": {
     "access": "public"