X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fplugins%2Fplugin.service.ts;h=e24468da553f12c653ad6b2a6fa9270df8934355;hb=5dfb7c1dec8222b0bbccac5b56ad46da1438747e;hp=45d8088a48a90bfefe06de64bae6073a380333a1;hpb=23bdacf8ec24ce47a15529830e116911d7478598;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/core/plugins/plugin.service.ts b/client/src/app/core/plugins/plugin.service.ts index 45d8088a4..e24468da5 100644 --- a/client/src/app/core/plugins/plugin.service.ts +++ b/client/src/app/core/plugins/plugin.service.ts @@ -1,20 +1,25 @@ -import { Injectable } from '@angular/core' +import { Inject, Injectable, LOCALE_ID, NgZone } from '@angular/core' import { Router } from '@angular/router' -import { ServerConfigPlugin } from '@shared/models' +import { getCompleteLocale, isDefaultLocale, peertubeTranslate, ServerConfigPlugin } from '@shared/models' import { ServerService } from '@app/core/server/server.service' import { ClientScript } from '@shared/models/plugins/plugin-package-json.model' import { ClientScript as ClientScriptModule } from '../../../types/client-script.model' import { environment } from '../../../environments/environment' -import { ReplaySubject } from 'rxjs' +import { Observable, of, ReplaySubject } from 'rxjs' import { catchError, first, map, shareReplay } from 'rxjs/operators' import { getHookType, internalRunHook } from '@shared/core-utils/plugins/hooks' import { ClientHook, ClientHookName, clientHookObject } from '@shared/models/plugins/client-hook.model' import { PluginClientScope } from '@shared/models/plugins/plugin-client-scope.type' import { RegisterClientHookOptions } from '@shared/models/plugins/register-client-hook.model' -import { PeerTubePlugin } from '@shared/models/plugins/peertube-plugin.model' import { HttpClient } from '@angular/common/http' +import { AuthService } from '@app/core/auth' import { RestExtractor } from '@app/shared/rest' import { PluginType } from '@shared/models/plugins/plugin.type' +import { PublicServerSetting } from '@shared/models/plugins/public-server.setting' +import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' +import { RegisterClientHelpers } from '../../../types/register-client-option.model' +import { PluginTranslation } from '@shared/models/plugins/plugin-translation.model' +import { importModule } from '@app/shared/misc/utils' interface HookStructValue extends RegisterClientHookOptions { plugin: ServerConfigPlugin @@ -30,16 +35,20 @@ type PluginInfo = { @Injectable() export class PluginService implements ClientHook { - private static BASE_PLUGIN_URL = environment.apiUrl + '/api/v1/plugins' + private static BASE_PLUGIN_API_URL = environment.apiUrl + '/api/v1/plugins' + private static BASE_PLUGIN_URL = environment.apiUrl + '/plugins' pluginsBuilt = new ReplaySubject(1) pluginsLoaded: { [ scope in PluginClientScope ]: ReplaySubject } = { common: new ReplaySubject(1), search: new ReplaySubject(1), - 'video-watch': new ReplaySubject(1) + 'video-watch': new ReplaySubject(1), + signup: new ReplaySubject(1) } + translationsObservable: Observable + private plugins: ServerConfigPlugin[] = [] private scopes: { [ scopeName: string ]: PluginInfo[] } = {} private loadedScripts: { [ script: string ]: boolean } = {} @@ -50,10 +59,14 @@ export class PluginService implements ClientHook { constructor ( private router: Router, + private authService: AuthService, private server: ServerService, + private zone: NgZone, private authHttp: HttpClient, - private restExtractor: RestExtractor + private restExtractor: RestExtractor, + @Inject(LOCALE_ID) private localeId: string ) { + this.loadTranslations() } initializePlugins () { @@ -156,20 +169,22 @@ export class PluginService implements ClientHook { } } - async runHook (hookName: ClientHookName, result?: T, params?: any): Promise { - if (!this.hooks[hookName]) return Promise.resolve(result) + runHook (hookName: ClientHookName, result?: T, params?: any): Promise { + return this.zone.runOutsideAngular(async () => { + if (!this.hooks[ hookName ]) return result - const hookType = getHookType(hookName) + const hookType = getHookType(hookName) - for (const hook of this.hooks[hookName]) { - console.log('Running hook %s of plugin %s.', hookName, hook.plugin.name) + for (const hook of this.hooks[ hookName ]) { + console.log('Running hook %s of plugin %s.', hookName, hook.plugin.name) - result = await internalRunHook(hook.handler, hookType, result, params, err => { - console.error('Cannot run hook %s of script %s of plugin %s.', hookName, hook.clientScript.script, hook.plugin.name, err) - }) - } + result = await internalRunHook(hook.handler, hookType, result, params, err => { + console.error('Cannot run hook %s of script %s of plugin %s.', hookName, hook.clientScript.script, hook.plugin.name, err) + }) + } - return result + return result + }) } nameToNpmName (name: string, type: PluginType) { @@ -210,10 +225,12 @@ export class PluginService implements ClientHook { console.log('Loading script %s of plugin %s.', clientScript.script, plugin.name) - return import(/* webpackIgnore: true */ clientScript.script) - .then((script: ClientScriptModule) => script.register({ registerHook, peertubeHelpers })) - .then(() => this.sortHooksByPriority()) - .catch(err => console.error('Cannot import or register plugin %s.', pluginInfo.plugin.name, err)) + return this.zone.runOutsideAngular(() => { + return importModule(clientScript.script) + .then((script: ClientScriptModule) => script.register({ registerHook, peertubeHelpers })) + .then(() => this.sortHooksByPriority()) + .catch(err => console.error('Cannot import or register plugin %s.', pluginInfo.plugin.name, err)) + }) } private buildScopeStruct () { @@ -230,8 +247,9 @@ export class PluginService implements ClientHook { } } - private buildPeerTubeHelpers (pluginInfo: PluginInfo) { + private buildPeerTubeHelpers (pluginInfo: PluginInfo): RegisterClientHelpers { const { plugin } = pluginInfo + const npmName = this.nameToNpmName(pluginInfo.plugin.name, pluginInfo.pluginType) return { getBaseStaticRoute: () => { @@ -240,19 +258,40 @@ export class PluginService implements ClientHook { }, getSettings: () => { - const npmName = this.nameToNpmName(pluginInfo.plugin.name, pluginInfo.pluginType) - const path = PluginService.BASE_PLUGIN_URL + '/' + npmName + const path = PluginService.BASE_PLUGIN_API_URL + '/' + npmName + '/public-settings' - return this.authHttp.get(path) + return this.authHttp.get(path) .pipe( - map(p => p.settings), + map(p => p.publicSettings), catchError(res => this.restExtractor.handleError(res)) ) .toPromise() + }, + + isLoggedIn: () => { + return this.authService.isLoggedIn() + }, + + translate: (value: string) => { + return this.translationsObservable + .pipe(map(allTranslations => allTranslations[npmName])) + .pipe(map(translations => peertubeTranslate(value, translations))) + .toPromise() } } } + private loadTranslations () { + const completeLocale = isOnDevLocale() ? getDevLocale() : getCompleteLocale(this.localeId) + + // Default locale, nothing to translate + if (isDefaultLocale(completeLocale)) this.translationsObservable = of({}).pipe(shareReplay()) + + this.translationsObservable = this.authHttp + .get(PluginService.BASE_PLUGIN_URL + '/translations/' + completeLocale + '.json') + .pipe(shareReplay()) + } + private getPluginPathPrefix (isTheme: boolean) { return isTheme ? '/themes' : '/plugins' }