unnbound-events 1.0.12 → 1.0.13

package/dist/events/src/index.d.ts

@@ -1,4 +1,4 @@
 export { createEventsClient } from './lib/client';
-export type { EventsClient, EventRequest, EventResponse, RouteHandler, RouteMatcher, RegisteredRoute, SqsBatchEvent, } from './lib/types';
+export type { EventsClient, EventRequest, EventResponse, RouteHandler, RouteMatcher, RegisteredRoute, SqsBatchEvent, StartOptions, } from './lib/types';
 export { createExpressMiddleware } from './lib/adapters/express';
 export { createSqsConsumer } from './lib/adapters/sqs';

package/dist/events/src/lib/client.js

@@ -183,16 +183,16 @@ function createEventsClient() {
             };
         },
         sqsListen(options) {
-            const AWS = (() => {
+            const awsSqs = (() => {
                 try {
-                    return require('aws-sdk');
+                    return require('@aws-sdk/client-sqs');
                 }
                 catch {
                     return null;
                 }
             })();
-            if (!AWS) {
-                throw new Error('aws-sdk is required to use sqsListen');
+            if (!awsSqs) {
+                throw new Error('@aws-sdk/client-sqs is required to use sqsListen');
             }
             const env = globalThis
                 .process?.env ?? {};
@@ -205,8 +205,7 @@ function createEventsClient() {
             const waitTimeSeconds = options?.waitTimeSeconds ?? 10;
             const maxMessages = options?.maxMessages ?? 10;
             const visibilityTimeout = options?.visibilityTimeoutSeconds;
-            const AWSLib = AWS;
-            const sqs = new AWSLib.SQS({ region, endpoint });
+            const sqs = new awsSqs.SQSClient({ region, endpoint });
             let stopped = false;
             const consume = this.sqs();
             async function loop() {
@@ -216,10 +215,9 @@ function createEventsClient() {
                             QueueUrl: queueUrl,
                             MaxNumberOfMessages: maxMessages,
                             WaitTimeSeconds: waitTimeSeconds,
+                            ...(visibilityTimeout && { VisibilityTimeout: visibilityTimeout }),
                         };
-                        if (visibilityTimeout)
-                            params.VisibilityTimeout = visibilityTimeout;
-                        const resp = await sqs.receiveMessage(params).promise();
+                        const resp = (await sqs.send(new awsSqs.ReceiveMessageCommand(params)));
                         const messages = (resp.Messages ?? []).map((m) => ({
                             id: m.MessageId ?? '',
                             body: String(m.Body ?? ''),
@@ -237,7 +235,7 @@ function createEventsClient() {
                         for (let i = 0; i < toDelete.length; i += 10) {
                             const chunk = toDelete.slice(i, i + 10);
                             if (chunk.length > 0) {
-                                await sqs.deleteMessageBatch({ QueueUrl: queueUrl, Entries: chunk }).promise();
+                                await sqs.send(new awsSqs.DeleteMessageBatchCommand({ QueueUrl: queueUrl, Entries: chunk }));
                             }
                         }
                     }
@@ -256,5 +254,59 @@ function createEventsClient() {
                 },
             });
         },
+        async start(options) {
+            // Default to starting both HTTP and SQS if no options provided
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            const httpOptions = options?.http ?? { port: 3000 };
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            const sqsOptions = options?.sqs ?? {};
+            // Start HTTP server
+            let httpServer;
+            try {
+                httpServer = await this.http(httpOptions);
+            }
+            catch (error) {
+                unnbound_logger_sdk_1.logger.warn({ error }, 'Failed to start HTTP server, continuing without it');
+            }
+            // Start SQS listener
+            let sqsListener;
+            try {
+                sqsListener = await this.sqsListen(sqsOptions);
+            }
+            catch (error) {
+                unnbound_logger_sdk_1.logger.warn({ error }, 'Failed to start SQS listener, continuing without it');
+            }
+            // If neither HTTP nor SQS started successfully, throw an error
+            if (!httpServer && !sqsListener) {
+                throw new Error('Failed to start any transport. Please check your configuration and try again.');
+            }
+            // Set up graceful shutdown
+            const g = globalThis;
+            const shutdown = async () => {
+                unnbound_logger_sdk_1.logger.info('Received shutdown signal, closing servers...');
+                const promises = [];
+                if (httpServer)
+                    promises.push(httpServer.close());
+                if (sqsListener)
+                    promises.push(sqsListener.stop());
+                await Promise.all(promises);
+                unnbound_logger_sdk_1.logger.info('All servers closed');
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                g.process?.exit?.(0);
+            };
+            // Handle SIGINT and SIGTERM
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            g.process?.on?.('SIGINT', shutdown);
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            g.process?.on?.('SIGTERM', shutdown);
+            // Log startup information
+            const services = [];
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            if (httpServer)
+                services.push(`HTTP on port ${httpOptions?.port ?? 3000}`);
+            if (sqsListener)
+                services.push('SQS listener');
+            unnbound_logger_sdk_1.logger.info({ services: services.join(' and ') }, 'Services started. Press Ctrl+C to stop.');
+        },
     };
 }

package/dist/events/src/lib/types.d.ts

@@ -26,6 +26,18 @@ export type SqsRecord = {
 export interface SqsBatchEvent {
     Records: SqsRecord[];
 }
+export interface StartOptions {
+    http?: {
+        port?: number;
+    };
+    sqs?: {
+        queueUrl?: string;
+        region?: string;
+        waitTimeSeconds?: number;
+        maxMessages?: number;
+        visibilityTimeoutSeconds?: number;
+    };
+}
 export interface EventsClient {
     on: (method: HttpMethod, matcher: RouteMatcher, handler: RouteHandler<any, any>) => void;
     handle: (request: EventRequest<any>) => Promise<EventResponse<any>>;
@@ -57,4 +69,5 @@ export interface EventsClient {
     }) => Promise<{
         stop: () => Promise<void>;
     }>;
+    start: (options?: StartOptions) => Promise<void>;
 }

package/dist/lib/client.js

@@ -24,6 +24,7 @@ function isMiddleware(value) {
     return typeof value === 'function' && value.length >= 2;
 }
 const TRACE_HEADER_KEY = 'x-unnbound-trace-id';
+const MESSAGE_HEADER_KEY = 'x-message-id';
 const getHeaderValue = (headers, name) => {
     const needle = name.toLowerCase();
     for (const [key, value] of Object.entries(headers)) {
@@ -54,21 +55,26 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
         }
         const metadataTraceId = typeof request.metadata?.traceId === 'string' ? request.metadata.traceId : undefined;
         const metadataMessageId = typeof request.metadata?.messageId === 'string' ? request.metadata.messageId : undefined;
+        const headerMessageId = getHeaderValue(request.headers, MESSAGE_HEADER_KEY);
+        if (metadataMessageId && headerMessageId && metadataMessageId !== headerMessageId) {
+            unnbound_logger_sdk_1.logger.warn({ metadataMessageId, headerMessageId }, 'Message ID mismatch detected; defaulting to header value.');
+        }
+        const messageId = headerMessageId ?? metadataMessageId;
         const headerTraceId = getHeaderValue(request.headers, TRACE_HEADER_KEY);
         const traceId = metadataTraceId ?? headerTraceId;
-        const context = traceId || metadataMessageId
+        const context = traceId || messageId
             ? {
                 ...(traceId ? { traceId } : {}),
-                ...(metadataMessageId ? { messageId: metadataMessageId } : {}),
+                ...(messageId ? { messageId } : {}),
             }
             : undefined;
-        const enrichedRequest = traceId || metadataMessageId
+        const enrichedRequest = traceId || messageId
             ? {
                 ...request,
                 metadata: {
                     ...request.metadata,
                     ...(traceId ? { traceId } : {}),
-                    ...(metadataMessageId ? { messageId: metadataMessageId } : {}),
+                    ...(messageId ? { messageId } : {}),
                 },
             }
             : request;
@@ -248,12 +254,27 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                 await Promise.all(event.Records.map(async (record) => {
                     try {
                         const envelope = JSON.parse(record.body);
-                        const messageId = record.messageId;
+                        const headerMessageId = getHeaderValue(envelope.request.headers, MESSAGE_HEADER_KEY);
+                        const envelopeMessageId = typeof envelope.metadata?.messageId === 'string'
+                            ? envelope.metadata.messageId
+                            : typeof envelope.messageId === 'string'
+                                ? envelope.messageId
+                                : undefined;
+                        if (envelopeMessageId && headerMessageId && envelopeMessageId !== headerMessageId) {
+                            unnbound_logger_sdk_1.logger.warn({ envelopeMessageId, headerMessageId }, 'Message ID mismatch detected in SQS envelope; defaulting to header value.');
+                        }
+                        const messageId = headerMessageId ?? envelopeMessageId ?? record.messageId ?? undefined;
+                        const originalMessageId = envelopeMessageId && envelopeMessageId !== messageId
+                            ? envelopeMessageId
+                            : undefined;
                         const originalTraceId = typeof envelope.metadata?.traceId === 'string'
                             ? envelope.metadata.traceId
                             : undefined;
                         const traceId = (0, unnbound_logger_sdk_1.getTraceId)();
-                        const traceContext = { traceId, messageId };
+                        const traceContext = {
+                            traceId,
+                            ...(messageId ? { messageId } : {}),
+                        };
                         await (0, unnbound_logger_sdk_1.withTrace)(async () => {
                             const req = {
                                 method: envelope.request.method,
@@ -269,7 +290,11 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                                     timestamp: envelope.timestamp,
                                     version: envelope.version,
                                     traceId,
-                                    messageId,
+                                    ...(messageId ? { messageId } : {}),
+                                    ...(originalMessageId ? { envelopeMessageId: originalMessageId } : {}),
+                                    ...(record.messageId && record.messageId !== messageId
+                                        ? { deliveryMessageId: record.messageId }
+                                        : {}),
                                     ...(originalTraceId && originalTraceId !== traceId ? { originalTraceId } : {}),
                                 },
                             };

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,9 +1,25 @@
 {
   "name": "unnbound-events",
   "description": "Unified events SDK to handle HTTP routes and SQS messages with a single routing API.",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "test": "jest",
+    "test:coverage": "jest --coverage",
+    "test:watch": "jest --watch",
+    "typecheck": "tsc -noEmit",
+    "lint": "eslint --cache --cache-location ./node_modules/.cache/eslint .",
+    "lint:fix": "pnpm lint --fix",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "prepublishOnly": "pnpm build",
+    "start:example:express": "npx --yes tsx --watch examples/express.ts",
+    "start:example:sqs": "npx --yes tsx --watch examples/sqs.ts",
+    "start:example:http-and-sqs": "npx --yes tsx --watch examples/http-and-sqs.ts",
+    "version:bump": "npm version patch"
+  },
   "author": "Unnbound Team",
   "license": "MIT",
   "repository": {
@@ -17,7 +33,7 @@
   "dependencies": {
     "express": "^4.0.0 || ^5.0.0",
     "@aws-sdk/client-sqs": "^3.0.0",
-    "unnbound-logger-sdk": "3.0.19"
+    "unnbound-logger-sdk": "workspace:*"
   },
   "peerDependencies": {
     "express": "^4.0.0 || ^5.0.0"
@@ -40,20 +56,5 @@
   "engines": {
     "node": ">=22"
   },
-  "sideEffects": false,
-  "scripts": {
-    "build": "tsc",
-    "test": "jest",
-    "test:coverage": "jest --coverage",
-    "test:watch": "jest --watch",
-    "typecheck": "tsc -noEmit",
-    "lint": "eslint --cache --cache-location ./node_modules/.cache/eslint .",
-    "lint:fix": "pnpm lint --fix",
-    "format": "prettier --write .",
-    "format:check": "prettier --check .",
-    "start:example:express": "npx --yes tsx --watch examples/express.ts",
-    "start:example:sqs": "npx --yes tsx --watch examples/sqs.ts",
-    "start:example:http-and-sqs": "npx --yes tsx --watch examples/http-and-sqs.ts",
-    "version:bump": "npm version patch"
-  }
-}
+  "sideEffects": false
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 Unnbound Team
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.