homebridge-config-ui-x 5.0.0-beta.5 → 5.0.0-beta.51

package/dist/modules/platform-tools/linux/linux.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"linux.service.js","sourceRoot":"","sources":["../../../../src/modules/platform-tools/linux/linux.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAyC;AAEzC,2CAA2C;AAE3C,wEAAmE;AACnE,wEAA4D;AAGrD,IAAM,YAAY,GAAlB,MAAM,YAAY;IACvB,YACmB,aAA4B,EAC5B,MAAc;QADd,kBAAa,GAAb,aAAa,CAAe;QAC5B,WAAM,GAAN,MAAM,CAAQ;IAC9B,CAAC;IAKJ,WAAW;QACT,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;gBAC/E,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO;gBACrC,CAAC,CAAC,yBAAyB,CAAC,CAAA;QAE9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE3E,UAAU,CAAC,GAAG,EAAE;YACd,IAAA,yBAAI,EAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC1B,IAAI,GAAG,EAAE,CAAC;oBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAChC,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,EAAE,GAAG,CAAC,CAAA;QAEP,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAA;IACnC,CAAC;IAKD,YAAY;QACV,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;gBAChF,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ;gBACtC,CAAC,CAAC,yBAAyB,CAAC,CAAA;QAE9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE/E,UAAU,CAAC,GAAG,EAAE;YACd,IAAA,yBAAI,EAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC1B,IAAI,GAAG,EAAE,CAAC;oBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAChC,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,EAAE,GAAG,CAAC,CAAA;QAEP,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAA;IACnC,CAAC;CACF,CAAA;AA/CY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAGuB,8BAAa;QACpB,uBAAM;GAHtB,YAAY,CA+CxB"}
+{"version":3,"file":"linux.service.js","sourceRoot":"","sources":["../../../../src/modules/platform-tools/linux/linux.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAyC;AAEzC,2CAA2C;AAE3C,wEAAmE;AACnE,wEAA4D;AAGrD,IAAM,YAAY,GAAlB,MAAM,YAAY;IACvB,YACmB,aAA4B,EAC5B,MAAc;QADd,kBAAa,GAAb,aAAa,CAAe;QAC5B,WAAM,GAAN,MAAM,CAAQ;IAC9B,CAAC;IAKJ,WAAW;QACT,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;gBAC/E,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO;gBACrC,CAAC,CAAC,yBAAyB,CAAC,CAAA;QAE9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAEzE,UAAU,CAAC,GAAG,EAAE;YACd,IAAA,yBAAI,EAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC1B,IAAI,GAAG,EAAE,CAAC;oBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAChC,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,EAAE,GAAG,CAAC,CAAA;QAEP,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAA;IACnC,CAAC;IAKD,YAAY;QACV,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;gBAChF,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ;gBACtC,CAAC,CAAC,yBAAyB,CAAC,CAAA;QAE9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE7E,UAAU,CAAC,GAAG,EAAE;YACd,IAAA,yBAAI,EAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC1B,IAAI,GAAG,EAAE,CAAC;oBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAChC,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,EAAE,GAAG,CAAC,CAAA;QAEP,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAA;IACnC,CAAC;CACF,CAAA;AA/CY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAGuB,8BAAa;QACpB,uBAAM;GAHtB,YAAY,CA+CxB"}

package/dist/modules/platform-tools/terminal/terminal.gateway.d.ts

@@ -1,4 +1,5 @@
-import { TerminalService, TermSize, WsEventEmitter } from './terminal.service';
+import type { TermSize, WsEventEmitter } from './terminal.service';
+import { TerminalService } from './terminal.service';
 export declare class TerminalGateway {
     private readonly terminalService;
     constructor(terminalService: TerminalService);

package/dist/modules/platform-tools/terminal/terminal.gateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.gateway.js","sourceRoot":"","sources":["../../../../src/modules/platform-tools/terminal/terminal.gateway.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0C;AAC1C,mDAAuE;AAEvE,6EAAuE;AACvE,yDAA8E;AAWvE,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YACmB,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAChD,CAAC;IAGJ,oBAAoB,CAAC,MAAsB,EAAE,OAAiB;QAC5D,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC3D,CAAC;CACF,CAAA;AATY,0CAAe;AAM1B;IADC,IAAA,6BAAgB,EAAC,eAAe,CAAC;;;;2DAGjC;0BARU,eAAe;IAT3B,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACvB,IAAA,6BAAgB,EAAC;QAChB,SAAS,EAAE,yBAAyB;QACpC,SAAS,EAAE,IAAI;QACf,IAAI,EAAE;YACJ,MAAM,EAAE,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;YAC1D,WAAW,EAAE,IAAI;SAClB;KACF,CAAC;qCAGoC,kCAAe;GAFxC,eAAe,CAS3B"}
+{"version":3,"file":"terminal.gateway.js","sourceRoot":"","sources":["../../../../src/modules/platform-tools/terminal/terminal.gateway.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2CAA0C;AAC1C,mDAAuE;AAEvE,6EAAuE;AACvE,yDAAoD;AAW7C,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YACmB,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAChD,CAAC;IAGJ,oBAAoB,CAAC,MAAsB,EAAE,OAAiB;QAC5D,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC3D,CAAC;CACF,CAAA;AATY,0CAAe;AAM1B;IADC,IAAA,6BAAgB,EAAC,eAAe,CAAC;;;;2DAGjC;0BARU,eAAe;IAT3B,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACvB,IAAA,6BAAgB,EAAC;QAChB,SAAS,EAAE,yBAAyB;QACpC,SAAS,EAAE,IAAI;QACf,IAAI,EAAE;YACJ,MAAM,EAAE,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;YAC1D,WAAW,EAAE,IAAI;SAClB;KACF,CAAC;qCAGoC,kCAAe;GAFxC,eAAe,CAS3B"}

package/dist/modules/platform-tools/terminal/terminal.service.js

@@ -29,11 +29,11 @@ let TerminalService = class TerminalService {
     async startSession(client, size) {
         this.ending = false;
         if (!this.configService.enableTerminalAccess) {
-            this.logger.error('Terminal is not enabled. Disconnecting client...');
+            this.logger.error('Terminal is not enabled, disconnecting client...');
             client.disconnect();
             return;
         }
-        this.logger.log('Starting terminal session');
+        this.logger.log('Starting terminal session.');
         const shell = await (0, fs_extra_1.pathExists)('/bin/bash') ? '/bin/bash' : '/bin/sh';
         const term = this.nodePtyService.spawn(shell, [], {
             name: 'xterm-color',

package/dist/modules/platform-tools/terminal/terminal.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../../../src/modules/platform-tools/terminal/terminal.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../../../src/modules/platform-tools/terminal/terminal.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/plugins/plugins.controller.js

@@ -55,7 +55,7 @@ let PluginsController = class PluginsController {
 exports.PluginsController = PluginsController;
 __decorate([
     (0, common_1.UseGuards)(admin_guard_1.AdminGuard),
-    (0, swagger_1.ApiOperation)({ summary: 'List of currently installed Homebridge plugins.' }),
+    (0, swagger_1.ApiOperation)({ summary: 'Get the list of currently installed Homebridge plugins.' }),
     (0, common_1.Get)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
@@ -93,7 +93,7 @@ __decorate([
 ], PluginsController.prototype, "getAvailablePluginVersions", null);
 __decorate([
     (0, common_1.UseGuards)(admin_guard_1.AdminGuard),
-    (0, swagger_1.ApiOperation)({ summary: 'Get the config.schema.json for a plugin.' }),
+    (0, swagger_1.ApiOperation)({ summary: 'Get the `config.schema.json` for a plugin.' }),
     (0, swagger_1.ApiParam)({ name: 'pluginName', type: 'string' }),
     (0, common_1.Get)('config-schema/:pluginName'),
     __param(0, (0, common_1.Param)('pluginName')),
@@ -103,7 +103,7 @@ __decorate([
 ], PluginsController.prototype, "getPluginConfigSchema", null);
 __decorate([
     (0, common_1.UseGuards)(admin_guard_1.AdminGuard),
-    (0, swagger_1.ApiOperation)({ summary: 'Get the CHANGELOG.md (post install) for a plugin.' }),
+    (0, swagger_1.ApiOperation)({ summary: 'Get the `CHANGELOG.md` (post install) for a plugin.' }),
     (0, swagger_1.ApiParam)({ name: 'pluginName', type: 'string' }),
     (0, common_1.Get)('changelog/:pluginName'),
     __param(0, (0, common_1.Param)('pluginName')),
@@ -125,7 +125,7 @@ __decorate([
     (0, common_1.UseGuards)(admin_guard_1.AdminGuard),
     (0, swagger_1.ApiOperation)({
         summary: 'Attempt to resolve the type (platform or accessory) and alias for a plugin.',
-        description: '**Warning**: pluginAlias and pluginType will be `null` if the type or alias could not be resolved.',
+        description: 'NOTE: `pluginAlias` and `pluginType` will be `null` if the type or alias could not be resolved.',
     }),
     (0, swagger_1.ApiParam)({ name: 'pluginName', type: 'string' }),
     (0, common_1.Get)('alias/:pluginName'),

package/dist/modules/plugins/plugins.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugins.controller.js","sourceRoot":"","sources":["../../../src/modules/plugins/plugins.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAkE;AAClE,+CAA4C;AAC5C,6CAAgF;AAEhF,oEAA+D;AAC/D,uDAAkD;AAM3C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC5B,YACU,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IACrC,CAAC;IAKJ,UAAU;QACR,OAAO,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAA;IAClD,CAAC;IAMD,aAAa,CAAiB,KAAK;QACjC,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;IAC5D,CAAC;IAMD,YAAY,CAAsB,UAAU;QAC1C,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;IACrD,CAAC;IAMD,0BAA0B,CAAsB,UAAU;QACxD,OAAO,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAA;IACnE,CAAC;IAMD,qBAAqB,CAAsB,UAAU;QACnD,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAA;QAC9D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC;IACH,CAAC;IAMD,kBAAkB,CAAsB,UAAU;QAChD,OAAO,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAA;IAC3D,CAAC;IAMD,gBAAgB,CAAsB,UAAU;QAC9C,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACzD,CAAC;IASD,cAAc,CAAsB,UAAU;QAC5C,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;IACvD,CAAC;CACF,CAAA;AA1EY,8CAAiB;AAQ5B;IAHC,IAAA,kBAAS,EAAC,wBAAU,CAAC;IACrB,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,iDAAiD,EAAE,CAAC;IAC5E,IAAA,YAAG,GAAE;;;;mDAGL;AAMD;IAJC,IAAA,kBAAS,EAAC,wBAAU,CAAC;IACrB,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,iDAAiD,EAAE,CAAC;IAC5E,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC3C,IAAA,YAAG,EAAC,eAAe,CAAC;IACN,WAAA,IAAA,cAAK,EAAC,OAAO,CAAC,CAAA;;;;sDAE5B;AAMD;IAJC,IAAA,kBAAS,EAAC,wBAAU,CAAC;IACrB,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,+CAA+C,EAAE,CAAC;IAC1E,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAChD,IAAA,YAAG,EAAC,oBAAoB,CAAC;IACZ,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;;;;qDAEhC;AAMD;IAJC,IAAA,kBAAS,EAAC,wBAAU,CAAC;IACrB,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,gFAAgF,EAAE,CAAC;IAC3G,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAChD,IAAA,YAAG,EAAC,6BAA6B,CAAC;IACP,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;;;;mEAE9C;AAMD;IAJC,IAAA,kBAAS,EAAC,wBAAU,CAAC;IACrB,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,0CAA0C,EAAE,CAAC;IACrE,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAChD,IAAA,YAAG,EAAC,2BAA2B,CAAC;IACV,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;;;;8DAMzC;AAMD;IAJC,IAAA,kBAAS,EAAC,wBAAU,CAAC;IACrB,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,mDAAmD,EAAE,CAAC;IAC9E,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAChD,IAAA,YAAG,EAAC,uBAAuB,CAAC;IACT,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;;;;2DAEtC;AAMD;IAJC,IAAA,kBAAS,EAAC,wBAAU,CAAC;IACrB,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,mDAAmD,EAAE,CAAC;IAC9E,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAChD,IAAA,YAAG,EAAC,qBAAqB,CAAC;IACT,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;;;;yDAEpC;AASD;IAPC,IAAA,kBAAS,EAAC,wBAAU,CAAC;IACrB,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,6EAA6E;QACtF,WAAW,EAAE,oGAAoG;KAClH,CAAC;IACD,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAChD,IAAA,YAAG,EAAC,mBAAmB,CAAC;IACT,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;;;;uDAElC;4BAzEU,iBAAiB;IAJ7B,IAAA,iBAAO,EAAC,SAAS,CAAC;IAClB,IAAA,uBAAa,GAAE;IACf,IAAA,kBAAS,EAAC,IAAA,oBAAS,GAAE,CAAC;IACtB,IAAA,mBAAU,EAAC,SAAS,CAAC;qCAGM,gCAAc;GAF7B,iBAAiB,CA0E7B"}
+{"version":3,"file":"plugins.controller.js","sourceRoot":"","sources":["../../../src/modules/plugins/plugins.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/plugins/plugins.service.d.ts

@@ -21,7 +21,8 @@ export declare class PluginsService {
     private hiddenPlugins;
     private maintainedPlugins;
     private pluginIcons;
-    private scopedPlugins;
+    private pluginAuthors;
+    private pluginNames;
     private newScopePlugins;
     private verifiedPlugins;
     private verifiedPlusPlugins;
@@ -29,6 +30,7 @@ export declare class PluginsService {
     private pluginAliasCache;
     private pluginAliasHints;
     constructor(httpService: HttpService, nodePtyService: NodePtyService, logger: Logger, configService: ConfigService);
+    private fixDisplayName;
     getInstalledPlugins(): Promise<HomebridgePlugin[]>;
     getOutOfDatePlugins(): Promise<HomebridgePlugin[]>;
     lookupPlugin(pluginName: string): Promise<HomebridgePlugin>;

package/dist/modules/plugins/plugins.service.js

@@ -40,11 +40,12 @@ let PluginsService = PluginsService_1 = class PluginsService {
         this.npm = this.getNpmPath();
         this.paths = this.getBasePaths();
         this.pluginListUrl = 'https://raw.githubusercontent.com/homebridge/plugins/latest/';
-        this.pluginListFile = `${this.pluginListUrl}assets/plugins.min.json`;
+        this.pluginListFile = `${this.pluginListUrl}assets/plugins-v2.min.json`;
         this.hiddenPlugins = [];
         this.maintainedPlugins = [];
         this.pluginIcons = {};
-        this.scopedPlugins = {};
+        this.pluginAuthors = {};
+        this.pluginNames = {};
         this.newScopePlugins = {};
         this.verifiedPlugins = [];
         this.verifiedPlusPlugins = [];
@@ -67,6 +68,12 @@ let PluginsService = PluginsService_1 = class PluginsService {
         this.loadPluginList();
         setInterval(this.loadPluginList.bind(this), 60000 * 60 * 12);
     }
+    fixDisplayName(plugin) {
+        plugin.displayName = plugin.displayName || (plugin.name.charAt(0) === '@' ? plugin.name.split('/')[1] : plugin.name)
+            .replace(/-/g, ' ')
+            .replace(/\w\S*/g, (txt) => txt.charAt(0).toUpperCase() + txt.substring(1).toLowerCase());
+        return plugin;
+    }
     async getInstalledPlugins() {
         const plugins = [];
         const modules = await this.getInstalledModules();
@@ -92,12 +99,12 @@ let PluginsService = PluginsService_1 = class PluginsService {
                     }
                 }
                 catch (e) {
-                    this.logger.error(`Failed to parse plugin "${pkg.name}": ${e.message}`);
+                    this.logger.error(`Failed to parse plugin ${pkg.name} as ${e.message}.`);
                 }
             });
         }));
-        this.installedPlugins = plugins;
-        return plugins;
+        this.installedPlugins = plugins.map(plugin => this.fixDisplayName(plugin));
+        return this.installedPlugins;
     }
     async getOutOfDatePlugins() {
         const plugins = await this.getInstalledPlugins();
@@ -146,14 +153,21 @@ let PluginsService = PluginsService_1 = class PluginsService {
         if (!this.installedPlugins) {
             await this.getInstalledPlugins();
         }
-        const q = `${(!query || !query.length) ? '' : `${query}+`}keywords:homebridge-plugin+not:deprecated&size=30`;
+        query = query.trim().toLowerCase();
+        if ((query.startsWith('homebridge-') || this.isScopedPlugin(query)) && !this.hiddenPlugins.includes(query)) {
+            if (!this.installedPlugins.find(x => x.name === query) && Object.keys(this.newScopePlugins).includes(query)) {
+                query = `@homebridge-plugins/${query}`;
+            }
+            return await this.searchNpmRegistrySingle(query);
+        }
+        const q = `${(!query || !query.length) ? '' : `${query.substring(0, 15)}+`}keywords:homebridge-plugin+not:deprecated&size=99`;
         let searchResults;
         try {
             searchResults = (await (0, rxjs_1.firstValueFrom)(this.httpService.get(`https://registry.npmjs.org/-/v1/search?text=${q}`))).data;
         }
         catch (e) {
-            this.logger.error(`Failed to search the npm registry - "${e.message}" - see https://homebridge.io/w/JJSz6 for help.`);
-            throw new common_1.InternalServerErrorException(`Failed to search the npm registry - "${e.message}" - see logs.`);
+            this.logger.error(`Failed to search the npm registry (see https://homebridge.io/w/JJSz6 for help) as ${e.message}.`);
+            throw new common_1.InternalServerErrorException(`Failed to search the npm registry as ${e.message}, see logs.`);
         }
         const result = searchResults.objects
             .filter(x => x.package.name.indexOf('homebridge-') === 0 || this.isScopedPlugin(x.package.name))
@@ -161,12 +175,14 @@ let PluginsService = PluginsService_1 = class PluginsService {
             .map((pkg) => {
             let plugin = {
                 name: pkg.package.name,
+                displayName: this.pluginNames[pkg.package.name],
                 private: false,
             };
             const isInstalled = this.installedPlugins.find(x => x.name === plugin.name);
             if (isInstalled) {
                 plugin = isInstalled;
                 plugin.lastUpdated = pkg.package.date;
+                plugin.keywords = pkg.package.keywords;
                 return plugin;
             }
             plugin.publicPackage = true;
@@ -176,24 +192,45 @@ let PluginsService = PluginsService_1 = class PluginsService {
             plugin.description = (pkg.package.description)
                 ? pkg.package.description.replace(/\(?(?:https?|ftp):\/\/[\n\S]+/g, '').trim()
                 : pkg.package.name;
+            plugin.keywords = pkg.package.keywords;
             plugin.links = pkg.package.links;
-            plugin.author = this.scopedPlugins[pkg.package.name] || ((pkg.package.publisher) ? pkg.package.publisher.username : null);
+            plugin.author = this.pluginAuthors[pkg.package.name] || ((pkg.package.publisher) ? pkg.package.publisher.username : null);
             plugin.verifiedPlugin = this.verifiedPlugins.includes(pkg.package.name);
             plugin.verifiedPlusPlugin = this.verifiedPlusPlugins.includes(pkg.package.name);
             plugin.icon = this.pluginIcons[pkg.package.name]
                 ? `${this.pluginListUrl}${this.pluginIcons[pkg.package.name]}`
                 : null;
-            plugin.isHbScoped = !!this.scopedPlugins[pkg.package.name];
+            plugin.isHbScoped = pkg.package.name.startsWith('@homebridge-plugins/');
             plugin.newHbScope = this.newScopePlugins[pkg.package.name];
             plugin.isHbMaintained = this.maintainedPlugins.includes(pkg.package.name);
             return plugin;
         });
-        if (!result.length
-            && (query.indexOf('homebridge-') === 0 || this.isScopedPlugin(query))
-            && !this.hiddenPlugins.includes(query.toLowerCase())) {
-            return await this.searchNpmRegistrySingle(query.toLowerCase());
-        }
-        return (0, lodash_1.orderBy)(result, ['verifiedPlusPlugin', 'verifiedPlugin'], ['desc', 'desc']);
+        const searchTerm = query
+            .replace(/[.,/#!$%^&*;:{}=\-_`~()]/g, '');
+        const searchTerms = searchTerm
+            .split(/\s+/)
+            .filter(term => term.length > 0);
+        const exactMatchPlugins = [];
+        const partialMatchPlugins = [];
+        result.forEach((plugin) => {
+            const pluginKeywords = plugin.keywords.map(keyword => keyword.toLowerCase());
+            const isExactMatch = pluginKeywords.includes(searchTerm);
+            if (isExactMatch) {
+                exactMatchPlugins.push(plugin);
+                return;
+            }
+            const pluginName = plugin.name.toLowerCase();
+            const pluginDescription = plugin.description.toLowerCase();
+            const isPartialMatch = searchTerms.some(term => pluginName.includes(term))
+                || searchTerms.some(term => pluginKeywords.some(keyword => keyword.includes(term)))
+                || searchTerms.some(term => pluginDescription.includes(term));
+            if (isPartialMatch) {
+                partialMatchPlugins.push(plugin);
+            }
+        });
+        return (0, lodash_1.orderBy)([...exactMatchPlugins, ...partialMatchPlugins], ['verifiedPlusPlugin', 'verifiedPlugin'], ['desc', 'desc'])
+            .slice(0, 30)
+            .map(plugin => this.fixDisplayName(plugin));
     }
     async searchNpmRegistrySingle(query) {
         try {
@@ -224,10 +261,11 @@ let PluginsService = PluginsService_1 = class PluginsService {
                 verifiedPlugin: this.verifiedPlugins.includes(pkg.name),
                 verifiedPlusPlugin: this.verifiedPlusPlugins.includes(pkg.name),
                 icon: this.pluginIcons[pkg.name],
-                isHbScoped: !!this.scopedPlugins[pkg.name],
+                isHbScoped: pkg.name.startsWith('@homebridge-plugins/'),
                 newHbScope: this.newScopePlugins[pkg.name],
                 isHbMaintained: this.maintainedPlugins.includes(pkg.name),
             };
+            plugin.displayName = this.pluginNames[pkg.name];
             plugin.publicPackage = true;
             plugin.latestVersion = pkg['dist-tags'] ? pkg['dist-tags'].latest : undefined;
             plugin.lastUpdated = pkg.time.modified;
@@ -238,21 +276,21 @@ let PluginsService = PluginsService_1 = class PluginsService {
                 homepage: pkg.homepage,
                 bugs: typeof pkg.bugs === 'object' && pkg.bugs?.url ? pkg.bugs.url : null,
             };
-            plugin.author = this.scopedPlugins[pkg.name]
+            plugin.author = this.pluginAuthors[pkg.name]
                 || ((pkg.maintainers && pkg.maintainers.length) ? pkg.maintainers[0].name : null);
             plugin.verifiedPlugin = this.verifiedPlugins.includes(pkg.name);
             plugin.verifiedPlusPlugin = this.verifiedPlusPlugins.includes(pkg.name);
             plugin.icon = this.pluginIcons[pkg.name]
                 ? `${this.pluginListUrl}${this.pluginIcons[pkg.name]}`
                 : null;
-            plugin.isHbScoped = !!this.scopedPlugins[pkg.name];
+            plugin.isHbScoped = pkg.name.startsWith('@homebridge-plugins/');
             plugin.newHbScope = this.newScopePlugins[pkg.name];
             plugin.isHbMaintained = this.maintainedPlugins.includes(pkg.name);
-            return [plugin];
+            return [this.fixDisplayName(plugin)];
         }
         catch (e) {
             if (e.response?.status !== 404) {
-                this.logger.error(`Failed to search the npm registry - "${e.message}" - see https://homebridge.io/w/JJSz6 for help.`);
+                this.logger.error(`Failed to search the npm registry (see https://homebridge.io/w/JJSz6 for help) as ${e.message}.`);
             }
             return [];
         }
@@ -269,6 +307,14 @@ let PluginsService = PluginsService_1 = class PluginsService {
         if (action === 'install' && pluginAction.version === 'latest') {
             pluginAction.version = await this.getNpmModuleLatestVersion(pluginAction.name);
         }
+        const userPlatform = (0, node_os_1.platform)();
+        if (pluginAction.name === this.configService.name && userPlatform === 'linux') {
+            const uname = (0, node_child_process_1.execSync)('uname -m').toString().trim();
+            const majorVersion = +pluginAction.version.split('.')[0];
+            if (uname === 'armv6l' && majorVersion > 4) {
+                throw new Error('Versions 5 and above of the Homebridge UI are not compatible with your armv6l device.');
+            }
+        }
         let installPath = (this.configService.customPluginPath)
             ? this.configService.customPluginPath
             : this.installedPlugins.find(x => x.name === this.configService.name).installPath;
@@ -305,27 +351,22 @@ let PluginsService = PluginsService_1 = class PluginsService {
             }
         }
         const installOptions = [];
+        let npmPluginLabel = pluginAction.name;
         if (installPath === this.configService.customPluginPath && await (0, fs_extra_1.pathExists)((0, node_path_1.resolve)(installPath, '../package.json'))) {
             installOptions.push('--save');
         }
         installPath = (0, node_path_1.resolve)(installPath, '../');
-        if (!this.configService.customPluginPath || (0, node_os_1.platform)() === 'win32' || existingPlugin?.globalInstall === true) {
+        if (!this.configService.customPluginPath || userPlatform === 'win32' || existingPlugin?.globalInstall === true) {
             installOptions.push('-g');
         }
-        const npmPluginLabel = action === 'uninstall' ? pluginAction.name : `${pluginAction.name}@${pluginAction.version}`;
-        try {
-            await this.runNpmCommand([...this.npm, action, ...installOptions, npmPluginLabel], installPath, client, pluginAction.termCols, pluginAction.termRows);
-            await this.ensureCustomPluginDirExists();
-            return true;
-        }
-        catch (e) {
-            if (pluginAction.name === this.configService.name) {
-                client.emit('stdout', (0, bash_color_1.yellow)('\r\nCleaning up npm cache, please wait...\r\n'));
-                await this.cleanNpmCache();
-                client.emit('stdout', (0, bash_color_1.yellow)(`npm cache cleared, please try updating ${this.configService.name} again.\r\n`));
-            }
-            throw e;
+        if (action === 'install') {
+            installOptions.push('--omit=dev');
+            npmPluginLabel = `${pluginAction.name}@${pluginAction.version}`;
         }
+        await this.cleanNpmCache();
+        await this.runNpmCommand([...this.npm, action, ...installOptions, npmPluginLabel], installPath, client, pluginAction.termCols, pluginAction.termRows);
+        await this.ensureCustomPluginDirExists();
+        return true;
     }
     async getHomebridgePackage() {
         if (this.configService.ui.homebridgePackagePath) {
@@ -334,21 +375,21 @@ let PluginsService = PluginsService_1 = class PluginsService {
                 return await this.parsePackageJson(await (0, fs_extra_1.readJson)(pkgJsonPath), this.configService.ui.homebridgePackagePath);
             }
             else {
-                this.logger.error(`"homebridgePath" (${this.configService.ui.homebridgePackagePath}) does not exist`);
+                this.logger.error(`The Homebridge path ${this.configService.ui.homebridgePackagePath} does not exist.`);
             }
         }
         const modules = await this.getInstalledModules();
         const homebridgeInstalls = modules.filter(x => x.name === 'homebridge');
         if (homebridgeInstalls.length > 1) {
-            this.logger.warn('Multiple Instances Of Homebridge Found Installed - see https://homebridge.io/w/JJSgm for help.');
+            this.logger.warn('Multiple instances of Homebridge were found, see https://homebridge.io/w/JJSgm for help.');
             homebridgeInstalls.forEach((instance) => {
                 this.logger.warn(instance.installPath);
             });
         }
         if (!homebridgeInstalls.length) {
             this.configService.hbServiceUiRestartRequired = true;
-            this.logger.error('Unable To Find Homebridge Installation - see https://homebridge.io/w/JJSgZ for help.');
-            throw new Error('Unable To Find Homebridge Installation');
+            this.logger.error('Unable to find Homebridge installation, see https://homebridge.io/w/JJSgZ for help.');
+            throw new Error('Unable To Find Homebridge Installation.');
         }
         const homebridgeModule = homebridgeInstalls[0];
         const pkgJson = await (0, fs_extra_1.readJson)((0, node_path_1.join)(homebridgeModule.installPath, 'package.json'));
@@ -378,6 +419,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
         }
         let installPath = homebridge.installPath;
         const installOptions = [];
+        installOptions.push('--omit=dev');
         if (installPath === this.configService.customPluginPath && await (0, fs_extra_1.pathExists)((0, node_path_1.resolve)(installPath, '../package.json'))) {
             installOptions.push('--save');
         }
@@ -416,7 +458,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
             && pluginAction.name !== this.configService.name
             && pluginAction.version !== 'latest') {
             try {
-                await (0, rxjs_1.firstValueFrom)(this.httpService.head(`https://github.com/homebridge/verified/releases/download/v1.0.0/${pluginAction.name.replace('/', '@')}-${pluginAction.version}.sha256`));
+                await (0, rxjs_1.firstValueFrom)(this.httpService.head(`https://github.com/homebridge/plugins/releases/download/v1.0.0/${pluginAction.name.replace('/', '@')}-${pluginAction.version}.sha256`));
                 return true;
             }
             catch (e) {
@@ -440,7 +482,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
             '/var/packages/homebridge/target/app/lib/node_modules',
         ].includes((0, node_path_1.dirname)(node_process_1.default.env.UIX_BASE_PATH))
             && pluginAction.name === this.configService.name
-            && pluginAction.version !== 'latest') {
+            && !['latest', 'alpha', 'beta'].includes(pluginAction.version)) {
             try {
                 try {
                     const withV = `v${pluginAction.version}`;
@@ -454,7 +496,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
                 }
             }
             catch (e) {
-                this.logger.error(`Failed to check for bundled update: ${e.message}`);
+                this.logger.error(`Failed to check for bundled update: ${e.message}.`);
                 return '';
             }
         }
@@ -494,27 +536,19 @@ let PluginsService = PluginsService_1 = class PluginsService {
         let configSchema = await (0, fs_extra_1.readJson)(schemaPath);
         if (configSchema.dynamicSchemaVersion) {
             const dynamicSchemaPath = (0, node_path_1.resolve)(this.configService.storagePath, `.${pluginName}-v${configSchema.dynamicSchemaVersion}.schema.json`);
-            this.logger.log(`[${pluginName}] dynamic schema path: ${dynamicSchemaPath}`);
+            this.logger.log(`[${pluginName}] dynamic schema path: ${dynamicSchemaPath}.`);
             if ((0, fs_extra_1.existsSync)(dynamicSchemaPath)) {
                 try {
                     configSchema = await (0, fs_extra_1.readJson)(dynamicSchemaPath);
-                    this.logger.log(`[${pluginName}] dynamic schema loaded from: ${dynamicSchemaPath}`);
+                    this.logger.log(`[${pluginName}] dynamic schema loaded from ${dynamicSchemaPath}.`);
                 }
                 catch (e) {
-                    this.logger.error(`[${pluginName}] Failed to load dynamic schema at ${dynamicSchemaPath}: ${e.message}`);
+                    this.logger.error(`[${pluginName}] failed to load dynamic schema from ${dynamicSchemaPath} as ${e.message}.`);
                 }
             }
         }
         if (pluginName === this.configService.name) {
             configSchema.schema.properties.port.default = this.configService.ui.port;
-            if (this.configService.serviceMode) {
-                configSchema.layout = configSchema.layout.filter((x) => {
-                    return x.ref !== 'log';
-                });
-                configSchema.layout = configSchema.layout.filter((x) => {
-                    return !(x === 'sudo' || x.key === 'restart');
-                });
-            }
         }
         if (pluginName === 'homebridge-alexa') {
             configSchema.schema.properties.pin.default = this.configService.homebridgeConfig.bridge.pin;
@@ -626,7 +660,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
                         ?.name;
                 }
                 catch (e) {
-                    this.logger.error(`Failed to get list of branches from GitHub: ${e.message}`);
+                    this.logger.error(`Failed to get list of branches from GitHub as ${e.message}.`);
                 }
             }
             return {
@@ -696,7 +730,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
                 });
             }
             catch (e) {
-                this.logger.debug('Failed to extract plugin alias:', e);
+                this.logger.debug(`Failed to extract ${pluginName} plugin alias as ${e.message}.`);
                 if (this.pluginAliasHints[pluginName]) {
                     output.pluginAlias = this.pluginAliasHints[pluginName].pluginAlias;
                     output.pluginType = this.pluginAliasHints[pluginName].pluginType;
@@ -788,7 +822,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
                     }
                 }
                 catch (e) {
-                    this.logger.log(`Failed to parse item "${module}" in ${requiredPath}: ${e.message}`);
+                    this.logger.log(`Failed to parse ${module} in ${requiredPath} as ${e.message}.`);
                 }
             }
         }
@@ -824,8 +858,8 @@ let PluginsService = PluginsService_1 = class PluginsService {
                 return [windowsNpmPath[0]];
             }
             else {
-                this.logger.error('ERROR: Cannot find npm binary. You will not be able to manage plugins or update homebridge.');
-                this.logger.error('ERROR: You might be able to fix this problem by running: npm install -g npm');
+                this.logger.error('Cannot find npm binary, you will not be able to manage plugins or update Homebridge. You might be able to fix this problem by running:');
+                this.logger.error('npm install -g npm');
             }
         }
         return ['npm'];
@@ -876,8 +910,8 @@ let PluginsService = PluginsService_1 = class PluginsService {
     async parsePackageJson(pkgJson, installPath) {
         const plugin = {
             name: pkgJson.name,
+            displayName: pkgJson.displayName || this.pluginNames[pkgJson.name],
             private: pkgJson.private || false,
-            displayName: pkgJson.displayName,
             description: (pkgJson.description)
                 ? pkgJson.description.replace(/(?:https?|ftp):\/\/[\n\S]+/g, '').trim()
                 : pkgJson.name,
@@ -886,7 +920,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
             icon: this.pluginIcons[pkgJson.name]
                 ? `${this.pluginListUrl}${this.pluginIcons[pkgJson.name]}`
                 : null,
-            isHbScoped: !!this.scopedPlugins[pkgJson.name],
+            isHbScoped: pkgJson.name.startsWith('@homebridge-plugins/'),
             newHbScope: this.newScopePlugins[pkgJson.name],
             isHbMaintained: this.maintainedPlugins.includes(pkgJson.name),
             installedVersion: installPath ? (pkgJson.version || '0.0.1') : null,
@@ -938,12 +972,12 @@ let PluginsService = PluginsService_1 = class PluginsService {
                 homepage: pkg.homepage,
                 bugs: typeof pkg.bugs === 'object' && pkg.bugs?.url ? pkg.bugs.url : null,
             };
-            plugin.author = this.scopedPlugins[pkg.name]
+            plugin.author = this.pluginAuthors[pkg.name]
                 || ((pkg.maintainers && pkg.maintainers.length) ? pkg.maintainers[0].name : null);
         }
         catch (e) {
             if (e.response?.status !== 404) {
-                this.logger.log(`[${plugin.name}] Failed to check registry.npmjs.org for updates: "${e.message}" - see https://homebridge.io/w/JJSz6 for help.`);
+                this.logger.log(`[${plugin.name}] failed to check registry.npmjs.org for updates (see https://homebridge.io/w/JJSz6 for help) as ${e.message}.`);
             }
             plugin.publicPackage = false;
             plugin.latestVersion = null;
@@ -970,18 +1004,25 @@ let PluginsService = PluginsService_1 = class PluginsService {
             command.unshift('sudo', '-E', '-n');
         }
         else {
+            let npmInstallPath;
+            try {
+                npmInstallPath = (0, node_child_process_1.execSync)('npm root -g').toString().trim();
+            }
+            catch (e) {
+                npmInstallPath = (0, node_path_1.resolve)(cwd, 'node_modules');
+            }
             try {
-                await (0, fs_extra_1.access)((0, node_path_1.resolve)(cwd, 'node_modules'), fs_extra_1.constants.W_OK);
+                await (0, fs_extra_1.access)(npmInstallPath, fs_extra_1.constants.W_OK);
             }
             catch (e) {
                 client.emit('stdout', (0, bash_color_1.yellow)(`The user "${(0, node_os_1.userInfo)().username}" does not have write access to the target directory:\n\r\n\r`));
-                client.emit('stdout', `${(0, node_path_1.resolve)(cwd, 'node_modules')}\n\r\n\r`);
+                client.emit('stdout', `${npmInstallPath}\n\r\n\r`);
                 client.emit('stdout', (0, bash_color_1.yellow)('This may cause the operation to fail.\n\r'));
                 client.emit('stdout', (0, bash_color_1.yellow)('See the docs for details on how to enable sudo mode:\n\r'));
                 client.emit('stdout', (0, bash_color_1.yellow)('https://github.com/homebridge/homebridge-config-ui-x/wiki/Manual-Configuration#sudo-mode\n\r\n\r'));
             }
         }
-        this.logger.log(`Running Command: ${command.join(' ')}`);
+        this.logger.log(`Running command ${command.join(' ')}.`);
         if (!(0, semver_1.satisfies)(node_process_1.default.version, `>=${this.configService.minimumNodeVersion}`)) {
             client.emit('stdout', (0, bash_color_1.yellow)(`Node.js v${this.configService.minimumNodeVersion} higher is required for ${this.configService.name}.\n\r`));
             client.emit('stdout', (0, bash_color_1.yellow)(`You may experience issues while running on Node.js ${node_process_1.default.version}.\n\r\n\r`));
@@ -1042,13 +1083,12 @@ let PluginsService = PluginsService_1 = class PluginsService {
             return;
         }
         if (!await (0, fs_extra_1.pathExists)(this.configService.customPluginPath)) {
-            this.logger.warn(`Custom plugin directory was removed. Re-creating: ${this.configService.customPluginPath}`);
+            this.logger.warn(`Custom plugin directory was removed, re-creating ${this.configService.customPluginPath}.`);
             try {
                 await (0, fs_extra_1.ensureDir)(this.configService.customPluginPath);
             }
             catch (e) {
-                this.logger.error('Failed to recreate custom plugin directory');
-                this.logger.error(e.message);
+                this.logger.error(`Failed to re-create custom plugin directory as ${e.message}.`);
             }
         }
     }
@@ -1063,7 +1103,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
             }
         }
         catch (e) {
-            this.logger.error(`Failed to remove ${offendingPath}`, e.message);
+            this.logger.error(`Failed to remove ${offendingPath} as ${e.message}.`);
         }
     }
     async cleanNpmCache() {
@@ -1072,9 +1112,9 @@ let PluginsService = PluginsService_1 = class PluginsService {
             command.unshift('sudo', '-E', '-n');
         }
         return new Promise((res) => {
-            const child = (0, node_child_process_1.spawn)(command.shift(), command);
+            const child = (0, node_child_process_1.spawn)(command.shift(), command, { shell: true });
             child.on('exit', (code) => {
-                this.logger.log('npm cache clear command executed with exit code', code);
+                this.logger.log(`Executed npm cache clear command with exit code ${code}.`);
                 res(null);
             });
             child.on('error', () => {
@@ -1093,36 +1133,40 @@ let PluginsService = PluginsService_1 = class PluginsService {
             this.pluginIcons = {};
             this.hiddenPlugins = [];
             this.maintainedPlugins = [];
-            this.scopedPlugins = {};
+            this.pluginAuthors = {};
+            this.pluginNames = {};
             this.newScopePlugins = {};
             Object.keys(pluginListData).forEach((key) => {
                 const plugin = pluginListData[key];
-                if (plugin.icon) {
-                    this.pluginIcons[key] = `icons/${plugin.icon}.png`;
+                if (plugin.i) {
+                    this.pluginIcons[key] = `icons/${plugin.i}.png`;
                 }
-                if (plugin.hidden) {
+                if (plugin.h) {
                     this.hiddenPlugins.push(key);
                 }
-                if (plugin.maintained) {
+                if (plugin.m) {
                     this.maintainedPlugins.push(key);
                 }
-                if (plugin.scoped) {
-                    this.scopedPlugins[key] = plugin.scoped;
+                if (plugin.a) {
+                    this.pluginAuthors[key] = plugin.a;
+                }
+                if (plugin.n) {
+                    this.pluginNames[key] = plugin.n;
                 }
-                if (plugin.newScope) {
-                    this.newScopePlugins[key] = plugin.newScope;
+                if (plugin.s) {
+                    this.newScopePlugins[key] = plugin.s;
                 }
-                if (plugin.verified) {
+                if (plugin.v) {
                     this.verifiedPlugins.push(key);
                 }
-                if (plugin.verifiedPlus) {
+                if (plugin.p) {
                     this.verifiedPlusPlugins.push(key);
                 }
             });
         }
         catch (e) {
             this.pluginListRetryTimeout = setTimeout(() => this.loadPluginList(), 60000);
-            this.logger.debug('Error when trying to get github plugin list:', e.message);
+            this.logger.debug(`Could not obtain plugin list from plugins repo as ${e.message}.`);
         }
     }
 };