[IMPROVE] Add flag to identify remote federation users

app/federation/server/PeerClient.js

@@ -5,9 +5,9 @@ import { Meteor } from 'meteor/meteor';
 import { updateStatus } from './settingsUpdater';
 import { logger } from './logger';
 import { FederatedMessage, FederatedRoom, FederatedUser } from './federatedResources';
-import { callbacks } from '../../callbacks';
-import { settings } from '../../settings';
-import { FederationEvents, FederationKeys, Messages, Rooms, Subscriptions, Users } from '../../models';
+import { callbacks } from '../../callbacks/server';
+import { settings } from '../../settings/server';
+import { FederationEvents, FederationKeys, Messages, Rooms, Subscriptions, Users } from '../../models/server';
 
 import { Federation } from '.';
 
@@ -232,9 +232,7 @@ export class PeerClient {
 		// Should we use queues in here?
 		const events = FederationEvents.getUnfulfilled();
 
-		for (const e of events) {
-			this.propagateEvent(e);
-		}
+		events.forEach((e) => this.propagateEvent(e));
 	}
 
 	// #####

app/federation/server/PeerServer/PeerServer.js

@@ -58,7 +58,7 @@ export class PeerServer {
 		federatedRoom.create();
 
 		// Refresh federation peers
-		FederationPeers.refreshPeers();
+		FederationPeers.refreshPeers(localPeerDomain);
 	}
 
 	handleRoomCreatedEvent(e) {
@@ -81,7 +81,7 @@ export class PeerServer {
 		federatedRoom.create(true);
 
 		// Refresh federation peers
-		FederationPeers.refreshPeers();
+		FederationPeers.refreshPeers(localPeerDomain);
 	}
 
 	handleUserJoinedEvent(e) {
@@ -111,7 +111,7 @@ export class PeerServer {
 		federatedRoom.refreshFederation();
 
 		// Refresh federation peers
-		FederationPeers.refreshPeers();
+		FederationPeers.refreshPeers(localPeerDomain);
 	}
 
 	handleUserAddedEvent(e) {
@@ -150,7 +150,7 @@ export class PeerServer {
 		federatedRoom.refreshFederation();
 
 		// Refresh federation peers
-		FederationPeers.refreshPeers();
+		FederationPeers.refreshPeers(localPeerDomain);
 	}
 
 	handleUserLeftEvent(e) {
@@ -180,7 +180,7 @@ export class PeerServer {
 		federatedRoom.refreshFederation();
 
 		// Refresh federation peers
-		FederationPeers.refreshPeers();
+		FederationPeers.refreshPeers(localPeerDomain);
 	}
 
 	handleUserRemovedEvent(e) {
@@ -214,7 +214,7 @@ export class PeerServer {
 		federatedRoom.refreshFederation();
 
 		// Refresh federation peers
-		FederationPeers.refreshPeers();
+		FederationPeers.refreshPeers(localPeerDomain);
 	}
 
 	handleUserMutedEvent(e) {

app/federation/server/federatedResources/FederatedUser.js

@@ -67,6 +67,9 @@ export class FederatedUser extends FederatedResource {
 			localUser.username = user.username.split('@')[0];
 			localUser.name = user.name.split('@')[0];
 		}
+		if (federation.peer !== localPeerIdentifier) {
+			localUser.isRemote = true;
+		}
 
 		return localUser;
 	}

app/federation/server/federation-settings.js

@@ -7,6 +7,8 @@ Meteor.startup(function() {
 	// const federationUniqueId = FederationKeys.getUniqueId();
 	const federationPublicKey = FederationKeys.getPublicKeyString();
 
+	const defaultHubURL = process.env.NODE_ENV === 'development' ? 'http://localhost:8080' : 'https://hub.rocket.chat';
+
 	settings.addGroup('Federation', function() {
 		this.add('FEDERATION_Enabled', false, {
 			type: 'boolean',
@@ -45,7 +47,7 @@ Meteor.startup(function() {
 			i18nDescription: 'FEDERATION_Public_Key_Description',
 		});
 
-		this.add('FEDERATION_Hub_URL', 'https://hub.rocket.chat', {
+		this.add('FEDERATION_Hub_URL', defaultHubURL, {
 			group: 'Federation Hub',
 			type: 'string',
 			i18nLabel: 'FEDERATION_Hub_URL',

app/federation/server/methods/dashboard.js

@@ -1,19 +1,25 @@
 import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
 
-import { FederationEvents, FederationPeers, Users } from '../../../models';
+// We do not import the whole Federation object here because statistics cron
+// job use this file, and some of the features are not available on the cron
+import { FederationEvents, FederationPeers, Users } from '../../../models/server';
 
-import { Federation } from '..';
+export function getStatistics() {
+	const numberOfEvents = FederationEvents.findByType('png').count();
+	const numberOfFederatedUsers = Users.findRemote().count();
+	const numberOfActivePeers = FederationPeers.findActiveRemote().count();
+	const numberOfInactivePeers = FederationPeers.findNotActiveRemote().count();
+
+	return { numberOfEvents, numberOfFederatedUsers, numberOfActivePeers, numberOfInactivePeers };
+}
 
 export function federationGetOverviewData() {
 	if (!Meteor.userId()) {
 		throw new Meteor.Error('not-authorized');
 	}
 
-	const numberOfEvents = FederationEvents.find({ t: { $ne: 'png' } }).count();
-	const numberOfFederatedUsers = Users.find({ federation: { $exists: true }, 'federation.peer': { $ne: Federation.localIdentifier } }).count();
-	const numberOfActivePeers = FederationPeers.find({ active: true, peer: { $ne: Federation.localIdentifier } }).count();
-	const numberOfInactivePeers = FederationPeers.find({ active: false, peer: { $ne: Federation.localIdentifier } }).count();
+	const { numberOfEvents, numberOfFederatedUsers, numberOfActivePeers, numberOfInactivePeers } = getStatistics();
 
 	return {
 		data: [{
@@ -37,7 +43,7 @@ export function federationGetPeerStatuses() {
 		throw new Meteor.Error('not-authorized');
 	}
 
-	const peers = FederationPeers.find({ peer: { $ne: Federation.localIdentifier } }).fetch();
+	const peers = FederationPeers.findRemote().fetch();
 
 	const peerStatuses = [];
 

app/lib/server/functions/deleteUser.js

@@ -6,6 +6,7 @@ import { Users, Subscriptions, Messages, Rooms, Integrations, FederationPeers }
 import { hasRole, getUsersInRole } from '../../../authorization';
 import { settings } from '../../../settings';
 import { Notifications } from '../../../notifications';
+import { getConfig } from '../../../federation/server/config';
 
 export const deleteUser = function(userId) {
 	const user = Users.findOneById(userId, {
@@ -99,5 +100,6 @@ export const deleteUser = function(userId) {
 	Users.removeById(userId); // Remove user from users database
 
 	// Refresh the peers list
-	FederationPeers.refreshPeers();
+	const { peer: { domain: localPeerDomain } } = getConfig();
+	FederationPeers.refreshPeers(localPeerDomain);
 };

app/models/server/models/FederationEvents.js

@@ -20,6 +20,10 @@ const normalizePeers = (basePeers, options) => {
 class FederationEventsModel extends Base {
 	constructor() {
 		super('federation_events');
+
+		this.tryEnsureIndex({ t: 1 });
+		this.tryEnsureIndex({ fulfilled: 1 });
+		this.tryEnsureIndex({ ts: 1 });
 	}
 
 	// Sometimes events errored but the error is final
@@ -256,7 +260,11 @@ class FederationEventsModel extends Base {
 
 	// Get all unfulfilled events
 	getUnfulfilled() {
-		return this.find({ fulfilled: false }, { sort: { ts: 1 } }).fetch();
+		return this.find({ fulfilled: false }, { sort: { ts: 1 } });
+	}
+
+	findByType(t) {
+		return this.find({ t });
 	}
 }
 

app/models/server/models/FederationPeers.js

@@ -1,32 +1,27 @@
-import { Meteor } from 'meteor/meteor';
-
 import { Base } from './_Base';
-
-import { Users } from '..';
+import { Users } from '../raw';
 
 class FederationPeersModel extends Base {
 	constructor() {
 		super('federation_peers');
-	}
 
-	refreshPeers() {
-		const collectionObj = this.model.rawCollection();
-		const findAndModify = Meteor.wrapAsync(collectionObj.findAndModify, collectionObj);
-
-		const users = Users.find({ federation: { $exists: true } }, { fields: { federation: 1 } }).fetch();
+		this.tryEnsureIndex({ active: 1, isRemote: 1 });
+	}
 
-		const peers = [...new Set(users.map((u) => u.federation.peer))];
+	async refreshPeers(localIdentifier) {
+		const peers = await Users.getDistinctFederationPeers();
 
-		for (const peer of peers) {
-			findAndModify({ peer }, [], {
+		peers.forEach((peer) =>
+			this.update({ peer }, {
 				$setOnInsert: {
+					isRemote: localIdentifier !== peer,
 					active: false,
 					peer,
 					last_seen_at: null,
 					last_failure_at: null,
 				},
-			}, { upsert: true });
-		}
+			}, { upsert: true })
+		);
 
 		this.remove({ peer: { $nin: peers } });
 	}
@@ -48,6 +43,18 @@ class FederationPeersModel extends Base {
 			this.update({ peer }, { $set: updateQuery });
 		}
 	}
+
+	findActiveRemote() {
+		return this.find({ active: true, isRemote: true });
+	}
+
+	findNotActiveRemote() {
+		return this.find({ active: false, isRemote: true });
+	}
+
+	findRemote() {
+		return this.find({ isRemote: true });
+	}
 }
 
 export const FederationPeers = new FederationPeersModel();

app/models/server/models/Users.js

@@ -21,6 +21,7 @@ export class Users extends Base {
 		this.tryEnsureIndex({ type: 1 });
 		this.tryEnsureIndex({ 'visitorEmails.address': 1 });
 		this.tryEnsureIndex({ federation: 1 }, { sparse: true });
+		this.tryEnsureIndex({ isRemote: 1 }, { sparse: true });
 	}
 
 	getLoginTokensByUserId(userId) {
@@ -666,6 +667,10 @@ export class Users extends Base {
 		return this.findOne(query, options);
 	}
 
+	findRemote() {
+		return this.find({ isRemote: true });
+	}
+
 	// UPDATE
 	addImportIds(_id, importIds) {
 		importIds = [].concat(importIds);

app/models/server/raw/Users.js

@@ -19,4 +19,8 @@ export class UsersRaw extends BaseRaw {
 
 		return this.findOne(query, { fields: { roles: 1 } });
 	}
+
+	getDistinctFederationPeers() {
+		return this.col.distinct('federation.peer', { federation: { $exists: true } });
+	}
 }

app/statistics/server/functions/get.js

@@ -18,6 +18,7 @@ import { settings } from '../../../settings/server';
 import { Info, getMongoInfo } from '../../../utils/server';
 import { Migrations } from '../../../migrations/server';
 import { statistics } from '../statisticsNamespace';
+import { getStatistics as federationGetStatistics } from '../../../federation/server/methods/dashboard';
 
 const wizardFields = [
 	'Organization_Type',
@@ -100,6 +101,13 @@ statistics.get = function _getStatistics() {
 	statistics.totalDirectMessages = _.reduce(Rooms.findByType('d', { fields: { msgs: 1 } }).fetch(), function _countDirectMessages(num, room) { return num + room.msgs; }, 0);
 	statistics.totalLivechatMessages = _.reduce(Rooms.findByType('l', { fields: { msgs: 1 } }).fetch(), function _countLivechatMessages(num, room) { return num + room.msgs; }, 0);
 
+	// Federation statistics
+	const federationOverviewData = federationGetStatistics();
+
+	statistics.federatedServers = federationOverviewData.numberOfActivePeers + federationOverviewData.numberOfInactivePeers;
+	statistics.federatedServersActive = federationOverviewData.numberOfActivePeers;
+	statistics.federatedUsers = federationOverviewData.numberOfFederatedUsers;
+
 	statistics.lastLogin = Users.getLastLogin();
 	statistics.lastMessageSentAt = Messages.getLastTimestamp();
 	statistics.lastSeenSubscription = Subscriptions.getLastSeen();