chore: create network broker package

_templates/service/new/package.json.ejs.t

@@ -20,6 +20,7 @@ to: ee/apps/<%= name %>/package.json
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/emitter": "next",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",

_templates/service/new/service.ejs.t

@@ -1,11 +1,11 @@
 ---
 to: ee/apps/<%= name %>/src/service.ts
 ---
+import { api } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
-import { api } from '@rocket.chat/core-services';
 
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 

apps/meteor/ee/server/services/ecdh-proxy/service.ts

@@ -1,5 +1,4 @@
-import '../../startup/broker';
-
+import '@rocket.chat/network-broker';
 import { api } from '@rocket.chat/core-services';
 
 import { ECDHProxy } from './ECDHProxy';

apps/meteor/ee/server/services/package.json

@@ -25,6 +25,7 @@
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/ui-kit": "workspace:~",

apps/meteor/ee/server/startup/index.ts

@@ -13,7 +13,7 @@ import { isRunningMs } from '../../../server/lib/isRunningMs';
 export const registerEEBroker = async (): Promise<void> => {
 	// only starts network broker if running in micro services mode
 	if (isRunningMs()) {
-		const { broker } = await import('./broker');
+		const { broker } = await import('@rocket.chat/network-broker');
 
 		api.setBroker(broker);
 		void api.start();

apps/meteor/package.json

@@ -262,6 +262,7 @@
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/mp3-encoder": "0.24.0",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@rocket.chat/onboarding-ui": "~0.33.3",
 		"@rocket.chat/password-policies": "workspace:^",

ee/apps/account-service/Dockerfile

@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 

ee/apps/account-service/package.json

@@ -20,6 +20,7 @@
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tools": "workspace:^",

ee/apps/account-service/src/service.ts

@@ -1,10 +1,10 @@
 import { api } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3033;
 

ee/apps/authorization-service/Dockerfile

@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 

ee/apps/authorization-service/package.json

@@ -20,6 +20,7 @@
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@types/node": "^14.18.63",

ee/apps/authorization-service/src/service.ts

@@ -1,10 +1,10 @@
 import { api } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3034;
 

ee/apps/ddp-streamer/Dockerfile

@@ -40,6 +40,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 

ee/apps/ddp-streamer/package.json

@@ -23,6 +23,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"colorette": "^1.4.0",

ee/apps/ddp-streamer/src/service.ts

@@ -1,9 +1,9 @@
 import { api } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 (async () => {
 	const db = await getConnection();

ee/apps/omnichannel-transcript/Dockerfile

@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 

ee/apps/omnichannel-transcript/package.json

@@ -22,6 +22,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@rocket.chat/pdf-worker": "workspace:^",
 		"@rocket.chat/tools": "workspace:^",

ee/apps/omnichannel-transcript/src/service.ts

@@ -1,11 +1,11 @@
 import { api } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3036;
 

ee/apps/presence-service/Dockerfile

@@ -40,6 +40,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 

ee/apps/presence-service/package.json

@@ -20,6 +20,7 @@
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/presence": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@types/node": "^14.18.63",

ee/apps/presence-service/src/service.ts

@@ -1,10 +1,10 @@
 import { api } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3031;
 

ee/apps/queue-worker/Dockerfile

@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 

ee/apps/queue-worker/package.json

@@ -22,6 +22,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@types/node": "^14.18.63",
 		"ejson": "^2.2.3",

ee/apps/queue-worker/src/service.ts

@@ -1,11 +1,11 @@
 import { api } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3038;
 

ee/apps/stream-hub-service/Dockerfile

@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 

ee/apps/stream-hub-service/package.json

@@ -21,6 +21,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@types/node": "^14.18.63",
 		"ejson": "^2.2.3",

ee/apps/stream-hub-service/src/service.ts

@@ -1,11 +1,11 @@
 import { api } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
+import { broker } from '@rocket.chat/network-broker';
 import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 import { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher';
 import { StreamHub } from './StreamHub';
 

ee/packages/network-broker/.eslintrc.json

@@ -0,0 +1,4 @@
+{
+	"extends": ["@rocket.chat/eslint-config"],
+	"ignorePatterns": ["**/dist"]
+}

ee/packages/network-broker/jest.config.ts

@@ -0,0 +1,6 @@
+import server from '@rocket.chat/jest-presets/server';
+import type { Config } from 'jest';
+
+export default {
+	preset: server.preset,
+} satisfies Config;

ee/packages/network-broker/package.json

@@ -0,0 +1,39 @@
+{
+	"name": "@rocket.chat/network-broker",
+	"version": "0.1.0",
+	"private": true,
+	"devDependencies": {
+		"@rocket.chat/eslint-config": "workspace:^",
+		"@types/chai": "~4.3.19",
+		"@types/ejson": "^2.2.2",
+		"@types/node": "^14.18.63",
+		"@types/sinon": "^10.0.20",
+		"chai": "^4.3.10",
+		"eslint": "~8.45.0",
+		"jest": "~29.7.0",
+		"sinon": "^14.0.2",
+		"typescript": "~5.5.4"
+	},
+	"scripts": {
+		"lint": "eslint src",
+		"lint:fix": "eslint src --fix",
+		"test": "jest",
+		"build": "tsc",
+		"testunit": "jest",
+		"typecheck": "tsc --noEmit --skipLibCheck"
+	},
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"volta": {
+		"extends": "../../../package.json"
+	},
+	"dependencies": {
+		"@rocket.chat/core-services": "workspace:^",
+		"ejson": "^2.2.3",
+		"moleculer": "^0.14.34",
+		"pino": "^8.15.0"
+	}
+}

apps/meteor/ee/tests/unit/server/NetworkBroker.tests.ts → ee/packages/network-broker/src/NetworkBroker.test.ts

@@ -2,8 +2,8 @@ import { ServiceClass } from '@rocket.chat/core-services';
 import { expect } from 'chai';
 import sinon from 'sinon';
 
-import { BrokerMocked } from '../../../../tests/mocks/server/BrokerMocked';
-import { NetworkBroker } from '../../../server/NetworkBroker';
+import { BrokerMocked } from '../../../../apps/meteor/tests/mocks/server/BrokerMocked';
+import { NetworkBroker } from './NetworkBroker';
 
 class DelayedStopBroker extends BrokerMocked {
 	async destroyService(name: string) {

apps/meteor/ee/server/NetworkBroker.ts → ee/packages/network-broker/src/NetworkBroker.ts

@@ -2,7 +2,7 @@ import { asyncLocalStorage } from '@rocket.chat/core-services';
 import type { IBroker, IBrokerNode, IServiceMetrics, IServiceClass, EventSignatures } from '@rocket.chat/core-services';
 import type { ServiceBroker, Context, ServiceSchema } from 'moleculer';
 
-import { EnterpriseCheck } from './lib/EnterpriseCheck';
+import { EnterpriseCheck } from './EnterpriseCheck';
 
 const events: { [k: string]: string } = {
 	onNodeConnected: '$node.connected',
@@ -25,7 +25,7 @@ const waitForServicesTimeout = parseInt(WAIT_FOR_SERVICES_TIMEOUT, 10) || 10000;
 export class NetworkBroker implements IBroker {
 	private broker: ServiceBroker;
 
-	private started: Promise<void>;
+	private started: Promise<boolean> = Promise.resolve(false);
 
 	metrics: IServiceMetrics;
 
@@ -36,7 +36,9 @@ export class NetworkBroker implements IBroker {
 	}
 
 	async call(method: string, data: any): Promise<any> {
-		await this.started;
+		if (!(await this.started)) {
+			return;
+		}
 
 		const context = asyncLocalStorage.getStore();
 
@@ -54,7 +56,9 @@ export class NetworkBroker implements IBroker {
 	}
 
 	async waitAndCall(method: string, data: any): Promise<any> {
-		await this.started;
+		if (!(await this.started)) {
+			return;
+		}
 
 		try {
 			await this.broker.waitForServices(method.split('.')[0], waitForServicesTimeout);
@@ -182,6 +186,8 @@ export class NetworkBroker implements IBroker {
 	}
 
 	async start(): Promise<void> {
-		this.started = this.broker.start();
+		await this.broker.start();
+
+		this.started = Promise.resolve(true);
 	}
 }

apps/meteor/ee/server/startup/broker.ts → ee/packages/network-broker/src/index.ts

@@ -3,7 +3,7 @@ import EJSON from 'ejson';
 import { Errors, Serializers, ServiceBroker } from 'moleculer';
 import { pino } from 'pino';
 
-import { NetworkBroker } from '../NetworkBroker';
+import { NetworkBroker } from './NetworkBroker';
 
 const {
 	MS_NAMESPACE = '',

ee/packages/network-broker/tsconfig.json

@@ -0,0 +1,9 @@
+{
+	"extends": "../../../tsconfig.base.server.json",
+	"compilerOptions": {
+		"declaration": true,
+		"outDir": "./dist",
+		"rootDir": "./src",
+	},
+	"files": ["./src/index.ts"]
+}