mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2025-10-04 18:29:27 +02:00
Support transcoding options/encoders by plugins
This commit is contained in:
parent
529b37527c
commit
1896bca09e
32 changed files with 754 additions and 135 deletions
|
@ -20,7 +20,7 @@ import { PLUGIN_GLOBAL_CSS_PATH } from '../../initializers/constants'
|
|||
import { PluginModel } from '../../models/server/plugin'
|
||||
import { PluginLibrary, RegisterServerAuthExternalOptions, RegisterServerAuthPassOptions, RegisterServerOptions } from '../../types/plugins'
|
||||
import { ClientHtml } from '../client-html'
|
||||
import { RegisterHelpersStore } from './register-helpers-store'
|
||||
import { RegisterHelpers } from './register-helpers'
|
||||
import { installNpmPlugin, installNpmPluginFromDisk, removeNpmPlugin } from './yarn'
|
||||
|
||||
export interface RegisteredPlugin {
|
||||
|
@ -40,7 +40,7 @@ export interface RegisteredPlugin {
|
|||
css: string[]
|
||||
|
||||
// Only if this is a plugin
|
||||
registerHelpersStore?: RegisterHelpersStore
|
||||
registerHelpers?: RegisterHelpers
|
||||
unregister?: Function
|
||||
}
|
||||
|
||||
|
@ -109,7 +109,7 @@ export class PluginManager implements ServerHook {
|
|||
npmName: p.npmName,
|
||||
name: p.name,
|
||||
version: p.version,
|
||||
idAndPassAuths: p.registerHelpersStore.getIdAndPassAuths()
|
||||
idAndPassAuths: p.registerHelpers.getIdAndPassAuths()
|
||||
}))
|
||||
.filter(v => v.idAndPassAuths.length !== 0)
|
||||
}
|
||||
|
@ -120,7 +120,7 @@ export class PluginManager implements ServerHook {
|
|||
npmName: p.npmName,
|
||||
name: p.name,
|
||||
version: p.version,
|
||||
externalAuths: p.registerHelpersStore.getExternalAuths()
|
||||
externalAuths: p.registerHelpers.getExternalAuths()
|
||||
}))
|
||||
.filter(v => v.externalAuths.length !== 0)
|
||||
}
|
||||
|
@ -129,14 +129,14 @@ export class PluginManager implements ServerHook {
|
|||
const result = this.getRegisteredPluginOrTheme(npmName)
|
||||
if (!result || result.type !== PluginType.PLUGIN) return []
|
||||
|
||||
return result.registerHelpersStore.getSettings()
|
||||
return result.registerHelpers.getSettings()
|
||||
}
|
||||
|
||||
getRouter (npmName: string) {
|
||||
const result = this.getRegisteredPluginOrTheme(npmName)
|
||||
if (!result || result.type !== PluginType.PLUGIN) return null
|
||||
|
||||
return result.registerHelpersStore.getRouter()
|
||||
return result.registerHelpers.getRouter()
|
||||
}
|
||||
|
||||
getTranslations (locale: string) {
|
||||
|
@ -194,7 +194,7 @@ export class PluginManager implements ServerHook {
|
|||
logger.error('Cannot find plugin %s to call on settings changed.', name)
|
||||
}
|
||||
|
||||
for (const cb of registered.registerHelpersStore.getOnSettingsChangedCallbacks()) {
|
||||
for (const cb of registered.registerHelpers.getOnSettingsChangedCallbacks()) {
|
||||
try {
|
||||
cb(settings)
|
||||
} catch (err) {
|
||||
|
@ -268,8 +268,9 @@ export class PluginManager implements ServerHook {
|
|||
this.hooks[key] = this.hooks[key].filter(h => h.npmName !== npmName)
|
||||
}
|
||||
|
||||
const store = plugin.registerHelpersStore
|
||||
const store = plugin.registerHelpers
|
||||
store.reinitVideoConstants(plugin.npmName)
|
||||
store.reinitTranscodingProfilesAndEncoders(plugin.npmName)
|
||||
|
||||
logger.info('Regenerating registered plugin CSS to global file.')
|
||||
await this.regeneratePluginGlobalCSS()
|
||||
|
@ -375,11 +376,11 @@ export class PluginManager implements ServerHook {
|
|||
this.sanitizeAndCheckPackageJSONOrThrow(packageJSON, plugin.type)
|
||||
|
||||
let library: PluginLibrary
|
||||
let registerHelpersStore: RegisterHelpersStore
|
||||
let registerHelpers: RegisterHelpers
|
||||
if (plugin.type === PluginType.PLUGIN) {
|
||||
const result = await this.registerPlugin(plugin, pluginPath, packageJSON)
|
||||
library = result.library
|
||||
registerHelpersStore = result.registerStore
|
||||
registerHelpers = result.registerStore
|
||||
}
|
||||
|
||||
const clientScripts: { [id: string]: ClientScript } = {}
|
||||
|
@ -398,7 +399,7 @@ export class PluginManager implements ServerHook {
|
|||
staticDirs: packageJSON.staticDirs,
|
||||
clientScripts,
|
||||
css: packageJSON.css,
|
||||
registerHelpersStore: registerHelpersStore || undefined,
|
||||
registerHelpers: registerHelpers || undefined,
|
||||
unregister: library ? library.unregister : undefined
|
||||
}
|
||||
|
||||
|
@ -512,8 +513,8 @@ export class PluginManager implements ServerHook {
|
|||
const plugin = this.getRegisteredPluginOrTheme(npmName)
|
||||
if (!plugin || plugin.type !== PluginType.PLUGIN) return null
|
||||
|
||||
let auths: (RegisterServerAuthPassOptions | RegisterServerAuthExternalOptions)[] = plugin.registerHelpersStore.getIdAndPassAuths()
|
||||
auths = auths.concat(plugin.registerHelpersStore.getExternalAuths())
|
||||
let auths: (RegisterServerAuthPassOptions | RegisterServerAuthExternalOptions)[] = plugin.registerHelpers.getIdAndPassAuths()
|
||||
auths = auths.concat(plugin.registerHelpers.getExternalAuths())
|
||||
|
||||
return auths.find(a => a.authName === authName)
|
||||
}
|
||||
|
@ -538,7 +539,7 @@ export class PluginManager implements ServerHook {
|
|||
private getRegisterHelpers (
|
||||
npmName: string,
|
||||
plugin: PluginModel
|
||||
): { registerStore: RegisterHelpersStore, registerOptions: RegisterServerOptions } {
|
||||
): { registerStore: RegisterHelpers, registerOptions: RegisterServerOptions } {
|
||||
const onHookAdded = (options: RegisterServerHookOptions) => {
|
||||
if (!this.hooks[options.target]) this.hooks[options.target] = []
|
||||
|
||||
|
@ -550,11 +551,11 @@ export class PluginManager implements ServerHook {
|
|||
})
|
||||
}
|
||||
|
||||
const registerHelpersStore = new RegisterHelpersStore(npmName, plugin, onHookAdded.bind(this))
|
||||
const registerHelpers = new RegisterHelpers(npmName, plugin, onHookAdded.bind(this))
|
||||
|
||||
return {
|
||||
registerStore: registerHelpersStore,
|
||||
registerOptions: registerHelpersStore.buildRegisterHelpers()
|
||||
registerStore: registerHelpers,
|
||||
registerOptions: registerHelpers.buildRegisterHelpers()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@ import {
|
|||
RegisterServerOptions
|
||||
} from '@server/types/plugins'
|
||||
import {
|
||||
EncoderOptionsBuilder,
|
||||
PluginPlaylistPrivacyManager,
|
||||
PluginSettingsManager,
|
||||
PluginStorageManager,
|
||||
|
@ -28,7 +29,8 @@ import {
|
|||
RegisterServerSettingOptions
|
||||
} from '@shared/models'
|
||||
import { serverHookObject } from '@shared/models/plugins/server-hook.model'
|
||||
import { buildPluginHelpers } from './plugin-helpers'
|
||||
import { VideoTranscodingProfilesManager } from '../video-transcoding-profiles'
|
||||
import { buildPluginHelpers } from './plugin-helpers-builder'
|
||||
|
||||
type AlterableVideoConstant = 'language' | 'licence' | 'category' | 'privacy' | 'playlistPrivacy'
|
||||
type VideoConstant = { [key in number | string]: string }
|
||||
|
@ -40,7 +42,7 @@ type UpdatedVideoConstant = {
|
|||
}
|
||||
}
|
||||
|
||||
export class RegisterHelpersStore {
|
||||
export class RegisterHelpers {
|
||||
private readonly updatedVideoConstants: UpdatedVideoConstant = {
|
||||
playlistPrivacy: { added: [], deleted: [] },
|
||||
privacy: { added: [], deleted: [] },
|
||||
|
@ -49,6 +51,23 @@ export class RegisterHelpersStore {
|
|||
category: { added: [], deleted: [] }
|
||||
}
|
||||
|
||||
private readonly transcodingProfiles: {
|
||||
[ npmName: string ]: {
|
||||
type: 'vod' | 'live'
|
||||
encoder: string
|
||||
profile: string
|
||||
}[]
|
||||
} = {}
|
||||
|
||||
private readonly transcodingEncoders: {
|
||||
[ npmName: string ]: {
|
||||
type: 'vod' | 'live'
|
||||
streamType: 'audio' | 'video'
|
||||
encoder: string
|
||||
priority: number
|
||||
}[]
|
||||
} = {}
|
||||
|
||||
private readonly settings: RegisterServerSettingOptions[] = []
|
||||
|
||||
private idAndPassAuths: RegisterServerAuthPassOptions[] = []
|
||||
|
@ -83,6 +102,8 @@ export class RegisterHelpersStore {
|
|||
const videoPrivacyManager = this.buildVideoPrivacyManager()
|
||||
const playlistPrivacyManager = this.buildPlaylistPrivacyManager()
|
||||
|
||||
const transcodingManager = this.buildTranscodingManager()
|
||||
|
||||
const registerIdAndPassAuth = this.buildRegisterIdAndPassAuth()
|
||||
const registerExternalAuth = this.buildRegisterExternalAuth()
|
||||
const unregisterIdAndPassAuth = this.buildUnregisterIdAndPassAuth()
|
||||
|
@ -106,6 +127,8 @@ export class RegisterHelpersStore {
|
|||
videoPrivacyManager,
|
||||
playlistPrivacyManager,
|
||||
|
||||
transcodingManager,
|
||||
|
||||
registerIdAndPassAuth,
|
||||
registerExternalAuth,
|
||||
unregisterIdAndPassAuth,
|
||||
|
@ -141,6 +164,22 @@ export class RegisterHelpersStore {
|
|||
}
|
||||
}
|
||||
|
||||
reinitTranscodingProfilesAndEncoders (npmName: string) {
|
||||
const profiles = this.transcodingProfiles[npmName]
|
||||
if (Array.isArray(profiles)) {
|
||||
for (const profile of profiles) {
|
||||
VideoTranscodingProfilesManager.Instance.removeProfile(profile)
|
||||
}
|
||||
}
|
||||
|
||||
const encoders = this.transcodingEncoders[npmName]
|
||||
if (Array.isArray(encoders)) {
|
||||
for (const o of encoders) {
|
||||
VideoTranscodingProfilesManager.Instance.removeEncoderPriority(o.type, o.streamType, o.encoder, o.priority)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
getSettings () {
|
||||
return this.settings
|
||||
}
|
||||
|
@ -354,4 +393,52 @@ export class RegisterHelpersStore {
|
|||
|
||||
return true
|
||||
}
|
||||
|
||||
private buildTranscodingManager () {
|
||||
const self = this
|
||||
|
||||
function addProfile (type: 'live' | 'vod', encoder: string, profile: string, builder: EncoderOptionsBuilder) {
|
||||
if (profile === 'default') {
|
||||
logger.error('A plugin cannot add a default live transcoding profile')
|
||||
return false
|
||||
}
|
||||
|
||||
VideoTranscodingProfilesManager.Instance.addProfile({
|
||||
type,
|
||||
encoder,
|
||||
profile,
|
||||
builder
|
||||
})
|
||||
|
||||
if (!self.transcodingProfiles[self.npmName]) self.transcodingProfiles[self.npmName] = []
|
||||
self.transcodingProfiles[self.npmName].push({ type, encoder, profile })
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
function addEncoderPriority (type: 'live' | 'vod', streamType: 'audio' | 'video', encoder: string, priority: number) {
|
||||
VideoTranscodingProfilesManager.Instance.addEncoderPriority(type, streamType, encoder, priority)
|
||||
|
||||
if (!self.transcodingEncoders[self.npmName]) self.transcodingEncoders[self.npmName] = []
|
||||
self.transcodingEncoders[self.npmName].push({ type, streamType, encoder, priority })
|
||||
}
|
||||
|
||||
return {
|
||||
addLiveProfile (encoder: string, profile: string, builder: EncoderOptionsBuilder) {
|
||||
return addProfile('live', encoder, profile, builder)
|
||||
},
|
||||
|
||||
addVODProfile (encoder: string, profile: string, builder: EncoderOptionsBuilder) {
|
||||
return addProfile('vod', encoder, profile, builder)
|
||||
},
|
||||
|
||||
addLiveEncoderPriority (streamType: 'audio' | 'video', encoder: string, priority: number) {
|
||||
return addEncoderPriority('live', streamType, encoder, priority)
|
||||
},
|
||||
|
||||
addVODEncoderPriority (streamType: 'audio' | 'video', encoder: string, priority: number) {
|
||||
return addEncoderPriority('vod', streamType, encoder, priority)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue