diff --git a/wai-server/api/channels/channel.controller.js b/wai-server/api/channels/channel.controller.js index 2a75cd8..fd776fc 100644 --- a/wai-server/api/channels/channel.controller.js +++ b/wai-server/api/channels/channel.controller.js @@ -34,6 +34,35 @@ exports.newConnect = async ctx => { } }; +exports.sendText = async ctx => { + const { from, to, msgcontent, content: _content, actionId } = ctx.request.body; + const content = _content || msgcontent.body || ''; + if (!from || !content) { + ctx.assert(from, 400, 'From and message are required'); + return; + } + const wsToSend = whatApp.instance; + // console.log('find wsToSend', wsToSend) + if (!wsToSend) { + ctx.assert(wsToSend, 400, 'Session not found'); // 404 + return; + } + try { + const fromWebId = generateId(); + console.info(`fromWebId: ${fromWebId};`); + wsToSend.sendTextMessage(to, content, fromWebId).then(({ messageId, externalId }) => { + console.info(`messageId: ${messageId}; externalId: ${externalId}`); + }).catch(ex => { + console.error('Error channel sending message:', error); + }); + // const sockMsg = await wsToSend.sendTextMessage(to, content, actionId); + return 'channel sent successfully'; // { wsToSend, ret: 'Message sent successfully' }; + } catch (error) { + console.error('Error sending message:', error); + ctx.assert(null, 500, 'Failed to send message'); + } +}; + exports.getAll = async () => { const findConnection = await getConnection({}); return findConnection; diff --git a/wai-server/core/baileys/index.js b/wai-server/core/baileys/index.js index a053a8a..5a29f95 100644 --- a/wai-server/core/baileys/index.js +++ b/wai-server/core/baileys/index.js @@ -17,9 +17,6 @@ const generateId = require('../../utils/generateId.util'); const NodeCache = require('node-cache'); const P = require('pino'); -const logger = P({ timestamp: () => `,"time":"${new Date().toJSON()}"` }, P.destination('./wa-logs.txt')); -logger.level = 'trace'; - const msgRetryCounterCache = new NodeCache(); waEmitter.on('message:updated', event => { @@ -40,7 +37,8 @@ const createWhatsApp = async phone => { let qrCode = null; const channelId = generateId(); const whatsAppNo = phone; - + const logger = P({ timestamp: () => `,"time":"${new Date().toJSON()}"` }, P.destination('./wa-logs-' + phone + '.txt')); + logger.level = 'trace'; const storeFilename = './baileys_auth_info/baileys_store_' + phone + '_' + channelId + '.json' const store = makeInMemoryStore({ logger }); store?.readFromFile(storeFilename); @@ -53,7 +51,7 @@ const createWhatsApp = async phone => { const { version, isLatest } = await fetchLatestBaileysVersion(); const waVersion = version.join('.') + ', ' + (isLatest ? 'latest' : 'out'); - const sendTextMessage = async (number, content) => { + const sendTextMessage = async (number, content, externalId) => { const jid = formatPhoneNumber(number); if (number === whatsAppNo) { @@ -61,10 +59,24 @@ const createWhatsApp = async phone => { } try { - const msgInfo = await waSocket.sendMessage(jid, { text: content }); - return { - messageId: msgInfo?.key.id - }; + return new Promise((resolve, reject) => { + waSocket.sendMessage(jid, { text: content }) + .then(msgInfo => { + resolve({ + messageId: msgInfo?.key?.id ?? generateId(), + externalId + }); + }) + .catch(ex => { + waEmitter.emit('message.error', { + messge: `[${whatsAppNo}->${number}]发送文本消息出错`, + from: whatsAppNo, + to: number, + error: ex + }) + console.error(`[${whatsAppNo}->${number}]发送文本消息出错: `, ex); + }); + }); } catch (ex) { waEmitter.emit('message.error', { messge: `[${whatsAppNo}->${number}]发送文本消息出错`, @@ -83,7 +95,7 @@ const createWhatsApp = async phone => { image: { url: imageUrl }, }); return { - messageId: msgInfo?.key.id + messageId: msgInfo?.key?.id ?? generateId() }; } catch (ex) { waEmitter.emit('message.error', { @@ -137,12 +149,8 @@ const createWhatsApp = async phone => { if (msg.message?.conversation || msg.message?.extendedTextMessage?.text) { const text = msg.message?.conversation || msg.message?.extendedTextMessage?.text; - if (text.indexOf('【发图】') > -1) { - sendImageMessage(fromWhatsAppNo, 'https://images.asiahighlights.com/allpicture/2022/07/8a7d9ced5936463bb904c82a_cut_750x850_349.webp'); - } else if (text.indexOf('【发文】') > -1) { - sendTextMessage(fromWhatsAppNo, '这是文本消息:' + new Date().toString()); - } else if (text.indexOf('【发群】') > -1) { - sendTextMessage('120363363417115199@g.us', '这是群消息:' + new Date().toString()); + if (text.indexOf('「自~测」') > -1) { + sendTextMessage(fromWhatsAppNo, '这是自测消息:' + new Date().toString()); } if (msg.key.fromMe) { diff --git a/wai-server/pm2-install.txt b/wai-server/pm2-install.txt index cda5783..d29691f 100644 --- a/wai-server/pm2-install.txt +++ b/wai-server/pm2-install.txt @@ -1,2 +1,3 @@ https://pm2.keymetrics.io/docs/usage/pm2-doc-single-page/ -pm2 start index.js --name wai-server \ No newline at end of file +cd /www/wwwroot/wai-server-01 +pm2 start index.js --name wai-server -i 8 \ No newline at end of file