diff --git a/wai-server/core/baileys/index-no-promise.js b/wai-server/core/baileys/index-no-promise.js index 69603a8..d17af70 100644 --- a/wai-server/core/baileys/index-no-promise.js +++ b/wai-server/core/baileys/index-no-promise.js @@ -47,16 +47,6 @@ const createWhatsApp = async phone => { socketRef.sendMessage(jid, { text: content }) .then(msg => { msgIdMap.set(msg.key.id, externalId); - waEmitter.emit('message:updated', { - id: msg.key.id, - externalId, - status: 'saved', - direction: 'outbound', - from: whatsAppNo, - to: number, - eventSource: 'sendMessage.promise.then', - updateTime: formatTimestamp(new Date().getTime() / 1000), - }) }) .catch(ex => { waEmitter.emit('message:updated', { diff --git a/wai-server/core/baileys/index.js b/wai-server/core/baileys/index.js index a472908..267ae80 100644 --- a/wai-server/core/baileys/index.js +++ b/wai-server/core/baileys/index.js @@ -31,7 +31,7 @@ waEmitter.on('connection:close', event => { }); const createWhatsApp = async phone => { - let waSocket = null; + let socketRef = null; let qrCode = null; let connectionStatus = 'offline' const channelId = generateId(); @@ -39,38 +39,14 @@ const createWhatsApp = async phone => { // 储存键值对 msgId-externalId // TODO 什么时候清理旧的？ const msgIdMap = new Map(); - const logger = P({ timestamp: () => `,"time":"${new Date().toJSON()}"` }, P.destination('./wa-logs-' + phone + '_' + channelId + '.txt')); - logger.level = 'trace'; - const msgRetryCounterCache = new NodeCache(); - const storeFilename = './baileys_auth_info/baileys_store_' + phone + '_' + channelId + '.json' - const store = makeInMemoryStore({ logger }); - store?.readFromFile(storeFilename); - // save every 10s - setInterval(() => { - store?.writeToFile(storeFilename); - }, 10_000); - const { state, saveCreds } = await useMultiFileAuthState('baileys_auth_info/' + phone + '_' + channelId); - // fetch latest version of WA Web - const { version, isLatest } = await fetchLatestBaileysVersion(); - const waVersion = version.join('.') + ', ' + (isLatest ? 'latest' : 'out'); const sendTextMessage = async (number, content, externalId) => { const jid = formatPhoneNumber(number); return new Promise(() => { - waSocket.sendMessage(jid, { text: content }) + socketRef.sendMessage(jid, { text: content }) .then(msg => { msgIdMap.set(msg.key.id, externalId); - waEmitter.emit('message:updated', { - id: msg.key.id, - externalId, - status: 'saved', - direction: 'outbound', - from: whatsAppNo, - to: number, - eventSource: 'sendMessage.promise.then', - updateTime: formatTimestamp(new Date().getTime() / 1000), - }) }) .catch(ex => { waEmitter.emit('message:updated', { @@ -81,7 +57,7 @@ const createWhatsApp = async phone => { from: whatsAppNo, to: number, errro: `发送文本消息出错 ` + ex, - eventSource: 'sendMessage.promise.catch', + eventSource: 'WA-01-HK.sendMessage.promise.catch', updateTime: formatTimestamp(new Date().getTime() / 1000), }); }); @@ -91,7 +67,7 @@ const createWhatsApp = async phone => { const sendImageMessage = async (number, imageUrl) => { const jid = formatPhoneNumber(number); try { - const msgInfo = await waSocket.sendMessage(jid, { + const msgInfo = await socketRef.sendMessage(jid, { image: { url: imageUrl }, }); return { @@ -111,7 +87,7 @@ const createWhatsApp = async phone => { const getProfilePicture = async (whatsAppNo) => { const number = formatPhoneNumber(whatsAppNo); try { - const ppUrl = await waSocket.profilePictureUrl(number); + const ppUrl = await socketRef.profilePictureUrl(number); console.log('头像: ' + ppUrl); } catch (ex) { console.error('头像出错: ', ex); @@ -161,7 +137,9 @@ const createWhatsApp = async phone => { id: parsePhoneNumber(msg.key.participant), name: msg.pushName, }, - eventSource: 'messages.upsert.notify', + whatsAppNo, + fromMe: msg.key.fromMe, + eventSource: 'WA-01-HK.messages.upsert.notify', updateTime: formatTimestamp(msg.messageTimestamp), }); } else { @@ -183,7 +161,9 @@ const createWhatsApp = async phone => { id: parsePhoneNumber(msg.key.participant), name: msg.pushName, }, - eventSource: 'messages.upsert.notify', + whatsAppNo, + fromMe: msg.key.fromMe, + eventSource: 'WA-01-HK.messages.upsert.notify', createTime: formatTimestamp(msg.messageTimestamp), }); } @@ -215,7 +195,9 @@ const createWhatsApp = async phone => { id: parsePhoneNumber(msg.participant), name: msg.pushName, }, - eventSource: 'messages.upsert.append', + whatsAppNo, + fromMe: msg.key.fromMe, + eventSource: 'WA-01-HK.messages.upsert.append', updateTime: formatTimestamp(msg.messageTimestamp), }); } @@ -244,32 +226,49 @@ const createWhatsApp = async phone => { id: parsePhoneNumber(msg.key.participant), name: msg.pushName, }, - eventSource: 'messages.updated', + whatsAppNo, + fromMe: msg.key.fromMe, + eventSource: 'WA-01-HK.messages.updated', updateTime: formatTimestamp(new Date().getTime() / 1000), }); } } - const handleCredsUpdate = async () => { - await saveCreds(); + const handleConnection = async (socket) => { + socketRef = socket; + socketRef.sendMessage('8613317835586@s.whatsapp.net', { text: '原始连接上了：' + new Date().toString()}) } - const start = () => { - return new Promise(resolve => { - waSocket = makeWASocket({ + const start = async () => { + + const logger = P({ timestamp: () => `,"time":"${new Date().toJSON()}"` }, P.destination('./wa-logs-' + phone + '_' + channelId + '.txt')); + logger.level = 'trace'; + const msgRetryCounterCache = new NodeCache(); + const storeFilename = './baileys_auth_info/baileys_store_' + phone + '_' + channelId + '.json' + const store = makeInMemoryStore({ logger }); + store?.readFromFile(storeFilename); + // save every 10s + setInterval(() => { + store?.writeToFile(storeFilename); + }, 10_000); + const { state, saveCreds } = await useMultiFileAuthState('baileys_auth_info/' + phone + '_' + channelId); + // fetch latest version of WA Web + const { version, isLatest } = await fetchLatestBaileysVersion(); + + 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, + // 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'),// + browser: Browsers.ubuntu('IOS_PHONE'),//Browsers.macOS('SAFARI'),//Browsers.ubuntu('IOS_PHONE'),//Browsers.baileys('WEAR_OS'),// msgRetryCounterCache, generateHighQualityLinkPreview: false, syncFullHistory: false, @@ -277,57 +276,73 @@ const createWhatsApp = async phone => { store?.bind(waSocket.ev); - waSocket.ev.on('connection.update', async update => { - console.log('connection update: ', update); - const { connection, lastDisconnect, qr } = update; - - if (connection === 'close') { - if((lastDisconnect?.error)?.output?.statusCode !== DisconnectReason.loggedOut) { - start(); - } else { + waSocket.ev.process( + // events is a map for event name => event data + async(events) => { + // something about the connection changed + // maybe it closed, or we received all offline message or connection opened + if(events['connection.update']) { + const update = events['connection.update'] + const { connection, qr, lastDisconnect } = update + + if (connection === 'close') { + if((lastDisconnect?.error)?.output?.statusCode !== DisconnectReason.loggedOut) { + start(); + } else { + waEmitter.emit('connection:close', { + whatsAppNo, channelId, + eventSource: 'WA-01-HK.connection.update.close', + status: 'offline', + }); + } + } else if (connection === 'open') { + handleConnection(waSocket) + connectionStatus = 'open'; + waEmitter.emit('connection:open', { + status: 'open', whatsAppNo, channelId, + eventSource: 'WA-01-HK.connection.update.open', + socket: waSocket, + sendTextMessage, + sendImageMessage, + }); + } else if (qr !== undefined) { + // WebSocket 创建成功等待扫码，如果没有扫码会更新 qr + // 第一次一分钟，后面是 20 秒更新一次 + if (qrCode === null) { + qrCode = qr; + console.info('qr: ', qr) + + waEmitter.emit('connection:qr', { + createTimestamp: Date.now(), + status: 'offline', + version: '0.111111', + channelId: channelId, + phone: phone, + qrCode: qr, + socket: waSocket + }) + } else { + // 第一次二维码时效后退出，不需要等待更新二维码 + waSocket.logout(() => '二维码已过期'); + } + } + } + + if (events['creds.update']) { + await saveCreds() + } + } + ) - waEmitter.emit('connection:close', { - whatsAppNo, channelId, - eventSource: 'connection.update.close', - status: 'offline', - }); - } - } else if (connection === 'open') { - if (connectionStatus === 'open') { - sendTextMessage('120363363417115199@g.us', whatsAppNo + ' 在线：' + new Date().toString()); - } else { - // 扫码成功后向这个群('120363363417115199@g.us')发消息，后续就能使用 API 发送了。 - sendTextMessage('120363363417115199@g.us', whatsAppNo + ' 登录成功：' + new Date().toString()); - } - connectionStatus = 'open'; - waEmitter.emit('connection:open', { - status: 'open', whatsAppNo, channelId, - eventSource: 'connection.update.open', - }); - } else if (qr !== undefined) { - // WebSocket 创建成功等待扫码，如果没有扫码会更新 qr - // 第一次一分钟，后面是 20 秒更新一次 - if (qrCode === null) { - qrCode = qr; - resolve(qr); - } else { - // 第一次二维码时效后退出，不需要等待更新二维码 - waSocket.logout(() => '二维码已过期'); - } - - } - }); - - waSocket.ev.on('creds.update', handleCredsUpdate); + waSocket.ev.on('creds.update', async () => await saveCreds()); waSocket.ev.on('messages.upsert', handleMessagesUpsert); waSocket.ev.on('messages.update', handleMessagesUpdate); - }); }; return { createTimestamp: Date.now(), status: 'offline', - version: waVersion, + version: 'no-promise-version', channelId: channelId, phone: phone, start,