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-*

.nvmrc

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

apps/bridge-frontend/package.json

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

apps/bridge-whatsapp/package.json

@@ -1,29 +1,33 @@
 {
   "name": "@link-stack/bridge-whatsapp",
-  "version": "3.4.0-beta.2",
+  "version": "3.3.5",
-  "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": "7.0.0-rc.9",
+    "@whiskeysockets/baileys": "6.7.21",
-    "hapi-pino": "^13.0.0"
+    "hapi-pino": "^13.0.0",
+    "link-preview-js": "^3.1.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": "node --env-file=.env --experimental-transform-types src/index.ts",
+    "dev": "dotenv -- tsx 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.ts";
+import WhatsappService from "./service.js";
 import {
   RegisterBotRoute,
   UnverifyBotRoute,
   GetBotRoute,
   SendMessageRoute,
   ReceiveMessageRoute,
-} from "./routes.ts";
+} from "./routes.js";
 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.ts";
+import WhatsappService from "./service";
 
 const withDefaults = Toys.withRouteDefaults({
   options: {
@@ -27,9 +27,15 @@ 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,13 +4,12 @@ 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 {
@@ -98,7 +97,6 @@ export default class WhatsappService extends Service {
       ...options,
       auth: state,
       generateHighQualityLinkPreview: false,
-      syncFullHistory: true,
       msgRetryCounterMap,
       shouldIgnoreJid: (jid) => isJidBroadcast(jid) || isJidStatusBroadcast(jid),
     });
@@ -149,17 +147,6 @@ 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 };
@@ -180,6 +167,7 @@ export default class WhatsappService extends Service {
 
         await this.createConnection(botID, this.server, {
           browser: WhatsappService.browserDescription,
+          printQRInTerminal: true,
           version,
         });
       }
@@ -187,12 +175,11 @@ export default class WhatsappService extends Service {
   }
 
   private async queueMessage(botID: string, webMessageInfo: proto.IWebMessageInfo) {
-    const { key, message, messageTimestamp } = webMessageInfo;
+    const {
-    if (!key) {
+      key: { id, fromMe, remoteJid },
-      logger.warn("Message missing key, skipping");
+      message,
-      return;
+      messageTimestamp,
-    }
+    } = webMessageInfo;
-    const { id, fromMe, remoteJid } = key;
     logger.info("Message type debug");
     for (const key in message) {
       logger.info(

apps/bridge-whatsapp/src/types.ts

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

apps/bridge-whatsapp/tsconfig.json

@@ -1,17 +1,16 @@
 {
   "extends": "@link-stack/typescript-config/tsconfig.node.json",
   "compilerOptions": {
-    "module": "NodeNext",
+    "module": "commonjs",
-    "target": "es2022",
+    "target": "es2018",
     "esModuleInterop": true,
-    "moduleResolution": "NodeNext",
+    "moduleResolution": "node",
     "outDir": "build/main",
     "rootDir": "src",
     "skipLibCheck": true,
     "types": ["node"],
-    "lib": ["es2022", "DOM"],
+    "lib": ["es2020", "DOM"],
-    "composite": true,
+    "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.4.0-beta.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.4.0-beta.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",

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", "bridge-whatsapp"],
+  all: ["zammad", "postgresql", "bridge", "opensearch", "link", "signal-cli-rest-api"],
   linkDev: ["zammad", "postgresql", "opensearch"],
   link: ["zammad", "postgresql", "opensearch", "link"],
   linkOnly: ["link"],
   opensearch: ["opensearch"],
-  bridgeDev: ["zammad", "postgresql", "signal-cli-rest-api", "bridge-whatsapp"],
+  bridgeDev: ["zammad", "postgresql", "signal-cli-rest-api"],
-  bridge: ["zammad", "postgresql", "bridge", "signal-cli-rest-api", "bridge-whatsapp"],
+  bridge: ["zammad", "postgresql", "bridge", "signal-cli-rest-api"],
   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'];
+const devAppsWithZammad = ['linkDev', 'bridgeDev', 'all'];
 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.4.0-beta.2",
+  "version": "3.3.5",
   "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.6.0",
+    "turbo": "^2.5.8",
     "typescript": "latest"
   },
   "pnpm": {

packages/bridge-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-stack/bridge-common",
-  "version": "3.4.0-beta.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.4.0-beta.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.4.0-beta.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.4.0-beta.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.4.0-beta.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.4.0-beta.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.4.0-beta.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.4.0-beta.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.4.0-beta.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.4.0-beta.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.4.0-beta.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'",