@goatlab/node-backend 1.1.0 → 1.1.2
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/Cache.d.ts +1 -1
- package/dist/Cache.js +18 -16
- package/dist/Cache.js.map +1 -1
- package/dist/container/Container.d.ts +2 -2
- package/dist/container/Container.js +16 -8
- package/dist/container/Container.js.map +1 -1
- package/dist/container/DistributedCacheInvalidator.d.ts +1 -1
- package/dist/container/DistributedCacheInvalidator.js +8 -8
- package/dist/container/DistributedCacheInvalidator.js.map +1 -1
- package/dist/container/examples/batch-operations.example.js +25 -23
- package/dist/container/examples/batch-operations.example.js.map +1 -1
- package/dist/container/helpers.js +2 -1
- package/dist/container/helpers.js.map +1 -1
- package/dist/index.d.ts +24 -24
- package/dist/index.js +41 -41
- package/dist/index.js.map +1 -1
- package/dist/server/bootstraps/ExpressTrpcAppConfig.d.ts +1 -1
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js +1 -1
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js.map +1 -1
- package/dist/server/bootstraps/getExpressTrpcApp.d.ts +1 -1
- package/dist/server/bootstraps/getExpressTrpcApp.js +7 -6
- package/dist/server/bootstraps/getExpressTrpcApp.js.map +1 -1
- package/dist/server/consts.js +8 -8
- package/dist/server/consts.js.map +1 -1
- package/dist/server/context/request.context.js +0 -1
- package/dist/server/context/request.context.js.map +1 -1
- package/dist/server/context/trpc.context.d.ts +1 -1
- package/dist/server/context/trpc.context.js +2 -2
- package/dist/server/context/trpc.context.js.map +1 -1
- package/dist/server/initOpenApiDocs.d.ts +1 -1
- package/dist/server/initOpenApiDocs.js +3 -3
- package/dist/server/initOpenApiDocs.js.map +1 -1
- package/dist/server/middleware/cloudTaskDecrypt.middleware.d.ts +2 -2
- package/dist/server/middleware/cloudTaskDecrypt.middleware.js +7 -9
- package/dist/server/middleware/cloudTaskDecrypt.middleware.js.map +1 -1
- package/dist/server/middleware/error.middleware.d.ts +1 -1
- package/dist/server/middleware/error.middleware.js +13 -8
- package/dist/server/middleware/error.middleware.js.map +1 -1
- package/dist/server/middleware/handleRequest.middleware.d.ts +1 -1
- package/dist/server/middleware/handleRequest.middleware.js +3 -3
- package/dist/server/middleware/handleRequest.middleware.js.map +1 -1
- package/dist/server/middleware/logger/cloudRun.logger.d.ts +2 -2
- package/dist/server/middleware/logger/cloudRun.logger.js +15 -15
- package/dist/server/middleware/logger/cloudRun.logger.js.map +1 -1
- package/dist/server/middleware/logger/logger.service.js +2 -2
- package/dist/server/middleware/logs.middleware.d.ts +1 -1
- package/dist/server/middleware/logs.middleware.js +10 -14
- package/dist/server/middleware/logs.middleware.js.map +1 -1
- package/dist/server/middleware/memoryMonitor.example.js +13 -11
- package/dist/server/middleware/memoryMonitor.example.js.map +1 -1
- package/dist/server/middleware/memoryMonitor.middleware.d.ts +1 -1
- package/dist/server/middleware/memoryMonitor.middleware.js.map +1 -1
- package/dist/server/middleware/productionError.middleware.d.ts +2 -2
- package/dist/server/middleware/productionError.middleware.js.map +1 -1
- package/dist/server/middleware/security.middleware.d.ts +1 -1
- package/dist/server/middleware/security.middleware.js +1 -1
- package/dist/server/middleware/security.middleware.js.map +1 -1
- package/dist/server/middleware/trpcError.middleware.d.ts +1 -1
- package/dist/server/middleware/trpcError.middleware.js +8 -5
- package/dist/server/middleware/trpcError.middleware.js.map +1 -1
- package/dist/server/schemas/user.schema.js +3 -3
- package/dist/server/sentry/getSentry.d.ts +1 -1
- package/dist/server/sentry/getSentry.js +3 -3
- package/dist/server/sentry/getSentry.js.map +1 -1
- package/dist/server/sentry/sentry.service.d.ts +1 -1
- package/dist/server/sentry/sentry.service.js +11 -11
- package/dist/server/sentry/sentry.service.js.map +1 -1
- package/dist/server/services/email/email.model.js +1 -1
- package/dist/server/services/email/email.service.d.ts +3 -3
- package/dist/server/services/email/email.service.js +14 -14
- package/dist/server/services/email/email.service.js.map +1 -1
- package/dist/server/services/secrets/examples/container-preload.example.js +36 -16
- package/dist/server/services/secrets/examples/container-preload.example.js.map +1 -1
- package/dist/server/services/secrets/index.d.ts +1 -1
- package/dist/server/services/secrets/index.js.map +1 -1
- package/dist/server/services/secrets/secret.service.js +30 -19
- package/dist/server/services/secrets/secret.service.js.map +1 -1
- package/dist/server/services/sendgrid/sendgridApi.service.d.ts +1 -1
- package/dist/server/services/sendgrid/sendgridApi.service.js +14 -16
- package/dist/server/services/sendgrid/sendgridApi.service.js.map +1 -1
- package/dist/server/services/translations/template.util.js.map +1 -1
- package/dist/server/services/translations/translation.model.d.ts +2 -2
- package/dist/server/services/translations/translation.model.js +7 -1
- package/dist/server/services/translations/translation.model.js.map +1 -1
- package/dist/server/services/translations/translation.service.d.ts +5 -5
- package/dist/server/services/translations/translation.service.js +11 -9
- package/dist/server/services/translations/translation.service.js.map +1 -1
- package/dist/server/services/util/benchmarker.js +8 -8
- package/dist/server/services/util/benchmarker.js.map +1 -1
- package/dist/server/services/util/pagination.d.ts +4 -4
- package/dist/server/services/util/pagination.js +4 -4
- package/dist/server/services/util/pagination.js.map +1 -1
- package/dist/server/services/util/url.service.d.ts +4 -4
- package/dist/server/services/util/url.service.js +7 -7
- package/dist/server/services/util/url.service.js.map +1 -1
- package/dist/server/test/express.mock.js +6 -6
- package/dist/server/test/firebase.mock.js +2 -2
- package/dist/server/test/trpc.mock.d.ts +1 -1
- package/dist/server/test/trpc.mock.js +1 -1
- package/dist/server/test/trpc.mock.js.map +1 -1
- package/dist/server/trpc.d.ts +1 -1
- package/dist/server/trpc.js +10 -10
- package/dist/server/trpc.js.map +1 -1
- package/dist/test/const.js +7 -7
- package/dist/test/const.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +6 -8
|
@@ -20,7 +20,7 @@ function genericErrorMiddleware(cfg = {}) {
|
|
|
20
20
|
respondWithError(request, res, error);
|
|
21
21
|
};
|
|
22
22
|
}
|
|
23
|
-
function respondWithError(
|
|
23
|
+
function respondWithError(_request, res, error) {
|
|
24
24
|
const { headersSent } = res;
|
|
25
25
|
if (headersSent) {
|
|
26
26
|
console.error(`after headersSent`, error);
|
|
@@ -29,38 +29,43 @@ function respondWithError(request, res, error) {
|
|
|
29
29
|
console.error(error);
|
|
30
30
|
}
|
|
31
31
|
const originalError = js_utils_1.Errors.anyToError(error, Error, {
|
|
32
|
-
stringifyFn: js_utils_1.Inspect.anyStringifyFn
|
|
32
|
+
stringifyFn: js_utils_1.Inspect.anyStringifyFn
|
|
33
33
|
});
|
|
34
34
|
let errorId;
|
|
35
35
|
if (sentryService && shouldReportToSentry(originalError)) {
|
|
36
36
|
errorId = sentryService.captureException(originalError, false);
|
|
37
37
|
}
|
|
38
|
-
if (res.headersSent)
|
|
38
|
+
if (res.headersSent) {
|
|
39
39
|
return;
|
|
40
|
+
}
|
|
40
41
|
const httpError = js_utils_1.Errors.errorToErrorObject(originalError, includeErrorStack);
|
|
41
42
|
httpError.data.errorId = errorId;
|
|
42
43
|
// Check if error has a status or statusCode property (from Express errors like PayloadTooLargeError)
|
|
43
44
|
if (!httpError.data.httpStatusCode && originalError) {
|
|
44
|
-
httpError.data.httpStatusCode =
|
|
45
|
+
httpError.data.httpStatusCode =
|
|
46
|
+
originalError.status || originalError.statusCode;
|
|
45
47
|
}
|
|
46
48
|
httpError.data.httpStatusCode ||= 500; // Default to 500
|
|
47
49
|
httpError.data.headersSent = headersSent || undefined;
|
|
48
50
|
httpError.data.report ||= undefined; // Set to undefined if false
|
|
49
51
|
js_utils_1.Objects.filterUndefinedValues(httpError.data, true);
|
|
50
52
|
res.status(httpError.data.httpStatusCode).json({
|
|
51
|
-
error: httpError
|
|
53
|
+
error: httpError
|
|
52
54
|
});
|
|
53
55
|
}
|
|
54
56
|
function shouldReportToSentry(error) {
|
|
55
57
|
const e = error;
|
|
56
58
|
// By default - report
|
|
57
|
-
if (!e.data)
|
|
59
|
+
if (!e.data) {
|
|
58
60
|
return true;
|
|
61
|
+
}
|
|
59
62
|
// If `report` is set - do as it says
|
|
60
|
-
if (e.data.report === true)
|
|
63
|
+
if (e.data.report === true) {
|
|
61
64
|
return true;
|
|
62
|
-
|
|
65
|
+
}
|
|
66
|
+
if (e.data.report === false) {
|
|
63
67
|
return false;
|
|
68
|
+
}
|
|
64
69
|
// Report if http 5xx, otherwise not
|
|
65
70
|
// If no httpCode - report
|
|
66
71
|
// if httpCode >= 500 - report
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/error.middleware.ts"],"names":[],"mappings":";;AA+BA,wDAcC;AAED,
|
|
1
|
+
{"version":3,"file":"error.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/error.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { NextFunction, Request, Response } from 'express';
|
|
2
|
-
import type {
|
|
2
|
+
import type { ZodSchema, z } from 'zod';
|
|
3
3
|
export declare const handleRequest: <T extends ZodSchema>(schema: T, handler: (args: {
|
|
4
4
|
req: Request<any, any, z.infer<T>>;
|
|
5
5
|
res: Response;
|
|
@@ -11,7 +11,7 @@ const handleRequest = (schema, handler) => {
|
|
|
11
11
|
await handler({
|
|
12
12
|
req,
|
|
13
13
|
res,
|
|
14
|
-
body: parsedBody
|
|
14
|
+
body: parsedBody
|
|
15
15
|
});
|
|
16
16
|
// If the response hasn't been sent by the handler, send a default 200 OK
|
|
17
17
|
if (!res.headersSent) {
|
|
@@ -25,13 +25,13 @@ const handleRequest = (schema, handler) => {
|
|
|
25
25
|
if (err instanceof zod_1.ZodError) {
|
|
26
26
|
return res.status(400).json({
|
|
27
27
|
error: 'Invalid request body',
|
|
28
|
-
details: err.issues
|
|
28
|
+
details: err.issues // Send detailed validation errors
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
31
|
// Handle other errors and respond with a 500 status code
|
|
32
32
|
return res.status(500).json({
|
|
33
33
|
error: 'Internal Server Error',
|
|
34
|
-
message: err instanceof Error ? err.message : 'Unknown error'
|
|
34
|
+
message: err instanceof Error ? err.message : 'Unknown error'
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleRequest.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/handleRequest.middleware.ts"],"names":[],"mappings":";;;AAEA,6BAA8B;AAEvB,MAAM,aAAa,GAAG,CAC3B,MAAS,EACT,OAImB,EACnB,EAAE;IACF,OAAO,KAAK,EACV,GAA2B,EAC3B,GAAa,EACb,IAAkB,EAClB,EAAE;QACF,IAAI,CAAC;YACH,kCAAkC;YAClC,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YAEzC,2DAA2D;YAC3D,MAAM,OAAO,CAAC;gBACZ,GAAG;gBACH,GAAG;gBACH,IAAI,EAAE,UAAU;aACjB,CAAC,CAAA;YAEF,yEAAyE;YACzE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;YAC9B,CAAC;YAED,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,iCAAiC;YACjC,IAAI,GAAG,YAAY,cAAQ,EAAE,CAAC;gBAC5B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBAC1B,KAAK,EAAE,sBAAsB;oBAC7B,OAAO,EAAE,GAAG,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"handleRequest.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/handleRequest.middleware.ts"],"names":[],"mappings":";;;AAEA,6BAA8B;AAEvB,MAAM,aAAa,GAAG,CAC3B,MAAS,EACT,OAImB,EACnB,EAAE;IACF,OAAO,KAAK,EACV,GAA2B,EAC3B,GAAa,EACb,IAAkB,EAClB,EAAE;QACF,IAAI,CAAC;YACH,kCAAkC;YAClC,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YAEzC,2DAA2D;YAC3D,MAAM,OAAO,CAAC;gBACZ,GAAG;gBACH,GAAG;gBACH,IAAI,EAAE,UAAU;aACjB,CAAC,CAAA;YAEF,yEAAyE;YACzE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;YAC9B,CAAC;YAED,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,iCAAiC;YACjC,IAAI,GAAG,YAAY,cAAQ,EAAE,CAAC;gBAC5B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBAC1B,KAAK,EAAE,sBAAsB;oBAC7B,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,kCAAkC;iBACvD,CAAC,CAAA;YACJ,CAAC;YAED,yDAAyD;YACzD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,KAAK,EAAE,uBAAuB;gBAC9B,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAC9D,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AA/CY,QAAA,aAAa,iBA+CzB"}
|
|
@@ -20,8 +20,8 @@ export interface WinstonCloudRunConfig {
|
|
|
20
20
|
*
|
|
21
21
|
* Log level is set like this: ```production ? 'error' : 'debug'```
|
|
22
22
|
*/
|
|
23
|
-
export declare function getWinstonCloudRunConfig({ appName, appVersion, production, environment, getTrace, getLabels
|
|
23
|
+
export declare function getWinstonCloudRunConfig({ appName, appVersion, production, environment, getTrace, getLabels }: WinstonCloudRunConfig): LoggerOptions;
|
|
24
24
|
/**
|
|
25
25
|
* Creates Winston format that specifies time and renames level to severity
|
|
26
26
|
*/
|
|
27
|
-
export declare function getCloudLoggingFormat({ getTrace, getLabels, environment
|
|
27
|
+
export declare function getCloudLoggingFormat({ getTrace, getLabels, environment }?: Pick<WinstonCloudRunConfig, 'getLabels' | 'getTrace' | 'environment'>): Format;
|
|
@@ -11,12 +11,12 @@ const logs_middleware_1 = require("../logs.middleware");
|
|
|
11
11
|
*
|
|
12
12
|
* Log level is set like this: ```production ? 'error' : 'debug'```
|
|
13
13
|
*/
|
|
14
|
-
function getWinstonCloudRunConfig({ appName, appVersion, production, environment, getTrace, getLabels
|
|
14
|
+
function getWinstonCloudRunConfig({ appName, appVersion, production, environment, getTrace, getLabels }) {
|
|
15
15
|
const logTransports = [];
|
|
16
16
|
if (environment === 'local') {
|
|
17
17
|
const consoleLogger = new winston_1.transports.Console({
|
|
18
|
-
format: winston_1.format.combine(winston_1.format.colorize(), winston_1.format.printf(
|
|
19
|
-
level: 'debug'
|
|
18
|
+
format: winston_1.format.combine(winston_1.format.colorize(), winston_1.format.printf(info => `[${(0, colors_1.blue)((0, logs_middleware_1.getCurrentTimeFormatted)())}] ${info.level}: ${info.message}`)),
|
|
19
|
+
level: 'debug'
|
|
20
20
|
});
|
|
21
21
|
logTransports.push(consoleLogger);
|
|
22
22
|
}
|
|
@@ -24,19 +24,19 @@ function getWinstonCloudRunConfig({ appName, appVersion, production, environment
|
|
|
24
24
|
logTransports.push(new logging_winston_1.LoggingWinston({
|
|
25
25
|
serviceContext: {
|
|
26
26
|
service: appName,
|
|
27
|
-
version: appVersion
|
|
27
|
+
version: appVersion
|
|
28
28
|
},
|
|
29
29
|
labels: {
|
|
30
30
|
environment,
|
|
31
|
-
service: appName
|
|
31
|
+
service: appName
|
|
32
32
|
},
|
|
33
|
-
defaultCallback:
|
|
33
|
+
defaultCallback: err => {
|
|
34
34
|
if (err) {
|
|
35
35
|
console.error('Logging failed:', err);
|
|
36
36
|
}
|
|
37
37
|
},
|
|
38
38
|
level: 'error',
|
|
39
|
-
redirectToStdout: true
|
|
39
|
+
redirectToStdout: true
|
|
40
40
|
}));
|
|
41
41
|
}
|
|
42
42
|
return {
|
|
@@ -44,19 +44,19 @@ function getWinstonCloudRunConfig({ appName, appVersion, production, environment
|
|
|
44
44
|
format: getCloudLoggingFormat({ getTrace, getLabels, environment }),
|
|
45
45
|
transports: logTransports,
|
|
46
46
|
handleRejections: true,
|
|
47
|
-
handleExceptions: true
|
|
47
|
+
handleExceptions: true
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
51
51
|
* Creates Winston format that specifies time and renames level to severity
|
|
52
52
|
*/
|
|
53
|
-
function getCloudLoggingFormat({ getTrace, getLabels, environment
|
|
54
|
-
environment: 'local'
|
|
53
|
+
function getCloudLoggingFormat({ getTrace, getLabels, environment } = {
|
|
54
|
+
environment: 'local'
|
|
55
55
|
}) {
|
|
56
56
|
const traceInfo = getTrace ? getTraceInfo(getTrace) : {};
|
|
57
57
|
const logFormat = [
|
|
58
58
|
winston_1.format.errors({ stack: true }),
|
|
59
|
-
(0, winston_1.format)(
|
|
59
|
+
(0, winston_1.format)(info => {
|
|
60
60
|
const { level } = info;
|
|
61
61
|
return {
|
|
62
62
|
...info,
|
|
@@ -64,10 +64,10 @@ function getCloudLoggingFormat({ getTrace, getLabels, environment, } = {
|
|
|
64
64
|
severity: environment === 'local' ? undefined : level.toUpperCase(),
|
|
65
65
|
time: environment === 'local' ? undefined : new Date().toISOString(),
|
|
66
66
|
...(getLabels && {
|
|
67
|
-
'logging.googleapis.com/labels': getLabels()
|
|
68
|
-
})
|
|
67
|
+
'logging.googleapis.com/labels': getLabels()
|
|
68
|
+
})
|
|
69
69
|
};
|
|
70
|
-
})()
|
|
70
|
+
})()
|
|
71
71
|
];
|
|
72
72
|
if (environment !== 'local') {
|
|
73
73
|
logFormat.push(winston_1.format.json());
|
|
@@ -80,7 +80,7 @@ function getTraceInfo(getTrace) {
|
|
|
80
80
|
? {
|
|
81
81
|
'logging.googleapis.com/trace': traceId,
|
|
82
82
|
'logging.googleapis.com/spanId': spanId,
|
|
83
|
-
'logging.googleapis.com/trace_sampled': traceSampled
|
|
83
|
+
'logging.googleapis.com/trace_sampled': traceSampled
|
|
84
84
|
}
|
|
85
85
|
: {};
|
|
86
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRun.logger.js","sourceRoot":"","sources":["../../../../src/server/middleware/logger/cloudRun.logger.ts"],"names":[],"mappings":";;AA4BA,4DAqDC;AAKD,sDAgCC;
|
|
1
|
+
{"version":3,"file":"cloudRun.logger.js","sourceRoot":"","sources":["../../../../src/server/middleware/logger/cloudRun.logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,8 @@ const getLogger = (cfg) => {
|
|
|
9
9
|
...(0, cloudRun_logger_1.getWinstonCloudRunConfig)({
|
|
10
10
|
...cfg,
|
|
11
11
|
appName: cfg.appName || consts_1.pkg.name,
|
|
12
|
-
appVersion: cfg.appVersion || consts_1.pkg.version
|
|
13
|
-
})
|
|
12
|
+
appVersion: cfg.appVersion || consts_1.pkg.version
|
|
13
|
+
})
|
|
14
14
|
});
|
|
15
15
|
};
|
|
16
16
|
exports.getLogger = getLogger;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { NextFunction, Request, Response } from 'express';
|
|
2
1
|
import { CommonLogger } from '@goatlab/js-utils';
|
|
2
|
+
import type { NextFunction, Request, Response } from 'express';
|
|
3
3
|
export declare const httpResponseCodeColor: (statusCode: number) => string;
|
|
4
4
|
export declare const httpResponseTimeColor: (msTime: number) => string;
|
|
5
5
|
export declare const getActualRequestDurationInMilliseconds: (start: [number, number]) => number;
|
|
@@ -8,12 +8,10 @@ const httpResponseCodeColor = (statusCode) => {
|
|
|
8
8
|
if (statusCode >= 200 && statusCode < 400) {
|
|
9
9
|
return (0, colors_1.green)(statusCode.toString());
|
|
10
10
|
}
|
|
11
|
-
|
|
11
|
+
if (statusCode >= 400 && statusCode < 500) {
|
|
12
12
|
return (0, colors_1.yellow)(statusCode.toString());
|
|
13
13
|
}
|
|
14
|
-
|
|
15
|
-
return (0, colors_1.red)(statusCode.toString());
|
|
16
|
-
}
|
|
14
|
+
return (0, colors_1.red)(statusCode.toString());
|
|
17
15
|
};
|
|
18
16
|
exports.httpResponseCodeColor = httpResponseCodeColor;
|
|
19
17
|
// Adds color to response time based on duration
|
|
@@ -21,12 +19,10 @@ const httpResponseTimeColor = (msTime) => {
|
|
|
21
19
|
if (msTime >= 0 && msTime < 500) {
|
|
22
20
|
return (0, colors_1.green)(js_utils_1.Time.ms(msTime));
|
|
23
21
|
}
|
|
24
|
-
|
|
22
|
+
if (msTime >= 500 && msTime < 1000) {
|
|
25
23
|
return (0, colors_1.yellow)(js_utils_1.Time.ms(msTime));
|
|
26
24
|
}
|
|
27
|
-
|
|
28
|
-
return (0, colors_1.red)(js_utils_1.Time.ms(msTime));
|
|
29
|
-
}
|
|
25
|
+
return (0, colors_1.red)(js_utils_1.Time.ms(msTime));
|
|
30
26
|
};
|
|
31
27
|
exports.httpResponseTimeColor = httpResponseTimeColor;
|
|
32
28
|
// Utility function to log based on status code
|
|
@@ -50,10 +46,10 @@ const getActualRequestDurationInMilliseconds = (start) => {
|
|
|
50
46
|
exports.getActualRequestDurationInMilliseconds = getActualRequestDurationInMilliseconds;
|
|
51
47
|
const getCurrentTimeFormatted = () => new Date().toISOString();
|
|
52
48
|
exports.getCurrentTimeFormatted = getCurrentTimeFormatted;
|
|
53
|
-
const formatRequestLog = ({ method, url, statusCode, statusMessage, durationInMilliseconds
|
|
49
|
+
const formatRequestLog = ({ method, url, statusCode, statusMessage, durationInMilliseconds }) => {
|
|
54
50
|
return `${(0, colors_1.magenta)(method)}: ${(0, colors_1.bgBlack)(url)} | Response: ${(0, exports.httpResponseCodeColor)(statusCode)} (${statusMessage}) ${(0, exports.httpResponseTimeColor)(durationInMilliseconds)}`;
|
|
55
51
|
};
|
|
56
|
-
function logBatchRequests({ date, method, url, statusCode, statusMessage, durationInMilliseconds, logger
|
|
52
|
+
function logBatchRequests({ date, method, url, statusCode, statusMessage, durationInMilliseconds, logger }) {
|
|
57
53
|
const decodedUrl = decodeURIComponent(url);
|
|
58
54
|
const urlParts = decodedUrl.split('?');
|
|
59
55
|
const baseUrl = urlParts[0] || '';
|
|
@@ -76,7 +72,7 @@ function logBatchRequests({ date, method, url, statusCode, statusMessage, durati
|
|
|
76
72
|
url: endpoint,
|
|
77
73
|
statusCode,
|
|
78
74
|
statusMessage,
|
|
79
|
-
durationInMilliseconds
|
|
75
|
+
durationInMilliseconds
|
|
80
76
|
})} | ${(0, colors_1.yellow)('Batch Params')}: ${JSON.stringify(params, null, 2)}`;
|
|
81
77
|
logMessage(message, statusCode, logger);
|
|
82
78
|
});
|
|
@@ -91,7 +87,7 @@ function logBatchRequests({ date, method, url, statusCode, statusMessage, durati
|
|
|
91
87
|
url: `${baseUrl}?${queryParams.toString()}`,
|
|
92
88
|
statusCode,
|
|
93
89
|
statusMessage,
|
|
94
|
-
durationInMilliseconds
|
|
90
|
+
durationInMilliseconds
|
|
95
91
|
});
|
|
96
92
|
logMessage(message, statusCode, logger);
|
|
97
93
|
}
|
|
@@ -102,7 +98,7 @@ function logBatchRequests({ date, method, url, statusCode, statusMessage, durati
|
|
|
102
98
|
url: baseUrl,
|
|
103
99
|
statusCode,
|
|
104
100
|
statusMessage,
|
|
105
|
-
durationInMilliseconds
|
|
101
|
+
durationInMilliseconds
|
|
106
102
|
});
|
|
107
103
|
logMessage(message, statusCode, logger);
|
|
108
104
|
}
|
|
@@ -121,7 +117,7 @@ const expressRequestLogger = (request, response, next, logger) => {
|
|
|
121
117
|
statusCode,
|
|
122
118
|
statusMessage,
|
|
123
119
|
durationInMilliseconds,
|
|
124
|
-
logger
|
|
120
|
+
logger
|
|
125
121
|
});
|
|
126
122
|
});
|
|
127
123
|
next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/logs.middleware.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"logs.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/logs.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ const { middleware: memoryMiddleware, monitor } = (0, memoryMonitor_middleware_1
|
|
|
27
27
|
});
|
|
28
28
|
app.use(memoryMiddleware);
|
|
29
29
|
// Endpoint to check current memory status
|
|
30
|
-
app.get('/memory-status', (
|
|
30
|
+
app.get('/memory-status', (_req, res) => {
|
|
31
31
|
const metrics = monitor.getLastMetrics();
|
|
32
32
|
const memUsage = process.memoryUsage();
|
|
33
33
|
res.json({
|
|
@@ -37,12 +37,14 @@ app.get('/memory-status', (req, res) => {
|
|
|
37
37
|
heapUsedPercent: ((memUsage.heapUsed / memUsage.heapTotal) * 100).toFixed(1),
|
|
38
38
|
rssMB: (memUsage.rss / (1024 * 1024)).toFixed(2)
|
|
39
39
|
},
|
|
40
|
-
lastMonitored: metrics
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
40
|
+
lastMonitored: metrics
|
|
41
|
+
? {
|
|
42
|
+
heapUsedMB: metrics.heapUsedMB.toFixed(2),
|
|
43
|
+
heapTotalMB: metrics.heapTotalMB.toFixed(2),
|
|
44
|
+
heapUsedPercent: metrics.heapUsedPercentage.toFixed(1),
|
|
45
|
+
timestamp: new Date(metrics.timestamp).toISOString()
|
|
46
|
+
}
|
|
47
|
+
: null,
|
|
46
48
|
thresholds: {
|
|
47
49
|
warning: '70%',
|
|
48
50
|
critical: '85%'
|
|
@@ -51,7 +53,7 @@ app.get('/memory-status', (req, res) => {
|
|
|
51
53
|
});
|
|
52
54
|
// Endpoint to simulate memory leak (for testing)
|
|
53
55
|
let leakedData = [];
|
|
54
|
-
app.get('/leak-memory', (
|
|
56
|
+
app.get('/leak-memory', (_req, res) => {
|
|
55
57
|
// Allocate 10MB of memory
|
|
56
58
|
const size = 10 * 1024 * 1024;
|
|
57
59
|
const buffer = Buffer.alloc(size);
|
|
@@ -63,7 +65,7 @@ app.get('/leak-memory', (req, res) => {
|
|
|
63
65
|
});
|
|
64
66
|
});
|
|
65
67
|
// Endpoint to clear leaked memory
|
|
66
|
-
app.get('/clear-memory', (
|
|
68
|
+
app.get('/clear-memory', (_req, res) => {
|
|
67
69
|
const beforeMB = (process.memoryUsage().heapUsed / (1024 * 1024)).toFixed(2);
|
|
68
70
|
leakedData = [];
|
|
69
71
|
// Force garbage collection if available
|
|
@@ -76,12 +78,12 @@ app.get('/clear-memory', (req, res) => {
|
|
|
76
78
|
message: 'Memory cleared',
|
|
77
79
|
beforeMB,
|
|
78
80
|
afterMB,
|
|
79
|
-
freedMB: (parseFloat(beforeMB) - parseFloat(afterMB)).toFixed(2)
|
|
81
|
+
freedMB: (Number.parseFloat(beforeMB) - Number.parseFloat(afterMB)).toFixed(2)
|
|
80
82
|
});
|
|
81
83
|
}, 100);
|
|
82
84
|
});
|
|
83
85
|
// Health endpoint showing memory in response
|
|
84
|
-
app.get('/health', (
|
|
86
|
+
app.get('/health', (_req, res) => {
|
|
85
87
|
res.json({ status: 'ok', timestamp: new Date().toISOString() });
|
|
86
88
|
});
|
|
87
89
|
const server = app.listen(port, () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryMonitor.example.js","sourceRoot":"","sources":["../../../src/server/middleware/memoryMonitor.example.ts"],"names":[],"mappings":";AAAA,+DAA+D;;AAE/D;;;;;;;;;;;GAWG;AAEH,qCAA6B;AAC7B,yEAA0E;AAE1E,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAA;AACrB,MAAM,IAAI,GAAG,IAAI,CAAA;AAEjB,4DAA4D;AAC5D,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,OAAO,EAAE,GAAG,IAAA,wDAA6B,
|
|
1
|
+
{"version":3,"file":"memoryMonitor.example.js","sourceRoot":"","sources":["../../../src/server/middleware/memoryMonitor.example.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { Request, Response, NextFunction } from 'express';
|
|
2
1
|
import { CommonLogger } from '@goatlab/js-utils';
|
|
2
|
+
import type { NextFunction, Request, Response } from 'express';
|
|
3
3
|
interface MemoryMonitorOptions {
|
|
4
4
|
logger?: CommonLogger;
|
|
5
5
|
warningThreshold?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryMonitor.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/memoryMonitor.middleware.ts"],"names":[],"mappings":";AAAA,0EAA0E;;
|
|
1
|
+
{"version":3,"file":"memoryMonitor.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/memoryMonitor.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { Request, Response, NextFunction } from 'express';
|
|
2
1
|
import type { HttpError, HttpErrorData } from '@goatlab/js-utils';
|
|
2
|
+
import type { NextFunction, Request, Response } from 'express';
|
|
3
3
|
/**
|
|
4
4
|
* Sanitize error messages for production environment
|
|
5
5
|
* Prevents leaking sensitive information in error responses
|
|
@@ -13,4 +13,4 @@ export declare function productionErrorHandler(): (err: any, req: Request, res:
|
|
|
13
13
|
/**
|
|
14
14
|
* Async error wrapper to catch errors in async route handlers
|
|
15
15
|
*/
|
|
16
|
-
export declare function asyncErrorHandler(fn:
|
|
16
|
+
export declare function asyncErrorHandler(fn: (req: Request, res: Response, next: NextFunction) => Promise<unknown> | unknown): (req: Request, res: Response, next: NextFunction) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"productionError.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/productionError.middleware.ts"],"names":[],"mappings":";;AASA,gEAyCC;AAMD,wDAwCC;AAKD,
|
|
1
|
+
{"version":3,"file":"productionError.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/productionError.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { CorsOptions } from 'cors';
|
|
2
|
-
import type { HelmetOptions } from 'helmet';
|
|
3
2
|
import type { RateLimitRequestHandler } from 'express-rate-limit';
|
|
4
3
|
import rateLimit from 'express-rate-limit';
|
|
4
|
+
import type { HelmetOptions } from 'helmet';
|
|
5
5
|
/**
|
|
6
6
|
* Get CORS configuration based on environment
|
|
7
7
|
*/
|
|
@@ -122,7 +122,7 @@ function createAuthRateLimiter() {
|
|
|
122
122
|
*/
|
|
123
123
|
function createApiRateLimiter() {
|
|
124
124
|
const maxRequests = process.env.API_RATE_LIMIT
|
|
125
|
-
? parseInt(process.env.API_RATE_LIMIT, 10)
|
|
125
|
+
? Number.parseInt(process.env.API_RATE_LIMIT, 10)
|
|
126
126
|
: 100;
|
|
127
127
|
return createRateLimiter({
|
|
128
128
|
windowMs: 15 * 60 * 1000, // 15 minutes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/security.middleware.ts"],"names":[],"mappings":";;AAQA,wCAsCC;AAKD,4CAoCC;AAKD,8CAuBC;AAKD,sDAOC;AAKD,oDAUC;AAKD,8DAoBC;
|
|
1
|
+
{"version":3,"file":"security.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/security.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@ const js_utils_1 = require("@goatlab/js-utils");
|
|
|
5
5
|
const colors_1 = require("kleur/colors");
|
|
6
6
|
// dist/@trpc/server/http
|
|
7
7
|
const reportOnly5xx = false;
|
|
8
|
-
function trpcErrorMiddleware({ error, sentryService
|
|
8
|
+
function trpcErrorMiddleware({ error, sentryService }) {
|
|
9
9
|
const originalError = js_utils_1.Errors.anyToError(error, Error, {
|
|
10
|
-
stringifyFn: js_utils_1.Inspect.anyStringifyFn
|
|
10
|
+
stringifyFn: js_utils_1.Inspect.anyStringifyFn
|
|
11
11
|
});
|
|
12
12
|
let errorId;
|
|
13
13
|
if (sentryService && shouldReportToSentry(originalError)) {
|
|
@@ -22,13 +22,16 @@ function trpcErrorMiddleware({ error, sentryService, }) {
|
|
|
22
22
|
function shouldReportToSentry(error) {
|
|
23
23
|
const e = error;
|
|
24
24
|
// By default - report
|
|
25
|
-
if (!e.data)
|
|
25
|
+
if (!e.data) {
|
|
26
26
|
return true;
|
|
27
|
+
}
|
|
27
28
|
// If `report` is set - do as it says
|
|
28
|
-
if (e.data.report === true)
|
|
29
|
+
if (e.data.report === true) {
|
|
29
30
|
return true;
|
|
30
|
-
|
|
31
|
+
}
|
|
32
|
+
if (e.data.report === false) {
|
|
31
33
|
return false;
|
|
34
|
+
}
|
|
32
35
|
// Report if http 5xx, otherwise not
|
|
33
36
|
// If no httpCode - report
|
|
34
37
|
// if httpCode >= 500 - report
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trpcError.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/trpcError.middleware.ts"],"names":[],"mappings":";;AAQA,kDAuBC;AA9BD,gDAAmD;AACnD,yCAA2C;AAG3C,yBAAyB;AACzB,MAAM,aAAa,GAAG,KAAK,CAAA;AAE3B,SAAgB,mBAAmB,CAAC,EAClC,KAAK,EACL,aAAa,
|
|
1
|
+
{"version":3,"file":"trpcError.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/trpcError.middleware.ts"],"names":[],"mappings":";;AAQA,kDAuBC;AA9BD,gDAAmD;AACnD,yCAA2C;AAG3C,yBAAyB;AACzB,MAAM,aAAa,GAAG,KAAK,CAAA;AAE3B,SAAgB,mBAAmB,CAAC,EAClC,KAAK,EACL,aAAa,EAC0B;IACvC,MAAM,aAAa,GAAG,iBAAM,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE;QACpD,WAAW,EAAE,kBAAO,CAAC,cAAc;KACpC,CAAC,CAAA;IAEF,IAAI,OAA2B,CAAA;IAE/B,IAAI,aAAa,IAAI,oBAAoB,CAAC,aAAa,CAAC,EAAE,CAAC;QACzD,OAAO,GAAG,aAAa,CAAC,gBAAgB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;IAChE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAEpB,MAAM,YAAY,GAAG,GAAG,IAAA,gBAAO,EAAC,OAAO,CAAC,KAAK,IAAA,YAAG,EAAC,KAAK,CAAC,IAAI,CAAC,MAC1D,KAAK,CAAC,OACR,EAAE,CAAA;IAEF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAC1B,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IAC3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;AAC1B,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAY;IACxC,MAAM,CAAC,GAAG,KAAkB,CAAA;IAE5B,sBAAsB;IACtB,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACZ,OAAO,IAAI,CAAA;IACb,CAAC;IAED,qCAAqC;IACrC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,oCAAoC;IACpC,0BAA0B;IAC1B,8BAA8B;IAC9B,mDAAmD;IACnD,OAAO,CACL,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,IAAI,GAAG,CACzE,CAAA;AACH,CAAC"}
|
|
@@ -16,13 +16,13 @@ exports.firebaseDecodedTokenSchema = zod_1.z.object({
|
|
|
16
16
|
displayName: zod_1.z.string().optional(),
|
|
17
17
|
name: zod_1.z.string().optional(),
|
|
18
18
|
ownerId: zod_1.z.string().optional(),
|
|
19
|
-
user_id: zod_1.z.string().optional()
|
|
19
|
+
user_id: zod_1.z.string().optional()
|
|
20
20
|
});
|
|
21
21
|
exports.internalTokenSchema = zod_1.z.object({
|
|
22
|
-
tokenPurpose: zod_1.z.string().optional()
|
|
22
|
+
tokenPurpose: zod_1.z.string().optional()
|
|
23
23
|
});
|
|
24
24
|
exports.requestTokenSchema = zod_1.z.union([
|
|
25
25
|
exports.firebaseDecodedTokenSchema,
|
|
26
|
-
exports.internalTokenSchema
|
|
26
|
+
exports.internalTokenSchema
|
|
27
27
|
]);
|
|
28
28
|
//# sourceMappingURL=user.schema.js.map
|