Redis logout WIP

.gitlab-ci.yml

@@ -12,7 +12,7 @@ build-all:
     TURBO_TEAM: ${TURBO_TEAM}
     ZAMMAD_URL: ${ZAMMAD_URL}
   script:
-    - npm install npm@latest -g
+    - npm install npm@10 -g
     - npm install -g turbo
     - npm ci
     - turbo build
@@ -204,7 +204,7 @@ zammad-docker-build:
   before_script:
     - apk --update add nodejs npm
   script:
-    - npm install npm@latest -g
+    - npm install npm@10 -g
     - npm install -g turbo
     - npm ci
     - turbo build --force --filter @link-stack/zammad-addon-*
@@ -226,7 +226,7 @@ zammad-standalone-docker-build:
   before_script:
     - apk --update add nodejs npm
   script:
-    - npm install npm@latest -g
+    - npm install npm@10 -g
     - npm install -g turbo
     - npm ci
     - turbo build --force --filter @link-stack/zammad-addon-*

apps/bridge-frontend/app/(main)/[...segment]/@create/page.tsx

@@ -1,10 +1,11 @@
 import { Create } from "@link-stack/bridge-ui";
 
 type PageProps = {
-  params: { segment: string[] };
+  params: Promise<{ segment: string[] }>;
 };
 
