|
|
|
@ -219,13 +219,14 @@ const setupMessageHandler = async () => {
|
|
|
|
if (savedMsg?.sn) {
|
|
|
|
if (savedMsg?.sn) {
|
|
|
|
targetUpsert = { sn: savedMsg.sn };
|
|
|
|
targetUpsert = { sn: savedMsg.sn };
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const savedMsgKeyFields = pick(savedMsg, ['from', 'to']);
|
|
|
|
const bixFields = pick(savedMsg, ['actionId', 'externalId']);
|
|
|
|
const bixFields = pick(savedMsg, ['actionId', 'externalId']);
|
|
|
|
const savedTimeFields = pick(savedMsg, Object.values(timeField));
|
|
|
|
const savedTimeFields = pick(savedMsg, Object.values(timeField));
|
|
|
|
logger.info('message evt\n', eventName, messageData, savedMsg);
|
|
|
|
logger.info('message evt\n', eventName, messageData, savedMsg);
|
|
|
|
const _type = messageData?.type || savedMsg?.msgtype || 'unresolvable';
|
|
|
|
const _type = messageData?.type || savedMsg?.msgtype || 'unresolvable';
|
|
|
|
const typeField = { msgtype: _type }; // fix: type 空
|
|
|
|
const typeField = { msgtype: _type }; // fix: type 空
|
|
|
|
|
|
|
|
|
|
|
|
const webhookBody = webhookBodyBuilder({ ...savedTimeFields, ...messageData, ...bixFields, ...typeField }, eventName);
|
|
|
|
const webhookBody = webhookBodyBuilder({ ...savedTimeFields, ...messageData, ...bixFields, ...savedMsgKeyFields, ...typeField }, eventName);
|
|
|
|
const { waiMessage } = webhookBody;
|
|
|
|
const { waiMessage } = webhookBody;
|
|
|
|
|
|
|
|
|
|
|
|
const timeFields = pick(waiMessage, Object.values(timeField));
|
|
|
|
const timeFields = pick(waiMessage, Object.values(timeField));
|
|
|
|
|