Merge branch 'fix/docker-build-issues' into 'main'

Fix Docker-in-Docker connectivity for GitLab CI

See merge request digiresilience/link/link-stack!23

.gitlab-ci.yml

@@ -20,11 +20,13 @@ build-all:
     - turbo build
 
 .docker-build:
-  image: registry.gitlab.com/digiresilience/link/link-stack/buildx:${CI_COMMIT_REF_NAME}
+  image: registry.gitlab.com/digiresilience/link/link-stack/buildx:main
   services:
     - docker:dind
   stage: docker-build
   variables:
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_TLS_CERTDIR: ""
     DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
     BUILD_CONTEXT: .
   only:
@@ -37,11 +39,13 @@ build-all:
     - docker push ${DOCKER_NS}:${DOCKER_TAG}
 
 .docker-release:
-  image: registry.gitlab.com/digiresilience/link/link-stack/buildx:${CI_COMMIT_REF_NAME}
+  image: registry.gitlab.com/digiresilience/link/link-stack/buildx:main
   services:
     - docker:dind
   stage: docker-release
   variables:
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_TLS_CERTDIR: ""
     DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
     DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME}
   only:
@@ -195,8 +199,8 @@ zammad-docker-build:
     PNPM_HOME: "/pnpm"
   before_script:
     - export PATH="$PNPM_HOME:$PATH"
-  script:
     - corepack enable && corepack prepare pnpm@9.15.4 --activate
+  script:
     - pnpm add -g turbo
     - pnpm install --frozen-lockfile
     - turbo build --force --filter @link-stack/zammad-addon-*
@@ -218,8 +222,8 @@ zammad-standalone-docker-build:
     PNPM_HOME: "/pnpm"
   before_script:
     - export PATH="$PNPM_HOME:$PATH"
-  script:
     - corepack enable && corepack prepare pnpm@9.15.4 --activate
+  script:
     - pnpm add -g turbo
     - pnpm install --frozen-lockfile
     - turbo build --force --filter @link-stack/zammad-addon-*

README.md

