Expand ServerScores includePattern parameter type to allow RegExp

EdgeApp · Apr 5, 2024 · aeced0f · aeced0f
1 parent ae63dfc
commit aeced0f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/common/plugin/PluginState.ts b/src/common/plugin/PluginState.ts
@@ -51,7 +51,7 @@ export interface PluginState {
   clearCache: () => Promise<void>
   getLocalServers: (
     numServersWanted: number,
-    includePatterns: string[]
+    includePatterns?: Array<string | RegExp>
   ) => string[]
   refreshServers: () => Promise<void>
   updateServers: (settings: UtxoUserSettings) => Promise<void>
@@ -209,7 +209,7 @@ export function makePluginState(settings: PluginStateSettings): PluginState {
 
     getLocalServers(
       numServersWanted: number,
-      includePatterns: string[] = []
+      includePatterns: Array<string | RegExp> = []
     ): string[] {
       return serverScores.getServers(
         knownServers,

diff --git a/src/common/plugin/ServerScores.ts b/src/common/plugin/ServerScores.ts
@@ -208,7 +208,7 @@ export class ServerScores {
   getServers(
     servers: ServerList,
     numServersWanted: number,
-    includePatterns: string[] = []
+    includePatterns: Array<string | RegExp> = []
   ): string[] {
     if (servers == null || Object.keys(servers).length === 0) {
       return []
@@ -236,7 +236,14 @@ export class ServerScores {
       const filter = (server: ServerInfo): boolean => {
         for (const pattern of includePatterns) {
           // make sure that the server URL starts with the required pattern
-          if (server.serverUrl.indexOf(pattern) === 0) return true
+          if (
+            typeof pattern === 'string' &&
+            server.serverUrl.indexOf(pattern) === 0
+          )
+            return true
+          // Or make sure that the server URL matches regex
+          if (pattern instanceof RegExp && pattern.test(server.serverUrl))
+            return true
         }
         return false
       }