yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 10:19:35 +02:00
Code Issues Releases Wiki Activity

Improve plugin package.json error message

Browse source
This commit is contained in:
Chocobozzz 2019-09-11 10:19:03 +02:00
parent 8d5e65349d
commit 9157d5981f
No known key found for this signature in database
GPG key ID: 583A612D890159BE
2 changed files with 77 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
server/lib/plugins/plugin-manager.ts
View file

@ -222,9 +222,8 @@ export class PluginManager implements ServerHook {
const pluginName = PluginModel.normalizePluginName(npmName)
const packageJSON = await this.getPackageJSON(pluginName, pluginType)
if (!isPackageJSONValid(packageJSON, pluginType)) {
throw new Error('PackageJSON is invalid.')
}
this.sanitizeAndCheckPackageJSONOrThrow(packageJSON, pluginType);
[ plugin ] = await PluginModel.upsert({
name: pluginName,
@ -301,9 +300,7 @@ export class PluginManager implements ServerHook {
const packageJSON = await this.getPackageJSON(plugin.name, plugin.type)
const pluginPath = this.getPluginPath(plugin.name, plugin.type)
if (!isPackageJSONValid(packageJSON, plugin.type)) {
throw new Error('Package.JSON is invalid.')
}
this.sanitizeAndCheckPackageJSONOrThrow(packageJSON, plugin.type)
let library: PluginLibrary
if (plugin.type === PluginType.PLUGIN) {
@ -598,6 +595,21 @@ export class PluginManager implements ServerHook {
}
}
private sanitizeAndCheckPackageJSONOrThrow (packageJSON: PluginPackageJson, pluginType: PluginType) {
if (!packageJSON.staticDirs) packageJSON.staticDirs = {}
if (!packageJSON.css) packageJSON.css = []
if (!packageJSON.clientScripts) packageJSON.clientScripts = []
if (!packageJSON.translations) packageJSON.translations = {}
const { result: packageJSONValid, badFields } = isPackageJSONValid(packageJSON, pluginType)
if (!packageJSONValid) {
const formattedFields = badFields.map(f => `"${f}"`)
.join(', ')
throw new Error(`PackageJSON is invalid (invalid fields: ${formattedFields}).`)
}
}
static get Instance () {
return this.instance || (this.instance = new this())
}