From 1e46224129c8fe57b9d62d693a2e1dbd839a9338 Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 4 Aug 2019 10:30:49 +0200 Subject: [PATCH] fix --- src/backend/PluginManager/Plugin.ts | 18 ++++++++++-------- src/backend/PluginManager/PluginManager.ts | 7 ++++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/backend/PluginManager/Plugin.ts b/src/backend/PluginManager/Plugin.ts index 1ed4787..d2b2bc4 100644 --- a/src/backend/PluginManager/Plugin.ts +++ b/src/backend/PluginManager/Plugin.ts @@ -33,17 +33,12 @@ export default class PluginManagerPlugin extends PluginManager implements Plugin type: 'call' }, { - name: "getInstalledPlugins", + name: "getInstalledPluginNames", visibility: "private", - rpc: async() => { return await this.getInstalledPlugins() }, + rpc: async() => { return await this.getInstalledPluginNames() }, type: 'call' }, { - name: "getLoadedPlugins", - visibility: "private", - rpc: async () => { return this.getLoadedPlugins() }, - type: 'call' - },{ name: "getLoadedPluginNames", visibility: "private", rpc: async () => { return this.getLoadedPluginNames() }, @@ -87,12 +82,19 @@ export default class PluginManagerPlugin extends PluginManager implements Plugin visibility: "private", rpc: async(conf) => { return this.downloadPlugin(conf) }, type: 'call' + },{ + name: "getConfig", + visibility: "private", + rpc: async() => { return this.conf }, + type: 'call' } ] } async start(): Promise { - + await Promise.all(this.getInstalledPluginNames().map(name => { + return this.loadPlugin(name) + })); } stop(): void { diff --git a/src/backend/PluginManager/PluginManager.ts b/src/backend/PluginManager/PluginManager.ts index 384dea0..2dcea1a 100644 --- a/src/backend/PluginManager/PluginManager.ts +++ b/src/backend/PluginManager/PluginManager.ts @@ -78,7 +78,7 @@ export default class PluginManager extends ConfigLoader entry[0] != '.') @@ -93,6 +93,7 @@ export default class PluginManager extends ConfigLoader