@scloud/lambda-api 0.1.18 → 0.1.19
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/dist/handler.js +2 -2
- package/dist/helpers.d.ts +2 -1
- package/dist/helpers.js +16 -2
- package/package.json +1 -1
package/dist/handler.js
CHANGED
|
@@ -12,7 +12,7 @@ async function apiHandler(event, context, routes = {
|
|
|
12
12
|
const request = (0, helpers_1.parseRequest)(event);
|
|
13
13
|
let response;
|
|
14
14
|
try {
|
|
15
|
-
const route = routes
|
|
15
|
+
const route = (0, helpers_1.matchRoute)(routes, request.path);
|
|
16
16
|
if (!route) {
|
|
17
17
|
// Catch-all / 404
|
|
18
18
|
response = await catchAll(request);
|
|
@@ -51,4 +51,4 @@ async function apiHandler(event, context, routes = {
|
|
|
51
51
|
return result;
|
|
52
52
|
}
|
|
53
53
|
exports.apiHandler = apiHandler;
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9oYW5kbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQVNBLHVDQUFrRTtBQUVsRTs7R0FFRztBQUNJLEtBQUssVUFBVSxVQUFVLENBQzlCLEtBQTJCLEVBQzNCLE9BQWdCLEVBQ2hCLFNBQWlCO0lBQ2YsV0FBVyxFQUFFLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxPQUFnQixFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLENBQUMsRUFBRTtDQUN2RixFQUNELGVBQXdCLEtBQUssRUFBRSxPQUFnQixFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRSxLQUFLLEVBQUUsMEJBQTBCLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFDcEksV0FBb0IsS0FBSyxFQUFFLE9BQWdCLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFLEtBQUssRUFBRSxjQUFjLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFFcEgsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLE9BQU8sQ0FBQyxZQUFZLGFBQWEsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO0lBQ3JGLE1BQU0sT0FBTyxHQUFHLElBQUEsc0JBQVksRUFBQyxLQUFLLENBQUMsQ0FBQztJQUVwQyxJQUFJLFFBQWtCLENBQUM7SUFDdkIsSUFBSTtRQUNGLE1BQU0sS0FBSyxHQUFHLElBQUEsb0JBQVUsRUFBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQy9DLElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDVixrQkFBa0I7WUFDbEIsUUFBUSxHQUFHLE1BQU0sUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQ3BDO2FBQU07WUFDTCxNQUFNLGVBQWUsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQXFCLENBQUMsQ0FBQztZQUM3RCxJQUFJLENBQUMsZUFBZTtnQkFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxvQkFBb0IsQ0FBQyxFQUFFLENBQUM7WUFFN0Ysc0JBQXNCO1lBQ3RCLFFBQVEsR0FBRyxNQUFNLGVBQWUsQ0FBQyxPQUFPLENBQUMsQ0FBQztTQUMzQztLQUNGO0lBQUMsT0FBTyxDQUFDLEVBQUU7UUFDVixPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUksQ0FBVyxDQUFDLE9BQU8sS0FBTSxDQUFXLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQztRQUNoRSxJQUFJO1lBQ0YsaUJBQWlCO1lBQ2pCLFFBQVEsR0FBRyxNQUFNLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztTQUN4QztRQUFDLE9BQU8sRUFBRSxFQUFFO1lBQ1gsUUFBUSxHQUFHLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRSxLQUFLLEVBQUUsMEJBQTBCLE9BQU8sQ0FBQyxJQUFJLGlCQUFpQixFQUFFLEVBQUUsQ0FBQztTQUMxRztLQUNGO0lBRUQsMkJBQTJCO0lBQzNCLE1BQU0sTUFBTSxHQUEwQjtRQUNwQyxVQUFVLEVBQUUsUUFBUSxDQUFDLFVBQVU7UUFDL0IsSUFBSSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQztRQUNuQyxPQUFPLEVBQUUsUUFBUSxDQUFDLE9BQU87S0FDMUIsQ0FBQztJQUVGLG1CQUFtQjtJQUNuQixNQUFNLGFBQWEsR0FBRyxJQUFBLHFCQUFXLEVBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3BELElBQUksYUFBYSxFQUFFO1FBQ2pCLE1BQU0sQ0FBQyxpQkFBaUIsR0FBRztZQUN6QixNQUFNLEVBQUUsYUFBYTtTQUN0QixDQUFDO0tBQ0g7SUFFRCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBbkRELGdDQW1EQyIsInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlIGltcG9ydC9wcmVmZXItZGVmYXVsdC1leHBvcnQgKi9cbmltcG9ydCB7XG4gIEFQSUdhdGV3YXlQcm94eUV2ZW50LFxuICBBUElHYXRld2F5UHJveHlSZXN1bHQsXG4gIENvbnRleHQsXG59IGZyb20gJ2F3cy1sYW1iZGEnO1xuaW1wb3J0IHtcbiAgSGFuZGxlciwgUmVxdWVzdCwgUmVzcG9uc2UsIFJvdXRlLCBSb3V0ZXMsXG59IGZyb20gJy4vdHlwZXMnO1xuaW1wb3J0IHsgYnVpbGRDb29raWUsIG1hdGNoUm91dGUsIHBhcnNlUmVxdWVzdCB9IGZyb20gJy4vaGVscGVycyc7XG5cbi8qKlxuICogQVBJIHJvdXRlIGhhbmRsZXJcbiAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGFwaUhhbmRsZXIoXG4gIGV2ZW50OiBBUElHYXRld2F5UHJveHlFdmVudCxcbiAgY29udGV4dDogQ29udGV4dCxcbiAgcm91dGVzOiBSb3V0ZXMgPSB7XG4gICAgJy9hcGkvcGluZyc6IHsgR0VUOiBhc3luYyAocmVxdWVzdDogUmVxdWVzdCkgPT4gKHsgc3RhdHVzQ29kZTogMjAwLCBib2R5OiByZXF1ZXN0IH0pIH0sXG4gIH0sXG4gIGVycm9ySGFuZGxlcjogSGFuZGxlciA9IGFzeW5jIChyZXF1ZXN0OiBSZXF1ZXN0KSA9PiAoeyBzdGF0dXNDb2RlOiA1MDAsIGJvZHk6IHsgZXJyb3I6IGBJbnRlcm5hbCBzZXJ2ZXIgZXJyb3I6ICR7cmVxdWVzdC5wYXRofWAgfSB9KSxcbiAgY2F0Y2hBbGw6IEhhbmRsZXIgPSBhc3luYyAocmVxdWVzdDogUmVxdWVzdCkgPT4gKHsgc3RhdHVzQ29kZTogNDA0LCBib2R5OiB7IGVycm9yOiBgTm90IGZvdW5kOiAke3JlcXVlc3QucGF0aH1gIH0gfSksXG4pOiBQcm9taXNlPEFQSUdhdGV3YXlQcm94eVJlc3VsdD4ge1xuICBjb25zb2xlLmxvZyhgRXhlY3V0aW5nICR7Y29udGV4dC5mdW5jdGlvbk5hbWV9IHZlcnNpb246ICR7cHJvY2Vzcy5lbnYuQ09NTUlUX0hBU0h9YCk7XG4gIGNvbnN0IHJlcXVlc3QgPSBwYXJzZVJlcXVlc3QoZXZlbnQpO1xuXG4gIGxldCByZXNwb25zZTogUmVzcG9uc2U7XG4gIHRyeSB7XG4gICAgY29uc3Qgcm91dGUgPSBtYXRjaFJvdXRlKHJvdXRlcywgcmVxdWVzdC5wYXRoKTtcbiAgICBpZiAoIXJvdXRlKSB7XG4gICAgICAvLyBDYXRjaC1hbGwgLyA0MDRcbiAgICAgIHJlc3BvbnNlID0gYXdhaXQgY2F0Y2hBbGwocmVxdWVzdCk7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IGhhbmRsZXJGdW5jdGlvbiA9IHJvdXRlW3JlcXVlc3QubWV0aG9kIGFzIGtleW9mIFJvdXRlXTtcbiAgICAgIGlmICghaGFuZGxlckZ1bmN0aW9uKSByZXR1cm4geyBzdGF0dXNDb2RlOiA0MDUsIGJvZHk6IEpTT04uc3RyaW5naWZ5KCdNZXRob2Qgbm90IGFsbG93ZWQnKSB9O1xuXG4gICAgICAvLyBIYW5kbGUgdGhlIHJlcXVlc3Q6XG4gICAgICByZXNwb25zZSA9IGF3YWl0IGhhbmRsZXJGdW5jdGlvbihyZXF1ZXN0KTtcbiAgICB9XG4gIH0gY2F0Y2ggKGUpIHtcbiAgICBjb25zb2xlLmVycm9yKGAkeyhlIGFzIEVycm9yKS5tZXNzYWdlfVxcbiR7KGUgYXMgRXJyb3IpLnN0YWNrfWApO1xuICAgIHRyeSB7XG4gICAgICAvLyBFcnJvciBoYW5kbGluZ1xuICAgICAgcmVzcG9uc2UgPSBhd2FpdCBlcnJvckhhbmRsZXIocmVxdWVzdCk7XG4gICAgfSBjYXRjaCAoZWUpIHtcbiAgICAgIHJlc3BvbnNlID0geyBzdGF0dXNDb2RlOiA1MDAsIGJvZHk6IHsgZXJyb3I6IGBJbnRlcm5hbCBzZXJ2ZXIgZXJyb3I6ICR7cmVxdWVzdC5wYXRofSBbZXJyb3JIYW5kbGVyXWAgfSB9O1xuICAgIH1cbiAgfVxuXG4gIC8vIEFQSSBHYXRld2F5IFByb3h5IHJlc3VsdFxuICBjb25zdCByZXN1bHQ6IEFQSUdhdGV3YXlQcm94eVJlc3VsdCA9IHtcbiAgICBzdGF0dXNDb2RlOiByZXNwb25zZS5zdGF0dXNDb2RlLFxuICAgIGJvZHk6IEpTT04uc3RyaW5naWZ5KHJlc3BvbnNlLmJvZHkpLFxuICAgIGhlYWRlcnM6IHJlc3BvbnNlLmhlYWRlcnMsXG4gIH07XG5cbiAgLy8gQ29va2llcyAoaWYgc2V0KVxuICBjb25zdCBjb29raWVIZWFkZXJzID0gYnVpbGRDb29raWUocmVzcG9uc2UuY29va2llcyk7XG4gIGlmIChjb29raWVIZWFkZXJzKSB7XG4gICAgcmVzdWx0Lm11bHRpVmFsdWVIZWFkZXJzID0ge1xuICAgICAgQ29va2llOiBjb29raWVIZWFkZXJzLFxuICAgIH07XG4gIH1cblxuICByZXR1cm4gcmVzdWx0O1xufVxuIl19
|
package/dist/helpers.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { APIGatewayProxyEvent } from 'aws-lambda';
|
|
2
|
-
import { Request } from './types';
|
|
2
|
+
import { Request, Route, Routes } from './types';
|
|
3
3
|
/**
|
|
4
4
|
* Ensures the path is lowercased, always has a leading slash and never a trailing slash
|
|
5
5
|
* @param path APIGatewayProxyEvent.path
|
|
@@ -43,3 +43,4 @@ export declare function buildCookie(values: {
|
|
|
43
43
|
[key: string]: string;
|
|
44
44
|
} | undefined): string[] | undefined;
|
|
45
45
|
export declare function parseRequest(event: APIGatewayProxyEvent): Request;
|
|
46
|
+
export declare function matchRoute(routes: Routes, path: string): Route | undefined;
|
package/dist/helpers.js
CHANGED
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.parseRequest = exports.buildCookie = exports.parseCookie = exports.parseBody = exports.standardHeaders = exports.standardQueryParameters = exports.standardPath = void 0;
|
|
26
|
+
exports.matchRoute = exports.parseRequest = exports.buildCookie = exports.parseCookie = exports.parseBody = exports.standardHeaders = exports.standardQueryParameters = exports.standardPath = void 0;
|
|
27
27
|
const cookie = __importStar(require("cookie"));
|
|
28
28
|
/**
|
|
29
29
|
* Ensures the path is lowercased, always has a leading slash and never a trailing slash
|
|
@@ -126,4 +126,18 @@ function parseRequest(event) {
|
|
|
126
126
|
};
|
|
127
127
|
}
|
|
128
128
|
exports.parseRequest = parseRequest;
|
|
129
|
-
|
|
129
|
+
function matchRoute(routes, path) {
|
|
130
|
+
let route;
|
|
131
|
+
// Simple match
|
|
132
|
+
if (routes[path])
|
|
133
|
+
return routes[path];
|
|
134
|
+
// Case insensitive match
|
|
135
|
+
Object.keys(routes).forEach((candidate) => {
|
|
136
|
+
if (candidate.toLowerCase() === path.toLowerCase())
|
|
137
|
+
route = routes[candidate];
|
|
138
|
+
});
|
|
139
|
+
// TODO: path-parameter matching
|
|
140
|
+
return route;
|
|
141
|
+
}
|
|
142
|
+
exports.matchRoute = matchRoute;
|
|
143
|
+
//# 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, Route, Routes } from './types';\n\n/**\n * Ensures the path is lowercased, 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('/').toLowerCase()}`;\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 header names are lowercased for ease of access.\n * @param headers APIGatewayProxyEvent.headers\n */\nexport function standardHeaders(headers: { [name: string]: string | undefined; }): { [name: string]: string; } {\n  const result: { [name: string]: string; } = {};\n  Object.keys(headers).forEach((name) => {\n    const value = headers[name];\n    if (value) result[name.toLowerCase()] = value;\n  });\n  return result;\n}\n\n/**\n * Parses the body (if present) to a JSON string. Returns at mimimum an empty object.\n * @param body APIGatewayProxyEvent.body\n */\nexport function parseBody(body: string | null): { [name: string]: string; } {\n  if (!body) return {};\n  let result = {};\n  try {\n    result = JSON.parse(body);\n  } catch (e) {\n    console.error(`Error parsing request body: ${e}`);\n  }\n  return result;\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 = headers.cookie || headers.Cookie || '';\n  return cookie.parse(header);\n}\n\nexport function buildCookie(values: { [key: string]: string; } | undefined): string[] | undefined {\n  if (!values) return undefined;\n\n  const header: string[] = [];\n  const oneYear = 60 * 60 * 24 * 365;\n\n  Object.keys(values).forEach((key) => {\n    const value = values[key];\n    if (value === '') {\n      // If explicitly unset, expire the cookie value\n      header.push(cookie.serialize(key, '', {\n        expires: new Date(), secure: true, httpOnly: true, sameSite: 'strict',\n      }));\n    } else if (value) {\n      // Otherwise, set it only if a value was given\n      header.push(cookie.serialize(key, value, {\n        maxAge: oneYear, secure: true, httpOnly: true, sameSite: 'strict',\n      }));\n    }\n  });\n\n  return header;\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),\n    cookies: parseCookie(event.headers),\n  };\n}\n\nexport function matchRoute(routes: Routes, path: string): Route | undefined {\n  let route: Route | undefined;\n\n  // Simple match\n  if (routes[path]) return routes[path];\n\n  // Case insensitive match\n  Object.keys(routes).forEach((candidate) => {\n    if (candidate.toLowerCase() === path.toLowerCase()) route = routes[candidate];\n  });\n\n  // TODO: path-parameter matching\n\n  return route;\n}\n"]}
|