Merge remote-tracking branch 'origin/main'

wai-server/core/baileys/helper.js

@@ -50,7 +50,31 @@ const formatTimestamp = timestamp => {
   return `${datetime.getFullYear()}-${datetime.getMonth() + 1}-${datetime.getDate()} ${datetime.getHours()}:${datetime.getMinutes()}:${datetime.getSeconds()}`;
 };
 
+const getFileExtension = mimeType => {
+  switch (mimeType) {
+    case 'image/jpeg':
+      return '.jpg';
+    case 'image/png':
+      return '.png';
+    case 'image/gif':
+      return '.gif';
+    case 'image/bmp':
+      return '.bmp';
+    case 'image/webp':
+      return '.webp';
+    default:
+      return 'unknown';
+  }
+}
+
+const uint8ArrayToBase64  = uint8Array => {
+  const binaryString = String.fromCharCode(...uint8Array);
+  return btoa(binaryString);
+}
+
 module.exports = {
+  uint8ArrayToBase64,
+  getFileExtension,
   formatTimestamp,
   formatStatus,
   encodeJid,

wai-server/core/baileys/index.js

@@ -15,7 +15,7 @@ const { writeFile } = require('fs/promises');
 const waEmitter = require('../emitter');
 const serverConfig = require('../../config').server;
 
-const { encodeJid, decodeJid, formatStatus, formatTimestamp } = require('./helper');
+const { encodeJid, decodeJid, formatStatus, formatTimestamp, getFileExtension, uint8ArrayToBase64 } = require('./helper');
 const generateId = require('../../utils/generateId.util');
 const NodeCache = require('node-cache');
 const P = require('pino');
@@ -43,6 +43,30 @@ const createWhatsApp = async phone => {
   const { version, isLatest } = await fetchLatestBaileysVersion();
   const waVersion = version.join('.') + ', ' + (isLatest ? 'latest' : 'out');
 
+
+  const start = () => {
+
+    const waSocket = makeWASocket({
+        version,
+        logger,
+        auth: {
+          creds: state.creds,
+          keys: makeCacheableSignalKeyStore(state.keys, logger),
+        },
+        // connectTimeoutMs: 1000*60*10,
+        // defaultQueryTimeoutMs: 1000*60*1,
+        // keepAliveIntervalMs: 1000*60*60,
+        //retryRequestDelayMs: 1000*25,
+        // https://github.com/WhiskeySockets/Baileys/blob/31bc8ab/src/Utils/generics.ts#L21
+        // https://github.com/WhiskeySockets/Baileys/blob/31bc8ab4e2c825c0d774875701ed07e20d05bdb6/WAProto/WAProto.proto
+        browser: Browsers.macOS('SAFARI'),//Browsers.macOS('SAFARI'),//Browsers.ubuntu('IOS_PHONE'),//Browsers.baileys('WEAR_OS'),//
+        msgRetryCounterCache,
+        generateHighQualityLinkPreview: false,
+        syncFullHistory: false,
+      });
+
+    store?.bind(waSocket.ev);
+
     const handleMessagesUpsert = async upsert => {
       console.info('messages.upsert: ', JSON.stringify(upsert, undefined, 2));
 
@@ -55,15 +79,12 @@ const createWhatsApp = async phone => {
           }
 
           const messageType = Object.keys(msg.message)[0];
-        console.log('messageType', messageType);
-        // TODO: 待处理图片消息
-
-        const fromWhatsAppNo = decodeJid(msg.key.remoteJid);
+          const remoteNo = decodeJid(msg.key.remoteJid);
+          const externalId = externalIdCache.get(msg.key.id);
 
           if (msg.message?.conversation || msg.message?.extendedTextMessage?.text) {
 
             const text = msg.message?.conversation || msg.message?.extendedTextMessage?.text;
-          const externalId = externalIdCache.get(msg.key.id);
 
             if (msg.key.fromMe) {
               waEmitter.emit('message:updated', {
@@ -72,7 +93,7 @@ const createWhatsApp = async phone => {
                 status: formatStatus(msg.status),
                 direction: 'outbound',
                 from: whatsAppNo,
-              to: fromWhatsAppNo,
+                to: remoteNo,
                 type: 'text',
                 text: {
                   body: text,
@@ -95,7 +116,7 @@ const createWhatsApp = async phone => {
                 externalId,
                 status: '',
                 direction: 'inbound',
-              from: fromWhatsAppNo,
+                from: remoteNo,
                 to: whatsAppNo,
                 type: 'text',
                 text: {
@@ -114,6 +135,44 @@ const createWhatsApp = async phone => {
                 createTime: formatTimestamp(msg.messageTimestamp),
               });
             }
+          } else if (messageType === 'imageMessage') {
+            console.info('image message: ', msg)
+            const imageMessage = msg.message.imageMessage;
+            const fileExtension = getFileExtension(imageMessage.mimetype);
+            const imageBuffer = await downloadMediaMessage(
+              msg, 'buffer', {}, { logger, reuploadRequest: waSocket.updateMediaMessage, },
+            );
+            const imageFilename = './temp/image_'  + whatsAppNo + '_' + msg.key.id + fileExtension;
+            await writeFile(imageFilename, imageBuffer);
+            if (msg.key.fromMe) {
+              waEmitter.emit('message:updated', {
+                id: msg.key.id,
+                externalId,
+                status: formatStatus(msg.status),
+                direction: 'outbound',
+                from: whatsAppNo,
+                to: remoteNo,
+                type: 'image',
+                image: {
+                  mimetype: imageMessage.mimetype,
+                  sha256: uint8ArrayToBase64(imageMessage.fileSha256),
+                  caption: '', // 暂时为空
+                  filename: imageFilename,
+                  link_original: imageMessage.url,
+                },
+                conversation: {
+                  type: isJidUser(msg.key.remoteJid) ? 'individual' : 'group',
+                },
+                customerProfile: {
+                  id: decodeJid(msg.key.participant),
+                  name: msg.pushName,
+                },
+                whatsAppNo,
+                fromMe: msg.key.fromMe,
+                eventSource: serverConfig.name + '.messages.upsert.notify',
+                updateTime: formatTimestamp(msg.messageTimestamp),
+              });
+            }
           }
         }
       } else if (upsert.type === 'append') {
@@ -190,29 +249,6 @@ const createWhatsApp = async phone => {
       await saveCreds();
     }
 
-  const start = () => {
-
-    const waSocket = makeWASocket({
-        version,
-        logger,
-        auth: {
-          creds: state.creds,
-          keys: makeCacheableSignalKeyStore(state.keys, logger),
-        },
-        // connectTimeoutMs: 1000*60*10,
-        // defaultQueryTimeoutMs: 1000*60*1,
-        // keepAliveIntervalMs: 1000*60*60,
-        //retryRequestDelayMs: 1000*25,
-        // https://github.com/WhiskeySockets/Baileys/blob/31bc8ab/src/Utils/generics.ts#L21
-        // https://github.com/WhiskeySockets/Baileys/blob/31bc8ab4e2c825c0d774875701ed07e20d05bdb6/WAProto/WAProto.proto
-        browser: Browsers.macOS('SAFARI'),//Browsers.macOS('SAFARI'),//Browsers.ubuntu('IOS_PHONE'),//Browsers.baileys('WEAR_OS'),//
-        msgRetryCounterCache,
-        generateHighQualityLinkPreview: false,
-        syncFullHistory: false,
-      });
-
-    store?.bind(waSocket.ev);
-
     const sendMessageHandler = (event) => {
       const { to: number, externalId, ...content } = event;
       const jid = encodeJid(number);
@@ -264,7 +300,7 @@ const createWhatsApp = async phone => {
           eventSource: serverConfig.name + '.connection.update.open',
         });
 
-        waEmitter.on('request.' + whatsAppNo + '.send.text', sendMessageHandler);
+        waEmitter.on('request.' + whatsAppNo + '.send.message', sendMessageHandler);
       } else if (qr !== undefined) {
         // WebSocket 创建成功等待扫码，如果没有扫码会更新 qr
         // 第一次一分钟，后面是 20 秒更新一次