@peopl-health/nexus 2.4.7 → 2.4.9-fix-pdf-processing

package/lib/storage/MongoStorage.js

@@ -1,5 +1,6 @@
 const mongoose = require('mongoose');
 const runtimeConfig = require('../config/runtimeConfig');
+const { logger } = require('../utils/logger');
 
 /**
  * MongoDB storage interface for messages and interactions
@@ -34,7 +35,7 @@ class MongoStorage {
         useNewUrlParser: true,
         useUnifiedTopology: true
       });
-      console.log('MongoDB connected successfully');
+      logger.info('MongoDB connected successfully');
     } catch (error) {
       throw new Error(`MongoDB connection failed: ${error.message}`);
     }
@@ -46,10 +47,10 @@ class MongoStorage {
       const values = this.buildMessageValues(enrichedMessage);
       const { insertMessage } = require('../models/messageModel');
       await insertMessage(values);
-      console.log('[MongoStorage] Message stored');
+      logger.info('[MongoStorage] Message stored');
       return values;
     } catch (error) {
-      console.error('Error saving message:', error);
+      logger.error('Error saving message:', error);
       throw error;
     }
   }
@@ -64,23 +65,22 @@ class MongoStorage {
         return messageData;
       }
 
-      console.log('[MongoStorage] Detected Twilio media message', {
+      logger.info('[MongoStorage] Detected Twilio media message', {
         from: rawMessage.From,
         numMedia
       });
 
       const bucketName = runtimeConfig.get('AWS_S3_BUCKET_NAME') || process.env.AWS_S3_BUCKET_NAME;
       if (!bucketName) {
-        console.warn('[MongoStorage] AWS_S3_BUCKET_NAME not configured. Skipping media upload.');
+        logger.warn('[MongoStorage] AWS_S3_BUCKET_NAME not configured. Skipping media upload.');
         return messageData;
       }
 
       const { processTwilioMediaMessage } = require('../helpers/twilioMediaProcessor');
-      const { logger } = require('../utils/logger');
 
-      const mediaItems = await processTwilioMediaMessage(rawMessage, logger, bucketName);
+      const mediaItems = await processTwilioMediaMessage(rawMessage, bucketName);
       if (!mediaItems || mediaItems.length === 0) {
-        console.warn('[MongoStorage] Media processing returned no items');
+        logger.warn('[MongoStorage] Media processing returned no items');
         return messageData;
       }
 
@@ -91,7 +91,7 @@ class MongoStorage {
 
       rawMessage.__nexusMediaProcessed = true;
 
-      console.log('[MongoStorage] Media processed successfully', {
+      logger.info('[MongoStorage] Media processed successfully', {
         primaryType: mediaPayload.mediaType,
         mediaCount: mediaItems.length,
         s3Key: mediaPayload.key
@@ -107,7 +107,7 @@ class MongoStorage {
         caption: primary.caption || messageData.caption
       };
     } catch (error) {
-      console.error('[MongoStorage] Failed to enrich Twilio media message:', error);
+      logger.error('[MongoStorage] Failed to enrich Twilio media message:', error);
       return messageData;
     }
   }
@@ -197,7 +197,7 @@ class MongoStorage {
         .sort({ createdAt: -1 })
         .limit(limit);
     } catch (error) {
-      console.error('Error getting messages:', error);
+      logger.error('Error getting messages:', error);
       throw error;
     }
   }
@@ -206,7 +206,7 @@ class MongoStorage {
     try {
       return await this.schemas.Thread.findOne({ code, active: true });
     } catch (error) {
-      console.error('Error getting thread:', error);
+      logger.error('Error getting thread:', error);
       throw error;
     }
   }
@@ -217,7 +217,7 @@ class MongoStorage {
       await thread.save();
       return thread;
     } catch (error) {
-      console.error('Error creating thread:', error);
+      logger.error('Error creating thread:', error);
       throw error;
     }
   }
@@ -230,7 +230,7 @@ class MongoStorage {
         { new: true }
       );
     } catch (error) {
-      console.error('Error updating thread:', error);
+      logger.error('Error updating thread:', error);
       throw error;
     }
   }

package/lib/utils/errorHandler.js

@@ -1,5 +1,7 @@
+const { logger } = require('../utils/logger');
+
 const handleApiError = (res, error, message) => {
-  console.error(message, error);
+  logger.error(message, error);
   return res.status(500).json({ success: false, error: message });
 };
 

package/lib/utils/logger.js

@@ -1,5 +1,5 @@
 const pino = require('pino');
-const { trace, context } = require('@opentelemetry/api');
+const { trace } = require('@opentelemetry/api');
 
 const createLogger = (config = {}) => {
   const {
@@ -98,12 +98,44 @@ const createObservabilityLogger = (serviceName = 'nexus-assistant', config = {})
 };
 
 // Default logger instances
-const logger = createLogger();
+const baseLogger = createLogger();
 const observabilityLogger = createObservabilityLogger();
 
+let getRequestId = () => null;
+
+function setRequestIdGetter(getter) {
+  getRequestId = getter;
+}
+
+const logger = {
+  info: (message, meta = {}) => {
+    const requestId = getRequestId();
+    baseLogger.info(requestId ? { requestId, ...meta } : meta, message);
+  },
+  
+  error: (message, meta = {}) => {
+    const requestId = getRequestId();
+    baseLogger.error(requestId ? { requestId, ...meta } : meta, message);
+  },
+  
+  warn: (message, meta = {}) => {
+    const requestId = getRequestId();
+    baseLogger.warn(requestId ? { requestId, ...meta } : meta, message);
+  },
+  
+  debug: (message, meta = {}) => {
+    const requestId = getRequestId();
+    baseLogger.debug(requestId ? { requestId, ...meta } : meta, message);
+  },
+  
+  child: (bindings) => baseLogger.child(bindings),
+  level: baseLogger.level
+};
+
 module.exports = { 
   logger, 
   createLogger, 
   observabilityLogger, 
-  createObservabilityLogger 
+  createObservabilityLogger,
+  setRequestIdGetter
 };

package/lib/utils/mediaValidator.js

@@ -65,23 +65,27 @@ function getMediaType(contentType) {
 }
 
 function validateMedia(media, contentType) {
+  const fileSize = Buffer.isBuffer(media) ? media.length : media;
+  
+  if (contentType === 'image/webp') {
+    const mediaType = fileSize <= MEDIA_LIMITS.sticker ? 'sticker' : 'image';
+    const formatValidation = validateMediaFormat(contentType, mediaType);
+    if (!formatValidation.valid) return formatValidation;
+    
+    const sizeValidation = validateMediaSize(media, mediaType);
+    if (!sizeValidation.valid) return sizeValidation;
+    
+    return { valid: true, mediaType, message: `Media validated successfully as ${mediaType}` };
+  }
+  
   const mediaType = getMediaType(contentType);
   const formatValidation = validateMediaFormat(contentType, mediaType);
-
-  if (!formatValidation.valid) {
-    return formatValidation;
-  }
-
+  if (!formatValidation.valid) return formatValidation;
+  
   const sizeValidation = validateMediaSize(media, mediaType);
-  if (!sizeValidation.valid) {
-    return sizeValidation;
-  }
-
-  return {
-    valid: true,
-    mediaType,
-    message: `Media validated successfully as ${mediaType}`
-  };
+  if (!sizeValidation.valid) return sizeValidation;
+  
+  return { valid: true, mediaType, message: `Media validated successfully as ${mediaType}` };
 }
 
 module.exports = {

package/lib/utils/sanitizer.js

@@ -39,8 +39,6 @@ function sanitizeLogMetadata(metadata) {
   delete safe.text;
   delete safe.content;  
   delete safe.body;
-  delete safe.phone;
-  delete safe.numero;
   
   if (safe.message_id) {
     safe.message_id = safe.message_id.length > 8 
@@ -48,10 +46,6 @@ function sanitizeLogMetadata(metadata) {
       : '***';
   }
   
-  if (safe.code && safe.code.length > 8) {
-    safe.code = `${safe.code.substring(0, 3)}***${safe.code.slice(-4)}`;
-  }
-  
   return safe;
 }
 

package/lib/utils/tracingDecorator.js

@@ -4,9 +4,10 @@ const { SpanStatusCode } = require('@opentelemetry/api');
 /**
  * Usage: const tracedFunction = withTracing(originalFunction, 'operation_name');
  */
-const withTracing = (fn, spanName, attributeMapper = null) => {
+const withTracing = (fn, spanName, attributeMapper = null, options = {}) => {
   return async function (...args) {
     const span = createSpan(spanName);
+    const startTime = Date.now();
     
     try {
       if (attributeMapper && typeof attributeMapper === 'function') {
@@ -16,6 +17,11 @@ const withTracing = (fn, spanName, attributeMapper = null) => {
       const result = await fn.apply(this, args);
       
       span.setStatus({ code: SpanStatusCode.OK });
+      
+      if (options.returnTiming) {
+        const duration = Date.now() - startTime;
+        return { result, duration };
+      }
       return result;
       
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "2.4.7",
+  "version": "2.4.9-fix-pdf-processing",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",