Merge pull request #3531 from thornbill/remove-plugin-get-routes

Remove broken method of registering routes for plugins
This commit is contained in:
Bill Thornton 2022-03-31 13:59:19 -04:00 committed by GitHub
commit 3a14418e47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,166 +9,149 @@ import * as inputManager from '../scripts/inputManager';
import toast from '../components/toast/toast';
import confirm from '../components/confirm/confirm';
/* eslint-disable indent */
// TODO: replace with each plugin version
const cacheParam = new Date().getTime();
// TODO: replace with each plugin version
const cacheParam = new Date().getTime();
class PluginManager {
pluginsList = [];
class PluginManager {
pluginsList = [];
get plugins() {
return this.pluginsList;
}
get plugins() {
return this.pluginsList;
}
#loadStrings(plugin) {
const strings = plugin.getTranslations ? plugin.getTranslations() : [];
return globalize.loadStrings({
name: plugin.id || plugin.packageName,
strings: strings
});
}
#loadStrings(plugin) {
const strings = plugin.getTranslations ? plugin.getTranslations() : [];
return globalize.loadStrings({
name: plugin.id || plugin.packageName,
strings: strings
});
}
async #registerPlugin(plugin) {
this.#register(plugin);
#definePluginRoute(route, plugin) {
route.contentPath = this.mapPath(plugin, route.path);
route.path = this.#mapRoute(plugin, route);
Emby.App.defineRoute(route, plugin.id);
}
async #registerPlugin(plugin) {
this.#register(plugin);
if (plugin.getRoutes) {
plugin.getRoutes().forEach((route) => {
this.#definePluginRoute(route, plugin);
});
}
if (plugin.type === 'skin') {
// translations won't be loaded for skins until needed
return plugin;
} else {
return await this.#loadStrings(plugin);
}
}
async #preparePlugin(pluginSpec, plugin) {
if (typeof pluginSpec === 'string') {
// See if it's already installed
const existing = this.plugins.filter(function (p) {
return p.id === plugin.id;
})[0];
if (existing) {
return pluginSpec;
}
plugin.installUrl = pluginSpec;
const separatorIndex = Math.max(pluginSpec.lastIndexOf('/'), pluginSpec.lastIndexOf('\\'));
plugin.baseUrl = pluginSpec.substring(0, separatorIndex);
}
return this.#registerPlugin(plugin);
}
async loadPlugin(pluginSpec) {
let plugin;
if (typeof pluginSpec === 'string') {
if (pluginSpec in window) {
console.log(`Loading plugin (via window): ${pluginSpec}`);
const pluginDefinition = await window[pluginSpec];
if (typeof pluginDefinition !== 'function') {
throw new TypeError('Plugin definitions in window have to be an (async) function returning the plugin class');
}
const pluginClass = await pluginDefinition();
if (typeof pluginClass !== 'function') {
throw new TypeError(`Plugin definition doesn't return a class for '${pluginSpec}'`);
}
// init plugin and pass basic dependencies
plugin = new pluginClass({
events: Events,
loading,
appSettings,
playbackManager,
globalize,
appHost,
appRouter,
inputManager,
toast,
confirm
});
} else {
console.debug(`Loading plugin (via dynamic import): ${pluginSpec}`);
const pluginResult = await import(/* webpackChunkName: "[request]" */ `../plugins/${pluginSpec}`);
plugin = new pluginResult.default;
}
} else if (pluginSpec.then) {
console.debug('Loading plugin (via promise/async function)');
const pluginResult = await pluginSpec;
plugin = new pluginResult.default;
} else {
throw new TypeError('Plugins have to be a Promise that resolves to a plugin builder function');
}
return this.#preparePlugin(pluginSpec, plugin);
}
// In lieu of automatic discovery, plugins will register dynamic objects
// Each object will have the following properties:
// name
// type (skin, screensaver, etc)
#register(obj) {
this.pluginsList.push(obj);
Events.trigger(this, 'registered', [obj]);
}
ofType(type) {
return this.pluginsList.filter((o) => {
return o.type === type;
});
}
#mapRoute(plugin, route) {
if (typeof plugin === 'string') {
plugin = this.pluginsList.filter((p) => {
return (p.id || p.packageName) === plugin;
})[0];
}
route = route.path || route;
if (route.toLowerCase().startsWith('http')) {
return route;
}
return '/plugins/' + plugin.id + '/' + route;
}
mapPath(plugin, path, addCacheParam) {
if (typeof plugin === 'string') {
plugin = this.pluginsList.filter((p) => {
return (p.id || p.packageName) === plugin;
})[0];
}
let url = plugin.baseUrl + '/' + path;
if (addCacheParam) {
url += url.includes('?') ? '&' : '?';
url += 'v=' + cacheParam;
}
return url;
if (plugin.type === 'skin') {
// translations won't be loaded for skins until needed
return plugin;
} else {
return await this.#loadStrings(plugin);
}
}
/* eslint-enable indent */
async #preparePlugin(pluginSpec, plugin) {
if (typeof pluginSpec === 'string') {
// See if it's already installed
const existing = this.plugins.filter(function (p) {
return p.id === plugin.id;
})[0];
if (existing) {
return pluginSpec;
}
plugin.installUrl = pluginSpec;
const separatorIndex = Math.max(pluginSpec.lastIndexOf('/'), pluginSpec.lastIndexOf('\\'));
plugin.baseUrl = pluginSpec.substring(0, separatorIndex);
}
return this.#registerPlugin(plugin);
}
async loadPlugin(pluginSpec) {
let plugin;
if (typeof pluginSpec === 'string') {
if (pluginSpec in window) {
console.log(`Loading plugin (via window): ${pluginSpec}`);
const pluginDefinition = await window[pluginSpec];
if (typeof pluginDefinition !== 'function') {
throw new TypeError('Plugin definitions in window have to be an (async) function returning the plugin class');
}
const pluginClass = await pluginDefinition();
if (typeof pluginClass !== 'function') {
throw new TypeError(`Plugin definition doesn't return a class for '${pluginSpec}'`);
}
// init plugin and pass basic dependencies
plugin = new pluginClass({
events: Events,
loading,
appSettings,
playbackManager,
globalize,
appHost,
appRouter,
inputManager,
toast,
confirm
});
} else {
console.debug(`Loading plugin (via dynamic import): ${pluginSpec}`);
const pluginResult = await import(/* webpackChunkName: "[request]" */ `../plugins/${pluginSpec}`);
plugin = new pluginResult.default;
}
} else if (pluginSpec.then) {
console.debug('Loading plugin (via promise/async function)');
const pluginResult = await pluginSpec;
plugin = new pluginResult.default;
} else {
throw new TypeError('Plugins have to be a Promise that resolves to a plugin builder function');
}
return this.#preparePlugin(pluginSpec, plugin);
}
// In lieu of automatic discovery, plugins will register dynamic objects
// Each object will have the following properties:
// name
// type (skin, screensaver, etc)
#register(obj) {
this.pluginsList.push(obj);
Events.trigger(this, 'registered', [obj]);
}
ofType(type) {
return this.pluginsList.filter((o) => {
return o.type === type;
});
}
#mapRoute(plugin, route) {
if (typeof plugin === 'string') {
plugin = this.pluginsList.filter((p) => {
return (p.id || p.packageName) === plugin;
})[0];
}
route = route.path || route;
if (route.toLowerCase().startsWith('http')) {
return route;
}
return '/plugins/' + plugin.id + '/' + route;
}
mapPath(plugin, path, addCacheParam) {
if (typeof plugin === 'string') {
plugin = this.pluginsList.filter((p) => {
return (p.id || p.packageName) === plugin;
})[0];
}
let url = plugin.baseUrl + '/' + path;
if (addCacheParam) {
url += url.includes('?') ? '&' : '?';
url += 'v=' + cacheParam;
}
return url;
}
}
export const pluginManager = new PluginManager();