X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fplugins%2Fplugin.service.ts;h=dff8ad864754469790b04c1f9a552cfda236de34;hb=584ac47a323d6e57233fce4451d43d4943bfaa10;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..dff8ad864 100644 --- a/client/src/app/core/plugins/plugin.service.ts +++ b/client/src/app/core/plugins/plugin.service.ts @@ -1,72 +1,102 @@ -import { Injectable } from '@angular/core' -import { Router } from '@angular/router' -import { 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 { RestExtractor } from '@app/shared/rest' -import { PluginType } from '@shared/models/plugins/plugin.type' - -interface HookStructValue extends RegisterClientHookOptions { - plugin: ServerConfigPlugin - clientScript: ClientScript -} +import { Inject, Injectable, LOCALE_ID, NgZone } from '@angular/core' +import { VideoEditType } from '@app/+videos/+video-edit/shared/video-edit.type' +import { AuthService } from '@app/core/auth' +import { Notifier } from '@app/core/notification' +import { MarkdownService } from '@app/core/renderer' +import { RestExtractor } from '@app/core/rest' +import { ServerService } from '@app/core/server/server.service' +import { getDevLocale, isOnDevLocale } from '@app/helpers' +import { CustomModalComponent } from '@app/modal/custom-modal.component' +import { FormFields, Hooks, loadPlugin, PluginInfo, runHook } from '@root-helpers/plugins' +import { getCompleteLocale, isDefaultLocale, peertubeTranslate } from '@shared/core-utils/i18n' +import { + ClientHook, + ClientHookName, + PluginClientScope, + PluginTranslation, + PluginType, + PublicServerSetting, + RegisterClientSettingsScript, + ServerConfigPlugin +} from '@shared/models' +import { environment } from '../../../environments/environment' +import { RegisterClientHelpers } from '../../../types/register-client-option.model' +import * as debug from 'debug' -type PluginInfo = { - plugin: ServerConfigPlugin - clientScript: ClientScript - pluginType: PluginType - isTheme: boolean -} +const logger = debug('peertube:plugins') @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), + 'admin-plugin': new ReplaySubject(1), search: new ReplaySubject(1), - 'video-watch': new ReplaySubject(1) + 'video-watch': new ReplaySubject(1), + signup: new ReplaySubject(1), + login: new ReplaySubject(1), + 'video-edit': new ReplaySubject(1), + embed: new ReplaySubject(1) } + translationsObservable: Observable + + customModal: CustomModalComponent + private plugins: ServerConfigPlugin[] = [] + private helpers: { [ npmName: string ]: RegisterClientHelpers } = {} + private scopes: { [ scopeName: string ]: PluginInfo[] } = {} + private loadedScripts: { [ script: string ]: boolean } = {} private loadedScopes: PluginClientScope[] = [] private loadingScopes: { [id in PluginClientScope]?: boolean } = {} - private hooks: { [ name: string ]: HookStructValue[] } = {} + private hooks: Hooks = {} + private formFields: FormFields = { + video: [] + } + private settingsScripts: { [ npmName: string ]: RegisterClientSettingsScript } = {} constructor ( - private router: Router, + private authService: AuthService, + private notifier: Notifier, + private markdownRenderer: MarkdownService, private server: ServerService, + private zone: NgZone, private authHttp: HttpClient, - private restExtractor: RestExtractor + private restExtractor: RestExtractor, + @Inject(LOCALE_ID) private localeId: string ) { + this.loadTranslations() } initializePlugins () { - this.server.configLoaded - .subscribe(() => { - this.plugins = this.server.getConfig().plugin.registered + logger('Building plugin configuration') + + this.server.getConfig() + .subscribe(config => { + this.plugins = config.plugin.registered this.buildScopeStruct() this.pluginsBuilt.next(true) + + logger('Plugin configuration built') }) } + initializeCustomModal (customModal: CustomModalComponent) { + this.customModal = customModal + } + ensurePluginsAreBuilt () { return this.pluginsBuilt.asObservable() .pipe(first(), shareReplay()) @@ -93,7 +123,7 @@ export class PluginService implements ClientHook { this.scopes[scope].push({ plugin, clientScript: { - script: environment.apiUrl + `${pathPrefix}/${plugin.name}/${plugin.version}/client-scripts/${clientScript.script}`, + script: `${pathPrefix}/${plugin.name}/${plugin.version}/client-scripts/${clientScript.script}`, scopes: clientScript.scopes }, pluginType: isTheme ? PluginType.THEME : PluginType.PLUGIN, @@ -123,6 +153,8 @@ export class PluginService implements ClientHook { this.loadingScopes[scope] = true + logger('Loading scope %s', scope) + try { await this.ensurePluginsAreBuilt() @@ -133,6 +165,7 @@ export class PluginService implements ClientHook { this.loadingScopes[scope] = false this.pluginsLoaded[scope].next(true) + logger('Nothing to load for scope %s', scope) return } @@ -151,25 +184,17 @@ export class PluginService implements ClientHook { this.pluginsLoaded[scope].next(true) this.loadingScopes[scope] = false + + logger('Scope %s loaded', scope) } catch (err) { console.error('Cannot load plugins by scope %s.', scope, err) } } - async runHook (hookName: ClientHookName, result?: T, params?: any): Promise { - if (!this.hooks[hookName]) return Promise.resolve(result) - - const hookType = getHookType(hookName) - - 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) - }) - } - - return result + runHook (hookName: ClientHookName, result?: T, params?: any): Promise { + return this.zone.runOutsideAngular(() => { + return runHook(this.hooks, hookName, result, params) + }) } nameToNpmName (name: string, type: PluginType) { @@ -186,34 +211,39 @@ export class PluginService implements ClientHook { : PluginType.THEME } - private loadPlugin (pluginInfo: PluginInfo) { - const { plugin, clientScript } = pluginInfo - - const registerHook = (options: RegisterClientHookOptions) => { - if (clientHookObject[options.target] !== true) { - console.error('Unknown hook %s of plugin %s. Skipping.', options.target, plugin.name) - return - } + getRegisteredVideoFormFields (type: VideoEditType) { + return this.formFields.video.filter(f => f.videoFormOptions.type === type) + } - if (!this.hooks[options.target]) this.hooks[options.target] = [] + getRegisteredSettingsScript (npmName: string) { + return this.settingsScripts[npmName] + } - this.hooks[options.target].push({ - plugin, - clientScript, - target: options.target, - handler: options.handler, - priority: options.priority || 0 - }) + translateBy (npmName: string, toTranslate: string) { + const helpers = this.helpers[npmName] + if (!helpers) { + console.error('Unknown helpers to translate %s from %s.', toTranslate, npmName) + return toTranslate } - const peertubeHelpers = this.buildPeerTubeHelpers(pluginInfo) - - console.log('Loading script %s of plugin %s.', clientScript.script, plugin.name) + return helpers.translate(toTranslate) + } - 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)) + private loadPlugin (pluginInfo: PluginInfo) { + return this.zone.runOutsideAngular(() => { + const npmName = this.nameToNpmName(pluginInfo.plugin.name, pluginInfo.pluginType) + + const helpers = this.buildPeerTubeHelpers(pluginInfo) + this.helpers[npmName] = helpers + + return loadPlugin({ + hooks: this.hooks, + formFields: this.formFields, + onSettingsScripts: options => this.settingsScripts[npmName] = options, + pluginInfo, + peertubeHelpersFactory: () => helpers + }) + }) } private buildScopeStruct () { @@ -222,16 +252,9 @@ export class PluginService implements ClientHook { } } - private sortHooksByPriority () { - for (const hookName of Object.keys(this.hooks)) { - this.hooks[hookName].sort((a, b) => { - return b.priority - a.priority - }) - } - } - - private buildPeerTubeHelpers (pluginInfo: PluginInfo) { + private buildPeerTubeHelpers (pluginInfo: PluginInfo): RegisterClientHelpers { const { plugin } = pluginInfo + const npmName = this.nameToNpmName(pluginInfo.plugin.name, pluginInfo.pluginType) return { getBaseStaticRoute: () => { @@ -239,20 +262,85 @@ export class PluginService implements ClientHook { return environment.apiUrl + `${pathPrefix}/${plugin.name}/${plugin.version}/static` }, + getBaseRouterRoute: () => { + const pathPrefix = this.getPluginPathPrefix(pluginInfo.isTheme) + return environment.apiUrl + `${pathPrefix}/${plugin.name}/${plugin.version}/router` + }, + 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() + }, + + getServerConfig: () => { + return this.server.getConfig() + .pipe(catchError(res => this.restExtractor.handleError(res))) + .toPromise() + }, + + isLoggedIn: () => { + return this.authService.isLoggedIn() + }, + + getAuthHeader: () => { + if (!this.authService.isLoggedIn()) return undefined + + const value = this.authService.getRequestHeaderValue() + return { 'Authorization': value } + }, + + notifier: { + info: (text: string, title?: string, timeout?: number) => this.notifier.info(text, title, timeout), + error: (text: string, title?: string, timeout?: number) => this.notifier.error(text, title, timeout), + success: (text: string, title?: string, timeout?: number) => this.notifier.success(text, title, timeout) + }, + + showModal: (input: { + title: string, + content: string, + close?: boolean, + cancel?: { value: string, action?: () => void }, + confirm?: { value: string, action?: () => void } + }) => { + this.customModal.show(input) + }, + + markdownRenderer: { + textMarkdownToHTML: (textMarkdown: string) => { + return this.markdownRenderer.textMarkdownToHTML(textMarkdown) + }, + + enhancedMarkdownToHTML: (enhancedMarkdown: string) => { + return this.markdownRenderer.enhancedMarkdownToHTML(enhancedMarkdown) + } + }, + + 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' }