Haina
/
Global-sales
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
dev/supplier-email-drawer
Lei OT 9 months ago
parent 3df7ff4b80 07a78f7dee
commit d166e9d2fa
5 changed files with 101 additions and 79 deletions
Show Stats Download Patch File Download Diff File

8
baileys-server/index.js
Unescape Escape View File

@ -8,6 +8,7 @@ const {
makeInMemoryStore,
useMultiFileAuthState,
downloadMediaMessage,
isJidGroup,jidNormalizedUser,
} = require('@whiskeysockets/baileys');
const { writeFile } = require('fs/promises');
@ -42,7 +43,7 @@ const createWhatsApp = async phone => {
const formatPhoneNumber = number => {
if (number === null || number === undefined) return '';
if (number.indexOf('@g.us') > -1) {
if (isJidGroup(number)) {
return number;
} else if (number.indexOf('@broadcast') > -1) {
return number;
@ -162,8 +163,11 @@ const createWhatsApp = async phone => {
}
const fromWhatsAppNo = parsePhoneNumber(msg.key.remoteJid);
console.log('fromWhatsAppNo: ', fromWhatsAppNo)
if (msg.key.remoteJid.indexOf('@g.us') > -1) {
console.log('jidNormalizedUser: ', jidNormalizedUser(msg.key.remoteJid))
if (isJidGroup(msg.key.remoteJid)) {
const metadata = await waSocket.groupMetadata(msg.key.remoteJid);
console.log('群: ' + metadata.subject + ', description: ' + metadata.desc);

6
src/actions/WaiAction.js
Unescape Escape View File

@ -13,3 +13,9 @@ export const postSendMsg = async (body) => {
const { result } = await postJSON(`${WAI_HOST}/messages/text`, body);
return result;
};
export const fetchQRCode = (phone) => {
return fetchJSON(
`${WAI_HOST}/channels/qrcode`,
{ phone })
}

7
src/views/accounts/Profile.jsx
Unescape Escape View File

@ -6,6 +6,8 @@ import { fetchJSON } from '@/utils/request'
import { Conditional } from '@/components/Conditional'
import { PERM_USE_WHATSAPP } from '@/stores/AuthStore'
import { WAI_HOST } from '@/config'
import { fetchQRCode } from '@/actions/WaiAction'
function Profile() {
const { notification } = App.useApp()
@ -46,10 +48,7 @@ function Profile() {
const handelGernaterQR = useCallback(() => {
const phone = loginUser.whatsAppNo
fetchJSON(
`${WAI_HOST}/channels/qrcode`,
{ phone })
fetchQRCode(phone)
.then(r => {
setQRCode(r.result.qr)
setQRStatus('active')

49
wai-server/core/baileys/common.js
Unescape Escape View File

@ -0,0 +1,49 @@
const { isJidUser, isJidGroup, isJidBroadcast, jidEncode, jidDecode, S_WHATSAPP_NET } = require('@whiskeysockets/baileys');
const formatPhoneNumber = number => {
if (number === null || number === undefined) return '';
if (isJidGroup(number)) {
return number;
} else if (isJidBroadcast(number)) {
return number;
} else {
jidEncode(number, S_WHATSAPP_NET);
}
};
const parsePhoneNumber = number => {
if (number === null || number === undefined) return '';
if (isJidUser(number)) {
return jidDecode(number).user;
} else {
return number;
}
};
// status: sent read delivered failed
// 2 sent, 3 delivered, 4 read, 0 error
const formatStatus = number => {
if (number === 2) return 'sent';
else if (number === 3) return 'delivered';
else if (number === 4) return 'read';
else if (number === 0) return 'error';
else return 'played';
};
// Time: 2008-07-07 15:37:07
const formatTimestamp = timestamp => {
if (timestamp === null) return '';
const datetime = new Date(timestamp * 1000);
return datetime.getFullYear() + '-' + (datetime.getMonth() + 1) + '-' + datetime.getDay() + ' ' + datetime.getHours() + ':' + datetime.getMinutes() + ':' + datetime.getSeconds();
};
module.exports = {
formatTimestamp,
formatStatus,
parsePhoneNumber,
formatPhoneNumber,
};

110
wai-server/core/baileys/index.js
Unescape Escape View File

@ -11,6 +11,7 @@ const {
const { writeFile } = require('fs/promises');
const waEmitter = require('../emitter');
const { formatPhoneNumber, parsePhoneNumber, formatStatus, formatTimestamp } = require('./common');
const generateId = require('../../utils/generateId.util');
const NodeCache = require('node-cache');
const P = require('pino');
@ -18,12 +19,8 @@ const P = require('pino');
const logger = P({ timestamp: () => `,"time":"${new Date().toJSON()}"` }, P.destination('./wa-logs.txt'));
logger.level = 'trace';
// external map to store retry counts of messages when decryption/encryption fails
// keep this out of the socket itself, so as to prevent a message decryption/encryption loop across socket restarts
const msgRetryCounterCache = new NodeCache();
// the store maintains the data of the WA connection in memory
// can be written out to a file & read from it
const store = makeInMemoryStore({ logger });
store?.readFromFile('./baileys_store_multi.json');
// save every 10s
@ -37,8 +34,10 @@ waEmitter.on('message:updated', event => {
waEmitter.on('message:received', event => {
console.info('msg:event', event);
});
waEmitter.on('connection.open', event => {
console.info('msg:event', event);
});
// start a connection
const createWhatsApp = async phone => {
const channelId = generateId();
const whatsAppNo = phone;
@ -47,64 +46,38 @@ const createWhatsApp = async phone => {
const { version, isLatest } = await fetchLatestBaileysVersion();
const waVersion = version.join('.') + ', ' + (isLatest ? 'latest' : 'out');
const formatPhoneNumber = number => {
if (number === null || number === undefined) return '';
if (number.indexOf('@g.us') > -1) {
return number;
} else if (number.indexOf('@broadcast') > -1) {
return number;
} else {
return number + '@s.whatsapp.net';
}
};
const parsePhoneNumber = number => {
if (number === null || number === undefined) return '';
if (number.indexOf('@s.whatsapp.net') > -1) {
return number.split('@')[0];
} else {
return number;
}
};
// status: sent read delivered failed
// 2 sent, 3 delivered, 4 read, 0 error
// Time: 2008-07-07 15:37:07
const formatStatus = number => {
if (number === 2) return 'sent';
else if (number === 3) return 'delivered';
else if (number === 4) return 'read';
else if (number === 0) return 'error';
else return 'played';
};
const formatTimestamp = timestamp => {
if (timestamp === null) return '';
const datetime = new Date(timestamp * 1000);
return datetime.getFullYear() + '-' + (datetime.getMonth() + 1) + '-' + datetime.getDay() + ' ' + datetime.getHours() + ':' + datetime.getMinutes() + ':' + datetime.getSeconds();
};
const sendTextMessage = (whatsAppNo, content) => {
const number = formatPhoneNumber(whatsAppNo);
console.info('formatPhoneNumber: ', number);
waSocket.sendMessage(number, { text: content });
try {
waSocket.sendMessage(number, { text: content });
} catch (ex) {
waEmitter.emit('message.error', {
messge: '发送文本消息出错',
error: ex
})
console.error('发送文本消息出错: ', ex);
}
};
const sendImageMessage = (whatsAppNo, imageUrl) => {
const number = formatPhoneNumber(whatsAppNo);
waSocket.sendMessage(number, {
image: { url: imageUrl },
});
try {
waSocket.sendMessage(number, {
image: { url: imageUrl },
});
} catch (ex) {
waEmitter.emit('message.error', {
messge: '发送图片消息出错',
error: ex
})
console.error('发送图片消息出错: ', ex);
}
};
let waSocket = null;
const start = () => {
return new Promise((resolve, reject) => {
return new Promise(resolve => {
waSocket = makeWASocket({
version,
logger,
@ -128,6 +101,8 @@ const createWhatsApp = async phone => {
if (connection === 'close') {
console.log('链接断开：', lastDisconnect);
if (lastDisconnect?.error?.output?.statusCode !== DisconnectReason.loggedOut) {
console.log('正在重连：');
start();
} else {
waSocket.end(error => console.error('end.error: ', error));
@ -135,8 +110,9 @@ const createWhatsApp = async phone => {
console.log('Connection closed. You are logged out.');
}
} else if (connection === 'open') {
console.info('链接成功');
waEmitter.emit('connection.open', waSocket);
waEmitter.emit('connection.open', {
status: 'online',
});
} else if (qr !== undefined) {
// WebSocket 创建成功等待扫码，如果没有扫码会更新 qr
resolve(qr);
@ -172,24 +148,11 @@ const createWhatsApp = async phone => {
const fromWhatsAppNo = parsePhoneNumber(msg.key.remoteJid);
if (msg.key.remoteJid.indexOf('@g.us') > -1) {
const metadata = await waSocket.groupMetadata(msg.key.remoteJid);
console.log('群: ' + metadata.subject + ', description: ' + metadata.desc);
try {
const ppUrl = await waSocket.profilePictureUrl(msg.key.remoteJid);
console.log('群头像: ' + ppUrl);
} catch (ex) {
console.error('群头像出错了: ', ex);
}
} else {
console.log('remoteJid: ', msg.key.remoteJid);
try {
const ppUrl = await waSocket.profilePictureUrl(msg.key.remoteJid);
console.log('个人头像: ' + ppUrl);
} catch (ex) {
console.error('个人头像出错了: ', ex);
}
try {
const ppUrl = await waSocket.profilePictureUrl(msg.key.remoteJid);
console.log('头像: ' + ppUrl);
} catch (ex) {
console.error('头像出错: ', ex);
}
if (msg.message?.conversation || msg.message?.extendedTextMessage?.text) {
@ -200,7 +163,7 @@ const createWhatsApp = async phone => {
} else if (text.indexOf('文本') > -1) {
sendTextMessage(fromWhatsAppNo, '这是文本消息：' + new Date().toString());
} else if (text.indexOf('发群') > -1) {
sendTextMessage('120363335516526642@g.us', '这是群消息：' + new Date().toString());
sendTextMessage('120363363417115199@g.us', '这是群消息：' + new Date().toString());
}
if (msg.key.fromMe) {
@ -223,6 +186,7 @@ const createWhatsApp = async phone => {
waEmitter.emit('message:received', {
id: msg.key.id,
status: '',
direction: 'inbound',
from: fromWhatsAppNo,
to: whatsAppNo,
type: 'text',

Write Preview
Loading…
Cancel
Save