From 5977ec23519d742f32b8d9a3159685176dbed561 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Fri, 20 Dec 2024 16:47:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95:=20qrcode,=20send=20text?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wai-server/api/channels/call.controller.js | 67 ------------- wai-server/api/channels/channel.controller.js | 93 ++++++++++--------- wai-server/api/channels/channel.routes.js | 12 +-- wai-server/api/messages/message.controller.js | 71 +++++--------- wai-server/api/messages/message.routes.js | 5 +- wai-server/core/index.js | 4 +- wai-server/core/websocket/services/session.js | 5 +- wai-server/index.js | 11 +-- 8 files changed, 88 insertions(+), 180 deletions(-) delete mode 100644 wai-server/api/channels/call.controller.js diff --git a/wai-server/api/channels/call.controller.js b/wai-server/api/channels/call.controller.js deleted file mode 100644 index 2b19fa7..0000000 --- a/wai-server/api/channels/call.controller.js +++ /dev/null @@ -1,67 +0,0 @@ -const { websocketService, websocketManager } = require('../../core'); // Import from core/index.js -const generateId = require('../../utils/generateId.util'); -// const { createConnection, getConnection } = require('../../core/whatsapp/connection'); -// const { getAvailableConnection } = require('../../core/whatsapp/sessionStore'); - -exports.newConnect = async ctx => { - // try { - // const socketId = generateId(); - // const { qr } = await createConnection(socketId); // Await the Promise here - // return { socketId, qr, message: 'Connection initiated. QR code provided.' }; // Return the QR code - // } catch (error) { - // console.error('create connection error', error); - // ctx.assert(null, 500, 'Failed to create connection or generate QR code.'); - // } -}; - -exports.getIn = async ctx => { - // Wait for at least one connection to be established (or handle the case where no connections are available) - // await new Promise(resolve => { - // const checkConnections = () => { - // if (websocketManager.getConnections().length > 0) { - // resolve(); - // } else { - // setTimeout(checkConnections, 100); // Check again after 100ms - // } - // }; - // checkConnections(); - // }); - - const availableWs = websocketManager.getAvailableConnection(); - - if (!availableWs) { - // ctx.status = 503; - // ctx.body = { message: 'No available connections' }; - ctx.assert(availableWs, 503, 'No available connections'); - return; - } - // return availableWs; - - const { sessionId, url } = websocketService.createSession(availableWs); - return { sessionId, url, message: 'Connection established' }; // availableWs -}; - -exports.sendMsg = ctx => { - const { sessionId, message } = ctx.request.body; - if (!sessionId || !message) { - // ctx.status = 400; - // ctx.body = { message: 'Session ID and message are required' }; - ctx.assert(sessionId, 400, 'Session ID and message are required'); - return; - } - const wsToSend = websocketService.getSession(sessionId); - if (!wsToSend) { - // ctx.status = 404; - // ctx.body = { message: 'Session not found' }; - ctx.assert(wsToSend, 400, 'Session not found'); - return; - } - try { - wsToSend.send(message); - ctx.body = { message: 'Message sent' }; - } catch (error) { - console.error('Error sending message:', error); - ctx.status = 500; - ctx.body = { message: 'Failed to send message' }; - } -}; diff --git a/wai-server/api/channels/channel.controller.js b/wai-server/api/channels/channel.controller.js index 2c250b6..7d0c095 100644 --- a/wai-server/api/channels/channel.controller.js +++ b/wai-server/api/channels/channel.controller.js @@ -1,52 +1,57 @@ -'use strict'; - +const { websocketService, websocketManager, createWhatsApp } = require('../../core'); // Import from core/index.js const generateId = require('../../utils/generateId.util'); +// const { createConnection, getConnection } = require('../../core/whatsapp/connection'); +// const { getAvailableConnection } = require('../../core/whatsapp/sessionStore'); -/** - * Mock database, replace this with your db models import, required to perform query to your database. - */ -const db = { - channels: [ - { - channelId: 1, - phone: 'string', - formattedPhone: 'string', - profilePicture: 'string', - name: 'string', - connectStatus: 'string', - channelStatus: 'string', - createTime: 0, - }, - ], -}; -function sleep(ms) { - return new Promise(resolve => setTimeout(resolve, ms)); -} -exports.qrcode = async ctx => { - return `data:image/png;base64,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`; -}; -exports.getOne = async ctx => { - const { id } = ctx.params; - const channel = db.channels.find(channel => channel.channelId === Number(id)); - await sleep(500); - ctx.assert(channel, 200, "The requested channel doesn't exist"); - return channel; +exports.newConnect = async ctx => { + try { + const { phone } = ctx.query; + // return phone; + const connectId = generateId(); + const whatsApp1 = await createWhatsApp(connectId, phone); + ctx.assert(whatsApp1, 503, 'No available connections'); + const { sessionId } = websocketService.createSession(phone, whatsApp1); + return { sessionId, whatsApp1 }; + } catch (error) { + console.error('create connection error', error); + ctx.assert(null, 500, 'Failed to create connection or generate QR code.'); + + // const wa = findConnection('from'); + // wa.senedTextMessage(to, text); + } }; exports.getAll = async ctx => { - return db.channels; + const sessions = websocketService.sessions; + return Array.from(sessions); }; -exports.createOne = async ctx => { - const { name } = ctx.request.body; - ctx.assert(name, 200, 'The channel info is malformed!'); - const id = generateId(); - const newChannel = { - id, - name, - timestamp: Date.now(), - }; - db.channels.push(newChannel); - const createdChannel = db.channels.find(channel => channel.id === id); - return createdChannel; +/** + * @deprecated + */ +exports.getIn = async ctx => { + // Wait for at least one connection to be established (or handle the case where no connections are available) + // await new Promise(resolve => { + // const checkConnections = () => { + // if (websocketManager.getConnections().length > 0) { + // resolve(); + // } else { + // setTimeout(checkConnections, 100); // Check again after 100ms + // } + // }; + // checkConnections(); + // }); + + const availableWs = websocketManager.getAvailableConnection(); + + if (!availableWs) { + // ctx.status = 503; + // ctx.body = { message: 'No available connections' }; + ctx.assert(availableWs, 503, 'No available connections'); + return; + } + // return availableWs; + + const { sessionId, url } = websocketService.createSession(availableWs); + return { sessionId, url, message: 'Connection established' }; // availableWs }; diff --git a/wai-server/api/channels/channel.routes.js b/wai-server/api/channels/channel.routes.js index 9bfb760..8ea4d89 100644 --- a/wai-server/api/channels/channel.routes.js +++ b/wai-server/api/channels/channel.routes.js @@ -1,7 +1,7 @@ 'use strict'; +// const controller = require('./channel.controller.js.bak'); const controller = require('./channel.controller'); -const callController = require('./call.controller'); module.exports = Router => { const router = new Router({ @@ -9,12 +9,12 @@ module.exports = Router => { }); router - .get('/qrcode', callController.newConnect) - .get('/qrcode0', callController.getIn) + .get('/qrcode', controller.newConnect) + // .get('/qrcode0', callController.getIn) // .get('/qrcode', controller.qrcode) - .get('/:id', controller.getOne) - .get('/', controller.getAll) - .post('/', controller.createOne); + // .get('/:id', controller.getOne) + .get('/', controller.getAll); + // .post('/', controller.createOne) // router.post('/get-in', callController.getIn); // router.post('/send-msg', callController.sendMsg); diff --git a/wai-server/api/messages/message.controller.js b/wai-server/api/messages/message.controller.js index 47c553b..533d21e 100644 --- a/wai-server/api/messages/message.controller.js +++ b/wai-server/api/messages/message.controller.js @@ -1,62 +1,37 @@ 'use strict'; const generateId = require('../../utils/generateId.util'); +const { websocketService, websocketManager, createWhatsApp } = require('../../core'); -/** - * Mock database, replace this with your db models import, required to perform query to your database. - */ -const db = { - users: [ - { - id: 'bff28903-042e-47c2-b9ee-07c3954989ec', - name: 'Marco', - created_at: 1558536830937, - }, - { - id: 'dca01a32-36e6-4886-af75-8e7caa0162a9', - name: 'Leonardo', - created_at: 1558536843742, - }, - { - id: 'dca01a32-36e6-4886-af75-8e7caa0162a9', - name: 'Berta', - created_at: 1558536863550, - }, - ], -}; function sleep(ms) { return new Promise(resolve => setTimeout(resolve, ms)); } -exports.getOne = async ctx => { - const { id } = ctx.params; - const user = db.users.find(user => user.id === id); - await sleep(500); - ctx.assert(user, 404, "The requested user doesn't exist"); - return user; -}; - -exports.getAll = async ctx => { - return db.users; -}; -exports.createOne = async ctx => { - const { name } = ctx.request.body; - ctx.assert(name, 400, 'The user info is malformed!'); - const id = generateId(); - const newUser = { - id, - name, - timestamp: Date.now(), - }; - db.users.push(newUser); - const createdUser = db.users.find(user => user.id === id); - return createdUser; -}; - -exports.sendText = async ctx => { +exports.sendText111 = async ctx => { const { type } = ctx.params; const body = ctx.request.body; ctx.assert(null, 400, `debug: content: {${type}} {${body.content}}`); ctx.assert(null, 400, 'The message info is malformed!'); return body; }; + +exports.sendText = ctx => { + const { from, to, content } = ctx.request.body; + if (!from || !content) { + ctx.assert(from, 400, 'From and message are required'); + return; + } + const wsToSend = websocketService.getSession(from); + if (!wsToSend) { + ctx.assert(wsToSend, 400, 'Session not found'); // 404 + return; + } + // return wsToSend; + try { + wsToSend.sendTextMessage(to, content); + return { wsToSend, ret: 'Message sent successfully' }; + } catch (error) { + console.error('Error sending message:', error); + ctx.assert(null, 500, 'Failed to send message'); + } +}; diff --git a/wai-server/api/messages/message.routes.js b/wai-server/api/messages/message.routes.js index 0561e27..cde3508 100644 --- a/wai-server/api/messages/message.routes.js +++ b/wai-server/api/messages/message.routes.js @@ -7,10 +7,7 @@ module.exports = Router => { prefix: `/messages`, }); - router - .get('/:id', controller.getOne) - .get('/', controller.getAll) - .post('/:type', controller.sendText); + router.post('/:type', controller.sendText); return router; }; diff --git a/wai-server/core/index.js b/wai-server/core/index.js index 891eaf1..fbdabc9 100644 --- a/wai-server/core/index.js +++ b/wai-server/core/index.js @@ -98,8 +98,8 @@ const createWhatsApp = async (channelId, phone) => { status: 'connecting', channelId : channelId, phone: phone, - ...sendTextMessage, - ...sendImageMessage + sendTextMessage, + sendImageMessage }) } }) diff --git a/wai-server/core/websocket/services/session.js b/wai-server/core/websocket/services/session.js index b3744ee..ecdcfb7 100644 --- a/wai-server/core/websocket/services/session.js +++ b/wai-server/core/websocket/services/session.js @@ -3,10 +3,9 @@ const generateId = require('../../../utils/generateId.util'); module.exports = () => { const sessions = new Map(); - const createSession = ws => { - const sessionId = generateId(); + const createSession = (sessionId, ws) => { sessions.set(ws, sessionId); - return { sessionId, url: ws.url }; + return { sessionId }; }; const getSession = sessionId => { diff --git a/wai-server/index.js b/wai-server/index.js index e13bf90..5de96ee 100644 --- a/wai-server/index.js +++ b/wai-server/index.js @@ -4,13 +4,13 @@ const http = require('http'); const server = require('./server'); const { port } = require('./config').server; -const { websocketService, websocketManager, createWhatsApp } = require('./core'); +const { createWhatsApp } = require('./core'); async function bootstrap() { - const whatsApp1 = await createWhatsApp('channel_001', '8618777396951') - console.info(whatsApp1) - const whatsApp2 = await createWhatsApp('channel_002', '8613557032060') - console.info(whatsApp2) + // const whatsApp1 = await createWhatsApp('channel_001', '8618777396951'); + // console.info(whatsApp1); + // const whatsApp2 = await createWhatsApp('channel_002', '8613557032060'); + // console.info(whatsApp2); /** * Add external services init as async operations (db, redis, etc...) * e.g. @@ -22,7 +22,6 @@ async function bootstrap() { bootstrap() .then(server => { console.log(`🚀 Server listening on port ${server.address().port}!`); - // websocketManager.connect(); // connect websocket after server start }) .catch(err => { setImmediate(() => {