chore: NATS broker for micro services

.github/workflows/ci-test-e2e.yml

@@ -16,6 +16,10 @@ on:
         type: string
       transporter:
         type: string
+      broker:
+        default: 'nats' # TODO remove default before merge
+        required: false
+        type: string
       mongodb-version:
         default: "['8.0']"
         required: false
@@ -82,7 +86,7 @@ jobs:
       # if building for production on develop branch or release, add suffix for coverage images
       DOCKER_TAG_SUFFIX_ROCKETCHAT: ${{ inputs.coverage == matrix.mongodb-version && (github.event_name == 'release' || github.ref == 'refs/heads/develop') && '-cov' || '' }}
       MONGODB_VERSION: ${{ matrix.mongodb-version }}
-      COVERAGE_DIR: '/tmp/coverage/${{ startsWith(inputs.type, ''api'') && ''api'' || inputs.type }}'
+      COVERAGE_DIR: "/tmp/coverage/${{ startsWith(inputs.type, 'api') && 'api' || inputs.type }}"
       COVERAGE_FILE_NAME: '${{ inputs.type }}-${{ matrix.shard }}.json'
       COVERAGE_REPORTER: ${{ inputs.coverage == matrix.mongodb-version && 'json' || '' }}
 
@@ -204,6 +208,7 @@ jobs:
           COMPOSE_PROFILES: ${{ inputs.type == 'api' && 'api' || '' }}
           TEST_MODE: ${{ startsWith(inputs.type, 'api') && 'api' || 'true' }}
           FIPS_OVERRIDE: ${{ inputs.fips && '-f docker-compose-ci.fips.yml' || '' }}
+          BROKER: ${{ inputs.broker }}
         run: |
           read -r -a fips_override <<< "$FIPS_OVERRIDE"
           DEBUG_LOG_LEVEL=${DEBUG_LOG_LEVEL:-0} docker compose -f docker-compose-ci.yml "${fips_override[@]}" up -d --wait
@@ -213,11 +218,20 @@ jobs:
 
       - name: Wait services to start up
         if: inputs.release == 'ee'
+        env:
+          BROKER: ${{ inputs.broker }}
         run: |
           docker ps
 
-          until docker compose -f docker-compose-ci.yml logs ddp-streamer-service | grep -q "MoleculerBroker started successfully"; do
-            echo "Waiting 'ddp-streamer' to start up"
+          # assert the broker that was asked for actually started, so a silent
+          # fallback to the other one fails the run instead of passing
+          expected="MoleculerBroker started successfully"
+          if [ "$BROKER" = 'nats' ]; then
+            expected="NatsBroker started successfully"
+          fi
+
+          until docker compose -f docker-compose-ci.yml logs ddp-streamer-service | grep -q "$expected"; do
+            echo "Waiting 'ddp-streamer' to start up with $expected"
             ((c++)) && ((c==10)) && docker compose -f docker-compose-ci.yml logs ddp-streamer-service && exit 1
             sleep 10
           done;

CLAUDE.md

@@ -42,7 +42,7 @@ Read the doc that matches the task instead of scanning `docs/` wholesale.
 - [docs/api-endpoint-migration.md](docs/api-endpoint-migration.md) — migrating `API.v1.addRoute()` to the validated `API.v1.get()`/`.post()`/… pattern
 - [docs/ajv-instances.md](docs/ajv-instances.md) — when to use `ajv` vs `ajvQuery` in `@rocket.chat/rest-typings`
 - [docs/apps-engine-migration.md](docs/apps-engine-migration.md) — phased extraction of apps execution into a microservice
-- [docs/service-brokers.md](docs/service-brokers.md) — how services reach each other: the local and Moleculer brokers, how events and stream relays reach other instances in each deployment, and the calls that only work because both ends share a process
+- [docs/service-brokers.md](docs/service-brokers.md) — how services reach each other: the three brokers (local, Moleculer, NATS), what the new NATS one had to rebuild, how events and stream relays reach other instances in each deployment, and the calls that only work because both ends share a process
 
 ### Build and tooling
 

apps/meteor/package.json

@@ -268,7 +268,7 @@
 		"moment-timezone": "^0.5.48",
 		"mongo-message-queue": "^1.1.0",
 		"mongodb": "6.16.0",
-		"nats": "^2.28.2",
+		"nats": "^2.29.1",
 		"node-dogstatsd": "^0.0.7",
 		"node-fetch": "2.7.0",
 		"node-rsa": "^1.1.1",

docker-compose-ci.yml

@@ -18,6 +18,7 @@ services:
       - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0
       - 'MONGO_OPLOG_URL=${MONGO_OPLOG_URL:-}'
       - 'TRANSPORTER=${TRANSPORTER:-}'
+      - 'BROKER=${BROKER:-}'
       - MOLECULER_LOG_LEVEL=info
       - 'ROCKETCHAT_LICENSE=${ENTERPRISE_LICENSE:-}'
       - 'COVERAGE_DIR=${COVERAGE_DIR:-}'
@@ -71,6 +72,7 @@ services:
     environment:
       - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0
       - 'TRANSPORTER=${TRANSPORTER:-}'
+      - 'BROKER=${BROKER:-}'
       - MOLECULER_LOG_LEVEL=info
     extra_hosts:
       - 'host.docker.internal:host-gateway'
@@ -92,6 +94,7 @@ services:
     environment:
       - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0
       - 'TRANSPORTER=${TRANSPORTER:-}'
+      - 'BROKER=${BROKER:-}'
       - MOLECULER_LOG_LEVEL=info
     extra_hosts:
       - 'host.docker.internal:host-gateway'
@@ -113,6 +116,7 @@ services:
     environment:
       - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0
       - 'TRANSPORTER=${TRANSPORTER:-}'
+      - 'BROKER=${BROKER:-}'
       - MOLECULER_LOG_LEVEL=info
     extra_hosts:
       - 'host.docker.internal:host-gateway'
@@ -134,6 +138,7 @@ services:
     environment:
       - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0
       - 'TRANSPORTER=${TRANSPORTER:-}'
+      - 'BROKER=${BROKER:-}'
       - MOLECULER_LOG_LEVEL=info
     extra_hosts:
       - 'host.docker.internal:host-gateway'
@@ -161,6 +166,7 @@ services:
     environment:
       - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0
       - 'TRANSPORTER=${TRANSPORTER:-}'
+      - 'BROKER=${BROKER:-}'
       - MOLECULER_LOG_LEVEL=info
     extra_hosts:
       - 'host.docker.internal:host-gateway'
@@ -183,6 +189,7 @@ services:
       - 'TEST_MODE=${TEST_MODE:-true}'
       - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0
       - 'TRANSPORTER=${TRANSPORTER:-}'
+      - 'BROKER=${BROKER:-}'
       - MOLECULER_LOG_LEVEL=info
     extra_hosts:
       - 'host.docker.internal:host-gateway'