Merge branch 'develop' into fix/receipts-not-created-first-read

.changeset/perfect-pianos-yawn.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/presence': minor
+---
+
+Add peak connections monitoring and methods to get and reset the counter

.changeset/rich-dogs-smell.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Fix typing indicator of Apps user

.changeset/slow-coats-shout.md

@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Add the daily and monthly peaks of concurrent connections to statistics
+ - Added `dailyPeakConnections` statistic for monitoring the daily peak of concurrent connections in a workspace;
+ - Added `maxMonthlyPeakConnections` statistic for monitoring the last 30 days peak of concurrent connections in a workspace;

apps/meteor/app/apps/server/bridges/messages.ts

@@ -103,7 +103,11 @@ export class AppMessageBridge extends MessageBridge {
 	protected async typing({ scope, id, username, isTyping }: ITypingDescriptor): Promise<void> {
 		switch (scope) {
 			case 'room':
-				notifications.notifyRoom(id, 'typing', username!, isTyping);
+				if (!username) {
+					throw new Error('Invalid username');
+				}
+
+				notifications.notifyRoom(id, 'user-activity', username, isTyping ? ['user-typing'] : []);
 				return;
 			default:
 				throw new Error('Unrecognized typing scope provided');

apps/meteor/app/cas/server/cas_server.js

@@ -257,7 +257,7 @@ Accounts.registerLoginHandler('cas', async (options) => {
 				if (roomName) {
 					let room = await Rooms.findOneByNameAndType(roomName, 'c');
 					if (!room) {
-						room = await createRoom('c', roomName, user.username);
+						room = await createRoom('c', roomName, user);
 					}
 				}
 			}

apps/meteor/app/irc/server/irc-bridge/peerHandlers/joinedChannel.js

@@ -16,7 +16,7 @@ export default async function handleJoinedChannel(args) {
 	let room = await Rooms.findOneByName(args.roomName);
 
 	if (!room) {
-		const createdRoom = await createRoom('c', args.roomName, user.username, []);
+		const createdRoom = await createRoom('c', args.roomName, user, []);
 		room = await Rooms.findOne({ _id: createdRoom.rid });
 
 		this.log(`${user.username} created room ${args.roomName}`);

apps/meteor/app/slackbridge/server/RocketAdapter.js

@@ -295,7 +295,7 @@ export default class RocketAdapter {
 
 					try {
 						const isPrivate = slackChannel.is_private;
-						const rocketChannel = await createRoom(isPrivate ? 'p' : 'c', slackChannel.name, rocketUserCreator.username, rocketUsers);
+						const rocketChannel = await createRoom(isPrivate ? 'p' : 'c', slackChannel.name, rocketUserCreator, rocketUsers);
 						slackChannel.rocketId = rocketChannel.rid;
 					} catch (e) {
 						if (!hasRetried) {

apps/meteor/app/statistics/server/lib/statistics.ts

@@ -1,7 +1,7 @@
 import { log } from 'console';
 import os from 'os';
 
-import { Analytics, Team, VideoConf } from '@rocket.chat/core-services';
+import { Analytics, Team, VideoConf, Presence } from '@rocket.chat/core-services';
 import type { IRoom, IStats } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
 import {
@@ -579,6 +579,11 @@ export const statistics = {
 		const defaultLoggedInCustomScript = (await Settings.findOneById('Custom_Script_Logged_In'))?.packageValue;
 		statistics.loggedInCustomScriptChanged = settings.get('Custom_Script_Logged_In') !== defaultLoggedInCustomScript;
 
+		statistics.dailyPeakConnections = await Presence.getPeakConnections(true);
+
+		const peak = await Statistics.findMonthlyPeakConnections();
+		statistics.maxMonthlyPeakConnections = Math.max(statistics.dailyPeakConnections, peak?.dailyPeakConnections || 0);
+
 		statistics.matrixFederation = await getMatrixFederationStatistics();
 
 		// Omnichannel call stats

apps/meteor/client/views/admin/info/DeploymentCard.stories.tsx

@@ -272,6 +272,8 @@ export default {
 			totalWebRTCCalls: 0,
 			uncaughtExceptionsCount: 0,
 			push: 0,
+			dailyPeakConnections: 0,
+			maxMonthlyPeakConnections: 0,
 			matrixFederation: {
 				enabled: false,
 			},

apps/meteor/client/views/admin/info/InformationPage.stories.tsx

@@ -302,6 +302,8 @@ export default {
 			totalWebRTCCalls: 0,
 			uncaughtExceptionsCount: 0,
 			push: 0,
+			dailyPeakConnections: 0,
+			maxMonthlyPeakConnections: 0,
 			matrixFederation: {
 				enabled: false,
 			},

apps/meteor/client/views/admin/info/UsageCard.stories.tsx

@@ -250,6 +250,8 @@ export default {
 			totalWebRTCCalls: 0,
 			uncaughtExceptionsCount: 0,
 			push: 0,
+			dailyPeakConnections: 0,
+			maxMonthlyPeakConnections: 0,
 			matrixFederation: {
 				enabled: false,
 			},

apps/meteor/ee/server/api/licenses.ts

@@ -25,10 +25,13 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'licenses.info',
-	{ authRequired: true, validateParams: isLicensesInfoProps, permissionsRequired: ['view-privileged-setting'] },
+	{ authRequired: true, validateParams: isLicensesInfoProps },
 	{
 		async get() {
-			const data = await License.getInfo(Boolean(this.queryParams.loadValues));
+			const unrestrictedAccess = await hasPermissionAsync(this.userId, 'view-privileged-setting');
+			const loadCurrentValues = unrestrictedAccess && Boolean(this.queryParams.loadValues);
+
+			const data = await License.getInfo({ limits: unrestrictedAccess, license: unrestrictedAccess, currentValues: loadCurrentValues });
 
 			return API.v1.success({ data });
 		},

apps/meteor/server/cron/statistics.ts

@@ -37,5 +37,7 @@ export async function statsCron(logger: Logger): Promise<void> {
 
 	const now = new Date();
 
-	await cronJobs.add(name, `12 ${now.getHours()} * * *`, async () => generateStatistics(logger));
+	await cronJobs.add(name, `12 ${now.getHours()} * * *`, async () => {
+		await generateStatistics(logger);
+	});
 }

apps/meteor/server/models/raw/Statistics.ts

@@ -25,4 +25,25 @@ export class StatisticsRaw extends BaseRaw<IStats> implements IStatisticsModel {
 		).toArray();
 		return records?.[0];
 	}
+
+	async findMonthlyPeakConnections() {
+		const oneMonthAgo = new Date();
+		oneMonthAgo.setDate(oneMonthAgo.getDate() - 30);
+		oneMonthAgo.setHours(0, 0, 0, 0);
+
+		return this.findOne<Pick<IStats, 'dailyPeakConnections' | 'createdAt'>>(
+			{
+				createdAt: { $gte: oneMonthAgo },
+			},
+			{
+				sort: {
+					dailyPeakConnections: -1,
+				},
+				projection: {
+					dailyPeakConnections: 1,
+					createdAt: 1,
+				},
+			},
+		);
+	}
 }

apps/meteor/tests/end-to-end/api/20-licenses.js

@@ -105,6 +105,52 @@ describe('licenses', function () {
 		});
 	});
 
+	describe('[/licenses.info]', () => {
+		it('should fail if not logged in', (done) => {
+			request
+				.get(api('licenses.info'))
+				.expect('Content-Type', 'application/json')
+				.expect(401)
+				.expect((res) => {
+					expect(res.body).to.have.property('status', 'error');
+					expect(res.body).to.have.property('message');
+				})
+				.end(done);
+		});
+
+		it('should return limited information if user is unauthorized', (done) => {
+			request
+				.get(api('licenses.info'))
+				.set(unauthorizedUserCredentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('data').and.to.be.an('object');
+					expect(res.body.data).to.not.have.property('license');
+					expect(res.body.data).to.have.property('tags').and.to.be.an('array');
+				})
+				.end(done);
+		});
+
+		it('should return unrestricted info if user is logged in and is authorized', (done) => {
+			request
+				.get(api('licenses.info'))
+				.set(credentials)
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('data').and.to.be.an('object');
+					if (process.env.IS_EE) {
+						expect(res.body.data).to.have.property('license').and.to.be.an('object');
+					}
+					expect(res.body.data).to.have.property('tags').and.to.be.an('array');
+				})
+
+				.end(done);
+		});
+	});
+
 	describe('[/licenses.isEnterprise]', () => {
 		it('should fail if not logged in', (done) => {
 			request

ee/packages/license/src/definition/LicenseInfo.ts

@@ -0,0 +1,10 @@
+import type { ILicenseTag } from './ILicenseTag';
+import type { ILicenseV3, LicenseLimitKind } from './ILicenseV3';
+import type { LicenseModule } from './LicenseModule';
+
+export type LicenseInfo = {
+	license?: ILicenseV3;
+	activeModules: LicenseModule[];
+	limits: Record<LicenseLimitKind, { value?: number; max: number }>;
+	tags: ILicenseTag[];
+};

ee/packages/license/src/index.ts

@@ -1,5 +1,5 @@
-import type { ILicenseV3, LicenseLimitKind } from './definition/ILicenseV3';
-import type { LicenseModule } from './definition/LicenseModule';
+import type { LicenseLimitKind } from './definition/ILicenseV3';
+import type { LicenseInfo } from './definition/LicenseInfo';
 import type { LimitContext } from './definition/LimitContext';
 import { getAppsConfig, getMaxActiveUsers, getUnmodifiedLicenseAndModules } from './deprecated';
 import { onLicense } from './events/deprecated';
@@ -24,6 +24,7 @@ export * from './definition/ILicenseTag';
 export * from './definition/ILicenseV2';
 export * from './definition/ILicenseV3';
 export * from './definition/LicenseBehavior';
+export * from './definition/LicenseInfo';
 export * from './definition/LicenseLimit';
 export * from './definition/LicenseModule';
 export * from './definition/LicensePeriod';
@@ -49,11 +50,7 @@ interface License {
 	onBehaviorTriggered: typeof onBehaviorTriggered;
 	revalidateLicense: () => Promise<void>;
 
-	getInfo: (loadCurrentValues: boolean) => Promise<{
-		license: ILicenseV3 | undefined;
-		activeModules: LicenseModule[];
-		limits: Record<LicenseLimitKind, { value?: number; max: number }>;
-	}>;
+	getInfo: (info: { limits: boolean; currentValues: boolean; license: boolean }) => Promise<LicenseInfo>;
 
 	// Deprecated:
 	onLicense: typeof onLicense;

ee/packages/license/src/license.ts

@@ -4,6 +4,7 @@ import { type ILicenseTag } from './definition/ILicenseTag';
 import type { ILicenseV2 } from './definition/ILicenseV2';
 import type { ILicenseV3, LicenseLimitKind } from './definition/ILicenseV3';
 import type { BehaviorWithContext } from './definition/LicenseBehavior';
+import type { LicenseInfo } from './definition/LicenseInfo';
 import type { LicenseModule } from './definition/LicenseModule';
 import type { LicenseValidationOptions } from './definition/LicenseValidationOptions';
 import type { LimitContext } from './definition/LimitContext';
@@ -291,17 +292,22 @@ export class LicenseManager extends Emitter<LicenseEvents> {
 		return isBehaviorsInResult(validationResult, ['prevent_action']);
 	}
 
-	public async getInfo(loadCurrentValues = false): Promise<{
-		license: ILicenseV3 | undefined;
-		activeModules: LicenseModule[];
-		limits: Record<LicenseLimitKind, { value?: number; max: number }>;
-	}> {
+	public async getInfo({
+		limits: includeLimits,
+		currentValues: loadCurrentValues,
+		license: includeLicense,
+	}: {
+		limits: boolean;
+		currentValues: boolean;
+		license: boolean;
+	}): Promise<LicenseInfo> {
 		const activeModules = getModules.call(this);
 		const license = this.getLicense();
 
 		// Get all limits present in the license and their current value
 		const limits = (
 			(license &&
+				includeLimits &&
 				(await Promise.all(
 					globalLimitKinds
 						.map((limitKey) => ({
@@ -322,9 +328,10 @@ export class LicenseManager extends Emitter<LicenseEvents> {
 		).reduce((prev, curr) => ({ ...prev, ...curr }), {});
 
 		return {
-			license,
+			license: (includeLicense && license) || undefined,
 			activeModules,
 			limits: limits as Record<LicenseLimitKind, { max: number; value: number }>,
+			tags: license?.information.tags || [],
 		};
 	}
 }

ee/packages/presence/src/Presence.ts

@@ -19,6 +19,8 @@ export class Presence extends ServiceClass implements IPresence {
 
 	private connsPerInstance = new Map<string, number>();
 
+	private peakConnections = 0;
+
 	constructor() {
 		super();
 
@@ -35,6 +37,7 @@ export class Presence extends ServiceClass implements IPresence {
 			if (diff?.hasOwnProperty('extraInformation.conns')) {
 				this.connsPerInstance.set(id, diff['extraInformation.conns']);
 
+				this.peakConnections = Math.max(this.peakConnections, this.getTotalConnections());
 				this.validateAvailability();
 			}
 		});
@@ -251,4 +254,16 @@ export class Presence extends ServiceClass implements IPresence {
 	private getTotalConnections(): number {
 		return Array.from(this.connsPerInstance.values()).reduce((acc, conns) => acc + conns, 0);
 	}
+
+	getPeakConnections(reset = false): number {
+		const peak = this.peakConnections;
+		if (reset) {
+			this.resetPeakConnections();
+		}
+		return peak;
+	}
+
+	resetPeakConnections(): void {
+		this.peakConnections = 0;
+	}
 }

packages/core-services/src/types/IPresence.ts

@@ -19,4 +19,6 @@ export interface IPresence extends IServiceClass {
 	updateUserPresence(uid: string): Promise<void>;
 	toggleBroadcast(enabled: boolean): void;
 	getConnectionCount(): { current: number; max: number };
+	getPeakConnections(reset?: boolean): number;
+	resetPeakConnections(): void;
 }

packages/core-typings/src/IStats.ts

@@ -219,6 +219,8 @@ export interface IStats {
 	totalWebRTCCalls: number;
 	uncaughtExceptionsCount: number;
 	push: number;
+	dailyPeakConnections: number;
+	maxMonthlyPeakConnections: number;
 	matrixFederation: {
 		enabled: boolean;
 	};

packages/model-typings/src/models/IStatisticsModel.ts

@@ -4,4 +4,5 @@ import type { IBaseModel } from './IBaseModel';
 
 export interface IStatisticsModel extends IBaseModel<IStats> {
 	findLast(): Promise<IStats>;
+	findMonthlyPeakConnections(): Promise<Pick<IStats, 'dailyPeakConnections' | 'createdAt'> | null>;
 }

packages/rest-typings/src/v1/licenses.ts

@@ -1,4 +1,4 @@
-import type { ILicenseV2, ILicenseV3, LicenseLimitKind } from '@rocket.chat/license';
+import type { ILicenseV2, ILicenseV3, LicenseInfo } from '@rocket.chat/license';
 import Ajv from 'ajv';
 
 const ajv = new Ajv({
@@ -45,11 +45,7 @@ export type LicensesEndpoints = {
 	};
 	'/v1/licenses.info': {
 		GET: (params: licensesInfoProps) => {
-			data: {
-				license: ILicenseV3 | undefined;
-				activeModules: string[];
-				limits: Record<LicenseLimitKind, { max: number; value?: number }>;
-			};
+			data: LicenseInfo;
 		};
 	};
 	'/v1/licenses.add': {