@goatlab/node-backend 1.1.20 → 1.1.22
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 +5 -5
- package/dist/Cache.js.map +1 -1
- package/dist/cache/KeyvLrus.js +1 -1
- package/dist/cache/LazyRedisStore.js +1 -1
- package/dist/cache/RedisConnectionPool.js +1 -1
- package/dist/container/Container.js +20 -20
- package/dist/container/Container.js.map +1 -1
- package/dist/container/DistributedCacheInvalidator.js +4 -4
- package/dist/container/examples/batch-operations.example.js +18 -18
- package/dist/container/examples/batch-operations.example.js.map +1 -1
- package/dist/index.d.ts +6 -6
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js +23 -23
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js.map +1 -1
- package/dist/server/bootstraps/getExpressTrpcApp.js +24 -24
- package/dist/server/bootstraps/getExpressTrpcApp.js.map +1 -1
- package/dist/server/consts.js +1 -1
- package/dist/server/context/request.context.js +5 -5
- package/dist/server/context/trpc.context.d.ts +1 -1
- package/dist/server/context/trpc.context.js +1 -1
- package/dist/server/context/trpc.context.js.map +1 -1
- package/dist/server/initOpenApiDocs.d.ts +1 -1
- package/dist/server/initOpenApiDocs.js +2 -2
- package/dist/server/initOpenApiDocs.js.map +1 -1
- package/dist/server/middleware/cloudTaskDecrypt.middleware.d.ts +1 -1
- package/dist/server/middleware/cloudTaskDecrypt.middleware.js +3 -3
- package/dist/server/middleware/cloudTaskDecrypt.middleware.js.map +1 -1
- package/dist/server/middleware/error.middleware.js +2 -2
- 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 +12 -12
- 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.js +6 -6
- package/dist/server/middleware/logs.middleware.js.map +1 -1
- package/dist/server/middleware/memoryMonitor.example.js +7 -7
- package/dist/server/middleware/memoryMonitor.example.js.map +1 -1
- package/dist/server/middleware/memoryMonitor.middleware.js +2 -2
- package/dist/server/middleware/productionError.middleware.js +6 -6
- package/dist/server/middleware/security.middleware.js +11 -11
- 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 +2 -2
- 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.js +10 -10
- package/dist/server/services/email/email.model.js +1 -1
- package/dist/server/services/email/email.service.d.ts +2 -2
- 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 +16 -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/secret.service.js +5 -5
- package/dist/server/services/sendgrid/sendgridApi.service.d.ts +1 -1
- package/dist/server/services/sendgrid/sendgridApi.service.js +16 -14
- package/dist/server/services/sendgrid/sendgridApi.service.js.map +1 -1
- package/dist/server/services/translations/translation.model.js +1 -1
- package/dist/server/services/util/benchmarker.js +3 -3
- package/dist/server/services/util/benchmarker.js.map +1 -1
- package/dist/server/services/util/pagination.d.ts +3 -3
- 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.js +10 -10
- package/dist/server/types/Envinronment.d.ts +1 -1
- package/dist/server/zod-compat.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
|
@@ -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
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'
|
|
19
|
+
level: 'debug',
|
|
20
20
|
});
|
|
21
21
|
logTransports.push(consoleLogger);
|
|
22
22
|
}
|
|
@@ -24,11 +24,11 @@ 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
33
|
defaultCallback: err => {
|
|
34
34
|
if (err) {
|
|
@@ -36,7 +36,7 @@ function getWinstonCloudRunConfig({ appName, appVersion, production, environment
|
|
|
36
36
|
}
|
|
37
37
|
},
|
|
38
38
|
level: 'error',
|
|
39
|
-
redirectToStdout: true
|
|
39
|
+
redirectToStdout: true,
|
|
40
40
|
}));
|
|
41
41
|
}
|
|
42
42
|
return {
|
|
@@ -44,14 +44,14 @@ 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 = [
|
|
@@ -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;AAtHD,mEAA8D;AAC9D,yCAAmC;AAGnC,qCAA4C;AAE5C,wDAA4D;AAiB5D;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,EACvC,OAAO,EACP,UAAU,EACV,UAAU,EACV,WAAW,EACX,QAAQ,EACR,SAAS,
|
|
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;
|
|
@@ -46,10 +46,10 @@ const getActualRequestDurationInMilliseconds = (start) => {
|
|
|
46
46
|
exports.getActualRequestDurationInMilliseconds = getActualRequestDurationInMilliseconds;
|
|
47
47
|
const getCurrentTimeFormatted = () => new Date().toISOString();
|
|
48
48
|
exports.getCurrentTimeFormatted = getCurrentTimeFormatted;
|
|
49
|
-
const formatRequestLog = ({ method, url, statusCode, statusMessage, durationInMilliseconds }) => {
|
|
49
|
+
const formatRequestLog = ({ method, url, statusCode, statusMessage, durationInMilliseconds, }) => {
|
|
50
50
|
return `${(0, colors_1.magenta)(method)}: ${(0, colors_1.bgBlack)(url)} | Response: ${(0, exports.httpResponseCodeColor)(statusCode)} (${statusMessage}) ${(0, exports.httpResponseTimeColor)(durationInMilliseconds)}`;
|
|
51
51
|
};
|
|
52
|
-
function logBatchRequests({ date, method, url, statusCode, statusMessage, durationInMilliseconds, logger }) {
|
|
52
|
+
function logBatchRequests({ date, method, url, statusCode, statusMessage, durationInMilliseconds, logger, }) {
|
|
53
53
|
const decodedUrl = decodeURIComponent(url);
|
|
54
54
|
const urlParts = decodedUrl.split('?');
|
|
55
55
|
const baseUrl = urlParts[0] || '';
|
|
@@ -72,7 +72,7 @@ function logBatchRequests({ date, method, url, statusCode, statusMessage, durati
|
|
|
72
72
|
url: endpoint,
|
|
73
73
|
statusCode,
|
|
74
74
|
statusMessage,
|
|
75
|
-
durationInMilliseconds
|
|
75
|
+
durationInMilliseconds,
|
|
76
76
|
})} | ${(0, colors_1.yellow)('Batch Params')}: ${JSON.stringify(params, null, 2)}`;
|
|
77
77
|
logMessage(message, statusCode, logger);
|
|
78
78
|
});
|
|
@@ -87,7 +87,7 @@ function logBatchRequests({ date, method, url, statusCode, statusMessage, durati
|
|
|
87
87
|
url: `${baseUrl}?${queryParams.toString()}`,
|
|
88
88
|
statusCode,
|
|
89
89
|
statusMessage,
|
|
90
|
-
durationInMilliseconds
|
|
90
|
+
durationInMilliseconds,
|
|
91
91
|
});
|
|
92
92
|
logMessage(message, statusCode, logger);
|
|
93
93
|
}
|
|
@@ -98,7 +98,7 @@ function logBatchRequests({ date, method, url, statusCode, statusMessage, durati
|
|
|
98
98
|
url: baseUrl,
|
|
99
99
|
statusCode,
|
|
100
100
|
statusMessage,
|
|
101
|
-
durationInMilliseconds
|
|
101
|
+
durationInMilliseconds,
|
|
102
102
|
});
|
|
103
103
|
logMessage(message, statusCode, logger);
|
|
104
104
|
}
|
|
@@ -117,7 +117,7 @@ const expressRequestLogger = (request, response, next, logger) => {
|
|
|
117
117
|
statusCode,
|
|
118
118
|
statusMessage,
|
|
119
119
|
durationInMilliseconds,
|
|
120
|
-
logger
|
|
120
|
+
logger,
|
|
121
121
|
});
|
|
122
122
|
});
|
|
123
123
|
next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/logs.middleware.ts"],"names":[],"mappings":";;;AAAA,gDAAsD;AAEtD,yCAAmE;AAEnE,uDAAuD;AAChD,MAAM,qBAAqB,GAAG,CAAC,UAAkB,EAAU,EAAE;IAClE,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;QAC1C,OAAO,IAAA,cAAK,EAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;IACrC,CAAC;IACD,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;QAC1C,OAAO,IAAA,eAAM,EAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,IAAA,YAAG,EAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;AACnC,CAAC,CAAA;AARY,QAAA,qBAAqB,yBAQjC;AAED,gDAAgD;AACzC,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAU,EAAE;IAC9D,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,GAAG,GAAG,EAAE,CAAC;QAChC,OAAO,IAAA,cAAK,EAAC,eAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAC/B,CAAC;IACD,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,IAAI,EAAE,CAAC;QACnC,OAAO,IAAA,eAAM,EAAC,eAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAChC,CAAC;IACD,OAAO,IAAA,YAAG,EAAC,eAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;AAC7B,CAAC,CAAA;AARY,QAAA,qBAAqB,yBAQjC;AAED,+CAA+C;AAC/C,MAAM,UAAU,GAAG,CACjB,OAAe,EACf,UAAkB,EAClB,MAAoB,EACpB,EAAE;IACF,IAAI,UAAU,IAAI,GAAG,EAAE,CAAC;QACtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC;SAAM,IAAI,UAAU,IAAI,GAAG,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC;AACH,CAAC,CAAA;AAEM,MAAM,sCAAsC,GAAG,CACpD,KAAuB,EACf,EAAE;IACV,MAAM,UAAU,GAAG,GAAG,CAAA,CAAC,yBAAyB;IAChD,MAAM,QAAQ,GAAG,GAAG,CAAA,CAAC,0BAA0B;IAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAClC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAA;AACpD,CAAC,CAAA;AAPY,QAAA,sCAAsC,0CAOlD;AAEM,MAAM,uBAAuB,GAAG,GAAW,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;AAAhE,QAAA,uBAAuB,2BAAyC;AAE7E,MAAM,gBAAgB,GAAG,CAAC,EACxB,MAAM,EACN,GAAG,EACH,UAAU,EACV,aAAa,EACb,sBAAsB,
|
|
1
|
+
{"version":3,"file":"logs.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/logs.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ const { middleware: memoryMiddleware, monitor } = (0, memoryMonitor_middleware_1
|
|
|
23
23
|
criticalThreshold: 85, // Critical at 85% heap usage
|
|
24
24
|
monitorInterval: 5000, // Check every 5 seconds
|
|
25
25
|
enableGarbageCollection: true,
|
|
26
|
-
addHeaders: true // Add memory info to response headers
|
|
26
|
+
addHeaders: true, // Add memory info to response headers
|
|
27
27
|
});
|
|
28
28
|
app.use(memoryMiddleware);
|
|
29
29
|
// Endpoint to check current memory status
|
|
@@ -35,20 +35,20 @@ app.get('/memory-status', (_req, res) => {
|
|
|
35
35
|
heapUsedMB: (memUsage.heapUsed / (1024 * 1024)).toFixed(2),
|
|
36
36
|
heapTotalMB: (memUsage.heapTotal / (1024 * 1024)).toFixed(2),
|
|
37
37
|
heapUsedPercent: ((memUsage.heapUsed / memUsage.heapTotal) * 100).toFixed(1),
|
|
38
|
-
rssMB: (memUsage.rss / (1024 * 1024)).toFixed(2)
|
|
38
|
+
rssMB: (memUsage.rss / (1024 * 1024)).toFixed(2),
|
|
39
39
|
},
|
|
40
40
|
lastMonitored: metrics
|
|
41
41
|
? {
|
|
42
42
|
heapUsedMB: metrics.heapUsedMB.toFixed(2),
|
|
43
43
|
heapTotalMB: metrics.heapTotalMB.toFixed(2),
|
|
44
44
|
heapUsedPercent: metrics.heapUsedPercentage.toFixed(1),
|
|
45
|
-
timestamp: new Date(metrics.timestamp).toISOString()
|
|
45
|
+
timestamp: new Date(metrics.timestamp).toISOString(),
|
|
46
46
|
}
|
|
47
47
|
: null,
|
|
48
48
|
thresholds: {
|
|
49
49
|
warning: '70%',
|
|
50
|
-
critical: '85%'
|
|
51
|
-
}
|
|
50
|
+
critical: '85%',
|
|
51
|
+
},
|
|
52
52
|
});
|
|
53
53
|
});
|
|
54
54
|
// Endpoint to simulate memory leak (for testing)
|
|
@@ -61,7 +61,7 @@ app.get('/leak-memory', (_req, res) => {
|
|
|
61
61
|
res.json({
|
|
62
62
|
message: 'Allocated 10MB',
|
|
63
63
|
totalLeaked: `${leakedData.length * 10}MB`,
|
|
64
|
-
currentHeapMB: (process.memoryUsage().heapUsed / (1024 * 1024)).toFixed(2)
|
|
64
|
+
currentHeapMB: (process.memoryUsage().heapUsed / (1024 * 1024)).toFixed(2),
|
|
65
65
|
});
|
|
66
66
|
});
|
|
67
67
|
// Endpoint to clear leaked memory
|
|
@@ -78,7 +78,7 @@ app.get('/clear-memory', (_req, res) => {
|
|
|
78
78
|
message: 'Memory cleared',
|
|
79
79
|
beforeMB,
|
|
80
80
|
afterMB,
|
|
81
|
-
freedMB: (Number.parseFloat(beforeMB) - Number.parseFloat(afterMB)).toFixed(2)
|
|
81
|
+
freedMB: (Number.parseFloat(beforeMB) - Number.parseFloat(afterMB)).toFixed(2),
|
|
82
82
|
});
|
|
83
83
|
}, 100);
|
|
84
84
|
});
|
|
@@ -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,EAC7E;IACE,gBAAgB,EAAE,EAAE,EAAE,yBAAyB;IAC/C,iBAAiB,EAAE,EAAE,EAAE,6BAA6B;IACpD,eAAe,EAAE,IAAI,EAAE,wBAAwB;IAC/C,uBAAuB,EAAE,IAAI;IAC7B,UAAU,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"memoryMonitor.example.js","sourceRoot":"","sources":["../../../src/server/middleware/memoryMonitor.example.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ class MemoryMonitor {
|
|
|
38
38
|
heapTotalMB,
|
|
39
39
|
heapUsedPercentage,
|
|
40
40
|
rssMB,
|
|
41
|
-
timestamp: Date.now()
|
|
41
|
+
timestamp: Date.now(),
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
44
|
formatMemoryMetrics(metrics) {
|
|
@@ -123,7 +123,7 @@ function createMemoryMonitorMiddleware(options) {
|
|
|
123
123
|
}
|
|
124
124
|
return {
|
|
125
125
|
middleware: monitor.middleware(),
|
|
126
|
-
monitor
|
|
126
|
+
monitor,
|
|
127
127
|
};
|
|
128
128
|
}
|
|
129
129
|
// Convenience middleware function for simple usage
|
|
@@ -23,7 +23,7 @@ function sanitizeErrorForProduction(error) {
|
|
|
23
23
|
sanitizedError.data = {
|
|
24
24
|
httpStatusCode: error.data.httpStatusCode,
|
|
25
25
|
errorId: error.data.errorId,
|
|
26
|
-
timestamp: new Date().toISOString()
|
|
26
|
+
timestamp: new Date().toISOString(),
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
29
|
else if (error.data?.httpStatusCode && error.data.httpStatusCode >= 400) {
|
|
@@ -37,7 +37,7 @@ function sanitizeErrorForProduction(error) {
|
|
|
37
37
|
errorId,
|
|
38
38
|
message: message || sanitizedError.message,
|
|
39
39
|
code,
|
|
40
|
-
timestamp: new Date().toISOString()
|
|
40
|
+
timestamp: new Date().toISOString(),
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
}
|
|
@@ -68,8 +68,8 @@ function productionErrorHandler() {
|
|
|
68
68
|
method: req.method,
|
|
69
69
|
url: req.originalUrl,
|
|
70
70
|
ip: req.ip,
|
|
71
|
-
userAgent: req.get('user-agent')
|
|
72
|
-
}
|
|
71
|
+
userAgent: req.get('user-agent'),
|
|
72
|
+
},
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
75
|
// Send sanitized response
|
|
@@ -78,8 +78,8 @@ function productionErrorHandler() {
|
|
|
78
78
|
message: sanitizedError.message,
|
|
79
79
|
code: sanitizedError.data?.code,
|
|
80
80
|
errorId: sanitizedError.data?.errorId,
|
|
81
|
-
timestamp: sanitizedError.data?.timestamp || new Date().toISOString()
|
|
82
|
-
}
|
|
81
|
+
timestamp: sanitizedError.data?.timestamp || new Date().toISOString(),
|
|
82
|
+
},
|
|
83
83
|
});
|
|
84
84
|
};
|
|
85
85
|
}
|
|
@@ -36,10 +36,10 @@ function getCorsOptions() {
|
|
|
36
36
|
'X-Request-ID',
|
|
37
37
|
'X-RateLimit-Limit',
|
|
38
38
|
'X-RateLimit-Remaining',
|
|
39
|
-
'X-RateLimit-Reset'
|
|
39
|
+
'X-RateLimit-Reset',
|
|
40
40
|
],
|
|
41
41
|
maxAge: 86400, // 24 hours
|
|
42
|
-
optionsSuccessStatus: 200 // Some legacy browsers choke on 204
|
|
42
|
+
optionsSuccessStatus: 200, // Some legacy browsers choke on 204
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
/**
|
|
@@ -64,13 +64,13 @@ function getHelmetOptions() {
|
|
|
64
64
|
baseUri: ["'self'"],
|
|
65
65
|
formAction: ["'self'"],
|
|
66
66
|
frameAncestors: ["'none'"],
|
|
67
|
-
upgradeInsecureRequests: []
|
|
68
|
-
}
|
|
67
|
+
upgradeInsecureRequests: [],
|
|
68
|
+
},
|
|
69
69
|
},
|
|
70
70
|
hsts: {
|
|
71
71
|
maxAge: 31536000, // 1 year
|
|
72
72
|
includeSubDomains: true,
|
|
73
|
-
preload: true
|
|
73
|
+
preload: true,
|
|
74
74
|
},
|
|
75
75
|
noSniff: true,
|
|
76
76
|
xssFilter: true,
|
|
@@ -78,7 +78,7 @@ function getHelmetOptions() {
|
|
|
78
78
|
permittedCrossDomainPolicies: false,
|
|
79
79
|
hidePoweredBy: true,
|
|
80
80
|
ieNoOpen: true,
|
|
81
|
-
frameguard: { action: 'deny' }
|
|
81
|
+
frameguard: { action: 'deny' },
|
|
82
82
|
};
|
|
83
83
|
}
|
|
84
84
|
/**
|
|
@@ -99,11 +99,11 @@ function createRateLimiter(options) {
|
|
|
99
99
|
error: {
|
|
100
100
|
code: 'RATE_LIMIT_EXCEEDED',
|
|
101
101
|
message: 'Too many requests, please try again later.',
|
|
102
|
-
retryAfter: res.getHeader('Retry-After')
|
|
103
|
-
}
|
|
102
|
+
retryAfter: res.getHeader('Retry-After'),
|
|
103
|
+
},
|
|
104
104
|
});
|
|
105
105
|
},
|
|
106
|
-
...options
|
|
106
|
+
...options,
|
|
107
107
|
});
|
|
108
108
|
}
|
|
109
109
|
/**
|
|
@@ -114,7 +114,7 @@ function createAuthRateLimiter() {
|
|
|
114
114
|
windowMs: 15 * 60 * 1000, // 15 minutes
|
|
115
115
|
max: 5, // Limit each IP to 5 requests per windowMs
|
|
116
116
|
skipSuccessfulRequests: true, // Don't count successful requests
|
|
117
|
-
message: 'Too many authentication attempts, please try again later.'
|
|
117
|
+
message: 'Too many authentication attempts, please try again later.',
|
|
118
118
|
});
|
|
119
119
|
}
|
|
120
120
|
/**
|
|
@@ -127,7 +127,7 @@ function createApiRateLimiter() {
|
|
|
127
127
|
return createRateLimiter({
|
|
128
128
|
windowMs: 15 * 60 * 1000, // 15 minutes
|
|
129
129
|
max: maxRequests,
|
|
130
|
-
message: 'API rate limit exceeded, please try again later.'
|
|
130
|
+
message: 'API rate limit exceeded, please try again later.',
|
|
131
131
|
});
|
|
132
132
|
}
|
|
133
133
|
/**
|
|
@@ -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;AArKD,2DAA0C;AAG1C;;GAEG;AACH,SAAgB,cAAc;IAC5B,MAAM,cAAc,GAClB,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAA;IAE5E,0CAA0C;IAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnE,cAAc,CAAC,IAAI,CACjB,uBAAuB,EACvB,uBAAuB,EACvB,uBAAuB,CACxB,CAAA;IACH,CAAC;IAED,OAAO;QACL,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YAC3B,8DAA8D;YAC9D,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;gBAC/C,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC7B,CAAC;YAED,IAAI,CAAC,MAAM,IAAI,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC/C,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACtB,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;YAC5C,CAAC;QACH,CAAC;QACD,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC;QAC7D,cAAc,EAAE,CAAC,cAAc,EAAE,eAAe,EAAE,cAAc,CAAC;QACjE,cAAc,EAAE;YACd,cAAc;YACd,mBAAmB;YACnB,uBAAuB;YACvB,mBAAmB;SACpB;QACD,MAAM,EAAE,KAAK,EAAE,WAAW;QAC1B,oBAAoB,EAAE,GAAG,
|
|
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)) {
|
|
@@ -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,GAC0B;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
|
|
@@ -10,7 +10,7 @@ const sentry_service_1 = require("./sentry.service");
|
|
|
10
10
|
// https://docs.sentry.io/platforms/node/usage/sdk-fingerprinting/
|
|
11
11
|
// https://docs.sentry.io/product/data-management-settings/event-grouping/fingerprint-rules/#variables
|
|
12
12
|
const DEFAULT = '{{ default }}';
|
|
13
|
-
const getSentry = ({ dns, appVersion, environment }) => {
|
|
13
|
+
const getSentry = ({ dns, appVersion, environment, }) => {
|
|
14
14
|
const sentryService = new sentry_service_1.SentryService({
|
|
15
15
|
dsn: dns,
|
|
16
16
|
release: appVersion || consts_1.pkg.version,
|
|
@@ -34,10 +34,10 @@ const getSentry = ({ dns, appVersion, environment }) => {
|
|
|
34
34
|
return event;
|
|
35
35
|
}
|
|
36
36
|
return event;
|
|
37
|
-
}
|
|
37
|
+
},
|
|
38
38
|
});
|
|
39
39
|
sentryService.sentry().setTags(js_utils_1.Objects.deleteNulls({
|
|
40
|
-
ver: consts_1.pkg.version
|
|
40
|
+
ver: consts_1.pkg.version,
|
|
41
41
|
}));
|
|
42
42
|
return sentryService;
|
|
43
43
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSentry.js","sourceRoot":"","sources":["../../../src/server/sentry/getSentry.ts"],"names":[],"mappings":";;;AACA,gDAA2C;AAC3C,2DAA2D;AAC3D,2DAAiE;AACjE,6BAA8B;AAC9B,sCAA+B;AAC/B,qDAAgD;AAEhD,kEAAkE;AAClE,sGAAsG;AACtG,MAAM,OAAO,GAAG,eAAe,CAAA;AAExB,MAAM,SAAS,GAAG,CAAC,EACxB,GAAG,EACH,UAAU,EACV,WAAW,
|
|
1
|
+
{"version":3,"file":"getSentry.js","sourceRoot":"","sources":["../../../src/server/sentry/getSentry.ts"],"names":[],"mappings":";;;AACA,gDAA2C;AAC3C,2DAA2D;AAC3D,2DAAiE;AACjE,6BAA8B;AAC9B,sCAA+B;AAC/B,qDAAgD;AAEhD,kEAAkE;AAClE,sGAAsG;AACtG,MAAM,OAAO,GAAG,eAAe,CAAA;AAExB,MAAM,SAAS,GAAG,CAAC,EACxB,GAAG,EACH,UAAU,EACV,WAAW,GAKZ,EAAE,EAAE;IACH,MAAM,aAAa,GAAG,IAAI,8BAAa,CAAC;QACtC,GAAG,EAAE,GAAG;QACR,OAAO,EAAE,UAAU,IAAI,YAAG,CAAC,OAAO;QAClC,WAAW,EAAE,WAAW;QACxB,gBAAgB,EAAE,CAAC;QACnB,kBAAkB,EAAE,CAAC;QACrB,YAAY,EAAE,CAAC,IAAA,yCAAwB,GAAS,CAAC;QACjD,UAAU,CAAC,KAAK,EAAE,IAAI;YACpB,MAAM,KAAK,GAAQ,IAAI,EAAE,iBAAiB,CAAA;YAE1C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,KAAK,CAAA;YACd,CAAC;YAED,IACE,KAAK,YAAY,cAAQ,IAAI,0BAA0B;gBACvD,KAAK,CAAC,IAAI,EACV,CAAC;gBACD,KAAK,CAAC,WAAW,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;gBAErD,OAAO,KAAK,CAAA;YACd,CAAC;YAED,MAAM,IAAI,GAAI,KAAkB,CAAC,IAA6B,CAAA;YAE9D,IAAI,IAAI,EAAE,WAAW,EAAE,CAAC;gBACtB,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;gBACpC,OAAO,KAAK,CAAA;YACd,CAAC;YAED,OAAO,KAAK,CAAA;QACd,CAAC;KACF,CAAC,CAAA;IAEF,aAAa,CAAC,MAAM,EAAE,CAAC,OAAO,CAC5B,kBAAO,CAAC,WAAW,CAAC;QAClB,GAAG,EAAE,YAAG,CAAC,OAAO;KACjB,CAAC,CACH,CAAA;IAED,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA;AAlDY,QAAA,SAAS,aAkDrB"}
|
|
@@ -8,7 +8,7 @@ const sentrySeverityMap = {
|
|
|
8
8
|
log: 'log',
|
|
9
9
|
warning: 'warn',
|
|
10
10
|
error: 'error',
|
|
11
|
-
fatal: 'error'
|
|
11
|
+
fatal: 'error',
|
|
12
12
|
};
|
|
13
13
|
class SentryService {
|
|
14
14
|
config;
|
|
@@ -25,7 +25,7 @@ class SentryService {
|
|
|
25
25
|
console.log('SentryService init...');
|
|
26
26
|
sentry.init({
|
|
27
27
|
maxValueLength: 2000, // Default is 250 characters
|
|
28
|
-
...this.config
|
|
28
|
+
...this.config,
|
|
29
29
|
});
|
|
30
30
|
return sentry;
|
|
31
31
|
}
|
|
@@ -37,7 +37,7 @@ class SentryService {
|
|
|
37
37
|
*/
|
|
38
38
|
setUserId(id) {
|
|
39
39
|
this.sentry().getCurrentScope().setUser({
|
|
40
|
-
id
|
|
40
|
+
id,
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
43
|
/**
|
|
@@ -60,12 +60,12 @@ class SentryService {
|
|
|
60
60
|
this.sentry().addBreadcrumb({
|
|
61
61
|
message: js_utils_1.Inspect.any(error, {
|
|
62
62
|
includeErrorData: true,
|
|
63
|
-
colors: false
|
|
64
|
-
})
|
|
63
|
+
colors: false,
|
|
64
|
+
}),
|
|
65
65
|
// Data: (err as AppError).data, // included in message
|
|
66
66
|
});
|
|
67
67
|
return this.sentry().captureException(js_utils_1.Errors.anyToError(error, Error, {
|
|
68
|
-
stringifyFn: js_utils_1.Inspect.anyStringifyFn
|
|
68
|
+
stringifyFn: js_utils_1.Inspect.anyStringifyFn,
|
|
69
69
|
}));
|
|
70
70
|
}
|
|
71
71
|
/**
|
|
@@ -93,16 +93,16 @@ class SentryService {
|
|
|
93
93
|
const message = args
|
|
94
94
|
.map(arg => js_utils_1.Inspect.any(arg, {
|
|
95
95
|
includeErrorData: true,
|
|
96
|
-
colors: false
|
|
96
|
+
colors: false,
|
|
97
97
|
}))
|
|
98
98
|
.join(' ');
|
|
99
99
|
this.sentry().addBreadcrumb({
|
|
100
|
-
message
|
|
100
|
+
message,
|
|
101
101
|
});
|
|
102
102
|
this.sentry().captureException(js_utils_1.Errors.anyToError(args.length === 1 ? args[0] : args, Error, {
|
|
103
|
-
stringifyFn: js_utils_1.Inspect.anyStringifyFn
|
|
103
|
+
stringifyFn: js_utils_1.Inspect.anyStringifyFn,
|
|
104
104
|
}));
|
|
105
|
-
}
|
|
105
|
+
},
|
|
106
106
|
};
|
|
107
107
|
}
|
|
108
108
|
}
|
|
@@ -8,7 +8,7 @@ export declare class EmailService {
|
|
|
8
8
|
private emailTransport;
|
|
9
9
|
private emailArchive;
|
|
10
10
|
private theme;
|
|
11
|
-
constructor({ fromName, shouldSendEmail, baseDomain, emailTransport, emailArchive, theme }: {
|
|
11
|
+
constructor({ fromName, shouldSendEmail, baseDomain, emailTransport, emailArchive, theme, }: {
|
|
12
12
|
fromName: string;
|
|
13
13
|
shouldSendEmail: boolean;
|
|
14
14
|
baseDomain?: string;
|
|
@@ -18,6 +18,6 @@ export declare class EmailService {
|
|
|
18
18
|
});
|
|
19
19
|
private compileTemplate;
|
|
20
20
|
private compileMjml;
|
|
21
|
-
sendEmailFromTemplate({ template, to, subject, attachments, archive }: SendEmailFromTemplateParams): Promise<SendGridEmailResponse>;
|
|
21
|
+
sendEmailFromTemplate({ template, to, subject, attachments, archive, }: SendEmailFromTemplateParams): Promise<SendGridEmailResponse>;
|
|
22
22
|
sendEmailTemplateTest(email: EmailTest): Promise<SendGridEmailResponse>;
|
|
23
23
|
}
|