Compare commits

..

4 commits

Author SHA1 Message Date
Darren Clarke
797ed112c6 Update version 2025-12-02 18:19:31 +01:00
Darren Clarke
a2fc38db25 Fetch message history at startup 2025-12-02 18:19:14 +01:00
Darren Clarke
0c287e38d3 Remove deprecated property 2025-12-02 18:00:25 +01:00
Darren Clarke
8d3eeee1d9 Update Baileys to 7RC 2025-12-02 16:55:07 +01:00
25 changed files with 1023 additions and 936 deletions

View file

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

2
.nvmrc
View file

@ -1 +1 @@
v22.18.0 v24

View file

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

View file

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

View file

@ -1,33 +1,29 @@
{ {
"name": "@link-stack/bridge-whatsapp", "name": "@link-stack/bridge-whatsapp",
"version": "3.3.5", "version": "3.4.0-beta.1",
"type": "module",
"main": "build/main/index.js", "main": "build/main/index.js",
"author": "Darren Clarke <darren@redaranj.com>", "author": "Darren Clarke <darren@redaranj.com>",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@adiwajshing/keyed-db": "0.2.4",
"@hapi/hapi": "^21.4.3", "@hapi/hapi": "^21.4.3",
"@hapipal/schmervice": "^3.0.0", "@hapipal/schmervice": "^3.0.0",
"@hapipal/toys": "^4.0.0", "@hapipal/toys": "^4.0.0",
"@link-stack/bridge-common": "workspace:*", "@link-stack/bridge-common": "workspace:*",
"@link-stack/logger": "workspace:*", "@link-stack/logger": "workspace:*",
"@whiskeysockets/baileys": "6.7.21", "@whiskeysockets/baileys": "7.0.0-rc.9",
"hapi-pino": "^13.0.0", "hapi-pino": "^13.0.0"
"link-preview-js": "^3.1.0"
}, },
"devDependencies": { "devDependencies": {
"@link-stack/eslint-config": "workspace:*", "@link-stack/eslint-config": "workspace:*",
"@link-stack/jest-config": "workspace:*", "@link-stack/jest-config": "workspace:*",
"@link-stack/typescript-config": "workspace:*", "@link-stack/typescript-config": "workspace:*",
"@types/long": "^5",
"@types/node": "*", "@types/node": "*",
"dotenv-cli": "^10.0.0",
"tsx": "^4.20.6",
"typescript": "^5.9.3" "typescript": "^5.9.3"
}, },
"scripts": { "scripts": {
"build": "tsc -p tsconfig.json", "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" "start": "node build/main/index.js"
} }
} }

View file

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

View file

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

View file

@ -4,12 +4,13 @@ import makeWASocket, {
DisconnectReason, DisconnectReason,
proto, proto,
downloadContentFromMessage, downloadContentFromMessage,
MediaType,
fetchLatestBaileysVersion, fetchLatestBaileysVersion,
isJidBroadcast, isJidBroadcast,
isJidStatusBroadcast, isJidStatusBroadcast,
useMultiFileAuthState, useMultiFileAuthState,
} from "@whiskeysockets/baileys"; } from "@whiskeysockets/baileys";
type MediaType = "audio" | "document" | "image" | "video" | "sticker";
import fs from "fs"; import fs from "fs";
import { createLogger } from "@link-stack/logger"; import { createLogger } from "@link-stack/logger";
import { import {
@ -97,6 +98,7 @@ export default class WhatsappService extends Service {
...options, ...options,
auth: state, auth: state,
generateHighQualityLinkPreview: false, generateHighQualityLinkPreview: false,
syncFullHistory: true,
msgRetryCounterMap, msgRetryCounterMap,
shouldIgnoreJid: (jid) => isJidBroadcast(jid) || isJidStatusBroadcast(jid), shouldIgnoreJid: (jid) => isJidBroadcast(jid) || isJidStatusBroadcast(jid),
}); });
@ -147,6 +149,17 @@ export default class WhatsappService extends Service {
await this.queueUnreadMessages(botID, messages); 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 }; this.connections[botID] = { socket, msgRetryCounterMap };
@ -167,7 +180,6 @@ export default class WhatsappService extends Service {
await this.createConnection(botID, this.server, { await this.createConnection(botID, this.server, {
browser: WhatsappService.browserDescription, browser: WhatsappService.browserDescription,
printQRInTerminal: true,
version, version,
}); });
} }
@ -175,11 +187,12 @@ export default class WhatsappService extends Service {
} }
private async queueMessage(botID: string, webMessageInfo: proto.IWebMessageInfo) { private async queueMessage(botID: string, webMessageInfo: proto.IWebMessageInfo) {
const { const { key, message, messageTimestamp } = webMessageInfo;
key: { id, fromMe, remoteJid }, if (!key) {
message, logger.warn("Message missing key, skipping");
messageTimestamp, return;
} = webMessageInfo; }
const { id, fromMe, remoteJid } = key;
logger.info("Message type debug"); logger.info("Message type debug");
for (const key in message) { for (const key in message) {
logger.info( logger.info(
@ -330,10 +343,7 @@ export default class WhatsappService extends Service {
attachments?: Array<{ data: string; filename: string; mime_type: string }>, attachments?: Array<{ data: string; filename: string; mime_type: string }>,
): Promise<void> { ): Promise<void> {
const connection = this.connections[botID]?.socket; const connection = this.connections[botID]?.socket;
const digits = phoneNumber.replace(/\D+/g, ""); const recipient = `${phoneNumber.replace(/\D+/g, "")}@s.whatsapp.net`;
// 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 // Send text message if provided
if (message) { if (message) {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

1826
pnpm-lock.yaml generated

File diff suppressed because it is too large Load diff