Chore: Startup Time

app/2fa/server/lib/totp.js

@@ -3,7 +3,7 @@ import { Random } from 'meteor/random';
 import speakeasy from 'speakeasy';
 
 import { Users } from '../../../models';
-import { settings } from '../../../settings';
+import { settings } from '../../../settings/server';
 
 export const TOTP = {
 	generateSecret() {

app/2fa/server/startup/settings.js → app/2fa/server/startup/settings.ts

@@ -1,6 +1,6 @@
-import { settings } from '../../../settings';
+import { settingsRegistry } from '../../../settings/server';
 
-settings.addGroup('Accounts', function() {
+settingsRegistry.addGroup('Accounts', function() {
 	this.section('Two Factor Authentication', function() {
 		const enable2FA = {
 			_id: 'Accounts_TwoFactorAuthentication_Enabled',

app/analytics/server/settings.js → app/analytics/server/settings.ts

@@ -1,6 +1,6 @@
-import { settings } from '../../settings';
+import { settingsRegistry } from '../../settings/server';
 
-settings.addGroup('Analytics', function addSettings() {
+settingsRegistry.addGroup('Analytics', function addSettings() {
 	this.section('Piwik', function() {
 		const enableQuery = { _id: 'PiwikAnalytics_enabled', value: true };
 		this.add('PiwikAnalytics_enabled', false, {

app/api/server/api.js

@@ -744,11 +744,11 @@ const createApis = function _createApis() {
 createApis();
 
 // register the API to be re-created once the CORS-setting changes.
-settings.get(/^(API_Enable_CORS|API_CORS_Origin)$/, () => {
+settings.watchMultiple(['API_Enable_CORS', 'API_CORS_Origin'], () => {
 	createApis();
 });
 
-settings.get('Accounts_CustomFields', (key, value) => {
+settings.watch('Accounts_CustomFields', (value) => {
 	if (!value) {
 		return API.v1.setLimitedCustomFields([]);
 	}
@@ -761,16 +761,16 @@ settings.get('Accounts_CustomFields', (key, value) => {
 	}
 });
 
-settings.get('API_Enable_Rate_Limiter_Limit_Time_Default', (key, value) => {
+settings.watch('API_Enable_Rate_Limiter_Limit_Time_Default', (value) => {
 	defaultRateLimiterOptions.intervalTimeInMS = value;
 	API.v1.reloadRoutesToRefreshRateLimiter();
 });
 
-settings.get('API_Enable_Rate_Limiter_Limit_Calls_Default', (key, value) => {
+settings.watch('API_Enable_Rate_Limiter_Limit_Calls_Default', (value) => {
 	defaultRateLimiterOptions.numRequestsAllowed = value;
 	API.v1.reloadRoutesToRefreshRateLimiter();
 });
 
-settings.get('Prometheus_API_User_Agent', (key, value) => {
+settings.watch('Prometheus_API_User_Agent', (value) => {
 	prometheusAPIUserAgent = value;
 });

app/api/server/helpers/getPaginationItems.js

@@ -1,7 +1,7 @@
 // If the count query param is higher than the "API_Upper_Count_Limit" setting, then we limit that
 // If the count query param isn't defined, then we set it to the "API_Default_Count" setting
 // If the count is zero, then that means unlimited and is only allowed if the setting "API_Allow_Infinite_Count" is true
-import { settings } from '../../../settings';
+import { settings } from '../../../settings/server';
 import { API } from '../api';
 
 API.helperMethods.set('getPaginationItems', function _getPaginationItems() {

app/api/server/helpers/getUserInfo.js

@@ -11,10 +11,10 @@ API.helperMethods.set('getUserInfo', function _getUserInfo(me) {
 	};
 	const getUserPreferences = () => {
 		const defaultUserSettingPrefix = 'Accounts_Default_User_Preferences_';
-		const allDefaultUserSettings = settings.get(new RegExp(`^${ defaultUserSettingPrefix }.*$`));
+		const allDefaultUserSettings = settings.getByRegexp(new RegExp(`^${ defaultUserSettingPrefix }.*$`));
 
-		return allDefaultUserSettings.reduce((accumulator, setting) => {
-			const settingWithoutPrefix = setting.key.replace(defaultUserSettingPrefix, ' ').trim();
+		return allDefaultUserSettings.reduce((accumulator, [key]) => {
+			const settingWithoutPrefix = key.replace(defaultUserSettingPrefix, ' ').trim();
 			accumulator[settingWithoutPrefix] = getUserPreference(me, settingWithoutPrefix);
 			return accumulator;
 		}, {});

app/api/server/settings.js → app/api/server/settings.ts

@@ -1,6 +1,6 @@
-import { settings } from '../../settings';
+import { settingsRegistry } from '../../settings/server';
 
-settings.addGroup('General', function() {
+settingsRegistry.addGroup('General', function() {
 	this.section('REST API', function() {
 		this.add('API_Upper_Count_Limit', 100, { type: 'int', public: false });
 		this.add('API_Default_Count', 50, { type: 'int', public: false });

app/api/server/v1/autotranslate.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
 import { API } from '../api';
-import { settings } from '../../../settings';
+import { settings } from '../../../settings/server';
 import { Messages } from '../../../models/server';
 
 API.v1.addRoute('autotranslate.getSupportedLanguages', { authRequired: true }, {

app/api/server/v1/chat.js

@@ -12,7 +12,7 @@ import { API } from '../api';
 import Rooms from '../../../models/server/models/Rooms';
 import Users from '../../../models/server/models/Users';
 import Subscriptions from '../../../models/server/models/Subscriptions';
-import { settings } from '../../../settings';
+import { settings } from '../../../settings/server';
 import { findMentionedMessages, findStarredMessages, findSnippetedMessageById, findSnippetedMessages, findDiscussionsFromRoom } from '../lib/messages';
 
 API.v1.addRoute('chat.delete', { authRequired: true }, {

app/api/server/v1/ldap.ts

@@ -16,7 +16,7 @@ API.v1.addRoute('ldap.testConnection', { authRequired: true }, {
 			throw new Error('error-not-authorized');
 		}
 
-		if (settings.get('LDAP_Enable') !== true) {
+		if (settings.get<boolean>('LDAP_Enable') !== true) {
 			throw new Error('LDAP_disabled');
 		}
 

app/api/server/v1/settings.js

@@ -147,10 +147,7 @@ API.v1.addRoute('settings/:_id', { authRequired: true }, {
 				value: Match.Any,
 			});
 			if (Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value)) {
-				settings.storeSettingValue({
-					_id: this.urlParams._id,
-					value: this.bodyParams.value,
-				});
+				settings.set(Settings.findOneNotHiddenById(this.urlParams._id));
 				setValue(this.urlParams._id, this.bodyParams.value);
 				return API.v1.success();
 			}

app/api/server/v1/users.js

@@ -6,7 +6,7 @@ import _ from 'underscore';
 import { Users, Subscriptions } from '../../../models/server';
 import { Users as UsersRaw } from '../../../models/server/raw';
 import { hasPermission } from '../../../authorization';
-import { settings } from '../../../settings';
+import { settings } from '../../../settings/server';
 import { getURL } from '../../../utils';
 import {
 	validateCustomFields,

app/apple/server/index.js

@@ -1,2 +1,2 @@
-import './startup.js';
+import './startup';
 import './loginHandler.js';

app/apple/server/startup.js → app/apple/server/startup.ts

@@ -1,17 +1,16 @@
-import _ from 'underscore';
-import { Meteor } from 'meteor/meteor';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 
-import { settings } from '../../settings';
+import { settings, settingsRegistry } from '../../settings/server';
 
-settings.addGroup('OAuth', function() {
+settingsRegistry.addGroup('OAuth', function() {
 	this.section('Apple', function() {
 		this.add('Accounts_OAuth_Apple', false, { type: 'boolean', public: true });
 	});
 });
 
-const configureService = _.debounce(Meteor.bindEnvironment(() => {
-	if (!settings.get('Accounts_OAuth_Apple')) {
+
+settings.watch('Accounts_OAuth_Apple', (enabled) => {
+	if (!enabled) {
 		return ServiceConfiguration.configurations.remove({
 			service: 'apple',
 		});
@@ -26,10 +25,4 @@ const configureService = _.debounce(Meteor.bindEnvironment(() => {
 			enabled: settings.get('Accounts_OAuth_Apple'),
 		},
 	});
-}), 1000);
-
-Meteor.startup(() => {
-	settings.get('Accounts_OAuth_Apple', () => {
-		configureService();
-	});
 });

app/apps/client/orchestrator.js

@@ -1,5 +1,6 @@
 import { AppClientManager } from '@rocket.chat/apps-engine/client/AppClientManager';
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 import { dispatchToastMessage } from '../../../client/lib/toast';
 import { hasAtLeastOnePermission } from '../../authorization';
@@ -192,7 +193,8 @@ Meteor.startup(() => {
 		});
 	});
 
-	settings.get('Apps_Framework_enabled', (isEnabled) => {
+	Tracker.autorun(() => {
+		const isEnabled = settings.get('Apps_Framework_enabled');
 		Apps.load(isEnabled);
 	});
 });

app/apps/server/communication/rest.js

@@ -4,7 +4,7 @@ import { HTTP } from 'meteor/http';
 import { API } from '../../../api/server';
 import { getUploadFormData } from '../../../api/server/lib/getUploadFormData';
 import { getWorkspaceAccessToken, getUserCloudAccessToken } from '../../../cloud/server';
-import { settings } from '../../../settings';
+import { settings } from '../../../settings/server';
 import { Info } from '../../../utils';
 import { Settings, Users } from '../../../models/server';
 import { Apps } from '../orchestrator';

app/apps/server/communication/uikit.js

@@ -18,9 +18,9 @@ apiServer.disable('x-powered-by');
 let corsEnabled = false;
 let allowListOrigins = [];
 
-settings.get('API_Enable_CORS', (_, value) => { corsEnabled = value; });
+settings.watch('API_Enable_CORS', (value) => { corsEnabled = value; });
 
-settings.get('API_CORS_Origin', (_, value) => {
+settings.watch('API_CORS_Origin', (value) => {
 	allowListOrigins = value ? value.trim().split(',').map((origin) => String(origin).trim().toLocaleLowerCase()) : [];
 });
 

app/apps/server/orchestrator.js

@@ -3,9 +3,9 @@ import { AppInterface } from '@rocket.chat/apps-engine/definition/metadata';
 import { AppManager } from '@rocket.chat/apps-engine/server/AppManager';
 import { Meteor } from 'meteor/meteor';
 
-import { Logger } from '../../logger';
-import { AppsLogsModel, AppsModel, AppsPersistenceModel, Permissions } from '../../models';
-import { settings } from '../../settings';
+import { Logger } from '../../../server/lib/logger/Logger';
+import { AppsLogsModel, AppsModel, AppsPersistenceModel } from '../../models/server';
+import { settings, settingsRegistry } from '../../settings/server';
 import { RealAppBridges } from './bridges';
 import { AppMethods, AppServerNotifier, AppsRestApi, AppUIKitInteractionApi } from './communication';
 import { AppMessagesConverter, AppRoomsConverter, AppSettingsConverter, AppUsersConverter } from './converters';
@@ -32,7 +32,6 @@ export class AppServerOrchestrator {
 		}
 
 		this._rocketchatLogger = new Logger('Rocket.Chat Apps');
-		Permissions.create('manage-apps', ['admin']);
 
 		if (typeof process.env.OVERWRITE_INTERNAL_MARKETPLACE_URL === 'string' && process.env.OVERWRITE_INTERNAL_MARKETPLACE_URL !== '') {
 			this._marketplaceUrl = process.env.OVERWRITE_INTERNAL_MARKETPLACE_URL;
@@ -78,6 +77,9 @@ export class AppServerOrchestrator {
 		return this._model;
 	}
 
+	/**
+	 * @returns {AppsPersistenceModel}
+	 */
 	getPersistenceModel() {
 		return this._persistModel;
 	}
@@ -130,6 +132,9 @@ export class AppServerOrchestrator {
 		return settings.get('Apps_Framework_Development_Mode') && !isTesting();
 	}
 
+	/**
+	 * @returns {Logger}
+	 */
 	getRocketChatLogger() {
 		return this._rocketchatLogger;
 	}
@@ -195,7 +200,7 @@ export class AppServerOrchestrator {
 export const AppEvents = AppInterface;
 export const Apps = new AppServerOrchestrator();
 
-settings.addGroup('General', function() {
+settingsRegistry.addGroup('General', function() {
 	this.section('Apps', function() {
 		this.add('Apps_Logs_TTL', '30_days', {
 			type: 'select',
@@ -259,23 +264,23 @@ settings.addGroup('General', function() {
 	});
 });
 
-settings.get('Apps_Framework_Source_Package_Storage_Type', (_, value) => {
+settings.watch('Apps_Framework_Source_Package_Storage_Type', (value) => {
 	if (!Apps.isInitialized()) {
 		appsSourceStorageType = value;
 	} else {
 		Apps.getAppSourceStorage().setStorage(value);
 	}
 });
 
-settings.get('Apps_Framework_Source_Package_Storage_FileSystem_Path', (_, value) => {
+settings.watch('Apps_Framework_Source_Package_Storage_FileSystem_Path', (value) => {
 	if (!Apps.isInitialized()) {
 		appsSourceStorageFilesystemPath = value;
 	} else {
 		Apps.getAppSourceStorage().setFileSystemStoragePath(value);
 	}
 });
 
-settings.get('Apps_Framework_enabled', (key, isEnabled) => {
+settings.watch('Apps_Framework_enabled', (isEnabled) => {
 	// In case this gets called before `Meteor.startup`
 	if (!Apps.isInitialized()) {
 		return;
@@ -288,7 +293,7 @@ settings.get('Apps_Framework_enabled', (key, isEnabled) => {
 	}
 });
 
-settings.get('Apps_Logs_TTL', (key, value) => {
+settings.watch('Apps_Logs_TTL', (value) => {
 	if (!Apps.isInitialized()) {
 		return;
 	}