feat(IP2Region): support IPv6 locate (#921)

* chore: 更新数据文件增加 IPv6 数据

* chore: 更新依赖到最新

* feat: 增加 CachePolicy 配置项

* chore: 更新数据包拷贝脚本

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

Author: ArgoZhang

src/components/BootstrapBlazor.IP2Region/BootstrapBlazor.IP2Region.csproj

@@ -1,18 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
+  <PropertyGroup>
+    <Version>10.0.1</Version>
+  </PropertyGroup>
+
   <PropertyGroup>
     <PackageTags>Bootstrap Blazor WebAssembly wasm UI Components Ip Region</PackageTags>
     <Description>Bootstrap UI components extensions of IP2Region.NET</Description>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="Build\*.targets" PackagePath="build\" />
-    <Content Include="Data\ip2region.xdb" PackagePath="contentFiles\ip2region.xdb" />
+    <Content Include="Data\ip2region_v4.xdb" PackagePath="contentFiles\ip2region_v4.xdb" />
+    <Content Include="Data\ip2region_v6.xdb" PackagePath="contentFiles\ip2region_v6.xdb" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="BootstrapBlazor" Version="$(BBVersion)" />
-    <PackageReference Include="IP2Region.Net" Version="2.0.2" />
+    <PackageReference Include="IP2Region.Net" Version="3.0.1" />
   </ItemGroup>
 
 </Project>

src/components/BootstrapBlazor.IP2Region/Build/BootstrapBlazor.IP2Region.targets

@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup>
-    <IP2RegionFiles Include="$(MSBuildThisFileDirectory)/../contentFiles/ip2region.xdb"/>
+    <IP2RegionFiles Include="$(MSBuildThisFileDirectory)/../contentFiles/ip2region_v*.xdb"/>
   </ItemGroup>
 
   <Target Name="IP2RegionCopyFilesAfterBuild" AfterTargets="Build">

…strapBlazor.IP2Region/Data/ip2region.xdb …apBlazor.IP2Region/Data/ip2region_v4.xdbsrc/components/BootstrapBlazor.IP2Region/Data/ip2region.xdb renamed to src/components/BootstrapBlazor.IP2Region/Data/ip2region_v4.xdb src/components/BootstrapBlazor.IP2Region/Data/ip2region.xdb renamed to src/components/BootstrapBlazor.IP2Region/Data/ip2region_v4.xdb

@@ -1,4 +1,4 @@
-// Copyright (c) BootstrapBlazor & Argo Zhang (argo@live.ca). All rights reserved.
+// Copyright (c) BootstrapBlazor & Argo Zhang (argo@live.ca). 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/
 
@@ -15,14 +15,19 @@ public static class ServiceCollectionExtensions
     /// 添加 IP2RegionService 服务
     /// </summary>
     /// <param name="services"></param>
-    public static IServiceCollection AddBootstrapBlazorIP2RegionService(this IServiceCollection services)
+    /// <param name="configureOptions"></param>
+    public static IServiceCollection AddBootstrapBlazorIP2RegionService(this IServiceCollection services, Action<IP2RegionOptions>? configureOptions = null)
     {
         services.AddSingleton<IIpLocatorProvider, IP2RegionService>();
 #if NET8_0_OR_GREATER
         services.AddKeyedSingleton<IIpLocatorProvider, IP2RegionService>("BootstrapBlazor.IP2Region");
 #endif
 
         services.AddOptionsMonitor<IP2RegionOptions>();
+        services.Configure<IP2RegionOptions>(options =>
+        {
+            configureOptions?.Invoke(options);
+        });
         return services;
     }
 }

src/components/BootstrapBlazor.IP2Region/Data/ip2region_v6.xdb

@@ -1,7 +1,9 @@
-// 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.XDB;
+
 namespace BootstrapBlazor.Components;
 
 /// <summary>
@@ -13,4 +15,9 @@ public class IP2RegionOptions
     /// 获取/设置 IP2Region 数据文件路径
     /// </summary>
     public string? XdbPath { get; set; }
+
+    /// <summary>
+    /// 获得/设置 缓存策略 默认 <see cref="CachePolicy.Content"/>
+    /// </summary>
+    public CachePolicy CachePolicy { get; set; } = CachePolicy.Content;
 }

src/components/BootstrapBlazor.IP2Region/Extensions/ServiceCollectionExtensions.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;
+    });
 }