sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Groups WIP #2

Browse source
This commit is contained in:
Darren Clarke 2025-07-08 18:03:01 +02:00
parent 7be5cb1478
commit a55e939592
4 changed files with 265 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

35
apps/bridge-worker/tasks/fetch-signal-messages.ts
View file

@ -58,7 +58,7 @@ const processMessage = async ({
const { attachments } = dataMessage;
const rawTimestamp = dataMessage?.timestamp;
// Debug logging for group detection
console.log(`[fetch-signal-messages] Processing message:`, {
sourceUuid,
@ -77,22 +77,13 @@ const processMessage = async ({
const formattedAttachments = await fetchAttachments(attachments);
const primaryAttachment = formattedAttachments[0] ?? {};
const additionalAttachments = formattedAttachments.slice(1);
// Extract group ID if this is a group message
const groupId = dataMessage?.groupV2?.id || dataMessage?.groupContext?.id || dataMessage?.groupInfo?.groupId;
// IMPORTANT: Always use phoneNumber as 'to' for compatibility with Zammad
// The group ID will be passed via the isGroup flag and potentially in metadata
const toRecipient = phoneNumber;
console.log(`[fetch-signal-messages] Setting recipient:`, {
isGroup,
groupId,
phoneNumber,
toRecipient,
note: 'Using phoneNumber as to for Zammad compatibility',
});
const groupId =
dataMessage?.groupV2?.id ||
dataMessage?.groupContext?.id ||
dataMessage?.groupInfo?.groupId;
const toRecipient = groupId ?? phoneNumber;
const primaryMessage = {
token: id,
to: toRecipient,
@ -104,8 +95,6 @@ const processMessage = async ({
filename: primaryAttachment.filename,
mimeType: primaryAttachment.mimeType,
isGroup,
// Include groupId if this is a group message
...(isGroup && groupId ? { groupId } : {}),
};
const formattedMessages = [primaryMessage];
@ -157,8 +146,10 @@ const fetchSignalMessagesTask = async ({
number: phoneNumber,
});
console.log(`[fetch-signal-messages] Fetching messages for bot ${id} (${phoneNumber})`);
console.log(
`[fetch-signal-messages] Fetching messages for bot ${id} (${phoneNumber})`,
);
for (const message of messages) {
const formattedMessages = await processMessage({
id,
@ -175,7 +166,7 @@ const fetchSignalMessagesTask = async ({
hasMessage: !!formattedMessage.message,
hasAttachment: !!formattedMessage.attachment,
});
await worker.addJob(
"signal/receive-signal-message",
formattedMessage,

265
apps/bridge-worker/tasks/signal/receive-signal-message.ts
View file

@ -13,7 +13,6 @@ interface ReceiveSignalMessageTaskOptions {
filename?: string;
mimeType?: string;
isGroup?: boolean;
groupId?: string; // Group ID from the message envelope
}
const receiveSignalMessageTask = async ({
@ -27,18 +26,15 @@ const receiveSignalMessageTask = async ({
filename,
mimeType,
isGroup,
groupId,
}: ReceiveSignalMessageTaskOptions): Promise<void> => {
console.log(`[receive-signal-message] Processing incoming message:`, {
messageId,
from,
to,
isGroup,
groupId,
hasMessage: !!message,
hasAttachment: !!attachment,
token,
toFormat: to?.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i) ? 'UUID' : 'phone',
});
const worker = await getWorkerUtils();
const row = await db
@ -53,7 +49,7 @@ const receiveSignalMessageTask = async ({
// Check if auto-group creation is enabled and this is NOT already a group message
const enableAutoGroups = process.env.BRIDGE_SIGNAL_AUTO_GROUPS === "true";
console.log(`[receive-signal-message] Auto-groups config:`, {
enableAutoGroups,
isGroup,
@ -61,11 +57,15 @@ const receiveSignalMessageTask = async ({
});
// If this is already a group message and auto-groups is enabled,
// use the provided groupId or keep the original 'to'
if (enableAutoGroups && isGroup && groupId) {
// Store the group ID for metadata but keep using phone number for 'to'
console.log(`[receive-signal-message] Message is from existing group: ${groupId}`);
finalTo = groupId; // Store for metadata
// use group provided in 'to'
if (enableAutoGroups && isGroup && to) {
// Signal sends the internal ID (base64) in group messages
// We should NOT add "group." prefix - that's for sending messages, not receiving
console.log(
`[receive-signal-message] Message is from existing group with internal ID`,
);
finalTo = to;
} else if (enableAutoGroups && !isGroup && from && to) {
try {
const config = new Configuration({
@ -73,8 +73,20 @@ const receiveSignalMessageTask = async ({
});
const groupsClient = new GroupsApi(config);
// Always create a new group for direct messages to the helpdesk
// This ensures each conversation gets its own group/ticket
console.log(
`[receive-signal-message] Creating new group for user ${from}`,
);
// Include timestamp to make each group unique
const timestamp = new Date()
.toISOString()
.replace(/[:.]/g, "-")
.substring(0, 19);
const groupName = `Support: ${from} (${timestamp})`;
// Create new group for this conversation
const groupName = `Support: ${from}`;
const createGroupResponse = await groupsClient.v1GroupsNumberPost({
number: row.phoneNumber,
data: {
@ -84,118 +96,140 @@ const receiveSignalMessageTask = async ({
},
});
console.log(
`[receive-signal-message] Full group creation response from Signal API:`,
JSON.stringify(createGroupResponse, null, 2),
);
if (createGroupResponse.id) {
// We need to get the internal_id for this group
// Sometimes the API needs a moment to return the new group, so retry if needed
let internalId: string | undefined;
let retries = 3;
while (retries > 0 && !internalId) {
try {
const groupsResponse = await groupsClient.v1GroupsNumberGet({
number: row.phoneNumber,
});
// Find the group we just created to get its internal_id
const createdGroup = groupsResponse.find(g => g.id === createGroupResponse.id);
internalId = createdGroup?.internal_id;
if (!internalId && retries > 1) {
console.log(`[receive-signal-message] Group not found in list yet, retrying...`);
await new Promise(resolve => setTimeout(resolve, 1000));
}
} catch (error) {
console.error(`[receive-signal-message] Error fetching groups:`, error);
}
retries--;
}
createdInternalId = internalId; // Store for use in webhook payload
if (!internalId) {
console.warn(
`[receive-signal-message] Warning: Could not get internal_id for group ${createGroupResponse.id}. Group matching may fail for subsequent messages.`,
);
} else {
console.log(
`[receive-signal-message] Successfully retrieved internal_id: ${internalId} for group: ${createGroupResponse.id}`,
);
}
// The createGroupResponse.id already contains the full group identifier (group.BASE64)
finalTo = createGroupResponse.id;
console.log(
`[receive-signal-message] Created new Signal group:`,
{
groupId: finalTo,
internalId,
groupName,
forPhoneNumber: from,
botNumber: row.phoneNumber,
response: createGroupResponse,
},
);
// Send a system notification to Zammad about group creation
// Fetch the group details to get the actual internalId
// The base64 part of the ID is NOT the same as the internalId!
try {
const systemNote = `Signal Auto-Group Created\n` +
`Group Name: ${groupName}\n` +
`Group ID: ${finalTo}\n\n` +
`Note: The user's initial message has been forwarded to the Signal group with attribution.`;
await worker.addJob("common/notify-webhooks", {
backendId,
payload: {
to: to,
from: "system",
message_id: `system-group-created-${Date.now()}`,
sent_at: new Date().toISOString(),
message: systemNote,
isGroup: true,
group_id: finalTo,
internal_group_id: internalId, // Also pass the internal_id
internal: true, // Mark as internal note
system_message: true // Additional flag to indicate system message
}
console.log(
`[receive-signal-message] Fetching group details to get internalId...`,
);
const groups = await groupsClient.v1GroupsNumberGet({
number: row.phoneNumber,
});
console.log(`[receive-signal-message] Sent group creation notification to Zammad`);
} catch (notifyError) {
console.error("[receive-signal-message] Error sending system notification:", notifyError);
// Continue processing even if notification fails
console.log(
`[receive-signal-message] All groups for bot:`,
JSON.stringify(groups.slice(0, 3), null, 2), // Show first 3 to avoid too much output
);
const createdGroup = groups.find((g) => g.id === finalTo);
if (createdGroup) {
console.log(
`[receive-signal-message] Found created group details:`,
JSON.stringify(createdGroup, null, 2),
);
}
if (createdGroup && createdGroup.internalId) {
createdInternalId = createdGroup.internalId;
console.log(
`[receive-signal-message] Got actual internalId: ${createdInternalId}`,
);
} else {
// Fallback: extract base64 part from ID
if (finalTo.startsWith("group.")) {
createdInternalId = finalTo.substring(6);
}
}
} catch (fetchError) {
console.log(
`[receive-signal-message] Could not fetch group details, using ID base64 part`,
);
// Fallback: extract base64 part from ID
if (finalTo.startsWith("group.")) {
createdInternalId = finalTo.substring(6);
}
}
console.log(`[receive-signal-message] Group created successfully:`, {
fullGroupId: finalTo,
internalId: createdInternalId,
});
console.log(`[receive-signal-message] Created new Signal group:`, {
groupId: finalTo,
internalId: createdInternalId,
groupName,
forPhoneNumber: from,
botNumber: row.phoneNumber,
response: createGroupResponse,
});
}
// Now handle notifications and message forwarding for both new and existing groups
if (finalTo && finalTo.startsWith("group.")) {
// Forward the user's initial message to the group using quote feature
try {
console.log(`[receive-signal-message] Forwarding initial message to group using quote feature`);
// Build the attribution message
console.log(
`[receive-signal-message] Forwarding initial message to group using quote feature`,
);
const attributionMessage = `Message from ${from}:\n"${message}"\n\n---\nSupport team: Your request has been received. An agent will respond shortly.`;
await worker.addJob("signal/send-signal-message", {
token: backendId,
to: finalTo, // Send to the newly created group
token: row.token,
to: finalTo,
message: attributionMessage,
conversationId: null, // No ticket ID yet since we're still processing the initial message
// Quote the original message for context
conversationId: null,
quoteMessage: message,
quoteAuthor: from,
quoteTimestamp: Date.parse(sentAt), // Convert ISO string to milliseconds
quoteTimestamp: Date.parse(sentAt),
});
console.log(`[receive-signal-message] Successfully forwarded initial message to group ${finalTo}`);
console.log(
`[receive-signal-message] Successfully forwarded initial message to group ${finalTo}`,
);
} catch (forwardError) {
console.error("[receive-signal-message] Error forwarding message to group:", forwardError);
// Continue processing even if forwarding fails
console.error(
"[receive-signal-message] Error forwarding message to group:",
forwardError,
);
}
// Send a response to the original DM informing about the group
try {
console.log(
`[receive-signal-message] Sending group notification to original DM`,
);
const dmNotification = `Hello! A private support group has been created for your conversation.\n\nGroup name: ${groupName}\n\nPlease look for the new group in your Signal app to continue the conversation. Our support team will respond there shortly.\n\nThank you for contacting support!`;
await worker.addJob("signal/send-signal-message", {
token: row.token,
to: from,
message: dmNotification,
conversationId: null,
});
console.log(
`[receive-signal-message] Successfully sent group notification to user DM`,
);
} catch (dmError) {
console.error(
"[receive-signal-message] Error sending DM notification:",
dmError,
);
}
}
} catch (error: any) {
// Check if error is because group already exists
const errorMessage = error?.response?.data?.error || error?.message || error;
const isAlreadyExists = errorMessage?.toString().toLowerCase().includes('already') ||
errorMessage?.toString().toLowerCase().includes('exists');
const errorMessage =
error?.response?.data?.error || error?.message || error;
const isAlreadyExists =
errorMessage?.toString().toLowerCase().includes("already") ||
errorMessage?.toString().toLowerCase().includes("exists");
if (isAlreadyExists) {
console.log(`[receive-signal-message] Group might already exist for ${from}, continuing with original recipient`);
console.log(
`[receive-signal-message] Group might already exist for ${from}, continuing with original recipient`,
);
} else {
console.error("[receive-signal-message] Error creating Signal group:", {
error: errorMessage,
@ -204,17 +238,11 @@ const receiveSignalMessageTask = async ({
botNumber: row.phoneNumber,
});
}
// Continue with original 'to' if group creation fails
}
}
// WORKAROUND: Zammad doesn't accept UUID group IDs in the 'to' field
// Instead, we use the bot's phone number and include group metadata
const isGroupMessage = isGroup || finalTo !== to || !!groupId;
const effectiveGroupId = groupId || (finalTo !== to ? finalTo : undefined);
const payload = {
to: to, // Always use the bot's phone number, not the group ID
to: finalTo,
from,
message_id: messageId,
sent_at: sentAt,
@ -222,25 +250,8 @@ const receiveSignalMessageTask = async ({
attachment,
filename,
mime_type: mimeType,
isGroup: isGroupMessage,
// Include group ID as metadata if this is a group message
...(effectiveGroupId ? { group_id: effectiveGroupId } : {}),
// Include internal_group_id if we created a new group
...(createdInternalId ? { internal_group_id: createdInternalId } : {}),
is_group: finalTo.startsWith("group"),
};
console.log(`[receive-signal-message] Sending webhook notification:`, {
backendId,
originalTo: to,
finalTo,
toChanged: to !== finalTo,
payloadIsGroup: payload.isGroup,
payloadTo: payload.to,
payloadGroupId: (payload as any).group_id,
payloadInternalGroupId: (payload as any).internal_group_id,
messageId: payload.message_id,
createdNewGroup: !!createdInternalId,
});
await worker.addJob("common/notify-webhooks", { backendId, payload });
};

136
apps/bridge-worker/tasks/signal/send-signal-message.ts
View file

@ -45,13 +45,13 @@ const sendSignalMessageTask = async ({
let groupCreated = false;
try {
// Check if 'to' is a group ID (UUID format) vs phone number
const isGroupId =
/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(
to,
);
// Check if 'to' is a group ID (UUID format, group.base64 format, or base64) vs phone number
const isUUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(to);
const isGroupPrefix = to.startsWith('group.');
const isBase64 = /^[A-Za-z0-9+/]+=*$/.test(to) && to.length > 20; // Base64 internal_id
const isGroupId = isUUID || isGroupPrefix || isBase64;
const enableAutoGroups = process.env.BRIDGE_SIGNAL_AUTO_GROUPS === "true";
console.log(`[send-signal-message] Recipient analysis:`, {
to,
isGroupId,
@ -73,44 +73,46 @@ const sendSignalMessageTask = async ({
});
if (createGroupResponse.id) {
// Get the internal_id for this group
// Sometimes the API needs a moment to return the new group, so retry if needed
let internalId: string | undefined;
let retries = 3;
while (retries > 0 && !internalId) {
try {
const groupsResponse = await groupsClient.v1GroupsNumberGet({
number: bot.phoneNumber,
});
// Find the group we just created to get its internal_id
const createdGroup = groupsResponse.find(g => g.id === createGroupResponse.id);
internalId = createdGroup?.internal_id;
if (!internalId && retries > 1) {
console.log(`[send-signal-message] Group not found in list yet, retrying...`);
await new Promise(resolve => setTimeout(resolve, 1000));
}
} catch (error) {
console.error(`[send-signal-message] Error fetching groups:`, error);
}
retries--;
}
// The createGroupResponse.id already contains the full group identifier (group.BASE64)
finalTo = createGroupResponse.id;
groupCreated = true;
console.log(
`[send-signal-message] Created new Signal group:`,
{
groupId: finalTo,
internalId,
groupName,
conversationId,
originalRecipient: to,
botNumber: bot.phoneNumber,
},
);
// Fetch the group details to get the actual internalId
let internalId: string | undefined;
try {
const groups = await groupsClient.v1GroupsNumberGet({
number: bot.phoneNumber,
});
const createdGroup = groups.find(g => g.id === finalTo);
if (createdGroup && createdGroup.internalId) {
internalId = createdGroup.internalId;
console.log(
`[send-signal-message] Got actual internalId: ${internalId}`,
);
} else {
// Fallback: extract base64 part from ID
if (finalTo.startsWith('group.')) {
internalId = finalTo.substring(6);
}
}
} catch (fetchError) {
console.log(
`[send-signal-message] Could not fetch group details, using ID base64 part`,
);
// Fallback: extract base64 part from ID
if (finalTo.startsWith('group.')) {
internalId = finalTo.substring(6);
}
}
console.log(`[send-signal-message] Created new Signal group:`, {
groupId: finalTo,
internalId,
groupName,
conversationId,
originalRecipient: to,
botNumber: bot.phoneNumber,
});
// Notify Zammad about the new group ID via webhook
await worker.addJob("common/notify-webhooks", {
@ -141,24 +143,32 @@ const sendSignalMessageTask = async ({
originalTo: to,
recipientChanged: to !== finalTo,
groupCreated,
isGroupRecipient: finalTo.startsWith('group.'),
});
// Build the message data with optional quote parameters
const messageData: signalApi.ApiSendMessageV2 = {
number,
recipients: [finalTo],
message,
};
console.log(`[send-signal-message] Message data being sent:`, {
number,
recipients: [finalTo],
message: message.substring(0, 50) + '...',
hasQuoteParams: !!(quoteMessage && quoteAuthor && quoteTimestamp),
});
// Add quote parameters if all are provided
if (quoteMessage && quoteAuthor && quoteTimestamp) {
messageData.quoteTimestamp = quoteTimestamp;
messageData.quoteAuthor = quoteAuthor;
messageData.quoteMessage = quoteMessage;
console.log(`[send-signal-message] Including quote in message:`, {
quoteAuthor,
quoteMessage: quoteMessage.substring(0, 50) + '...',
quoteMessage: quoteMessage.substring(0, 50) + "...",
quoteTimestamp,
});
}
@ -167,16 +177,32 @@ const sendSignalMessageTask = async ({
data: messageData,
});
console.log(
`[send-signal-message] Message sent successfully:`,
{
to: finalTo,
groupCreated,
response: response?.timestamp || 'no timestamp',
},
);
} catch (error) {
console.error({ error });
console.log(`[send-signal-message] Message sent successfully:`, {
to: finalTo,
groupCreated,
response: response?.timestamp || "no timestamp",
});
} catch (error: any) {
// Try to get the actual error message from the response
if (error.response) {
try {
const errorBody = await error.response.text();
console.error(`[send-signal-message] Signal API error:`, {
status: error.response.status,
statusText: error.response.statusText,
body: errorBody,
sentTo: finalTo,
messageDetails: {
fromNumber: number,
toRecipients: [finalTo],
hasQuote: !!(quoteMessage),
},
});
} catch (e) {
console.error(`[send-signal-message] Could not parse error response`);
}
}
console.error(`[send-signal-message] Full error:`, error);
throw error;
}
};