feat: 增加 IPv4/6 自适应逻辑

Author: ArgoZhang

src/components/BootstrapBlazor.IP2Region/Services/IP2RegionService.cs

@@ -1,10 +1,13 @@
-// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
+using IP2Region.Net.Abstractions;
 using IP2Region.Net.XDB;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using System.Collections.Concurrent;
+using System.Net;
 
 namespace BootstrapBlazor.Components;
 
@@ -24,51 +27,64 @@ public IP2RegionService(IOptions<BootstrapBlazorOptions> options, IOptions<IP2Re
         _options = options;
         _ipOptions = ipRegionOptions;
         _logger = logger;
-
-        Task.Run(InitSearch, CancellationToken.None).ConfigureAwait(false);
     }
 
     private readonly IOptions<BootstrapBlazorOptions> _options;
     private readonly IOptions<IP2RegionOptions> _ipOptions;
     private readonly ILogger<IP2RegionService> _logger;
     private readonly TaskCompletionSource _tcs = new();
-    private Searcher? _search;
+    private ConcurrentDictionary<string, ISearcher?> _searchCache = [];
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
     /// <param name="ip"></param>
-    protected override async Task<string?> LocateByIp(string ip)
+    protected override Task<string?> LocateByIp(string ip)
     {
-        await _tcs.Task;
-
         string? result = null;
-        if (_search != null && _options.Value.WebClientOptions.EnableIpLocator)
+        if (_options.Value.WebClientOptions.EnableIpLocator && IPAddress.TryParse(ip, out var address))
         {
-            result = _search.Search(ip);
+            ISearcher? searcher = null;
+            if (address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+            {
+                searcher = CreateSearcher("ip2region_v4.xdb");
+            }
+            else if (address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetworkV6)
+            {
+                searcher = CreateSearcher("ip2region_v6.xdb");
+            }
+            result = searcher?.Search(ip);
         }
-        return result;
+        return Task.FromResult(result);
     }
 
-    private void InitSearch()
+    private ISearcher? CreateSearcher(string xdbFile) => _searchCache.GetOrAdd(xdbFile, key =>
     {
-        var xdbPath = _ipOptions.Value.XdbPath ?? Path.Combine(AppContext.BaseDirectory, "ip2region", "ip2region.xdb");
+        var xdbPath = _ipOptions.Value.XdbPath ?? Path.Combine(AppContext.BaseDirectory, "ip2region", xdbFile);
         if (!File.Exists(xdbPath))
         {
             _logger.LogWarning("IP2Region xdb file not found, please check the file path: {dbPath}", xdbPath);
-            return;
+            return null;
         }
 
+        ISearcher? searcher = null;
         try
         {
-            _search = new Searcher(CachePolicy.Content, xdbPath);
-            _logger.LogInformation("IP2Region xdb file {dbPath} loaded", xdbPath);
+            var cachePolicy = _ipOptions.Value.CachePolicy;
+            searcher = new Searcher(cachePolicy, xdbPath);
+
+            if (_logger.IsEnabled(LogLevel.Information))
+            {
+                _logger.LogInformation("IP2Region xdb file {dbPath} loaded", xdbPath);
+            }
             _tcs.TrySetResult();
         }
         catch (Exception ex)
         {
             _tcs.TrySetException(ex);
             _logger.LogError(ex, "IP2Region xdb file path: {dbPath}", xdbPath);
         }
-    }
+
+        return searcher;
+    });
 }