=> {
+ const { formData, receivedAt } = options;
+
+ logger.info({
+ formData,
+ receivedAt,
+ formDataKeys: Object.keys(formData),
+ }, 'Processing Formstack form submission');
+
+ // Extract data from Formstack payload
+ const {
+ FormID,
+ UniqueID,
+ name,
+ signal_number,
+ type_of_help_requested,
+ type_of_organization,
+ urgency_level,
+ email_address,
+ phone_number,
+ address,
+ description_of_issue,
+ preferred_contact_method,
+ available_times_for_contact,
+ how_did_you_hear_about_us,
+ preferred_language,
+ } = formData;
+
+ // Build full name
+ const fullName = name
+ ? `${name.first || ''} ${name.last || ''}`.trim()
+ : 'Unknown';
+
+ // Get organization name from form data
+ const organizationName = type_of_organization || '';
+
+ // Build ticket title - matching ngo-isac-uploader pattern
+ let title = fullName;
+ if (organizationName) {
+ title += ` - ${organizationName}`;
+ }
+ if (type_of_help_requested) {
+ title += ` - ${type_of_help_requested}`;
+ }
+
+ // Build article body - only description and metadata
+ // All other fields go into custom Zammad ticket fields
+ const body = description_of_issue
+ ? `${description_of_issue}
+
+
+ Submitted via Formstack | Form ID: ${FormID} | Submission ID: ${UniqueID} | Received: ${receivedAt}
`
+ : `No description provided
+
+
+ Submitted via Formstack | Form ID: ${FormID} | Submission ID: ${UniqueID} | Received: ${receivedAt}
`;
+
+ // Get Zammad configuration from environment
+ const zammadUrl = process.env.ZAMMAD_URL || 'http://zammad-nginx:8080';
+ const zammadToken = process.env.ZAMMAD_API_TOKEN;
+
+ if (!zammadToken) {
+ logger.error('ZAMMAD_API_TOKEN environment variable is not configured');
+ throw new Error('ZAMMAD_API_TOKEN is required');
+ }
+
+ const zammad = Zammad({ token: zammadToken }, zammadUrl);
+
+ try {
+ // Get or create user based on contact info
+ // Priority: signal_number > phone_number > email_address
+ let customer;
+
+ // Try to find existing user by phone or email
+ if (signal_number || phone_number) {
+ const phoneToSearch = signal_number || phone_number;
+ customer = await getUser(zammad, phoneToSearch);
+ if (customer) {
+ logger.info({ customerId: customer.id, method: 'phone' }, 'Found existing user by phone');
+ }
+ }
+
+ if (!customer && email_address) {
+ // Search by email if phone search didn't work
+ const emailResults = await zammad.user.search(`email:${email_address}`);
+ if (emailResults.length > 0) {
+ customer = emailResults[0];
+ logger.info({ customerId: customer.id, method: 'email' }, 'Found existing user by email');
+ }
+ }
+
+ if (!customer) {
+ // Create new user with all available contact information
+ logger.info('Creating new user from form submission');
+ customer = await zammad.user.create({
+ firstname: name?.first || '',
+ lastname: name?.last || '',
+ email: email_address || `${UniqueID}@formstack.local`,
+ phone: signal_number || phone_number || '',
+ note: `User created from Formstack submission ${UniqueID}`,
+ });
+ }
+
+ logger.info({
+ customerId: customer.id,
+ customerEmail: customer.email,
+ customerPhone: customer.phone,
+ }, 'Customer identified/created');
+
+ // Build address parts
+ const streetAddress = address?.address || '';
+ const cityValue = address?.city || '';
+ const stateValue = address?.state || '';
+ const zipValue = address?.zip || '';
+
+ // Create the ticket with custom fields mapped to Zammad attributes
+ // Following the pattern from ngo-isac-uploader where all form data
+ // goes into structured fields rather than HTML body
+ const ticket = await zammad.ticket.create({
+ title,
+ group: "Users", // Default group - you may want to make this configurable
+ customer_id: customer.id,
+
+ // Custom fields - these will be populated in Zammad's ticket attributes
+ // NOTE: 'organization', 'formstack_form_id', 'formstack_submission_id'
+ // fields could not be created due to naming conflicts, so metadata
+ // is included in the ticket body instead
+ signal_number: signal_number || undefined,
+ type_of_help_requested: type_of_help_requested || undefined,
+ type_of_organization: type_of_organization || undefined,
+ urgency_level: urgency_level || undefined,
+ city: cityValue || undefined,
+ us_state: stateValue || undefined,
+ zip_code: zipValue || undefined,
+ street_address: streetAddress || undefined,
+ preferred_contact_method: preferred_contact_method || undefined,
+ available_times: available_times_for_contact || undefined,
+ where_heard: how_did_you_hear_about_us || undefined,
+ preferred_language: preferred_language || undefined,
+
+ // Article with just the description
+ article: {
+ body,
+ subject: title,
+ content_type: "text/html",
+ type: "note",
+ },
+ });
+
+ logger.info({
+ ticketId: ticket.id,
+ customerId: customer.id,
+ formId: FormID,
+ submissionId: UniqueID,
+ }, 'Zammad ticket created successfully');
+
+ } catch (error: any) {
+ logger.error({
+ error: error.message,
+ stack: error.stack,
+ output: error.output,
+ formId: FormID,
+ submissionId: UniqueID,
+ }, 'Failed to create Zammad ticket');
+ throw error;
+ }
+};
+
+export default createTicketFromFormTask;
diff --git a/apps/bridge-worker/tasks/leafcutter/import-label-studio.ts b/apps/bridge-worker/tasks/leafcutter/import-label-studio.ts
index cb1857e..4f50066 100644
--- a/apps/bridge-worker/tasks/leafcutter/import-label-studio.ts
+++ b/apps/bridge-worker/tasks/leafcutter/import-label-studio.ts
@@ -36,7 +36,6 @@ const getZammadTickets = async (
{ headers },
);
const tickets: any = await rawTickets.json();
- console.log({ tickets });
if (!tickets || tickets.length === 0) {
return [shouldContinue, docs];
}
@@ -49,23 +48,9 @@ const getZammadTickets = async (
shouldContinue = true;
if (source_closed_at <= minUpdatedTimestamp) {
- console.log(`Skipping ticket`, {
- source_id,
- source_updated_at,
- source_closed_at,
- minUpdatedTimestamp,
- });
continue;
}
-
- console.log(`Processing ticket`, {
- source_id,
- source_updated_at,
- source_closed_at,
- minUpdatedTimestamp,
- });
-
- const rawArticles = await fetch(
+ const rawArticles = await fetch(
`${zammadApiUrl}/ticket_articles/by_ticket/${source_id}`,
{ headers },
);
@@ -178,8 +163,6 @@ const sendToLabelStudio = async (tickets: FormattedZammadTicket[]) => {
body: JSON.stringify([ticket]),
});
const importResult = await res.json();
-
- console.log(JSON.stringify(importResult, undefined, 2));
}
};
*/
@@ -201,7 +184,6 @@ const importLabelStudioTask = async (): Promise => {
await sendToLabelStudio(tickets);
const lastTicket = tickets.pop();
const newLastTimestamp = lastTicket.data.source_closed_at;
- console.log({ newLastTimestamp });
await db.settings.upsert(settingName, {
minUpdatedTimestamp: newLastTimestamp,
});
diff --git a/apps/bridge-worker/tasks/leafcutter/import-leafcutter.ts b/apps/bridge-worker/tasks/leafcutter/import-leafcutter.ts
index a3c3e4e..a0fa171 100644
--- a/apps/bridge-worker/tasks/leafcutter/import-leafcutter.ts
+++ b/apps/bridge-worker/tasks/leafcutter/import-leafcutter.ts
@@ -2,6 +2,9 @@
/*
import { URLSearchParams } from "url";
import { withDb, AppDatabase } from "../../lib/db.js";
+import { createLogger } from "@link-stack/logger";
+
+const logger = createLogger('bridge-worker-import-leafcutter');
// import { loadConfig } from "@digiresilience/bridge-config";
const config: any = {};
@@ -43,14 +46,11 @@ const getLabelStudioTickets = async (
page_size: "50",
page: `${page}`,
});
- console.log({ url: `${labelStudioApiUrl}/projects/1/tasks?${ticketsQuery}` });
const res = await fetch(
`${labelStudioApiUrl}/projects/1/tasks?${ticketsQuery}`,
{ headers },
);
- console.log({ res });
const tasksResult: any = await res.json();
- console.log({ tasksResult });
return tasksResult;
};
@@ -63,14 +63,11 @@ const fetchFromLabelStudio = async (
for await (const page of pages) {
const docs = await getLabelStudioTickets(page + 1);
- console.log({ page, docs });
if (docs && docs.length > 0) {
for (const doc of docs) {
const updatedAt = new Date(doc.updated_at);
- console.log({ updatedAt, minUpdatedTimestamp });
if (updatedAt > minUpdatedTimestamp) {
- console.log(`Adding doc`, { doc });
allDocs.push(doc);
}
}
@@ -79,7 +76,6 @@ const fetchFromLabelStudio = async (
}
}
- console.log({ allDocs });
return allDocs;
};
@@ -93,9 +89,7 @@ const sendToLeafcutter = async (tickets: LabelStudioTicket[]) => {
},
} = config;
- console.log({ tickets });
const filteredTickets = tickets.filter((ticket) => ticket.is_labeled);
- console.log({ filteredTickets });
const finalTickets: LeafcutterTicket[] = filteredTickets.map((ticket) => {
const {
id,
@@ -131,8 +125,7 @@ const sendToLeafcutter = async (tickets: LabelStudioTicket[]) => {
};
});
- console.log("Sending to Leafcutter");
- console.log({ finalTickets });
+ logger.info("Sending to Leafcutter");
const result = await fetch(opensearchApiUrl, {
method: "POST",
@@ -157,15 +150,7 @@ const importLeafcutterTask = async (): Promise => {
? new Date(res.value.minUpdatedTimestamp as string)
: new Date("2023-03-01");
const newLastTimestamp = new Date();
- console.log({
- contributorName,
- settingName,
- res,
- startTimestamp,
- newLastTimestamp,
- });
const tickets = await fetchFromLabelStudio(startTimestamp);
- console.log({ tickets });
await sendToLeafcutter(tickets);
await db.settings.upsert(settingName, {
minUpdatedTimestamp: newLastTimestamp,
diff --git a/apps/bridge-worker/tasks/signal/receive-signal-message.ts b/apps/bridge-worker/tasks/signal/receive-signal-message.ts
index b1688ea..a504b3c 100644
--- a/apps/bridge-worker/tasks/signal/receive-signal-message.ts
+++ b/apps/bridge-worker/tasks/signal/receive-signal-message.ts
@@ -1,4 +1,9 @@
import { db, getWorkerUtils } from "@link-stack/bridge-common";
+import { createLogger } from "@link-stack/logger";
+import * as signalApi from "@link-stack/signal-api";
+const { Configuration, GroupsApi } = signalApi;
+
+const logger = createLogger('bridge-worker-receive-signal-message');
interface ReceiveSignalMessageTaskOptions {
token: string;
@@ -10,6 +15,7 @@ interface ReceiveSignalMessageTaskOptions {
attachment?: string;
filename?: string;
mimeType?: string;
+ isGroup?: boolean;
}
const receiveSignalMessageTask = async ({
@@ -22,8 +28,17 @@ const receiveSignalMessageTask = async ({
attachment,
filename,
mimeType,
+ isGroup,
}: ReceiveSignalMessageTaskOptions): Promise => {
- console.log({ token, to, from });
+ logger.debug({
+ messageId,
+ from,
+ to,
+ isGroup,
+ hasMessage: !!message,
+ hasAttachment: !!attachment,
+ token,
+ }, 'Processing incoming message');
const worker = await getWorkerUtils();
const row = await db
.selectFrom("SignalBot")
@@ -32,8 +47,170 @@ const receiveSignalMessageTask = async ({
.executeTakeFirstOrThrow();
const backendId = row.id;
+ let finalTo = to;
+ let createdInternalId: string | undefined;
+
+ // Check if auto-group creation is enabled and this is NOT already a group message
+ const enableAutoGroups = process.env.BRIDGE_SIGNAL_AUTO_GROUPS === "true";
+
+ logger.debug({
+ enableAutoGroups,
+ isGroup,
+ shouldCreateGroup: enableAutoGroups && !isGroup && from && to,
+ }, 'Auto-groups config');
+
+ // If this is already a group message and auto-groups is enabled,
+ // 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
+ logger.debug('Message is from existing group with internal ID');
+
+ finalTo = to;
+ } else if (enableAutoGroups && !isGroup && from && to) {
+ try {
+ const config = new Configuration({
+ basePath: process.env.BRIDGE_SIGNAL_URL,
+ });
+ 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
+ logger.info({ from }, 'Creating new group for user');
+
+ // 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 createGroupResponse = await groupsClient.v1GroupsNumberPost({
+ number: row.phoneNumber,
+ data: {
+ name: groupName,
+ members: [from],
+ description: "Private support conversation",
+ },
+ });
+
+ logger.debug({ createGroupResponse }, 'Group creation response from Signal API');
+
+ if (createGroupResponse.id) {
+ // The createGroupResponse.id already contains the full group identifier (group.BASE64)
+ finalTo = createGroupResponse.id;
+
+ // Fetch the group details to get the actual internalId
+ // The base64 part of the ID is NOT the same as the internalId!
+ try {
+ logger.debug('Fetching group details to get internalId');
+ const groups = await groupsClient.v1GroupsNumberGet({
+ number: row.phoneNumber,
+ });
+
+ logger.debug({ groupsSample: groups.slice(0, 3) }, 'Groups for bot');
+
+ const createdGroup = groups.find((g) => g.id === finalTo);
+ if (createdGroup) {
+ logger.debug({ createdGroup }, 'Found created group details');
+ }
+
+ if (createdGroup && createdGroup.internalId) {
+ createdInternalId = createdGroup.internalId;
+ logger.debug({ createdInternalId }, 'Got actual internalId');
+ } else {
+ // Fallback: extract base64 part from ID
+ if (finalTo.startsWith("group.")) {
+ createdInternalId = finalTo.substring(6);
+ }
+ }
+ } catch (fetchError) {
+ logger.debug('Could not fetch group details, using ID base64 part');
+ // Fallback: extract base64 part from ID
+ if (finalTo.startsWith("group.")) {
+ createdInternalId = finalTo.substring(6);
+ }
+ }
+
+ logger.debug({
+ fullGroupId: finalTo,
+ internalId: createdInternalId,
+ }, 'Group created successfully');
+ logger.debug({
+ groupId: finalTo,
+ internalId: createdInternalId,
+ groupName,
+ forPhoneNumber: from,
+ botNumber: row.phoneNumber,
+ response: createGroupResponse,
+ }, 'Created new Signal group');
+ }
+
+ // 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 {
+ logger.debug('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: row.token,
+ to: finalTo,
+ message: attributionMessage,
+ conversationId: null,
+ quoteMessage: message,
+ quoteAuthor: from,
+ quoteTimestamp: Date.parse(sentAt),
+ });
+
+ logger.debug({ finalTo }, 'Successfully forwarded initial message to group');
+ } catch (forwardError) {
+ logger.error({ error: forwardError }, 'Error forwarding message to group');
+ }
+
+ // Send a response to the original DM informing about the group
+ try {
+ logger.debug('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,
+ });
+
+ logger.debug('Successfully sent group notification to user DM');
+ } catch (dmError) {
+ logger.error({ error: dmError }, 'Error sending DM notification');
+ }
+ }
+ } 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");
+
+ if (isAlreadyExists) {
+ logger.debug({ from }, 'Group might already exist, continuing with original recipient');
+ } else {
+ logger.error({
+ error: errorMessage,
+ from,
+ to,
+ botNumber: row.phoneNumber,
+ }, 'Error creating Signal group');
+ }
+ }
+ }
+
const payload = {
- to,
+ to: finalTo,
from,
message_id: messageId,
sent_at: sentAt,
@@ -41,6 +218,7 @@ const receiveSignalMessageTask = async ({
attachment,
filename,
mime_type: mimeType,
+ is_group: finalTo.startsWith("group"),
};
await worker.addJob("common/notify-webhooks", { backendId, payload });
diff --git a/apps/bridge-worker/tasks/signal/send-signal-message.ts b/apps/bridge-worker/tasks/signal/send-signal-message.ts
index 4150300..5b00bbc 100644
--- a/apps/bridge-worker/tasks/signal/send-signal-message.ts
+++ b/apps/bridge-worker/tasks/signal/send-signal-message.ts
@@ -1,19 +1,44 @@
-import { db } from "@link-stack/bridge-common";
+import { db, getWorkerUtils } from "@link-stack/bridge-common";
+import { createLogger } from "@link-stack/logger";
import * as signalApi from "@link-stack/signal-api";
-const { Configuration, MessagesApi } = signalApi;
+const { Configuration, MessagesApi, GroupsApi } = signalApi;
+
+const logger = createLogger("bridge-worker-send-signal-message");
interface SendSignalMessageTaskOptions {
token: string;
to: string;
message: any;
+ conversationId?: string; // Zammad ticket/conversation ID for callback
+ quoteMessage?: string; // Optional: message text to quote
+ quoteAuthor?: string; // Optional: author of quoted message (phone number)
+ quoteTimestamp?: number; // Optional: timestamp of quoted message in milliseconds
+ attachments?: Array<{
+ data: string; // base64
+ filename: string;
+ mime_type: string;
+ }>;
}
const sendSignalMessageTask = async ({
token,
to,
message,
+ conversationId,
+ quoteMessage,
+ quoteAuthor,
+ quoteTimestamp,
+ attachments,
}: SendSignalMessageTaskOptions): Promise => {
- console.log({ token, to });
+ logger.debug(
+ {
+ token,
+ to,
+ conversationId,
+ messageLength: message?.length,
+ },
+ "Processing outgoing message",
+ );
const bot = await db
.selectFrom("SignalBot")
.selectAll()
@@ -25,18 +50,208 @@ const sendSignalMessageTask = async ({
basePath: process.env.BRIDGE_SIGNAL_URL,
});
const messagesClient = new MessagesApi(config);
+ const groupsClient = new GroupsApi(config);
+ const worker = await getWorkerUtils();
+
+ let finalTo = to;
+ let groupCreated = false;
try {
- const response = await messagesClient.v2SendPost({
- data: {
- number,
- recipients: [to],
- message,
+ // 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";
+
+ logger.debug(
+ {
+ to,
+ isGroupId,
+ enableAutoGroups,
+ shouldCreateGroup:
+ enableAutoGroups && !isGroupId && to && conversationId,
},
+ "Recipient analysis",
+ );
+
+ // If sending to a phone number and auto-groups is enabled, create a group first
+ if (enableAutoGroups && !isGroupId && to && conversationId) {
+ try {
+ const groupName = `DPN Support Request: ${conversationId}`;
+ const createGroupResponse = await groupsClient.v1GroupsNumberPost({
+ number: bot.phoneNumber,
+ data: {
+ name: groupName,
+ members: [to],
+ description: "Private support conversation",
+ },
+ });
+
+ if (createGroupResponse.id) {
+ // The createGroupResponse.id already contains the full group identifier (group.BASE64)
+ finalTo = createGroupResponse.id;
+ groupCreated = true;
+
+ // 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;
+ logger.debug({ internalId }, "Got actual internalId");
+ } else {
+ // Fallback: extract base64 part from ID
+ if (finalTo.startsWith("group.")) {
+ internalId = finalTo.substring(6);
+ }
+ }
+ } catch (fetchError) {
+ logger.debug("Could not fetch group details, using ID base64 part");
+ // Fallback: extract base64 part from ID
+ if (finalTo.startsWith("group.")) {
+ internalId = finalTo.substring(6);
+ }
+ }
+ logger.debug(
+ {
+ groupId: finalTo,
+ internalId,
+ groupName,
+ conversationId,
+ originalRecipient: to,
+ botNumber: bot.phoneNumber,
+ },
+ "Created new Signal group",
+ );
+
+ // Notify Zammad about the new group ID via webhook
+ await worker.addJob("common/notify-webhooks", {
+ backendId: bot.id,
+ payload: {
+ event: "group_created",
+ conversation_id: conversationId,
+ original_recipient: to,
+ group_id: finalTo,
+ internal_group_id: internalId,
+ timestamp: new Date().toISOString(),
+ },
+ });
+ }
+ } catch (groupError) {
+ logger.error(
+ {
+ error:
+ groupError instanceof Error ? groupError.message : groupError,
+ to,
+ conversationId,
+ },
+ "Error creating Signal group",
+ );
+ // Continue with original recipient if group creation fails
+ }
+ }
+
+ logger.debug(
+ {
+ fromNumber: number,
+ toRecipient: finalTo,
+ originalTo: to,
+ recipientChanged: to !== finalTo,
+ groupCreated,
+ isGroupRecipient: finalTo.startsWith("group."),
+ },
+ "Sending message via API",
+ );
+
+ // Build the message data with optional quote parameters
+ const messageData: signalApi.ApiSendMessageV2 = {
+ number,
+ recipients: [finalTo],
+ message,
+ };
+
+ logger.debug(
+ {
+ number,
+ recipients: [finalTo],
+ message: message.substring(0, 50) + "...",
+ hasQuoteParams: !!(quoteMessage && quoteAuthor && quoteTimestamp),
+ },
+ "Message data being sent",
+ );
+
+ // Add quote parameters if all are provided
+ if (quoteMessage && quoteAuthor && quoteTimestamp) {
+ messageData.quoteTimestamp = quoteTimestamp;
+ messageData.quoteAuthor = quoteAuthor;
+ messageData.quoteMessage = quoteMessage;
+
+ logger.debug(
+ {
+ quoteAuthor,
+ quoteMessage: quoteMessage.substring(0, 50) + "...",
+ quoteTimestamp,
+ },
+ "Including quote in message",
+ );
+ }
+
+ // Add attachments if provided
+ if (attachments && attachments.length > 0) {
+ messageData.base64Attachments = attachments.map((att) => att.data);
+ logger.debug(
+ {
+ attachmentCount: attachments.length,
+ attachmentNames: attachments.map((att) => att.filename),
+ },
+ "Including attachments in message",
+ );
+ }
+
+ const response = await messagesClient.v2SendPost({
+ data: messageData,
});
- console.log({ response });
- } catch (error) {
- console.error({ error });
+
+ logger.debug(
+ {
+ to: finalTo,
+ groupCreated,
+ response: response?.timestamp || "no timestamp",
+ },
+ "Message sent successfully",
+ );
+ } catch (error: any) {
+ // Try to get the actual error message from the response
+ if (error.response) {
+ try {
+ const errorBody = await error.response.text();
+ logger.error(
+ {
+ status: error.response.status,
+ statusText: error.response.statusText,
+ body: errorBody,
+ sentTo: finalTo,
+ messageDetails: {
+ fromNumber: number,
+ toRecipients: [finalTo],
+ hasQuote: !!quoteMessage,
+ },
+ },
+ "Signal API error",
+ );
+ } catch (e) {
+ logger.error("Could not parse error response");
+ }
+ }
+ logger.error({ error }, "Full error details");
throw error;
}
};
diff --git a/apps/bridge-worker/tasks/voice/twilio-recording.ts b/apps/bridge-worker/tasks/voice/twilio-recording.ts
index 9372b61..1b11675 100644
--- a/apps/bridge-worker/tasks/voice/twilio-recording.ts
+++ b/apps/bridge-worker/tasks/voice/twilio-recording.ts
@@ -3,6 +3,9 @@ import { withDb, AppDatabase } from "../../lib/db.js";
import { twilioClientFor } from "../../lib/common.js";
import { CallInstance } from "twilio/lib/rest/api/v2010/account/call";
import workerUtils from "../../lib/utils.js";
+import { createLogger } from "@link-stack/logger";
+
+const logger = createLogger('bridge-worker-twilio-recording');
interface WebhookPayload {
startTime: string;
@@ -20,7 +23,7 @@ const getTwilioRecording = async (url: string) => {
const { payload } = await Wreck.get(url);
return { recording: payload as Buffer };
} catch (error: any) {
- console.error(error.output);
+ logger.error(error.output);
return { error: error.output };
}
};
diff --git a/apps/bridge-worker/tasks/whatsapp/receive-whatsapp-message.ts b/apps/bridge-worker/tasks/whatsapp/receive-whatsapp-message.ts
index 024c70e..48adc6f 100644
--- a/apps/bridge-worker/tasks/whatsapp/receive-whatsapp-message.ts
+++ b/apps/bridge-worker/tasks/whatsapp/receive-whatsapp-message.ts
@@ -23,8 +23,6 @@ const receiveWhatsappMessageTask = async ({
filename,
mimeType,
}: ReceiveWhatsappMessageTaskOptions): Promise => {
- console.log({ token, to, from });
-
const worker = await getWorkerUtils();
const row = await db
.selectFrom("WhatsappBot")
diff --git a/apps/bridge-worker/tasks/whatsapp/send-whatsapp-message.ts b/apps/bridge-worker/tasks/whatsapp/send-whatsapp-message.ts
index 509371f..8e89d13 100644
--- a/apps/bridge-worker/tasks/whatsapp/send-whatsapp-message.ts
+++ b/apps/bridge-worker/tasks/whatsapp/send-whatsapp-message.ts
@@ -1,15 +1,24 @@
import { db } from "@link-stack/bridge-common";
+import { createLogger } from "@link-stack/logger";
+
+const logger = createLogger("bridge-worker-send-whatsapp-message");
interface SendWhatsappMessageTaskOptions {
token: string;
to: string;
message: any;
+ attachments?: Array<{
+ data: string;
+ filename: string;
+ mime_type: string;
+ }>;
}
const sendWhatsappMessageTask = async ({
message,
to,
token,
+ attachments,
}: SendWhatsappMessageTaskOptions): Promise => {
const bot = await db
.selectFrom("WhatsappBot")
@@ -18,16 +27,40 @@ const sendWhatsappMessageTask = async ({
.executeTakeFirstOrThrow();
const url = `${process.env.BRIDGE_WHATSAPP_URL}/api/bots/${bot.id}/send`;
- const params = { message, phoneNumber: to };
+ const params: any = { message, phoneNumber: to };
+
+ if (attachments && attachments.length > 0) {
+ params.attachments = attachments;
+ logger.debug(
+ {
+ attachmentCount: attachments.length,
+ attachmentNames: attachments.map((att) => att.filename),
+ },
+ "Sending WhatsApp message with attachments",
+ );
+ }
+
try {
const result = await fetch(url, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify(params),
});
- console.log({ result });
+
+ if (!result.ok) {
+ const errorText = await result.text();
+ logger.error(
+ {
+ status: result.status,
+ errorText,
+ url,
+ },
+ "WhatsApp send failed",
+ );
+ throw new Error(`Failed to send message: ${result.status}`);
+ }
} catch (error) {
- console.error({ error });
+ logger.error({ error });
throw new Error("Failed to send message");
}
};
diff --git a/apps/leafcutter/Dockerfile b/apps/leafcutter/Dockerfile
index 9103384..99ee7b4 100644
--- a/apps/leafcutter/Dockerfile
+++ b/apps/leafcutter/Dockerfile
@@ -38,9 +38,7 @@ RUN chown -R node ${APP_DIR}/
USER node
WORKDIR ${APP_DIR}
-COPY --from=installer ${APP_DIR}/node_modules/ ./node_modules/
-COPY --from=installer ${APP_DIR}/apps/leafcutter/ ./apps/leafcutter/
-COPY --from=installer ${APP_DIR}/package.json ./package.json
+COPY --from=installer ${APP_DIR} ./
USER root
WORKDIR ${APP_DIR}/apps/leafcutter/
RUN chmod +x docker-entrypoint.sh
diff --git a/apps/leafcutter/README.md b/apps/leafcutter/README.md
index e03b35c..c644c6a 100644
--- a/apps/leafcutter/README.md
+++ b/apps/leafcutter/README.md
@@ -1,32 +1,195 @@
-This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
+# Leafcutter
-## Getting Started
+Data visualization and analytics platform for the CDR Link ecosystem.
-First, run the development server:
+## Overview
+
+Leafcutter provides powerful data visualization capabilities with multiple chart types, trend analysis, and OpenSearch integration. It enables users to create, save, and share custom visualizations of their data with support for multiple languages.
+
+## Features
+
+- **Multiple Visualization Types**:
+ - Vertical/Horizontal Bar Charts (including stacked)
+ - Line Charts (including stacked)
+ - Pie/Donut Charts
+ - Data Tables
+ - Metrics Display
+ - Tag Clouds
+
+- **Data Management**:
+ - Create and save custom searches
+ - User-specific visualizations
+ - Trend analysis and insights
+ - OpenSearch integration for data queries
+
+- **User Experience**:
+ - Internationalization (English, French)
+ - Responsive design
+ - Export capabilities
+ - Preview mode for sharing
+
+## Development
+
+### Prerequisites
+
+- Node.js >= 20
+- npm >= 10
+- OpenSearch instance
+- PostgreSQL database (for user data)
+
+### Setup
```bash
+# Install dependencies
+npm install
+
+# Run development server (port 3001)
npm run dev
+
+# Build for production
+npm run build
+
+# Start production server
+npm run start
```
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+### Environment Variables
-You can start editing the page by modifying `pages/index.js`. The page auto-updates as you edit the file.
+Required environment variables:
-[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.js`.
+- `OPENSEARCH_URL` - OpenSearch endpoint
+- `OPENSEARCH_USERNAME` - OpenSearch username
+- `OPENSEARCH_PASSWORD` - OpenSearch password
+- `DATABASE_URL` - PostgreSQL connection
+- `NEXTAUTH_URL` - Application URL
+- `NEXTAUTH_SECRET` - NextAuth.js secret
+- `GOOGLE_CLIENT_ID` - Google OAuth client ID
+- `GOOGLE_CLIENT_SECRET` - Google OAuth client secret
-The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages.
+### Available Scripts
-## Learn More
+- `npm run dev` - Development server on port 3001
+- `npm run build` - Build for production
+- `npm run start` - Start production server
+- `npm run lint` - Run ESLint
+- `npm run export` - Export static site
+- `npm run aws:*` - AWS deployment utilities
+- `npm run kubectl:*` - Kubernetes utilities
-To learn more about Next.js, take a look at the following resources:
+## Architecture
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+### Page Structure
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
+- `/` - Home dashboard
+- `/create` - Create new visualizations
+- `/visualizations/[id]` - View/edit visualizations
+- `/preview/[id]` - Public preview mode
+- `/trends` - Trend analysis
+- `/about` - About page
+- `/faq` - Frequently asked questions
+- `/setup` - Initial setup wizard
-## Deploy on Vercel
+### API Routes
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+- `/api/searches/*` - Search management
+- `/api/visualizations/*` - Visualization CRUD
+- `/api/trends/*` - Trend data
+- `/api/upload` - File upload handling
+- `/api/link/auth` - Link authentication
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
+### Visualization Configuration
+
+Each visualization type has a JSON configuration in `_config/visualizations/`:
+- Chart options
+- Data mapping
+- Styling preferences
+- Aggregation settings
+
+### Data Flow
+
+1. User creates search query
+2. Query sent to OpenSearch
+3. Results processed and aggregated
+4. Data rendered in chosen visualization
+5. Visualization saved to PostgreSQL
+
+## Internationalization
+
+Supported languages:
+- English (`_locales/en.json`)
+- French (`_locales/fr.json`)
+
+Language selection available in the UI with automatic persistence.
+
+## OpenSearch Integration
+
+### Query Structure
+
+Leafcutter translates user inputs into OpenSearch queries:
+- Full-text search
+- Field filtering
+- Date ranges
+- Aggregations
+
+### Index Management
+
+Works with OpenSearch indices for:
+- Document storage
+- Real-time analytics
+- Historical data
+
+## Visualization Types
+
+### Bar Charts
+- Vertical and horizontal orientations
+- Stacked variants for multi-series data
+- Customizable colors and labels
+
+### Line Charts
+- Time series visualization
+- Multiple series support
+- Trend analysis
+
+### Pie/Donut Charts
+- Proportional data display
+- Interactive legends
+- Percentage calculations
+
+### Data Tables
+- Sortable columns
+- Pagination
+- Export functionality
+
+### Metrics
+- Single value display
+- Comparison indicators
+- Real-time updates
+
+### Tag Clouds
+- Word frequency visualization
+- Interactive filtering
+- Size-based importance
+
+## Security
+
+- Authentication via NextAuth.js
+- User-scoped data access
+- Secure OpenSearch queries
+- Input validation
+
+## Docker Support
+
+```bash
+# Build image
+docker build -t link-stack/leafcutter .
+
+# Run with docker-compose
+docker-compose -f docker/compose/leafcutter.yml up
+```
+
+## Deployment
+
+Includes utilities for:
+- AWS deployment (S3, CloudFront)
+- Kubernetes deployment
+- Static site export
\ No newline at end of file
diff --git a/apps/leafcutter/app/(main)/about/page.tsx b/apps/leafcutter/app/(main)/about/page.tsx
index b6958b2..1bfad23 100644
--- a/apps/leafcutter/app/(main)/about/page.tsx
+++ b/apps/leafcutter/app/(main)/about/page.tsx
@@ -1,5 +1,10 @@
+import { Suspense } from "react";
import { About } from "@link-stack/leafcutter-ui";
export default function Page() {
- return ;
+ return (
+
+
+
+ );
}
diff --git a/apps/leafcutter/app/(main)/faq/page.tsx b/apps/leafcutter/app/(main)/faq/page.tsx
index 396a9b5..05b57de 100644
--- a/apps/leafcutter/app/(main)/faq/page.tsx
+++ b/apps/leafcutter/app/(main)/faq/page.tsx
@@ -1,5 +1,12 @@
+import { Suspense } from "react";
import { FAQ } from "@link-stack/leafcutter-ui";
-export default function Page() {
- return ;
+export const dynamic = "force-dynamic";
+
+export default async function Page() {
+ return (
+
+
+
+ );
}
diff --git a/apps/leafcutter/app/(main)/layout.tsx b/apps/leafcutter/app/(main)/layout.tsx
index 5b9e9f1..d97fd7b 100644
--- a/apps/leafcutter/app/(main)/layout.tsx
+++ b/apps/leafcutter/app/(main)/layout.tsx
@@ -2,6 +2,8 @@ import { ReactNode } from "react";
import "app/_styles/global.css";
import { InternalLayout } from "../_components/InternalLayout";
+export const dynamic = "force-dynamic";
+
type LayoutProps = {
children: ReactNode;
};
diff --git a/apps/leafcutter/app/(main)/preview/[...visualizationID]/page.tsx b/apps/leafcutter/app/(main)/preview/[...visualizationID]/page.tsx
index 8daaaba..a1a60c6 100644
--- a/apps/leafcutter/app/(main)/preview/[...visualizationID]/page.tsx
+++ b/apps/leafcutter/app/(main)/preview/[...visualizationID]/page.tsx
@@ -69,19 +69,17 @@ export const getServerSideProps: GetServerSideProps = async (
});
});
}
- console.log({ query });
const dataResponse = await client.search({
index: "demo_data",
size: 200,
body: { query },
});
- console.log({ dataResponse });
res.props.data = dataResponse.body.hits.hits.map((hit) => ({
id: hit._id,
...hit._source,
}));
- console.log({ data: res.props.data });
- console.log(res.props.data[0]);
+
+
return res;
};
diff --git a/apps/leafcutter/app/(main)/setup/_components/Setup.tsx b/apps/leafcutter/app/(main)/setup/_components/Setup.tsx
index 1a079ec..7fe08ae 100644
--- a/apps/leafcutter/app/(main)/setup/_components/Setup.tsx
+++ b/apps/leafcutter/app/(main)/setup/_components/Setup.tsx
@@ -13,7 +13,7 @@ export const Setup: FC = () => {
} = useLeafcutterContext();
const router = useRouter();
useLayoutEffect(() => {
- setTimeout(() => router.push("/"), 4000);
+ setTimeout(() => router.push("/"), 2000);
}, [router]);
return (
diff --git a/apps/leafcutter/app/(main)/setup/page.tsx b/apps/leafcutter/app/(main)/setup/page.tsx
index 4e62414..dad2ed0 100644
--- a/apps/leafcutter/app/(main)/setup/page.tsx
+++ b/apps/leafcutter/app/(main)/setup/page.tsx
@@ -1,5 +1,10 @@
+import { Suspense } from "react";
import { Setup } from "./_components/Setup";
export default function Page() {
- return ;
+ return (
+
+
+
+ );
}
diff --git a/apps/leafcutter/app/(main)/visualizations/[...visualizationID]/page.tsx b/apps/leafcutter/app/(main)/visualizations/[...visualizationID]/page.tsx
index 5ef382b..d840ef4 100644
--- a/apps/leafcutter/app/(main)/visualizations/[...visualizationID]/page.tsx
+++ b/apps/leafcutter/app/(main)/visualizations/[...visualizationID]/page.tsx
@@ -22,9 +22,9 @@ const getVisualization = async (visualizationID: string) => {
);
const hit = hits[0];
const visualization = {
- id: hit._id.split(":")[1],
- title: hit._source.visualization.title,
- description: hit._source.visualization.description,
+ id: hit?._id.split(":")[1],
+ title: hit?._source?.visualization.title,
+ description: hit?._source?.visualization.description,
url: `/app/visualize?security_tenant=global#/edit/${
hit._id.split(":")[1]
}?embed=true`,
@@ -34,12 +34,13 @@ const getVisualization = async (visualizationID: string) => {
};
type PageProps = {
- params: {
+ params: Promise<{
visualizationID: string;
- };
+ }>;
};
-export default async function Page({ params: { visualizationID } }: PageProps) {
+export default async function Page({ params }: PageProps) {
+ const { visualizationID } = await params;
const visualization = await getVisualization(visualizationID);
return ;
diff --git a/apps/leafcutter/app/_components/MultiProvider.tsx b/apps/leafcutter/app/_components/MultiProvider.tsx
index 67e12b5..f049ce0 100644
--- a/apps/leafcutter/app/_components/MultiProvider.tsx
+++ b/apps/leafcutter/app/_components/MultiProvider.tsx
@@ -15,7 +15,7 @@ import fr from "@link-stack/leafcutter-ui/locales/fr.json";
import { LicenseInfo } from "@mui/x-license";
LicenseInfo.setLicenseKey(
- "c787ac6613c5f2aa0494c4285fe3e9f2Tz04OTY1NyxFPTE3NDYzNDE0ODkwMDAsUz1wcm8sTE09c3Vic2NyaXB0aW9uLEtWPTI=",
+ "2a7dd73ee59e3e028b96b0d2adee1ad8Tz0xMTMwOTUsRT0xNzc5MDYyMzk5MDAwLFM9cHJvLExNPXN1YnNjcmlwdGlvbixQVj1pbml0aWFsLEtWPTI=",
);
const messages: any = { en, fr };
diff --git a/apps/leafcutter/app/_components/Sidebar.tsx b/apps/leafcutter/app/_components/Sidebar.tsx
index acdcef3..b3c0a43 100644
--- a/apps/leafcutter/app/_components/Sidebar.tsx
+++ b/apps/leafcutter/app/_components/Sidebar.tsx
@@ -48,7 +48,6 @@ const MenuItem = ({
return (
new Client({
- node: baseURL,
- auth: {
- username: process.env.OPENSEARCH_USERNAME!,
- password: process.env.OPENSEARCH_PASSWORD!,
- },
- ssl: {
- rejectUnauthorized: false,
- },
-});
+const createClient = () =>
+ new Client({
+ node: baseURL,
+ auth: {
+ username: process.env.OPENSEARCH_USERNAME!,
+ password: process.env.OPENSEARCH_PASSWORD!,
+ },
+ ssl: {
+ rejectUnauthorized: false,
+ },
+ });
-const createUserClient = (username: string, password: string) => new Client({
- node: baseURL,
- auth: {
- username,
- password,
- },
- ssl: {
- rejectUnauthorized: false,
- },
-});
+const createUserClient = (username: string, password: string) =>
+ new Client({
+ node: baseURL,
+ auth: {
+ username,
+ password,
+ },
+ ssl: {
+ rejectUnauthorized: false,
+ },
+ });
export const checkAuth = async (username: string, password: string) => {
const client = createUserClient(username, password);
@@ -115,7 +120,7 @@ export const getUserMetadata = async (username: string) => {
await client.create({
id: username,
index: userMetadataIndexName,
- body: { username, savedSearches: [] }
+ body: { username, savedSearches: [] },
});
res = await client.get({
@@ -132,7 +137,7 @@ export const saveUserMetadata = async (username: string, metadata: any) => {
await client.update({
id: username,
index: userMetadataIndexName,
- body: { doc: { username, ...metadata } }
+ body: { doc: { username, ...metadata } },
});
};
@@ -181,7 +186,7 @@ const getIndexPattern: any = async (index: string) => {
sort: ["updated_at:desc"],
});
- if (res.body.hits.total.value === 0) {
+ if (res?.body?.hits?.total?.valueOf() === 0) {
// eslint-disable-next-line no-use-before-define
return createCurrentUserIndexPattern(index);
}
@@ -226,7 +231,7 @@ interface createUserVisualizationProps {
}
export const createUserVisualization = async (
- props: createUserVisualizationProps
+ props: createUserVisualizationProps,
) => {
const { email, query, visualizationID, title, description } = props;
const userIndex = await getCurrentUserIndex(email);
@@ -279,7 +284,7 @@ interface updateVisualizationProps {
}
export const updateUserVisualization = async (
- props: updateVisualizationProps
+ props: updateVisualizationProps,
) => {
const { email, id, query, title, description } = props;
const userIndex = await getCurrentUserIndex(email);
@@ -300,8 +305,7 @@ export const updateUserVisualization = async (
body,
});
} catch (e) {
- // eslint-disable-next-line no-console
- console.log({ e });
+ logger.error({ e });
}
return id;
@@ -469,10 +473,18 @@ export const performQuery = async (searchQuery: any, limit: number) => {
const results = hits.map((hit: any) => ({
...hit._source,
id: hit._id,
- incident: Array.isArray(hit._source.incident) ? hit._source.incident.join(", ") : hit._source.incident,
- technology: Array.isArray(hit._source.technology) ? hit._source.technology.join(", ") : hit._source.technology,
- targeted_group: Array.isArray(hit._source.targeted_group) ? hit._source.targeted_group.join(", ") : hit._source.targeted_group,
- country: Array.isArray(hit._source.country) ? hit._source.country.join(", ") : hit._source.country,
+ incident: Array.isArray(hit._source.incident)
+ ? hit._source.incident.join(", ")
+ : hit._source.incident,
+ technology: Array.isArray(hit._source.technology)
+ ? hit._source.technology.join(", ")
+ : hit._source.technology,
+ targeted_group: Array.isArray(hit._source.targeted_group)
+ ? hit._source.targeted_group.join(", ")
+ : hit._source.targeted_group,
+ country: Array.isArray(hit._source.country)
+ ? hit._source.country.join(", ")
+ : hit._source.country,
}));
return results;
@@ -570,7 +582,6 @@ export const getTemplates = async (limit: number) => {
},
};
-
const rawResponse = await client.search({
index: globalIndex,
size: limit,
diff --git a/apps/leafcutter/app/api/link/auth/route.ts b/apps/leafcutter/app/api/link/auth/route.ts
index 37b356e..1960382 100644
--- a/apps/leafcutter/app/api/link/auth/route.ts
+++ b/apps/leafcutter/app/api/link/auth/route.ts
@@ -1,15 +1,13 @@
import { NextRequest, NextResponse } from "next/server";
export const GET = async (req: NextRequest) => {
- const validDomains = "localhost";
- console.log({ req });
+ const validDomains = "localhost";
- return NextResponse.json({ response: "ok" });
+ return NextResponse.json({ response: "ok" });
};
export const POST = async (req: NextRequest) => {
- const validDomains = "localhost";
- console.log({ req });
+ const validDomains = "localhost";
- return NextResponse.json({ response: "ok" });
+ return NextResponse.json({ response: "ok" });
};
diff --git a/apps/leafcutter/app/api/trends/recent/route.ts b/apps/leafcutter/app/api/trends/recent/route.ts
index a635d29..d18b657 100644
--- a/apps/leafcutter/app/api/trends/recent/route.ts
+++ b/apps/leafcutter/app/api/trends/recent/route.ts
@@ -2,10 +2,9 @@ import { NextResponse } from "next/server";
import { getTrends } from "app/_lib/opensearch";
export const GET = async () => {
- const results = await getTrends(5);
- console.log({ results });
+ const results = await getTrends(5);
- NextResponse.json(results);
+ NextResponse.json(results);
};
-export const dynamic = 'force-dynamic';
+export const dynamic = "force-dynamic";
diff --git a/apps/leafcutter/app/api/upload/index.ts b/apps/leafcutter/app/api/upload/index.ts
index 4f3223e..dd2ea26 100644
--- a/apps/leafcutter/app/api/upload/index.ts
+++ b/apps/leafcutter/app/api/upload/index.ts
@@ -4,6 +4,9 @@ import { Client } from "@opensearch-project/opensearch";
import { v4 as uuid } from "uuid";
import taxonomy from "app/_config/taxonomy.json";
import unRegions from "app/_config/unRegions.json";
+import { createLogger } from "@link-stack/logger";
+
+const logger = createLogger('leafcutter-index');
export const POST = async (req: NextRequest) => {
const { tickets } = await req.json();
@@ -15,8 +18,8 @@ export const POST = async (req: NextRequest) => {
rejectUnauthorized: false,
},
headers: {
- authorization
- }
+ authorization,
+ },
});
const succeeded = [];
@@ -28,11 +31,15 @@ export const POST = async (req: NextRequest) => {
const country = ticket.country[0] ?? "none";
// @ts-expect-error
const translatedCountry = taxonomy.country[country]?.display ?? "none";
- const countryDetails: any = unRegions.find((c) => c.name === translatedCountry);
+ const countryDetails: any = unRegions.find(
+ (c) => c.name === translatedCountry,
+ );
const augmentedTicket = {
...ticket,
- region: countryDetails['sub-region']?.toLowerCase().replace(" ", "-") ?? null,
- continent: countryDetails.region?.toLowerCase().replace(" ", "-") ?? null,
+ region:
+ countryDetails["sub-region"]?.toLowerCase().replace(" ", "-") ?? null,
+ continent:
+ countryDetails.region?.toLowerCase().replace(" ", "-") ?? null,
};
const out = await client.create({
id: uuid(),
@@ -40,10 +47,9 @@ export const POST = async (req: NextRequest) => {
refresh: true,
body: augmentedTicket,
});
- console.log(out);
succeeded.push(id);
} catch (e) {
- console.log(e);
+ logger.error(e);
failed.push(id);
}
}
@@ -52,4 +58,3 @@ export const POST = async (req: NextRequest) => {
return NextResponse.json(results);
};
-
diff --git a/apps/leafcutter/app/api/visualizations/delete/route.ts b/apps/leafcutter/app/api/visualizations/delete/route.ts
index 2200ed7..20e10b5 100644
--- a/apps/leafcutter/app/api/visualizations/delete/route.ts
+++ b/apps/leafcutter/app/api/visualizations/delete/route.ts
@@ -3,13 +3,13 @@ import { getServerSession } from "next-auth";
import { authOptions } from "app/_lib/auth";
import { deleteUserVisualization } from "app/_lib/opensearch";
-export const POST = async (req: NextRequest, res: NextResponse) => {
- const session = await getServerSession(authOptions);
- const { user: { email } }: any = session;
- const { id } = await req.json();
- await deleteUserVisualization(email as string, id);
+export const POST = async (req: NextRequest) => {
+ const session = await getServerSession(authOptions);
+ const {
+ user: { email },
+ }: any = session;
+ const { id } = await req.json();
+ await deleteUserVisualization(email as string, id);
- return NextResponse.json({ id });
+ return NextResponse.json({ id });
};
-
-
diff --git a/apps/leafcutter/next-env.d.ts b/apps/leafcutter/next-env.d.ts
index 725dd6f..36a4fe4 100644
--- a/apps/leafcutter/next-env.d.ts
+++ b/apps/leafcutter/next-env.d.ts
@@ -1,6 +1,7 @@
///
///
///
+///
// NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/apps/leafcutter/next.config.js b/apps/leafcutter/next.config.js
index e8cb203..a57f18f 100644
--- a/apps/leafcutter/next.config.js
+++ b/apps/leafcutter/next.config.js
@@ -1,8 +1,5 @@
module.exports = {
transpilePackages: ["@link-stack/leafcutter-ui", "@link-stack/opensearch-common"],
- experimental: {
- missingSuspenseWithCSRBailout: false,
- },
poweredByHeader: false,
rewrites: async () => ({
fallback: [
diff --git a/apps/leafcutter/package.json b/apps/leafcutter/package.json
index 9c3e062..b21e711 100644
--- a/apps/leafcutter/package.json
+++ b/apps/leafcutter/package.json
@@ -1,6 +1,6 @@
{
"name": "@link-stack/leafcutter",
- "version": "2.2.0",
+ "version": "3.2.0b3",
"scripts": {
"dev": "next dev -p 3001",
"login": "aws sso login --sso-session cdr",
@@ -13,37 +13,38 @@
"lint": "next lint"
},
"dependencies": {
- "@emotion/cache": "^11.13.1",
- "@emotion/react": "^11.13.3",
+ "@emotion/cache": "^11.14.0",
+ "@emotion/react": "^11.14.0",
"@emotion/server": "^11.11.0",
- "@emotion/styled": "^11.13.0",
+ "@emotion/styled": "^11.14.1",
"@link-stack/leafcutter-ui": "*",
+ "@link-stack/logger": "*",
"@link-stack/opensearch-common": "*",
- "@mui/icons-material": "^5",
- "@mui/material": "^5",
- "@mui/material-nextjs": "^5",
- "@mui/x-date-pickers-pro": "^7.18.0",
- "@opensearch-project/opensearch": "^2.12.0",
+ "@mui/icons-material": "^6",
+ "@mui/material": "^6",
+ "@mui/material-nextjs": "^6",
+ "@mui/x-date-pickers-pro": "^7",
+ "@opensearch-project/opensearch": "^3.5.1",
"date-fns": "^4.1.0",
- "http-proxy-middleware": "^3.0.2",
- "material-ui-popup-state": "^5.3.1",
- "next": "^14.2.23",
- "next-auth": "^4.24.8",
- "react": "18.3.1",
- "react-cookie": "^7.2.0",
+ "http-proxy-middleware": "^3.0.5",
+ "material-ui-popup-state": "^5.3.6",
+ "next": "15.5.4",
+ "next-auth": "^4.24.11",
+ "react": "19.2.0",
+ "react-cookie": "^8.0.1",
"react-cookie-consent": "^9.0.0",
- "react-dom": "18.3.1",
+ "react-dom": "19.2.0",
"react-iframe": "^1.8.5",
"react-polyglot": "^0.7.2",
- "sharp": "^0.33.5",
- "uuid": "^10.0.0"
+ "sharp": "^0.34.4",
+ "uuid": "^13.0.0"
},
"devDependencies": {
+ "@types/node": "^24.7.0",
+ "@types/react": "19.2.2",
+ "@types/uuid": "^11.0.0",
"@link-stack/eslint-config": "*",
"@link-stack/typescript-config": "*",
- "@types/node": "^22.7.3",
- "@types/react": "18.3.9",
- "@types/uuid": "^10.0.0",
- "typescript": "5.6.2"
+ "typescript": "5.9.3"
}
}
diff --git a/apps/leafcutter/pages/api/proxy/[[...path]].ts b/apps/leafcutter/pages/api/proxy/[[...path]].ts
index 913b7cb..fd296d1 100644
--- a/apps/leafcutter/pages/api/proxy/[[...path]].ts
+++ b/apps/leafcutter/pages/api/proxy/[[...path]].ts
@@ -1,6 +1,9 @@
import { createProxyMiddleware } from "http-proxy-middleware";
import { NextApiRequest, NextApiResponse } from "next";
import { getToken } from "next-auth/jwt";
+import { createLogger } from "@link-stack/logger";
+
+const logger = createLogger('leafcutter-[[...path]]');
/*
@@ -24,17 +27,17 @@ const withAuthInfo =
const requestSignature = req.query.signature;
const url = new URL(req.headers.referer as string);
const referrerSignature = url.searchParams.get("signature");
-
- console.log({ requestSignature, referrerSignature });
const isAppPath = !!req.url?.startsWith("/app");
- const isResourcePath = !!req.url?.match(/\/(api|app|bootstrap|3961|ui|translations|internal|login|node_modules)/);
+ const isResourcePath = !!req.url?.match(
+ /\/(api|app|bootstrap|3961|ui|translations|internal|login|node_modules)/,
+ );
if (requestSignature && isAppPath) {
- console.log("Has Signature");
+ logger.info("Has Signature");
}
if (referrerSignature && isResourcePath) {
- console.log("Has Signature");
+ logger.info("Has Signature");
}
if (!email) {
diff --git a/apps/leafcutter/public/robots.txt b/apps/leafcutter/public/robots.txt
new file mode 100644
index 0000000..1f53798
--- /dev/null
+++ b/apps/leafcutter/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
diff --git a/apps/link/Dockerfile b/apps/link/Dockerfile
index d894214..833a82a 100644
--- a/apps/link/Dockerfile
+++ b/apps/link/Dockerfile
@@ -38,10 +38,7 @@ RUN chown -R node ${APP_DIR}/
USER node
WORKDIR ${APP_DIR}
-COPY --from=installer ${APP_DIR}/node_modules/ ./node_modules/
-COPY --from=installer ${APP_DIR}/apps/link/ ./apps/link/
-COPY --from=installer ${APP_DIR}/apps/bridge-migrations/ ./apps/bridge-migrations/
-COPY --from=installer ${APP_DIR}/package.json ./package.json
+COPY --from=installer ${APP_DIR} ./
USER root
WORKDIR ${APP_DIR}/apps/link/
RUN chmod +x docker-entrypoint.sh
diff --git a/apps/link/README.md b/apps/link/README.md
index e03b35c..f080763 100644
--- a/apps/link/README.md
+++ b/apps/link/README.md
@@ -1,32 +1,109 @@
-This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
+# CDR Link
-## Getting Started
+The main CDR (Center for Digital Resilience) Link application - a streamlined helpdesk interface built on top of Zammad with integrated communication channels and data visualization.
-First, run the development server:
+## Overview
+
+CDR Link provides a unified dashboard for managing support tickets, communication channels, and data analytics. It integrates multiple services including Zammad (ticketing), Bridge (multi-channel messaging), Leafcutter (data visualization), and OpenSearch.
+
+## Features
+
+- **Simplified Helpdesk Interface**: Streamlined UI for Zammad ticket management
+- **Multi-Channel Communication**: Integration with Signal, WhatsApp, Facebook, and Voice channels
+- **Data Visualization**: Embedded Leafcutter analytics and reporting
+- **User Management**: Role-based access control with Google OAuth
+- **Search**: Integrated OpenSearch for advanced queries
+- **Label Studio Integration**: For data annotation workflows
+
+## Development
+
+### Prerequisites
+
+- Node.js >= 20
+- npm >= 10
+- Running instances of Zammad, PostgreSQL, and Redis
+- Configured authentication providers
+
+### Setup
```bash
+# Install dependencies
+npm install
+
+# Run development server
npm run dev
+
+# Build for production
+npm run build
+
+# Start production server
+npm run start
```
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+### Environment Variables
-You can start editing the page by modifying `pages/index.js`. The page auto-updates as you edit the file.
+Key environment variables required:
-[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.js`.
+- `ZAMMAD_URL` - Zammad instance URL
+- `ZAMMAD_API_TOKEN` - Zammad API authentication token
+- `DATABASE_URL` - PostgreSQL connection string
+- `REDIS_URL` - Redis connection URL
+- `NEXTAUTH_URL` - Application URL for authentication
+- `NEXTAUTH_SECRET` - Secret for NextAuth.js
+- `GOOGLE_CLIENT_ID` - Google OAuth client ID
+- `GOOGLE_CLIENT_SECRET` - Google OAuth client secret
-The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages.
+### Available Scripts
-## Learn More
+- `npm run dev` - Start development server
+- `npm run build` - Build for production
+- `npm run start` - Start production server
+- `npm run lint` - Run ESLint
+- `npm run export` - Export static site
-To learn more about Next.js, take a look at the following resources:
+## Architecture
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+### Pages Structure
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
+- `/` - Main dashboard
+- `/overview/[overview]` - Ticket overview pages
+- `/tickets/[id]` - Individual ticket view/edit
+- `/admin/bridge` - Bridge configuration management
+- `/leafcutter` - Data visualization dashboard
+- `/opensearch` - Search dashboard
+- `/zammad` - Direct Zammad access
+- `/profile` - User profile management
-## Deploy on Vercel
+### API Routes
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+- `/api/auth` - NextAuth.js authentication
+- `/api/v2/users` - User management API
+- `/api/[service]/bots` - Bot management for communication channels
+- `/api/[service]/webhooks` - Webhook endpoints
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
+### Key Components
+
+- `ZammadWrapper` - Embeds Zammad UI with authentication
+- `SearchBox` - Global search functionality
+- `TicketList` / `TicketDetail` - Ticket management components
+- `Sidebar` - Navigation and service switching
+
+## Docker Support
+
+Build and run with Docker:
+
+```bash
+# Build image
+docker build -t link-stack/link .
+
+# Run with docker-compose
+docker-compose -f docker/compose/link.yml up
+```
+
+## Integration Points
+
+- **Zammad**: GraphQL queries for ticket data
+- **Bridge Services**: REST APIs for channel management
+- **Leafcutter**: Embedded iframe integration
+- **OpenSearch**: Direct dashboard embedding
+- **Redis**: Session and cache storage
\ No newline at end of file
diff --git a/apps/link/app/(login)/login/_components/Login.tsx b/apps/link/app/(login)/login/_components/Login.tsx
index 0cc1234..3207dfd 100644
--- a/apps/link/app/(login)/login/_components/Login.tsx
+++ b/apps/link/app/(login)/login/_components/Login.tsx
@@ -23,13 +23,15 @@ import { useSearchParams } from "next/navigation";
type LoginProps = {
session: any;
+ baseURL: string;
};
-export const Login: FC = ({ session }) => {
- const origin =
- typeof window !== "undefined" && window.location.origin
- ? window.location.origin
- : "";
+export const Login: FC = ({ session, baseURL }) => {
+ let origin = null;
+ if (typeof window !== "undefined") {
+ origin = window.location.origin;
+ }
+ const callbackUrl = `${origin}/link`;
const [provider, setProvider] = useState(undefined);
const [email, setEmail] = useState("");
const [password, setPassword] = useState("");
@@ -158,7 +160,7 @@ export const Login: FC = ({ session }) => {
sx={buttonStyles}
onClick={() =>
signIn("google", {
- callbackUrl: `${origin}`,
+ callbackUrl,
})
}
>
@@ -174,7 +176,7 @@ export const Login: FC = ({ session }) => {
sx={buttonStyles}
onClick={() =>
signIn("apple", {
- callbackUrl: `${window.location.origin}`,
+ callbackUrl,
})
}
>
@@ -189,7 +191,7 @@ export const Login: FC = ({ session }) => {
sx={buttonStyles}
onClick={() =>
signIn("azure-ad", {
- callbackUrl: `${origin}`,
+ callbackUrl,
})
}
>
@@ -226,13 +228,13 @@ export const Login: FC = ({ session }) => {
+ onClick={() => {
signIn("credentials", {
email,
password,
- callbackUrl: `${origin}/setup`,
- })
- }
+ callbackUrl,
+ });
+ }}
>
Sign in with Zammad credentials
diff --git a/apps/link/app/(login)/login/page.tsx b/apps/link/app/(login)/login/page.tsx
index 7bafdbb..ea944ba 100644
--- a/apps/link/app/(login)/login/page.tsx
+++ b/apps/link/app/(login)/login/page.tsx
@@ -9,10 +9,11 @@ export const metadata: Metadata = {
export default async function Page() {
const session = await getSession();
+ const baseURL = process.env.LINK_URL;
return (
Loading...}>
-
+
);
}
diff --git a/apps/link/app/(main)/_components/ClientOnly.tsx b/apps/link/app/(main)/_components/ClientOnly.tsx
index 46e79e8..b669b4f 100644
--- a/apps/link/app/(main)/_components/ClientOnly.tsx
+++ b/apps/link/app/(main)/_components/ClientOnly.tsx
@@ -1,8 +1,9 @@
"use client";
+import { ReactNode } from "react";
import dynamic from "next/dynamic";
-type ClientOnlyProps = { children: JSX.Element };
+type ClientOnlyProps = { children: ReactNode };
const ClientOnly = (props: ClientOnlyProps) => {
const { children } = props;
diff --git a/apps/link/app/(main)/_components/Home.tsx b/apps/link/app/(main)/_components/Home.tsx
index 1a404ae..44332f1 100644
--- a/apps/link/app/(main)/_components/Home.tsx
+++ b/apps/link/app/(main)/_components/Home.tsx
@@ -3,9 +3,10 @@
import { FC } from "react";
import { OpenSearchWrapper } from "@link-stack/leafcutter-ui";
-export const Home: FC = () => (
-
+type HomeProps = {
+ url: string;
+};
+
+export const Home: FC = ({ url }) => (
+
);
diff --git a/apps/link/app/(main)/_components/Sidebar.tsx b/apps/link/app/(main)/_components/Sidebar.tsx
index c099c42..1bd7a1c 100644
--- a/apps/link/app/(main)/_components/Sidebar.tsx
+++ b/apps/link/app/(main)/_components/Sidebar.tsx
@@ -207,10 +207,6 @@ export const Sidebar: FC = ({
return () => clearInterval(interval);
}, []);
- const logout = () => {
- signOut({ callbackUrl: "/login" });
- };
-
return (
= ({
{open
? username
: username
- .split(" ")
- .map((name) => name.substring(0, 1))
- .join("")}
+ .split(" ")
+ .map((name) => name.substring(0, 1))
+ .join("")}
@@ -485,7 +481,17 @@ export const Sidebar: FC = ({
selected={pathname.endsWith("/docs")}
open={open}
/>
- {leafcutterEnabled && (
+ {roles.includes("admin") && leafcutterEnabled && (
+
+ )}
+ {false && leafcutterEnabled && (
diff --git a/apps/link/app/(main)/_components/ZammadWrapper.tsx b/apps/link/app/(main)/_components/ZammadWrapper.tsx
index 1696040..4daec0f 100644
--- a/apps/link/app/(main)/_components/ZammadWrapper.tsx
+++ b/apps/link/app/(main)/_components/ZammadWrapper.tsx
@@ -41,7 +41,6 @@ export const ZammadWrapper: FC = ({
method: "GET",
redirect: "manual",
});
- console.log({ res });
if (res.type === "opaqueredirect") {
setAuthenticated(true);
} else {
@@ -69,7 +68,6 @@ export const ZammadWrapper: FC = ({
}, [session]);
if (!session || !authenticated) {
- console.log("Not authenticated");
return (
= ({
}
if (session && authenticated) {
- console.log("Session and authenticated");
return (