@@ -20,3 +20,4 @@ We use [Turborepo](https://turbo.build) to manage development and building of th
 To run a single package:
 
 - `turbo dev --filter @link-stack/link`
+

apps/bridge-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-frontend",
-  "version": "3.3.2",
+  "version": "3.3.5",
   "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.3.5",
   "type": "module",
   "scripts": {
     "migrate:up:all": "tsx migrate.ts up:all",

apps/bridge-whatsapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-whatsapp",
-  "version": "3.3.2",
+  "version": "3.3.5",
   "main": "build/main/index.js",
   "author": "Darren Clarke <darren@redaranj.com>",
   "license": "AGPL-3.0-or-later",
@@ -11,7 +11,7 @@
     "@hapipal/toys": "^4.0.0",
     "@link-stack/bridge-common": "workspace:*",
     "@link-stack/logger": "workspace:*",
-    "@whiskeysockets/baileys": "^6.7.21",
+    "@whiskeysockets/baileys": "6.7.21",
     "hapi-pino": "^13.0.0",
     "link-preview-js": "^3.1.0"
   },

apps/bridge-whatsapp/src/service.ts

@@ -26,11 +26,7 @@ export default class WhatsappService extends Service {
   connections: { [key: string]: any } = {};
   loginConnections: { [key: string]: any } = {};
 
-  static browserDescription: [string, string, string] = [
+  static browserDescription: [string, string, string] = ["Bridge", "Chrome", "2.0"];
-    "Bridge",
-    "Chrome",
-    "2.0",
-  ];
 
   constructor(server: Server, options: never) {
     super(server, options);
@@ -47,7 +43,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}`);
     }
 
@@ -102,20 +98,14 @@ export default class WhatsappService extends Service {
       auth: state,
       generateHighQualityLinkPreview: false,
       msgRetryCounterMap,
-      shouldIgnoreJid: (jid) =>
+      shouldIgnoreJid: (jid) => isJidBroadcast(jid) || isJidStatusBroadcast(jid),
-        isJidBroadcast(jid) || isJidStatusBroadcast(jid),
     });
     let pause = 5000;
 
     socket.ev.process(async (events) => {
       if (events["connection.update"]) {
         const update = events["connection.update"];
-        const {
+        const { connection: connectionState, lastDisconnect, qr, isNewLogin } = update;
-          connection: connectionState,
-          lastDisconnect,
-          qr,
-          isNewLogin,
-        } = update;
         if (qr) {
           logger.info("got qr code");
           const botDirectory = this.getBotDirectory(botID);
@@ -130,8 +120,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
+          const disconnectStatusCode = (lastDisconnect?.error as any)?.output?.statusCode;
-            ?.statusCode;
           if (disconnectStatusCode === DisconnectReason.restartRequired) {
             logger.info("reconnecting after got new login");
             await this.createConnection(botID, server, options);
@@ -174,10 +163,7 @@ export default class WhatsappService extends Service {
       const verifiedFile = `${directory}/verified`;
       if (fs.existsSync(verifiedFile)) {
         const { version, isLatest } = await fetchLatestBaileysVersion();
-        logger.info(
+        logger.info({ version: version.join("."), isLatest }, "using WA version");
-          { version: version.join("."), isLatest },
-          "using WA version",
-        );
 
         await this.createConnection(botID, this.server, {
           browser: WhatsappService.browserDescription,
@@ -188,10 +174,7 @@ export default class WhatsappService extends Service {
     }
   }
 
-  private async queueMessage(
+  private async queueMessage(botID: string, webMessageInfo: proto.IWebMessageInfo) {
-    botID: string,
-    webMessageInfo: proto.IWebMessageInfo,
-  ) {
     const {
       key: { id, fromMe, remoteJid },
       message,
@@ -204,11 +187,9 @@ export default class WhatsappService extends Service {
         "Message field",
       );
     }
-    const isValidMessage =
+    const isValidMessage = message && remoteJid !== "status@broadcast" && !fromMe;
-      message && remoteJid !== "status@broadcast" && !fromMe;
     if (isValidMessage) {
-      const { audioMessage, documentMessage, imageMessage, videoMessage } =
+      const { audioMessage, documentMessage, imageMessage, videoMessage } = message;
-        message;
       const isMediaMessage =
         audioMessage || documentMessage || imageMessage || videoMessage;
 
@@ -288,10 +269,7 @@ export default class WhatsappService extends Service {
     }
   }
 
-  private async queueUnreadMessages(
+  private async queueUnreadMessages(botID: string, messages: proto.IWebMessageInfo[]) {
-    botID: string,
-    messages: proto.IWebMessageInfo[],
-  ) {
     for await (const message of messages) {
       await this.queueMessage(botID, message);
     }
@@ -334,10 +312,7 @@ export default class WhatsappService extends Service {
     }
   }
 
-  async register(
+  async register(botID: string, callback?: AuthCompleteCallback): Promise<void> {
-    botID: string,
-    callback?: AuthCompleteCallback,
-  ): Promise<void> {
     const { version } = await fetchLatestBaileysVersion();
     await this.createConnection(
       botID,
@@ -355,7 +330,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 +346,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 +358,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,
+              filename: attachment.filename,
-            maxSize: MAX_ATTACHMENT_SIZE
+              size: estimatedSize,
-          }, '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
+              totalSize,
-          }, 'Total attachment size exceeds limit, skipping remaining');
+              maxTotalSize: MAX_TOTAL_SIZE,
+            },
+            "Total attachment size exceeds limit, skipping remaining",
+          );
           break;
         }
 

apps/bridge-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-worker",
-  "version": "3.3.2",
+  "version": "3.3.5",
   "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.3.5",
   "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",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack",
-  "version": "3.3.2",
+  "version": "3.3.5",
   "description": "Link from the Center for Digital Resilience",
   "scripts": {
     "dev": "dotenv -- turbo dev",

packages/bridge-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-common",
-  "version": "3.3.2",
+  "version": "3.3.5",
   "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.3.5",
   "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.3.5",
   "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.3.5",
   "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.3.5",
   "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.3.5",
   "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.3.5",
   "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.3.5",
   "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.3.5",
   "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.3.5",
   "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.3.5",
   "description": "A Zammad addon that hardens a Zammad instance according to CDR's needs.",
   "scripts": {
     "build": "node '../zammad-addon-common/dist/build.js'",