@peopl-health/nexus 2.5.4 → 2.5.5-message-tracking
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -349,10 +349,42 @@ const getLastInteractionController = async (req, res) => {
|
|
|
349
349
|
}
|
|
350
350
|
};
|
|
351
351
|
|
|
352
|
+
const checkScheduledMessageStatusController = async (req, res) => {
|
|
353
|
+
const { contentSid, code } = req.query;
|
|
354
|
+
if (!contentSid || !code) return res.status(400).send({ message: 'contentSid and code are required' });
|
|
355
|
+
if (!ensureDependency(res, dependencies.ScheduledMessage, 'ScheduledMessage model not configured.')) return;
|
|
356
|
+
|
|
357
|
+
try {
|
|
358
|
+
const msg = await dependencies.ScheduledMessage.findOne({ contentSid, code: normalizeCode(code) });
|
|
359
|
+
if (!msg) return res.status(404).send({ message: 'ScheduledMessage not found' });
|
|
360
|
+
return res.status(200).send({ message: 'ScheduledMessage status retrieved successfully.', sent: msg?.status === 'sent', status: msg?.status || null });
|
|
361
|
+
} catch (error) {
|
|
362
|
+
logger.error('Error checking scheduled message status:', error);
|
|
363
|
+
return res.status(500).send({ message: 'Failed to check scheduled message status', error });
|
|
364
|
+
}
|
|
365
|
+
};
|
|
366
|
+
|
|
367
|
+
const checkMessageStatusController = async (req, res) => {
|
|
368
|
+
const { contentSid, code } = req.query;
|
|
369
|
+
if (!contentSid || !code) return res.status(400).send({ message: 'contentSid and code are required' });
|
|
370
|
+
|
|
371
|
+
try {
|
|
372
|
+
const msg = await Message.findOne({ content_sid: contentSid, numero: normalizeCode(code) });
|
|
373
|
+
if (!msg) return res.status(404).send({ message: 'Message not found' });
|
|
374
|
+
const sent = msg?.statusInfo?.status === 'sent' || msg?.statusInfo?.status === 'delivered' || msg?.statusInfo?.status === 'read';
|
|
375
|
+
return res.status(200).send({ message: 'Message status retrieved successfully.', sent, status: msg?.statusInfo?.status || null });
|
|
376
|
+
} catch (error) {
|
|
377
|
+
logger.error('Error checking message status:', error);
|
|
378
|
+
return res.status(500).send({ message: 'Failed to check message status', error });
|
|
379
|
+
}
|
|
380
|
+
};
|
|
381
|
+
|
|
352
382
|
module.exports = {
|
|
353
383
|
sendMessageController,
|
|
354
384
|
sendBulkMessageController,
|
|
355
385
|
sendBulkMessageAirtableController,
|
|
356
386
|
getLastInteractionController,
|
|
387
|
+
checkScheduledMessageStatusController,
|
|
388
|
+
checkMessageStatusController,
|
|
357
389
|
configureMessageController
|
|
358
390
|
};
|
|
@@ -138,6 +138,7 @@ async function insertMessage(values) {
|
|
|
138
138
|
origin: values.origin,
|
|
139
139
|
tools_executed: values.tools_executed || [],
|
|
140
140
|
raw: values.raw || null,
|
|
141
|
+
assistant_id: values.assistant_id || null,
|
|
141
142
|
statusInfo: values.statusInfo || (values.delivery_status ? {
|
|
142
143
|
status: values.delivery_status,
|
|
143
144
|
errorCode: values.delivery_error_code || null,
|
package/lib/routes/index.js
CHANGED
|
@@ -36,6 +36,8 @@ const messageRouteDefinitions = {
|
|
|
36
36
|
'POST /send-bulk': 'sendBulkMessageController',
|
|
37
37
|
'POST /send-bulk-airtable': 'sendBulkMessageAirtableController',
|
|
38
38
|
'GET /last': 'getLastInteractionController',
|
|
39
|
+
'GET /scheduled-status': 'checkScheduledMessageStatusController',
|
|
40
|
+
'GET /status': 'checkMessageStatusController',
|
|
39
41
|
'POST /quality': 'addQualityVoteController',
|
|
40
42
|
'GET /quality/:message_id': 'getQualityVotesByMessageController',
|
|
41
43
|
'GET /quality/:message_id/voter/:voter_username': 'getQualityVoteByMessageAndVoterController',
|
|
@@ -130,6 +132,8 @@ const builtInControllers = {
|
|
|
130
132
|
sendBulkMessageController: messageController.sendBulkMessageController,
|
|
131
133
|
sendBulkMessageAirtableController: messageController.sendBulkMessageAirtableController,
|
|
132
134
|
getLastInteractionController: messageController.getLastInteractionController,
|
|
135
|
+
checkScheduledMessageStatusController: messageController.checkScheduledMessageStatusController,
|
|
136
|
+
checkMessageStatusController: messageController.checkMessageStatusController,
|
|
133
137
|
addQualityVoteController: qualityMessageController.addQualityVoteController,
|
|
134
138
|
getQualityVotesByMessageController: qualityMessageController.getQualityVotesByMessageController,
|
|
135
139
|
getQualityVoteByMessageAndVoterController: qualityMessageController.getQualityVoteByMessageAndVoterController,
|
|
@@ -33,7 +33,7 @@ const createAssistantCore = async (code, assistant_id) => {
|
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
35
|
|
|
36
|
-
const addMsgAssistantCore = async (code,
|
|
36
|
+
const addMsgAssistantCore = async (code, inMessages, role = 'user', reply = false, skipSystemMessage = false) => {
|
|
37
37
|
const thread = await getThread(code);
|
|
38
38
|
if (!thread) return null;
|
|
39
39
|
|
|
@@ -41,16 +41,43 @@ const addMsgAssistantCore = async (code, message, role = 'user', reply = false)
|
|
|
41
41
|
const threadId = thread.getConversationId();
|
|
42
42
|
|
|
43
43
|
try {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
44
|
+
const messages = Array.isArray(inMessages) ? inMessages : [inMessages];
|
|
45
|
+
|
|
46
|
+
await provider.addMessage({
|
|
47
|
+
threadId,
|
|
48
|
+
messages: messages.map(message => ({ role, content: message }))
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
// Save system messages to database for frontend visibility
|
|
52
|
+
if (!skipSystemMessage) {
|
|
53
|
+
for (let i = 0; i < messages.length; i++) {
|
|
54
|
+
const message = messages[i];
|
|
55
|
+
try {
|
|
56
|
+
const message_id = `system_${Date.now()}_${i}_${Math.random().toString(36).substring(7)}`;
|
|
57
|
+
await insertMessage({
|
|
58
|
+
nombre_whatsapp: 'System',
|
|
59
|
+
numero: code,
|
|
60
|
+
body: message,
|
|
61
|
+
message_id: message_id,
|
|
62
|
+
is_group: false,
|
|
63
|
+
is_media: false,
|
|
64
|
+
from_me: true,
|
|
65
|
+
processed: true,
|
|
66
|
+
origin: 'system',
|
|
67
|
+
assistant_id: thread.getAssistantId(),
|
|
68
|
+
raw: { role: role }
|
|
69
|
+
});
|
|
70
|
+
} catch (err) {
|
|
71
|
+
logger.error('[addMsgAssistantCore] Error saving system message:', err);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
51
74
|
}
|
|
52
|
-
|
|
53
|
-
return null;
|
|
75
|
+
|
|
76
|
+
if (!reply) return null;
|
|
77
|
+
|
|
78
|
+
const assistant = getAssistantById(thread.getAssistantId(), thread);
|
|
79
|
+
const runResult = await runAssistantWithRetries(thread, assistant, {});
|
|
80
|
+
return runResult?.output || null;
|
|
54
81
|
} catch (error) {
|
|
55
82
|
logger.error('[addMsgAssistantCore] Error adding message', { error: error.message, code, role });
|
|
56
83
|
return null;
|
|
@@ -67,7 +94,34 @@ const addInstructionCore = async (code, instruction, role = 'user') => {
|
|
|
67
94
|
try {
|
|
68
95
|
await provider.addMessage({ threadId, messages: [{ role, content: instruction }] });
|
|
69
96
|
const assistant = getAssistantById(thread.getAssistantId(), thread);
|
|
70
|
-
const runResult = await runAssistantWithRetries(thread, assistant, {
|
|
97
|
+
const runResult = await runAssistantWithRetries(thread, assistant, {
|
|
98
|
+
additionalInstructions: instruction,
|
|
99
|
+
additionalMessages: [
|
|
100
|
+
{ role: role, content: instruction }
|
|
101
|
+
]
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
// Save instruction message to database for frontend visibility
|
|
105
|
+
try {
|
|
106
|
+
const message_id = `instruction_${Date.now()}_${Math.random().toString(36).substring(7)}`;
|
|
107
|
+
await insertMessage({
|
|
108
|
+
nombre_whatsapp: 'Instruction',
|
|
109
|
+
numero: code,
|
|
110
|
+
body: instruction,
|
|
111
|
+
message_id: message_id,
|
|
112
|
+
is_group: false,
|
|
113
|
+
is_media: false,
|
|
114
|
+
from_me: true,
|
|
115
|
+
processed: true,
|
|
116
|
+
origin: 'instruction',
|
|
117
|
+
assistant_id: thread.getAssistantId(),
|
|
118
|
+
raw: { role: role }
|
|
119
|
+
});
|
|
120
|
+
} catch (err) {
|
|
121
|
+
logger.error('[addInstructionCore] Error saving instruction message:', err);
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
logger.info('[addInstructionCore] Run response', { output: runResult?.output });
|
|
71
125
|
return runResult?.output || null;
|
|
72
126
|
} catch (error) {
|
|
73
127
|
logger.error('[addInstructionCore] Error adding instruction', { error: error.message, code, role });
|