update plugin icons

package.json

@@ -109,8 +109,8 @@
     "@types/tar": "^6.1.10",
     "@types/tcp-port-used": "^1.0.4",
     "@types/unzipper": "^0.10.9",
-    "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^6.12.0",
+    "@typescript-eslint/eslint-plugin": "^6.13.0",
+    "@typescript-eslint/parser": "^6.13.0",
     "babel-jest": "^29.7.0",
     "concurrently": "^8.2.2",
     "eslint": "^8.54.0",

src/modules/plugins/plugins.service.ts

@@ -79,6 +79,11 @@ export class PluginsService {
 
   // verified plugins cache
   private verifiedPlugins: string[] = [];
+  private verifiedPluginsIcons: { [key: string]: string } = {};
+  private verifiedPluginsIconsPrefix = 'https://raw.githubusercontent.com/homebridge/verified/latest/';
+
+  private verifiedPluginsJson = 'https://raw.githubusercontent.com/homebridge/verified/latest/verified-plugins.json';
+  private verifiedPluginsIconsJson = 'https://raw.githubusercontent.com/homebridge/verified/latest/plugin-icons.json';
 
   // misc schemas
   private miscSchemas = {
@@ -293,6 +298,9 @@ export class PluginsService {
         plugin.links = pkg.package.links;
         plugin.author = (pkg.package.publisher) ? pkg.package.publisher.username : null;
         plugin.verifiedPlugin = this.verifiedPlugins.includes(pkg.package.name);
+        plugin.icon = this.verifiedPluginsIcons[pkg.package.name]
+          ? `${this.verifiedPluginsIconsPrefix}${this.verifiedPluginsIcons[pkg.package.name]}`
+          : null;
         return plugin;
       });
 
@@ -349,6 +357,7 @@ export class PluginsService {
         description: (pkg.description) ?
           pkg.description.replace(/(?:https?|ftp):\/\/[\n\S]+/g, '').trim() : pkg.name,
         verifiedPlugin: this.verifiedPlugins.includes(pkg.name),
+        icon: this.verifiedPluginsIcons[pkg.name],
       } as HomebridgePlugin;
 
       // it's not installed; finish building the response
@@ -363,6 +372,9 @@ export class PluginsService {
       };
       plugin.author = (pkg.maintainers.length) ? pkg.maintainers[0].name : null;
       plugin.verifiedPlugin = this.verifiedPlugins.includes(pkg.name);
+      plugin.icon = this.verifiedPluginsIcons[pkg.name]
+        ? `${this.verifiedPluginsIconsPrefix}${this.verifiedPluginsIcons[pkg.name]}`
+        : null;
 
       return [plugin];
     } catch (e) {
@@ -1201,6 +1213,9 @@ export class PluginsService {
       description: (pjson.description) ?
         pjson.description.replace(/(?:https?|ftp):\/\/[\n\S]+/g, '').trim() : pjson.name,
       verifiedPlugin: this.verifiedPlugins.includes(pjson.name),
+      icon: this.verifiedPluginsIcons[pjson.name]
+        ? `${this.verifiedPluginsIconsPrefix}${this.verifiedPluginsIcons[pjson.name]}`
+        : null,
       installedVersion: installPath ? (pjson.version || '0.0.1') : null,
       globalInstall: (installPath !== this.configService.customPluginPath),
       settingsSchema: await pathExists(resolve(installPath, pjson.name, 'config.schema.json')) || this.miscSchemas[pjson.name],
@@ -1474,7 +1489,13 @@ export class PluginsService {
     clearTimeout(this.verifiedPluginsRetryTimeout);
     try {
       this.verifiedPlugins = (
-        await this.httpService.get('https://raw.githubusercontent.com/homebridge/verified/latest/verified-plugins.json', {
+        await this.httpService.get(this.verifiedPluginsJson, {
+          httpsAgent: null,
+        }).toPromise()
+      ).data;
+
+      this.verifiedPluginsIcons = (
+        await this.httpService.get(this.verifiedPluginsIconsJson, {
           httpsAgent: null,
         }).toPromise()
       ).data;

src/modules/plugins/types.d.ts

@@ -4,6 +4,7 @@ export interface HomebridgePlugin {
   displayName?: string;
   description?: string;
   verifiedPlugin?: boolean;
+  icon?: string;
   publicPackage?: boolean;
   installedVersion?: string;
   latestVersion?: string;

ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts

@@ -65,10 +65,9 @@ export class PluginCardComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.plugin.icon = this.plugin.verifiedPlugin && this.plugin?.links?.homepage
-      ? `${this.plugin.links.homepage.split('#')[0]}/latest/branding/icon.png`
-        .replace('github.com', 'raw.githubusercontent.com')
-      : this.defaultIcon;
+    if (!this.plugin.icon) {
+      this.plugin.icon = this.defaultIcon;
+    }
 
     if (
       this.plugin.installedVersion