@remotion/lambda 4.0.5 → 4.0.7

package/dist/shared/call-lambda.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callLambda = void 0;
 const client_lambda_1 = require("@aws-sdk/client-lambda");
+const streaming_payloads_1 = require("../functions/helpers/streaming-payloads");
 const aws_clients_1 = require("./aws-clients");
-const callLambda = async ({ functionName, type, payload, region, }) => {
-    var _a;
-    const res = await (0, aws_clients_1.getLambdaClient)(region).send(new client_lambda_1.InvokeWithResponseStreamCommand({
+const callLambda = async ({ functionName, type, payload, region, receivedStreamingPayload, timeoutInTest, }) => {
+    const res = await (0, aws_clients_1.getLambdaClient)(region, timeoutInTest).send(new client_lambda_1.InvokeWithResponseStreamCommand({
         FunctionName: functionName,
-        // @ts-expect-error
         Payload: JSON.stringify({ type, ...payload }),
     }));
     const events = res.EventStream;
@@ -19,30 +18,48 @@ const callLambda = async ({ functionName, type, payload, region, }) => {
         if (event.PayloadChunk) {
             // Decode the raw bytes into a string a human can read
             const decoded = new TextDecoder('utf-8').decode(event.PayloadChunk.Payload);
+            const streamPayload = (0, streaming_payloads_1.isStreamingPayload)(decoded);
+            if (streamPayload) {
+                receivedStreamingPayload(streamPayload);
+                continue;
+            }
             responsePayload = Buffer.concat([responsePayload, Buffer.from(decoded)]);
         }
         if (event.InvokeComplete) {
             if (event.InvokeComplete.ErrorCode) {
-                throw new Error(`Lambda function ${functionName} failed with error code ${event.InvokeComplete.ErrorCode}: ${event.InvokeComplete.ErrorDetails}}`);
+                const logs = `https://${region}.console.aws.amazon.com/cloudwatch/home?region=${region}#logsV2:logs-insights$3FqueryDetail$3D~(end~0~start~-3600~timeType~'RELATIVE~unit~'seconds~editorString~'fields*20*40timestamp*2c*20*40requestId*2c*20*40message*0a*7c*20filter*20*40requestId*20like*20*${res.$metadata.requestId}*22*0a*7c*20sort*20*40timestamp*20asc~source~(~'*2faws*2flambda*2f${functionName}))`;
+                if (event.InvokeComplete.ErrorCode === 'Unhandled') {
+                    throw new Error(`Lambda function ${functionName} failed with an unhandled error. See ${logs} to see the logs of this invocation.`);
+                }
+                throw new Error(`Lambda function ${functionName} failed with error code ${event.InvokeComplete.ErrorCode}: ${event.InvokeComplete.ErrorDetails}. See ${logs} to see the logs of this invocation.`);
             }
         }
     }
     const string = Buffer.from(responsePayload).toString();
-    const json = JSON.parse(string);
+    const json = parseJson(string);
+    return json;
+};
+exports.callLambda = callLambda;
+const parseJson = (input) => {
+    var _a;
+    let json = JSON.parse(input);
+    if ('statusCode' in json) {
+        json = JSON.parse(json.body);
+    }
     if ('errorMessage' in json) {
         const err = new Error(json.errorMessage);
         err.name = json.errorType;
         err.stack = ((_a = json.trace) !== null && _a !== void 0 ? _a : []).join('\n');
         throw err;
     }
-    // Streaming: 3.3.96+
+    // This will not happen, it is for narrowing purposes
     if ('statusCode' in json) {
-        if (json.statusCode !== 200) {
-            throw new Error(`Lambda function ${functionName} failed with status code ${json.statusCode}: ${json.body}`);
-        }
-        return JSON.parse(json.body);
+        throw new Error(`Lambda function failed with status code ${json.statusCode}`);
+    }
+    if (json.type === 'error') {
+        const err = new Error(json.message);
+        err.stack = json.stack;
+        throw err;
     }
-    // Non-streaming: 3.3.95 and below
     return json;
 };
-exports.callLambda = callLambda;

package/dist/shared/compress-props.js

@@ -5,8 +5,8 @@ const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
 const io_1 = require("../functions/helpers/io");
 const constants_1 = require("./constants");
 const random_hash_1 = require("./random-hash");
-const stream_to_string_1 = require("./stream-to-string");
 const serialize_props_1 = require("./serialize-props");
+const stream_to_string_1 = require("./stream-to-string");
 const serializeOrThrow = (inputProps, propsType) => {
     try {
         const payload = (0, serialize_props_1.serializeJSONWithDate)({

package/dist/shared/constants.d.ts

@@ -356,6 +356,7 @@ export type RenderProgress = {
     mostExpensiveFrameRanges: ExpensiveChunk[] | null;
     framesRendered: number;
     outputSizeInBytes: number | null;
+    type: 'success';
 };
 export type Privacy = 'public' | 'private' | 'no-acl';
 export declare const LAMBDA_CONCURRENCY_LIMIT_QUOTA = "L-B99A9384";

package/dist/shared/encode-aws-url-params.d.ts

@@ -0,0 +1 @@
+export declare const encodeAwsUrlParams: (input: string) => string;

package/dist/shared/encode-aws-url-params.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodeAwsUrlParams = void 0;
+const encodeAwsUrlParams = (input) => {
+    return encodeURIComponent(input).replace(/%/g, '$25');
+};
+exports.encodeAwsUrlParams = encodeAwsUrlParams;

package/dist/shared/get-aws-urls.d.ts

@@ -1,11 +1,18 @@
 import type { AwsRegion } from '../client';
 import type { LambdaRoutines } from './constants';
-export declare const getCloudwatchStreamUrl: ({ region, functionName, method, renderId, rendererFunctionName, }: {
+export declare const getCloudwatchMethodUrl: ({ region, functionName, renderId, rendererFunctionName, method, }: {
     region: AwsRegion;
     functionName: string;
-    rendererFunctionName: string | null;
     method: LambdaRoutines;
+    rendererFunctionName: string | null;
+    renderId: string;
+}) => string;
+export declare const getCloudwatchRendererUrl: ({ region, functionName, renderId, rendererFunctionName, chunk, }: {
+    region: AwsRegion;
+    functionName: string;
+    rendererFunctionName: string | null;
     renderId: string;
+    chunk: null | number;
 }) => string;
 export declare const getS3RenderUrl: ({ renderId, region, bucketName, }: {
     renderId: string;

package/dist/shared/get-aws-urls.js

@@ -1,11 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getS3RenderUrl = exports.getCloudwatchStreamUrl = void 0;
-const getCloudwatchStreamUrl = ({ region, functionName, method, renderId, rendererFunctionName, }) => {
+exports.getS3RenderUrl = exports.getCloudwatchRendererUrl = exports.getCloudwatchMethodUrl = void 0;
+const encode_aws_url_params_1 = require("./encode-aws-url-params");
+const getCloudwatchMethodUrl = ({ region, functionName, renderId, rendererFunctionName, method, }) => {
     const functionNameToUse = rendererFunctionName !== null && rendererFunctionName !== void 0 ? rendererFunctionName : functionName;
-    return `https://${region}.console.aws.amazon.com/cloudwatch/home?region=${region}#logsV2:log-groups/log-group/$252Faws$252Flambda$252F${functionNameToUse}/log-events$3FfilterPattern$3D$2522method$253D${method}$252CrenderId$253D${renderId}$2522`;
+    const query = `"method=${method},renderId=${renderId}"`;
+    return cloudWatchUrlWithQuery({ region, functionNameToUse, query });
+};
+exports.getCloudwatchMethodUrl = getCloudwatchMethodUrl;
+const getCloudwatchRendererUrl = ({ region, functionName, renderId, rendererFunctionName, chunk, }) => {
+    const functionNameToUse = rendererFunctionName !== null && rendererFunctionName !== void 0 ? rendererFunctionName : functionName;
+    const query = `"method=renderer,renderId=${renderId}${chunk === null ? '' : `,chunk=${chunk},`}"`;
+    return cloudWatchUrlWithQuery({ region, functionNameToUse, query });
+};
+exports.getCloudwatchRendererUrl = getCloudwatchRendererUrl;
+const cloudWatchUrlWithQuery = ({ region, functionNameToUse, query, }) => {
+    return `https://${region}.console.aws.amazon.com/cloudwatch/home?region=${region}#logsV2:log-groups/log-group/$252Faws$252Flambda$252F${functionNameToUse}/log-events$3FfilterPattern$3D${(0, encode_aws_url_params_1.encodeAwsUrlParams)(query)}`;
 };
-exports.getCloudwatchStreamUrl = getCloudwatchStreamUrl;
 const getS3RenderUrl = ({ renderId, region, bucketName, }) => {
     return `https://s3.console.aws.amazon.com/s3/buckets/${bucketName}?region=${region}&prefix=renders/${renderId}/`;
 };

package/dist/shared/get-function-version.js

@@ -12,6 +12,8 @@ const getFunctionVersion = async ({ functionName, region, }) => {
             },
             region,
             type: constants_1.LambdaRoutines.info,
+            receivedStreamingPayload: () => undefined,
+            timeoutInTest: 120000,
         });
         return result.version;
     }

package/dist/shared/invoke-webhook.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import https from 'https';
 import http from 'node:http';
 import type { EnhancedErrorInfo } from '../functions/helpers/write-lambda-error';

package/dist/shared/return-values.d.ts

@@ -6,6 +6,11 @@ import type { rendererHandler } from '../functions/renderer';
 import type { startHandler } from '../functions/start';
 import type { stillHandler } from '../functions/still';
 import type { LambdaRoutines } from './constants';
+export type OrError<T> = T | {
+    type: 'error';
+    message: string;
+    stack: string;
+};
 export interface LambdaReturnValues {
     [LambdaRoutines.start]: ReturnType<typeof startHandler>;
     [LambdaRoutines.launch]: ReturnType<typeof launchHandler>;
@@ -15,8 +20,3 @@ export interface LambdaReturnValues {
     [LambdaRoutines.still]: ReturnType<typeof stillHandler>;
     [LambdaRoutines.compositions]: ReturnType<typeof compositionsHandler>;
 }
-export type StreamedResponse = {
-    statusCode: number;
-    headers: Record<string, string>;
-    body: string;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "description": "Distributed renderer for Remotion based on AWS Lambda",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -13,22 +13,22 @@
     "url": "https://github.com/JonnyBurger/remotion"
   },
   "dependencies": {
-    "@aws-sdk/abort-controller": "3.338.0",
-    "@aws-sdk/client-cloudwatch-logs": "3.338.0",
-    "@aws-sdk/client-iam": "3.338.0",
-    "@aws-sdk/client-lambda": "3.338.0",
-    "@aws-sdk/client-s3": "3.338.0",
-    "@aws-sdk/client-service-quotas": "3.338.0",
-    "@aws-sdk/client-sts": "3.338.0",
-    "@aws-sdk/credential-providers": "3.338.0",
-    "@aws-sdk/lib-storage": "3.338.0",
-    "@aws-sdk/s3-request-presigner": "3.338.0",
+    "@aws-sdk/abort-controller": "3.370.0",
+    "@aws-sdk/client-cloudwatch-logs": "3.370.0",
+    "@aws-sdk/client-iam": "3.370.0",
+    "@aws-sdk/client-lambda": "3.370.0",
+    "@aws-sdk/client-s3": "3.370.0",
+    "@aws-sdk/client-service-quotas": "3.370.0",
+    "@aws-sdk/client-sts": "3.370.0",
+    "@aws-sdk/credential-providers": "3.370.0",
+    "@aws-sdk/lib-storage": "3.370.0",
+    "@aws-sdk/s3-request-presigner": "3.370.0",
     "aws-policies": "^1.0.1",
     "mime-types": "2.1.34",
-    "@remotion/bundler": "4.0.5",
-    "@remotion/cli": "4.0.5",
-    "@remotion/renderer": "4.0.5",
-    "remotion": "4.0.5"
+    "@remotion/bundler": "4.0.7",
+    "@remotion/cli": "4.0.7",
+    "@remotion/renderer": "4.0.7",
+    "remotion": "4.0.7"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.266",
@@ -38,16 +38,17 @@
     "@types/prompt": "^1.1.0",
     "eslint": "8.42.0",
     "prettier": "^2.4.1",
-    "prettier-plugin-organize-imports": "^2.3.4",
+    "prettier-plugin-organize-imports": "^3.2.2",
     "ts-node": "^10.8.0",
     "typescript": "4.9.5",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/bundler": "4.0.5",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.5"
+    "zod": "3.21.4",
+    "@remotion/bundler": "4.0.7",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.7"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.5"
+    "@remotion/bundler": "4.0.7"
   },
   "publishConfig": {
     "access": "public"