unnbound-events 1.0.21 → 1.0.22

package/dist/lib/client.js

@@ -9,7 +9,6 @@ const unnbound_logger_sdk_1 = require("unnbound-logger-sdk");
 const internal_1 = require("unnbound-logger-sdk/dist/internal");
 const types_1 = require("unnbound-logger-sdk/dist/types");
 const axios_1 = __importDefault(require("axios"));
-const logger = unnbound_logger_sdk_1.logger.child((0, internal_1.internal)());
 const http = require('http');
 function matchPath(matcher, path) {
     if (typeof matcher === 'string') {
@@ -76,7 +75,7 @@ async function fetchS3Payload(s3Client, bucket, key, versionId) {
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        logger.error({ err: error, bucket, key }, 'Failed to fetch S3 payload');
+        unnbound_logger_sdk_1.logger.error({ err: error, bucket, key }, 'Failed to fetch S3 payload');
         throw new Error(`Failed to fetch S3 payload: ${message}`);
     }
 }
@@ -128,7 +127,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
         const metadataMessageId = typeof request.metadata?.messageId === 'string' ? request.metadata.messageId : undefined;
         const headerMessageId = getHeaderValue(request.headers, types_1.defaultTraceHeaderKey);
         if (metadataMessageId && headerMessageId && metadataMessageId !== headerMessageId) {
-            logger.warn({ metadataMessageId, headerMessageId }, 'Message ID mismatch detected; defaulting to header value.');
+            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, types_1.defaultMessageHeaderKey);
@@ -235,7 +234,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                 return response;
             }
             catch (error) {
-                logger.error({ err: error, path: request.path }, 'Handler error');
+                unnbound_logger_sdk_1.logger.error({ err: error, path: request.path }, 'Handler error');
                 return { status: 500, body: { message: 'Internal Server Error' } };
             }
         },
@@ -301,7 +300,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                 });
             });
             await new Promise((resolve) => server.listen(port, resolve));
