Build updates

.gitlab-ci.yml

@@ -196,7 +196,6 @@ zammad-docker-build:
   before_script:
     - export PATH="$PNPM_HOME:$PATH"
   script:
-    - corepack enable && corepack prepare pnpm@9.15.4 --activate
     - pnpm add -g turbo
     - pnpm install --frozen-lockfile
     - turbo build --force --filter @link-stack/zammad-addon-*
@@ -219,7 +218,6 @@ zammad-standalone-docker-build:
   before_script:
     - export PATH="$PNPM_HOME:$PATH"
   script:
-    - corepack enable && corepack prepare pnpm@9.15.4 --activate
     - pnpm add -g turbo
     - pnpm install --frozen-lockfile
     - turbo build --force --filter @link-stack/zammad-addon-*

.nvmrc

@@ -1 +1 @@
-v22.18.0
+v24

apps/bridge-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-frontend",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "type": "module",
   "scripts": {
     "dev": "next dev",
@@ -20,7 +20,7 @@
     "@mui/x-license": "^7",
     "@link-stack/bridge-common": "workspace:*",
     "@link-stack/bridge-ui": "workspace:*",
-    "next": "15.5.4",
+    "next": "15.5.9",
     "next-auth": "^4.24.11",
     "react": "19.2.0",
     "react-dom": "19.2.0",

apps/bridge-migrations/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-migrations",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "type": "module",
   "scripts": {
     "migrate:up:all": "tsx migrate.ts up:all",

apps/bridge-whatsapp/package.json

@@ -1,33 +1,29 @@
 {
   "name": "@link-stack/bridge-whatsapp",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
+  "type": "module",
   "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.4.3",
     "@hapipal/schmervice": "^3.0.0",
     "@hapipal/toys": "^4.0.0",
     "@link-stack/bridge-common": "workspace:*",
     "@link-stack/logger": "workspace:*",
-    "@whiskeysockets/baileys": "^6.7.21",
-    "hapi-pino": "^13.0.0",
-    "link-preview-js": "^3.1.0"
+    "@whiskeysockets/baileys": "7.0.0-rc.9",
+    "hapi-pino": "^13.0.0"
   },
   "devDependencies": {
     "@link-stack/eslint-config": "workspace:*",
     "@link-stack/jest-config": "workspace:*",
     "@link-stack/typescript-config": "workspace:*",
-    "@types/long": "^5",
     "@types/node": "*",
-    "dotenv-cli": "^10.0.0",
-    "tsx": "^4.20.6",
     "typescript": "^5.9.3"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "dev": "dotenv -- tsx src/index.ts",
+    "dev": "node --env-file=.env --experimental-transform-types src/index.ts",
     "start": "node build/main/index.js"
   }
 }

apps/bridge-whatsapp/src/index.ts

@@ -1,17 +1,17 @@
 import * as Hapi from "@hapi/hapi";
 import hapiPino from "hapi-pino";
 import Schmervice from "@hapipal/schmervice";
-import WhatsappService from "./service.js";
+import WhatsappService from "./service.ts";
 import {
   RegisterBotRoute,
   UnverifyBotRoute,
   GetBotRoute,
   SendMessageRoute,
   ReceiveMessageRoute,
-} from "./routes.js";
+} from "./routes.ts";
 import { createLogger } from "@link-stack/logger";
 
-const logger = createLogger('bridge-whatsapp-index');
+const logger = createLogger("bridge-whatsapp-index");
 
 const server = Hapi.server({ port: 5000 });
 

apps/bridge-whatsapp/src/routes.ts

@@ -1,6 +1,6 @@
 import * as Hapi from "@hapi/hapi";
 import Toys from "@hapipal/toys";
