diff --git a/src/controllers/channelController.js b/src/controllers/channelController.js index e9f7c7b..a008558 100644 --- a/src/controllers/channelController.js +++ b/src/controllers/channelController.js @@ -45,7 +45,7 @@ const getClassInfo = async (req, res) => { } res.json({ success: true, channel: chat }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -137,7 +137,7 @@ const sendMessage = async (req, res) => { } res.json({ success: true, message: messageOut }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -196,7 +196,7 @@ const fetchMessages = async (req, res) => { const messages = Object.keys(searchOptions).length ? await chat.fetchMessages(searchOptions) : await chat.fetchMessages() res.json({ success: true, messages }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -244,7 +244,7 @@ const sendSeen = async (req, res) => { const result = await chat.sendSeen() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -292,7 +292,7 @@ const mute = async (req, res) => { const result = await chat.mute() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -340,7 +340,7 @@ const unmute = async (req, res) => { const result = await chat.unmute() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -393,7 +393,7 @@ const setSubject = async (req, res) => { const result = await chat.setSubject(newSubject) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -441,7 +441,7 @@ const acceptChannelAdminInvite = async (req, res) => { const result = await chat.acceptChannelAdminInvite() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -499,7 +499,7 @@ const sendChannelAdminInvite = async (req, res) => { const result = options ? await chat.sendChannelAdminInvite(userId, options) : await chat.sendChannelAdminInvite(userId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -552,7 +552,7 @@ const demoteChannelAdmin = async (req, res) => { const result = await chat.demoteChannelAdmin(userId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -611,7 +611,7 @@ const transferChannelOwnership = async (req, res) => { const result = options ? await chat.transferChannelOwnership(newOwnerId, options) : await chat.transferChannelOwnership(newOwnerId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -664,7 +664,7 @@ const revokeChannelAdminInvite = async (req, res) => { const result = await chat.revokeChannelAdminInvite(userId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -717,7 +717,7 @@ const getSubscribers = async (req, res) => { const result = await chat.getSubscribers(limit) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -765,7 +765,7 @@ const deleteChannel = async (req, res) => { const result = await chat.deleteChannel() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -819,7 +819,7 @@ const setReactionSetting = async (req, res) => { const result = await chat.setReactionSetting(reactionCode) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -872,7 +872,7 @@ const setDescription = async (req, res) => { const result = await chat.setDescription(newDescription) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -946,7 +946,7 @@ const setProfilePicture = async (req, res) => { const result = await chat.setProfilePicture(messageMedia) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } diff --git a/src/controllers/chatController.js b/src/controllers/chatController.js index 6b9275c..04dfa66 100644 --- a/src/controllers/chatController.js +++ b/src/controllers/chatController.js @@ -27,7 +27,7 @@ const getClassInfo = async (req, res) => { } res.json({ success: true, chat }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -58,7 +58,7 @@ const clearMessages = async (req, res) => { const result = await chat.clearMessages() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -89,7 +89,7 @@ const clearState = async (req, res) => { const result = await chat.clearState() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -121,7 +121,7 @@ const deleteChat = async (req, res) => { const result = await chat.delete() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -176,7 +176,7 @@ const fetchMessages = async (req, res) => { const messages = Object.keys(searchOptions).length ? await chat.fetchMessages(searchOptions) : await chat.fetchMessages() res.json({ success: true, messages }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -206,7 +206,7 @@ const getContact = async (req, res) => { const contact = await chat.getContact() res.json({ success: true, contact }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -238,7 +238,7 @@ const sendStateRecording = async (req, res) => { const result = await chat.sendStateRecording() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -270,7 +270,7 @@ const sendStateTyping = async (req, res) => { const result = await chat.sendStateTyping() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -301,7 +301,7 @@ const sendSeen = async (req, res) => { const result = await chat.sendSeen() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -332,7 +332,7 @@ const markUnread = async (req, res) => { const result = await chat.markUnread() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -363,7 +363,7 @@ const syncHistory = async (req, res) => { const result = await chat.syncHistory() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -395,7 +395,7 @@ const getLabels = async (req, res) => { const labels = await chat.getLabels() res.json({ success: true, labels }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -444,7 +444,7 @@ const changeLabels = async (req, res) => { await chat.changeLabels(labelIds) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -504,7 +504,7 @@ const runMethod = async (req, res) => { const result = options ? await chat[method](options) : await chat[method]() res.json({ success: true, data: result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } diff --git a/src/controllers/clientController.js b/src/controllers/clientController.js index d13f298..429dfd5 100644 --- a/src/controllers/clientController.js +++ b/src/controllers/clientController.js @@ -111,7 +111,7 @@ const sendMessage = async (req, res) => { } res.json({ success: true, message: messageOut }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -134,7 +134,7 @@ const getClassInfo = (req, res) => { const sessionInfo = client.info res.json({ success: true, sessionInfo }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -173,7 +173,7 @@ const isRegisteredUser = async (req, res) => { const result = await client.isRegisteredUser(number) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -213,7 +213,7 @@ const getNumberId = async (req, res) => { const result = await client.getNumberId(number) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -268,7 +268,7 @@ const createGroup = async (req, res) => { } res.json({ success: true, response }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -307,7 +307,7 @@ const setStatus = async (req, res) => { await client.setStatus(status) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -329,7 +329,7 @@ const getContacts = async (req, res) => { const contacts = await client.getContacts() res.json({ success: true, contacts }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -356,7 +356,7 @@ const getChats = async (req, res) => { 'application/json': { schema: { "$ref": "#/definitions/GetChatsResponse" } } - } + } } */ try { @@ -364,7 +364,7 @@ const getChats = async (req, res) => { const chats = await client.getChats() res.json({ success: true, chats }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -423,7 +423,7 @@ const getChatsWithSearch = async (req, res) => { const chats = await client.getChats(searchOptions) res.json({ success: true, chats }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -462,7 +462,7 @@ const getProfilePictureUrl = async (req, res) => { const result = await client.getProfilePicUrl(contactId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -502,7 +502,7 @@ const acceptInvite = async (req, res) => { const acceptInvite = await client.acceptInvite(inviteCode) res.json({ success: true, acceptInvite }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -527,7 +527,7 @@ const getWWebVersion = async (req, res) => { const result = await client.getWWebVersion() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -567,7 +567,7 @@ const archiveChat = async (req, res) => { const result = await client.archiveChat(chatId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -591,7 +591,7 @@ const getBlockedContacts = async (req, res) => { const blockedContacts = await client.getBlockedContacts() res.json({ success: true, blockedContacts }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -633,7 +633,7 @@ const getChatById = async (req, res) => { } res.json({ success: true, chat }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -672,7 +672,7 @@ const getChatLabels = async (req, res) => { const chatLabels = await client.getChatLabels(chatId) res.json({ success: true, chatLabels }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -711,7 +711,7 @@ const getChatsByLabelId = async (req, res) => { const chats = await client.getChatsByLabelId(labelId) res.json({ success: true, chats }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -750,7 +750,7 @@ const getCommonGroups = async (req, res) => { const groups = await client.getCommonGroups(contactId) res.json({ success: true, groups }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -788,7 +788,7 @@ const getContactById = async (req, res) => { const contact = await client.getContactById(contactId) res.json({ success: true, contact }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -827,7 +827,7 @@ const getInviteInfo = async (req, res) => { const inviteInfo = await client.getInviteInfo(inviteCode) res.json({ success: true, inviteInfo }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -866,7 +866,7 @@ const getLabelById = async (req, res) => { const label = await client.getLabelById(labelId) res.json({ success: true, label }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -889,7 +889,7 @@ const getLabels = async (req, res) => { const labels = await client.getLabels() res.json({ success: true, labels }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -930,7 +930,7 @@ const addOrRemoveLabels = async (req, res) => { await client.addOrRemoveLabels(labelIds, chatIds) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -953,7 +953,7 @@ const getState = async (req, res) => { const state = await client.getState() res.json({ success: true, state }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -992,7 +992,7 @@ const markChatUnread = async (req, res) => { await client.markChatUnread(chatId) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1042,7 +1042,7 @@ const muteChat = async (req, res) => { } res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1081,7 +1081,7 @@ const pinChat = async (req, res) => { const result = await client.pinChat(chatId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } /** @@ -1130,7 +1130,7 @@ const searchMessages = async (req, res) => { } res.json({ success: true, messages }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1153,7 +1153,7 @@ const sendPresenceAvailable = async (req, res) => { await client.sendPresenceAvailable() res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1176,7 +1176,7 @@ const sendPresenceUnavailable = async (req, res) => { await client.sendPresenceUnavailable() res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1214,7 +1214,7 @@ const sendSeen = async (req, res) => { const result = await client.sendSeen(chatId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1253,7 +1253,7 @@ const setDisplayName = async (req, res) => { const result = await client.setDisplayName(displayName) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1291,7 +1291,7 @@ const unarchiveChat = async (req, res) => { const result = await client.unarchiveChat(chatId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1330,7 +1330,7 @@ const unmuteChat = async (req, res) => { const result = await client.unmuteChat(chatId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1369,7 +1369,7 @@ const unpinChat = async (req, res) => { const result = await client.unpinChat(chatId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1413,7 +1413,7 @@ const setProfilePicture = async (req, res) => { const result = await client.setProfilePicture(media) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1434,7 +1434,7 @@ const deleteProfilePicture = async (req, res) => { const result = await client.deleteProfilePicture() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1469,7 +1469,7 @@ const setAutoDownloadAudio = async (req, res) => { await client.setAutoDownloadAudio(flag) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1504,7 +1504,7 @@ const setAutoDownloadDocuments = async (req, res) => { await client.setAutoDownloadDocuments(flag) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1539,7 +1539,7 @@ const setAutoDownloadPhotos = async (req, res) => { await client.setAutoDownloadPhotos(flag) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1574,7 +1574,7 @@ const setAutoDownloadVideos = async (req, res) => { await client.setAutoDownloadVideos(flag) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1613,7 +1613,7 @@ const syncHistory = async (req, res) => { const result = await client.syncHistory(chatId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1653,7 +1653,7 @@ const getContactDeviceCount = async (req, res) => { const result = await client.getContactDeviceCount(userId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1692,7 +1692,7 @@ const getCountryCode = async (req, res) => { const result = await client.getCountryCode(number) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1731,7 +1731,7 @@ const getFormattedNumber = async (req, res) => { const result = await client.getFormattedNumber(number) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1770,7 +1770,7 @@ const openChatWindow = async (req, res) => { await client.interface.openChatWindow(chatId) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1809,7 +1809,7 @@ const openChatWindowAt = async (req, res) => { await client.interface.openChatWindowAt(messageId) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1834,7 +1834,7 @@ const resetState = async (req, res) => { await client.resetState() res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1874,7 +1874,7 @@ const setBackgroundSync = async (req, res) => { await client.setBackgroundSync(flag) res.json({ success: true }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1917,7 +1917,7 @@ const getContactLidAndPhone = async (req, res) => { const result = await client.getContactLidAndPhone(userIds) res.json({ success: true, data: result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1942,7 +1942,7 @@ const getChannels = async (req, res) => { const result = await client.getChannels() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -1990,7 +1990,7 @@ const createChannel = async (req, res) => { const result = options ? await client.createChannel(title, options) : await client.createChannel(title) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -2028,7 +2028,7 @@ const subscribeToChannel = async (req, res) => { const result = await client.subscribeToChannel(channelId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -2075,7 +2075,7 @@ const unsubscribeFromChannel = async (req, res) => { const result = options ? await client.unsubscribeFromChannel(channelId, options) : await client.unsubscribeFromChannel(channelId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -2137,7 +2137,7 @@ const searchChannels = async (req, res) => { const foundChannels = await client.searchChannels(searchOptions) res.json({ success: true, result: foundChannels }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -2175,7 +2175,7 @@ const getChannelByInviteCode = async (req, res) => { const result = await client.getChannelByInviteCode(inviteCode) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -2219,12 +2219,12 @@ const runMethod = async (req, res) => { const { method, options } = req.body const client = sessions.get(req.params.sessionId) if (typeof client[method] !== 'function') { - throw new Error('Method is not implemented') + throw new Error(`Method ${method} is not implemented`) } const result = options ? await client[method](options) : await client[method]() res.json({ success: true, data: result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } diff --git a/src/controllers/contactController.js b/src/controllers/contactController.js index 56a2b3a..13a10e7 100644 --- a/src/controllers/contactController.js +++ b/src/controllers/contactController.js @@ -26,7 +26,7 @@ const getClassInfo = async (req, res) => { } res.json({ success: true, contact }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -56,7 +56,7 @@ const block = async (req, res) => { const result = await contact.block() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -87,7 +87,7 @@ const getAbout = async (req, res) => { const result = await contact.getAbout() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -118,7 +118,7 @@ const getChat = async (req, res) => { const result = await contact.getChat() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -149,7 +149,7 @@ const getFormattedNumber = async (req, res) => { const result = await contact.getFormattedNumber() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -180,7 +180,7 @@ const getCountryCode = async (req, res) => { const result = await contact.getCountryCode() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -211,7 +211,7 @@ const getProfilePicUrl = async (req, res) => { const result = await contact.getProfilePicUrl() || null res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -242,7 +242,7 @@ const unblock = async (req, res) => { const result = await contact.unblock() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -273,7 +273,7 @@ const getCommonGroups = async (req, res) => { const result = await contact.getCommonGroups() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } diff --git a/src/controllers/groupChatController.js b/src/controllers/groupChatController.js index 6039f63..7f0dfec 100644 --- a/src/controllers/groupChatController.js +++ b/src/controllers/groupChatController.js @@ -25,7 +25,7 @@ const getClassInfo = async (req, res) => { if (!chat.isGroup) { throw new Error('The chat is not a group') } res.json({ success: true, chat }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -79,7 +79,7 @@ const addParticipants = async (req, res) => { const result = Object.keys(options).length ? await chat.addParticipants(participantIdsArray, options) : await chat.addParticipants(participantIdsArray) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -127,7 +127,7 @@ const removeParticipants = async (req, res) => { const result = await chat.removeParticipants(participantIdsArray) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -175,7 +175,7 @@ const promoteParticipants = async (req, res) => { const result = await chat.promoteParticipants(participantIdsArray) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -223,7 +223,7 @@ const demoteParticipants = async (req, res) => { const result = await chat.demoteParticipants(participantIdsArray) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -250,7 +250,7 @@ const getInviteCode = async (req, res) => { const inviteCode = await chat.getInviteCode() res.json({ success: true, inviteCode }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -294,7 +294,7 @@ const setSubject = async (req, res) => { const result = await chat.setSubject(subject) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -338,7 +338,7 @@ const setDescription = async (req, res) => { const result = await chat.setDescription(description) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -364,7 +364,7 @@ const leave = async (req, res) => { const result = await chat.leave() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -393,7 +393,7 @@ const revokeInvite = async (req, res) => { const result = await chat.revokeInvite() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -442,7 +442,7 @@ const setInfoAdminsOnly = async (req, res) => { const result = await chat.setInfoAdminsOnly(adminsOnly) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -491,7 +491,7 @@ const setMessagesAdminsOnly = async (req, res) => { const result = await chat.setMessagesAdminsOnly(adminsOnly) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -540,7 +540,7 @@ const setPicture = async (req, res) => { const result = await chat.setPicture(media) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -565,7 +565,7 @@ const deletePicture = async (req, res) => { const result = await chat.deletePicture() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -590,7 +590,7 @@ const getGroupMembershipRequests = async (req, res) => { const result = await chat.getGroupMembershipRequests() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -633,7 +633,7 @@ const approveGroupMembershipRequests = async (req, res) => { const result = await chat.approveGroupMembershipRequests(options) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -676,7 +676,7 @@ const rejectGroupMembershipRequests = async (req, res) => { const result = await chat.rejectGroupMembershipRequests(options) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -733,7 +733,7 @@ const runMethod = async (req, res) => { const result = options ? await chat[method](options) : await chat[method]() res.json({ success: true, data: result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } diff --git a/src/controllers/healthController.js b/src/controllers/healthController.js index ee00a39..64a86d7 100644 --- a/src/controllers/healthController.js +++ b/src/controllers/healthController.js @@ -1,7 +1,6 @@ const fsp = require('fs').promises const qrcode = require('qrcode-terminal') const { sessionFolderPath } = require('../config') -const { sendErrorResponse } = require('../utils') const { logger } = require('../logger') /** @@ -78,8 +77,8 @@ const localCallbackExample = async (req, res) => { } } */ - logger.error(error, 'Failed to handle local callback') - sendErrorResponse(res, 500, error.message) + logger.error({ err: error }, 'Failed to handle local callback') + res.status(500).json({ success: false, error: error.message }) } } diff --git a/src/controllers/messageController.js b/src/controllers/messageController.js index f12a411..22e8268 100644 --- a/src/controllers/messageController.js +++ b/src/controllers/messageController.js @@ -41,7 +41,7 @@ const getClassInfo = async (req, res) => { if (!message) { throw new Error('Message not found') } res.json({ success: true, message }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -97,7 +97,7 @@ const deleteMessage = async (req, res) => { const result = await message.delete(everyone, clearMedia) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -126,7 +126,7 @@ const downloadMedia = async (req, res) => { const messageMedia = await message.downloadMedia() res.json({ success: true, messageMedia }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -174,7 +174,7 @@ const downloadMediaAsData = async (req, res) => { }) readableStream.pipe(res) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -226,7 +226,7 @@ const forward = async (req, res) => { const result = await message.forward(destinationChatId) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -255,7 +255,7 @@ const getInfo = async (req, res) => { const info = await message.getInfo() res.json({ success: true, info }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -285,7 +285,7 @@ const getMentions = async (req, res) => { const contacts = await message.getMentions() res.json({ success: true, contacts }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -315,7 +315,7 @@ const getOrder = async (req, res) => { const order = await message.getOrder() res.json({ success: true, order }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -345,7 +345,7 @@ const getPayment = async (req, res) => { const payment = await message.getPayment() res.json({ success: true, payment }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -375,7 +375,7 @@ const getQuotedMessage = async (req, res) => { const quotedMessage = await message.getQuotedMessage() res.json({ success: true, quotedMessage }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -429,7 +429,7 @@ const react = async (req, res) => { const result = await message.react(reaction) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -522,7 +522,7 @@ const reply = async (req, res) => { const contactId = content.contactId.endsWith('@c.us') || content.contactId.endsWith('@lid') ? content.contactId - : `${content.contactId}@c.us`; + : `${content.contactId}@c.us` contentMessage = await client.getContactById(contactId) break } @@ -538,7 +538,7 @@ const reply = async (req, res) => { const repliedMessage = await message.reply(contentMessage, chatId, options) res.json({ success: true, repliedMessage }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -566,7 +566,7 @@ const star = async (req, res) => { const result = await message.star() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -594,7 +594,7 @@ const unstar = async (req, res) => { const result = await message.unstar() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -622,7 +622,7 @@ const getReactions = async (req, res) => { const result = await message.getReactions() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -650,7 +650,7 @@ const getGroupMentions = async (req, res) => { const result = await message.getGroupMentions() res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -704,7 +704,7 @@ const edit = async (req, res) => { const editedMessage = await message.edit(content, options) res.json({ success: true, message: editedMessage }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -732,7 +732,7 @@ const getContact = async (req, res) => { const contact = await message.getContact() res.json({ success: true, contact }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } @@ -761,11 +761,10 @@ const getPollVotes = async (req, res) => { const votes = await message.getPollVotes() res.json({ success: true, votes }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } - /** * Executes a method on the message associated with the given sessionId. * @@ -824,7 +823,7 @@ const runMethod = async (req, res) => { const result = options ? await message[method](options) : await message[method]() res.json({ success: true, data: result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + sendErrorResponse(res, 500, error) } } diff --git a/src/controllers/sessionController.js b/src/controllers/sessionController.js index ff0c40a..b392646 100644 --- a/src/controllers/sessionController.js +++ b/src/controllers/sessionController.js @@ -47,7 +47,7 @@ const startSession = async (req, res) => { res.json({ success: true, message: setupSessionReturn.message }) } catch (error) { logger.error({ sessionId, err: error }, 'Failed to start session') - sendErrorResponse(res, 500, error.message) + res.status(500).json({ success: false, error: error.message }) } } @@ -80,7 +80,7 @@ const stopSession = async (req, res) => { res.json({ success: true, message: 'Session stopped successfully' }) } catch (error) { logger.error({ sessionId, err: error }, 'Failed to stop session') - sendErrorResponse(res, 500, error.message) + res.status(500).json({ success: false, error: error.message }) } } @@ -113,7 +113,7 @@ const statusSession = async (req, res) => { res.json(sessionData) } catch (error) { logger.error({ sessionId, err: error }, 'Failed to get session status') - sendErrorResponse(res, 500, error.message) + res.status(500).json({ success: false, error: error.message }) } } @@ -145,7 +145,7 @@ const sessionQrCode = async (req, res) => { return res.json({ success: false, message: 'qr code not ready or already scanned' }) } catch (error) { logger.error({ sessionId, err: error }, 'Failed to get session qr code') - sendErrorResponse(res, 500, error.message) + res.status(500).json({ success: false, error: error.message }) } } @@ -188,7 +188,7 @@ const sessionQrCodeImage = async (req, res) => { return res.json({ success: false, message: 'qr code not ready or already scanned' }) } catch (error) { logger.error({ sessionId, err: error }, 'Failed to get session qr code image') - sendErrorResponse(res, 500, error.message) + res.status(500).json({ success: false, error: error.message }) } } @@ -225,7 +225,7 @@ const restartSession = async (req, res) => { res.json({ success: true, message: 'Restarted successfully' }) } catch (error) { logger.error({ sessionId, err: error }, 'Failed to restart session') - sendErrorResponse(res, 500, error.message) + res.status(500).json({ success: false, error: error.message }) } } @@ -262,7 +262,7 @@ const terminateSession = async (req, res) => { res.json({ success: true, message: 'Logged out successfully' }) } catch (error) { logger.error({ sessionId, err: error }, 'Failed to terminate session') - sendErrorResponse(res, 500, error.message) + res.status(500).json({ success: false, error: error.message }) } } @@ -292,8 +292,8 @@ const terminateInactiveSessions = async (req, res) => { */ res.json({ success: true, message: 'Flush completed successfully' }) } catch (error) { - logger.error(error, 'Failed to terminate inactive sessions') - sendErrorResponse(res, 500, error.message) + logger.error({ err: error }, 'Failed to terminate inactive sessions') + res.status(500).json({ success: false, error: error.message }) } } @@ -323,8 +323,8 @@ const terminateAllSessions = async (req, res) => { */ res.json({ success: true, message: 'Flush completed successfully' }) } catch (error) { - logger.error(error, 'Failed to terminate all sessions') - sendErrorResponse(res, 500, error.message) + logger.error({ err: error }, 'Failed to terminate all sessions') + res.status(500).json({ success: false, error: error.message }) } } @@ -363,9 +363,10 @@ const requestPairingCode = async (req, res) => { }, } */ + const sessionId = req.params.sessionId try { const { phoneNumber, showNotification = true } = req.body - const client = sessions.get(req.params.sessionId) + const client = sessions.get(sessionId) if (!client) { return res.json({ success: false, message: 'session_not_found' }) } @@ -377,7 +378,8 @@ const requestPairingCode = async (req, res) => { const result = await client.requestPairingCode(phoneNumber, showNotification) res.json({ success: true, result }) } catch (error) { - sendErrorResponse(res, 500, error.message) + logger.error({ sessionId, err: error }, 'Failed to request pairing code') + res.status(500).json({ success: false, error: error.message }) } } @@ -449,7 +451,7 @@ const getPageScreenshot = async (req, res) => { res.end() } catch (error) { logger.error({ sessionId, err: error }, 'Failed to get page screenshot') - sendErrorResponse(res, 500, error.message) + res.status(500).json({ success: false, error: error.message }) } } diff --git a/src/utils.js b/src/utils.js index f1001a6..4f5a6de 100644 --- a/src/utils.js +++ b/src/utils.js @@ -15,7 +15,11 @@ const triggerWebhook = (webhookURL, sessionId, dataType, data) => { } // Function to send a response with error status and message -const sendErrorResponse = (res, status, message) => { +const sendErrorResponse = (res, status, error) => { + const message = error instanceof Error ? error.message : error + if (error instanceof Error) { + logger.error({ err: error }, message) + } res.status(status).json({ success: false, error: message }) }