move DatabaseWatcher to models package

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

@@ -36,10 +36,10 @@ import {
 	Permissions,
 	LivechatPriority,
 } from '@rocket.chat/models';
+import type { DatabaseWatcher } from '@rocket.chat/models';
 
 import { getMessageToBroadcast } from '../../../app/lib/server/lib/notifyListener';
 import { subscriptionFields, roomFields } from '../../../lib/publishFields';
-import type { DatabaseWatcher } from '../../database/DatabaseWatcher';
 
 type BroadcastCallback = <T extends keyof EventSignatures>(event: T, ...args: Parameters<EventSignatures[T]>) => Promise<void>;
 

apps/meteor/server/startup/watchDb.ts

@@ -1,9 +1,9 @@
 import { api, dbWatchersDisabled } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
+import { DatabaseWatcher } from '@rocket.chat/models';
 import { MongoInternals } from 'meteor/mongo';
 
 import { metrics } from '../../app/metrics/server/lib/metrics';
-import { DatabaseWatcher } from '../database/DatabaseWatcher';
 import { db } from '../database/utils';
 import { SystemLogger } from '../lib/logger/system';
 import { initWatchers } from '../modules/watchers/watchers.module';

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

@@ -1,8 +1,8 @@
 import type { IServiceClass } from '@rocket.chat/core-services';
 import { ServiceClass } from '@rocket.chat/core-services';
 import type { Logger } from '@rocket.chat/logger';
+import type { DatabaseWatcher } from '@rocket.chat/models';
 
-import type { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher';
 import { initWatchers } from '../../../../apps/meteor/server/modules/watchers/watchers.module';
 
 export class StreamHub extends ServiceClass implements IServiceClass {

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

@@ -1,12 +1,11 @@
 import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
-import { registerServiceModels } from '@rocket.chat/models';
+import { DatabaseWatcher, registerServiceModels } from '@rocket.chat/models';
 import { broker } from '@rocket.chat/network-broker';
 import { startTracing } from '@rocket.chat/tracing';
 import polka from 'polka';
 
 import { StreamHub } from './StreamHub';
-import { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher';
 
 const PORT = process.env.PORT || 3035;
 

apps/meteor/server/database/DatabaseWatcher.ts → packages/models/src/DatabaseWatcher.ts

@@ -44,9 +44,9 @@ export class DatabaseWatcher extends EventEmitter {
 	/**
 	 * Last doc timestamp received from a real time event
 	 */
-	private lastDocTS: Date;
+	private lastDocTS: Date | undefined;
 
-	private watchCollections: string[];
+	private watchCollections: string[] | undefined;
 
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	constructor({ db, _oplogHandle, metrics, logger: LoggerClass }: { db: Db; _oplogHandle?: any; metrics?: any; logger: typeof Logger }) {
@@ -127,7 +127,7 @@ export class DatabaseWatcher extends EventEmitter {
 		const stream = cursor.stream();
 
 		stream.on('data', (doc) => {
-			const doesMatter = this.watchCollections.some((collection) => doc.ns === `${dbName}.${collection}`);
+			const doesMatter = this.watchCollections?.some((collection) => doc.ns === `${dbName}.${collection}`);
 			if (!doesMatter) {
 				return;
 			}
@@ -149,7 +149,7 @@ export class DatabaseWatcher extends EventEmitter {
 
 		this.logger.startup('Using Meteor oplog');
 
-		this.watchCollections.forEach((collection) => {
+		this.watchCollections?.forEach((collection) => {
 			this._oplogHandle.onOplogEntry({ collection }, (event: any) => {
 				this.emitDoc(collection, convertOplogPayload(event));
 			});

packages/models/src/index.ts

@@ -124,6 +124,7 @@ export function getCollectionName(name: string): string {
 }
 
 export * from './modelClasses';
+export * from './DatabaseWatcher';
 
 export * from './dummy/ReadReceipts';
 

apps/meteor/server/database/watchCollections.ts → packages/models/src/watchCollections.ts

@@ -1,4 +1,5 @@
 import { dbWatchersDisabled } from '@rocket.chat/core-services';
+
 import {
 	Messages,
 	Users,
@@ -16,7 +17,7 @@ import {
 	PbxEvents,
 	Permissions,
 	LivechatPriority,
-} from '@rocket.chat/models';
+} from './index';
 
 const { DBWATCHER_EXCLUDE_COLLECTIONS = '', DBWATCHER_ONLY_COLLECTIONS = '' } = process.env;