@scloud/lambda-api 1.2.2 → 1.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -7
- package/dist/event.d.ts +9 -0
- package/dist/event.js +11 -0
- package/dist/handler.d.ts +5 -2
- package/dist/handler.js +12 -42
- package/dist/helpers.d.ts +6 -2
- package/dist/helpers.js +66 -43
- package/dist/index.d.ts +1 -0
- package/dist/index.js +4 -2
- package/dist/result.d.ts +4 -0
- package/dist/result.js +45 -0
- package/dist/types.d.ts +2 -2
- package/dist/types.js +1 -1
- package/package.json +2 -3
package/README.md
CHANGED
|
@@ -6,6 +6,7 @@ This is a piece of useful boilerplate to handle the mechanics of routing, header
|
|
|
6
6
|
|
|
7
7
|
## Releae notes
|
|
8
8
|
|
|
9
|
+
* `1.2.3`: Readme update
|
|
9
10
|
* '1.2.0': Restructure so we consumers don't need to include '/dist' in the import path
|
|
10
11
|
* `1.1.8`: Trusted publishing enabled
|
|
11
12
|
* `1.1.7`: Enable sending headers in ApiError
|
|
@@ -40,15 +41,17 @@ const routes: types.Routes = {
|
|
|
40
41
|
}
|
|
41
42
|
```
|
|
42
43
|
|
|
43
|
-
Use `@scloud/lambda-api` in your Lambda handler
|
|
44
|
+
Use `@scloud/lambda-api` in your Lambda handler. `apiHandler` accepts both REST API (v1) and Function URL (v2) events and returns the matching response shape. When the event type is known at compile time, TypeScript infers the result type via overloads; you can also use `ApiGatewayProxyResultFor<E>`:
|
|
44
45
|
|
|
45
46
|
```
|
|
46
|
-
import {
|
|
47
|
-
import { apiHandler,
|
|
48
|
-
|
|
49
|
-
export async function handler(
|
|
50
|
-
|
|
51
|
-
|
|
47
|
+
import { APIGatewayProxyEventV2, Context } from 'aws-lambda';
|
|
48
|
+
import { apiHandler, ApiGatewayProxyResultFor } from '@scloud/lambda-api';
|
|
49
|
+
|
|
50
|
+
export async function handler(
|
|
51
|
+
event: APIGatewayProxyEventV2,
|
|
52
|
+
context: Context,
|
|
53
|
+
): Promise<ApiGatewayProxyResultFor<typeof event>> {
|
|
54
|
+
return apiHandler(event, context, routes);
|
|
52
55
|
}
|
|
53
56
|
```
|
|
54
57
|
|
package/dist/event.d.ts
ADDED
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { APIGatewayProxyEvent, APIGatewayProxyEventV2, APIGatewayProxyResult, APIGatewayProxyStructuredResultV2 } from 'aws-lambda';
|
|
2
|
+
export type ApiGatewayProxyEventAny = APIGatewayProxyEvent | APIGatewayProxyEventV2;
|
|
3
|
+
/** Result type that matches the incoming API Gateway / Function URL event format. */
|
|
4
|
+
export type ApiGatewayProxyResultFor<E extends ApiGatewayProxyEventAny> = E extends APIGatewayProxyEventV2 ? APIGatewayProxyStructuredResultV2 : APIGatewayProxyResult;
|
|
5
|
+
/**
|
|
6
|
+
* Lambda Function URLs and HTTP APIs (payload format 2.0) use `rawPath`.
|
|
7
|
+
* REST API / CloudFront proxy integrations use `path`.
|
|
8
|
+
*/
|
|
9
|
+
export declare function isApiGatewayEventV2(event: ApiGatewayProxyEventAny): event is APIGatewayProxyEventV2;
|
package/dist/event.js
ADDED
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isApiGatewayEventV2 = isApiGatewayEventV2;
|
|
4
|
+
/**
|
|
5
|
+
* Lambda Function URLs and HTTP APIs (payload format 2.0) use `rawPath`.
|
|
6
|
+
* REST API / CloudFront proxy integrations use `path`.
|
|
7
|
+
*/
|
|
8
|
+
function isApiGatewayEventV2(event) {
|
|
9
|
+
return typeof event.rawPath === 'string';
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXZlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFpQkEsa0RBRUM7QUFORDs7O0dBR0c7QUFDSCxTQUFnQixtQkFBbUIsQ0FBQyxLQUE4QjtJQUNoRSxPQUFPLE9BQVEsS0FBZ0MsQ0FBQyxPQUFPLEtBQUssUUFBUSxDQUFDO0FBQ3ZFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBBUElHYXRld2F5UHJveHlFdmVudCxcbiAgQVBJR2F0ZXdheVByb3h5RXZlbnRWMixcbiAgQVBJR2F0ZXdheVByb3h5UmVzdWx0LFxuICBBUElHYXRld2F5UHJveHlTdHJ1Y3R1cmVkUmVzdWx0VjIsXG59IGZyb20gJ2F3cy1sYW1iZGEnO1xuXG5leHBvcnQgdHlwZSBBcGlHYXRld2F5UHJveHlFdmVudEFueSA9IEFQSUdhdGV3YXlQcm94eUV2ZW50IHwgQVBJR2F0ZXdheVByb3h5RXZlbnRWMjtcblxuLyoqIFJlc3VsdCB0eXBlIHRoYXQgbWF0Y2hlcyB0aGUgaW5jb21pbmcgQVBJIEdhdGV3YXkgLyBGdW5jdGlvbiBVUkwgZXZlbnQgZm9ybWF0LiAqL1xuZXhwb3J0IHR5cGUgQXBpR2F0ZXdheVByb3h5UmVzdWx0Rm9yPEUgZXh0ZW5kcyBBcGlHYXRld2F5UHJveHlFdmVudEFueT4gPVxuICBFIGV4dGVuZHMgQVBJR2F0ZXdheVByb3h5RXZlbnRWMiA/IEFQSUdhdGV3YXlQcm94eVN0cnVjdHVyZWRSZXN1bHRWMiA6IEFQSUdhdGV3YXlQcm94eVJlc3VsdDtcblxuLyoqXG4gKiBMYW1iZGEgRnVuY3Rpb24gVVJMcyBhbmQgSFRUUCBBUElzIChwYXlsb2FkIGZvcm1hdCAyLjApIHVzZSBgcmF3UGF0aGAuXG4gKiBSRVNUIEFQSSAvIENsb3VkRnJvbnQgcHJveHkgaW50ZWdyYXRpb25zIHVzZSBgcGF0aGAuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBpc0FwaUdhdGV3YXlFdmVudFYyKGV2ZW50OiBBcGlHYXRld2F5UHJveHlFdmVudEFueSk6IGV2ZW50IGlzIEFQSUdhdGV3YXlQcm94eUV2ZW50VjIge1xuICByZXR1cm4gdHlwZW9mIChldmVudCBhcyBBUElHYXRld2F5UHJveHlFdmVudFYyKS5yYXdQYXRoID09PSAnc3RyaW5nJztcbn1cbiJdfQ==
|
package/dist/handler.d.ts
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
|
|
1
|
+
import { APIGatewayProxyEvent, APIGatewayProxyEventV2, APIGatewayProxyResult, APIGatewayProxyStructuredResultV2, Context } from 'aws-lambda';
|
|
2
2
|
import { Request, Response, Handler, Routes } from './types';
|
|
3
|
+
type ErrorHandler = (request: Request, e: Error) => Promise<Response | undefined>;
|
|
3
4
|
/**
|
|
4
5
|
* API route handler
|
|
5
6
|
*/
|
|
6
|
-
export declare function apiHandler(event:
|
|
7
|
+
export declare function apiHandler(event: APIGatewayProxyEventV2, context: Context, routes: Routes, errorHandler?: ErrorHandler, catchAll?: Handler): Promise<APIGatewayProxyStructuredResultV2>;
|
|
8
|
+
export declare function apiHandler(event: APIGatewayProxyEvent, context: Context, routes: Routes, errorHandler?: ErrorHandler, catchAll?: Handler): Promise<APIGatewayProxyResult>;
|
|
9
|
+
export {};
|
package/dist/handler.js
CHANGED
|
@@ -5,10 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.apiHandler = apiHandler;
|
|
7
7
|
const types_1 = require("./types");
|
|
8
|
+
const event_1 = require("./event");
|
|
8
9
|
const helpers_1 = require("./helpers");
|
|
10
|
+
const result_1 = require("./result");
|
|
9
11
|
const v4_1 = __importDefault(require("zod/v4"));
|
|
10
12
|
function apiErrorResponse(e) {
|
|
11
|
-
// Intentional API error response
|
|
12
13
|
if (e instanceof types_1.ApiError) {
|
|
13
14
|
return {
|
|
14
15
|
headers: e.headers,
|
|
@@ -16,7 +17,6 @@ function apiErrorResponse(e) {
|
|
|
16
17
|
body: e.body,
|
|
17
18
|
};
|
|
18
19
|
}
|
|
19
|
-
// Unhandled error
|
|
20
20
|
if (e)
|
|
21
21
|
console.error(e);
|
|
22
22
|
return {
|
|
@@ -24,10 +24,7 @@ function apiErrorResponse(e) {
|
|
|
24
24
|
body: 'Internal server error',
|
|
25
25
|
};
|
|
26
26
|
}
|
|
27
|
-
|
|
28
|
-
* API route handler
|
|
29
|
-
*/
|
|
30
|
-
async function apiHandler(event, context, routes, errorHandler = undefined, catchAll = undefined) {
|
|
27
|
+
async function handleRequest(event, routes, errorHandler, catchAll) {
|
|
31
28
|
const request = (0, helpers_1.parseRequest)(event);
|
|
32
29
|
let response;
|
|
33
30
|
try {
|
|
@@ -38,7 +35,6 @@ async function apiHandler(event, context, routes, errorHandler = undefined, catc
|
|
|
38
35
|
const route = match.methods[request.method];
|
|
39
36
|
if (!route)
|
|
40
37
|
throw new types_1.ApiError(405, 'Method not allowed');
|
|
41
|
-
// Verify request body
|
|
42
38
|
if (route.request?.body) {
|
|
43
39
|
const parsed = route.request.body.safeParse(request.body);
|
|
44
40
|
if (!parsed.success) {
|
|
@@ -47,19 +43,17 @@ async function apiHandler(event, context, routes, errorHandler = undefined, catc
|
|
|
47
43
|
request.body = parsed.data;
|
|
48
44
|
}
|
|
49
45
|
response = await route.handler(request);
|
|
50
|
-
// Verify response body
|
|
51
46
|
if (route.response?.body) {
|
|
52
47
|
const parsed = route.response.body.safeParse(response.body);
|
|
53
48
|
if (!parsed.success) {
|
|
54
49
|
console.error('Invalid response body:', request.method, request.path, JSON.stringify(v4_1.default.treeifyError(parsed.error), null, 2));
|
|
55
|
-
response = undefined;
|
|
50
|
+
response = undefined;
|
|
56
51
|
throw new types_1.ApiError(500, 'Internal server error');
|
|
57
52
|
}
|
|
58
53
|
response.body = parsed.data;
|
|
59
54
|
}
|
|
60
55
|
}
|
|
61
56
|
else if (catchAll) {
|
|
62
|
-
// Catch-all / 404
|
|
63
57
|
response = await catchAll.handler(request);
|
|
64
58
|
}
|
|
65
59
|
else {
|
|
@@ -69,44 +63,20 @@ async function apiHandler(event, context, routes, errorHandler = undefined, catc
|
|
|
69
63
|
catch (e) {
|
|
70
64
|
if (errorHandler) {
|
|
71
65
|
try {
|
|
72
|
-
// errorHandler can optionally return undefined to request standard error handling:
|
|
73
66
|
response = await errorHandler(request, e);
|
|
74
67
|
}
|
|
75
68
|
catch (ee) {
|
|
76
69
|
response = apiErrorResponse(ee);
|
|
77
70
|
}
|
|
78
71
|
}
|
|
79
|
-
// Standard error handling
|
|
80
72
|
response = response ?? apiErrorResponse(e);
|
|
81
73
|
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
(0, helpers_1.setHeader)('Content-Type', 'text/plain', headers);
|
|
90
|
-
body = response.body;
|
|
91
|
-
}
|
|
92
|
-
else if (response.body) {
|
|
93
|
-
// Stringify the response object
|
|
94
|
-
// API Gateway returns application/json by default
|
|
95
|
-
body = JSON.stringify(response.body);
|
|
96
|
-
}
|
|
97
|
-
// Prepare response
|
|
98
|
-
const result = {
|
|
99
|
-
statusCode: response.statusCode ?? 200,
|
|
100
|
-
headers,
|
|
101
|
-
body: body || '',
|
|
102
|
-
};
|
|
103
|
-
// Add cookie headers
|
|
104
|
-
const cookieHeaders = (0, helpers_1.buildCookie)(response);
|
|
105
|
-
if (cookieHeaders) {
|
|
106
|
-
result.multiValueHeaders = {
|
|
107
|
-
'Set-Cookie': cookieHeaders,
|
|
108
|
-
};
|
|
109
|
-
}
|
|
110
|
-
return result;
|
|
74
|
+
return response;
|
|
75
|
+
}
|
|
76
|
+
async function apiHandler(event, context, routes, errorHandler, catchAll) {
|
|
77
|
+
const response = await handleRequest(event, routes, errorHandler, catchAll);
|
|
78
|
+
return (0, event_1.isApiGatewayEventV2)(event)
|
|
79
|
+
? (0, result_1.toApiGatewayResultV2)(response)
|
|
80
|
+
: (0, result_1.toApiGatewayResultV1)(response);
|
|
111
81
|
}
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  APIGatewayProxyEvent,\n  APIGatewayProxyEventV2,\n  APIGatewayProxyResult,\n  APIGatewayProxyStructuredResultV2,\n  Context,\n} from 'aws-lambda';\nimport {\n  Request, Response, Handler, Route, Routes,\n  ApiError,\n} from './types';\nimport { ApiGatewayProxyEventAny, isApiGatewayEventV2 } from './event';\nimport { matchRoute, parseRequest } from './helpers';\nimport { toApiGatewayResultV1, toApiGatewayResultV2 } from './result';\nimport z from 'zod/v4';\n\ntype ErrorHandler = (request: Request, e: Error) => Promise<Response | undefined>;\n\nfunction apiErrorResponse(e?: unknown): Response {\n  if (e instanceof ApiError) {\n    return {\n      headers: e.headers,\n      statusCode: e.statusCode,\n      body: e.body,\n    };\n  }\n\n  if (e) console.error(e);\n  return {\n    statusCode: 500,\n    body: 'Internal server error',\n  };\n}\n\nasync function handleRequest(\n  event: ApiGatewayProxyEventAny,\n  routes: Routes,\n  errorHandler: ErrorHandler | undefined,\n  catchAll: Handler | undefined,\n): Promise<Response> {\n  const request = parseRequest(event);\n\n  let response: Response | undefined;\n  try {\n    const match = matchRoute(routes, request.path);\n    if (match.params) request.pathParameters = match.params;\n\n    if (match.methods) {\n      const route = match.methods[request.method as keyof Route];\n      if (!route) throw new ApiError(405, 'Method not allowed');\n\n      if (route.request?.body) {\n        const parsed = route.request.body.safeParse(request.body);\n        if (!parsed.success) {\n          throw new ApiError(400, z.treeifyError(parsed.error));\n        }\n        request.body = parsed.data;\n      }\n\n      response = await route.handler(request);\n\n      if (route.response?.body) {\n        const parsed = route.response.body.safeParse(response.body);\n        if (!parsed.success) {\n          console.error('Invalid response body:', request.method, request.path, JSON.stringify(z.treeifyError(parsed.error), null, 2));\n          response = undefined;\n          throw new ApiError(500, 'Internal server error');\n        }\n        response.body = parsed.data;\n      }\n    } else if (catchAll) {\n      response = await catchAll.handler(request);\n    } else {\n      throw new ApiError(404, 'Not found');\n    }\n  } catch (e) {\n    if (errorHandler) {\n      try {\n        response = await errorHandler(request, e as Error);\n      } catch (ee) {\n        response = apiErrorResponse(ee);\n      }\n    }\n\n    response = response ?? apiErrorResponse(e);\n  }\n\n  return response;\n}\n\n/**\n * API route handler\n */\nexport async function apiHandler(\n  event: APIGatewayProxyEventV2,\n  context: Context,\n  routes: Routes,\n  errorHandler?: ErrorHandler,\n  catchAll?: Handler,\n): Promise<APIGatewayProxyStructuredResultV2>;\nexport async function apiHandler(\n  event: APIGatewayProxyEvent,\n  context: Context,\n  routes: Routes,\n  errorHandler?: ErrorHandler,\n  catchAll?: Handler,\n): Promise<APIGatewayProxyResult>;\nexport async function apiHandler(\n  event: ApiGatewayProxyEventAny,\n  context: Context,\n  routes: Routes,\n  errorHandler?: ErrorHandler,\n  catchAll?: Handler,\n): Promise<APIGatewayProxyResult | APIGatewayProxyStructuredResultV2> {\n  const response = await handleRequest(event, routes, errorHandler, catchAll);\n  return isApiGatewayEventV2(event)\n    ? toApiGatewayResultV2(response)\n    : toApiGatewayResultV1(response);\n}\n"]}
|
package/dist/helpers.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ApiGatewayProxyEventAny } from './event';
|
|
2
2
|
import { Request, Response, Route, Routes } from './types';
|
|
3
|
+
export { ApiGatewayProxyEventAny, ApiGatewayProxyResultFor, isApiGatewayEventV2 } from './event';
|
|
3
4
|
/**
|
|
4
5
|
* Ensures the path always has a leading slash and never a trailing slash
|
|
5
6
|
* @param path APIGatewayProxyEvent.path
|
|
@@ -51,7 +52,10 @@ export declare function getHeader(name: string, headers: {
|
|
|
51
52
|
export declare function setHeader(name: string, value: string, headers: {
|
|
52
53
|
[key: string]: string | undefined;
|
|
53
54
|
} | undefined): void;
|
|
54
|
-
|
|
55
|
+
/**
|
|
56
|
+
* Parses a REST API (v1) or HTTP API / Function URL (v2) proxy event into a Request.
|
|
57
|
+
*/
|
|
58
|
+
export declare function parseRequest(event: ApiGatewayProxyEventAny): Request;
|
|
55
59
|
export declare function matchRoute(routes: Routes, path: string): {
|
|
56
60
|
methods: Route | undefined;
|
|
57
61
|
params?: {
|
package/dist/helpers.js
CHANGED
|
@@ -1,38 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isApiGatewayEventV2 = void 0;
|
|
36
4
|
exports.standardPath = standardPath;
|
|
37
5
|
exports.standardQueryParameters = standardQueryParameters;
|
|
38
6
|
exports.standardHeaders = standardHeaders;
|
|
@@ -43,7 +11,10 @@ exports.getHeader = getHeader;
|
|
|
43
11
|
exports.setHeader = setHeader;
|
|
44
12
|
exports.parseRequest = parseRequest;
|
|
45
13
|
exports.matchRoute = matchRoute;
|
|
46
|
-
const
|
|
14
|
+
const cookie_1 = require("cookie");
|
|
15
|
+
const event_1 = require("./event");
|
|
16
|
+
var event_2 = require("./event");
|
|
17
|
+
Object.defineProperty(exports, "isApiGatewayEventV2", { enumerable: true, get: function () { return event_2.isApiGatewayEventV2; } });
|
|
47
18
|
/**
|
|
48
19
|
* Ensures the path always has a leading slash and never a trailing slash
|
|
49
20
|
* @param path APIGatewayProxyEvent.path
|
|
@@ -110,7 +81,7 @@ function parseBody(body, isBase64Encoded, contentType = 'application/json') {
|
|
|
110
81
|
*/
|
|
111
82
|
function parseCookie(headers) {
|
|
112
83
|
const header = getHeader('Cookie', headers);
|
|
113
|
-
const values = header ?
|
|
84
|
+
const values = header ? (0, cookie_1.parseCookie)(header) : {};
|
|
114
85
|
// Ensure we don't return any undefined values
|
|
115
86
|
const result = {};
|
|
116
87
|
for (const [name, value] of Object.entries(values)) {
|
|
@@ -131,14 +102,14 @@ function buildCookie(response, maxAge = 60 * 60 * 24 * 365, expires = undefined,
|
|
|
131
102
|
const value = cookies[key];
|
|
132
103
|
if (value === '') {
|
|
133
104
|
// If explicitly unset, expire the cookie value
|
|
134
|
-
header.push(
|
|
135
|
-
expires: new Date(), secure, httpOnly, sameSite,
|
|
105
|
+
header.push((0, cookie_1.stringifySetCookie)({
|
|
106
|
+
name: key, value: '', expires: new Date(), secure, httpOnly, sameSite,
|
|
136
107
|
}));
|
|
137
108
|
}
|
|
138
109
|
else if (value) {
|
|
139
110
|
// Otherwise, set it only if a value was given
|
|
140
|
-
header.push(
|
|
141
|
-
maxAge, expires, secure, httpOnly, sameSite,
|
|
111
|
+
header.push((0, cookie_1.stringifySetCookie)({
|
|
112
|
+
name: key, value, maxAge, expires, secure, httpOnly, sameSite,
|
|
142
113
|
}));
|
|
143
114
|
}
|
|
144
115
|
});
|
|
@@ -176,7 +147,32 @@ function setHeader(name, value, headers) {
|
|
|
176
147
|
if (!set)
|
|
177
148
|
headers[name] = value;
|
|
178
149
|
}
|
|
179
|
-
function
|
|
150
|
+
function parseCookiesArray(cookies) {
|
|
151
|
+
if (!cookies)
|
|
152
|
+
return {};
|
|
153
|
+
const result = {};
|
|
154
|
+
cookies.forEach((entry) => {
|
|
155
|
+
const separator = entry.indexOf('=');
|
|
156
|
+
if (separator === -1)
|
|
157
|
+
return;
|
|
158
|
+
const name = entry.slice(0, separator);
|
|
159
|
+
const value = entry.slice(separator + 1);
|
|
160
|
+
if (name)
|
|
161
|
+
result[name] = value;
|
|
162
|
+
});
|
|
163
|
+
return result;
|
|
164
|
+
}
|
|
165
|
+
function standardPathParameters(params) {
|
|
166
|
+
if (!params)
|
|
167
|
+
return {};
|
|
168
|
+
const result = {};
|
|
169
|
+
Object.entries(params).forEach(([key, value]) => {
|
|
170
|
+
if (value)
|
|
171
|
+
result[key] = value;
|
|
172
|
+
});
|
|
173
|
+
return result;
|
|
174
|
+
}
|
|
175
|
+
function parseRequestV1(event) {
|
|
180
176
|
return {
|
|
181
177
|
method: event.httpMethod,
|
|
182
178
|
path: standardPath(event.path),
|
|
@@ -184,9 +180,36 @@ function parseRequest(event) {
|
|
|
184
180
|
headers: standardHeaders(event.headers),
|
|
185
181
|
body: parseBody(event.body, event.isBase64Encoded, getHeader('Content-Type', event.headers)),
|
|
186
182
|
cookies: parseCookie(event.headers),
|
|
187
|
-
pathParameters: {},
|
|
188
|
-
context: { event },
|
|
183
|
+
pathParameters: {},
|
|
184
|
+
context: { event },
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
function parseRequestV2(event) {
|
|
188
|
+
const headers = standardHeaders(event.headers);
|
|
189
|
+
const cookies = {
|
|
190
|
+
...parseCookie(event.headers),
|
|
191
|
+
...parseCookiesArray(event.cookies),
|
|
189
192
|
};
|
|
193
|
+
const query = event.queryStringParameters
|
|
194
|
+
?? (event.rawQueryString ? Object.fromEntries(new URLSearchParams(event.rawQueryString)) : null);
|
|
195
|
+
return {
|
|
196
|
+
method: event.requestContext.http.method,
|
|
197
|
+
path: standardPath(event.rawPath),
|
|
198
|
+
query: standardQueryParameters(query),
|
|
199
|
+
headers,
|
|
200
|
+
body: parseBody(event.body ?? null, event.isBase64Encoded, getHeader('content-type', headers)),
|
|
201
|
+
cookies,
|
|
202
|
+
pathParameters: standardPathParameters(event.pathParameters),
|
|
203
|
+
context: { event },
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
/**
|
|
207
|
+
* Parses a REST API (v1) or HTTP API / Function URL (v2) proxy event into a Request.
|
|
208
|
+
*/
|
|
209
|
+
function parseRequest(event) {
|
|
210
|
+
if ((0, event_1.isApiGatewayEventV2)(event))
|
|
211
|
+
return parseRequestV2(event);
|
|
212
|
+
return parseRequestV1(event);
|
|
190
213
|
}
|
|
191
214
|
function matchRoute(routes, path) {
|
|
192
215
|
// Direct match
|
|
@@ -226,4 +249,4 @@ function matchRoute(routes, path) {
|
|
|
226
249
|
}
|
|
227
250
|
return { methods: undefined };
|
|
228
251
|
}
|
|
229
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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","sourcesContent":["import { APIGatewayProxyEvent } from 'aws-lambda';\nimport * as cookie from 'cookie';\nimport { Request, Response, Route, Routes } from './types';\n\n/**\n * Ensures the path always has a leading slash and never a trailing slash\n * @param path APIGatewayProxyEvent.path\n */\nexport function standardPath(path: string): string {\n  // Get path segments, filtering out any blanks\n  const segments = path.split('/').filter((segment) => segment);\n  // Return path\n  return `/${segments.join('/')}`;\n}\n\n/**\n * Ensures a non-null object containing only query-string parameters that have a value.\n * @param query APIGatewayProxyEvent.query\n */\nexport function standardQueryParameters(query: { [name: string]: string | undefined; } | null): { [name: string]: string; } {\n  if (!query) return {};\n  const result: { [name: string]: string; } = {};\n  Object.keys(query).forEach((parameter) => {\n    const value = query[parameter];\n    if (value) result[parameter] = value;\n  });\n  return result;\n}\n\n/**\n * Ensures all headers have a value.\n * @param headers APIGatewayProxyEvent.headers\n */\nexport function standardHeaders(headers: { [name: string]: string | undefined; }): { [name: string]: string; } {\n  const result: { [name: string]: string; } = {};\n  for (const [name, value] of Object.entries(headers || {})) {\n    result[name] = value ?? '';\n  }\n  return result;\n}\n\n/**\n * Parses the body (if present) from application/x-www-form-urlencoded or JSON string.\n * If the body fails to parse as JSOn, the raw body is returned.\n * @param body APIGatewayProxyEvent.body\n */\nexport function parseBody(body: string | null, isBase64Encoded: boolean, contentType: string = 'application/json'): Record<string, unknown> | string {\n  if (!body) return {};\n\n  const content = isBase64Encoded ? Buffer.from(body, 'base64').toString('utf8') : body;\n\n  try {\n    if ((contentType || '').toLowerCase() === 'application/x-www-form-urlencoded') {\n      return Object.fromEntries(new URLSearchParams(content));\n    } else {\n      // Default to parsing as JSON:\n      return JSON.parse(content);\n    }\n  } catch (e) {\n    console.error(`Error parsing request body: ${e}`);\n  }\n\n  // Fallback to returning the raw body\n  return content;\n}\n\n/**\n * Parses the cookie, if any, returning at minimum an empty object.\n * @param headers APIGatewayProxyEvent.headers\n */\nexport function parseCookie(headers: { [name: string]: string | undefined; }): { [name: string]: string; } {\n  const header = getHeader('Cookie', headers);\n  const values = header ? cookie.parse(header) : {};\n\n  // Ensure we don't return any undefined values\n  const result: { [name: string]: string; } = {};\n  for (const [name, value] of Object.entries(values)) {\n    if (value) result[name] = value;\n  }\n  return result;\n}\n\nexport function buildCookie(\n  response: Response,\n  maxAge: number | undefined = 60 * 60 * 24 * 365,\n  expires: Date | undefined = undefined,\n  secure: boolean = true,\n  httpOnly: boolean = true,\n  sameSite: 'strict' | 'lax' | 'none' = 'lax',\n): string[] | undefined {\n  if (!response.cookies) return undefined;\n\n  const cookies: { [key: string]: string; } = {};\n  for (const [key, value] of Object.entries(response.cookies)) {\n    cookies[key] = value;\n  }\n\n  const header: string[] = [];\n\n  Object.keys(cookies).forEach((key) => {\n    const value = cookies[key];\n    if (value === '') {\n      // If explicitly unset, expire the cookie value\n      header.push(cookie.serialize(key, '', {\n        expires: new Date(), secure, httpOnly, sameSite,\n      }));\n    } else if (value) {\n      // Otherwise, set it only if a value was given\n      header.push(cookie.serialize(key, value, {\n        maxAge, expires, secure, httpOnly, sameSite,\n      }));\n    }\n  });\n\n  return header;\n}\n\n/**\n * Case-insensitive header lookup\n */\nexport function getHeader(name: string, headers: { [key: string]: string | undefined; } | undefined): string | undefined {\n  if (!headers) return undefined;\n\n  // Exact match\n  if (headers[name]) return headers[name];\n\n  // Case-insensitive match\n  const lowercased: { [key: string]: string | undefined; } = {};\n  for (const [key, value] of Object.entries(headers)) {\n    lowercased[key.toLowerCase()] = value;\n  }\n  return lowercased[name.toLowerCase()];\n}\n\n/**\n * Case-insensitive header setting\n */\nexport function setHeader(name: string, value: string, headers: { [key: string]: string | undefined; } | undefined): void {\n  if (!headers) return;\n  let set = false;\n  for (const key of Object.keys(headers)) {\n    if (name.toLowerCase() === key.toLowerCase()) {\n      headers[key] = value;\n      set = true;\n    }\n  }\n  if (!set) headers[name] = value;\n}\n\nexport function parseRequest(event: APIGatewayProxyEvent): Request {\n  return {\n    method: event.httpMethod,\n    path: standardPath(event.path),\n    query: standardQueryParameters(event.queryStringParameters),\n    headers: standardHeaders(event.headers),\n    body: parseBody(event.body, event.isBase64Encoded, getHeader('Content-Type', event.headers)),\n    cookies: parseCookie(event.headers),\n    pathParameters: {}, // These need to be parsed as part of route matching\n    context: { event }, // You can add any custom values you need to the request via this context\n  };\n}\n\nexport function matchRoute(routes: Routes, path: string): { methods: Route | undefined, params?: { [name: string]: string; }; } {\n  // Direct match\n  if (routes[path]) return { methods: routes[path], params: {} };\n\n  // List paths to check\n  const paths = Object.keys(routes);\n\n  // Case-insensitive match\n  for (const candidate of paths) {\n    if (candidate.toLowerCase() === path.toLowerCase()) return { methods: routes[candidate], params: {} };\n  }\n\n  // Path-parameter matching\n  const pathSegments = path.split('/');\n\n  for (const candidate of paths) {\n    const candidateSegments = candidate.split('/');\n\n    // First check: length match\n    if (pathSegments.length !== candidateSegments.length) continue;\n\n    const params: { [name: string]: string; } = {};\n    for (let s = 0; s < pathSegments.length; s++) {\n      const pathSegment = pathSegments[s];\n      const candidateSegment = candidateSegments[s];\n      if (candidateSegment.startsWith('{') && candidateSegment.endsWith('}')) {\n        // Path parameter\n        const name = candidateSegment.slice(1, -1);\n        params[name] = pathSegment;\n      } else if (pathSegment.toLowerCase() !== candidateSegment.toLowerCase()) {\n        break;\n      }\n\n      if (s === pathSegments.length - 1) {\n        // Matched all segments\n        return { methods: routes[candidate], params };\n      }\n    }\n  }\n\n  return { methods: undefined };\n}\n"]}
|
|
252
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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","sourcesContent":["import { APIGatewayProxyEvent, APIGatewayProxyEventV2 } from 'aws-lambda';\nimport { parseCookie as parseCookieHeader, stringifySetCookie } from 'cookie';\nimport { ApiGatewayProxyEventAny, isApiGatewayEventV2 } from './event';\nimport { Request, Response, Route, Routes } from './types';\n\nexport { ApiGatewayProxyEventAny, ApiGatewayProxyResultFor, isApiGatewayEventV2 } from './event';\n\n/**\n * Ensures the path always has a leading slash and never a trailing slash\n * @param path APIGatewayProxyEvent.path\n */\nexport function standardPath(path: string): string {\n  // Get path segments, filtering out any blanks\n  const segments = path.split('/').filter((segment) => segment);\n  // Return path\n  return `/${segments.join('/')}`;\n}\n\n/**\n * Ensures a non-null object containing only query-string parameters that have a value.\n * @param query APIGatewayProxyEvent.query\n */\nexport function standardQueryParameters(query: { [name: string]: string | undefined; } | null): { [name: string]: string; } {\n  if (!query) return {};\n  const result: { [name: string]: string; } = {};\n  Object.keys(query).forEach((parameter) => {\n    const value = query[parameter];\n    if (value) result[parameter] = value;\n  });\n  return result;\n}\n\n/**\n * Ensures all headers have a value.\n * @param headers APIGatewayProxyEvent.headers\n */\nexport function standardHeaders(headers: { [name: string]: string | undefined; }): { [name: string]: string; } {\n  const result: { [name: string]: string; } = {};\n  for (const [name, value] of Object.entries(headers || {})) {\n    result[name] = value ?? '';\n  }\n  return result;\n}\n\n/**\n * Parses the body (if present) from application/x-www-form-urlencoded or JSON string.\n * If the body fails to parse as JSOn, the raw body is returned.\n * @param body APIGatewayProxyEvent.body\n */\nexport function parseBody(body: string | null, isBase64Encoded: boolean, contentType: string = 'application/json'): Record<string, unknown> | string {\n  if (!body) return {};\n\n  const content = isBase64Encoded ? Buffer.from(body, 'base64').toString('utf8') : body;\n\n  try {\n    if ((contentType || '').toLowerCase() === 'application/x-www-form-urlencoded') {\n      return Object.fromEntries(new URLSearchParams(content));\n    } else {\n      // Default to parsing as JSON:\n      return JSON.parse(content);\n    }\n  } catch (e) {\n    console.error(`Error parsing request body: ${e}`);\n  }\n\n  // Fallback to returning the raw body\n  return content;\n}\n\n/**\n * Parses the cookie, if any, returning at minimum an empty object.\n * @param headers APIGatewayProxyEvent.headers\n */\nexport function parseCookie(headers: { [name: string]: string | undefined; }): { [name: string]: string; } {\n  const header = getHeader('Cookie', headers);\n  const values = header ? parseCookieHeader(header) : {};\n\n  // Ensure we don't return any undefined values\n  const result: { [name: string]: string; } = {};\n  for (const [name, value] of Object.entries(values)) {\n    if (value) result[name] = value;\n  }\n  return result;\n}\n\nexport function buildCookie(\n  response: Response,\n  maxAge: number | undefined = 60 * 60 * 24 * 365,\n  expires: Date | undefined = undefined,\n  secure: boolean = true,\n  httpOnly: boolean = true,\n  sameSite: 'strict' | 'lax' | 'none' = 'lax',\n): string[] | undefined {\n  if (!response.cookies) return undefined;\n\n  const cookies: { [key: string]: string; } = {};\n  for (const [key, value] of Object.entries(response.cookies)) {\n    cookies[key] = value;\n  }\n\n  const header: string[] = [];\n\n  Object.keys(cookies).forEach((key) => {\n    const value = cookies[key];\n    if (value === '') {\n      // If explicitly unset, expire the cookie value\n      header.push(stringifySetCookie({\n        name: key, value: '', expires: new Date(), secure, httpOnly, sameSite,\n      }));\n    } else if (value) {\n      // Otherwise, set it only if a value was given\n      header.push(stringifySetCookie({\n        name: key, value, maxAge, expires, secure, httpOnly, sameSite,\n      }));\n    }\n  });\n\n  return header;\n}\n\n/**\n * Case-insensitive header lookup\n */\nexport function getHeader(name: string, headers: { [key: string]: string | undefined; } | undefined): string | undefined {\n  if (!headers) return undefined;\n\n  // Exact match\n  if (headers[name]) return headers[name];\n\n  // Case-insensitive match\n  const lowercased: { [key: string]: string | undefined; } = {};\n  for (const [key, value] of Object.entries(headers)) {\n    lowercased[key.toLowerCase()] = value;\n  }\n  return lowercased[name.toLowerCase()];\n}\n\n/**\n * Case-insensitive header setting\n */\nexport function setHeader(name: string, value: string, headers: { [key: string]: string | undefined; } | undefined): void {\n  if (!headers) return;\n  let set = false;\n  for (const key of Object.keys(headers)) {\n    if (name.toLowerCase() === key.toLowerCase()) {\n      headers[key] = value;\n      set = true;\n    }\n  }\n  if (!set) headers[name] = value;\n}\n\nfunction parseCookiesArray(cookies: string[] | undefined): Record<string, string> {\n  if (!cookies) return {};\n  const result: Record<string, string> = {};\n  cookies.forEach((entry) => {\n    const separator = entry.indexOf('=');\n    if (separator === -1) return;\n    const name = entry.slice(0, separator);\n    const value = entry.slice(separator + 1);\n    if (name) result[name] = value;\n  });\n  return result;\n}\n\nfunction standardPathParameters(params: Record<string, string | undefined> | undefined): Record<string, string> {\n  if (!params) return {};\n  const result: Record<string, string> = {};\n  Object.entries(params).forEach(([key, value]) => {\n    if (value) result[key] = value;\n  });\n  return result;\n}\n\nfunction parseRequestV1(event: APIGatewayProxyEvent): Request {\n  return {\n    method: event.httpMethod,\n    path: standardPath(event.path),\n    query: standardQueryParameters(event.queryStringParameters),\n    headers: standardHeaders(event.headers),\n    body: parseBody(event.body, event.isBase64Encoded, getHeader('Content-Type', event.headers)),\n    cookies: parseCookie(event.headers),\n    pathParameters: {},\n    context: { event },\n  };\n}\n\nfunction parseRequestV2(event: APIGatewayProxyEventV2): Request {\n  const headers = standardHeaders(event.headers);\n  const cookies = {\n    ...parseCookie(event.headers),\n    ...parseCookiesArray(event.cookies),\n  };\n  const query = event.queryStringParameters\n    ?? (event.rawQueryString ? Object.fromEntries(new URLSearchParams(event.rawQueryString)) : null);\n\n  return {\n    method: event.requestContext.http.method,\n    path: standardPath(event.rawPath),\n    query: standardQueryParameters(query),\n    headers,\n    body: parseBody(event.body ?? null, event.isBase64Encoded, getHeader('content-type', headers)),\n    cookies,\n    pathParameters: standardPathParameters(event.pathParameters),\n    context: { event },\n  };\n}\n\n/**\n * Parses a REST API (v1) or HTTP API / Function URL (v2) proxy event into a Request.\n */\nexport function parseRequest(event: ApiGatewayProxyEventAny): Request {\n  if (isApiGatewayEventV2(event)) return parseRequestV2(event);\n  return parseRequestV1(event);\n}\n\nexport function matchRoute(routes: Routes, path: string): { methods: Route | undefined, params?: { [name: string]: string; }; } {\n  // Direct match\n  if (routes[path]) return { methods: routes[path], params: {} };\n\n  // List paths to check\n  const paths = Object.keys(routes);\n\n  // Case-insensitive match\n  for (const candidate of paths) {\n    if (candidate.toLowerCase() === path.toLowerCase()) return { methods: routes[candidate], params: {} };\n  }\n\n  // Path-parameter matching\n  const pathSegments = path.split('/');\n\n  for (const candidate of paths) {\n    const candidateSegments = candidate.split('/');\n\n    // First check: length match\n    if (pathSegments.length !== candidateSegments.length) continue;\n\n    const params: { [name: string]: string; } = {};\n    for (let s = 0; s < pathSegments.length; s++) {\n      const pathSegment = pathSegments[s];\n      const candidateSegment = candidateSegments[s];\n      if (candidateSegment.startsWith('{') && candidateSegment.endsWith('}')) {\n        // Path parameter\n        const name = candidateSegment.slice(1, -1);\n        params[name] = pathSegment;\n      } else if (pathSegment.toLowerCase() !== candidateSegment.toLowerCase()) {\n        break;\n      }\n\n      if (s === pathSegments.length - 1) {\n        // Matched all segments\n        return { methods: routes[candidate], params };\n      }\n    }\n  }\n\n  return { methods: undefined };\n}\n"]}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -36,8 +36,10 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
36
36
|
};
|
|
37
37
|
})();
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.types = exports.helpers = void 0;
|
|
39
|
+
exports.types = exports.helpers = exports.isApiGatewayEventV2 = void 0;
|
|
40
40
|
__exportStar(require("./handler"), exports);
|
|
41
|
+
var event_1 = require("./event");
|
|
42
|
+
Object.defineProperty(exports, "isApiGatewayEventV2", { enumerable: true, get: function () { return event_1.isApiGatewayEventV2; } });
|
|
41
43
|
exports.helpers = __importStar(require("./helpers"));
|
|
42
44
|
exports.types = __importStar(require("./types"));
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNENBQTBCO0FBQzFCLGlDQUFpRztBQUFyQyw0R0FBQSxtQkFBbUIsT0FBQTtBQUMvRSxxREFBcUM7QUFDckMsaURBQWlDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSAnLi9oYW5kbGVyJztcbmV4cG9ydCB7IEFwaUdhdGV3YXlQcm94eUV2ZW50QW55LCBBcGlHYXRld2F5UHJveHlSZXN1bHRGb3IsIGlzQXBpR2F0ZXdheUV2ZW50VjIgfSBmcm9tICcuL2V2ZW50JztcbmV4cG9ydCAqIGFzIGhlbHBlcnMgZnJvbSAnLi9oZWxwZXJzJztcbmV4cG9ydCAqIGFzIHR5cGVzIGZyb20gJy4vdHlwZXMnO1xuIl19
|
package/dist/result.d.ts
ADDED
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { APIGatewayProxyResult, APIGatewayProxyStructuredResultV2 } from 'aws-lambda';
|
|
2
|
+
import { Response } from './types';
|
|
3
|
+
export declare function toApiGatewayResultV1(response: Response): APIGatewayProxyResult;
|
|
4
|
+
export declare function toApiGatewayResultV2(response: Response): APIGatewayProxyStructuredResultV2;
|
package/dist/result.js
ADDED
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.toApiGatewayResultV1 = toApiGatewayResultV1;
|
|
4
|
+
exports.toApiGatewayResultV2 = toApiGatewayResultV2;
|
|
5
|
+
const helpers_1 = require("./helpers");
|
|
6
|
+
function prepareResponseBody(response) {
|
|
7
|
+
const headers = { ...(response.headers || {}) };
|
|
8
|
+
let body = '';
|
|
9
|
+
if (typeof response.body === 'string') {
|
|
10
|
+
if (!(0, helpers_1.getHeader)('Content-Type', headers))
|
|
11
|
+
(0, helpers_1.setHeader)('Content-Type', 'text/plain', headers);
|
|
12
|
+
body = response.body;
|
|
13
|
+
}
|
|
14
|
+
else if (response.body) {
|
|
15
|
+
body = JSON.stringify(response.body);
|
|
16
|
+
}
|
|
17
|
+
return { headers, body };
|
|
18
|
+
}
|
|
19
|
+
function toApiGatewayResultV1(response) {
|
|
20
|
+
const { headers, body } = prepareResponseBody(response);
|
|
21
|
+
const result = {
|
|
22
|
+
statusCode: response.statusCode ?? 200,
|
|
23
|
+
headers,
|
|
24
|
+
body,
|
|
25
|
+
};
|
|
26
|
+
const cookieHeaders = (0, helpers_1.buildCookie)(response);
|
|
27
|
+
if (cookieHeaders) {
|
|
28
|
+
result.multiValueHeaders = { 'Set-Cookie': cookieHeaders };
|
|
29
|
+
}
|
|
30
|
+
return result;
|
|
31
|
+
}
|
|
32
|
+
function toApiGatewayResultV2(response) {
|
|
33
|
+
const { headers, body } = prepareResponseBody(response);
|
|
34
|
+
const result = {
|
|
35
|
+
statusCode: response.statusCode ?? 200,
|
|
36
|
+
headers,
|
|
37
|
+
body,
|
|
38
|
+
};
|
|
39
|
+
const cookieHeaders = (0, helpers_1.buildCookie)(response);
|
|
40
|
+
if (cookieHeaders) {
|
|
41
|
+
result.cookies = cookieHeaders;
|
|
42
|
+
}
|
|
43
|
+
return result;
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Jlc3VsdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQXFCQSxvREFlQztBQUVELG9EQWVDO0FBakRELHVDQUE4RDtBQUc5RCxTQUFTLG1CQUFtQixDQUFDLFFBQWtCO0lBQzdDLE1BQU0sT0FBTyxHQUFHLEVBQUUsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQztJQUNoRCxJQUFJLElBQUksR0FBRyxFQUFFLENBQUM7SUFFZCxJQUFJLE9BQU8sUUFBUSxDQUFDLElBQUksS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUN0QyxJQUFJLENBQUMsSUFBQSxtQkFBUyxFQUFDLGNBQWMsRUFBRSxPQUFPLENBQUM7WUFBRSxJQUFBLG1CQUFTLEVBQUMsY0FBYyxFQUFFLFlBQVksRUFBRSxPQUFPLENBQUMsQ0FBQztRQUMxRixJQUFJLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQztJQUN2QixDQUFDO1NBQU0sSUFBSSxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDekIsSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFFRCxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO0FBQzNCLENBQUM7QUFFRCxTQUFnQixvQkFBb0IsQ0FBQyxRQUFrQjtJQUNyRCxNQUFNLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBRXhELE1BQU0sTUFBTSxHQUEwQjtRQUNwQyxVQUFVLEVBQUUsUUFBUSxDQUFDLFVBQVUsSUFBSSxHQUFHO1FBQ3RDLE9BQU87UUFDUCxJQUFJO0tBQ0wsQ0FBQztJQUVGLE1BQU0sYUFBYSxHQUFHLElBQUEscUJBQVcsRUFBQyxRQUFRLENBQUMsQ0FBQztJQUM1QyxJQUFJLGFBQWEsRUFBRSxDQUFDO1FBQ2xCLE1BQU0sQ0FBQyxpQkFBaUIsR0FBRyxFQUFFLFlBQVksRUFBRSxhQUFhLEVBQUUsQ0FBQztJQUM3RCxDQUFDO0lBRUQsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQUVELFNBQWdCLG9CQUFvQixDQUFDLFFBQWtCO0lBQ3JELE1BQU0sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLEdBQUcsbUJBQW1CLENBQUMsUUFBUSxDQUFDLENBQUM7SUFFeEQsTUFBTSxNQUFNLEdBQXNDO1FBQ2hELFVBQVUsRUFBRSxRQUFRLENBQUMsVUFBVSxJQUFJLEdBQUc7UUFDdEMsT0FBTztRQUNQLElBQUk7S0FDTCxDQUFDO0lBRUYsTUFBTSxhQUFhLEdBQUcsSUFBQSxxQkFBVyxFQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzVDLElBQUksYUFBYSxFQUFFLENBQUM7UUFDbEIsTUFBTSxDQUFDLE9BQU8sR0FBRyxhQUFhLENBQUM7SUFDakMsQ0FBQztJQUVELE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBBUElHYXRld2F5UHJveHlSZXN1bHQsXG4gIEFQSUdhdGV3YXlQcm94eVN0cnVjdHVyZWRSZXN1bHRWMixcbn0gZnJvbSAnYXdzLWxhbWJkYSc7XG5pbXBvcnQgeyBidWlsZENvb2tpZSwgZ2V0SGVhZGVyLCBzZXRIZWFkZXIgfSBmcm9tICcuL2hlbHBlcnMnO1xuaW1wb3J0IHsgUmVzcG9uc2UgfSBmcm9tICcuL3R5cGVzJztcblxuZnVuY3Rpb24gcHJlcGFyZVJlc3BvbnNlQm9keShyZXNwb25zZTogUmVzcG9uc2UpOiB7IGhlYWRlcnM6IFJlY29yZDxzdHJpbmcsIHN0cmluZz47IGJvZHk6IHN0cmluZzsgfSB7XG4gIGNvbnN0IGhlYWRlcnMgPSB7IC4uLihyZXNwb25zZS5oZWFkZXJzIHx8IHt9KSB9O1xuICBsZXQgYm9keSA9ICcnO1xuXG4gIGlmICh0eXBlb2YgcmVzcG9uc2UuYm9keSA9PT0gJ3N0cmluZycpIHtcbiAgICBpZiAoIWdldEhlYWRlcignQ29udGVudC1UeXBlJywgaGVhZGVycykpIHNldEhlYWRlcignQ29udGVudC1UeXBlJywgJ3RleHQvcGxhaW4nLCBoZWFkZXJzKTtcbiAgICBib2R5ID0gcmVzcG9uc2UuYm9keTtcbiAgfSBlbHNlIGlmIChyZXNwb25zZS5ib2R5KSB7XG4gICAgYm9keSA9IEpTT04uc3RyaW5naWZ5KHJlc3BvbnNlLmJvZHkpO1xuICB9XG5cbiAgcmV0dXJuIHsgaGVhZGVycywgYm9keSB9O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdG9BcGlHYXRld2F5UmVzdWx0VjEocmVzcG9uc2U6IFJlc3BvbnNlKTogQVBJR2F0ZXdheVByb3h5UmVzdWx0IHtcbiAgY29uc3QgeyBoZWFkZXJzLCBib2R5IH0gPSBwcmVwYXJlUmVzcG9uc2VCb2R5KHJlc3BvbnNlKTtcblxuICBjb25zdCByZXN1bHQ6IEFQSUdhdGV3YXlQcm94eVJlc3VsdCA9IHtcbiAgICBzdGF0dXNDb2RlOiByZXNwb25zZS5zdGF0dXNDb2RlID8/IDIwMCxcbiAgICBoZWFkZXJzLFxuICAgIGJvZHksXG4gIH07XG5cbiAgY29uc3QgY29va2llSGVhZGVycyA9IGJ1aWxkQ29va2llKHJlc3BvbnNlKTtcbiAgaWYgKGNvb2tpZUhlYWRlcnMpIHtcbiAgICByZXN1bHQubXVsdGlWYWx1ZUhlYWRlcnMgPSB7ICdTZXQtQ29va2llJzogY29va2llSGVhZGVycyB9O1xuICB9XG5cbiAgcmV0dXJuIHJlc3VsdDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRvQXBpR2F0ZXdheVJlc3VsdFYyKHJlc3BvbnNlOiBSZXNwb25zZSk6IEFQSUdhdGV3YXlQcm94eVN0cnVjdHVyZWRSZXN1bHRWMiB7XG4gIGNvbnN0IHsgaGVhZGVycywgYm9keSB9ID0gcHJlcGFyZVJlc3BvbnNlQm9keShyZXNwb25zZSk7XG5cbiAgY29uc3QgcmVzdWx0OiBBUElHYXRld2F5UHJveHlTdHJ1Y3R1cmVkUmVzdWx0VjIgPSB7XG4gICAgc3RhdHVzQ29kZTogcmVzcG9uc2Uuc3RhdHVzQ29kZSA/PyAyMDAsXG4gICAgaGVhZGVycyxcbiAgICBib2R5LFxuICB9O1xuXG4gIGNvbnN0IGNvb2tpZUhlYWRlcnMgPSBidWlsZENvb2tpZShyZXNwb25zZSk7XG4gIGlmIChjb29raWVIZWFkZXJzKSB7XG4gICAgcmVzdWx0LmNvb2tpZXMgPSBjb29raWVIZWFkZXJzO1xuICB9XG5cbiAgcmV0dXJuIHJlc3VsdDtcbn1cbiJdfQ==
|
package/dist/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { APIGatewayProxyEvent } from "aws-lambda";
|
|
2
1
|
import z from "zod/v4";
|
|
2
|
+
import { ApiGatewayProxyEventAny } from './event';
|
|
3
3
|
export interface Request<B = any> {
|
|
4
4
|
method: string;
|
|
5
5
|
path: string;
|
|
@@ -9,7 +9,7 @@ export interface Request<B = any> {
|
|
|
9
9
|
pathParameters: Record<string, string>;
|
|
10
10
|
body: B;
|
|
11
11
|
context: {
|
|
12
|
-
event:
|
|
12
|
+
event: ApiGatewayProxyEventAny;
|
|
13
13
|
[key: string]: any;
|
|
14
14
|
};
|
|
15
15
|
}
|
package/dist/types.js
CHANGED
|
@@ -15,4 +15,4 @@ class ApiError extends Error {
|
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
exports.ApiError = ApiError;
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBd0RBLE1BQWEsUUFBUyxTQUFRLEtBQUs7SUFDakMsVUFBVSxDQUFTO0lBQ25CLElBQUksQ0FBVTtJQUNkLE9BQU8sQ0FBMEI7SUFFakMsWUFBWSxVQUFrQixFQUFFLElBQWEsRUFBRSxPQUFnQztRQUM3RSxLQUFLLENBQUMsT0FBTyxJQUFJLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3ZFLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO1FBQzdCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBRXZCLDJDQUEyQztRQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGO0FBZEQsNEJBY0MiLCJzb3VyY2VzQ29udGVudCI6WyIvKiBlc2xpbnQtZGlzYWJsZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tZXhwbGljaXQtYW55ICovXG5pbXBvcnQgeiBmcm9tIFwiem9kL3Y0XCI7XG5pbXBvcnQgeyBBcGlHYXRld2F5UHJveHlFdmVudEFueSB9IGZyb20gJy4vZXZlbnQnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJlcXVlc3Q8QiA9IGFueT4ge1xuICBtZXRob2Q6IHN0cmluZyxcbiAgcGF0aDogc3RyaW5nLFxuICBxdWVyeTogUmVjb3JkPHN0cmluZywgc3RyaW5nPjtcbiAgaGVhZGVyczogUmVjb3JkPHN0cmluZywgc3RyaW5nPjtcbiAgY29va2llczogUmVjb3JkPHN0cmluZywgc3RyaW5nPjtcbiAgcGF0aFBhcmFtZXRlcnM6IFJlY29yZDxzdHJpbmcsIHN0cmluZz47XG4gIGJvZHk6IEI7XG4gIGNvbnRleHQ6IHtcbiAgICBldmVudDogQXBpR2F0ZXdheVByb3h5RXZlbnRBbnk7XG4gICAgW2tleTogc3RyaW5nXTogYW55O1xuICB9LFxufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJlc3BvbnNlPEIgPSBhbnk+IHtcbiAgc3RhdHVzQ29kZT86IG51bWJlcjtcbiAgaGVhZGVycz86IFJlY29yZDxzdHJpbmcsIHN0cmluZz47XG4gIGNvb2tpZXM/OiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+O1xuICBib2R5PzogQjtcbn1cblxudHlwZSBBbnlTY2hlbWEgPSB6LlpvZFR5cGU8YW55LCBhbnksIGFueT47XG5leHBvcnQgaW50ZXJmYWNlIEhhbmRsZXI8U1JlcSBleHRlbmRzIEFueVNjaGVtYSB8IHVuZGVmaW5lZCA9IHVuZGVmaW5lZCwgU1JlcyBleHRlbmRzIEFueVNjaGVtYSB8IHVuZGVmaW5lZCA9IHVuZGVmaW5lZD4ge1xuICByZXF1ZXN0Pzoge1xuICAgIGJvZHk/OiBTUmVxO1xuICAgIGhlYWRlcnM/OiB6LlpvZE9iamVjdDxhbnk+O1xuICAgIGNvb2tpZXM/OiB6LlpvZE9iamVjdDxhbnk+O1xuICAgIHBhdGhQYXJhbWV0ZXJzPzogei5ab2RPYmplY3Q8YW55PjtcbiAgICBxdWVyeT86IHouWm9kT2JqZWN0PGFueT47XG4gIH07XG4gIHJlc3BvbnNlPzoge1xuICAgIGJvZHk/OiBTUmVzO1xuICAgIGhlYWRlcnM/OiB6LlpvZE9iamVjdDxhbnk+O1xuICAgIGNvb2tpZXM/OiB6LlpvZE9iamVjdDxhbnk+O1xuICB9O1xuICBoYW5kbGVyOiAocmVxdWVzdDogUmVxdWVzdDx6LmluZmVyPFNSZXE+PikgPT4gUHJvbWlzZTxSZXNwb25zZTx6LmluZmVyPFNSZXM+Pj47XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUm91dGUge1xuICBHRVQ/OiBIYW5kbGVyPHVuZGVmaW5lZCwgQW55U2NoZW1hPjtcbiAgUE9TVD86IEhhbmRsZXI8QW55U2NoZW1hLCBBbnlTY2hlbWE+O1xuICBQVVQ/OiBIYW5kbGVyPEFueVNjaGVtYSwgQW55U2NoZW1hPjtcbiAgREVMRVRFPzogSGFuZGxlcjx1bmRlZmluZWQsIEFueVNjaGVtYT47XG4gIFBBVENIPzogSGFuZGxlcjx1bmRlZmluZWQsIEFueVNjaGVtYT47XG4gIE9QVElPTlM/OiBIYW5kbGVyPHVuZGVmaW5lZCwgQW55U2NoZW1hPjtcbiAgSEVBRD86IEhhbmRsZXI8dW5kZWZpbmVkLCBBbnlTY2hlbWE+O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJvdXRlcyB7XG4gIFtwYXRoOiBzdHJpbmddOiBSb3V0ZTtcbn1cblxuZXhwb3J0IGNsYXNzIEFwaUVycm9yIGV4dGVuZHMgRXJyb3Ige1xuICBzdGF0dXNDb2RlOiBudW1iZXI7XG4gIGJvZHk6IHVua25vd247XG4gIGhlYWRlcnM/OiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+O1xuXG4gIGNvbnN0cnVjdG9yKHN0YXR1c0NvZGU6IG51bWJlciwgYm9keTogdW5rbm93biwgaGVhZGVycz86IFJlY29yZDxzdHJpbmcsIHN0cmluZz4pIHtcbiAgICBzdXBlcih0eXBlb2YgYm9keSA9PT0gJ3N0cmluZycgPyBib2R5IDogSlNPTi5zdHJpbmdpZnkoYm9keSwgbnVsbCwgMikpO1xuICAgIHRoaXMuc3RhdHVzQ29kZSA9IHN0YXR1c0NvZGU7XG4gICAgdGhpcy5ib2R5ID0gYm9keTtcbiAgICB0aGlzLmhlYWRlcnMgPSBoZWFkZXJzO1xuXG4gICAgLy8gUmVxdWlyZWQgZm9yIGluc3RhbmNlb2YgdG8gd29yayBwcm9wZXJseVxuICAgIE9iamVjdC5zZXRQcm90b3R5cGVPZih0aGlzLCBBcGlFcnJvci5wcm90b3R5cGUpO1xuICB9XG59XG4iXX0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@scloud/lambda-api",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.5",
|
|
4
4
|
"description": "Lambda handler for API Gateway proxy requests",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -49,9 +49,8 @@
|
|
|
49
49
|
"@eslint/js": "*",
|
|
50
50
|
"@tsconfig/node24": "*",
|
|
51
51
|
"@types/chai": "*",
|
|
52
|
-
"@types/cookie": "*",
|
|
53
52
|
"@types/mocha": "*",
|
|
54
|
-
"@types/node": "
|
|
53
|
+
"@types/node": "^24",
|
|
55
54
|
"@types/nunjucks": "*",
|
|
56
55
|
"axios": "*",
|
|
57
56
|
"chai": "*",
|