-import WhatsappService from "./service";
+import WhatsappService from "./service.ts";
 
 const withDefaults = Toys.withRouteDefaults({
   options: {
@@ -27,15 +27,9 @@ export const SendMessageRoute = withDefaults({
     description: "Send a message",
     async handler(request: Hapi.Request, _h: Hapi.ResponseToolkit) {
       const { id } = request.params;
-      const { phoneNumber, message, attachments } =
-        request.payload as MessageRequest;
+      const { phoneNumber, message, attachments } = request.payload as MessageRequest;
       const whatsappService = getService(request);
-      await whatsappService.send(
-        id,
-        phoneNumber,
-        message as string,
-        attachments,
-      );
+      await whatsappService.send(id, phoneNumber, message as string, attachments);
       request.logger.info(
         {
           id,

apps/bridge-whatsapp/src/service.ts

@@ -4,12 +4,13 @@ import makeWASocket, {
   DisconnectReason,
   proto,
   downloadContentFromMessage,
-  MediaType,
   fetchLatestBaileysVersion,
   isJidBroadcast,
   isJidStatusBroadcast,
   useMultiFileAuthState,
 } from "@whiskeysockets/baileys";
+
+type MediaType = "audio" | "document" | "image" | "video" | "sticker";
 import fs from "fs";
 import { createLogger } from "@link-stack/logger";
 import {
@@ -26,11 +27,7 @@ export default class WhatsappService extends Service {
   connections: { [key: string]: any } = {};
   loginConnections: { [key: string]: any } = {};
 
-  static browserDescription: [string, string, string] = [
-    "Bridge",
-    "Chrome",
-    "2.0",
-  ];
+  static browserDescription: [string, string, string] = ["Bridge", "Chrome", "2.0"];
 
   constructor(server: Server, options: never) {
     super(server, options);
@@ -47,7 +44,7 @@ export default class WhatsappService extends Service {
     }
 
     // Prevent path traversal by checking for suspicious patterns
-    if (id.includes('..') || id.includes('/') || id.includes('\\')) {
+    if (id.includes("..") || id.includes("/") || id.includes("\\")) {
       throw new Error(`Path traversal detected in bot ID: ${id}`);
     }
 
@@ -101,21 +98,16 @@ export default class WhatsappService extends Service {
       ...options,
       auth: state,
       generateHighQualityLinkPreview: false,
+      syncFullHistory: true,
       msgRetryCounterMap,
-      shouldIgnoreJid: (jid) =>
-        isJidBroadcast(jid) || isJidStatusBroadcast(jid),
+      shouldIgnoreJid: (jid) => isJidBroadcast(jid) || isJidStatusBroadcast(jid),
     });
     let pause = 5000;
 
     socket.ev.process(async (events) => {
       if (events["connection.update"]) {
         const update = events["connection.update"];
-        const {
-          connection: connectionState,
-          lastDisconnect,
-          qr,
-          isNewLogin,
-        } = update;
+        const { connection: connectionState, lastDisconnect, qr, isNewLogin } = update;
         if (qr) {
           logger.info("got qr code");
           const botDirectory = this.getBotDirectory(botID);
@@ -130,8 +122,7 @@ export default class WhatsappService extends Service {
           logger.info("opened connection");
         } else if (connectionState === "close") {
           logger.info({ lastDisconnect }, "connection closed");
-          const disconnectStatusCode = (lastDisconnect?.error as any)?.output
-            ?.statusCode;
+          const disconnectStatusCode = (lastDisconnect?.error as any)?.output?.statusCode;
           if (disconnectStatusCode === DisconnectReason.restartRequired) {
             logger.info("reconnecting after got new login");
             await this.createConnection(botID, server, options);
@@ -158,6 +149,17 @@ export default class WhatsappService extends Service {
           await this.queueUnreadMessages(botID, messages);
         }
       }
+
+      if (events["messaging-history.set"]) {
+        const { messages, isLatest } = events["messaging-history.set"];
+        logger.info(
+          { messageCount: messages.length, isLatest },
+          "received message history on connection",
+        );
+        if (messages.length > 0) {
+          await this.queueUnreadMessages(botID, messages);
+        }
+      }
     });
 
     this.connections[botID] = { socket, msgRetryCounterMap };
@@ -174,29 +176,23 @@ export default class WhatsappService extends Service {
       const verifiedFile = `${directory}/verified`;
       if (fs.existsSync(verifiedFile)) {
         const { version, isLatest } = await fetchLatestBaileysVersion();
-        logger.info(
-          { version: version.join("."), isLatest },
-          "using WA version",
-        );
+        logger.info({ version: version.join("."), isLatest }, "using WA version");
 
         await this.createConnection(botID, this.server, {
           browser: WhatsappService.browserDescription,
-          printQRInTerminal: true,
           version,
         });
       }
     }
   }
 
-  private async queueMessage(
-    botID: string,
-    webMessageInfo: proto.IWebMessageInfo,
-  ) {
-    const {
-      key: { id, fromMe, remoteJid },
-      message,
-      messageTimestamp,
-    } = webMessageInfo;
+  private async queueMessage(botID: string, webMessageInfo: proto.IWebMessageInfo) {
+    const { key, message, messageTimestamp } = webMessageInfo;
+    if (!key) {
+      logger.warn("Message missing key, skipping");
+      return;
+    }
+    const { id, fromMe, remoteJid } = key;
     logger.info("Message type debug");
     for (const key in message) {
       logger.info(
@@ -204,11 +200,9 @@ export default class WhatsappService extends Service {
         "Message field",
       );
     }
-    const isValidMessage =
-      message && remoteJid !== "status@broadcast" && !fromMe;
+    const isValidMessage = message && remoteJid !== "status@broadcast" && !fromMe;
     if (isValidMessage) {
-      const { audioMessage, documentMessage, imageMessage, videoMessage } =
-        message;
+      const { audioMessage, documentMessage, imageMessage, videoMessage } = message;
       const isMediaMessage =
         audioMessage || documentMessage || imageMessage || videoMessage;
 
@@ -288,10 +282,7 @@ export default class WhatsappService extends Service {
     }
   }
 
-  private async queueUnreadMessages(
-    botID: string,
-    messages: proto.IWebMessageInfo[],
-  ) {
+  private async queueUnreadMessages(botID: string, messages: proto.IWebMessageInfo[]) {
     for await (const message of messages) {
       await this.queueMessage(botID, message);
     }
@@ -334,10 +325,7 @@ export default class WhatsappService extends Service {
     }
   }
 
-  async register(
-    botID: string,
-    callback?: AuthCompleteCallback,
-  ): Promise<void> {
+  async register(botID: string, callback?: AuthCompleteCallback): Promise<void> {
     const { version } = await fetchLatestBaileysVersion();
     await this.createConnection(
       botID,
@@ -355,7 +343,10 @@ export default class WhatsappService extends Service {
     attachments?: Array<{ data: string; filename: string; mime_type: string }>,
   ): Promise<void> {
     const connection = this.connections[botID]?.socket;
-    const recipient = `${phoneNumber.replace(/\D+/g, "")}@s.whatsapp.net`;
+    const digits = phoneNumber.replace(/\D+/g, "");
+    // LIDs are 15+ digits, phone numbers with country code are typically 10-14 digits
+    const suffix = digits.length > 14 ? "@lid" : "@s.whatsapp.net";
+    const recipient = `${digits}${suffix}`;
 
     // Send text message if provided
     if (message) {
@@ -368,7 +359,9 @@ export default class WhatsappService extends Service {
       const MAX_TOTAL_SIZE = getMaxTotalAttachmentSize();
 
       if (attachments.length > MAX_ATTACHMENTS) {
-        throw new Error(`Too many attachments: ${attachments.length} (max ${MAX_ATTACHMENTS})`);
+        throw new Error(
+          `Too many attachments: ${attachments.length} (max ${MAX_ATTACHMENTS})`,
+        );
       }
 
       let totalSize = 0;
@@ -378,20 +371,26 @@ export default class WhatsappService extends Service {
         const estimatedSize = (attachment.data.length * 3) / 4;
 
         if (estimatedSize > MAX_ATTACHMENT_SIZE) {
-          logger.warn({
+          logger.warn(
+            {
               filename: attachment.filename,
               size: estimatedSize,
-            maxSize: MAX_ATTACHMENT_SIZE
-          }, 'Attachment exceeds size limit, skipping');
+              maxSize: MAX_ATTACHMENT_SIZE,
+            },
+            "Attachment exceeds size limit, skipping",
+          );
           continue;
         }
 
         totalSize += estimatedSize;
         if (totalSize > MAX_TOTAL_SIZE) {
-          logger.warn({
+          logger.warn(
+            {
               totalSize,
-            maxTotalSize: MAX_TOTAL_SIZE
-          }, 'Total attachment size exceeds limit, skipping remaining');
+              maxTotalSize: MAX_TOTAL_SIZE,
+            },
+            "Total attachment size exceeds limit, skipping remaining",
+          );
           break;
         }
 

apps/bridge-whatsapp/src/types.ts

@@ -1,4 +1,4 @@
-import type WhatsappService from "./service.js";
+import type WhatsappService from "./service.ts";
 
 declare module "@hapipal/schmervice" {
   interface SchmerviceDecorator {

apps/bridge-whatsapp/tsconfig.json

@@ -1,16 +1,17 @@
 {
   "extends": "@link-stack/typescript-config/tsconfig.node.json",
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "es2018",
+    "module": "NodeNext",
+    "target": "es2022",
     "esModuleInterop": true,
-    "moduleResolution": "node",
+    "moduleResolution": "NodeNext",
     "outDir": "build/main",
     "rootDir": "src",
     "skipLibCheck": true,
     "types": ["node"],
-    "lib": ["es2020", "DOM"],
-    "composite": true
+    "lib": ["es2022", "DOM"],
+    "composite": true,
+    "rewriteRelativeImportExtensions": true
   },
   "include": ["src/**/*.ts", "src/**/.*.ts"],
   "exclude": ["node_modules/**"]

apps/bridge-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-worker",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "type": "module",
   "main": "build/main/index.js",
   "author": "Darren Clarke <darren@redaranj.com>",

apps/link/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/link",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "type": "module",
   "scripts": {
     "dev": "next dev -H 0.0.0.0",
@@ -31,7 +31,7 @@
     "graphql-request": "^7.2.0",
     "ioredis": "^5.8.1",
     "mui-chips-input": "^6.0.0",
-    "next": "15.5.4",
+    "next": "15.5.9",
     "next-auth": "^4.24.11",
     "react": "19.2.0",
     "react-cookie": "^8.0.1",

docker/buildx/Dockerfile

@@ -15,7 +15,7 @@ COPY --from=node /usr/local/lib /usr/local/lib
 COPY --from=node /usr/local/include /usr/local/include
 COPY --from=node /usr/local/bin /usr/local/bin
 
-# Prepare pnpm (corepack is already enabled in node:22-alpine)
+# Prepare pnpm (corepack symlinks already copied from node image)
 RUN corepack prepare pnpm@9.15.4 --activate
 
 # Set up pnpm home

docker/scripts/docker.js

@@ -5,13 +5,13 @@ const app = process.argv[2];
 const command = process.argv[3];
 
 const files = {
-  all: ["zammad", "postgresql", "bridge", "opensearch", "link", "signal-cli-rest-api"],
+  all: ["zammad", "postgresql", "bridge", "opensearch", "link", "signal-cli-rest-api", "bridge-whatsapp"],
   linkDev: ["zammad", "postgresql", "opensearch"],
   link: ["zammad", "postgresql", "opensearch", "link"],
   linkOnly: ["link"],
   opensearch: ["opensearch"],
-  bridgeDev: ["zammad", "postgresql", "signal-cli-rest-api"],
-  bridge: ["zammad", "postgresql", "bridge", "signal-cli-rest-api"],
+  bridgeDev: ["zammad", "postgresql", "signal-cli-rest-api", "bridge-whatsapp"],
+  bridge: ["zammad", "postgresql", "bridge", "signal-cli-rest-api", "bridge-whatsapp"],
   zammad: ["zammad", "postgresql", "opensearch"],
 };
 
@@ -21,7 +21,7 @@ const finalFiles = files[app]
   .map((file) => ['-f', `docker/compose/${file}.yml`]).flat();
 
 // Add bridge-dev.yml for dev commands that include zammad
-const devAppsWithZammad = ['linkDev', 'bridgeDev', 'all'];
+const devAppsWithZammad = ['linkDev', 'bridgeDev'];
 if (devAppsWithZammad.includes(app) && files[app].includes('zammad')) {
   finalFiles.push('-f', 'docker-compose.bridge-dev.yml');
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "description": "Link from the Center for Digital Resilience",
   "scripts": {
     "dev": "dotenv -- turbo dev",
@@ -49,7 +49,7 @@
     "react": "19.2.0",
     "react-dom": "19.2.0",
     "ts-node": "^10.9.2",
-    "turbo": "^2.5.8",
+    "turbo": "^2.6.0",
     "typescript": "latest"
   },
   "pnpm": {

packages/bridge-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-common",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "main": "build/main/index.js",
   "type": "module",
   "author": "Darren Clarke <darren@redaranj.com>",

packages/bridge-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-ui",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "scripts": {
     "build": "tsc -p tsconfig.json"
   },
@@ -11,7 +11,7 @@
     "@mui/material": "^6",
     "@mui/x-data-grid-pro": "^7",
     "kysely": "0.27.5",
-    "next": "15.5.4",
+    "next": "15.5.9",
     "react": "19.2.0",
     "react-dom": "19.2.0",
     "react-qr-code": "^2.0.18"

packages/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/eslint-config",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "description": "amigo's eslint config",
   "main": "index.js",
   "author": "Abel Luck <abel@guardianproject.info>",

packages/jest-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/jest-config",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "description": "",
   "main": "index.js",
   "author": "Abel Luck <abel@guardianproject.info>",

packages/logger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/logger",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "description": "Shared logging utility for Link Stack monorepo",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

packages/signal-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/signal-api",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "type": "module",
   "main": "build/index.js",
   "exports": {

packages/typescript-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/typescript-config",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "description": "Shared TypeScript config",
   "license": "AGPL-3.0-or-later",
   "author": "Abel Luck <abel@guardianproject.info>",

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/ui",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "description": "",
   "scripts": {
     "build": "tsc -p tsconfig.json"
@@ -11,7 +11,7 @@
     "@mui/material": "^6",
     "@mui/x-data-grid-pro": "^7",
     "@mui/x-license": "^7",
-    "next": "15.5.4",
+    "next": "15.5.9",
     "react": "19.2.0",
     "react-dom": "19.2.0"
   },

packages/zammad-addon-bridge/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@link-stack/zammad-addon-bridge",
   "displayName": "Bridge",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "description": "An addon that adds CDR Bridge channels to Zammad.",
   "scripts": {
     "build": "node '../zammad-addon-common/dist/build.js'",

packages/zammad-addon-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/zammad-addon-common",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "description": "",
   "bin": {
     "zpm-build": "./dist/build.js",

packages/zammad-addon-hardening/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@link-stack/zammad-addon-hardening",
   "displayName": "Hardening",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.3",
   "description": "A Zammad addon that hardens a Zammad instance according to CDR's needs.",
   "scripts": {
     "build": "node '../zammad-addon-common/dist/build.js'",