unnbound-events 1.0.0 → 1.0.1

package/dist/logger/src/axios.d.ts

@@ -1,9 +1,11 @@
-import { Axios } from 'axios';
+import { Axios, type AxiosRequestConfig, type AxiosResponse } from 'axios';
 import { HttpOptions } from './types';
+type GetPayload = (config: AxiosRequestConfig, res?: AxiosResponse) => object;
 /**
  * Wraps an axios instance to add tracing and span tracking
  * @param axios - The axios instance to wrap
  * @param options - Configuration options for HTTP tracing
  * @returns The wrapped axios instance with span tracking
  */
-export declare const traceAxios: (client: Axios, { ignoreTraceRoutes, traceHeaderKey, }?: HttpOptions) => Axios;
+export declare const traceAxios: (client: Axios, { ignoreTraceRoutes, traceHeaderKey, getPayload, }?: HttpOptions<GetPayload>) => Axios;
+export {};

package/dist/logger/src/axios.js

@@ -25,15 +25,17 @@ const buildOutgoingHttpPayload = (config, res) => ({
             : undefined,
     },
 });
+const getNoopPayload = () => ({});
 /**
  * Wraps an axios instance to add tracing and span tracking
  * @param axios - The axios instance to wrap
  * @param options - Configuration options for HTTP tracing
  * @returns The wrapped axios instance with span tracking
  */
-const traceAxios = (client, { ignoreTraceRoutes = types_1.defaultIgnoreTraceRoutes, traceHeaderKey = types_1.defaultTraceHeaderKey, } = {
+const traceAxios = (client, { ignoreTraceRoutes = types_1.defaultIgnoreTraceRoutes, traceHeaderKey = types_1.defaultTraceHeaderKey, getPayload = getNoopPayload, } = {
     ignoreTraceRoutes: types_1.defaultIgnoreTraceRoutes,
     traceHeaderKey: types_1.defaultTraceHeaderKey,
+    getPayload: getNoopPayload,
 }) => {
     const createSpanWrappedRequest = (originalMethod, method) => {
         const { headers: defaultHeaders, ...partialDefaultConfig } = client.defaults;
@@ -50,11 +52,14 @@ const traceAxios = (client, { ignoreTraceRoutes = types_1.defaultIgnoreTraceRout
             config = { ...config, headers: { ...config.headers, [traceHeaderKey]: traceId } };
             // Execute the request within a span
             return (0, span_1.startSpan)(`Outgoing HTTP request`, () => originalMethod(config), (options) => {
-                if (!options)
-                    return buildOutgoingHttpPayload(config);
-                if (options.error)
-                    return buildOutgoingHttpPayload(config, (0, axios_1.isAxiosError)(options.error) ? options.error.response : undefined);
-                return buildOutgoingHttpPayload(config, options.result);
+                const response = options
+                    ? options.error
+                        ? (0, axios_1.isAxiosError)(options.error)
+                            ? options.error.response
+                            : undefined
+                        : options.result
+                    : undefined;
+                return { ...buildOutgoingHttpPayload(config, response), ...getPayload(config, response) };
             });
         };
     };

package/dist/logger/src/middleware.d.ts

@@ -1,3 +1,10 @@
-import { RequestHandler } from 'express';
+import { Request, RequestHandler } from 'express';
 import { HttpOptions } from './types';
-export declare const traceMiddleware: ({ ignoreTraceRoutes, traceHeaderKey, }?: HttpOptions) => RequestHandler;
+interface Response {
+    status: number;
+    headers?: Record<string, string | undefined>;
+    body?: unknown;
+}
+type GetPayload = (config: Request, res?: Response) => object;
+export declare const traceMiddleware: ({ ignoreTraceRoutes, traceHeaderKey, getPayload, }?: HttpOptions<GetPayload>) => RequestHandler;
+export {};

package/dist/logger/src/middleware.js

@@ -19,7 +19,7 @@ const getFullUrl = (req) => {
     const host = req.get('host') || req.get('x-forwarded-host') || 'localhost';
     return `${protocol}://${host}${url}`;
 };
-const buildIncomingHttpPayload = (req, res, body) => ({
+const buildIncomingHttpPayload = (req, res) => ({
     type: 'http',
     http: {
         url: getFullUrl(req),
@@ -32,16 +32,18 @@ const buildIncomingHttpPayload = (req, res, body) => ({
         },
         response: res
             ? {
-                headers: res?.headers,
-                status: res.statusCode,
-                body: (0, utils_1.safeJsonParse)(body),
+                headers: res.headers,
+                status: res.status,
+                body: (0, utils_1.safeJsonParse)(res.body),
             }
             : undefined,
     },
 });
-const traceMiddleware = ({ ignoreTraceRoutes = types_1.defaultIgnoreTraceRoutes, traceHeaderKey = types_1.defaultTraceHeaderKey, } = {
+const getNoopPayload = () => ({});
+const traceMiddleware = ({ ignoreTraceRoutes = types_1.defaultIgnoreTraceRoutes, traceHeaderKey = types_1.defaultTraceHeaderKey, getPayload = getNoopPayload, } = {
     ignoreTraceRoutes: types_1.defaultIgnoreTraceRoutes,
     traceHeaderKey: types_1.defaultTraceHeaderKey,
+    getPayload: getNoopPayload,
 }) => async (req, res, next) => {
     if ((0, utils_1.shouldIgnorePath)(req.path, ignoreTraceRoutes))
         return next();
@@ -60,12 +62,14 @@ const traceMiddleware = ({ ignoreTraceRoutes = types_1.defaultIgnoreTraceRoutes,
                 return next();
             });
         }, (o) => {
-            return buildIncomingHttpPayload(req, o
+            const response = o
                 ? {
-                    statusCode: res.statusCode,
+                    status: res.statusCode,
                     headers: res.getHeaders(),
+                    body: res.locals.body,
                 }
-                : undefined, res.locals.body);
+                : undefined;
+            return { ...buildIncomingHttpPayload(req, response), ...getPayload(req, response) };
         });
     }, { traceId });
 };

package/dist/logger/src/types.d.ts

@@ -53,9 +53,10 @@ export interface SftpPayload {
     content?: string;
     exists?: string | false;
 }
-export interface HttpOptions {
+export interface HttpOptions<G extends Function> {
     ignoreTraceRoutes?: string[];
     traceHeaderKey?: string;
+    getPayload?: G;
 }
 export declare const defaultIgnoreTraceRoutes: string[];
 export declare const defaultTraceHeaderKey = "x-unnbound-trace-id";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unnbound-events",
   "description": "Unified events SDK to handle HTTP routes and SQS messages with a single routing API.",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -32,7 +32,7 @@
   "dependencies": {
     "express": "^4.0.0 || ^5.0.0",
     "@aws-sdk/client-sqs": "^3.0.0",
-    "unnbound-logger-sdk": "workspace:*"
+    "unnbound-logger-sdk": "^3.0.9"
   },
   "peerDependencies": {
     "express": "^4.0.0 || ^5.0.0"