Regression: Fix micro services

apps/meteor/definition/externals/meteor/meteor.d.ts

@@ -1,8 +1,17 @@
 /* eslint-disable @typescript-eslint/interface-name-prefix */
 import 'meteor/meteor';
+import { IStreamerConstructor, IStreamer } from 'meteor/rocketchat:streamer';
 
 declare module 'meteor/meteor' {
 	namespace Meteor {
+		const Streamer: IStreamerConstructor & IStreamer;
+
+		namespace StreamerCentral {
+			const instances: {
+				[name: string]: IStreamer;
+			};
+		}
+
 		interface ErrorStatic {
 			new (error: string | number, reason?: string, details?: any): Error;
 		}

apps/meteor/definition/externals/meteor/rocketchat-streamer.d.ts

@@ -80,17 +80,3 @@ declare module 'meteor/rocketchat:streamer' {
 		new (name: string, options?: { retransmit?: boolean; retransmitToSelf?: boolean }): IStreamer;
 	}
 }
-
-declare module 'meteor/meteor' {
-	import { IStreamerConstructor, IStreamer } from 'meteor/rocketchat:streamer';
-
-	namespace Meteor {
-		const Streamer: IStreamerConstructor & IStreamer;
-
-		namespace StreamerCentral {
-			const instances: {
-				[name: string]: IStreamer;
-			};
-		}
-	}
-}

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

@@ -9,7 +9,6 @@
 		"pm2": "pm2",
 		"start:account": "ts-node --files ./account/service.ts",
 		"start:authorization": "ts-node --files ./authorization/service.ts",
-		"start:ddp-streamer": "ts-node --files ./ddp-streamer/service.ts",
 		"start:presence": "ts-node --files ./presence/service.ts",
 		"start:stream-hub": "ts-node --files ./stream-hub/service.ts",
 		"typecheck": "tsc --noEmit --skipLibCheck",

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

@@ -43,6 +43,6 @@
 		// "emitDecoratorMetadata": true,
 		// "experimentalDecorators": true,
 	},
-	"include": ["./**/*", "../../../definition"],
+	"include": ["./**/*", "../../../definition/externals/meteor/rocketchat-streamer.d.ts"],
 	"exclude": ["./dist", "./ecosystem.config.js", "../../../definition/methods"]
 }

apps/meteor/server/modules/listeners/listeners.module.ts

@@ -4,7 +4,7 @@ import { parse } from '@rocket.chat/message-parser';
 import { IServiceClass } from '../../sdk/types/ServiceClass';
 import { NotificationsModule } from '../notifications/notifications.module';
 import { EnterpriseSettings } from '../../sdk/index';
-import { settings } from '../../../app/settings/server';
+import { settings } from '../../../app/settings/server/cached';
 
 const isMessageParserDisabled = process.env.DISABLE_MESSAGE_PARSER === 'true';
 

apps/meteor/server/services/voip/lib/Helper.ts

@@ -1,6 +1,6 @@
 import { ServerType, IVoipManagementServerConfig, IVoipCallServerConfig } from '@rocket.chat/core-typings';
 
-import { settings } from '../../../../app/settings/server';
+import { settings } from '../../../../app/settings/server/cached';
 
 export function getServerConfigDataFromSettings(type: ServerType): IVoipCallServerConfig | IVoipManagementServerConfig {
 	switch (type) {

ee/apps/ddp-streamer/package.json

@@ -5,7 +5,8 @@
 	"description": "Rocket.Chat DDP-Streamer service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
-		"test": "echo \"Error: no test specified\" && exit 1"
+		"test": "echo \"Error: no test specified\" && exit 1",
+		"typecheck": "tsc --noEmit --skipLibCheck -p tsconfig.json"
 	},
 	"keywords": [
 		"rocketchat"

ee/apps/ddp-streamer/tsconfig.json

@@ -24,6 +24,6 @@
 		"declaration": false,
 		"declarationMap": false
 	},
-	"include": ["./src/**/*", "../../../apps/meteor/definition", "./definition"],
+	"include": ["./src/**/*", "./definition", "../../../apps/meteor/definition/externals/meteor/rocketchat-streamer.d.ts"],
 	"exclude": ["./dist", "./ecosystem.config.js"]
 }