apitally 0.23.1 → 0.25.0
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/adonisjs/index.cjs +3 -0
- package/dist/adonisjs/index.cjs.map +1 -1
- package/dist/adonisjs/index.d.cts +2 -0
- package/dist/adonisjs/index.d.ts +2 -0
- package/dist/adonisjs/index.js +2 -0
- package/dist/adonisjs/index.js.map +1 -1
- package/dist/adonisjs/middleware.cjs +6 -2
- package/dist/adonisjs/middleware.cjs.map +1 -1
- package/dist/adonisjs/middleware.d.cts +2 -0
- package/dist/adonisjs/middleware.d.ts +2 -0
- package/dist/adonisjs/middleware.js +6 -2
- package/dist/adonisjs/middleware.js.map +1 -1
- package/dist/adonisjs/provider.d.cts +2 -0
- package/dist/adonisjs/provider.d.ts +2 -0
- package/dist/adonisjs/stubs/config/apitally.stub +1 -0
- package/dist/common/client.cjs +6 -1
- package/dist/common/client.cjs.map +1 -1
- package/dist/common/client.d.cts +3 -0
- package/dist/common/client.d.ts +3 -0
- package/dist/common/client.js +6 -1
- package/dist/common/client.js.map +1 -1
- package/dist/common/consumerRegistry.d.cts +2 -0
- package/dist/common/consumerRegistry.d.ts +2 -0
- package/dist/common/instance.cjs +158 -0
- package/dist/common/instance.cjs.map +1 -0
- package/dist/common/instance.d.cts +4 -0
- package/dist/common/instance.d.ts +4 -0
- package/dist/common/instance.js +134 -0
- package/dist/common/instance.js.map +1 -0
- package/dist/common/requestCounter.d.cts +2 -0
- package/dist/common/requestCounter.d.ts +2 -0
- package/dist/common/requestLogger.cjs +23 -19
- package/dist/common/requestLogger.cjs.map +1 -1
- package/dist/common/requestLogger.d.cts +6 -1
- package/dist/common/requestLogger.d.ts +6 -1
- package/dist/common/requestLogger.js +23 -19
- package/dist/common/requestLogger.js.map +1 -1
- package/dist/common/response.cjs +2 -2
- package/dist/common/response.cjs.map +1 -1
- package/dist/common/response.js +2 -2
- package/dist/common/response.js.map +1 -1
- package/dist/common/serverErrorCounter.cjs +3 -0
- package/dist/common/serverErrorCounter.cjs.map +1 -1
- package/dist/common/serverErrorCounter.d.cts +2 -0
- package/dist/common/serverErrorCounter.d.ts +2 -0
- package/dist/common/serverErrorCounter.js +3 -0
- package/dist/common/serverErrorCounter.js.map +1 -1
- package/dist/common/spanCollector.cjs +217 -0
- package/dist/common/spanCollector.cjs.map +1 -0
- package/dist/common/spanCollector.d.cts +50 -0
- package/dist/common/spanCollector.d.ts +50 -0
- package/dist/common/spanCollector.js +194 -0
- package/dist/common/spanCollector.js.map +1 -0
- package/dist/common/tempGzipFile.cjs +25 -2
- package/dist/common/tempGzipFile.cjs.map +1 -1
- package/dist/common/tempGzipFile.d.cts +3 -2
- package/dist/common/tempGzipFile.d.ts +3 -2
- package/dist/common/tempGzipFile.js +22 -3
- package/dist/common/tempGzipFile.js.map +1 -1
- package/dist/common/types.d.cts +2 -0
- package/dist/common/types.d.ts +2 -0
- package/dist/common/validationErrorCounter.d.cts +2 -0
- package/dist/common/validationErrorCounter.d.ts +2 -0
- package/dist/elysia/index.cjs +3 -0
- package/dist/elysia/index.cjs.map +1 -1
- package/dist/elysia/index.d.cts +2 -0
- package/dist/elysia/index.d.ts +2 -0
- package/dist/elysia/index.js +2 -0
- package/dist/elysia/index.js.map +1 -1
- package/dist/elysia/plugin.cjs +16 -8
- package/dist/elysia/plugin.cjs.map +1 -1
- package/dist/elysia/plugin.d.cts +4 -0
- package/dist/elysia/plugin.d.ts +4 -0
- package/dist/elysia/plugin.js +16 -8
- package/dist/elysia/plugin.js.map +1 -1
- package/dist/elysia/utils.d.cts +2 -0
- package/dist/elysia/utils.d.ts +2 -0
- package/dist/express/index.cjs +3 -0
- package/dist/express/index.cjs.map +1 -1
- package/dist/express/index.d.cts +2 -0
- package/dist/express/index.d.ts +2 -0
- package/dist/express/index.js +2 -0
- package/dist/express/index.js.map +1 -1
- package/dist/express/middleware.cjs +85 -77
- package/dist/express/middleware.cjs.map +1 -1
- package/dist/express/middleware.d.cts +2 -0
- package/dist/express/middleware.d.ts +2 -0
- package/dist/express/middleware.js +85 -77
- package/dist/express/middleware.js.map +1 -1
- package/dist/fastify/index.cjs +3 -0
- package/dist/fastify/index.cjs.map +1 -1
- package/dist/fastify/index.d.cts +2 -0
- package/dist/fastify/index.d.ts +2 -0
- package/dist/fastify/index.js +2 -0
- package/dist/fastify/index.js.map +1 -1
- package/dist/fastify/plugin.cjs +15 -6
- package/dist/fastify/plugin.cjs.map +1 -1
- package/dist/fastify/plugin.d.cts +4 -0
- package/dist/fastify/plugin.d.ts +4 -0
- package/dist/fastify/plugin.js +15 -6
- package/dist/fastify/plugin.js.map +1 -1
- package/dist/h3/index.cjs +3 -0
- package/dist/h3/index.cjs.map +1 -1
- package/dist/h3/index.d.cts +2 -0
- package/dist/h3/index.d.ts +2 -0
- package/dist/h3/index.js +2 -0
- package/dist/h3/index.js.map +1 -1
- package/dist/h3/plugin.cjs +15 -7
- package/dist/h3/plugin.cjs.map +1 -1
- package/dist/h3/plugin.d.cts +4 -0
- package/dist/h3/plugin.d.ts +4 -0
- package/dist/h3/plugin.js +15 -7
- package/dist/h3/plugin.js.map +1 -1
- package/dist/hapi/index.cjs +3 -0
- package/dist/hapi/index.cjs.map +1 -1
- package/dist/hapi/index.d.cts +2 -0
- package/dist/hapi/index.d.ts +2 -0
- package/dist/hapi/index.js +2 -0
- package/dist/hapi/index.js.map +1 -1
- package/dist/hapi/plugin.cjs +16 -9
- package/dist/hapi/plugin.cjs.map +1 -1
- package/dist/hapi/plugin.d.cts +4 -0
- package/dist/hapi/plugin.d.ts +4 -0
- package/dist/hapi/plugin.js +16 -9
- package/dist/hapi/plugin.js.map +1 -1
- package/dist/hapi/utils.d.cts +2 -0
- package/dist/hapi/utils.d.ts +2 -0
- package/dist/hono/index.cjs +3 -0
- package/dist/hono/index.cjs.map +1 -1
- package/dist/hono/index.d.cts +2 -0
- package/dist/hono/index.d.ts +2 -0
- package/dist/hono/index.js +2 -0
- package/dist/hono/index.js.map +1 -1
- package/dist/hono/middleware.cjs +6 -2
- package/dist/hono/middleware.cjs.map +1 -1
- package/dist/hono/middleware.d.cts +2 -0
- package/dist/hono/middleware.d.ts +2 -0
- package/dist/hono/middleware.js +6 -2
- package/dist/hono/middleware.js.map +1 -1
- package/dist/hono/utils.d.cts +2 -0
- package/dist/hono/utils.d.ts +2 -0
- package/dist/koa/index.cjs +3 -0
- package/dist/koa/index.cjs.map +1 -1
- package/dist/koa/index.d.cts +2 -0
- package/dist/koa/index.d.ts +2 -0
- package/dist/koa/index.js +2 -0
- package/dist/koa/index.js.map +1 -1
- package/dist/koa/middleware.cjs +8 -4
- package/dist/koa/middleware.cjs.map +1 -1
- package/dist/koa/middleware.d.cts +2 -0
- package/dist/koa/middleware.d.ts +2 -0
- package/dist/koa/middleware.js +8 -4
- package/dist/koa/middleware.js.map +1 -1
- package/dist/loggers/console.d.cts +4 -0
- package/dist/loggers/console.d.ts +4 -0
- package/dist/loggers/hapi.d.cts +4 -0
- package/dist/loggers/hapi.d.ts +4 -0
- package/dist/loggers/index.d.cts +4 -0
- package/dist/loggers/index.d.ts +4 -0
- package/dist/loggers/nestjs.d.cts +4 -0
- package/dist/loggers/nestjs.d.ts +4 -0
- package/dist/loggers/pino.cjs +1 -1
- package/dist/loggers/pino.cjs.map +1 -1
- package/dist/loggers/pino.d.cts +4 -0
- package/dist/loggers/pino.d.ts +4 -0
- package/dist/loggers/pino.js +1 -1
- package/dist/loggers/pino.js.map +1 -1
- package/dist/loggers/winston.d.cts +4 -0
- package/dist/loggers/winston.d.ts +4 -0
- package/dist/nestjs/index.cjs +3 -0
- package/dist/nestjs/index.cjs.map +1 -1
- package/dist/nestjs/index.d.cts +2 -0
- package/dist/nestjs/index.d.ts +2 -0
- package/dist/nestjs/index.js +2 -0
- package/dist/nestjs/index.js.map +1 -1
- package/package.json +6 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/express/middleware.ts"],"sourcesContent":["import type { Express, NextFunction, Request, Response, Router } from \"express\";\nimport { AsyncLocalStorage } from \"node:async_hooks\";\nimport { performance } from \"node:perf_hooks\";\n\nimport { ApitallyClient } from \"../common/client.js\";\nimport { consumerFromStringOrObject } from \"../common/consumerRegistry.js\";\nimport { parseContentLength } from \"../common/headers.js\";\nimport { getPackageVersion } from \"../common/packageVersions.js\";\nimport type { LogRecord } from \"../common/requestLogger.js\";\nimport { convertBody, convertHeaders } from \"../common/requestLogger.js\";\nimport {\n ApitallyConfig,\n ApitallyConsumer,\n StartupData,\n ValidationError,\n} from \"../common/types.js\";\nimport {\n patchConsole,\n patchNestLogger,\n patchPinoLogger,\n patchWinston,\n} from \"../loggers/index.js\";\nimport {\n getEndpoints,\n getRouterInfo,\n parseExpressPath,\n parseExpressPathRegExp,\n} from \"./utils.js\";\n\ndeclare module \"express\" {\n interface Request {\n apitallyConsumer?: ApitallyConsumer | string | null;\n consumerIdentifier?: ApitallyConsumer | string | null; // For backwards compatibility\n }\n}\n\nexport function useApitally(\n app: Express | Router,\n config: ApitallyConfig & { basePath?: string },\n) {\n const client = new ApitallyClient(config);\n const middleware = getMiddleware(app, client);\n app.use(middleware);\n\n const setStartupData = (attempt: number = 1) => {\n const appInfo = getAppInfo(app, config.basePath, config.appVersion);\n if (appInfo.paths.length > 0 || attempt >= 10) {\n client.setStartupData(appInfo);\n client.startSync();\n } else {\n setTimeout(() => setStartupData(attempt + 1), 500);\n }\n };\n setTimeout(() => setStartupData(), 500);\n}\n\nfunction getMiddleware(app: Express | Router, client: ApitallyClient) {\n let errorHandlerConfigured = false;\n const logsContext = new AsyncLocalStorage<LogRecord[]>();\n\n if (client.requestLogger.config.captureLogs) {\n patchConsole(logsContext);\n patchWinston(logsContext);\n patchNestLogger(logsContext);\n }\n\n return async (req: Request, res: Response, next: NextFunction) => {\n if (!client.isEnabled() || req.method.toUpperCase() === \"OPTIONS\") {\n next();\n return;\n }\n\n if (!errorHandlerConfigured) {\n // Add error handling middleware to the bottom of the stack when handling the first request\n app.use((err: Error, req: Request, res: Response, next: NextFunction) => {\n res.locals.serverError = err;\n next(err);\n });\n errorHandlerConfigured = true;\n }\n\n if (client.requestLogger.config.captureLogs && \"log\" in req) {\n await patchPinoLogger((req as any).log, logsContext);\n }\n\n logsContext.run([], () => {\n try {\n const startTime = performance.now();\n const originalSend = res.send;\n res.send = (body) => {\n const contentType = res.get(\"content-type\");\n if (client.requestLogger.isSupportedContentType(contentType)) {\n res.locals.body = body;\n }\n return originalSend.call(res, body);\n };\n\n res.once(\"finish\", () => {\n try {\n const responseTime = performance.now() - startTime;\n const path = getRoutePath(req);\n const consumer = getConsumer(req);\n client.consumerRegistry.addOrUpdateConsumer(consumer);\n\n const requestSize = parseContentLength(req.get(\"content-length\"));\n const responseSize = parseContentLength(res.get(\"content-length\"));\n\n if (path) {\n client.requestCounter.addRequest({\n consumer: consumer?.identifier,\n method: req.method,\n path,\n statusCode: res.statusCode,\n responseTime: responseTime,\n requestSize,\n responseSize,\n });\n\n if (\n (res.statusCode === 400 || res.statusCode === 422) &&\n res.locals.body\n ) {\n let jsonBody: any;\n try {\n jsonBody = JSON.parse(res.locals.body);\n } catch {\n // Ignore\n }\n if (jsonBody) {\n const validationErrors: ValidationError[] = [];\n if (validationErrors.length === 0) {\n validationErrors.push(\n ...extractExpressValidatorErrors(jsonBody),\n );\n }\n if (validationErrors.length === 0) {\n validationErrors.push(...extractCelebrateErrors(jsonBody));\n }\n if (validationErrors.length === 0) {\n validationErrors.push(\n ...extractNestValidationErrors(jsonBody),\n );\n }\n validationErrors.forEach((error) => {\n client.validationErrorCounter.addValidationError({\n consumer: consumer?.identifier,\n method: req.method,\n path,\n ...error,\n });\n });\n }\n }\n\n if (res.statusCode === 500 && res.locals.serverError) {\n const serverError = res.locals.serverError as Error;\n client.serverErrorCounter.addServerError({\n consumer: consumer?.identifier,\n method: req.method,\n path,\n type: serverError.name,\n msg: serverError.message,\n traceback: serverError.stack || \"\",\n });\n }\n }\n\n if (client.requestLogger.enabled) {\n const logs = logsContext.getStore();\n client.requestLogger.logRequest(\n {\n timestamp: Date.now() / 1000,\n method: req.method,\n path,\n url: `${req.protocol}://${req.host}${req.originalUrl}`,\n headers: convertHeaders(req.headers),\n size: requestSize,\n consumer: consumer?.identifier,\n body: convertBody(req.body, req.get(\"content-type\")),\n },\n {\n statusCode: res.statusCode,\n responseTime: responseTime / 1000,\n headers: convertHeaders(res.getHeaders()),\n size: responseSize,\n body: convertBody(res.locals.body, res.get(\"content-type\")),\n },\n res.locals.serverError,\n logs,\n );\n }\n } catch (error) {\n client.logger.error(\n \"Error while logging request in Apitally middleware.\",\n { request: req, response: res, error },\n );\n }\n });\n } catch (error) {\n client.logger.error(\"Error in Apitally middleware.\", {\n request: req,\n response: res,\n error,\n });\n } finally {\n next();\n }\n });\n };\n}\n\nfunction getRoutePath(req: Request) {\n if (!req.route) {\n return;\n }\n if (req.baseUrl) {\n const routerInfo = getRouterInfo(req.app);\n if (routerInfo.stack) {\n const routerPath = getRouterPath(routerInfo.stack, req.baseUrl);\n return req.route.path === \"/\" ? routerPath : routerPath + req.route.path;\n }\n }\n return req.route.path;\n}\n\nfunction getRouterPath(stack: any[], baseUrl: string) {\n const routerPaths: string[] = [];\n while (stack && stack.length > 0) {\n const routerLayer = stack.find(\n (layer) =>\n layer.name === \"router\" &&\n layer.path &&\n (baseUrl.startsWith(layer.path) || layer.regexp?.test(baseUrl)),\n );\n if (routerLayer) {\n if (\n routerLayer.regexp &&\n routerLayer.keys &&\n routerLayer.keys.length > 0\n ) {\n const parsedPath = parseExpressPathRegExp(\n routerLayer.regexp,\n routerLayer.keys,\n );\n routerPaths.push(\"/\" + parsedPath);\n } else if (\n routerLayer.params &&\n Object.keys(routerLayer.params).length > 0\n ) {\n const parsedPath = parseExpressPath(\n routerLayer.path,\n routerLayer.params,\n );\n routerPaths.push(parsedPath);\n } else {\n routerPaths.push(routerLayer.path);\n }\n stack = routerLayer.handle?.stack;\n baseUrl = baseUrl.slice(routerLayer.path.length);\n } else {\n break;\n }\n }\n return routerPaths.filter((path) => path !== \"/\").join(\"\");\n}\n\nexport function setConsumer(\n req: Request,\n consumer: ApitallyConsumer | string | null | undefined,\n) {\n req.apitallyConsumer = consumer || undefined;\n}\n\nfunction getConsumer(req: Request) {\n if (req.apitallyConsumer) {\n return consumerFromStringOrObject(req.apitallyConsumer);\n } else if (req.consumerIdentifier) {\n // For backwards compatibility\n process.emitWarning(\n \"The consumerIdentifier property on the request object is deprecated. Use apitallyConsumer instead.\",\n \"DeprecationWarning\",\n );\n return consumerFromStringOrObject(req.consumerIdentifier);\n }\n return null;\n}\n\nfunction extractExpressValidatorErrors(responseBody: any) {\n try {\n const errors: ValidationError[] = [];\n if (\n responseBody &&\n responseBody.errors &&\n Array.isArray(responseBody.errors)\n ) {\n responseBody.errors.forEach((error: any) => {\n if (error.location && error.path && error.msg && error.type) {\n errors.push({\n loc: `${error.location}.${error.path}`,\n msg: error.msg,\n type: error.type,\n });\n }\n });\n }\n return errors;\n } catch (error) {\n return [];\n }\n}\n\nfunction extractCelebrateErrors(responseBody: any) {\n try {\n const errors: ValidationError[] = [];\n if (responseBody && responseBody.validation) {\n Object.values(responseBody.validation).forEach((error: any) => {\n if (\n error.source &&\n error.keys &&\n Array.isArray(error.keys) &&\n error.message\n ) {\n error.keys.forEach((key: string) => {\n errors.push({\n loc: `${error.source}.${key}`,\n msg: subsetJoiMessage(error.message, key),\n type: \"\",\n });\n });\n }\n });\n }\n return errors;\n } catch (error) {\n return [];\n }\n}\n\nfunction extractNestValidationErrors(responseBody: any) {\n try {\n const errors: ValidationError[] = [];\n if (responseBody && Array.isArray(responseBody.message)) {\n responseBody.message.forEach((message: any) => {\n errors.push({\n loc: \"\",\n msg: message,\n type: \"\",\n });\n });\n }\n return errors;\n } catch (error) {\n return [];\n }\n}\n\nfunction subsetJoiMessage(message: string, key: string) {\n const messageWithKey = message\n .split(\". \")\n .find((message) => message.includes(`\"${key}\"`));\n return messageWithKey ? messageWithKey : message;\n}\n\nfunction getAppInfo(\n app: Express | Router,\n basePath?: string,\n appVersion?: string,\n): StartupData {\n const versions: Array<[string, string]> = [\n [\"nodejs\", process.version.replace(/^v/, \"\")],\n ];\n const expressVersion = getPackageVersion(\"express\");\n const nestjsVersion = getPackageVersion(\"@nestjs/core\");\n const apitallyVersion = getPackageVersion(\"../..\");\n if (expressVersion) {\n versions.push([\"express\", expressVersion]);\n }\n if (nestjsVersion) {\n versions.push([\"nestjs\", nestjsVersion]);\n }\n if (apitallyVersion) {\n versions.push([\"apitally\", apitallyVersion]);\n }\n if (appVersion) {\n versions.push([\"app\", appVersion]);\n }\n return {\n paths: getEndpoints(app, basePath || \"\"),\n versions: Object.fromEntries(versions),\n client: \"js:express\",\n };\n}\n"],"mappings":"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","names":["AsyncLocalStorage","performance","ApitallyClient","consumerFromStringOrObject","parseContentLength","getPackageVersion","convertBody","convertHeaders","patchConsole","patchNestLogger","patchPinoLogger","patchWinston","getEndpoints","getRouterInfo","parseExpressPath","parseExpressPathRegExp","useApitally","app","config","client","middleware","getMiddleware","use","setStartupData","attempt","appInfo","getAppInfo","basePath","appVersion","paths","length","startSync","setTimeout","errorHandlerConfigured","logsContext","requestLogger","captureLogs","req","res","next","isEnabled","method","toUpperCase","err","locals","serverError","log","run","startTime","now","originalSend","send","body","contentType","get","isSupportedContentType","call","once","responseTime","path","getRoutePath","consumer","getConsumer","consumerRegistry","addOrUpdateConsumer","requestSize","responseSize","requestCounter","addRequest","identifier","statusCode","jsonBody","JSON","parse","validationErrors","push","extractExpressValidatorErrors","extractCelebrateErrors","extractNestValidationErrors","forEach","error","validationErrorCounter","addValidationError","serverErrorCounter","addServerError","type","name","msg","message","traceback","stack","enabled","logs","getStore","logRequest","timestamp","Date","url","protocol","host","originalUrl","headers","size","getHeaders","logger","request","response","route","baseUrl","routerInfo","routerPath","getRouterPath","routerPaths","routerLayer","find","layer","_a","startsWith","regexp","test","keys","parsedPath","params","Object","handle","slice","filter","join","setConsumer","apitallyConsumer","undefined","consumerIdentifier","process","emitWarning","responseBody","errors","Array","isArray","location","loc","validation","values","source","key","subsetJoiMessage","messageWithKey","split","includes","versions","version","replace","expressVersion","nestjsVersion","apitallyVersion","fromEntries"]}
|
|
1
|
+
{"version":3,"sources":["../../src/express/middleware.ts"],"sourcesContent":["import type { Express, NextFunction, Request, Response, Router } from \"express\";\nimport { AsyncLocalStorage } from \"node:async_hooks\";\nimport { performance } from \"node:perf_hooks\";\n\nimport { ApitallyClient } from \"../common/client.js\";\nimport { consumerFromStringOrObject } from \"../common/consumerRegistry.js\";\nimport { parseContentLength } from \"../common/headers.js\";\nimport { getPackageVersion } from \"../common/packageVersions.js\";\nimport type { LogRecord } from \"../common/requestLogger.js\";\nimport { convertBody, convertHeaders } from \"../common/requestLogger.js\";\nimport {\n ApitallyConfig,\n ApitallyConsumer,\n StartupData,\n ValidationError,\n} from \"../common/types.js\";\nimport {\n patchConsole,\n patchNestLogger,\n patchPinoLogger,\n patchWinston,\n} from \"../loggers/index.js\";\nimport {\n getEndpoints,\n getRouterInfo,\n parseExpressPath,\n parseExpressPathRegExp,\n} from \"./utils.js\";\n\ndeclare module \"express\" {\n interface Request {\n apitallyConsumer?: ApitallyConsumer | string | null;\n consumerIdentifier?: ApitallyConsumer | string | null; // For backwards compatibility\n }\n}\n\nexport function useApitally(\n app: Express | Router,\n config: ApitallyConfig & { basePath?: string },\n) {\n const client = new ApitallyClient(config);\n const middleware = getMiddleware(app, client);\n app.use(middleware);\n\n const setStartupData = (attempt: number = 1) => {\n const appInfo = getAppInfo(app, config.basePath, config.appVersion);\n if (appInfo.paths.length > 0 || attempt >= 10) {\n client.setStartupData(appInfo);\n client.startSync();\n } else {\n setTimeout(() => setStartupData(attempt + 1), 500);\n }\n };\n setTimeout(() => setStartupData(), 500);\n}\n\nfunction getMiddleware(app: Express | Router, client: ApitallyClient) {\n let errorHandlerConfigured = false;\n const logsContext = new AsyncLocalStorage<LogRecord[]>();\n\n if (client.requestLogger.config.captureLogs) {\n patchConsole(logsContext);\n patchWinston(logsContext);\n patchNestLogger(logsContext);\n }\n\n return async (req: Request, res: Response, next: NextFunction) => {\n if (!client.isEnabled() || req.method.toUpperCase() === \"OPTIONS\") {\n next();\n return;\n }\n\n if (!errorHandlerConfigured) {\n // Add error handling middleware to the bottom of the stack when handling the first request\n app.use((err: Error, req: Request, res: Response, next: NextFunction) => {\n res.locals.serverError = err;\n next(err);\n });\n errorHandlerConfigured = true;\n }\n\n if (client.requestLogger.config.captureLogs && \"log\" in req) {\n await patchPinoLogger((req as any).log, logsContext);\n }\n\n logsContext.run([], () => {\n try {\n const startTime = performance.now();\n\n const originalSend = res.send;\n res.send = (body) => {\n const contentType = res.get(\"content-type\");\n if (client.requestLogger.isSupportedContentType(contentType)) {\n res.locals.body = body;\n }\n return originalSend.call(res, body);\n };\n\n const spanHandle = client.spanCollector.startSpan();\n spanHandle.runInContext(() => {\n res.once(\"finish\", () => {\n try {\n const responseTime = performance.now() - startTime;\n const path = getRoutePath(req);\n\n spanHandle.setName(`${req.method} ${path}`);\n const spans = spanHandle.end();\n const traceId = spanHandle.traceId;\n\n const consumer = getConsumer(req);\n client.consumerRegistry.addOrUpdateConsumer(consumer);\n\n const requestSize = parseContentLength(req.get(\"content-length\"));\n const responseSize = parseContentLength(\n res.get(\"content-length\"),\n );\n\n if (path) {\n client.requestCounter.addRequest({\n consumer: consumer?.identifier,\n method: req.method,\n path,\n statusCode: res.statusCode,\n responseTime: responseTime,\n requestSize,\n responseSize,\n });\n\n if (\n (res.statusCode === 400 || res.statusCode === 422) &&\n res.locals.body\n ) {\n let jsonBody: any;\n try {\n jsonBody = JSON.parse(res.locals.body);\n } catch {\n // Ignore\n }\n if (jsonBody) {\n const validationErrors: ValidationError[] = [];\n if (validationErrors.length === 0) {\n validationErrors.push(\n ...extractExpressValidatorErrors(jsonBody),\n );\n }\n if (validationErrors.length === 0) {\n validationErrors.push(\n ...extractCelebrateErrors(jsonBody),\n );\n }\n if (validationErrors.length === 0) {\n validationErrors.push(\n ...extractNestValidationErrors(jsonBody),\n );\n }\n validationErrors.forEach((error) => {\n client.validationErrorCounter.addValidationError({\n consumer: consumer?.identifier,\n method: req.method,\n path,\n ...error,\n });\n });\n }\n }\n\n if (res.statusCode === 500 && res.locals.serverError) {\n const serverError = res.locals.serverError as Error;\n client.serverErrorCounter.addServerError({\n consumer: consumer?.identifier,\n method: req.method,\n path,\n type: serverError.name,\n msg: serverError.message,\n traceback: serverError.stack || \"\",\n });\n }\n }\n\n if (client.requestLogger.enabled) {\n const logs = logsContext.getStore();\n client.requestLogger.logRequest(\n {\n timestamp: Date.now() / 1000,\n method: req.method,\n path,\n url: `${req.protocol}://${req.host}${req.originalUrl}`,\n headers: convertHeaders(req.headers),\n size: requestSize,\n consumer: consumer?.identifier,\n body: convertBody(req.body, req.get(\"content-type\")),\n },\n {\n statusCode: res.statusCode,\n responseTime: responseTime / 1000,\n headers: convertHeaders(res.getHeaders()),\n size: responseSize,\n body: convertBody(res.locals.body, res.get(\"content-type\")),\n },\n res.locals.serverError,\n logs,\n spans,\n traceId,\n );\n }\n } catch (error) {\n client.logger.error(\n \"Error while logging request in Apitally middleware\",\n { request: req, response: res, error },\n );\n }\n });\n\n res.once(\"close\", () => {\n spanHandle.end();\n });\n\n next();\n });\n } catch (error) {\n client.logger.error(\"Error in Apitally middleware\", {\n request: req,\n response: res,\n error,\n });\n }\n });\n };\n}\n\nfunction getRoutePath(req: Request) {\n if (!req.route) {\n return;\n }\n if (req.baseUrl) {\n const routerInfo = getRouterInfo(req.app);\n if (routerInfo.stack) {\n const routerPath = getRouterPath(routerInfo.stack, req.baseUrl);\n return req.route.path === \"/\" ? routerPath : routerPath + req.route.path;\n }\n }\n return req.route.path;\n}\n\nfunction getRouterPath(stack: any[], baseUrl: string) {\n const routerPaths: string[] = [];\n while (stack && stack.length > 0) {\n const routerLayer = stack.find(\n (layer) =>\n layer.name === \"router\" &&\n layer.path &&\n (baseUrl.startsWith(layer.path) || layer.regexp?.test(baseUrl)),\n );\n if (routerLayer) {\n if (\n routerLayer.regexp &&\n routerLayer.keys &&\n routerLayer.keys.length > 0\n ) {\n const parsedPath = parseExpressPathRegExp(\n routerLayer.regexp,\n routerLayer.keys,\n );\n routerPaths.push(\"/\" + parsedPath);\n } else if (\n routerLayer.params &&\n Object.keys(routerLayer.params).length > 0\n ) {\n const parsedPath = parseExpressPath(\n routerLayer.path,\n routerLayer.params,\n );\n routerPaths.push(parsedPath);\n } else {\n routerPaths.push(routerLayer.path);\n }\n stack = routerLayer.handle?.stack;\n baseUrl = baseUrl.slice(routerLayer.path.length);\n } else {\n break;\n }\n }\n return routerPaths.filter((path) => path !== \"/\").join(\"\");\n}\n\nexport function setConsumer(\n req: Request,\n consumer: ApitallyConsumer | string | null | undefined,\n) {\n req.apitallyConsumer = consumer || undefined;\n}\n\nfunction getConsumer(req: Request) {\n if (req.apitallyConsumer) {\n return consumerFromStringOrObject(req.apitallyConsumer);\n } else if (req.consumerIdentifier) {\n // For backwards compatibility\n process.emitWarning(\n \"The consumerIdentifier property on the request object is deprecated. Use apitallyConsumer instead.\",\n \"DeprecationWarning\",\n );\n return consumerFromStringOrObject(req.consumerIdentifier);\n }\n return null;\n}\n\nfunction extractExpressValidatorErrors(responseBody: any) {\n try {\n const errors: ValidationError[] = [];\n if (\n responseBody &&\n responseBody.errors &&\n Array.isArray(responseBody.errors)\n ) {\n responseBody.errors.forEach((error: any) => {\n if (error.location && error.path && error.msg && error.type) {\n errors.push({\n loc: `${error.location}.${error.path}`,\n msg: error.msg,\n type: error.type,\n });\n }\n });\n }\n return errors;\n } catch (error) {\n return [];\n }\n}\n\nfunction extractCelebrateErrors(responseBody: any) {\n try {\n const errors: ValidationError[] = [];\n if (responseBody && responseBody.validation) {\n Object.values(responseBody.validation).forEach((error: any) => {\n if (\n error.source &&\n error.keys &&\n Array.isArray(error.keys) &&\n error.message\n ) {\n error.keys.forEach((key: string) => {\n errors.push({\n loc: `${error.source}.${key}`,\n msg: subsetJoiMessage(error.message, key),\n type: \"\",\n });\n });\n }\n });\n }\n return errors;\n } catch (error) {\n return [];\n }\n}\n\nfunction extractNestValidationErrors(responseBody: any) {\n try {\n const errors: ValidationError[] = [];\n if (responseBody && Array.isArray(responseBody.message)) {\n responseBody.message.forEach((message: any) => {\n errors.push({\n loc: \"\",\n msg: message,\n type: \"\",\n });\n });\n }\n return errors;\n } catch (error) {\n return [];\n }\n}\n\nfunction subsetJoiMessage(message: string, key: string) {\n const messageWithKey = message\n .split(\". \")\n .find((message) => message.includes(`\"${key}\"`));\n return messageWithKey ? messageWithKey : message;\n}\n\nfunction getAppInfo(\n app: Express | Router,\n basePath?: string,\n appVersion?: string,\n): StartupData {\n const versions: Array<[string, string]> = [\n [\"nodejs\", process.version.replace(/^v/, \"\")],\n ];\n const expressVersion = getPackageVersion(\"express\");\n const nestjsVersion = getPackageVersion(\"@nestjs/core\");\n const apitallyVersion = getPackageVersion(\"../..\");\n if (expressVersion) {\n versions.push([\"express\", expressVersion]);\n }\n if (nestjsVersion) {\n versions.push([\"nestjs\", nestjsVersion]);\n }\n if (apitallyVersion) {\n versions.push([\"apitally\", apitallyVersion]);\n }\n if (appVersion) {\n versions.push([\"app\", appVersion]);\n }\n return {\n paths: getEndpoints(app, basePath || \"\"),\n versions: Object.fromEntries(versions),\n client: \"js:express\",\n };\n}\n"],"mappings":"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","names":["AsyncLocalStorage","performance","ApitallyClient","consumerFromStringOrObject","parseContentLength","getPackageVersion","convertBody","convertHeaders","patchConsole","patchNestLogger","patchPinoLogger","patchWinston","getEndpoints","getRouterInfo","parseExpressPath","parseExpressPathRegExp","useApitally","app","config","client","middleware","getMiddleware","use","setStartupData","attempt","appInfo","getAppInfo","basePath","appVersion","paths","length","startSync","setTimeout","errorHandlerConfigured","logsContext","requestLogger","captureLogs","req","res","next","isEnabled","method","toUpperCase","err","locals","serverError","log","run","startTime","now","originalSend","send","body","contentType","get","isSupportedContentType","call","spanHandle","spanCollector","startSpan","runInContext","once","responseTime","path","getRoutePath","setName","spans","end","traceId","consumer","getConsumer","consumerRegistry","addOrUpdateConsumer","requestSize","responseSize","requestCounter","addRequest","identifier","statusCode","jsonBody","JSON","parse","validationErrors","push","extractExpressValidatorErrors","extractCelebrateErrors","extractNestValidationErrors","forEach","error","validationErrorCounter","addValidationError","serverErrorCounter","addServerError","type","name","msg","message","traceback","stack","enabled","logs","getStore","logRequest","timestamp","Date","url","protocol","host","originalUrl","headers","size","getHeaders","logger","request","response","route","baseUrl","routerInfo","routerPath","getRouterPath","routerPaths","routerLayer","find","layer","_a","startsWith","regexp","test","keys","parsedPath","params","Object","handle","slice","filter","join","setConsumer","apitallyConsumer","undefined","consumerIdentifier","process","emitWarning","responseBody","errors","Array","isArray","location","loc","validation","values","source","key","subsetJoiMessage","messageWithKey","split","includes","versions","version","replace","expressVersion","nestjsVersion","apitallyVersion","fromEntries"]}
|
package/dist/fastify/index.cjs
CHANGED
|
@@ -28,13 +28,16 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
28
28
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
29
|
var fastify_exports = {};
|
|
30
30
|
__export(fastify_exports, {
|
|
31
|
+
ApitallySpanProcessor: () => import_spanCollector.ApitallySpanProcessor,
|
|
31
32
|
apitallyPlugin: () => import_plugin.default,
|
|
32
33
|
setConsumer: () => import_plugin.setConsumer
|
|
33
34
|
});
|
|
34
35
|
module.exports = __toCommonJS(fastify_exports);
|
|
36
|
+
var import_spanCollector = require("../common/spanCollector.js");
|
|
35
37
|
var import_plugin = __toESM(require("./plugin.js"), 1);
|
|
36
38
|
// Annotate the CommonJS export names for ESM import in node:
|
|
37
39
|
0 && (module.exports = {
|
|
40
|
+
ApitallySpanProcessor,
|
|
38
41
|
apitallyPlugin,
|
|
39
42
|
setConsumer
|
|
40
43
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/fastify/index.ts"],"sourcesContent":["export type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport { default as apitallyPlugin, setConsumer } from \"./plugin.js\";\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/fastify/index.ts"],"sourcesContent":["export { ApitallySpanProcessor } from \"../common/spanCollector.js\";\nexport type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport { default as apitallyPlugin, setConsumer } from \"./plugin.js\";\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;2BAAsC;AAEtC,oBAAuD;","names":[]}
|
package/dist/fastify/index.d.cts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
export { ApitallySpanProcessor } from '../common/spanCollector.cjs';
|
|
1
2
|
export { ApitallyConfig, ApitallyConsumer } from '../common/types.cjs';
|
|
2
3
|
export { default as apitallyPlugin, setConsumer } from './plugin.cjs';
|
|
4
|
+
import '@opentelemetry/sdk-trace-base';
|
|
3
5
|
import '../common/logging.cjs';
|
|
4
6
|
import 'winston';
|
|
5
7
|
import '../common/requestLogger.cjs';
|
package/dist/fastify/index.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
export { ApitallySpanProcessor } from '../common/spanCollector.js';
|
|
1
2
|
export { ApitallyConfig, ApitallyConsumer } from '../common/types.js';
|
|
2
3
|
export { default as apitallyPlugin, setConsumer } from './plugin.js';
|
|
4
|
+
import '@opentelemetry/sdk-trace-base';
|
|
3
5
|
import '../common/logging.js';
|
|
4
6
|
import 'winston';
|
|
5
7
|
import '../common/requestLogger.js';
|
package/dist/fastify/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/fastify/index.ts"],"sourcesContent":["export type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport { default as apitallyPlugin, setConsumer } from \"./plugin.js\";\n"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../src/fastify/index.ts"],"sourcesContent":["export { ApitallySpanProcessor } from \"../common/spanCollector.js\";\nexport type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport { default as apitallyPlugin, setConsumer } from \"./plugin.js\";\n"],"mappings":"AAAA,SAASA,6BAA6B;AAEtC,SAAoBC,WAAXC,UAA2BC,mBAAmB;","names":["ApitallySpanProcessor","apitallyPlugin","default","setConsumer"]}
|
package/dist/fastify/plugin.cjs
CHANGED
|
@@ -42,8 +42,9 @@ var import_headers = require("../common/headers.js");
|
|
|
42
42
|
var import_packageVersions = require("../common/packageVersions.js");
|
|
43
43
|
var import_requestLogger = require("../common/requestLogger.js");
|
|
44
44
|
var import_loggers = require("../loggers/index.js");
|
|
45
|
-
const LOGS_SYMBOL = Symbol("apitally.logs");
|
|
46
|
-
const ASYNC_RESOURCE_SYMBOL = Symbol("apitally.
|
|
45
|
+
const LOGS_SYMBOL = /* @__PURE__ */ Symbol("apitally.logs");
|
|
46
|
+
const ASYNC_RESOURCE_SYMBOL = /* @__PURE__ */ Symbol("apitally.asyncResource");
|
|
47
|
+
const SPAN_HANDLE_SYMBOL = /* @__PURE__ */ Symbol("apitally.spanHandle");
|
|
47
48
|
const apitallyPlugin = /* @__PURE__ */ __name(async (fastify, config) => {
|
|
48
49
|
const client = new import_client.ApitallyClient(config);
|
|
49
50
|
const routes = [];
|
|
@@ -85,9 +86,13 @@ const apitallyPlugin = /* @__PURE__ */ __name(async (fastify, config) => {
|
|
|
85
86
|
const logs = [];
|
|
86
87
|
request[LOGS_SYMBOL] = logs;
|
|
87
88
|
logsContext.run(logs, () => {
|
|
88
|
-
const
|
|
89
|
-
request[
|
|
90
|
-
|
|
89
|
+
const spanHandle = client.spanCollector.startSpan();
|
|
90
|
+
request[SPAN_HANDLE_SYMBOL] = spanHandle;
|
|
91
|
+
spanHandle.runInContext(() => {
|
|
92
|
+
const asyncResource = new import_node_async_hooks.AsyncResource("ApitallyContext");
|
|
93
|
+
request[ASYNC_RESOURCE_SYMBOL] = asyncResource;
|
|
94
|
+
asyncResource.runInAsyncScope(done, request.raw);
|
|
95
|
+
});
|
|
91
96
|
});
|
|
92
97
|
} else {
|
|
93
98
|
done();
|
|
@@ -162,6 +167,10 @@ const apitallyPlugin = /* @__PURE__ */ __name(async (fastify, config) => {
|
|
|
162
167
|
traceback: reply.serverError.stack || ""
|
|
163
168
|
});
|
|
164
169
|
}
|
|
170
|
+
const spanHandle = request[SPAN_HANDLE_SYMBOL];
|
|
171
|
+
spanHandle == null ? void 0 : spanHandle.setName(`${request.method} ${path}`);
|
|
172
|
+
const spans = spanHandle == null ? void 0 : spanHandle.end();
|
|
173
|
+
const traceId = spanHandle == null ? void 0 : spanHandle.traceId;
|
|
165
174
|
if (client.requestLogger.enabled) {
|
|
166
175
|
const logs = request[LOGS_SYMBOL];
|
|
167
176
|
client.requestLogger.logRequest({
|
|
@@ -179,7 +188,7 @@ const apitallyPlugin = /* @__PURE__ */ __name(async (fastify, config) => {
|
|
|
179
188
|
headers: (0, import_requestLogger.convertHeaders)(reply.getHeaders()),
|
|
180
189
|
size: responseSize,
|
|
181
190
|
body: (0, import_requestLogger.convertBody)(reply.payload, (_a = reply.getHeader("content-type")) == null ? void 0 : _a.toString())
|
|
182
|
-
}, reply.serverError, logs);
|
|
191
|
+
}, reply.serverError, logs, spans, traceId);
|
|
183
192
|
}
|
|
184
193
|
}
|
|
185
194
|
done();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/fastify/plugin.ts"],"sourcesContent":["import type {\n FastifyError,\n FastifyPluginAsync,\n FastifyReply,\n FastifyRequest,\n} from \"fastify\";\nimport fp from \"fastify-plugin\";\nimport { AsyncLocalStorage, AsyncResource } from \"node:async_hooks\";\n\nimport { ApitallyClient } from \"../common/client.js\";\nimport { consumerFromStringOrObject } from \"../common/consumerRegistry.js\";\nimport { parseContentLength } from \"../common/headers.js\";\nimport { getPackageVersion } from \"../common/packageVersions.js\";\nimport type { LogRecord } from \"../common/requestLogger.js\";\nimport { convertBody, convertHeaders } from \"../common/requestLogger.js\";\nimport {\n ApitallyConfig,\n ApitallyConsumer,\n PathInfo,\n ValidationError,\n} from \"../common/types.js\";\nimport {\n patchConsole,\n patchNestLogger,\n patchPinoLogger,\n patchWinston,\n} from \"../loggers/index.js\";\n\nconst LOGS_SYMBOL = Symbol(\"apitally.logs\");\nconst ASYNC_RESOURCE_SYMBOL = Symbol(\"apitally.logsContextAsyncResource\");\n\ndeclare module \"fastify\" {\n interface FastifyReply {\n payload: any;\n serverError?: FastifyError;\n }\n\n interface FastifyRequest {\n apitallyConsumer?: ApitallyConsumer | string | null;\n consumerIdentifier?: ApitallyConsumer | string | null; // For backwards compatibility\n\n [LOGS_SYMBOL]?: LogRecord[];\n [ASYNC_RESOURCE_SYMBOL]?: AsyncResource;\n }\n}\n\nconst apitallyPlugin: FastifyPluginAsync<ApitallyConfig> = async (\n fastify,\n config,\n) => {\n const client = new ApitallyClient(config);\n const routes: PathInfo[] = [];\n const logsContext = new AsyncLocalStorage<LogRecord[]>();\n\n if (client.requestLogger.config.captureLogs) {\n patchConsole(logsContext);\n patchWinston(logsContext);\n patchPinoLogger(fastify.log, logsContext);\n patchNestLogger(logsContext);\n }\n\n fastify.decorateRequest(\"apitallyConsumer\", null);\n fastify.decorateRequest(\"consumerIdentifier\", null); // For backwards compatibility\n fastify.decorateReply(\"payload\", null);\n\n fastify.addHook(\"onRoute\", (routeOptions) => {\n const methods = Array.isArray(routeOptions.method)\n ? routeOptions.method\n : [routeOptions.method];\n methods.forEach((method) => {\n if (![\"HEAD\", \"OPTIONS\"].includes(method.toUpperCase())) {\n routes.push({\n method: method.toUpperCase(),\n path: routeOptions.url,\n });\n }\n });\n });\n\n fastify.addHook(\"onReady\", () => {\n client.setStartupData(getAppInfo(routes, config.appVersion));\n client.startSync();\n });\n\n fastify.addHook(\"onClose\", async () => {\n await client.handleShutdown();\n });\n\n // Establish logs context for each request\n fastify.addHook(\"onRequest\", (request, reply, done) => {\n if (client.isEnabled()) {\n const logs: LogRecord[] = [];\n request[LOGS_SYMBOL] = logs;\n logsContext.run(logs, () => {\n const asyncResource = new AsyncResource(\"ApitallyLogsContext\");\n request[ASYNC_RESOURCE_SYMBOL] = asyncResource;\n asyncResource.runInAsyncScope(done, request.raw);\n });\n } else {\n done();\n }\n });\n\n // Restore async context for later hooks and route handlers\n fastify.addHook(\"preValidation\", (request, reply, done) => {\n if (client.isEnabled() && request[ASYNC_RESOURCE_SYMBOL]) {\n const asyncResource = request[ASYNC_RESOURCE_SYMBOL];\n asyncResource.runInAsyncScope(done, request.raw);\n } else {\n done();\n }\n });\n\n fastify.addHook(\"onSend\", (request, reply, payload: any, done) => {\n const contentType = reply.getHeader(\"content-type\") as string | undefined;\n if (client.requestLogger.isSupportedContentType(contentType)) {\n reply.payload = payload;\n }\n done();\n });\n\n fastify.addHook(\"onError\", (request, reply, error, done) => {\n if (!error.statusCode || error.statusCode === 500) {\n reply.serverError = error;\n }\n done();\n });\n\n fastify.addHook(\"onResponse\", (request, reply, done) => {\n if (client.isEnabled() && request.method.toUpperCase() !== \"OPTIONS\") {\n // Get path from routeOptions if available (from v4), otherwise fallback to deprecated routerPath\n const consumer = getConsumer(request);\n const path =\n \"routeOptions\" in request\n ? (request as any).routeOptions.url\n : (request as any).routerPath;\n const requestSize = parseContentLength(request.headers[\"content-length\"]);\n const responseSize = parseContentLength(\n reply.getHeader(\"content-length\"),\n );\n const responseTime = getResponseTime(reply);\n client.consumerRegistry.addOrUpdateConsumer(consumer);\n client.requestCounter.addRequest({\n consumer: consumer?.identifier,\n method: request.method,\n path,\n statusCode: reply.statusCode,\n responseTime,\n requestSize,\n responseSize,\n });\n\n if (\n (reply.statusCode === 400 || reply.statusCode === 422) &&\n reply.payload\n ) {\n try {\n const parsedPayload = JSON.parse(reply.payload);\n const validationErrors: ValidationError[] = [];\n\n if (\n (!parsedPayload.code ||\n parsedPayload.code === \"FST_ERR_VALIDATION\") &&\n typeof parsedPayload.message === \"string\"\n ) {\n validationErrors.push(...extractAjvErrors(parsedPayload.message));\n } else if (Array.isArray(parsedPayload.message)) {\n validationErrors.push(\n ...extractNestValidationErrors(parsedPayload.message),\n );\n }\n\n validationErrors.forEach((error) => {\n client.validationErrorCounter.addValidationError({\n consumer: consumer?.identifier,\n method: request.method,\n path: path,\n ...error,\n });\n });\n } catch (error) {} // eslint-disable-line no-empty\n }\n\n if (reply.statusCode === 500 && reply.serverError) {\n client.serverErrorCounter.addServerError({\n consumer: consumer?.identifier,\n method: request.method,\n path: path,\n type: reply.serverError.name,\n msg: reply.serverError.message,\n traceback: reply.serverError.stack || \"\",\n });\n }\n\n if (client.requestLogger.enabled) {\n const logs = request[LOGS_SYMBOL];\n client.requestLogger.logRequest(\n {\n timestamp: Date.now() / 1000,\n method: request.method,\n path,\n url: `${request.protocol}://${request.host ?? request.hostname}${request.originalUrl ?? request.url}`,\n headers: convertHeaders(request.headers),\n size: requestSize,\n consumer: consumer?.identifier,\n body: convertBody(request.body, request.headers[\"content-type\"]),\n },\n {\n statusCode: reply.statusCode,\n responseTime: responseTime / 1000,\n headers: convertHeaders(reply.getHeaders()),\n size: responseSize,\n body: convertBody(\n reply.payload,\n reply.getHeader(\"content-type\")?.toString(),\n ),\n },\n reply.serverError,\n logs,\n );\n }\n }\n\n done();\n });\n};\n\nfunction getAppInfo(routes: PathInfo[], appVersion?: string) {\n const versions = [[\"nodejs\", process.version.replace(/^v/, \"\")]];\n const fastifyVersion = getPackageVersion(\"fastify\");\n const pinoVersion = getPackageVersion(\"pino\");\n const nestjsVersion = getPackageVersion(\"@nestjs/core\");\n const apitallyVersion = getPackageVersion(\"../..\");\n if (fastifyVersion) {\n versions.push([\"fastify\", fastifyVersion]);\n }\n if (pinoVersion) {\n versions.push([\"pino\", pinoVersion]);\n }\n if (nestjsVersion) {\n versions.push([\"nestjs\", nestjsVersion]);\n }\n if (apitallyVersion) {\n versions.push([\"apitally\", apitallyVersion]);\n }\n if (appVersion) {\n versions.push([\"app\", appVersion]);\n }\n return {\n paths: routes,\n versions: Object.fromEntries(versions),\n client: \"js:fastify\",\n };\n}\n\nexport function setConsumer(\n request: FastifyRequest,\n consumer: ApitallyConsumer | string | null | undefined,\n) {\n request.apitallyConsumer = consumer || undefined;\n}\n\nfunction getConsumer(request: FastifyRequest) {\n if (request.apitallyConsumer) {\n return consumerFromStringOrObject(request.apitallyConsumer);\n } else if (request.consumerIdentifier) {\n // For backwards compatibility\n process.emitWarning(\n \"The consumerIdentifier property on the request object is deprecated. Use apitallyConsumer instead.\",\n \"DeprecationWarning\",\n );\n return consumerFromStringOrObject(request.consumerIdentifier);\n }\n return null;\n}\n\nfunction getResponseTime(reply: FastifyReply) {\n if (reply.elapsedTime !== undefined) {\n return reply.elapsedTime;\n } else if ((reply as any).getResponseTime !== undefined) {\n return (reply as any).getResponseTime();\n }\n return 0;\n}\n\nfunction extractAjvErrors(message: string): ValidationError[] {\n try {\n const regex =\n /(?<=^|, )((?:headers|params|query|querystring|body)[/.][^ ]+)(?= )/g;\n const matches: { match: string; index: number }[] = [];\n let match: RegExpExecArray | null;\n while ((match = regex.exec(message)) !== null) {\n matches.push({ match: match[0], index: match.index });\n }\n\n return matches.map((m, i) => {\n const endIndex =\n i + 1 < matches.length ? matches[i + 1].index - 2 : message.length;\n const matchSplit = m.match.split(/[/.]/);\n if (matchSplit[0] === \"querystring\") {\n matchSplit[0] = \"query\";\n }\n return {\n loc: matchSplit.join(\".\"),\n msg: message.substring(m.index, endIndex),\n type: \"\",\n };\n });\n } catch (error) {\n return [];\n }\n}\n\nfunction extractNestValidationErrors(message: any[]): ValidationError[] {\n try {\n return message\n .filter((msg: any) => typeof msg === \"string\")\n .map((msg: any) => ({\n loc: \"\",\n msg,\n type: \"\",\n }));\n } catch (error) {\n return [];\n }\n}\n\nexport { apitallyPlugin };\n\nexport default fp(apitallyPlugin, {\n name: \"apitally\",\n});\n"],"mappings":"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","names":["LOGS_SYMBOL","Symbol","ASYNC_RESOURCE_SYMBOL","apitallyPlugin","fastify","config","client","ApitallyClient","routes","logsContext","AsyncLocalStorage","requestLogger","captureLogs","patchConsole","patchWinston","patchPinoLogger","log","patchNestLogger","decorateRequest","decorateReply","addHook","routeOptions","methods","Array","isArray","method","forEach","includes","toUpperCase","push","path","url","setStartupData","getAppInfo","appVersion","startSync","handleShutdown","request","reply","done","isEnabled","logs","run","asyncResource","AsyncResource","runInAsyncScope","raw","payload","contentType","getHeader","isSupportedContentType","error","statusCode","serverError","consumer","getConsumer","routerPath","requestSize","parseContentLength","headers","responseSize","responseTime","getResponseTime","consumerRegistry","addOrUpdateConsumer","requestCounter","addRequest","identifier","parsedPayload","JSON","parse","validationErrors","code","message","extractAjvErrors","extractNestValidationErrors","validationErrorCounter","addValidationError","serverErrorCounter","addServerError","type","name","msg","traceback","stack","enabled","logRequest","timestamp","Date","now","protocol","host","hostname","originalUrl","convertHeaders","size","body","convertBody","getHeaders","toString","versions","process","version","replace","fastifyVersion","getPackageVersion","pinoVersion","nestjsVersion","apitallyVersion","paths","Object","fromEntries","setConsumer","apitallyConsumer","undefined","consumerFromStringOrObject","consumerIdentifier","emitWarning","elapsedTime","regex","matches","match","exec","index","map","m","i","endIndex","length","matchSplit","split","loc","join","substring","filter","fp"]}
|
|
1
|
+
{"version":3,"sources":["../../src/fastify/plugin.ts"],"sourcesContent":["import type {\n FastifyError,\n FastifyPluginAsync,\n FastifyReply,\n FastifyRequest,\n} from \"fastify\";\nimport fp from \"fastify-plugin\";\nimport { AsyncLocalStorage, AsyncResource } from \"node:async_hooks\";\n\nimport { ApitallyClient } from \"../common/client.js\";\nimport { consumerFromStringOrObject } from \"../common/consumerRegistry.js\";\nimport { parseContentLength } from \"../common/headers.js\";\nimport { getPackageVersion } from \"../common/packageVersions.js\";\nimport type { LogRecord } from \"../common/requestLogger.js\";\nimport { convertBody, convertHeaders } from \"../common/requestLogger.js\";\nimport type { SpanHandle } from \"../common/spanCollector.js\";\nimport {\n ApitallyConfig,\n ApitallyConsumer,\n PathInfo,\n ValidationError,\n} from \"../common/types.js\";\nimport {\n patchConsole,\n patchNestLogger,\n patchPinoLogger,\n patchWinston,\n} from \"../loggers/index.js\";\n\nconst LOGS_SYMBOL = Symbol(\"apitally.logs\");\nconst ASYNC_RESOURCE_SYMBOL = Symbol(\"apitally.asyncResource\");\nconst SPAN_HANDLE_SYMBOL = Symbol(\"apitally.spanHandle\");\n\ndeclare module \"fastify\" {\n interface FastifyReply {\n payload: any;\n serverError?: FastifyError;\n }\n\n interface FastifyRequest {\n apitallyConsumer?: ApitallyConsumer | string | null;\n consumerIdentifier?: ApitallyConsumer | string | null; // For backwards compatibility\n\n [LOGS_SYMBOL]?: LogRecord[];\n [ASYNC_RESOURCE_SYMBOL]?: AsyncResource;\n [SPAN_HANDLE_SYMBOL]?: SpanHandle;\n }\n}\n\nconst apitallyPlugin: FastifyPluginAsync<ApitallyConfig> = async (\n fastify,\n config,\n) => {\n const client = new ApitallyClient(config);\n const routes: PathInfo[] = [];\n const logsContext = new AsyncLocalStorage<LogRecord[]>();\n\n if (client.requestLogger.config.captureLogs) {\n patchConsole(logsContext);\n patchWinston(logsContext);\n patchPinoLogger(fastify.log, logsContext);\n patchNestLogger(logsContext);\n }\n\n fastify.decorateRequest(\"apitallyConsumer\", null);\n fastify.decorateRequest(\"consumerIdentifier\", null); // For backwards compatibility\n fastify.decorateReply(\"payload\", null);\n\n fastify.addHook(\"onRoute\", (routeOptions) => {\n const methods = Array.isArray(routeOptions.method)\n ? routeOptions.method\n : [routeOptions.method];\n methods.forEach((method) => {\n if (![\"HEAD\", \"OPTIONS\"].includes(method.toUpperCase())) {\n routes.push({\n method: method.toUpperCase(),\n path: routeOptions.url,\n });\n }\n });\n });\n\n fastify.addHook(\"onReady\", () => {\n client.setStartupData(getAppInfo(routes, config.appVersion));\n client.startSync();\n });\n\n fastify.addHook(\"onClose\", async () => {\n await client.handleShutdown();\n });\n\n // Establish logs context and start span for each request\n fastify.addHook(\"onRequest\", (request, reply, done) => {\n if (client.isEnabled()) {\n const logs: LogRecord[] = [];\n request[LOGS_SYMBOL] = logs;\n logsContext.run(logs, () => {\n const spanHandle = client.spanCollector.startSpan();\n request[SPAN_HANDLE_SYMBOL] = spanHandle;\n spanHandle.runInContext(() => {\n const asyncResource = new AsyncResource(\"ApitallyContext\");\n request[ASYNC_RESOURCE_SYMBOL] = asyncResource;\n asyncResource.runInAsyncScope(done, request.raw);\n });\n });\n } else {\n done();\n }\n });\n\n // Restore async context for later hooks and route handlers\n fastify.addHook(\"preValidation\", (request, reply, done) => {\n if (client.isEnabled() && request[ASYNC_RESOURCE_SYMBOL]) {\n const asyncResource = request[ASYNC_RESOURCE_SYMBOL];\n asyncResource.runInAsyncScope(done, request.raw);\n } else {\n done();\n }\n });\n\n fastify.addHook(\"onSend\", (request, reply, payload: any, done) => {\n const contentType = reply.getHeader(\"content-type\") as string | undefined;\n if (client.requestLogger.isSupportedContentType(contentType)) {\n reply.payload = payload;\n }\n done();\n });\n\n fastify.addHook(\"onError\", (request, reply, error, done) => {\n if (!error.statusCode || error.statusCode === 500) {\n reply.serverError = error;\n }\n done();\n });\n\n fastify.addHook(\"onResponse\", (request, reply, done) => {\n if (client.isEnabled() && request.method.toUpperCase() !== \"OPTIONS\") {\n // Get path from routeOptions if available (from v4), otherwise fallback to deprecated routerPath\n const consumer = getConsumer(request);\n const path =\n \"routeOptions\" in request\n ? (request as any).routeOptions.url\n : (request as any).routerPath;\n const requestSize = parseContentLength(request.headers[\"content-length\"]);\n const responseSize = parseContentLength(\n reply.getHeader(\"content-length\"),\n );\n const responseTime = getResponseTime(reply);\n client.consumerRegistry.addOrUpdateConsumer(consumer);\n client.requestCounter.addRequest({\n consumer: consumer?.identifier,\n method: request.method,\n path,\n statusCode: reply.statusCode,\n responseTime,\n requestSize,\n responseSize,\n });\n\n if (\n (reply.statusCode === 400 || reply.statusCode === 422) &&\n reply.payload\n ) {\n try {\n const parsedPayload = JSON.parse(reply.payload);\n const validationErrors: ValidationError[] = [];\n\n if (\n (!parsedPayload.code ||\n parsedPayload.code === \"FST_ERR_VALIDATION\") &&\n typeof parsedPayload.message === \"string\"\n ) {\n validationErrors.push(...extractAjvErrors(parsedPayload.message));\n } else if (Array.isArray(parsedPayload.message)) {\n validationErrors.push(\n ...extractNestValidationErrors(parsedPayload.message),\n );\n }\n\n validationErrors.forEach((error) => {\n client.validationErrorCounter.addValidationError({\n consumer: consumer?.identifier,\n method: request.method,\n path: path,\n ...error,\n });\n });\n } catch (error) {} // eslint-disable-line no-empty\n }\n\n if (reply.statusCode === 500 && reply.serverError) {\n client.serverErrorCounter.addServerError({\n consumer: consumer?.identifier,\n method: request.method,\n path: path,\n type: reply.serverError.name,\n msg: reply.serverError.message,\n traceback: reply.serverError.stack || \"\",\n });\n }\n\n const spanHandle = request[SPAN_HANDLE_SYMBOL];\n spanHandle?.setName(`${request.method} ${path}`);\n const spans = spanHandle?.end();\n const traceId = spanHandle?.traceId;\n\n if (client.requestLogger.enabled) {\n const logs = request[LOGS_SYMBOL];\n client.requestLogger.logRequest(\n {\n timestamp: Date.now() / 1000,\n method: request.method,\n path,\n url: `${request.protocol}://${request.host ?? request.hostname}${request.originalUrl ?? request.url}`,\n headers: convertHeaders(request.headers),\n size: requestSize,\n consumer: consumer?.identifier,\n body: convertBody(request.body, request.headers[\"content-type\"]),\n },\n {\n statusCode: reply.statusCode,\n responseTime: responseTime / 1000,\n headers: convertHeaders(reply.getHeaders()),\n size: responseSize,\n body: convertBody(\n reply.payload,\n reply.getHeader(\"content-type\")?.toString(),\n ),\n },\n reply.serverError,\n logs,\n spans,\n traceId,\n );\n }\n }\n\n done();\n });\n};\n\nfunction getAppInfo(routes: PathInfo[], appVersion?: string) {\n const versions = [[\"nodejs\", process.version.replace(/^v/, \"\")]];\n const fastifyVersion = getPackageVersion(\"fastify\");\n const pinoVersion = getPackageVersion(\"pino\");\n const nestjsVersion = getPackageVersion(\"@nestjs/core\");\n const apitallyVersion = getPackageVersion(\"../..\");\n if (fastifyVersion) {\n versions.push([\"fastify\", fastifyVersion]);\n }\n if (pinoVersion) {\n versions.push([\"pino\", pinoVersion]);\n }\n if (nestjsVersion) {\n versions.push([\"nestjs\", nestjsVersion]);\n }\n if (apitallyVersion) {\n versions.push([\"apitally\", apitallyVersion]);\n }\n if (appVersion) {\n versions.push([\"app\", appVersion]);\n }\n return {\n paths: routes,\n versions: Object.fromEntries(versions),\n client: \"js:fastify\",\n };\n}\n\nexport function setConsumer(\n request: FastifyRequest,\n consumer: ApitallyConsumer | string | null | undefined,\n) {\n request.apitallyConsumer = consumer || undefined;\n}\n\nfunction getConsumer(request: FastifyRequest) {\n if (request.apitallyConsumer) {\n return consumerFromStringOrObject(request.apitallyConsumer);\n } else if (request.consumerIdentifier) {\n // For backwards compatibility\n process.emitWarning(\n \"The consumerIdentifier property on the request object is deprecated. Use apitallyConsumer instead.\",\n \"DeprecationWarning\",\n );\n return consumerFromStringOrObject(request.consumerIdentifier);\n }\n return null;\n}\n\nfunction getResponseTime(reply: FastifyReply) {\n if (reply.elapsedTime !== undefined) {\n return reply.elapsedTime;\n } else if ((reply as any).getResponseTime !== undefined) {\n return (reply as any).getResponseTime();\n }\n return 0;\n}\n\nfunction extractAjvErrors(message: string): ValidationError[] {\n try {\n const regex =\n /(?<=^|, )((?:headers|params|query|querystring|body)[/.][^ ]+)(?= )/g;\n const matches: { match: string; index: number }[] = [];\n let match: RegExpExecArray | null;\n while ((match = regex.exec(message)) !== null) {\n matches.push({ match: match[0], index: match.index });\n }\n\n return matches.map((m, i) => {\n const endIndex =\n i + 1 < matches.length ? matches[i + 1].index - 2 : message.length;\n const matchSplit = m.match.split(/[/.]/);\n if (matchSplit[0] === \"querystring\") {\n matchSplit[0] = \"query\";\n }\n return {\n loc: matchSplit.join(\".\"),\n msg: message.substring(m.index, endIndex),\n type: \"\",\n };\n });\n } catch (error) {\n return [];\n }\n}\n\nfunction extractNestValidationErrors(message: any[]): ValidationError[] {\n try {\n return message\n .filter((msg: any) => typeof msg === \"string\")\n .map((msg: any) => ({\n loc: \"\",\n msg,\n type: \"\",\n }));\n } catch (error) {\n return [];\n }\n}\n\nexport { apitallyPlugin };\n\nexport default fp(apitallyPlugin, {\n name: \"apitally\",\n});\n"],"mappings":"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","names":["LOGS_SYMBOL","Symbol","ASYNC_RESOURCE_SYMBOL","SPAN_HANDLE_SYMBOL","apitallyPlugin","fastify","config","client","ApitallyClient","routes","logsContext","AsyncLocalStorage","requestLogger","captureLogs","patchConsole","patchWinston","patchPinoLogger","log","patchNestLogger","decorateRequest","decorateReply","addHook","routeOptions","methods","Array","isArray","method","forEach","includes","toUpperCase","push","path","url","setStartupData","getAppInfo","appVersion","startSync","handleShutdown","request","reply","done","isEnabled","logs","run","spanHandle","spanCollector","startSpan","runInContext","asyncResource","AsyncResource","runInAsyncScope","raw","payload","contentType","getHeader","isSupportedContentType","error","statusCode","serverError","consumer","getConsumer","routerPath","requestSize","parseContentLength","headers","responseSize","responseTime","getResponseTime","consumerRegistry","addOrUpdateConsumer","requestCounter","addRequest","identifier","parsedPayload","JSON","parse","validationErrors","code","message","extractAjvErrors","extractNestValidationErrors","validationErrorCounter","addValidationError","serverErrorCounter","addServerError","type","name","msg","traceback","stack","setName","spans","end","traceId","enabled","logRequest","timestamp","Date","now","protocol","host","hostname","originalUrl","convertHeaders","size","body","convertBody","getHeaders","toString","versions","process","version","replace","fastifyVersion","getPackageVersion","pinoVersion","nestjsVersion","apitallyVersion","paths","Object","fromEntries","setConsumer","apitallyConsumer","undefined","consumerFromStringOrObject","consumerIdentifier","emitWarning","elapsedTime","regex","matches","match","exec","index","map","m","i","endIndex","length","matchSplit","split","loc","join","substring","filter","fp"]}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { SpanHandle } from '../common/spanCollector.cjs';
|
|
1
2
|
import { ApitallyConsumer, ApitallyConfig } from '../common/types.cjs';
|
|
2
3
|
import { FastifyError, FastifyPluginAsync, FastifyRequest } from 'fastify';
|
|
3
4
|
import { AsyncResource } from 'node:async_hooks';
|
|
4
5
|
import { LogRecord } from '../common/requestLogger.cjs';
|
|
6
|
+
import '@opentelemetry/sdk-trace-base';
|
|
5
7
|
import '../common/logging.cjs';
|
|
6
8
|
import 'winston';
|
|
7
9
|
import 'node:buffer';
|
|
@@ -10,6 +12,7 @@ import '../common/tempGzipFile.cjs';
|
|
|
10
12
|
|
|
11
13
|
declare const LOGS_SYMBOL: unique symbol;
|
|
12
14
|
declare const ASYNC_RESOURCE_SYMBOL: unique symbol;
|
|
15
|
+
declare const SPAN_HANDLE_SYMBOL: unique symbol;
|
|
13
16
|
declare module "fastify" {
|
|
14
17
|
interface FastifyReply {
|
|
15
18
|
payload: any;
|
|
@@ -20,6 +23,7 @@ declare module "fastify" {
|
|
|
20
23
|
consumerIdentifier?: ApitallyConsumer | string | null;
|
|
21
24
|
[LOGS_SYMBOL]?: LogRecord[];
|
|
22
25
|
[ASYNC_RESOURCE_SYMBOL]?: AsyncResource;
|
|
26
|
+
[SPAN_HANDLE_SYMBOL]?: SpanHandle;
|
|
23
27
|
}
|
|
24
28
|
}
|
|
25
29
|
declare const apitallyPlugin: FastifyPluginAsync<ApitallyConfig>;
|
package/dist/fastify/plugin.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { SpanHandle } from '../common/spanCollector.js';
|
|
1
2
|
import { ApitallyConsumer, ApitallyConfig } from '../common/types.js';
|
|
2
3
|
import { FastifyError, FastifyPluginAsync, FastifyRequest } from 'fastify';
|
|
3
4
|
import { AsyncResource } from 'node:async_hooks';
|
|
4
5
|
import { LogRecord } from '../common/requestLogger.js';
|
|
6
|
+
import '@opentelemetry/sdk-trace-base';
|
|
5
7
|
import '../common/logging.js';
|
|
6
8
|
import 'winston';
|
|
7
9
|
import 'node:buffer';
|
|
@@ -10,6 +12,7 @@ import '../common/tempGzipFile.js';
|
|
|
10
12
|
|
|
11
13
|
declare const LOGS_SYMBOL: unique symbol;
|
|
12
14
|
declare const ASYNC_RESOURCE_SYMBOL: unique symbol;
|
|
15
|
+
declare const SPAN_HANDLE_SYMBOL: unique symbol;
|
|
13
16
|
declare module "fastify" {
|
|
14
17
|
interface FastifyReply {
|
|
15
18
|
payload: any;
|
|
@@ -20,6 +23,7 @@ declare module "fastify" {
|
|
|
20
23
|
consumerIdentifier?: ApitallyConsumer | string | null;
|
|
21
24
|
[LOGS_SYMBOL]?: LogRecord[];
|
|
22
25
|
[ASYNC_RESOURCE_SYMBOL]?: AsyncResource;
|
|
26
|
+
[SPAN_HANDLE_SYMBOL]?: SpanHandle;
|
|
23
27
|
}
|
|
24
28
|
}
|
|
25
29
|
declare const apitallyPlugin: FastifyPluginAsync<ApitallyConfig>;
|
package/dist/fastify/plugin.js
CHANGED
|
@@ -8,8 +8,9 @@ import { parseContentLength } from "../common/headers.js";
|
|
|
8
8
|
import { getPackageVersion } from "../common/packageVersions.js";
|
|
9
9
|
import { convertBody, convertHeaders } from "../common/requestLogger.js";
|
|
10
10
|
import { patchConsole, patchNestLogger, patchPinoLogger, patchWinston } from "../loggers/index.js";
|
|
11
|
-
const LOGS_SYMBOL = Symbol("apitally.logs");
|
|
12
|
-
const ASYNC_RESOURCE_SYMBOL = Symbol("apitally.
|
|
11
|
+
const LOGS_SYMBOL = /* @__PURE__ */ Symbol("apitally.logs");
|
|
12
|
+
const ASYNC_RESOURCE_SYMBOL = /* @__PURE__ */ Symbol("apitally.asyncResource");
|
|
13
|
+
const SPAN_HANDLE_SYMBOL = /* @__PURE__ */ Symbol("apitally.spanHandle");
|
|
13
14
|
const apitallyPlugin = /* @__PURE__ */ __name(async (fastify, config) => {
|
|
14
15
|
const client = new ApitallyClient(config);
|
|
15
16
|
const routes = [];
|
|
@@ -51,9 +52,13 @@ const apitallyPlugin = /* @__PURE__ */ __name(async (fastify, config) => {
|
|
|
51
52
|
const logs = [];
|
|
52
53
|
request[LOGS_SYMBOL] = logs;
|
|
53
54
|
logsContext.run(logs, () => {
|
|
54
|
-
const
|
|
55
|
-
request[
|
|
56
|
-
|
|
55
|
+
const spanHandle = client.spanCollector.startSpan();
|
|
56
|
+
request[SPAN_HANDLE_SYMBOL] = spanHandle;
|
|
57
|
+
spanHandle.runInContext(() => {
|
|
58
|
+
const asyncResource = new AsyncResource("ApitallyContext");
|
|
59
|
+
request[ASYNC_RESOURCE_SYMBOL] = asyncResource;
|
|
60
|
+
asyncResource.runInAsyncScope(done, request.raw);
|
|
61
|
+
});
|
|
57
62
|
});
|
|
58
63
|
} else {
|
|
59
64
|
done();
|
|
@@ -128,6 +133,10 @@ const apitallyPlugin = /* @__PURE__ */ __name(async (fastify, config) => {
|
|
|
128
133
|
traceback: reply.serverError.stack || ""
|
|
129
134
|
});
|
|
130
135
|
}
|
|
136
|
+
const spanHandle = request[SPAN_HANDLE_SYMBOL];
|
|
137
|
+
spanHandle == null ? void 0 : spanHandle.setName(`${request.method} ${path}`);
|
|
138
|
+
const spans = spanHandle == null ? void 0 : spanHandle.end();
|
|
139
|
+
const traceId = spanHandle == null ? void 0 : spanHandle.traceId;
|
|
131
140
|
if (client.requestLogger.enabled) {
|
|
132
141
|
const logs = request[LOGS_SYMBOL];
|
|
133
142
|
client.requestLogger.logRequest({
|
|
@@ -145,7 +154,7 @@ const apitallyPlugin = /* @__PURE__ */ __name(async (fastify, config) => {
|
|
|
145
154
|
headers: convertHeaders(reply.getHeaders()),
|
|
146
155
|
size: responseSize,
|
|
147
156
|
body: convertBody(reply.payload, (_a = reply.getHeader("content-type")) == null ? void 0 : _a.toString())
|
|
148
|
-
}, reply.serverError, logs);
|
|
157
|
+
}, reply.serverError, logs, spans, traceId);
|
|
149
158
|
}
|
|
150
159
|
}
|
|
151
160
|
done();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/fastify/plugin.ts"],"sourcesContent":["import type {\n FastifyError,\n FastifyPluginAsync,\n FastifyReply,\n FastifyRequest,\n} from \"fastify\";\nimport fp from \"fastify-plugin\";\nimport { AsyncLocalStorage, AsyncResource } from \"node:async_hooks\";\n\nimport { ApitallyClient } from \"../common/client.js\";\nimport { consumerFromStringOrObject } from \"../common/consumerRegistry.js\";\nimport { parseContentLength } from \"../common/headers.js\";\nimport { getPackageVersion } from \"../common/packageVersions.js\";\nimport type { LogRecord } from \"../common/requestLogger.js\";\nimport { convertBody, convertHeaders } from \"../common/requestLogger.js\";\nimport {\n ApitallyConfig,\n ApitallyConsumer,\n PathInfo,\n ValidationError,\n} from \"../common/types.js\";\nimport {\n patchConsole,\n patchNestLogger,\n patchPinoLogger,\n patchWinston,\n} from \"../loggers/index.js\";\n\nconst LOGS_SYMBOL = Symbol(\"apitally.logs\");\nconst ASYNC_RESOURCE_SYMBOL = Symbol(\"apitally.logsContextAsyncResource\");\n\ndeclare module \"fastify\" {\n interface FastifyReply {\n payload: any;\n serverError?: FastifyError;\n }\n\n interface FastifyRequest {\n apitallyConsumer?: ApitallyConsumer | string | null;\n consumerIdentifier?: ApitallyConsumer | string | null; // For backwards compatibility\n\n [LOGS_SYMBOL]?: LogRecord[];\n [ASYNC_RESOURCE_SYMBOL]?: AsyncResource;\n }\n}\n\nconst apitallyPlugin: FastifyPluginAsync<ApitallyConfig> = async (\n fastify,\n config,\n) => {\n const client = new ApitallyClient(config);\n const routes: PathInfo[] = [];\n const logsContext = new AsyncLocalStorage<LogRecord[]>();\n\n if (client.requestLogger.config.captureLogs) {\n patchConsole(logsContext);\n patchWinston(logsContext);\n patchPinoLogger(fastify.log, logsContext);\n patchNestLogger(logsContext);\n }\n\n fastify.decorateRequest(\"apitallyConsumer\", null);\n fastify.decorateRequest(\"consumerIdentifier\", null); // For backwards compatibility\n fastify.decorateReply(\"payload\", null);\n\n fastify.addHook(\"onRoute\", (routeOptions) => {\n const methods = Array.isArray(routeOptions.method)\n ? routeOptions.method\n : [routeOptions.method];\n methods.forEach((method) => {\n if (![\"HEAD\", \"OPTIONS\"].includes(method.toUpperCase())) {\n routes.push({\n method: method.toUpperCase(),\n path: routeOptions.url,\n });\n }\n });\n });\n\n fastify.addHook(\"onReady\", () => {\n client.setStartupData(getAppInfo(routes, config.appVersion));\n client.startSync();\n });\n\n fastify.addHook(\"onClose\", async () => {\n await client.handleShutdown();\n });\n\n // Establish logs context for each request\n fastify.addHook(\"onRequest\", (request, reply, done) => {\n if (client.isEnabled()) {\n const logs: LogRecord[] = [];\n request[LOGS_SYMBOL] = logs;\n logsContext.run(logs, () => {\n const asyncResource = new AsyncResource(\"ApitallyLogsContext\");\n request[ASYNC_RESOURCE_SYMBOL] = asyncResource;\n asyncResource.runInAsyncScope(done, request.raw);\n });\n } else {\n done();\n }\n });\n\n // Restore async context for later hooks and route handlers\n fastify.addHook(\"preValidation\", (request, reply, done) => {\n if (client.isEnabled() && request[ASYNC_RESOURCE_SYMBOL]) {\n const asyncResource = request[ASYNC_RESOURCE_SYMBOL];\n asyncResource.runInAsyncScope(done, request.raw);\n } else {\n done();\n }\n });\n\n fastify.addHook(\"onSend\", (request, reply, payload: any, done) => {\n const contentType = reply.getHeader(\"content-type\") as string | undefined;\n if (client.requestLogger.isSupportedContentType(contentType)) {\n reply.payload = payload;\n }\n done();\n });\n\n fastify.addHook(\"onError\", (request, reply, error, done) => {\n if (!error.statusCode || error.statusCode === 500) {\n reply.serverError = error;\n }\n done();\n });\n\n fastify.addHook(\"onResponse\", (request, reply, done) => {\n if (client.isEnabled() && request.method.toUpperCase() !== \"OPTIONS\") {\n // Get path from routeOptions if available (from v4), otherwise fallback to deprecated routerPath\n const consumer = getConsumer(request);\n const path =\n \"routeOptions\" in request\n ? (request as any).routeOptions.url\n : (request as any).routerPath;\n const requestSize = parseContentLength(request.headers[\"content-length\"]);\n const responseSize = parseContentLength(\n reply.getHeader(\"content-length\"),\n );\n const responseTime = getResponseTime(reply);\n client.consumerRegistry.addOrUpdateConsumer(consumer);\n client.requestCounter.addRequest({\n consumer: consumer?.identifier,\n method: request.method,\n path,\n statusCode: reply.statusCode,\n responseTime,\n requestSize,\n responseSize,\n });\n\n if (\n (reply.statusCode === 400 || reply.statusCode === 422) &&\n reply.payload\n ) {\n try {\n const parsedPayload = JSON.parse(reply.payload);\n const validationErrors: ValidationError[] = [];\n\n if (\n (!parsedPayload.code ||\n parsedPayload.code === \"FST_ERR_VALIDATION\") &&\n typeof parsedPayload.message === \"string\"\n ) {\n validationErrors.push(...extractAjvErrors(parsedPayload.message));\n } else if (Array.isArray(parsedPayload.message)) {\n validationErrors.push(\n ...extractNestValidationErrors(parsedPayload.message),\n );\n }\n\n validationErrors.forEach((error) => {\n client.validationErrorCounter.addValidationError({\n consumer: consumer?.identifier,\n method: request.method,\n path: path,\n ...error,\n });\n });\n } catch (error) {} // eslint-disable-line no-empty\n }\n\n if (reply.statusCode === 500 && reply.serverError) {\n client.serverErrorCounter.addServerError({\n consumer: consumer?.identifier,\n method: request.method,\n path: path,\n type: reply.serverError.name,\n msg: reply.serverError.message,\n traceback: reply.serverError.stack || \"\",\n });\n }\n\n if (client.requestLogger.enabled) {\n const logs = request[LOGS_SYMBOL];\n client.requestLogger.logRequest(\n {\n timestamp: Date.now() / 1000,\n method: request.method,\n path,\n url: `${request.protocol}://${request.host ?? request.hostname}${request.originalUrl ?? request.url}`,\n headers: convertHeaders(request.headers),\n size: requestSize,\n consumer: consumer?.identifier,\n body: convertBody(request.body, request.headers[\"content-type\"]),\n },\n {\n statusCode: reply.statusCode,\n responseTime: responseTime / 1000,\n headers: convertHeaders(reply.getHeaders()),\n size: responseSize,\n body: convertBody(\n reply.payload,\n reply.getHeader(\"content-type\")?.toString(),\n ),\n },\n reply.serverError,\n logs,\n );\n }\n }\n\n done();\n });\n};\n\nfunction getAppInfo(routes: PathInfo[], appVersion?: string) {\n const versions = [[\"nodejs\", process.version.replace(/^v/, \"\")]];\n const fastifyVersion = getPackageVersion(\"fastify\");\n const pinoVersion = getPackageVersion(\"pino\");\n const nestjsVersion = getPackageVersion(\"@nestjs/core\");\n const apitallyVersion = getPackageVersion(\"../..\");\n if (fastifyVersion) {\n versions.push([\"fastify\", fastifyVersion]);\n }\n if (pinoVersion) {\n versions.push([\"pino\", pinoVersion]);\n }\n if (nestjsVersion) {\n versions.push([\"nestjs\", nestjsVersion]);\n }\n if (apitallyVersion) {\n versions.push([\"apitally\", apitallyVersion]);\n }\n if (appVersion) {\n versions.push([\"app\", appVersion]);\n }\n return {\n paths: routes,\n versions: Object.fromEntries(versions),\n client: \"js:fastify\",\n };\n}\n\nexport function setConsumer(\n request: FastifyRequest,\n consumer: ApitallyConsumer | string | null | undefined,\n) {\n request.apitallyConsumer = consumer || undefined;\n}\n\nfunction getConsumer(request: FastifyRequest) {\n if (request.apitallyConsumer) {\n return consumerFromStringOrObject(request.apitallyConsumer);\n } else if (request.consumerIdentifier) {\n // For backwards compatibility\n process.emitWarning(\n \"The consumerIdentifier property on the request object is deprecated. Use apitallyConsumer instead.\",\n \"DeprecationWarning\",\n );\n return consumerFromStringOrObject(request.consumerIdentifier);\n }\n return null;\n}\n\nfunction getResponseTime(reply: FastifyReply) {\n if (reply.elapsedTime !== undefined) {\n return reply.elapsedTime;\n } else if ((reply as any).getResponseTime !== undefined) {\n return (reply as any).getResponseTime();\n }\n return 0;\n}\n\nfunction extractAjvErrors(message: string): ValidationError[] {\n try {\n const regex =\n /(?<=^|, )((?:headers|params|query|querystring|body)[/.][^ ]+)(?= )/g;\n const matches: { match: string; index: number }[] = [];\n let match: RegExpExecArray | null;\n while ((match = regex.exec(message)) !== null) {\n matches.push({ match: match[0], index: match.index });\n }\n\n return matches.map((m, i) => {\n const endIndex =\n i + 1 < matches.length ? matches[i + 1].index - 2 : message.length;\n const matchSplit = m.match.split(/[/.]/);\n if (matchSplit[0] === \"querystring\") {\n matchSplit[0] = \"query\";\n }\n return {\n loc: matchSplit.join(\".\"),\n msg: message.substring(m.index, endIndex),\n type: \"\",\n };\n });\n } catch (error) {\n return [];\n }\n}\n\nfunction extractNestValidationErrors(message: any[]): ValidationError[] {\n try {\n return message\n .filter((msg: any) => typeof msg === \"string\")\n .map((msg: any) => ({\n loc: \"\",\n msg,\n type: \"\",\n }));\n } catch (error) {\n return [];\n }\n}\n\nexport { apitallyPlugin };\n\nexport default fp(apitallyPlugin, {\n name: \"apitally\",\n});\n"],"mappings":"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","names":["fp","AsyncLocalStorage","AsyncResource","ApitallyClient","consumerFromStringOrObject","parseContentLength","getPackageVersion","convertBody","convertHeaders","patchConsole","patchNestLogger","patchPinoLogger","patchWinston","LOGS_SYMBOL","Symbol","ASYNC_RESOURCE_SYMBOL","apitallyPlugin","fastify","config","client","routes","logsContext","requestLogger","captureLogs","log","decorateRequest","decorateReply","addHook","routeOptions","methods","Array","isArray","method","forEach","includes","toUpperCase","push","path","url","setStartupData","getAppInfo","appVersion","startSync","handleShutdown","request","reply","done","isEnabled","logs","run","asyncResource","runInAsyncScope","raw","payload","contentType","getHeader","isSupportedContentType","error","statusCode","serverError","consumer","getConsumer","routerPath","requestSize","headers","responseSize","responseTime","getResponseTime","consumerRegistry","addOrUpdateConsumer","requestCounter","addRequest","identifier","parsedPayload","JSON","parse","validationErrors","code","message","extractAjvErrors","extractNestValidationErrors","validationErrorCounter","addValidationError","serverErrorCounter","addServerError","type","name","msg","traceback","stack","enabled","logRequest","timestamp","Date","now","protocol","host","hostname","originalUrl","size","body","getHeaders","toString","versions","process","version","replace","fastifyVersion","pinoVersion","nestjsVersion","apitallyVersion","paths","Object","fromEntries","setConsumer","apitallyConsumer","undefined","consumerIdentifier","emitWarning","elapsedTime","regex","matches","match","exec","index","map","m","i","endIndex","length","matchSplit","split","loc","join","substring","filter"]}
|
|
1
|
+
{"version":3,"sources":["../../src/fastify/plugin.ts"],"sourcesContent":["import type {\n FastifyError,\n FastifyPluginAsync,\n FastifyReply,\n FastifyRequest,\n} from \"fastify\";\nimport fp from \"fastify-plugin\";\nimport { AsyncLocalStorage, AsyncResource } from \"node:async_hooks\";\n\nimport { ApitallyClient } from \"../common/client.js\";\nimport { consumerFromStringOrObject } from \"../common/consumerRegistry.js\";\nimport { parseContentLength } from \"../common/headers.js\";\nimport { getPackageVersion } from \"../common/packageVersions.js\";\nimport type { LogRecord } from \"../common/requestLogger.js\";\nimport { convertBody, convertHeaders } from \"../common/requestLogger.js\";\nimport type { SpanHandle } from \"../common/spanCollector.js\";\nimport {\n ApitallyConfig,\n ApitallyConsumer,\n PathInfo,\n ValidationError,\n} from \"../common/types.js\";\nimport {\n patchConsole,\n patchNestLogger,\n patchPinoLogger,\n patchWinston,\n} from \"../loggers/index.js\";\n\nconst LOGS_SYMBOL = Symbol(\"apitally.logs\");\nconst ASYNC_RESOURCE_SYMBOL = Symbol(\"apitally.asyncResource\");\nconst SPAN_HANDLE_SYMBOL = Symbol(\"apitally.spanHandle\");\n\ndeclare module \"fastify\" {\n interface FastifyReply {\n payload: any;\n serverError?: FastifyError;\n }\n\n interface FastifyRequest {\n apitallyConsumer?: ApitallyConsumer | string | null;\n consumerIdentifier?: ApitallyConsumer | string | null; // For backwards compatibility\n\n [LOGS_SYMBOL]?: LogRecord[];\n [ASYNC_RESOURCE_SYMBOL]?: AsyncResource;\n [SPAN_HANDLE_SYMBOL]?: SpanHandle;\n }\n}\n\nconst apitallyPlugin: FastifyPluginAsync<ApitallyConfig> = async (\n fastify,\n config,\n) => {\n const client = new ApitallyClient(config);\n const routes: PathInfo[] = [];\n const logsContext = new AsyncLocalStorage<LogRecord[]>();\n\n if (client.requestLogger.config.captureLogs) {\n patchConsole(logsContext);\n patchWinston(logsContext);\n patchPinoLogger(fastify.log, logsContext);\n patchNestLogger(logsContext);\n }\n\n fastify.decorateRequest(\"apitallyConsumer\", null);\n fastify.decorateRequest(\"consumerIdentifier\", null); // For backwards compatibility\n fastify.decorateReply(\"payload\", null);\n\n fastify.addHook(\"onRoute\", (routeOptions) => {\n const methods = Array.isArray(routeOptions.method)\n ? routeOptions.method\n : [routeOptions.method];\n methods.forEach((method) => {\n if (![\"HEAD\", \"OPTIONS\"].includes(method.toUpperCase())) {\n routes.push({\n method: method.toUpperCase(),\n path: routeOptions.url,\n });\n }\n });\n });\n\n fastify.addHook(\"onReady\", () => {\n client.setStartupData(getAppInfo(routes, config.appVersion));\n client.startSync();\n });\n\n fastify.addHook(\"onClose\", async () => {\n await client.handleShutdown();\n });\n\n // Establish logs context and start span for each request\n fastify.addHook(\"onRequest\", (request, reply, done) => {\n if (client.isEnabled()) {\n const logs: LogRecord[] = [];\n request[LOGS_SYMBOL] = logs;\n logsContext.run(logs, () => {\n const spanHandle = client.spanCollector.startSpan();\n request[SPAN_HANDLE_SYMBOL] = spanHandle;\n spanHandle.runInContext(() => {\n const asyncResource = new AsyncResource(\"ApitallyContext\");\n request[ASYNC_RESOURCE_SYMBOL] = asyncResource;\n asyncResource.runInAsyncScope(done, request.raw);\n });\n });\n } else {\n done();\n }\n });\n\n // Restore async context for later hooks and route handlers\n fastify.addHook(\"preValidation\", (request, reply, done) => {\n if (client.isEnabled() && request[ASYNC_RESOURCE_SYMBOL]) {\n const asyncResource = request[ASYNC_RESOURCE_SYMBOL];\n asyncResource.runInAsyncScope(done, request.raw);\n } else {\n done();\n }\n });\n\n fastify.addHook(\"onSend\", (request, reply, payload: any, done) => {\n const contentType = reply.getHeader(\"content-type\") as string | undefined;\n if (client.requestLogger.isSupportedContentType(contentType)) {\n reply.payload = payload;\n }\n done();\n });\n\n fastify.addHook(\"onError\", (request, reply, error, done) => {\n if (!error.statusCode || error.statusCode === 500) {\n reply.serverError = error;\n }\n done();\n });\n\n fastify.addHook(\"onResponse\", (request, reply, done) => {\n if (client.isEnabled() && request.method.toUpperCase() !== \"OPTIONS\") {\n // Get path from routeOptions if available (from v4), otherwise fallback to deprecated routerPath\n const consumer = getConsumer(request);\n const path =\n \"routeOptions\" in request\n ? (request as any).routeOptions.url\n : (request as any).routerPath;\n const requestSize = parseContentLength(request.headers[\"content-length\"]);\n const responseSize = parseContentLength(\n reply.getHeader(\"content-length\"),\n );\n const responseTime = getResponseTime(reply);\n client.consumerRegistry.addOrUpdateConsumer(consumer);\n client.requestCounter.addRequest({\n consumer: consumer?.identifier,\n method: request.method,\n path,\n statusCode: reply.statusCode,\n responseTime,\n requestSize,\n responseSize,\n });\n\n if (\n (reply.statusCode === 400 || reply.statusCode === 422) &&\n reply.payload\n ) {\n try {\n const parsedPayload = JSON.parse(reply.payload);\n const validationErrors: ValidationError[] = [];\n\n if (\n (!parsedPayload.code ||\n parsedPayload.code === \"FST_ERR_VALIDATION\") &&\n typeof parsedPayload.message === \"string\"\n ) {\n validationErrors.push(...extractAjvErrors(parsedPayload.message));\n } else if (Array.isArray(parsedPayload.message)) {\n validationErrors.push(\n ...extractNestValidationErrors(parsedPayload.message),\n );\n }\n\n validationErrors.forEach((error) => {\n client.validationErrorCounter.addValidationError({\n consumer: consumer?.identifier,\n method: request.method,\n path: path,\n ...error,\n });\n });\n } catch (error) {} // eslint-disable-line no-empty\n }\n\n if (reply.statusCode === 500 && reply.serverError) {\n client.serverErrorCounter.addServerError({\n consumer: consumer?.identifier,\n method: request.method,\n path: path,\n type: reply.serverError.name,\n msg: reply.serverError.message,\n traceback: reply.serverError.stack || \"\",\n });\n }\n\n const spanHandle = request[SPAN_HANDLE_SYMBOL];\n spanHandle?.setName(`${request.method} ${path}`);\n const spans = spanHandle?.end();\n const traceId = spanHandle?.traceId;\n\n if (client.requestLogger.enabled) {\n const logs = request[LOGS_SYMBOL];\n client.requestLogger.logRequest(\n {\n timestamp: Date.now() / 1000,\n method: request.method,\n path,\n url: `${request.protocol}://${request.host ?? request.hostname}${request.originalUrl ?? request.url}`,\n headers: convertHeaders(request.headers),\n size: requestSize,\n consumer: consumer?.identifier,\n body: convertBody(request.body, request.headers[\"content-type\"]),\n },\n {\n statusCode: reply.statusCode,\n responseTime: responseTime / 1000,\n headers: convertHeaders(reply.getHeaders()),\n size: responseSize,\n body: convertBody(\n reply.payload,\n reply.getHeader(\"content-type\")?.toString(),\n ),\n },\n reply.serverError,\n logs,\n spans,\n traceId,\n );\n }\n }\n\n done();\n });\n};\n\nfunction getAppInfo(routes: PathInfo[], appVersion?: string) {\n const versions = [[\"nodejs\", process.version.replace(/^v/, \"\")]];\n const fastifyVersion = getPackageVersion(\"fastify\");\n const pinoVersion = getPackageVersion(\"pino\");\n const nestjsVersion = getPackageVersion(\"@nestjs/core\");\n const apitallyVersion = getPackageVersion(\"../..\");\n if (fastifyVersion) {\n versions.push([\"fastify\", fastifyVersion]);\n }\n if (pinoVersion) {\n versions.push([\"pino\", pinoVersion]);\n }\n if (nestjsVersion) {\n versions.push([\"nestjs\", nestjsVersion]);\n }\n if (apitallyVersion) {\n versions.push([\"apitally\", apitallyVersion]);\n }\n if (appVersion) {\n versions.push([\"app\", appVersion]);\n }\n return {\n paths: routes,\n versions: Object.fromEntries(versions),\n client: \"js:fastify\",\n };\n}\n\nexport function setConsumer(\n request: FastifyRequest,\n consumer: ApitallyConsumer | string | null | undefined,\n) {\n request.apitallyConsumer = consumer || undefined;\n}\n\nfunction getConsumer(request: FastifyRequest) {\n if (request.apitallyConsumer) {\n return consumerFromStringOrObject(request.apitallyConsumer);\n } else if (request.consumerIdentifier) {\n // For backwards compatibility\n process.emitWarning(\n \"The consumerIdentifier property on the request object is deprecated. Use apitallyConsumer instead.\",\n \"DeprecationWarning\",\n );\n return consumerFromStringOrObject(request.consumerIdentifier);\n }\n return null;\n}\n\nfunction getResponseTime(reply: FastifyReply) {\n if (reply.elapsedTime !== undefined) {\n return reply.elapsedTime;\n } else if ((reply as any).getResponseTime !== undefined) {\n return (reply as any).getResponseTime();\n }\n return 0;\n}\n\nfunction extractAjvErrors(message: string): ValidationError[] {\n try {\n const regex =\n /(?<=^|, )((?:headers|params|query|querystring|body)[/.][^ ]+)(?= )/g;\n const matches: { match: string; index: number }[] = [];\n let match: RegExpExecArray | null;\n while ((match = regex.exec(message)) !== null) {\n matches.push({ match: match[0], index: match.index });\n }\n\n return matches.map((m, i) => {\n const endIndex =\n i + 1 < matches.length ? matches[i + 1].index - 2 : message.length;\n const matchSplit = m.match.split(/[/.]/);\n if (matchSplit[0] === \"querystring\") {\n matchSplit[0] = \"query\";\n }\n return {\n loc: matchSplit.join(\".\"),\n msg: message.substring(m.index, endIndex),\n type: \"\",\n };\n });\n } catch (error) {\n return [];\n }\n}\n\nfunction extractNestValidationErrors(message: any[]): ValidationError[] {\n try {\n return message\n .filter((msg: any) => typeof msg === \"string\")\n .map((msg: any) => ({\n loc: \"\",\n msg,\n type: \"\",\n }));\n } catch (error) {\n return [];\n }\n}\n\nexport { apitallyPlugin };\n\nexport default fp(apitallyPlugin, {\n name: \"apitally\",\n});\n"],"mappings":"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","names":["fp","AsyncLocalStorage","AsyncResource","ApitallyClient","consumerFromStringOrObject","parseContentLength","getPackageVersion","convertBody","convertHeaders","patchConsole","patchNestLogger","patchPinoLogger","patchWinston","LOGS_SYMBOL","Symbol","ASYNC_RESOURCE_SYMBOL","SPAN_HANDLE_SYMBOL","apitallyPlugin","fastify","config","client","routes","logsContext","requestLogger","captureLogs","log","decorateRequest","decorateReply","addHook","routeOptions","methods","Array","isArray","method","forEach","includes","toUpperCase","push","path","url","setStartupData","getAppInfo","appVersion","startSync","handleShutdown","request","reply","done","isEnabled","logs","run","spanHandle","spanCollector","startSpan","runInContext","asyncResource","runInAsyncScope","raw","payload","contentType","getHeader","isSupportedContentType","error","statusCode","serverError","consumer","getConsumer","routerPath","requestSize","headers","responseSize","responseTime","getResponseTime","consumerRegistry","addOrUpdateConsumer","requestCounter","addRequest","identifier","parsedPayload","JSON","parse","validationErrors","code","message","extractAjvErrors","extractNestValidationErrors","validationErrorCounter","addValidationError","serverErrorCounter","addServerError","type","name","msg","traceback","stack","setName","spans","end","traceId","enabled","logRequest","timestamp","Date","now","protocol","host","hostname","originalUrl","size","body","getHeaders","toString","versions","process","version","replace","fastifyVersion","pinoVersion","nestjsVersion","apitallyVersion","paths","Object","fromEntries","setConsumer","apitallyConsumer","undefined","consumerIdentifier","emitWarning","elapsedTime","regex","matches","match","exec","index","map","m","i","endIndex","length","matchSplit","split","loc","join","substring","filter"]}
|
package/dist/h3/index.cjs
CHANGED
|
@@ -18,13 +18,16 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
18
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
19
|
var h3_exports = {};
|
|
20
20
|
__export(h3_exports, {
|
|
21
|
+
ApitallySpanProcessor: () => import_spanCollector.ApitallySpanProcessor,
|
|
21
22
|
apitallyPlugin: () => import_plugin.apitallyPlugin,
|
|
22
23
|
setConsumer: () => import_plugin.setConsumer
|
|
23
24
|
});
|
|
24
25
|
module.exports = __toCommonJS(h3_exports);
|
|
26
|
+
var import_spanCollector = require("../common/spanCollector.js");
|
|
25
27
|
var import_plugin = require("./plugin.js");
|
|
26
28
|
// Annotate the CommonJS export names for ESM import in node:
|
|
27
29
|
0 && (module.exports = {
|
|
30
|
+
ApitallySpanProcessor,
|
|
28
31
|
apitallyPlugin,
|
|
29
32
|
setConsumer
|
|
30
33
|
});
|
package/dist/h3/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/h3/index.ts"],"sourcesContent":["export type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport { apitallyPlugin, setConsumer } from \"./plugin.js\";\n"],"mappings":";;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/h3/index.ts"],"sourcesContent":["export { ApitallySpanProcessor } from \"../common/spanCollector.js\";\nexport type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport { apitallyPlugin, setConsumer } from \"./plugin.js\";\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;;;;;;;2BAAsC;AAEtC,oBAA4C;","names":[]}
|
package/dist/h3/index.d.cts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
export { ApitallySpanProcessor } from '../common/spanCollector.cjs';
|
|
1
2
|
export { ApitallyConfig, ApitallyConsumer } from '../common/types.cjs';
|
|
2
3
|
export { apitallyPlugin, setConsumer } from './plugin.cjs';
|
|
4
|
+
import '@opentelemetry/sdk-trace-base';
|
|
3
5
|
import '../common/logging.cjs';
|
|
4
6
|
import 'winston';
|
|
5
7
|
import '../common/requestLogger.cjs';
|
package/dist/h3/index.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
export { ApitallySpanProcessor } from '../common/spanCollector.js';
|
|
1
2
|
export { ApitallyConfig, ApitallyConsumer } from '../common/types.js';
|
|
2
3
|
export { apitallyPlugin, setConsumer } from './plugin.js';
|
|
4
|
+
import '@opentelemetry/sdk-trace-base';
|
|
3
5
|
import '../common/logging.js';
|
|
4
6
|
import 'winston';
|
|
5
7
|
import '../common/requestLogger.js';
|
package/dist/h3/index.js
CHANGED
package/dist/h3/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/h3/index.ts"],"sourcesContent":["export type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport { apitallyPlugin, setConsumer } from \"./plugin.js\";\n"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../src/h3/index.ts"],"sourcesContent":["export { ApitallySpanProcessor } from \"../common/spanCollector.js\";\nexport type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport { apitallyPlugin, setConsumer } from \"./plugin.js\";\n"],"mappings":"AAAA,SAASA,6BAA6B;AAEtC,SAASC,gBAAgBC,mBAAmB;","names":["ApitallySpanProcessor","apitallyPlugin","setConsumer"]}
|