-export default function Page({ params: { segment } }: PageProps) {
+export default async function Page({ params }: PageProps) {
+  const { segment } = await params;
   const service = segment[0];
 
   return <Create service={service} />;

apps/bridge-frontend/app/(main)/[...segment]/@detail/page.tsx

@@ -1,11 +1,12 @@
 import { db } from "@link-stack/bridge-common";
 import { serviceConfig, Detail } from "@link-stack/bridge-ui";
 
-type Props = {
+type PageProps = {
-  params: { segment: string[] };
+  params: Promise<{ segment: string[] }>;
 };
 
-export default async function Page({ params: { segment } }: Props) {
+export default async function Page({ params }: PageProps) {
+  const { segment } = await params;
   const service = segment[0];
   const id = segment?.[1];
 

apps/bridge-frontend/app/(main)/[...segment]/@edit/page.tsx

@@ -2,10 +2,11 @@ import { db } from "@link-stack/bridge-common";
 import { serviceConfig, Edit } from "@link-stack/bridge-ui";
 
 type PageProps = {
-  params: { segment: string[] };
+  params: Promise<{ segment: string[] }>;
 };
 
-export default async function Page({ params: { segment } }: PageProps) {
+export default async function Page({ params }: PageProps) {
+  const { segment } = await params;
   const service = segment[0];
   const id = segment?.[1];
 

apps/bridge-frontend/app/(main)/[...segment]/page.tsx

@@ -2,12 +2,13 @@ import { db } from "@link-stack/bridge-common";
 import { serviceConfig, List } from "@link-stack/bridge-ui";
 
 type PageProps = {
-  params: {
+  params: Promise<{
     segment: string[];
-  };
+  }>;
 };
 
-export default async function Page({ params: { segment } }: PageProps) {
+export default async function Page({ params }: PageProps) {
+  const { segment } = await params;
   const service = segment[0];
 
   if (!service) return null;

apps/bridge-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-frontend",
-  "version": "2.2.0",
+  "version": "2.4.0b1",
   "type": "module",
   "scripts": {
     "dev": "next dev",
@@ -13,26 +13,26 @@
     "migrate:down:one": "tsx database/migrate.ts down:one"
   },
   "dependencies": {
-    "@auth/kysely-adapter": "^1.5.2",
+    "@auth/kysely-adapter": "^1.7.4",
-    "@mui/icons-material": "^5",
+    "@mui/icons-material": "^6",
-    "@mui/material": "^5",
+    "@mui/material": "^6",
-    "@mui/material-nextjs": "^5",
+    "@mui/material-nextjs": "^6",
-    "@mui/x-license": "^7.18.0",
+    "@mui/x-license": "^7.24.1",
     "@link-stack/bridge-common": "*",
     "@link-stack/bridge-ui": "*",
-    "next": "14.2.13",
+    "next": "15.1.6",
-    "next-auth": "^4.24.8",
+    "next-auth": "^4.24.11",
-    "react": "18.3.1",
+    "react": "19.0.0",
-    "react-dom": "18.3.1",
+    "react-dom": "19.0.0",
     "sharp": "^0.33.5",
-    "tsx": "^4.19.1",
+    "tsx": "^4.19.2",
     "@link-stack/ui": "*"
   },
   "devDependencies": {
     "@types/node": "^22",
-    "@types/pg": "^8.11.10",
+    "@types/pg": "^8.11.11",
-    "@types/react": "^18",
+    "@types/react": "^19",
-    "@types/react-dom": "^18",
+    "@types/react-dom": "^19",
     "@link-stack/eslint-config": "*",
     "@link-stack/typescript-config": "*",
     "typescript": "^5"

apps/bridge-frontend/public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

apps/bridge-frontend/tsconfig.json

@@ -1,6 +1,10 @@
 {
   "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -14,14 +18,24 @@
     "jsx": "preserve",
     "incremental": true,
     "paths": {
-      "@/*": ["./*"]
+      "@/*": [
+        "./*"
+      ]
     },
     "plugins": [
       {
         "name": "next"
       }
-    ]
+    ],
+    "target": "ES2017"
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "include": [
-  "exclude": ["node_modules"]
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }

apps/bridge-migrations/migrate.ts

@@ -72,7 +72,7 @@ export const migrate = async (arg: string) => {
 
   results?.forEach((it) => {
     if (it.status === "Success") {
-      console.log(
+      console.info(
         `Migration "${it.migrationName} ${it.direction.toLowerCase()}" was executed successfully`,
       );
     } else if (it.status === "Error") {

apps/bridge-migrations/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-migrations",
-  "version": "2.2.0",
+  "version": "2.4.0b1",
   "type": "module",
   "scripts": {
     "migrate:up:all": "tsx migrate.ts up:all",
@@ -9,14 +9,14 @@
     "migrate:down:one": "tsx migrate.ts down:one"
   },
   "dependencies": {
-    "dotenv": "^16.4.5",
+    "dotenv": "^16.4.7",
     "kysely": "0.26.1",
-    "pg": "^8.13.0",
+    "pg": "^8.13.1",
-    "tsx": "^4.19.1"
+    "tsx": "^4.19.2"
   },
   "devDependencies": {
     "@types/node": "^22",
-    "@types/pg": "^8.11.10",
+    "@types/pg": "^8.11.11",
     "@link-stack/eslint-config": "*",
     "@link-stack/typescript-config": "*",
     "typescript": "^5"

apps/bridge-whatsapp/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@link-stack/bridge-whatsapp",
-  "version": "2.2.0",
+  "version": "2.4.0b1",
   "main": "build/main/index.js",
   "author": "Darren Clarke <darren@redaranj.com>",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "@adiwajshing/keyed-db": "0.2.4",
-    "@hapi/hapi": "^21.3.10",
+    "@hapi/hapi": "^21.3.12",
     "@hapipal/schmervice": "^3.0.0",
     "@hapipal/toys": "^4.0.0",
-    "@whiskeysockets/baileys": "^6.7.8",
+    "@whiskeysockets/baileys": "^6.7.9",
     "hapi-pino": "^12.1.0",
-    "link-preview-js": "^3.0.5"
+    "link-preview-js": "^3.0.13"
   },
   "devDependencies": {
     "@link-stack/eslint-config": "*",
     "@link-stack/jest-config": "*",
     "@link-stack/typescript-config": "*",
     "@types/node": "*",
-    "dotenv-cli": "^7.4.2",
+    "dotenv-cli": "^8.0.0",
-    "tsx": "^4.19.1",
+    "tsx": "^4.19.2",
-    "typescript": "^5.6.2"
+    "typescript": "^5.7.3"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",

apps/bridge-whatsapp/src/routes.ts

@@ -26,7 +26,6 @@ export const SendMessageRoute = withDefaults({
     description: "Send a message",
     async handler(request: Hapi.Request, _h: Hapi.ResponseToolkit) {
       const { id } = request.params;
-      console.log({ payload: request.payload });
       const { phoneNumber, message } = request.payload as MessageRequest;
       const whatsappService = getService(request);
       await whatsappService.send(id, phoneNumber, message as string);

apps/bridge-whatsapp/src/service.ts

@@ -57,7 +57,7 @@ export default class WhatsappService extends Service {
       try {
         connection.end(null);
       } catch (error) {
-        console.log(error);
+        console.error(error);
       }
     }
     this.connections = {};
@@ -92,27 +92,27 @@ export default class WhatsappService extends Service {
           isNewLogin,
         } = update;
         if (qr) {
-          console.log("got qr code");
+          console.info("got qr code");
           const botDirectory = this.getBotDirectory(botID);
           const qrPath = `${botDirectory}/qr.txt`;
           fs.writeFileSync(qrPath, qr, "utf8");
         } else if (isNewLogin) {
-          console.log("got new login");
+          console.info("got new login");
           const botDirectory = this.getBotDirectory(botID);
           const verifiedFile = `${botDirectory}/verified`;
           fs.writeFileSync(verifiedFile, "");
         } else if (connectionState === "open") {
-          console.log("opened connection");
+          console.info("opened connection");
         } else if (connectionState === "close") {
-          console.log("connection closed due to ", lastDisconnect?.error);
+          console.info("connection closed due to ", lastDisconnect?.error);
           const disconnectStatusCode = (lastDisconnect?.error as any)?.output
             ?.statusCode;
           if (disconnectStatusCode === DisconnectReason.restartRequired) {
-            console.log("reconnecting after got new login");
+            console.info("reconnecting after got new login");
             await this.createConnection(botID, server, options);
             authCompleteCallback?.();
           } else if (disconnectStatusCode !== DisconnectReason.loggedOut) {
-            console.log("reconnecting");
+            console.info("reconnecting");
             await this.sleep(pause);
             pause *= 2;
             this.createConnection(botID, server, options);
@@ -121,12 +121,12 @@ export default class WhatsappService extends Service {
       }
 
       if (events["creds.update"]) {
-        console.log("creds update");
+        console.info("creds update");
         await saveCreds();
       }
 
       if (events["messages.upsert"]) {
-        console.log("messages upsert");
+        console.info("messages upsert");
         const upsert = events["messages.upsert"];
         const { messages } = upsert;
         if (messages) {
@@ -143,13 +143,13 @@ export default class WhatsappService extends Service {
 
     const baseDirectory = this.getBaseDirectory();
     const botIDs = fs.readdirSync(baseDirectory);
-    console.log({ botIDs });
+
     for await (const botID of botIDs) {
       const directory = this.getBotDirectory(botID);
       const verifiedFile = `${directory}/verified`;
       if (fs.existsSync(verifiedFile)) {
         const { version, isLatest } = await fetchLatestBaileysVersion();
-        console.log(`using WA v${version.join(".")}, isLatest: ${isLatest}`);
+        console.info(`using WA v${version.join(".")}, isLatest: ${isLatest}`);
 
         await this.createConnection(botID, this.server, {
           browser: WhatsappService.browserDescription,
@@ -169,7 +169,10 @@ export default class WhatsappService extends Service {
       message,
       messageTimestamp,
     } = webMessageInfo;
-    console.log(webMessageInfo);
+    console.info("Message type debug");
+    for (const key in message) {
+      console.info(key, !!message[key as keyof proto.IMessage]);
+    }
     const isValidMessage =
       message && remoteJid !== "status@broadcast" && !fromMe;
     if (isValidMessage) {

apps/bridge-worker/graphile.config.ts

@@ -4,8 +4,12 @@ import type {} from "graphile-worker";
 const preset: GraphileConfig.Preset = {
   worker: {
     connectionString: process.env.DATABASE_URL,
-    maxPoolSize: 10,
+    maxPoolSize: process.env.BRIDGE_WORKER_POOL_SIZE
-    pollInterval: 2000,
+      ? parseInt(process.env.BRIDGE_WORKER_POOL_SIZE, 10)
+      : 10,
+    pollInterval: process.env.BRIDGE_WORKER_POLL_INTERVAL
+      ? parseInt(process.env.BRIDGE_WORKER_POLL_INTERVAL, 10)
+      : 2000,
     fileExtensions: [".ts"],
   },
 };

apps/bridge-worker/index.ts

@@ -6,13 +6,20 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 const startWorker = async () => {
-  console.log("Starting worker...");
+  console.info("Starting worker...");
-  console.log(process.env);
+
   await run({
     connectionString: process.env.DATABASE_URL,
-    concurrency: 10,
     noHandleSignals: false,
-    pollInterval: 1000,
+    concurrency: process.env.BRIDGE_WORKER_CONCURRENCY
+      ? parseInt(process.env.BRIDGE_WORKER_CONCURRENCY, 10)
+      : 10,
+    maxPoolSize: process.env.BRIDGE_WORKER_POOL_SIZE
+      ? parseInt(process.env.BRIDGE_WORKER_POOL_SIZE, 10)
+      : 10,
+    pollInterval: process.env.BRIDGE_WORKER_POLL_INTERVAL
+      ? parseInt(process.env.BRIDGE_WORKER_POLL_INTERVAL, 10)
+      : 1000,
     taskDirectory: `${__dirname}/tasks`,
     crontabFile: `${__dirname}/crontab`,
   });

apps/bridge-worker/lib/common.ts

@@ -62,9 +62,8 @@ export const createZammadTicket = async (
       },
     });
   } catch (error: any) {
-    console.log(Object.keys(error));
     if (error.isBoom) {
-      console.log(error.output);
+      console.error(error.output);
       throw new Error("Failed to create zamamd ticket");
     }
   }

apps/bridge-worker/lib/media-convert.ts

@@ -25,7 +25,7 @@ const defaultAudioConvertOpts = {
  **/
 export const convert = (
   input: Buffer,
-  opts?: AudioConvertOpts
+  opts?: AudioConvertOpts,
 ): Promise<Buffer> => {
   const settings = { ...defaultAudioConvertOpts, ...opts };
   return new Promise((resolve, reject) => {
@@ -35,12 +35,8 @@ export const convert = (
       .audioCodec(settings.audioCodec)
       .audioBitrate(settings.bitrate)
       .toFormat(settings.format)
-      .on("error", (err, stdout, stderr) => {
+      .on("error", (err, _stdout, _stderr) => {
         console.error(err.message);
-        console.log("FFMPEG OUTPUT");
-        console.log(stdout);
-        console.log("FFMPEG ERROR");
-        console.log(stderr);
         reject(err);
       })
       .on("end", () => {
@@ -66,8 +62,12 @@ export const selfCheck = (): Promise<boolean> => {
         resolve(false);
       }
 
-      const preds = R.map(requiredCodecs, (codec) => (available: any) =>
+      const preds = R.map(
-        available[codec] && available[codec].canDemux && available[codec].canMux
+        requiredCodecs,
+        (codec) => (available: any) =>
+          available[codec] &&
+          available[codec].canDemux &&
+          available[codec].canMux,
       );
 
       resolve(R.allPass(codecs, preds));
@@ -79,6 +79,6 @@ export const assertFfmpegAvailable = async (): Promise<void> => {
   const r = await selfCheck();
   if (!r)
     throw new Error(
-      `ffmpeg is not installed, could not be located, or does not support the required codecs: ${requiredCodecs}`
+      `ffmpeg is not installed, could not be located, or does not support the required codecs: ${requiredCodecs}`,
     );
 };

apps/bridge-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-worker",
-  "version": "2.2.0",
+  "version": "2.4.0b1",
   "type": "module",
   "main": "build/main/index.js",
   "author": "Darren Clarke <darren@redaranj.com>",
@@ -16,14 +16,14 @@
     "@link-stack/signal-api": "*",
     "fluent-ffmpeg": "^2.1.3",
     "graphile-worker": "^0.16.6",
-    "remeda": "^2.14.0",
+    "remeda": "^2.20.0",
-    "twilio": "^5.3.2"
+    "twilio": "^5.4.2"
   },
   "devDependencies": {
-    "@types/fluent-ffmpeg": "^2.1.26",
+    "@types/fluent-ffmpeg": "^2.1.27",
-    "dotenv-cli": "^7.4.2",
+    "dotenv-cli": "^8.0.0",
     "@link-stack/eslint-config": "*",
     "@link-stack/typescript-config": "*",
-    "typescript": "^5.6.2"
+    "typescript": "^5.7.3"
   }
 }

apps/bridge-worker/tasks/common/notify-webhooks.ts

@@ -19,13 +19,11 @@ const notifyWebhooksTask = async (
   for (const webhook of webhooks) {
     const { endpointUrl, httpMethod, headers } = webhook;
     const finalHeaders = { "Content-Type": "application/json", ...headers };
-    console.log({ endpointUrl, httpMethod, headers, finalHeaders });
     const result = await fetch(endpointUrl, {
       method: httpMethod,
       headers: finalHeaders,
       body: JSON.stringify(payload),
     });
-    console.log(result);
   }
 };
 

apps/bridge-worker/tasks/facebook/send-facebook-message.ts

@@ -31,7 +31,6 @@ const sendFacebookMessageTask = async (
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(outgoingMessage),
     });
-    console.log({ response });
   } catch (error) {
     console.error({ error });
     throw error;

apps/bridge-worker/tasks/fetch-signal-messages.ts

@@ -46,7 +46,6 @@ const processMessage = async ({
   message: msg,
 }: ProcessMessageArgs): Promise<Record<string, any>[]> => {
   const { envelope } = msg;
-  console.log(envelope);
   const { source, sourceUuid, dataMessage } = envelope;
 
   if (!dataMessage) return [];
@@ -125,7 +124,6 @@ const fetchSignalMessagesTask = async ({
         phoneNumber,
         message,
       });
-      console.log({ formattedMessages });
       for (const formattedMessage of formattedMessages) {
         if (formattedMessage.to !== formattedMessage.from) {
           await worker.addJob(

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,22 +48,8 @@ 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(
       `${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<void> => {
       await sendToLabelStudio(tickets);
       const lastTicket = tickets.pop();
       const newLastTimestamp = lastTicket.data.source_closed_at;
-      console.log({ newLastTimestamp });
       await db.settings.upsert(settingName, {
         minUpdatedTimestamp: newLastTimestamp,
       });

apps/bridge-worker/tasks/leafcutter/import-leafcutter.ts

@@ -43,14 +43,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 +60,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 +73,6 @@ const fetchFromLabelStudio = async (
     }
   }
 
-  console.log({ allDocs });
   return allDocs;
 };
 
@@ -93,9 +86,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 +122,7 @@ const sendToLeafcutter = async (tickets: LabelStudioTicket[]) => {
     };
   });
 
-  console.log("Sending to Leafcutter");
+  console.info("Sending to Leafcutter");
-  console.log({ finalTickets });
 
   const result = await fetch(opensearchApiUrl, {
     method: "POST",
@@ -157,15 +147,7 @@ const importLeafcutterTask = async (): Promise<void> => {
       ? 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,

apps/bridge-worker/tasks/signal/receive-signal-message.ts

@@ -23,7 +23,6 @@ const receiveSignalMessageTask = async ({
   filename,
   mimeType,
 }: ReceiveSignalMessageTaskOptions): Promise<void> => {
-  console.log({ token, to, from });
   const worker = await getWorkerUtils();
   const row = await db
     .selectFrom("SignalBot")

apps/bridge-worker/tasks/signal/send-signal-message.ts

@@ -13,7 +13,6 @@ const sendSignalMessageTask = async ({
   to,
   message,
 }: SendSignalMessageTaskOptions): Promise<void> => {
-  console.log({ token, to });
   const bot = await db
     .selectFrom("SignalBot")
     .selectAll()
@@ -34,7 +33,6 @@ const sendSignalMessageTask = async ({
         message,
       },
     });
-    console.log({ response });
   } catch (error) {
     console.error({ error });
     throw error;

apps/bridge-worker/tasks/whatsapp/receive-whatsapp-message.ts

@@ -23,8 +23,6 @@ const receiveWhatsappMessageTask = async ({
   filename,
   mimeType,
 }: ReceiveWhatsappMessageTaskOptions): Promise<void> => {
-  console.log({ token, to, from });
-
   const worker = await getWorkerUtils();
   const row = await db
     .selectFrom("WhatsappBot")

apps/bridge-worker/tasks/whatsapp/send-whatsapp-message.ts

@@ -25,7 +25,6 @@ const sendWhatsappMessageTask = async ({
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(params),
     });
-    console.log({ result });
   } catch (error) {
     console.error({ error });
     throw new Error("Failed to send message");

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 <About />;
+  return (
+    <Suspense>
+      <About />
+    </Suspense>
+  );
 }

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() {
+export const dynamic = "force-dynamic";
-  return <FAQ />;
+
+export default async function Page() {
+  return (
+    <Suspense>
+      <FAQ />
+    </Suspense>
+  );
 }

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;
 };

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;
 };

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 (

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 <Setup />;
+  return (
+    <Suspense>
+      <Setup />
+    </Suspense>
+  );
 }

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],
+    id: hit?._id.split(":")[1],
-    title: hit._source.visualization.title,
+    title: hit?._source?.visualization.title,
-    description: hit._source.visualization.description,
+    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 <VisualizationDetail {...visualization} editing={false} />;

apps/leafcutter/app/_components/Sidebar.tsx

@@ -48,7 +48,6 @@ const MenuItem = ({
   return (
     <Link href={href} passHref>
       <ListItem
-        button
         sx={{
           paddingLeft: "62px",
           backgroundColor: selected ? leafcutterLightBlue : "transparent",

apps/leafcutter/app/_lib/auth.ts

@@ -22,20 +22,17 @@ export const authOptions: NextAuthOptions = {
     Credentials({
       name: "Link",
       credentials: {
-        authToken: { label: "AuthToken", type: "text", },
+        authToken: { label: "AuthToken", type: "text" },
       },
       async authorize(credentials, req) {
         const { headers } = req;
-        console.log({ headers });
         const leafcutterUser = headers?.["x-leafcutter-user"];
         const authToken = credentials?.authToken;
 
         if (!leafcutterUser || leafcutterUser.trim() === "") {
-          console.log("no leafcutter user");
           return null;
         }
 
-        console.log({ authToken });
         return null;
         /*
         try {
@@ -48,14 +45,13 @@ export const authOptions: NextAuthOptions = {
 
           return user;
         } catch (e) {
-          console.log({ e });
+          console.error({ e });
         }
 
         return null;
         */
-      }
+      },
-    })
+    }),
-
   ],
   secret: process.env.NEXTAUTH_SECRET,
   /*
@@ -77,4 +73,3 @@ export const authOptions: NextAuthOptions = {
     }
   },*/
 };
-

apps/leafcutter/app/_lib/opensearch.ts

@@ -10,7 +10,8 @@ const userMetadataIndexName = "user_metadata";
 
 const baseURL = `https://${process.env.OPENSEARCH_USERNAME}:${process.env.OPENSEARCH_PASSWORD}@${process.env.OPENSEARCH_URL}`;
 
-const createClient = () => new Client({
+const createClient = () =>
+  new Client({
     node: baseURL,
     auth: {
       username: process.env.OPENSEARCH_USERNAME!,
@@ -19,9 +20,10 @@ const createClient = () => new Client({
     ssl: {
       rejectUnauthorized: false,
     },
-});
+  });
 
-const createUserClient = (username: string, password: string) => new Client({
+const createUserClient = (username: string, password: string) =>
+  new Client({
     node: baseURL,
     auth: {
       username,
@@ -30,7 +32,7 @@ const createUserClient = (username: string, password: string) => new Client({
     ssl: {
       rejectUnauthorized: false,
     },
-});
+  });
 
 export const checkAuth = async (username: string, password: string) => {
   const client = createUserClient(username, password);
@@ -115,7 +117,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 +134,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 +183,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 +228,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 +281,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 +302,7 @@ export const updateUserVisualization = async (
       body,
     });
   } catch (e) {
-    // eslint-disable-next-line no-console
+    console.error({ e });
-    console.log({ e });
   }
 
   return id;
@@ -469,10 +470,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,
+    incident: Array.isArray(hit._source.incident)
-    technology: Array.isArray(hit._source.technology) ? hit._source.technology.join(", ") : hit._source.technology,
+      ? hit._source.incident.join(", ")
-    targeted_group: Array.isArray(hit._source.targeted_group) ? hit._source.targeted_group.join(", ") : hit._source.targeted_group,
+      : hit._source.incident,
-    country: Array.isArray(hit._source.country) ? hit._source.country.join(", ") : hit._source.country,
+    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 +579,6 @@ export const getTemplates = async (limit: number) => {
     },
   };
 
-
   const rawResponse = await client.search({
     index: globalIndex,
     size: limit,

apps/leafcutter/app/api/link/auth/route.ts

@@ -2,14 +2,12 @@ import { NextRequest, NextResponse } from "next/server";
 
 export const GET = async (req: NextRequest) => {
   const validDomains = "localhost";
-    console.log({ req });
 
   return NextResponse.json({ response: "ok" });
 };
 
 export const POST = async (req: NextRequest) => {
   const validDomains = "localhost";
-    console.log({ req });
 
   return NextResponse.json({ response: "ok" });
 };

apps/leafcutter/app/api/trends/recent/route.ts

@@ -3,9 +3,8 @@ import { getTrends } from "app/_lib/opensearch";
 
 export const GET = async () => {
   const results = await getTrends(5);
-    console.log({ results });
 
   NextResponse.json(results);
 };
 
-export const dynamic = 'force-dynamic';
+export const dynamic = "force-dynamic";

apps/leafcutter/app/api/upload/index.ts

@@ -15,8 +15,8 @@ export const POST = async (req: NextRequest) => {
       rejectUnauthorized: false,
     },
     headers: {
-      authorization
+      authorization,
-    }
+    },
   });
 
   const succeeded = [];
@@ -28,11 +28,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,
+        region:
-        continent: countryDetails.region?.toLowerCase().replace(" ", "-") ?? null,
+          countryDetails["sub-region"]?.toLowerCase().replace(" ", "-") ?? null,
+        continent:
+          countryDetails.region?.toLowerCase().replace(" ", "-") ?? null,
       };
       const out = await client.create({
         id: uuid(),
@@ -40,10 +44,9 @@ export const POST = async (req: NextRequest) => {
         refresh: true,
         body: augmentedTicket,
       });
-      console.log(out);
       succeeded.push(id);
     } catch (e) {
-      console.log(e);
+      console.error(e);
       failed.push(id);
     }
   }
@@ -52,4 +55,3 @@ export const POST = async (req: NextRequest) => {
 
   return NextResponse.json(results);
 };
-

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) => {
+export const POST = async (req: NextRequest) => {
   const session = await getServerSession(authOptions);
-    const { user: { email } }: any = session;
+  const {
+    user: { email },
+  }: any = session;
   const { id } = await req.json();
   await deleteUserVisualization(email as string, id);
 
   return NextResponse.json({ id });
 };
-
-

apps/leafcutter/next-env.d.ts

@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // 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.

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: [

apps/leafcutter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/leafcutter",
-  "version": "2.2.0",
+  "version": "2.4.0b1",
   "scripts": {
     "dev": "next dev -p 3001",
     "login": "aws sso login --sso-session cdr",
@@ -13,37 +13,37 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@emotion/cache": "^11.13.1",
+    "@emotion/cache": "^11.14.0",
-    "@emotion/react": "^11.13.3",
+    "@emotion/react": "^11.14.0",
     "@emotion/server": "^11.11.0",
-    "@emotion/styled": "^11.13.0",
+    "@emotion/styled": "^11.14.0",
     "@link-stack/leafcutter-ui": "*",
     "@link-stack/opensearch-common": "*",
-    "@mui/icons-material": "^5",
+    "@mui/icons-material": "^6",
-    "@mui/material": "^5",
+    "@mui/material": "^6",
-    "@mui/material-nextjs": "^5",
+    "@mui/material-nextjs": "^6",
-    "@mui/x-date-pickers-pro": "^7.18.0",
+    "@mui/x-date-pickers-pro": "^7.24.1",
-    "@opensearch-project/opensearch": "^2.12.0",
+    "@opensearch-project/opensearch": "^3.2.0",
     "date-fns": "^4.1.0",
-    "http-proxy-middleware": "^3.0.2",
+    "http-proxy-middleware": "^3.0.3",
-    "material-ui-popup-state": "^5.3.1",
+    "material-ui-popup-state": "^5.3.3",
-    "next": "14.2.13",
+    "next": "15.1.6",
-    "next-auth": "^4.24.8",
+    "next-auth": "^4.24.11",
-    "react": "18.3.1",
+    "react": "19.0.0",
-    "react-cookie": "^7.2.0",
+    "react-cookie": "^7.2.2",
     "react-cookie-consent": "^9.0.0",
-    "react-dom": "18.3.1",
+    "react-dom": "19.0.0",
     "react-iframe": "^1.8.5",
     "react-polyglot": "^0.7.2",
     "sharp": "^0.33.5",
-    "uuid": "^10.0.0"
+    "uuid": "^11.0.5"
   },
   "devDependencies": {
-    "@types/node": "^22.7.3",
+    "@types/node": "^22.10.10",
-    "@types/react": "18.3.9",
+    "@types/react": "19.0.8",
     "@types/uuid": "^10.0.0",
     "@link-stack/eslint-config": "*",
     "@link-stack/typescript-config": "*",
-    "typescript": "5.6.2"
+    "typescript": "5.7.3"
   }
 }

apps/leafcutter/pages/api/proxy/[[...path]].ts

@@ -24,17 +24,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");
+      console.info("Has Signature");
     }
 
     if (referrerSignature && isResourcePath) {
-      console.log("Has Signature");
+      console.info("Has Signature");
     }
 
     if (!email) {

apps/leafcutter/public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

apps/link/app/(login)/login/_components/Login.tsx

@@ -29,6 +29,7 @@ export const Login: FC<LoginProps> = ({ session }) => {
     typeof window !== "undefined" && window.location.origin
       ? window.location.origin
       : "";
+  const callbackUrl = `${origin}/setup`;
   const [provider, setProvider] = useState(undefined);
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
@@ -157,7 +158,7 @@ export const Login: FC<LoginProps> = ({ session }) => {
                         sx={buttonStyles}
                         onClick={() =>
                           signIn("google", {
-                            callbackUrl: `${origin}`,
+                            callbackUrl,
                           })
                         }
                       >
@@ -173,7 +174,7 @@ export const Login: FC<LoginProps> = ({ session }) => {
                         sx={buttonStyles}
                         onClick={() =>
                           signIn("apple", {
-                            callbackUrl: `${window.location.origin}`,
+                            callbackUrl,
                           })
                         }
                       >
@@ -214,7 +215,7 @@ export const Login: FC<LoginProps> = ({ session }) => {
                             signIn("credentials", {
                               email,
                               password,
-                              callbackUrl: `${origin}/setup`,
+                              callbackUrl,
                             })
                           }
                         >

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;
 

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 = {
-  <OpenSearchWrapper
+  url: string;
-    url="/app/visualize#/edit/237b8f00-e6a0-11ee-94b3-d7b7409294e7?embed=true"
+};
-    marginTop="0"
+
-  />
+export const Home: FC<HomeProps> = ({ url }) => (
+  <OpenSearchWrapper url={url} margin={0} />
 );

apps/link/app/(main)/_components/Sidebar.tsx

@@ -501,7 +501,17 @@ export const Sidebar: FC<SidebarProps> = ({
               selected={pathname.endsWith("/reporting")}
               open={open}
             />
-            {leafcutterEnabled && (
+            {roles.includes("admin") && leafcutterEnabled && (
+              <MenuItem
+                name="Opensearch"
+                href="/opensearch"
+                Icon={InsightsIcon}
+                iconSize={20}
+                selected={pathname.startsWith("/opensearch")}
+                open={open}
+              />
+            )}
+            {false && leafcutterEnabled && (
               <MenuItem
                 name="Leafcutter"
                 href="/leafcutter"

apps/link/app/(main)/_components/ZammadWrapper.tsx

@@ -41,7 +41,6 @@ export const ZammadWrapper: FC<ZammadWrapperProps> = ({
         method: "GET",
         redirect: "manual",
       });
-      console.log({ res });
       if (res.type === "opaqueredirect") {
         setAuthenticated(true);
       } else {
@@ -69,7 +68,6 @@ export const ZammadWrapper: FC<ZammadWrapperProps> = ({
   }, [session]);
 
   if (!session || !authenticated) {
-    console.log("Not authenticated");
     return (
       <Box sx={{ width: "100%" }}>
         <Grid
@@ -89,7 +87,6 @@ export const ZammadWrapper: FC<ZammadWrapperProps> = ({
   }
 
   if (session && authenticated) {
-    console.log("Session and authenticated");
     return (
       <Iframe
         id={id}
@@ -102,10 +99,6 @@ export const ZammadWrapper: FC<ZammadWrapperProps> = ({
           const linkElement = document.querySelector(
             `#${id}`,
           ) as HTMLIFrameElement;
-
-          console.log({ path });
-          console.log({ id });
-          console.log({ linkElement });
           if (
             linkElement.contentDocument &&
             linkElement.contentDocument?.querySelector &&

apps/link/app/(main)/admin/bridge/[...segment]/@create/page.tsx

@@ -1,10 +1,11 @@
 import { Create } from "@link-stack/bridge-ui";
 
 type PageProps = {
-  params: { segment: string[] };
+  params: Promise<{ segment: string[] }>;
 };
 
-export default function Page({ params: { segment } }: PageProps) {
+export default async function Page({ params }: PageProps) {
+  const { segment } = await params;
   const service = segment[0];
 
   return <Create service={service} />;

apps/link/app/(main)/admin/bridge/[...segment]/@detail/page.tsx

@@ -1,11 +1,12 @@
 import { db } from "@link-stack/bridge-common";
 import { serviceConfig, Detail } from "@link-stack/bridge-ui";
 
-type Props = {
+type PageProps = {
-  params: { segment: string[] };
+  params: Promise<{ segment: string[] }>;
 };
 
-export default async function Page({ params: { segment } }: Props) {
+export default async function Page({ params }: PageProps) {
+  const { segment } = await params;
   const service = segment[0];
   const id = segment?.[1];
 

apps/link/app/(main)/admin/bridge/[...segment]/@edit/page.tsx

@@ -2,10 +2,11 @@ import { db } from "@link-stack/bridge-common";
 import { serviceConfig, Edit } from "@link-stack/bridge-ui";
 
 type PageProps = {
-  params: { segment: string[] };
+  params: Promise<{ segment: string[] }>;
 };
 
-export default async function Page({ params: { segment } }: PageProps) {
+export default async function Page({ params }: PageProps) {
+  const { segment } = await params;
   const service = segment[0];
   const id = segment?.[1];
 

apps/link/app/(main)/admin/bridge/[...segment]/page.tsx

@@ -2,12 +2,13 @@ import { db } from "@link-stack/bridge-common";
 import { serviceConfig, List } from "@link-stack/bridge-ui";
 
 type PageProps = {
-  params: {
+  params: Promise<{
     segment: string[];
-  };
+  }>;
 };
 
-export default async function Page({ params: { segment } }: PageProps) {
+export default async function Page({ params }: PageProps) {
+  const { segment } = await params;
   const service = segment[0];
 
   if (!service) return null;

apps/link/app/(main)/logout/page.tsx

@@ -1,9 +1,20 @@
 "use client";
 
+import { useEffect } from "react";
 import { signOut } from "next-auth/react";
 
 export default function Page() {
+  useEffect(() => {
+    const multistepSignOut = async () => {
+      const response = await fetch("/api/logout", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        credentials: "same-origin",
+      });
       signOut({ callbackUrl: "/login" });
+    };
+    multistepSignOut();
+  }, []);
 
   return <div />;
 }

apps/link/app/(main)/opensearch/page.tsx

@@ -0,0 +1,5 @@
+import { OpenSearchWrapper } from "@link-stack/leafcutter-ui";
+
+export default function Page() {
+  return <OpenSearchWrapper url="/app/visualize#/" margin={50} />;
+}

apps/link/app/(main)/overview/[overview]/_components/TicketCreateDialog.tsx

@@ -1,7 +1,6 @@
 "use client";
 
-import { FC, useState, useEffect } from "react";
+import { FC, useState, useEffect, useActionState } from "react";
-import { useFormState } from "react-dom";
 import { useRouter } from "next/navigation";
 import { Grid } from "@mui/material";
 import {
@@ -44,7 +43,7 @@ export const TicketCreateDialog: FC<TicketCreateDialogProps> = ({
       },
     },
   };
-  const [formState, formAction] = useFormState(
+  const [formState, formAction] = useActionState(
     createTicketAction,
     initialState,
   );

apps/link/app/(main)/overview/[overview]/_components/TicketList.tsx

@@ -65,7 +65,6 @@ export const TicketList: FC<TicketListProps> = ({ title, tickets }) => {
         columns={gridColumns}
         onRowClick={onRowClick}
         getRowID={(row: any) => {
-          console.log({ row });
           return row.internalId;
         }}
         buttons={

apps/link/app/(main)/overview/[overview]/_components/ZammadOverview.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { FC, useEffect, useState } from "react";
+import { redirect } from "next/navigation";
 import { getOverviewTicketsAction } from "app/_actions/overviews";
 
 import { TicketList } from "./TicketList";
@@ -12,6 +13,19 @@ type ZammadOverviewProps = {
 export const ZammadOverview: FC<ZammadOverviewProps> = ({ name }) => {
   const [tickets, setTickets] = useState([]);
 
+  if (typeof window !== "undefined") {
+    useEffect(() => {
+      const hash = window?.location?.hash;
+
+      if (hash) {
+        const ticketID = hash.replace("#ticket/zoom/", "");
+        if (ticketID && !isNaN(parseInt(ticketID, 10))) {
+          redirect(`/tickets/${ticketID}`);
+        }
+      }
+    }, [window?.location?.hash]);
+  }
+
   useEffect(() => {
     const fetchTickets = async () => {
       const { tickets } = await getOverviewTicketsAction(name);

apps/link/app/(main)/overview/[overview]/page.tsx

@@ -6,14 +6,15 @@ const getSection = (overview: string) => {
 };
 
 type MetadataProps = {
-  params: {
+  params: Promise<{
     overview: string;
-  };
+  }>;
 };
 
 export async function generateMetadata({
-  params: { overview },
+  params,
 }: MetadataProps): Promise<Metadata> {
+  const { overview } = await params;
   const section = getSection(overview);
 
   return {
@@ -22,12 +23,13 @@ export async function generateMetadata({
 }
 
 type PageProps = {
-  params: {
+  params: Promise<{
     overview: string;
-  };
+  }>;
 };
 
-export default function Page({ params: { overview } }: PageProps) {
+export default async function Page({ params }: PageProps) {
+  const { overview } = await params;
   const section = getSection(overview);
 
   return <ZammadOverview name={section} />;

apps/link/app/(main)/page.tsx

@@ -1,9 +1,10 @@
 import { Metadata } from "next";
 import { redirect } from "next/navigation";
-import { getServerSession } from "app/_lib/authentication";
+import { Home } from "./_components/Home";
-import { Home } from "@link-stack/leafcutter-ui";
+// import { getServerSession } from "app/_lib/authentication";
-import { getUserVisualizations } from "@link-stack/opensearch-common";
+// import { Home } from "@link-stack/leafcutter-ui";
-import { LeafcutterWrapper } from "@link-stack/leafcutter-ui";
+// import { getUserVisualizations } from "@link-stack/opensearch-common";
+// import { LeafcutterWrapper } from "@link-stack/leafcutter-ui";
 
 export const metadata: Metadata = {
   title: "CDR Link - Home",
@@ -11,21 +12,31 @@ export const metadata: Metadata = {
 
 export default async function Page() {
   const leafcutterEnabled = process.env.LEAFCUTTER_ENABLED === "true";
+  const dashboardURL = process.env.LEAFCUTTER_DEFAULT_DASHBOARD_URL;
 
   if (!leafcutterEnabled) {
     redirect("/overview/recent");
   }
-
+  /*
   const session = await getServerSession();
   const {
     user: { email },
   }: any = session;
-
+   */
-  const visualizations = await getUserVisualizations(email ?? "none", 20);
+  let visualizations = [];
+  /*
+  try {
+    visualizations = await getUserVisualizations(email ?? "none", 20);
+  } catch (e) {
+    console.error(e.meta);
+  }
 
   return (
     <LeafcutterWrapper>
       <Home visualizations={visualizations} showWelcome={false} />
     </LeafcutterWrapper>
   );
+   */
+
+  return <Home url={dashboardURL} />;
 }

apps/link/app/(main)/setup/_components/Setup.tsx

@@ -8,6 +8,13 @@ import { ZammadWrapper } from "app/(main)/_components/ZammadWrapper";
 export const Setup: FC = () => {
   const router = useRouter();
   useLayoutEffect(() => {
+    const fingerprint = localStorage.getItem("fingerprint");
+    if (!fingerprint || fingerprint === "") {
+      const newFingerprint = `${Math.floor(
+        Math.random() * 100000000,
+      )}`.padStart(8, "0");
+      localStorage.setItem("fingerprint", newFingerprint);
+    }
     setTimeout(() => router.push("/"), 4000);
   }, [router]);
 

apps/link/app/(main)/tickets/[id]/@detail/page.tsx

@@ -1,11 +1,13 @@
 import { TicketDetail } from "./_components/TicketDetail";
 
 type PageProps = {
-  params: {
+  params: Promise<{
     id: string;
-  };
+  }>;
 };
 
-export default function Page({ params: { id } }: PageProps) {
+export default async function Page({ params }: PageProps) {
+  const { id } = await params;
+
   return <TicketDetail id={id} />;
 }

apps/link/app/(main)/tickets/[id]/@edit/_components/TicketEdit.tsx

@@ -37,14 +37,10 @@ export const TicketEdit: FC<TicketEditProps> = ({ id }) => {
   const [agents, setAgents] = useState<any>();
   const [pendingVisible, setPendingVisible] = useState(false);
 
-  const filteredStates =
-    ticketStates?.filter(
-      (state: any) => !["new", "merged", "removed"].includes(state.label),
-    ) ?? [];
-
   useEffect(() => {
     const fetchAgents = async () => {
-      const result = await getAgentsAction();
+      const groupID = formState?.values?.group?.split("/")?.pop();
+      const result = await getAgentsAction(groupID);
       setAgents(result);
     };
 
@@ -67,7 +63,7 @@ export const TicketEdit: FC<TicketEditProps> = ({ id }) => {
     fetchTicketPriorities();
     fetchAgents();
     fetchGroups();
-  }, []);
+  }, [formState.values.group]);
 
   useEffect(() => {
     const fetchTicket = async () => {
@@ -95,7 +91,7 @@ export const TicketEdit: FC<TicketEditProps> = ({ id }) => {
         [name]: value,
       },
     });
-    const stateName = filteredStates?.find(
+    const stateName = ticketStates?.find(
       (state: any) => state.id === formState.values.state,
     )?.name;
     setPendingVisible(stateName?.includes("pending") ?? false);
@@ -140,7 +136,7 @@ export const TicketEdit: FC<TicketEditProps> = ({ id }) => {
               label="State"
               formState={formState}
               updateFormState={updateFormState}
-              getOptions={() => filteredStates}
+              getOptions={() => ticketStates}
             />
           </Grid>
           <Grid

apps/link/app/(main)/tickets/[id]/@edit/page.tsx

@@ -1,11 +1,13 @@
 import { TicketEdit } from "./_components/TicketEdit";
 
 type PageProps = {
-  params: {
+  params: Promise<{
     id: string;
-  };
+  }>;
 };
 
-export default function Page({ params: { id } }: PageProps) {
+export default async function Page({ params }: PageProps) {
+  const { id } = await params;
+
   return <TicketEdit id={id} />;
 }

apps/link/app/(main)/tickets/[id]/layout.tsx

@@ -1,16 +1,11 @@
-"use client";
-
 import { Grid } from "@mui/material";
 
 type LayoutProps = {
   detail: any;
   edit: any;
-  params: {
-    id: string;
-  };
 };
 
-export default function Layout({ detail, edit, params: { id } }: LayoutProps) {
+export default async function Layout({ detail, edit }: LayoutProps) {
   return (
     <Grid container spacing={0} sx={{ height: "100vh" }} direction="row">
       <Grid item sx={{ height: "100vh" }} xs={9}>

apps/link/app/_actions/overviews.ts

@@ -47,10 +47,10 @@ export const getOverviewTicketsAction = async (name: string) => {
   try {
     if (name === "Recent") {
       const recent = await executeREST({ path: "/api/v1/recent_view" });
-
+      const uniqueIDs = new Set(recent.map((rec: any) => rec.o_id));
-      for (const rec of recent) {
+      for (const id of uniqueIDs) {
         const tkt = await executeREST({
-          path: `/api/v1/tickets/${rec.o_id}`,
+          path: `/api/v1/tickets/${id}`,
         });
         tickets.push({
           ...tkt,

apps/link/app/_actions/tickets.ts

@@ -1,6 +1,5 @@
 "use server";
 
-import { revalidatePath } from "next/cache";
 import { getTicketQuery } from "app/_graphql/getTicketQuery";
 import { getTicketArticlesQuery } from "app/_graphql/getTicketArticlesQuery";
 import { createTicketMutation } from "app/_graphql/createTicketMutation";
@@ -75,7 +74,6 @@ export const updateTicketAction = async (
   ticketID: string,
   ticketInfo: Record<string, any>,
 ) => {
-  console.log({ ticketID, ticketInfo });
   try {
     const input = {};
     if (ticketInfo.state) {
@@ -158,13 +156,12 @@ export const getTicketStatesAction = async () => {
     const states = await executeREST({
       path: "/api/v1/ticket_states",
     });
-
     const formattedStates =
       states?.map((state: any) => ({
         value: `gid://zammad/Ticket::State/${state.id}`,
         label: state.name,
+        disabled: ["new", "merged", "removed"].includes(state.name),
       })) ?? [];
-
     return formattedStates;
   } catch (e) {
     console.error(e.message);

apps/link/app/_actions/users.ts

@@ -2,13 +2,16 @@
 
 import { executeREST } from "app/_lib/zammad";
 
-export const getAgentsAction = async () => {
+export const getAgentsAction = async (groupID: number) => {
   try {
-    const users = await executeREST({
+    const group = await executeREST({
-      path: "/api/v1/users",
+      path: `/api/v1/groups/${groupID}`,
     });
+    const { user_ids: groupUserIDs } = group;
+    const path = `/api/v1/users/search?query=role_ids:2&limit=1000`;
+    const users = await executeREST({ path });
     const agents =
-      users?.filter((user: any) => user.role_ids.includes(2)) ?? [];
+      users?.filter((user: any) => groupUserIDs.includes(user.id)) ?? [];
     const formattedAgents = agents
       .map((agent: any) => ({
         label: `${agent.firstname} ${agent.lastname}`,
@@ -49,7 +52,6 @@ export const getUsersAction = async () => {
     const users = await executeREST({
       path: "/api/v1/users",
     });
-    console.log({ users });
     const formattedUsers = users
       .map((customer: any) => ({
         label: customer.login,

apps/link/app/_components/ZammadLoginProvider.tsx

@@ -14,7 +14,7 @@ export const ZammadLoginProvider: FC<PropsWithChildren> = ({ children }) => {
         const response = await fetch("/api/v1/users/me", {
           method: "GET",
           headers: {
-            "X-Browser-Fingerprint": `${session.expires}`,
+            "X-Browser-Fingerprint": localStorage.getItem("fingerprint") || "",
           },
         });
 

apps/link/app/_lib/authentication.ts

@@ -10,6 +10,7 @@ import {
 import Google from "next-auth/providers/google";
 import Credentials from "next-auth/providers/credentials";
 import Apple from "next-auth/providers/apple";
+import { Redis } from "ioredis";
 
 const headers = { Authorization: `Token ${process.env.ZAMMAD_API_TOKEN}` };
 
@@ -36,6 +37,9 @@ const fetchUser = async (email: string) => {
 const getUserRoles = async (email: string) => {
   try {
     const user = await fetchUser(email);
+    if (!user) {
+      return [];
+    }
     const allRoles = await fetchRoles();
     const roles = user.role_ids.map((roleID: number) => {
       const role = allRoles[roleID];
@@ -43,7 +47,7 @@ const getUserRoles = async (email: string) => {
     });
     return roles.filter((role: string) => role !== null);
   } catch (e) {
-    console.log({ e });
+    console.error({ e });
     return [];
   }
 };
@@ -109,6 +113,9 @@ export const authOptions: NextAuthOptions = {
     signOut: "/logout",
   },
   providers,
+  session: {
+    maxAge: 3 * 24 * 60 * 60,
+  },
   secret: process.env.NEXTAUTH_SECRET,
   callbacks: {
     signIn: async ({ user }) => {
@@ -116,6 +123,11 @@ export const authOptions: NextAuthOptions = {
       return roles.includes("admin") || roles.includes("agent");
     },
     session: async ({ session, token }) => {
+      const redis = new Redis(process.env.REDIS_URL);
+      const isInvalidated = await redis.get(`invalidated:${token.sub}`);
+      if (isInvalidated) {
+        return null;
+      }
       // @ts-ignore
       session.user.roles = token.roles ?? [];
       // @ts-ignore

apps/link/app/_lib/utils.ts

@@ -13,21 +13,18 @@ export const fetchLeafcutter = async (url: string, options: any) => {
       const json = await res.json();
       return json;
     } catch (error) {
-      console.log({ error });
+      console.error({ error });
       return null;
     }
   };
 
   const data = await fetchData(url, options);
-  console.log({ data });
 
   if (!data) {
     const csrfURL = `${process.env.NEXT_PUBLIC_LEAFCUTTER_URL}/api/auth/csrf`;
     const csrfData = await fetchData(csrfURL, {});
-    console.log({ csrfData });
     const authURL = `${process.env.NEXT_PUBLIC_LEAFCUTTER_URL}/api/auth/callback/credentials`;
     const authData = await fetchData(authURL, { method: "POST" });
-    console.log({ authData });
     if (!authData) {
       return null;
     } else {
@@ -37,5 +34,3 @@ export const fetchLeafcutter = async (url: string, options: any) => {
     return data;
   }
 };
-
-

apps/link/app/_lib/zammad.ts

@@ -2,12 +2,11 @@ import { getServerSession } from "app/_lib/authentication";
 import { cookies } from "next/headers";
 
 const getHeaders = async () => {
-  const allCookies = cookies().getAll();
+  const allCookies = (await cookies()).getAll();
   const session = await getServerSession();
-  const headers = {
+  const finalHeaders = {
     "Content-Type": "application/json",
     Accept: "application/json",
-    "X-Browser-Fingerprint": `${session.expires}`,
     // @ts-ignore
     "X-CSRF-Token": session.user.zammadCsrfToken,
     Cookie: allCookies
@@ -15,7 +14,7 @@ const getHeaders = async () => {
       .join("; "),
   };
 
-  return headers;
+  return finalHeaders;
 };
 
 interface ExecuteGraphQLOptions {

apps/link/app/api/logout/route.ts

@@ -0,0 +1,38 @@
+import { NextRequest, NextResponse } from "next/server";
+import { Redis } from "ioredis";
+import { getToken } from "next-auth/jwt";
+
+export async function POST(request: NextRequest) {
+  const token = await getToken({
+    req: request,
+    secret: process.env.NEXTAUTH_SECRET,
+  });
+  const allCookies = request.cookies.getAll();
+  const zammadURL = process.env.ZAMMAD_URL ?? "http://zammad-nginx:8080";
+  const signOutURL = `${zammadURL}/api/v1/signout`;
+  const headers = {
+    "Content-Type": "application/json",
+    Accept: "application/json",
+    Cookie: allCookies
+      .map((cookie) => `${cookie.name}=${cookie.value}`)
+      .join("; "),
+  };
+
+  await fetch(signOutURL, { headers });
+
+  const cookiePrefixesToRemove = ["_zammad"];
+  const response = NextResponse.json({ message: "ok" });
+
+  for (const cookie of allCookies) {
+    if (
+      cookiePrefixesToRemove.some((prefix) => cookie.name.startsWith(prefix))
+    ) {
+      response.cookies.set(cookie.name, "", { path: "/", maxAge: 0 });
+    }
+  }
+
+  const redis = new Redis(process.env.REDIS_URL);
+  await redis.setex(`invalidated:${token.sub}`, 24 * 60 * 60, "1");
+
+  return response;
+}

apps/link/middleware.ts

@@ -12,9 +12,11 @@ const rewriteURL = (
     path = path.slice(1);
   }
   const destinationURL = `${destinationBaseURL}/${path}`;
-  console.log(`Rewriting ${request.url} to ${destinationURL}`);
+  console.info(`Rewriting ${request.url} to ${destinationURL}`);
   const requestHeaders = new Headers(request.headers);
+
   requestHeaders.delete("x-forwarded-user");
+  requestHeaders.delete("x-forwarded-roles");
   requestHeaders.delete("connection");
 
   for (const [key, value] of Object.entries(headers)) {
@@ -29,6 +31,9 @@ const rewriteURL = (
 const checkRewrites = async (request: NextRequestWithAuth) => {
   const linkBaseURL = process.env.LINK_URL ?? "http://localhost:3000";
   const zammadURL = process.env.ZAMMAD_URL ?? "http://zammad-nginx:8080";
+  const opensearchBaseURL =
+    process.env.OPENSEARCH_DASHBOARDS_URL ??
+    "http://opensearch-dashboards:5601";
 
   const zammadPaths = [
     "/zammad",
@@ -38,19 +43,38 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
     "/graphql",
     "/cable",
   ];
+  const isSetupMode = process.env.SETUP_MODE === "true";
   const { token } = request.nextauth;
   const email = token?.email?.toLowerCase() ?? "unknown";
-  let headers = { "x-forwarded-user": email };
+  const roles = (token?.roles as string[]) ?? [];
+  let headers = {
+    "x-forwarded-user": email,
+    "x-forwarded-roles": roles.join(","),
+  };
 
-  if (request.nextUrl.pathname.startsWith("/zammad")) {
+  if (request.nextUrl.pathname.startsWith("/dashboards")) {
+    return rewriteURL(
+      request,
+      `${linkBaseURL}/dashboards`,
+      opensearchBaseURL,
+      headers,
+    );
+  } else if (request.nextUrl.pathname.startsWith("/zammad")) {
     return rewriteURL(request, `${linkBaseURL}/zammad`, zammadURL, headers);
   } else if (zammadPaths.some((p) => request.nextUrl.pathname.startsWith(p))) {
     return rewriteURL(request, linkBaseURL, zammadURL, headers);
+  } else if (request.nextUrl.pathname.startsWith("/api/v1")) {
+    if ((email && email !== "unknown") || isSetupMode) {
+      return NextResponse.next();
+    } else {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
   } else {
     const isDev = process.env.NODE_ENV === "development";
     const nonce = Buffer.from(crypto.randomUUID()).toString("base64");
     const cspHeader = `
     default-src 'self';
+    frame-src 'self' https://digiresilience.org;
     connect-src 'self';
     script-src 'self' 'nonce-${nonce}' 'strict-dynamic' ${isDev ? "'unsafe-eval'" : ""};
     style-src 'self' 'unsafe-inline';
@@ -59,7 +83,7 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
     object-src 'none';
     base-uri 'self';
     form-action 'self';
-    frame-ancestors 'none';
+    frame-ancestors 'self';
     upgrade-insecure-requests;
 `;
     const contentSecurityPolicyHeaderValue = cspHeader
@@ -116,5 +140,7 @@ export default withAuth(checkRewrites, {
 });
 
 export const config = {
-  matcher: ["/((?!ws|wss|api|_next/static|_next/image|favicon.ico).*)"],
+  matcher: [
+    "/((?!ws|wss|api/signal|api/whatsapp|_next/static|_next/image|favicon.ico).*)",
+  ],
 };

apps/link/next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // 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.

apps/link/next.config.js

@@ -20,7 +20,7 @@ const nextConfig = {
           },
           {
             key: "X-Frame-Options",
-            value: "DENY",
+            value: "SAMEORIGIN",
           },
           {
             key: "X-Content-Type-Options",

apps/link/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/link",
-  "version": "2.2.0",
+  "version": "2.4.0b1",
   "type": "module",
   "scripts": {
     "dev": "next dev",
@@ -12,38 +12,39 @@
   "dependencies": {
     "@chatscope/chat-ui-kit-react": "^2.0.3",
     "@chatscope/chat-ui-kit-styles": "^1.4.0",
-    "@emotion/cache": "^11.13.1",
+    "@emotion/cache": "^11.14.0",
-    "@emotion/react": "^11.13.3",
+    "@emotion/react": "^11.14.0",
     "@emotion/server": "^11.11.0",
-    "@emotion/styled": "^11.13.0",
+    "@emotion/styled": "^11.14.0",
     "@link-stack/bridge-common": "*",
     "@link-stack/bridge-ui": "*",
     "@link-stack/leafcutter-ui": "*",
     "@link-stack/opensearch-common": "*",
     "@link-stack/ui": "*",
-    "@mui/icons-material": "^5",
+    "@mui/icons-material": "^6",
-    "@mui/material": "^5",
+    "@mui/material": "^6",
-    "@mui/material-nextjs": "^5",
+    "@mui/material-nextjs": "^6",
-    "@mui/x-data-grid-pro": "^7.18.0",
+    "@mui/x-data-grid-pro": "^7.24.1",
-    "@mui/x-date-pickers": "^7.18.0",
+    "@mui/x-date-pickers": "^7.24.1",
-    "@mui/x-date-pickers-pro": "^7.18.0",
+    "@mui/x-date-pickers-pro": "^7.24.1",
-    "@mui/x-license": "^7.18.0",
+    "@mui/x-license": "^7.24.1",
     "date-fns": "^4.1.0",
-    "graphql-request": "^7.1.0",
+    "graphql-request": "^7.1.2",
-    "mui-chips-input": "^2.1.5",
+    "ioredis": "^5.4.2",
-    "next": "14.2.13",
+    "mui-chips-input": "^4.0.1",
-    "next-auth": "^4.24.8",
+    "next": "15.1.6",
-    "react": "18.3.1",
+    "next-auth": "^4.24.11",
-    "react-cookie": "^7.2.0",
+    "react": "19.0.0",
-    "react-dom": "18.3.1",
+    "react-cookie": "^7.2.2",
+    "react-dom": "19.0.0",
     "react-iframe": "^1.8.5",
     "react-polyglot": "^0.7.2",
     "sharp": "^0.33.5"
   },
   "devDependencies": {
     "@link-stack/eslint-config": "*",
-    "@types/node": "^22.7.3",
+    "@types/node": "^22.10.10",
-    "@types/react": "18.3.9",
+    "@types/react": "19.0.8",
     "@types/uuid": "^10.0.0"
   }
 }

apps/link/public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

docker/compose/bridge.yml

@@ -25,6 +25,7 @@ services:
       context: ../../
       dockerfile: ./apps/bridge-frontend/Dockerfile
     container_name: bridge-frontend
+    image: registry.gitlab.com/digiresilience/link/link-stack/bridge-frontend:${LINK_STACK_VERSION}
     restart: ${RESTART}
     ports:
       - 8006:3000
@@ -35,5 +36,6 @@ services:
       context: ../../
       dockerfile: ./apps/bridge-worker/Dockerfile
     container_name: bridge-worker
+    image: registry.gitlab.com/digiresilience/link/link-stack/bridge-worker:${LINK_STACK_VERSION}
     restart: ${RESTART}
     environment: *common-bridge-variables

docker/compose/link.yml

@@ -17,6 +17,7 @@ services:
       LEAFCUTTER_URL: https://lc.digiresilience.org
       BRIDGE_URL: http://bridge-frontend:3000
       ZAMMAD_URL: http://zammad-nginx:8080
+      REDIS_URL: "redis://zammad-redis:6379"
       NEXTAUTH_URL: ${LINK_URL}
       NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
       NEXTAUTH_AUDIENCE: ${NEXTAUTH_AUDIENCE}

docker/compose/opensearch.yml

@@ -6,8 +6,8 @@ services:
     restart: ${RESTART}
     environment:
       - discovery.type=single-node
-      # - plugins.security.ssl.transport.enforce_hostname_verification=false
+      - plugins.security.ssl.transport.enforce_hostname_verification=false
-      # - plugins.security.ssl.transport.resolve_hostname=false
+      - plugins.security.ssl.transport.resolve_hostname=false
       - cluster.routing.allocation.disk.watermark.low=3gb
       - cluster.routing.allocation.disk.watermark.high=2gb
       - cluster.routing.allocation.disk.watermark.flood_stage=500mb
@@ -47,10 +47,10 @@ services:
       - ../opensearch-dashboards/opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml
     environment:
       OPENSEARCH_HOSTS: '["https://opensearch:9200"]'
-      # OPENSEARCH_SECURITY_AUTH_TYPE: "proxy"
+      OPENSEARCH_SECURITY_AUTH_TYPE: "proxy"
-      # OPENSEARCH_SECURITY_PROXYCACHE_USER_HEADER: "x-proxy-user"
+      OPENSEARCH_SECURITY_PROXYCACHE_USER_HEADER: "x-proxy-user"
-      # OPENSEARCH_SECURITY_PROXYCACHE_ROLES_HEADER: "x-proxy-roles"
+      OPENSEARCH_SECURITY_PROXYCACHE_ROLES_HEADER: "x-proxy-roles"
-      # OPENSEARCH_REQUESTHEADERSALLOWLIST: '["securitytenant","Authorization","x-forwarded-for","x-proxy-user","x-proxy-roles"]'
+      OPENSEARCH_REQUESTHEADERSALLOWLIST: '["securitytenant","Authorization","x-forwarded-for","x-proxy-user","x-proxy-roles"]'
 
 volumes:
   opensearch-data:

docker/compose/signal-cli-rest-api.yml

@@ -1,7 +1,8 @@
 services:
   signal-cli-rest-api:
+    container_name: signal-cli-rest-api
+    build: ../signal-cli-rest-api
     image: registry.gitlab.com/digiresilience/link/link-stack/signal-cli-rest-api:develop
-    platform: linux/amd64
     environment:
       - MODE=json-rpc
     volumes:

docker/compose/zammad.yml

@@ -17,7 +17,6 @@ x-zammad-vars: &common-zammad-variables
 
 services:
   zammad-init:
-    platform: linux/x86_64
     container_name: zammad-init
     command: ["zammad-init"]
     depends_on:
@@ -47,7 +46,6 @@ services:
       <<: *common-global-variables
 
   zammad-nginx:
-    platform: linux/x86_64
     container_name: zammad-nginx
     command: ["zammad-nginx"]
     expose:
@@ -72,7 +70,6 @@ services:
       - zammad-var:/opt/zammad/var:ro
 
   zammad-railsserver:
-    platform: linux/x86_64
     container_name: zammad-railsserver
     command: ["zammad-railsserver"]
     depends_on:
@@ -103,7 +100,6 @@ services:
       - redis-data:/data
 
   zammad-scheduler:
-    platform: linux/x86_64
     container_name: zammad-scheduler
     command: ["zammad-scheduler"]
     depends_on:
@@ -123,7 +119,6 @@ services:
       - zammad-storage:/opt/zammad/storage
 
   zammad-websocket:
-    platform: linux/x86_64
     container_name: zammad-websocket
     command: ["zammad-websocket"]
     depends_on:

docker/memcached/Dockerfile

@@ -1 +1 @@
-FROM memcached:1.6.31-bookworm
+FROM memcached:1.6.34-bookworm

docker/nginx-proxy/Dockerfile

@@ -1 +1 @@
-FROM nginxproxy/nginx-proxy:1.6.1
+FROM nginxproxy/nginx-proxy:1.6.4

docker/opensearch-dashboards/Dockerfile

@@ -1 +1 @@
-FROM opensearchproject/opensearch-dashboards:2.17.0
+FROM opensearchproject/opensearch-dashboards:2.18.0

docker/opensearch/Dockerfile

@@ -1,2 +1,2 @@
-FROM opensearchproject/opensearch:2.17.0
+FROM opensearchproject/opensearch:2.18.0
 RUN /usr/share/opensearch/bin/opensearch-plugin install ingest-attachment -b

docker/redis/Dockerfile

@@ -1 +1 @@
-FROM redis:7.4.0-bookworm
+FROM redis:7.4.2-bookworm

docker/scripts/docker.js

@@ -17,14 +17,13 @@ const files = {
 
 const finalFiles = files[app]
   .map((file) => ['-f', `docker/compose/${file}.yml`]).flat();
-const finalCommand = command === "up" ? ["up", "-d"] : [command];
+const finalCommand = command === "up" ? ["up", "-d", "--remove-orphans"] : [command];
-
 const dockerCompose = spawn('docker', ['compose', '--env-file', '.env', ...finalFiles, ...finalCommand]);
 
 dockerCompose.stdout.on('data', (data) => {
-  console.log(`${data}`);
+  console.info(`${data}`);
 });
 
 dockerCompose.stderr.on('data', (data) => {
-  console.log(`${data}`);
+  console.info(`${data}`);
 });

docker/signal-cli-rest-api/Dockerfile

@@ -1 +1 @@
-FROM bbernhard/signal-cli-rest-api:0.89
+FROM bbernhard/signal-cli-rest-api:0.90

docker/zammad/Dockerfile

@@ -1,19 +1,25 @@
-ARG ZAMMAD_VERSION=6.3.1
+ARG ZAMMAD_VERSION=6.4.1
 
-FROM node:22-slim as node
+FROM node:22-slim AS node
 
 FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS builder
+USER root
 COPY --from=node /opt /opt
 COPY --from=node /usr/local/bin /usr/local/bin
+COPY --from=node /usr/local/lib /usr/local/lib
+COPY --from=node /usr/lib /usr/lib
 SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
+RUN npm install -g pnpm
+RUN pnpm --version
 WORKDIR ${ZAMMAD_DIR}
 RUN mkdir -p /opt/zammad/contrib/link/addons
 COPY addons contrib/link/addons
 COPY setup.rb contrib/link/setup.rb
 COPY install.rb contrib/link/install.rb
 
-USER root
 RUN sed -i '/script\/build\/cleanup\.sh/d' contrib/docker/setup.sh
+RUN sed -i '/touch db\/schema.rb/a ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql:\/\/zammad:\/zammad bundle exec rails runner \/opt\/zammad\/contrib\/link\/install.rb' contrib/docker/setup.sh
+RUN cat contrib/docker/setup.sh
 RUN contrib/docker/setup.sh builder
 ARG EMBEDDED=false
 RUN if [ "$EMBEDDED" = "true" ] ; then sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi
@@ -22,11 +28,9 @@ RUN sed -i '/^[[:space:]]*# es config/a\
   bundle exec rails runner /opt/zammad/contrib/link/setup.rb\n\
   bundle exec rake zammad:package:migrate\n\
  ' /docker-entrypoint.sh
-RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rails runner /opt/zammad/contrib/link/install.rb
-RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rake assets:precompile
 
-FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} as runner
+FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS runner
-USER ${ZAMMAD_USER}
+USER zammad
 COPY --from=builder --chown=zammad:zammad ${ZAMMAD_DIR} ${ZAMMAD_DIR}
 COPY --from=builder /usr/local/bundle /usr/local/bundle
 COPY --from=builder /docker-entrypoint.sh /docker-entrypoint.sh

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@link-stack",
-  "version": "2.2.0",
+  "version": "2.4.0b1",
   "description": "Link from the Center for Digital Resilience",
   "scripts": {
     "dev": "dotenv -- turbo dev",
     "build": "dotenv -- turbo build",
     "migrate": "dotenv -- npm run migrate --workspace=database",
     "lint": "dotenv turbo lint",
-    "update-version": "find . -name 'package.json' -exec sed -i -E 's/\"version\": \"[^\"]+\"/\"version\": \"2.2.0\"/' {} +",
+    "update-version": "find . -name 'package.json' -exec sed -i -E 's/\"version\": \"[^\"]+\"/\"version\": \"2.4.0b1\"/' {} +",
     "upgrade:setup": "npm i -g npm-check-updates",
     "upgrade:check": "ncu && ncu -ws",
     "upgrade": "ncu -u -x eslint -x kysely && ncu -ws -u -x eslint -x kysely && npm i",
@@ -46,39 +46,33 @@
     "type": "git",
     "url": "git+https://gitlab.com/digiresilience/link/link-stack.git"
   },
-  "packageManager": "npm@10.8.3",
+  "packageManager": "npm@11.0.0",
   "author": "Darren Clarke",
   "license": "AGPL-3.0-or-later",
   "devDependencies": {
     "dotenv-cli": "latest",
-    "eslint": "^8",
+    "eslint": "^9",
-    "turbo": "^2.1.2",
+    "turbo": "^2.3.4",
-    "typescript": "latest"
+    "typescript": "latest",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@types/react": "^19.0.8"
   },
   "overrides": {
-    "eslint-config-next": {
+    "material-ui-popup-state": {
-      "eslint": "$eslint"
+      "react": "$react"
     },
-    "eslint-plugin-import": {
+    "@chatscope/chat-ui-kit-react": {
-      "eslint": "$eslint"
+      "react": "$react",
+      "react-dom": "$react-dom"
     },
-    "eslint-plugin-jsx-a11y": {
+    "@mui/icons-material": {
-      "eslint": "$eslint"
+      "react": "$react"
     },
-    "eslint-plugin-react": {
+    "mui-chips-input": {
-      "eslint": "$eslint"
+      "react": "$react",
-    },
+      "react-dom": "$react-dom",
-    "@typescript-eslint/eslint-plugin": {
+      "@types/react": "$@types/react"
-      "eslint": "$eslint"
-    },
-    "@typescript-eslint/parser": {
-      "eslint": "$eslint"
-    },
-    "eslint-plugin-promise": {
-      "eslint": "$eslint"
-    },
-    "@babel/eslint-parser": {
-      "eslint": "$eslint"
     }
   },
   "engines": {

packages/bridge-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-common",
-  "version": "2.2.0",
+  "version": "2.4.0b1",
   "main": "build/main/index.js",
   "type": "module",
   "author": "Darren Clarke <darren@redaranj.com>",
@@ -9,14 +9,14 @@
     "build": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@auth/kysely-adapter": "^1.5.2",
+    "@auth/kysely-adapter": "^1.7.4",
     "graphile-worker": "^0.16.6",
     "kysely": "0.26.1",
-    "pg": "^8.13.0"
+    "pg": "^8.13.1"
   },
   "devDependencies": {
     "@link-stack/eslint-config": "*",
     "@link-stack/typescript-config": "*",
-    "typescript": "^5.6.2"
+    "typescript": "^5.7.3"
   }
 }

packages/bridge-ui/components/QRCode.tsx

@@ -30,7 +30,6 @@ export const QRCode: FC<QRCodeProps> = ({
     if (!verified && getValue && refreshInterval) {
       const interval = setInterval(async () => {
         const { qr, kind } = await getValue(token);
-        console.log({ kind });
         setValue(qr);
         setKind(kind);
       }, refreshInterval * 1000);

packages/bridge-ui/components/ServiceLayout.tsx

@@ -3,18 +3,19 @@ type ServiceLayoutProps = {
   detail: any;
   edit: any;
   create: any;
-  params: {
+  params: Promise<{
     segment: string[];
-  };
+  }>;
 };
 
-export const ServiceLayout = ({
+export const ServiceLayout = async ({
   children,
   detail,
   edit,
   create,
-  params: { segment },
+  params,
 }: ServiceLayoutProps) => {
+  const { segment } = await params;
   const length = segment?.length ?? 0;
   const isCreate = length === 2 && segment[1] === "create";
   const isEdit = length === 3 && segment[2] === "edit";

packages/bridge-ui/lib/routing.ts

@@ -5,19 +5,21 @@ import { getService } from "./utils";
 export const getBot = async (
   _req: NextRequest,
   params: ServiceParams,
-): Promise<NextResponse> => getService(params)?.getBot(params);
+): Promise<NextResponse> => (await getService(params))?.getBot(params);
 
 export const sendMessage = async (
   req: NextRequest,
   params: ServiceParams,
-): Promise<NextResponse> => getService(params)?.sendMessage(req, params);
+): Promise<NextResponse> =>
+  (await getService(params))?.sendMessage(req, params);
 
 export const receiveMessage = async (
   req: NextRequest,
   params: ServiceParams,
-): Promise<NextResponse> => getService(params)?.receiveMessage(req, params);
+): Promise<NextResponse> =>
+  (await getService(params))?.receiveMessage(req, params);
 
 export const handleWebhook = async (
   req: NextRequest,
   params: ServiceParams,
-): Promise<NextResponse> => getService(params)?.handleWebhook(req);
+): Promise<NextResponse> => (await getService(params))?.handleWebhook(req);