homebridge-config-ui-x 5.0.0-beta.6 → 5.0.0-beta.60

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,38 +276,38 @@ 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 [];
         }
     }
-    async managePlugin(action, pluginAction, client) {
-        pluginAction.version = pluginAction.version || 'latest';
-        if (action === 'uninstall' && pluginAction.name === this.configService.name) {
-            throw new Error(`Cannot uninstall ${pluginAction.name} from ${this.configService.name}.`);
+    async manageUi(action, pluginAction, client) {
+        if (action === 'uninstall') {
+            throw new Error('Cannot uninstall the Homebridge UI.');
         }
-        if (pluginAction.name === this.configService.name && this.configService.dockerOfflineUpdate && pluginAction.version === 'latest') {
+        if (this.configService.dockerOfflineUpdate && pluginAction.version === 'latest') {
             await this.updateSelfOffline(client);
             return true;
         }
         if (action === 'install' && pluginAction.version === 'latest') {
             pluginAction.version = await this.getNpmModuleLatestVersion(pluginAction.name);
         }
-        let installPath = (this.configService.customPluginPath)
+        const userPlatform = (0, node_os_1.platform)();
+        let installPath = this.configService.customPluginPath
             ? this.configService.customPluginPath
             : this.installedPlugins.find(x => x.name === this.configService.name).installPath;
         await this.getInstalledPlugins();
@@ -277,24 +315,53 @@ let PluginsService = PluginsService_1 = class PluginsService {
         if (existingPlugin) {
             installPath = existingPlugin.installPath;
         }
-        if (action === 'install' && pluginAction.name === this.configService.name) {
-            const githubReleaseName = await this.isUiUpdateBundleAvailable(pluginAction);
-            if (githubReleaseName) {
-                try {
-                    await this.doUiBundleUpdate(pluginAction, client, githubReleaseName);
-                    return true;
-                }
-                catch (e) {
-                    client.emit('stdout', (0, bash_color_1.yellow)('\r\nBundled update failed. Trying regular update using npm.\r\n\r\n'));
-                }
+        const githubReleaseName = await this.isUiUpdateBundleAvailable(pluginAction);
+        if (githubReleaseName) {
+            try {
+                await this.doUiBundleUpdate(pluginAction, client, githubReleaseName);
+                return true;
             }
-            if ((0, node_os_1.cpus)().length === 1 && (0, node_os_1.arch)() === 'arm') {
-                client.emit('stdout', (0, bash_color_1.yellow)('***************************************************************\r\n'));
-                client.emit('stdout', (0, bash_color_1.yellow)(`Please be patient while ${this.configService.name} updates.\r\n`));
-                client.emit('stdout', (0, bash_color_1.yellow)('This process may take 5-15 minutes to complete on your device.\r\n'));
-                client.emit('stdout', (0, bash_color_1.yellow)('***************************************************************\r\n\r\n'));
+            catch (e) {
+                client.emit('stdout', (0, bash_color_1.yellow)('\r\nBundled update failed. Trying regular update using npm.\r\n\r\n'));
             }
         }
+        if ((0, node_os_1.cpus)().length === 1 && (0, node_os_1.arch)() === 'arm') {
+            client.emit('stdout', (0, bash_color_1.yellow)('***************************************************************\r\n'));
+            client.emit('stdout', (0, bash_color_1.yellow)(`Please be patient while ${this.configService.name} updates.\r\n`));
+            client.emit('stdout', (0, bash_color_1.yellow)('This process may take 5-15 minutes to complete on your device.\r\n'));
+            client.emit('stdout', (0, bash_color_1.yellow)('***************************************************************\r\n\r\n'));
+        }
+        const installOptions = [];
+        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 || userPlatform === 'win32' || existingPlugin?.globalInstall === true) {
+            installOptions.push('-g');
+        }
+        installOptions.push('--omit=dev');
+        const 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 managePlugin(action, pluginAction, client) {
+        pluginAction.version = pluginAction.version || 'latest';
+        if (pluginAction.name === this.configService.name) {
+            return await this.manageUi(action, pluginAction, client);
+        }
+        if (action === 'install' && pluginAction.version === 'latest') {
+            pluginAction.version = await this.getNpmModuleLatestVersion(pluginAction.name);
+        }
+        let installPath = this.configService.customPluginPath
+            ? this.configService.customPluginPath
+            : this.installedPlugins.find(x => x.name === this.configService.name).installPath;
+        await this.getInstalledPlugins();
+        const existingPlugin = this.installedPlugins.find(x => x.name === pluginAction.name);
+        if (existingPlugin) {
+            installPath = existingPlugin.installPath;
+        }
         if (action === 'install' && await this.isPluginBundleAvailable(pluginAction)) {
             try {
                 await this.doPluginBundleUpdate(pluginAction, client);
@@ -305,6 +372,7 @@ 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');
         }
@@ -312,20 +380,14 @@ let PluginsService = PluginsService_1 = class PluginsService {
         if (!this.configService.customPluginPath || (0, node_os_1.platform)() === '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 +396,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 +440,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 +479,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 +503,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 +517,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 '';
             }
         }
@@ -491,30 +554,28 @@ let PluginsService = PluginsService_1 = class PluginsService {
             throw new common_1.NotFoundException();
         }
         const schemaPath = (0, node_path_1.resolve)(plugin.installPath, pluginName, 'config.schema.json');
+        if (!schemaPath.startsWith(plugin.installPath)) {
+            throw new common_1.BadRequestException('Invalid plugin path');
+        }
         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}`);
+            if (!dynamicSchemaPath.startsWith(this.configService.storagePath)) {
+                throw new common_1.BadRequestException('Invalid dynamic schema path');
+            }
+            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 +687,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 +757,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 +849,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 +885,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 +937,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 +947,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 +999,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 +1031,25 @@ let PluginsService = PluginsService_1 = class PluginsService {
             command.unshift('sudo', '-E', '-n');
         }
         else {
+            let npmInstallPath;
             try {
-                await (0, fs_extra_1.access)((0, node_path_1.resolve)(cwd, 'node_modules'), fs_extra_1.constants.W_OK);
+                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)(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 +1110,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 +1130,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 +1139,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 +1160,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}.`);
         }
     }
 };