@tstdl/base 0.90.34 → 0.90.36
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/api/server/gateway.d.ts
CHANGED
|
@@ -11,12 +11,12 @@ import type { ApiController, ApiDefinition, ApiEndpointDefinition, ApiEndpointMe
|
|
|
11
11
|
import { ApiRequestTokenProvider } from './api-request-token.provider.js';
|
|
12
12
|
import type { CorsMiddlewareOptions } from './middlewares/cors.middleware.js';
|
|
13
13
|
export type ApiGatewayMiddlewareContext = {
|
|
14
|
-
api: ApiItem;
|
|
14
|
+
readonly api: ApiItem;
|
|
15
15
|
/** can be undefined if used before allowedMethods middleware */
|
|
16
|
-
endpoint: GatewayEndpoint;
|
|
17
|
-
resourcePatternResult: URLPatternResult;
|
|
18
|
-
request: HttpServerRequest;
|
|
19
|
-
response: HttpServerResponse;
|
|
16
|
+
readonly endpoint: GatewayEndpoint;
|
|
17
|
+
readonly resourcePatternResult: URLPatternResult;
|
|
18
|
+
readonly request: HttpServerRequest;
|
|
19
|
+
readonly response: HttpServerResponse;
|
|
20
20
|
};
|
|
21
21
|
export type ApiGatewayMiddlewareNext = AsyncMiddlewareNext;
|
|
22
22
|
export type ApiGatewayMiddleware = AsyncMiddleware<ApiGatewayMiddlewareContext>;
|
package/api/server/gateway.js
CHANGED
|
@@ -29,7 +29,7 @@ import { normalizedApiDefinitionEndpointsEntries } from '../types.js';
|
|
|
29
29
|
import { getFullApiEndpointResource } from '../utils.js';
|
|
30
30
|
import { ApiRequestTokenProvider } from './api-request-token.provider.js';
|
|
31
31
|
import { handleApiError } from './error-handler.js';
|
|
32
|
-
import { allowedMethodsMiddleware,
|
|
32
|
+
import { allowedMethodsMiddleware, contentTypeMiddleware, corsMiddleware, getCatchErrorMiddleware, responseTimeMiddleware } from './middlewares/index.js';
|
|
33
33
|
import { API_MODULE_OPTIONS } from './tokens.js';
|
|
34
34
|
const defaultMaxBytes = 10 * mebibyte;
|
|
35
35
|
export class ApiGatewayOptions {
|
|
@@ -189,7 +189,7 @@ let ApiGateway = class ApiGateway {
|
|
|
189
189
|
};
|
|
190
190
|
const result = await context.endpoint.implementation(requestContext);
|
|
191
191
|
if (result instanceof HttpServerResponse) {
|
|
192
|
-
context.response
|
|
192
|
+
context.response.update(result); // eslint-disable-line require-atomic-updates
|
|
193
193
|
}
|
|
194
194
|
else {
|
|
195
195
|
context.response.body = isUint8Array(result) ? { buffer: result } // eslint-disable-line require-atomic-updates
|
|
@@ -4,46 +4,50 @@ import { isDefined } from '../../../utils/type-guards.js';
|
|
|
4
4
|
export function corsMiddleware(options = {}) {
|
|
5
5
|
// eslint-disable-next-line max-statements, @typescript-eslint/no-shadow
|
|
6
6
|
async function corsMiddleware(context, next) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
if (
|
|
17
|
-
const
|
|
18
|
-
response.headers.setIfMissing('Access-Control-Allow-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
7
|
+
try {
|
|
8
|
+
await next();
|
|
9
|
+
}
|
|
10
|
+
finally {
|
|
11
|
+
const { request, response } = context;
|
|
12
|
+
const requestMethod = request.headers.tryGetSingle('Access-Control-Request-Method') ?? request.method;
|
|
13
|
+
const isOptions = (request.method == 'OPTIONS');
|
|
14
|
+
const endpointDefinition = context.api.endpoints.get(requestMethod)?.definition;
|
|
15
|
+
const cors = { ...options.default, ...endpointDefinition?.cors };
|
|
16
|
+
if (isOptions) {
|
|
17
|
+
const allowMethods = (await resolveApiEndpointDataProvider(request, context, cors.accessControlAllowMethods)) ?? [...context.api.endpoints.keys()].join(', ');
|
|
18
|
+
response.headers.setIfMissing('Access-Control-Allow-Methods', allowMethods);
|
|
19
|
+
if (isDefined(cors.accessControlAllowHeaders) && !request.headers.has('Access-Control-Allow-Headers')) {
|
|
20
|
+
const value = await resolveApiEndpointDataProvider(request, context, cors.accessControlAllowHeaders);
|
|
21
|
+
response.headers.setIfMissing('Access-Control-Allow-Headers', value);
|
|
22
|
+
}
|
|
23
|
+
if (isDefined(cors.accessControlExposeHeaders) && !request.headers.has('Access-Control-Expose-Headers')) {
|
|
24
|
+
const value = await resolveApiEndpointDataProvider(request, context, cors.accessControlExposeHeaders);
|
|
25
|
+
response.headers.setIfMissing('Access-Control-Expose-Headers', value);
|
|
26
|
+
}
|
|
27
|
+
if (isDefined(cors.accessControlMaxAge) && !request.headers.has('Access-Control-Max-Age')) {
|
|
28
|
+
const value = await resolveApiEndpointDataProvider(request, context, cors.accessControlMaxAge);
|
|
29
|
+
response.headers.setIfMissing('Access-Control-Max-Age', value);
|
|
30
|
+
}
|
|
23
31
|
}
|
|
24
|
-
if (
|
|
25
|
-
const
|
|
26
|
-
|
|
32
|
+
if (!request.headers.has('Access-Control-Allow-Credentials')) {
|
|
33
|
+
const allowCredentials = isDefined(cors.accessControlAllowCredentials)
|
|
34
|
+
? await resolveApiEndpointDataProvider(request, context, cors.accessControlAllowCredentials)
|
|
35
|
+
: endpointDefinition?.credentials;
|
|
36
|
+
if (allowCredentials == true) {
|
|
37
|
+
response.headers.setIfMissing('Access-Control-Allow-Credentials', 'true');
|
|
38
|
+
}
|
|
27
39
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
? await resolveApiEndpointDataProvider(request, context, cors.accessControlAllowCredentials)
|
|
32
|
-
: endpointDefinition?.credentials;
|
|
33
|
-
if (allowCredentials == true) {
|
|
34
|
-
response.headers.setIfMissing('Access-Control-Allow-Credentials', 'true');
|
|
40
|
+
if (isDefined(cors.accessControlAllowOrigin) && !response.headers.has('Access-Control-Allow-Origin')) {
|
|
41
|
+
const value = await resolveApiEndpointDataProvider(request, context, cors.accessControlAllowOrigin);
|
|
42
|
+
response.headers.setIfMissing('Access-Control-Allow-Origin', value);
|
|
35
43
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
const origin = request.headers.tryGetSingle('Origin');
|
|
44
|
-
const allowed = isDefined(value) && toArray(value).includes(origin);
|
|
45
|
-
if (allowed) {
|
|
46
|
-
response.headers.setIfMissing('Access-Control-Allow-Origin', origin);
|
|
44
|
+
if (isDefined(cors.autoAccessControlAllowOrigin) && !response.headers.has('Access-Control-Allow-Origin')) {
|
|
45
|
+
const value = await resolveApiEndpointDataProvider(request, context, cors.autoAccessControlAllowOrigin);
|
|
46
|
+
const origin = request.headers.tryGetSingle('Origin');
|
|
47
|
+
const allowed = isDefined(value) && toArray(value).includes(origin);
|
|
48
|
+
if (allowed) {
|
|
49
|
+
response.headers.setIfMissing('Access-Control-Allow-Origin', origin);
|
|
50
|
+
}
|
|
47
51
|
}
|
|
48
52
|
}
|
|
49
53
|
}
|
|
@@ -8,17 +8,20 @@ export class HttpServerResponse {
|
|
|
8
8
|
headers;
|
|
9
9
|
body;
|
|
10
10
|
constructor(response = {}) {
|
|
11
|
-
this.
|
|
12
|
-
this.statusMessage = response.statusMessage;
|
|
13
|
-
this.headers = new HttpHeaders(response.headers);
|
|
14
|
-
this.body = response.body;
|
|
15
|
-
if (isDefined(response.cookies)) {
|
|
16
|
-
for (const [name, options] of objectEntries(response.cookies)) {
|
|
17
|
-
this.headers.append('Set-Cookie', formatSetCookie(name, options.value, options));
|
|
18
|
-
}
|
|
19
|
-
}
|
|
11
|
+
this.update(response);
|
|
20
12
|
}
|
|
21
13
|
static fromObject(options) {
|
|
22
14
|
return new HttpServerResponse(options);
|
|
23
15
|
}
|
|
16
|
+
update(options) {
|
|
17
|
+
this.statusCode = options.statusCode;
|
|
18
|
+
this.statusMessage = options.statusMessage;
|
|
19
|
+
this.headers = new HttpHeaders(options.headers);
|
|
20
|
+
this.body = options.body;
|
|
21
|
+
if (isDefined(options.cookies)) {
|
|
22
|
+
for (const [name, cookie] of objectEntries(options.cookies)) {
|
|
23
|
+
this.headers.append('Set-Cookie', formatSetCookie(name, cookie.value, cookie));
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
24
27
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tstdl/base",
|
|
3
|
-
"version": "0.90.
|
|
3
|
+
"version": "0.90.36",
|
|
4
4
|
"author": "Patrick Hein",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -121,8 +121,8 @@
|
|
|
121
121
|
"@types/mjml": "4.7",
|
|
122
122
|
"@types/node": "20",
|
|
123
123
|
"@types/nodemailer": "6.4",
|
|
124
|
-
"@typescript-eslint/eslint-plugin": "6.
|
|
125
|
-
"@typescript-eslint/parser": "6.
|
|
124
|
+
"@typescript-eslint/eslint-plugin": "6.11",
|
|
125
|
+
"@typescript-eslint/parser": "6.11",
|
|
126
126
|
"concurrently": "8.2",
|
|
127
127
|
"esbuild": "0.19",
|
|
128
128
|
"eslint": "8.53",
|