diff --git a/apps/meteor/ee/server/apps/services/index.ts b/apps/meteor/ee/server/apps/services/index.ts new file mode 100644 index 000000000000..79d3bc3ad605 --- /dev/null +++ b/apps/meteor/ee/server/apps/services/index.ts @@ -0,0 +1,6 @@ +export { AppsApiService } from './apiService'; +export { AppsConverterService } from './converterService'; +export { AppsEngineService } from './service'; +export { AppsManagerService } from './managerService'; +export { AppsStatisticsService } from './statisticsService'; +export { AppsVideoManagerService } from './videoManagerService'; diff --git a/apps/meteor/ee/server/startup/services.ts b/apps/meteor/ee/server/startup/services.ts index 6aec5347f980..8b3aad015401 100644 --- a/apps/meteor/ee/server/startup/services.ts +++ b/apps/meteor/ee/server/startup/services.ts @@ -1,4 +1,5 @@ import { api } from '@rocket.chat/core-services'; +import { MongoInternals } from 'meteor/mongo'; import { EnterpriseSettings } from '../../app/settings/server/settings.internalService'; import { LDAPEEService } from '../local-services/ldap/service'; @@ -9,6 +10,14 @@ import { isRunningMs } from '../../../server/lib/isRunningMs'; import { FederationService } from '../../../server/services/federation/service'; import { FederationServiceEE } from '../local-services/federation/service'; import { isEnterprise, onLicense } from '../../app/license/server'; +import { + AppsApiService, + AppsConverterService, + AppsEngineService, + AppsManagerService, + AppsStatisticsService, + AppsVideoManagerService, +} from '../apps/services'; // TODO consider registering these services only after a valid license is added api.registerService(new EnterpriseSettings()); @@ -16,9 +25,20 @@ api.registerService(new LDAPEEService()); api.registerService(new LicenseService()); api.registerService(new MessageReadsService()); +const { db } = MongoInternals.defaultRemoteCollectionDriver().mongo; + +// This will need to be moved when we create the microservices +api.registerService(new AppsEngineService(db)); + // when not running micro services we want to start up the instance intercom if (!isRunningMs()) { api.registerService(new InstanceService()); + + api.registerService(new AppsConverterService()); + api.registerService(new AppsApiService()); + api.registerService(new AppsManagerService()); + api.registerService(new AppsStatisticsService()); + api.registerService(new AppsVideoManagerService()); } let federationService: FederationService; diff --git a/apps/meteor/server/services/startup.ts b/apps/meteor/server/services/startup.ts index ef64059c5d6c..054fd23020b1 100644 --- a/apps/meteor/server/services/startup.ts +++ b/apps/meteor/server/services/startup.ts @@ -3,7 +3,6 @@ import { api } from '@rocket.chat/core-services'; import { OmnichannelTranscript, QueueWorker } from '@rocket.chat/omnichannel-services'; import { AnalyticsService } from './analytics/service'; -import { AppsEngineService } from '../../ee/server/apps/services/service'; import { AuthorizationLivechat } from '../../app/livechat/server/roomAccessValidator.internalService'; import { BannerService } from './banner/service'; import { LDAPService } from './ldap/service'; @@ -30,7 +29,6 @@ import { Logger } from '../lib/logger/Logger'; const { db } = MongoInternals.defaultRemoteCollectionDriver().mongo; -api.registerService(new AppsEngineService(db)); api.registerService(new AnalyticsService()); api.registerService(new AuthorizationLivechat()); api.registerService(new BannerService());