@goatlab/node-backend 1.0.1 → 1.1.1
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 +46 -6
- 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 +25 -23
- package/dist/index.js +41 -39
- package/dist/index.js.map +1 -1
- package/dist/server/bootstraps/ExpressTrpcAppConfig.d.ts +118 -0
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js +175 -0
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js.map +1 -0
- package/dist/server/bootstraps/getExpressTrpcApp.d.ts +6 -18
- package/dist/server/bootstraps/getExpressTrpcApp.js +277 -160
- 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 +16 -7
- 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 +12 -9
- 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 +7 -9
package/dist/server/consts.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.config = exports.defaultTimeZone = exports.testEmailRegex = exports.frontendTestUser = exports.playStoreTestEmail = exports.appStoreTestEmail = exports.langDir = exports.templateDir = exports.envPath = exports.secretStoragePath = exports.srcPath = exports.pkg = void 0;
|
|
4
|
+
const node_path_1 = require("node:path");
|
|
4
5
|
const node_process_1 = require("node:process");
|
|
5
|
-
const path_1 = require("path");
|
|
6
6
|
const rootPath = (0, node_process_1.cwd)();
|
|
7
|
-
exports.pkg = require((0,
|
|
8
|
-
exports.srcPath = (0,
|
|
9
|
-
exports.secretStoragePath = (0,
|
|
10
|
-
exports.envPath = (0,
|
|
11
|
-
exports.templateDir = (0,
|
|
12
|
-
exports.langDir = (0,
|
|
7
|
+
exports.pkg = require((0, node_path_1.join)(rootPath, 'package.json'));
|
|
8
|
+
exports.srcPath = (0, node_path_1.join)(rootPath, './src');
|
|
9
|
+
exports.secretStoragePath = (0, node_path_1.join)(exports.srcPath, `/_secrets/storage`);
|
|
10
|
+
exports.envPath = (0, node_path_1.join)(exports.srcPath, `./_env/sodium`);
|
|
11
|
+
exports.templateDir = (0, node_path_1.join)(exports.srcPath, './services/email/templates');
|
|
12
|
+
exports.langDir = (0, node_path_1.join)(exports.srcPath, './lang');
|
|
13
13
|
// Stores Test
|
|
14
14
|
exports.appStoreTestEmail = 'appstore@test.com';
|
|
15
15
|
exports.playStoreTestEmail = 'playstore@test.com';
|
|
@@ -28,6 +28,6 @@ exports.config = {
|
|
|
28
28
|
playStoreTestEmail: exports.playStoreTestEmail,
|
|
29
29
|
frontendTestUser: exports.frontendTestUser,
|
|
30
30
|
testEmailRegex: exports.testEmailRegex,
|
|
31
|
-
defaultTimeZone: exports.defaultTimeZone
|
|
31
|
+
defaultTimeZone: exports.defaultTimeZone
|
|
32
32
|
};
|
|
33
33
|
//# sourceMappingURL=consts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/server/consts.ts"],"names":[],"mappings":";;;AAAA,+CAAkC;
|
|
1
|
+
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/server/consts.ts"],"names":[],"mappings":";;;AAAA,yCAAgC;AAChC,+CAAkC;AAElC,MAAM,QAAQ,GAAG,IAAA,kBAAG,GAAE,CAAA;AAET,QAAA,GAAG,GAAG,OAAO,CAAC,IAAA,gBAAI,EAAC,QAAQ,EAAE,cAAc,CAAC,CAGxD,CAAA;AAQY,QAAA,OAAO,GAAG,IAAA,gBAAI,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;AACjC,QAAA,iBAAiB,GAAG,IAAA,gBAAI,EAAC,eAAO,EAAE,mBAAmB,CAAC,CAAA;AACtD,QAAA,OAAO,GAAG,IAAA,gBAAI,EAAC,eAAO,EAAE,eAAe,CAAC,CAAA;AACxC,QAAA,WAAW,GAAG,IAAA,gBAAI,EAAC,eAAO,EAAE,4BAA4B,CAAC,CAAA;AACzD,QAAA,OAAO,GAAG,IAAA,gBAAI,EAAC,eAAO,EAAE,QAAQ,CAAC,CAAA;AAC9C,cAAc;AACD,QAAA,iBAAiB,GAAG,mBAAmB,CAAA;AACvC,QAAA,kBAAkB,GAAG,oBAAoB,CAAA;AAEtD,UAAU;AACG,QAAA,gBAAgB,GAAG,2BAA2B,CAAA;AAC9C,QAAA,cAAc,GACzB,kGAAkG,CAAA;AAEvF,QAAA,eAAe,GAAG,kBAAkB,CAAA;AAEpC,QAAA,MAAM,GAAG;IACpB,GAAG,EAAH,WAAG;IACH,OAAO,EAAP,eAAO;IACP,iBAAiB,EAAjB,yBAAiB;IACjB,OAAO,EAAP,eAAO;IACP,WAAW,EAAX,mBAAW;IACX,OAAO,EAAP,eAAO;IACP,iBAAiB,EAAjB,yBAAiB;IACjB,kBAAkB,EAAlB,0BAAkB;IAClB,gBAAgB,EAAhB,wBAAgB;IAChB,cAAc,EAAd,sBAAc;IACd,eAAe,EAAf,uBAAe;CAChB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.context.js","sourceRoot":"","sources":["../../../src/server/context/request.context.ts"],"names":[],"mappings":";;;AAIA,8DAA8D;AAC9D,IAAI,QAAa,CAAA;AACjB,IAAI,CAAC;IACH,+BAA+B;IAC/B,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAA;AACvE,CAAC;AAAC,MAAM,CAAC;IACP,IAAI,CAAC;QACH,oBAAoB;QACpB,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,qCAAqC;QACrC,QAAQ,GAAG;YACT,
|
|
1
|
+
{"version":3,"file":"request.context.js","sourceRoot":"","sources":["../../../src/server/context/request.context.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,5 +7,5 @@ declare global {
|
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
-
export declare const createContext: ({ req
|
|
10
|
+
export declare const createContext: ({ req }: trpcExpress.CreateExpressContextOptions) => Promise<ReturnType<typeof requestContext>>;
|
|
11
11
|
export type TrpcContext = Awaited<ReturnType<typeof createContext>>;
|
|
@@ -22,7 +22,7 @@ const validateFirebaseToken = async (idToken) => {
|
|
|
22
22
|
/**
|
|
23
23
|
* Validate Internal Token
|
|
24
24
|
*/
|
|
25
|
-
const validateInternalToken = async (
|
|
25
|
+
const validateInternalToken = async (_token) => {
|
|
26
26
|
// const isValid = await tokenService.validateToken({
|
|
27
27
|
// providedToken: token,
|
|
28
28
|
// purpose: 'INTERNAL_SERVICE', // Adjust if needed
|
|
@@ -37,7 +37,7 @@ const validateInternalToken = async (token) => {
|
|
|
37
37
|
// }
|
|
38
38
|
return null;
|
|
39
39
|
};
|
|
40
|
-
const createContext = async ({ req
|
|
40
|
+
const createContext = async ({ req }) => {
|
|
41
41
|
const idToken = passport_jwt_1.ExtractJwt.fromAuthHeaderAsBearerToken()(req);
|
|
42
42
|
if (idToken) {
|
|
43
43
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trpc.context.js","sourceRoot":"","sources":["../../../src/server/context/trpc.context.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"trpc.context.js","sourceRoot":"","sources":["../../../src/server/context/trpc.context.ts"],"names":[],"mappings":";;;AAAA,6DAA6D;AAC7D,yCAAwC;AAExC,wCAAuC;AACvC,+CAAyC;AACzC,wDAAmE;AACnE,uDAAkD;AAUlD;;GAEG;AACH,MAAM,qBAAqB,GAAG,KAAK,EACjC,OAAe,EAC4B,EAAE;IAC7C,IAAI,CAAC;QACH,OAAO,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,6BAA6B;QAC7B,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,qBAAqB,GAAG,KAAK,EACjC,MAAc,EAIN,EAAE;IACV,qDAAqD;IACrD,0BAA0B;IAC1B,qDAAqD;IACrD,KAAK;IAEL,iBAAiB;IACjB,+DAA+D;IAC/D,mEAAmE;IACnE,aAAa;IACb,sCAAsC;IACtC,sCAAsC;IACtC,MAAM;IACN,IAAI;IAEJ,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAEM,MAAM,aAAa,GAAG,KAAK,EAAE,EAClC,GAAG,EACqC,EAExC,EAAE;IACF,MAAM,OAAO,GAAG,yBAAU,CAAC,2BAA2B,EAAE,CAAC,GAAG,CAAC,CAAA;IAE7D,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,iCAAiC;YACjC,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAA;YAEzD,MAAM,KAAK,GAAG,YAAY,EAAE,KAAK,CAAA;YACjC,8DAA8D;YAE9D,IAAI,YAAY,IAAI,KAAK,EAAE,CAAC;gBAC1B,2CAA2C;gBAC3C,OAAO,IAAA,gCAAc,EACnB,GAAG,EACH,wCAA0B,CAAC,KAAK,CAAC,YAAY,CAAC,CAC/C,CAAA;YACH,CAAC;YAED,8CAA8C;YAC9C,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAA;YAC1D,IAAI,aAAa,EAAE,CAAC;gBAClB,+DAA+D;gBAC/D,OAAO,IAAA,gCAAc,EAAC,GAAG,EAAE,EAAE,YAAY,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAA;YACrE,CAAC;YAED,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,kBAAS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;QACrE,CAAC;IACH,CAAC;IAED,OAAO,IAAA,gCAAc,EAAC,GAAG,CAAC,CAAA;AAC5B,CAAC,CAAA;AArCY,QAAA,aAAa,iBAqCzB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { BuiltRouter } from '@trpc/server/unstable-core-do-not-import';
|
|
2
2
|
import type express from 'express';
|
|
3
|
-
export declare function initOpenApiDocs({ app, appName, appVersion, trpcRouter, baseUrl
|
|
3
|
+
export declare function initOpenApiDocs({ app, appName, appVersion, trpcRouter, baseUrl }: {
|
|
4
4
|
app: express.Application;
|
|
5
5
|
trpcRouter: BuiltRouter<any, any>;
|
|
6
6
|
appName: string;
|
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.initOpenApiDocs = initOpenApiDocs;
|
|
4
4
|
const trpc_to_openapi_1 = require("trpc-to-openapi");
|
|
5
5
|
const swaggerUi = require('swagger-ui-express');
|
|
6
|
-
function initOpenApiDocs({ app, appName, appVersion, trpcRouter, baseUrl
|
|
6
|
+
function initOpenApiDocs({ app, appName, appVersion, trpcRouter, baseUrl }) {
|
|
7
7
|
const openApiDocument = (0, trpc_to_openapi_1.generateOpenApiDocument)(trpcRouter, {
|
|
8
8
|
title: appName,
|
|
9
9
|
version: appVersion,
|
|
10
|
-
baseUrl
|
|
10
|
+
baseUrl
|
|
11
11
|
});
|
|
12
12
|
// Serve the OpenAPI document at /openapi
|
|
13
|
-
app.use('/openapi', (
|
|
13
|
+
app.use('/openapi', (_req, res) => {
|
|
14
14
|
res.json(openApiDocument);
|
|
15
15
|
});
|
|
16
16
|
app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(openApiDocument));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initOpenApiDocs.js","sourceRoot":"","sources":["../../src/server/initOpenApiDocs.ts"],"names":[],"mappings":";;AAMA,0CAwBC;AA5BD,qDAAyD;AAEzD,MAAM,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE/C,SAAgB,eAAe,CAAC,EAC9B,GAAG,EACH,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,
|
|
1
|
+
{"version":3,"file":"initOpenApiDocs.js","sourceRoot":"","sources":["../../src/server/initOpenApiDocs.ts"],"names":[],"mappings":";;AAMA,0CAwBC;AA5BD,qDAAyD;AAEzD,MAAM,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE/C,SAAgB,eAAe,CAAC,EAC9B,GAAG,EACH,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,EAOR;IACC,MAAM,eAAe,GAAG,IAAA,yCAAuB,EAAC,UAAU,EAAE;QAC1D,KAAK,EAAE,OAAO;QACd,OAAO,EAAE,UAAU;QACnB,OAAO;KACR,CAAC,CAAA;IACF,yCAAyC;IACzC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAChC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC3B,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;AACzE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { NextFunction, Request, Response } from 'express';
|
|
2
1
|
import { CommonLogger } from '@goatlab/js-utils';
|
|
3
|
-
|
|
2
|
+
import type { NextFunction, Request, Response } from 'express';
|
|
3
|
+
export declare const useCloudTaskDecryptMiddleware: ({ getLogger, getEncryptionKey }: {
|
|
4
4
|
getEncryptionKey: () => string;
|
|
5
5
|
getLogger?: () => CommonLogger;
|
|
6
6
|
}) => (req: Request, res: Response, next: NextFunction) => void;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.useCloudTaskDecryptMiddleware = void 0;
|
|
4
4
|
const node_utils_1 = require("@goatlab/node-utils");
|
|
5
|
-
const useCloudTaskDecryptMiddleware = ({ getLogger = () => console, getEncryptionKey
|
|
5
|
+
const useCloudTaskDecryptMiddleware = ({ getLogger = () => console, getEncryptionKey }) => {
|
|
6
6
|
const cloudTaskDecryptMiddleware = (req, res, next) => {
|
|
7
7
|
const logger = getLogger();
|
|
8
8
|
const isLocalTest = req.headers['local-queue'] === 'true';
|
|
@@ -23,17 +23,15 @@ const useCloudTaskDecryptMiddleware = ({ getLogger = () => console, getEncryptio
|
|
|
23
23
|
if (err instanceof Error) {
|
|
24
24
|
res.status(400).json({
|
|
25
25
|
status: 400,
|
|
26
|
-
message: err.message || 'Error processing request'
|
|
27
|
-
});
|
|
28
|
-
return;
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
res.status(500).json({
|
|
32
|
-
status: 500,
|
|
33
|
-
message: 'Internal Server Error',
|
|
26
|
+
message: err.message || 'Error processing request'
|
|
34
27
|
});
|
|
35
28
|
return;
|
|
36
29
|
}
|
|
30
|
+
res.status(500).json({
|
|
31
|
+
status: 500,
|
|
32
|
+
message: 'Internal Server Error'
|
|
33
|
+
});
|
|
34
|
+
return;
|
|
37
35
|
}
|
|
38
36
|
// Call next middleware if no error occurred
|
|
39
37
|
next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudTaskDecrypt.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/cloudTaskDecrypt.middleware.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cloudTaskDecrypt.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/cloudTaskDecrypt.middleware.ts"],"names":[],"mappings":";;;AACA,oDAA8C;AAGvC,MAAM,6BAA6B,GAAG,CAAC,EAC5C,SAAS,GAAG,GAAG,EAAE,CAAC,OAAO,EACzB,gBAAgB,EAIjB,EAAE,EAAE;IACH,MAAM,0BAA0B,GAAG,CACjC,GAAY,EACZ,GAAa,EACb,IAAkB,EACZ,EAAE;QACR,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;QAC1B,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,MAAM,CAAA;QACzD,MAAM,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAA;QAEvE,IAAI,CAAC;YACH,mDAAmD;YACnD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CACrB,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACtD,CAAA;YAED,mBAAmB;YACnB,MAAM,aAAa,GAAG,qBAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAA;YAEtE,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;YACjE,CAAC;YAED,wCAAwC;YACxC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAC9C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACjB,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;gBACzB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,0BAA0B;iBACnD,CAAC,CAAA;gBACF,OAAM;YACR,CAAC;YACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,uBAAuB;aACjC,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,4CAA4C;QAC5C,IAAI,EAAE,CAAA;IACR,CAAC,CAAA;IAED,OAAO,0BAA0B,CAAA;AACnC,CAAC,CAAA;AApDY,QAAA,6BAA6B,iCAoDzC"}
|
|
@@ -14,4 +14,4 @@ export interface GenericErrorMiddlewareCfg {
|
|
|
14
14
|
* Sends json payload as ErrorResponse, transformed via errorSharedUtil.
|
|
15
15
|
*/
|
|
16
16
|
export declare function genericErrorMiddleware(cfg?: GenericErrorMiddlewareCfg): any;
|
|
17
|
-
export declare function respondWithError(
|
|
17
|
+
export declare function respondWithError(_request: Express.Request, res: Express.Response, error: any): void;
|
|
@@ -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,34 +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;
|
|
43
|
+
// Check if error has a status or statusCode property (from Express errors like PayloadTooLargeError)
|
|
44
|
+
if (!httpError.data.httpStatusCode && originalError) {
|
|
45
|
+
httpError.data.httpStatusCode =
|
|
46
|
+
originalError.status || originalError.statusCode;
|
|
47
|
+
}
|
|
42
48
|
httpError.data.httpStatusCode ||= 500; // Default to 500
|
|
43
49
|
httpError.data.headersSent = headersSent || undefined;
|
|
44
50
|
httpError.data.report ||= undefined; // Set to undefined if false
|
|
45
51
|
js_utils_1.Objects.filterUndefinedValues(httpError.data, true);
|
|
46
52
|
res.status(httpError.data.httpStatusCode).json({
|
|
47
|
-
error: httpError
|
|
53
|
+
error: httpError
|
|
48
54
|
});
|
|
49
55
|
}
|
|
50
56
|
function shouldReportToSentry(error) {
|
|
51
57
|
const e = error;
|
|
52
58
|
// By default - report
|
|
53
|
-
if (!e.data)
|
|
59
|
+
if (!e.data) {
|
|
54
60
|
return true;
|
|
61
|
+
}
|
|
55
62
|
// If `report` is set - do as it says
|
|
56
|
-
if (e.data.report === true)
|
|
63
|
+
if (e.data.report === true) {
|
|
57
64
|
return true;
|
|
58
|
-
|
|
65
|
+
}
|
|
66
|
+
if (e.data.report === false) {
|
|
59
67
|
return false;
|
|
68
|
+
}
|
|
60
69
|
// Report if http 5xx, otherwise not
|
|
61
70
|
// If no httpCode - report
|
|
62
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, () => {
|