unnbound-events 1.0.6 → 1.0.7

package/dist/lib/adapters/sqs.d.ts

@@ -6,37 +6,20 @@ export interface QueueEnvelope {
     workflow: string;
     priority: number;
     payload: {
-        type: 'inline' | 's3-single' | 's3-multipart';
+        type: string;
         size: number;
         compressed: boolean;
-        compressionType?: 'brotli' | 'gzip';
-        location?: S3Reference;
     };
     request: {
         method: HttpMethod;
         path: string;
         headers: Record<string, string>;
-        query: Record<string, string>;
-        body?: unknown;
+        query: Record<string, unknown>;
+        body: unknown;
     };
-    metadata?: QueueMetadata;
+    metadata?: Record<string, unknown>;
     addons?: Record<string, unknown>;
 }
-export interface QueueMetadata {
-    correlationId: string;
-    traceId: string;
-    sourceIp: string;
-    userAgent: string;
-    receivedAt: number;
-    processedAt: number;
-    [key: string]: unknown;
-}
-export interface S3Reference {
-    bucket: string;
-    key: string;
-    region?: string;
-    versionId?: string;
-}
 export type SqsRecord = {
     messageId: string;
     body: string;

package/dist/lib/adapters/sqs.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSqsConsumer = createSqsConsumer;
-const unnbound_logger_sdk_1 = require("unnbound-logger-sdk");
 function createSqsConsumer(client) {
     return async function consume(event) {
         let successes = 0;
@@ -9,34 +8,29 @@ function createSqsConsumer(client) {
         await Promise.all(event.Records.map(async (record) => {
             try {
                 const envelope = JSON.parse(record.body);
-                const traceContext = envelope.metadata?.traceId
-                    ? { traceId: envelope.metadata.traceId }
-                    : undefined;
-                await (0, unnbound_logger_sdk_1.withTrace)(async () => {
-                    const req = {
-                        method: envelope.request.method,
-                        path: envelope.request.path,
-                        headers: envelope.request.headers,
-                        query: envelope.request.query,
-                        body: envelope.request.body,
-                        metadata: {
-                            source: 'sqs',
-                            id: envelope.id,
-                            workflow: envelope.workflow,
-                            timestamp: envelope.timestamp,
-                            version: envelope.version,
-                            ...envelope.metadata,
-                        },
-                    };
-                    const res = await client.handle(req);
-                    if (res.status >= 200 && res.status < 300)
-                        successes += 1;
-                    else
-                        failures.push({
-                            messageId: record.messageId,
-                            reason: `Handler returned status ${res.status}`,
-                        });
-                }, traceContext);
+                const req = {
+                    method: envelope.request.method,
+                    path: envelope.request.path,
+                    headers: envelope.request.headers,
+                    query: envelope.request.query,
+                    body: envelope.request.body,
+                    metadata: {
+                        source: 'sqs',
+                        id: envelope.id,
+                        workflow: envelope.workflow,
+                        timestamp: envelope.timestamp,
+                        version: envelope.version,
+                        ...envelope.metadata,
+                    },
+                };
+                const res = await client.handle(req);
+                if (res.status >= 200 && res.status < 300)
+                    successes += 1;
+                else
+                    failures.push({
+                        messageId: record.messageId,
+                        reason: `Handler returned status ${res.status}`,
+                    });
             }
             catch (error) {
                 const err = error instanceof Error ? error : new Error(String(error));

package/dist/lib/client.js

@@ -22,9 +22,32 @@ function matchPath(matcher, path) {
 function isMiddleware(value) {
     return typeof value === 'function' && value.length >= 2;
 }
+const TRACE_HEADER_KEY = 'x-unnbound-trace-id';
+const getHeaderValue = (headers, name) => {
+    const needle = name.toLowerCase();
+    for (const [key, value] of Object.entries(headers)) {
+        if (key.toLowerCase() === needle)
+            return value;
+    }
+    return undefined;
+};
 function createEventsClient() {
     const routes = [];
     const middlewares = [];
+    const traceContextMiddleware = async (request, next) => {
+        const metadataTraceId = typeof request.metadata?.traceId === 'string' ? request.metadata.traceId : undefined;
+        const headerTraceId = getHeaderValue(request.headers, TRACE_HEADER_KEY);
+        const traceId = metadataTraceId ?? headerTraceId;
+        const context = traceId ? { traceId } : undefined;
+        const enrichedRequest = traceId
+            ? {
+                ...request,
+                metadata: { ...request.metadata, traceId },
+            }
+            : request;
+        return await (0, unnbound_logger_sdk_1.withTrace)(async () => next(enrichedRequest), context);
+    };
+    middlewares.push({ fn: traceContextMiddleware });
     return {
         on(method, matcher, handler) {
             routes.push({ method, matcher, handler });
@@ -65,10 +88,10 @@ function createEventsClient() {
                 unnbound_logger_sdk_1.logger.warn({ path: request.path, method: request.method }, 'No route match');
                 return { status: 404, body: { message: 'Not Found' } };
             }
+            // Build middleware chain for this request (middleware added later will run earlier)
             const executeHandler = async (req) => {
                 return await route.handler(req);
             };
-            // Build middleware chain for this request
             const applicable = middlewares.filter((m) => !m.matcher || matchPath(m.matcher, request.path));
             const composed = applicable.reduceRight((next, m) => async (req) => m.fn(req, next), executeHandler);
             try {

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.6",
+  "version": "1.0.7",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {