@peopl-health/nexus 1.1.1 → 1.1.4

package/lib/services/whatsappService.js

@@ -0,0 +1,23 @@
+let sendMessage;
+let sendScheduledMessage;
+if (process.env.MESSAGING_PROVIDER === 'baileys') {
+  const baileyAdapter = require('../adapters/baileys');
+  console.log('Baileys adapter:', baileyAdapter);
+  console.log('Has sendMessage?', 'sendMessage' in baileyAdapter);
+  sendMessage = baileyAdapter.sendMessage;
+  sendScheduledMessage = baileyAdapter.sendScheduledMessage;
+} else if (process.env.MESSAGING_PROVIDER === 'twilio') {
+  const { sendMessage: twilioSendMessage } = require('../messaging/messageService');
+  const { sendScheduledMessage: twilioSendScheduledMessage } = require('../messaging/scheduledMessageService');
+  const twilioAdapter = require('../adapters/twilio');
+  const twilioClient = twilioAdapter.twilioClient;
+  sendMessage = (messageData) => twilioSendMessage(twilioClient, messageData);
+  sendScheduledMessage = (messageData) => twilioSendScheduledMessage(twilioClient, messageData);
+} else {
+  throw new Error('Unsupported MESSAGING_PROVIDER specified');
+}
+
+module.exports = {
+  sendMessage,
+  sendScheduledMessage
+};

package/lib/utils/index.js

@@ -2,34 +2,10 @@ const AssistantManager = require('./AssistantManager');
 const DefaultLLMProvider = require('./DefaultLLMProvider');
 const MessageParser = require('./MessageParser');
 const logger = require('./logger');
-const { useMongoDBAuthState } = require('./mongoAuthConfig');
-const { 
-  convertTwilioToInternalFormat,
-  downloadMediaFromTwilio,
-  getMediaTypeFromContentType,
-  extractTitle,
-  ensureWhatsAppFormat
-} = require('./twilioHelper');
-const { 
-  delay,
-  formatCode,
-  calculateDelay
-} = require('./whatsappHelper');
 
 module.exports = {
   AssistantManager,
   DefaultLLMProvider,
   MessageParser,
-  logger,
-  useMongoDBAuthState,
-  // Twilio utilities
-  convertTwilioToInternalFormat,
-  downloadMediaFromTwilio,
-  getMediaTypeFromContentType,
-  extractTitle,
-  ensureWhatsAppFormat,
-  // WhatsApp utilities
-  delay,
-  formatCode,
-  calculateDelay
+  logger
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "publishConfig": {
     "access": "public"
@@ -35,7 +35,7 @@
     "dev": "tsc --watch",
     "test": "jest",
     "lint": "eslint lib/**/*.js",
-    "prepublishOnly": "npm run lint",
+    "prepublishOnly": "npm test && npm run lint",
     "version": "npm run prepublishOnly && git add -A lib",
     "postversion": "git push && git push --tags"
   },
@@ -50,7 +50,9 @@
   "author": "PEOPL Health Tech",
   "license": "MIT",
   "dependencies": {
+    "airtable": "^0.12.2",
     "axios": "^1.5.0",
+    "dotenv": "^16.4.7",
     "moment-timezone": "^0.5.43",
     "mongoose": "^7.5.0",
     "pino": "^8.15.0",

package/lib/utils/twilioHelper.js

@@ -1,75 +0,0 @@
-const axios = require('axios');
-const { v4: uuidv4 } = require('uuid');
-
-function convertTwilioToInternalFormat(twilioMessage) {
-  const from = twilioMessage.From || '';
-  const to = twilioMessage.To || '';
-  const fromMe = to === from;
-    
-  return {
-    key: {
-      id: twilioMessage.MessageSid || uuidv4(),
-      fromMe: fromMe,
-      remoteJid: fromMe ? to : from
-    },
-    pushName: twilioMessage.ProfileName || '',
-    message: {
-      conversation: twilioMessage.Body || ''
-    },
-    messageTimestamp: Math.floor(Date.now() / 1000)
-  };
-}
-
-async function downloadMediaFromTwilio(mediaUrl, credentials) {
-  try {
-    const response = await axios({
-      method: 'GET',
-      url: mediaUrl,
-      responseType: 'arraybuffer',
-      headers: {
-        'Authorization': `Basic ${Buffer.from(
-          `${credentials.accountSid}:${credentials.authToken}`
-        ).toString('base64')}`
-      }
-    });
-        
-    return Buffer.from(response.data);
-  } catch (error) {
-    console.error(`Failed to download media: ${error.message}`);
-    throw error;
-  }
-}
-
-function getMediaTypeFromContentType(contentType) {
-  if (contentType.startsWith('image/')) return 'imageMessage';
-  if (contentType.startsWith('audio/')) return 'audioMessage';
-  if (contentType.startsWith('video/')) return 'videoMessage';
-  if (contentType.startsWith('application/')) return 'documentMessage';
-  return 'unknownMessage';
-}
-
-function extractTitle(message, mediaType) {
-  if (mediaType === 'documentMessage' && message.MediaUrl0) {
-    const urlParts = message.MediaUrl0.split('/');
-    return urlParts[urlParts.length - 1] || null;
-  }
-  return null;
-}
-
-const ensureWhatsAppFormat = (phoneNumber) => {
-  if (!phoneNumber) return null;
-    
-  if (phoneNumber.startsWith('whatsapp:')) {
-    return phoneNumber;
-  }
-    
-  return `whatsapp:${phoneNumber}`;
-};
-
-module.exports = {
-  convertTwilioToInternalFormat,
-  downloadMediaFromTwilio,
-  getMediaTypeFromContentType,
-  extractTitle,
-  ensureWhatsAppFormat
-};

package/lib/utils/whatsappHelper.js

@@ -1,60 +0,0 @@
-const moment = require('moment-timezone');
-
-function delay(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-function formatCode(codeBase) {
-  const [number, domain] = codeBase.split('@');
-    
-  if (!number || !domain) {
-    throw new Error('Invalid code format: missing number or domain');
-  }
-
-  if (domain !== 's.whatsapp.net') {
-    throw new Error('Invalid domain: must be s.whatsapp.net');
-  }
-
-  let formattedNumber = number;
-
-  if (formattedNumber.endsWith('-2')) {
-    formattedNumber = formattedNumber.slice(0, -2);
-  }
-
-  if (formattedNumber.length === 10) {
-    formattedNumber = '52' + formattedNumber;
-  }
-
-  if (formattedNumber.startsWith('52') && formattedNumber.length === 12) {
-    formattedNumber = formattedNumber.substring(0, 2) + '1' + formattedNumber.substring(2);
-  }
-  return `${formattedNumber}@s.whatsapp.net`;
-}
-
-function calculateDelay(sendTime, timeZone) {
-  if (sendTime !== undefined && timeZone !== undefined) {
-    const sendMoment = moment.tz(sendTime, timeZone);
-
-    if (!sendMoment.isValid()) {
-      return { error: 'Invalid time format' };
-    }
-
-    const now = moment().tz(timeZone);
-    const randomDelay = Math.floor(Math.random() * 15001) + 15000;
-    const delay = sendMoment.diff(now) + randomDelay;
-
-    if (delay <= 0) {
-      return 2500;
-    }
-
-    return delay;
-  } else {
-    return 2500;
-  }
-}
-
-module.exports = {
-  delay,
-  formatCode,
-  calculateDelay
-};