From 92e84e4ad00ea010627be92e1f5d63fb7dd8c3bf Mon Sep 17 00:00:00 2001 From: Jimmy Date: Tue, 31 Dec 2024 15:05:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E4=BD=BF=E7=94=A8=20emitter=20?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=91=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wai-server/api/messages/message.controller.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wai-server/api/messages/message.controller.js b/wai-server/api/messages/message.controller.js index 00414e3..0869e2a 100644 --- a/wai-server/api/messages/message.controller.js +++ b/wai-server/api/messages/message.controller.js @@ -5,6 +5,7 @@ const { sessionStore } = require('../../core'); const { objectMapper, pick } = require('../../utils/commons.util'); const { createOutboundMessage } = require('../../services/outbound_messages.service'); +const waEmitter = require('../../core/emitter'); function sleep(ms) { return new Promise(resolve => setTimeout(resolve, ms)); } @@ -39,7 +40,8 @@ exports.sendText = async ctx => { await createOutboundMessage({ ...toUpsert }); // return 'Message sent successfully'; // { wsToSend, ret: 'Message sent successfully' }; // }); - wsToSend.sendTextMessage(to, content, actionId); + //wsToSend.sendTextMessage(to, content, actionId); + waEmitter.emit('request.' + from + '.send.message', {to, content, externalId: actionId}); return 'Message sent successfully'; // { wsToSend, ret: 'Message sent successfully' }; } catch (error) { console.error('Error sending message:', error); From dacb49f273b904d118cc8518d72a3fe2d5ba9ce1 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Tue, 31 Dec 2024 16:05:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=E5=BF=BD=E7=95=A5=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E7=8A=B6=E6=80=81=E7=9A=84=E6=9B=B4=E6=96=B0=EF=BC=9B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20emitter=20=E5=8F=91=E9=80=81=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wai-server/core/baileys/helper.js | 2 ++ wai-server/core/baileys/index.js | 37 ++++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/wai-server/core/baileys/helper.js b/wai-server/core/baileys/helper.js index d9fc73b..8df98a2 100644 --- a/wai-server/core/baileys/helper.js +++ b/wai-server/core/baileys/helper.js @@ -1,5 +1,6 @@ const { isJidUser, isJidGroup, isJidBroadcast, jidEncode, jidDecode, S_WHATSAPP_NET } = require('@whiskeysockets/baileys'); +// -> encodePhoneNo const formatPhoneNumber = number => { if (number === null || number === undefined) return ''; @@ -10,6 +11,7 @@ const formatPhoneNumber = number => { } }; +// -> decodePhoneNo const parsePhoneNumber = number => { if (number === null || number === undefined) return ''; diff --git a/wai-server/core/baileys/index.js b/wai-server/core/baileys/index.js index 5ec3eb2..22a2cbb 100644 --- a/wai-server/core/baileys/index.js +++ b/wai-server/core/baileys/index.js @@ -172,6 +172,11 @@ const createWhatsApp = async phone => { for (const msg of messageUpdate) { + // 没有明确标识状态的更新，忽略 + const ignore = msg.update === undefined || msg.update.status === undefined; + + if (ignore) continue; + const externalId = msgIdMap.get(msg.key.id); waEmitter.emit('message:updated', { id: msg.key.id, @@ -280,7 +285,6 @@ const createWhatsApp = async phone => { if((lastDisconnect?.error)?.output?.statusCode !== DisconnectReason.loggedOut) { start(); } else { - waEmitter.emit('connection:close', { whatsAppNo, channelId, eventSource: serverConfig.name + '.connection.update.close', @@ -288,18 +292,16 @@ const createWhatsApp = async phone => { }); } } else if (connection === 'open') { - connectionStatus = 'open'; waEmitter.emit('connection:open', { status: 'open', whatsAppNo, channelId, eventSource: serverConfig.name + '.connection.update.open', }); - waEmitter.on('request.' + whatsAppNo + '.send.message', event => { - // const jid = formatPhoneNumber(event.to); + waEmitter.on('request.' + whatsAppNo + '.send.message', event => { const {to: number, externalId, content} = event; console.info('request.' + whatsAppNo + '.send.message:', event) + // const jid = formatPhoneNumber(event.to); waSocket.sendMessage( - number + '@s.whatsapp.net', - { text: content} + number + '@s.whatsapp.net', { text: content } ).then(msg => { msgIdMap.set(msg.key.id, externalId); }).catch(ex => { @@ -318,6 +320,29 @@ const createWhatsApp = async phone => { }); //sendTextMessage(number, content, externalId); }); + + waEmitter.on('req.' + whatsAppNo + '.send.image', event => { + const {to: number, externalId, content} = event; + const jid = formatPhoneNumber(event.to); + waSocket.sendMessage( + jid, {image: { url: imageUrl }} + ).then(msg => { + msgIdMap.set(msg.key.id, externalId); + }).catch(ex => { + console.error('sendMessage.error: ', ex) + waEmitter.emit('message:updated', { + id: generateId(), + externalId, + status: 'failed', + direction: 'outbound', + from: whatsAppNo, + to: number, + error: `发送图片消息出错 ` + ex, + eventSource: serverConfig.name + '.sendMessage.catch', + updateTime: formatTimestamp(new Date().getTime() / 1000), + }); + }); + }); } else if (qr !== undefined) { // WebSocket 创建成功等待扫码，如果没有扫码会更新 qr // 第一次一分钟，后面是 20 秒更新一次 From adf35291e2f1c06b305a50071fef691ab9f64438 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Tue, 31 Dec 2024 16:36:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20emitter=20?= =?UTF-8?q?=E5=8F=91=E6=96=87=E6=9C=AC=E6=B6=88=E6=81=AF=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wai-server/api/messages/message.controller.js | 2 +- wai-server/core/baileys/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wai-server/api/messages/message.controller.js b/wai-server/api/messages/message.controller.js index 0869e2a..93fce69 100644 --- a/wai-server/api/messages/message.controller.js +++ b/wai-server/api/messages/message.controller.js @@ -41,7 +41,7 @@ exports.sendText = async ctx => { // return 'Message sent successfully'; // { wsToSend, ret: 'Message sent successfully' }; // }); //wsToSend.sendTextMessage(to, content, actionId); - waEmitter.emit('request.' + from + '.send.message', {to, content, externalId: actionId}); + waEmitter.emit('request.' + from + '.send.text', {to, content, externalId: actionId}); return 'Message sent successfully'; // { wsToSend, ret: 'Message sent successfully' }; } catch (error) { console.error('Error sending message:', error); diff --git a/wai-server/core/baileys/index.js b/wai-server/core/baileys/index.js index 22a2cbb..5388e6a 100644 --- a/wai-server/core/baileys/index.js +++ b/wai-server/core/baileys/index.js @@ -296,7 +296,7 @@ const createWhatsApp = async phone => { status: 'open', whatsAppNo, channelId, eventSource: serverConfig.name + '.connection.update.open', }); - waEmitter.on('request.' + whatsAppNo + '.send.message', event => { + waEmitter.on('request.' + whatsAppNo + '.send.text', event => { const {to: number, externalId, content} = event; console.info('request.' + whatsAppNo + '.send.message:', event) // const jid = formatPhoneNumber(event.to); @@ -321,7 +321,7 @@ const createWhatsApp = async phone => { //sendTextMessage(number, content, externalId); }); - waEmitter.on('req.' + whatsAppNo + '.send.image', event => { + waEmitter.on('request.' + whatsAppNo + '.send.image', event => { const {to: number, externalId, content} = event; const jid = formatPhoneNumber(event.to); waSocket.sendMessage(