From 9407b4f72c0efe2403784bbce7486d716357a53d Mon Sep 17 00:00:00 2001
From: cxfksword <718792+cxfksword@users.noreply.github.com>
Date: Sat, 27 Dec 2025 13:33:45 +0800
Subject: [PATCH] chore: limit request frequently

---
 Jellyfin.Plugin.Danmu.Test/BilibiliApiTest.cs | 20 +++++++++++++++++
 .../Scrapers/Bilibili/BilibiliApi.cs          |  2 ++
 .../Scrapers/Dandan/DandanApi.cs              | 22 ++++++-------------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/Jellyfin.Plugin.Danmu.Test/BilibiliApiTest.cs b/Jellyfin.Plugin.Danmu.Test/BilibiliApiTest.cs
index 1ba1e53..fa29737 100644
--- a/Jellyfin.Plugin.Danmu.Test/BilibiliApiTest.cs
+++ b/Jellyfin.Plugin.Danmu.Test/BilibiliApiTest.cs
@@ -144,6 +144,26 @@ namespace Jellyfin.Plugin.Danmu.Test
             }).GetAwaiter().GetResult();
         }
 
+        [TestMethod]
+        public void TestGetDanmuContentByCidAsync()
+        {
+            var _bilibiliApi = new BilibiliApi(loggerFactory);
+
+            Task.Run(async () =>
+            {
+                try
+                {
+                    var cid = 9708007;
+                    var result = await _bilibiliApi.GetDanmuContentByCidAsync(cid, CancellationToken.None);
+                    Console.WriteLine(result);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine(ex.Message);
+                }
+            }).GetAwaiter().GetResult();
+        }
+
         [TestMethod]
         public void TestGetDanmuContentByProtoAsync()
         {
diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs
index e5d9380..d50fcf0 100644
--- a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs
+++ b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs
@@ -151,6 +151,8 @@ public class BilibiliApi : AbstractApi
             throw new ArgumentNullException(nameof(cid));
         }
 
+        await this.LimitRequestFrequently();
+
         var url = $"https://api.bilibili.com/x/v1/dm/list.so?oid={cid}";
         using var response = await this.httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false);
         if (!response.IsSuccessStatusCode)
diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Dandan/DandanApi.cs b/Jellyfin.Plugin.Danmu/Scrapers/Dandan/DandanApi.cs
index c0ca24f..66c1ece 100644
--- a/Jellyfin.Plugin.Danmu/Scrapers/Dandan/DandanApi.cs
+++ b/Jellyfin.Plugin.Danmu/Scrapers/Dandan/DandanApi.cs
@@ -15,6 +15,8 @@ using Jellyfin.Plugin.Danmu.Configuration;
 using Jellyfin.Plugin.Danmu.Core.Extensions;
 using MediaBrowser.Controller.Entities;
 using System.IO;
+using RateLimiter;
+using ComposableAsync;
 
 namespace Jellyfin.Plugin.Danmu.Scrapers.Dandan;
 
@@ -22,6 +24,8 @@ public class DandanApi : AbstractApi
 {
     const string API_ID = "";
     const string API_SECRET = "";
+    private TimeLimiter _limitRequestConstraint = TimeLimiter.GetFromMaxCountByInterval(1, TimeSpan.FromMilliseconds(1000));
+    private TimeLimiter _downloadLimitConstraint = TimeLimiter.GetFromMaxCountByInterval(1, TimeSpan.FromSeconds(10));
     private static readonly object _lock = new object();
     private DateTime lastRequestTime = DateTime.Now.AddDays(-1);
 
@@ -220,7 +224,7 @@ public class DandanApi : AbstractApi
             throw new ArgumentNullException(nameof(epId));
         }
 
-        this.LimitRequestFrequently();
+        await this._downloadLimitConstraint;
 
         var withRelated = this.Config.WithRelatedDanmu ? "true" : "false";
         var chConvert = this.Config.ChConvert;
@@ -235,21 +239,9 @@ public class DandanApi : AbstractApi
         throw new Exception($"Request fail. epId={epId}");
     }
 
-    protected void LimitRequestFrequently(double intervalMilliseconds = 1000)
+    protected async Task LimitRequestFrequently(double intervalMilliseconds = 1000)
     {
-        var diff = 0;
-        lock (_lock)
-        {
-            var ts = DateTime.Now - lastRequestTime;
-            diff = (int)(intervalMilliseconds - ts.TotalMilliseconds);
-            lastRequestTime = DateTime.Now;
-        }
-
-        if (diff > 0)
-        {
-            this._logger.LogDebug("请求太频繁，等待{0}毫秒后继续执行...", diff);
-            Thread.Sleep(diff);
-        }
+        await this._limitRequestConstraint;
     }
 
     protected async Task<HttpResponseMessage> Request(string url, CancellationToken cancellationToken)