From aac399021b406cf4843e4bbbf2ad10df0bbd4c6c Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 22 Jan 2022 00:54:59 -0800 Subject: [PATCH] server: fix insane allocation on plugin page load --- server/src/services/plugin.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/server/src/services/plugin.ts b/server/src/services/plugin.ts index 451178d52..9a56f4464 100644 --- a/server/src/services/plugin.ts +++ b/server/src/services/plugin.ts @@ -62,8 +62,15 @@ export class PluginComponent { return this.scrypted.plugins[pluginId]?.kill(); } async getPackageJson(pluginId: string) { - const plugin = await this.scrypted.datastore.tryGet(Plugin, pluginId); - return plugin.packageJson; + let packageJson; + if (this.scrypted.plugins[pluginId]) { + packageJson = this.scrypted.plugins[pluginId].packageJson; + } + else { + const plugin = await this.scrypted.datastore.tryGet(Plugin, pluginId); + packageJson = plugin.packageJson; + } + return packageJson; } async getDeviceInfo(id: string) { const pluginDevice = this.scrypted.findPluginDeviceById(id); @@ -75,14 +82,7 @@ export class PluginComponent { } } async getPluginInfo(pluginId: string) { - let packageJson; - if (this.scrypted.plugins[pluginId]) { - packageJson = this.scrypted.plugins[pluginId].packageJson; - } - else { - const plugin = await this.scrypted.datastore.tryGet(Plugin, pluginId); - packageJson = plugin.packageJson; - } + const packageJson = this.getPackageJson(pluginId); const host = this.scrypted.plugins[pluginId]; let rpcObjects = 0; if (host.peer) {