Speed up plugins loading

1 files changed, 5 insertions, 21 deletions

diff --git a/client/src/app/core/plugins/plugin.service.ts b/client/src/app/core/plugins/plugin.service.ts
index dff8ad864..ccbfd3e4d 100644
--- a/client/src/app/core/plugins/plugin.service.ts
+++ b/client/src/app/core/plugins/plugin.service.ts
@@ -1,3 +1,4 @@
+import * as debug from 'debug'
 import { Observable, of, ReplaySubject } from 'rxjs'
 import { catchError, first, map, shareReplay } from 'rxjs/operators'
 import { HttpClient } from '@angular/common/http'
@@ -24,7 +25,6 @@ import {
 } from '@shared/models'
 import { environment } from '../../../environments/environment'
 import { RegisterClientHelpers } from '../../../types/register-client-option.model'
-import * as debug from 'debug'
 
 const logger = debug('peertube:plugins')
 
@@ -33,8 +33,6 @@ export class PluginService implements ClientHook {
   private static BASE_PLUGIN_API_URL = environment.apiUrl + '/api/v1/plugins'
   private static BASE_PLUGIN_URL = environment.apiUrl + '/plugins'
 
-  pluginsBuilt = new ReplaySubject<boolean>(1)
-
   pluginsLoaded: { [ scope in PluginClientScope ]: ReplaySubject<boolean> } = {
     common: new ReplaySubject<boolean>(1),
     'admin-plugin': new ReplaySubject<boolean>(1),
@@ -79,30 +77,18 @@ export class PluginService implements ClientHook {
   }
 
   initializePlugins () {
-    logger('Building plugin configuration')
+    const config = this.server.getHTMLConfig()
+    this.plugins = config.plugin.registered
 
-    this.server.getConfig()
-      .subscribe(config => {
-        this.plugins = config.plugin.registered
+    this.buildScopeStruct()
 
-        this.buildScopeStruct()
-
-        this.pluginsBuilt.next(true)
-
-        logger('Plugin configuration built')
-      })
+    this.ensurePluginsAreLoaded('common')
   }
 
   initializeCustomModal (customModal: CustomModalComponent) {
     this.customModal = customModal
   }
 
-  ensurePluginsAreBuilt () {
-    return this.pluginsBuilt.asObservable()
-               .pipe(first(), shareReplay())
-               .toPromise()
-  }
-
   ensurePluginsAreLoaded (scope: PluginClientScope) {
     this.loadPluginsByScope(scope)
 
@@ -156,8 +142,6 @@ export class PluginService implements ClientHook {
     logger('Loading scope %s', scope)
 
     try {
-      await this.ensurePluginsAreBuilt()
-
       if (!isReload) this.loadedScopes.push(scope)
 
       const toLoad = this.scopes[ scope ]