-            logger.info({ port }, 'HTTP server started');
+            unnbound_logger_sdk_1.logger.info({ port, ...(0, internal_1.internal)() }, 'HTTP server started');
             return {
                 close() {
                     return new Promise((resolve, reject) => {
@@ -343,7 +342,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                                 if (!s3Client) {
                                     throw new Error('S3 client not initialized but S3 pointer message received');
                                 }
-                                logger.info({ bucket: pointer.s3BucketName, key: pointer.s3Key }, 'Fetching S3 pointer payload');
+                                unnbound_logger_sdk_1.logger.info({ bucket: pointer.s3BucketName, key: pointer.s3Key, ...(0, internal_1.internal)() }, 'Fetching S3 pointer payload');
                                 recordBody = await fetchS3Payload(s3Client, pointer.s3BucketName, pointer.s3Key);
                                 envelope = JSON.parse(recordBody);
                             }
@@ -352,7 +351,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                             }
                         }
                         catch (error) {
-                            logger.error({ err: error }, 'Failed to parse SQS record body');
+                            unnbound_logger_sdk_1.logger.error({ err: error }, 'Failed to parse SQS record body');
                             throw error;
                         }
                         // Check if envelope payload is stored in S3
@@ -364,15 +363,16 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                             if (!s3Client) {
                                 throw new Error('S3 client not initialized but S3 payload message received');
                             }
-                            logger.info({
+                            unnbound_logger_sdk_1.logger.info({
                                 type: envelope.payload.type,
                                 bucket: envelope.payload.location.bucket,
                                 key: envelope.payload.location.key,
+                                ...(0, internal_1.internal)(),
                             }, 'Fetching S3 envelope payload');
                             let payloadData = await fetchS3Payload(s3Client, envelope.payload.location.bucket, envelope.payload.location.key, envelope.payload.location.versionId);
                             // Handle decompression if needed
                             if (envelope.payload.compressed && envelope.payload.compressionType) {
-                                logger.info({ compressionType: envelope.payload.compressionType }, 'Decompressing payload');
+                                unnbound_logger_sdk_1.logger.info({ compressionType: envelope.payload.compressionType, ...(0, internal_1.internal)() }, 'Decompressing payload');
                                 payloadData = await decompressPayload(new TextEncoder().encode(payloadData), envelope.payload.compressionType);
                             }
                             // Parse the payload and set it as the request body
@@ -391,7 +391,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                                 ? envelope.messageId
                                 : undefined;
                         if (envelopeMessageId && headerMessageId && envelopeMessageId !== headerMessageId) {
-                            logger.warn({ envelopeMessageId, headerMessageId }, 'Message ID mismatch detected in SQS envelope; defaulting to header value.');
+                            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
@@ -457,22 +457,20 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
             if (bucketName || options?.s3) {
                 s3Options = options?.s3 || {};
                 if (!bucketName) {
-                    logger.error('S3 options provided but no bucket name specified. S3 payload support disabled.');
+                    throw new Error('S3 bucket name not provided. Set UNNBOUND_S3_PAYLOAD_BUCKET, S3_BUCKET env or pass options.bucketName');
                 }
-                else {
-                    try {
-                        s3Client = createS3Client({ ...s3Options, bucketName });
-                        logger.info({ bucket: bucketName }, 'S3 client initialized for payload offloading');
-                    }
-                    catch (error) {
-                        logger.error({ err: error }, 'Failed to initialize S3 client');
-                        throw error;
-                    }
+                try {
+                    s3Client = createS3Client({ ...s3Options, bucketName });
+                    unnbound_logger_sdk_1.logger.info({ bucket: bucketName, ...(0, internal_1.internal)() }, 'S3 client initialized for payload offloading');
+                }
+                catch (error) {
+                    unnbound_logger_sdk_1.logger.error({ err: error }, 'Failed to initialize S3 client');
+                    throw error;
                 }
             }
             const awsSqs = require('@aws-sdk/client-sqs');
             const queueUrl = options?.queueUrl || env.UNNBOUND_SQS_QUEUE_URL || env.SQS_QUEUE_URL || env.QUEUE_URL;
-            if (!queueUrl || queueUrl === undefined) {
+            if (!queueUrl) {
                 throw new Error('SQS queue URL not provided. Set UNNBOUND_SQS_QUEUE_URL, SQS_QUEUE_URL env or pass options.queueUrl');
             }
             const region = options?.region || env.AWS_REGION || 'us-east-1';
@@ -515,7 +513,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                         }
                     }
                     catch (err) {
-                        logger.error({ err }, 'SQS listen loop error');
+                        unnbound_logger_sdk_1.logger.error({ err }, 'SQS listen loop error');
                     }
                 }
             }
@@ -539,7 +537,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                         });
                     }
                     catch (error) {
-                        logger.error({ err: error, queueUrl: queueUrl.replace(/\/[^/]+$/, '/***') }, 'SQS connection test failed');
+                        unnbound_logger_sdk_1.logger.error({ err: error, queueUrl: queueUrl.replace(/\/[^/]+$/, '/***') }, 'SQS connection test failed');
                         reject(error instanceof Error ? error : new Error(String(error)));
                     }
                 };
@@ -582,7 +580,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                 httpServer = await this.http(httpOptions);
             }
             catch (error) {
-                logger.error({ err: error }, 'Failed to start HTTP server, continuing without it');
+                unnbound_logger_sdk_1.logger.error({ err: error }, 'Failed to start HTTP server, continuing without it');
             }
             // Start SQS listener
             let sqsListener;
@@ -590,7 +588,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                 sqsListener = await this.sqsListen(sqsListenOptions);
             }
             catch (error) {
-                logger.error({ err: error }, 'Failed to start SQS listener, continuing without it');
+                unnbound_logger_sdk_1.logger.error({ err: error }, 'Failed to start SQS listener, continuing without it');
             }
             // If neither HTTP nor SQS started successfully, throw an error
             if (!httpServer && !sqsListener) {
@@ -599,14 +597,14 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
             // Set up graceful shutdown
             const g = globalThis;
             const shutdown = async () => {
-                logger.info('Received shutdown signal, closing servers...');
+                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);
-                logger.info('All servers closed');
+                unnbound_logger_sdk_1.logger.info('All servers closed');
                 g.process?.exit?.(0);
             };
             // Handle SIGINT and SIGTERM
@@ -618,7 +616,7 @@ function createEventsClient(ignoreTraceRoutes = exports.defaultIgnoreTraceRoutes
                 services.push(`HTTP on port ${httpOptions?.port ?? 3000}`);
             if (sqsListener)
                 services.push('SQS listener');
-            logger.info({ services: services.join(' and ') }, 'Services started. Press Ctrl+C to stop.');
+            unnbound_logger_sdk_1.logger.info({ services: services.join(' and ') }, 'Services started. Press Ctrl+C to stop.');
         },
     };
 }

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.21",
+  "version": "1.0.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Unnbound Team",