Fix startup lock

Author: d-gubert

apps/meteor/ee/server/apps/orchestrator.js

@@ -122,6 +122,10 @@ export class AppServerOrchestrator {
 	}
 
 	getProvidedComponents() {
+		if (!this.isLoaded()) {
+			return;
+		}
+
 		return this._manager.getExternalComponentManager().getProvidedComponents();
 	}
 
@@ -134,7 +138,7 @@ export class AppServerOrchestrator {
 	}
 
 	isLoaded() {
-		return this.getManager().areAppsLoaded();
+		return this.isInitialized() && this.getManager().areAppsLoaded();
 	}
 
 	isDebugging() {
@@ -161,7 +165,7 @@ export class AppServerOrchestrator {
 	async load() {
 		// Don't try to load it again if it has
 		// already been loaded
-		if (this.isLoaded()) {
+		if (!this.isInitialized() || this.isLoaded()) {
 			return;
 		}
 

apps/meteor/ee/server/apps/services/orchestratorFactory.ts

@@ -1,7 +1,8 @@
 import type { Db } from 'mongodb';
 
 import { settings } from '../../../../app/settings/server';
-import { AppServerOrchestrator } from '../orchestrator';
+import type { AppServerOrchestrator } from '../orchestrator';
+import { Apps } from '../orchestrator';
 
 type AppsInitParams = {
 	appsSourceStorageFilesystemPath: any;
@@ -10,7 +11,7 @@ type AppsInitParams = {
 };
 
 export class OrchestratorFactory {
-	private static orchestrator: AppServerOrchestrator;
+	private static orchestrator: AppServerOrchestrator = Apps;
 
 	private static createOrchestrator(_db: Db) {
 		const appsInitParams: AppsInitParams = {
@@ -19,7 +20,6 @@ export class OrchestratorFactory {
 			marketplaceUrl: 'https://marketplace.rocket.chat',
 		};
 
-		this.orchestrator = new AppServerOrchestrator();
 		// this.orchestrator = new AppServerOrchestrator(db);
 
 		const { OVERWRITE_INTERNAL_MARKETPLACE_URL } = process.env || {};
@@ -28,7 +28,6 @@ export class OrchestratorFactory {
 			appsInitParams.marketplaceUrl = OVERWRITE_INTERNAL_MARKETPLACE_URL;
 		}
 
-		this.orchestrator.initialize();
 		// this.orchestrator.initialize(appsInitParams);
 	}