Merge branch 'develop'

src/Bilibili.AspNetCore.Apis/Bilibili.AspNetCore.Apis.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>disable</ImplicitUsings>
+		<Nullable>disable</Nullable>
+		<Version>4.0.2</Version>
+		<Description>Bilibili API封装。</Description>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.2.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+		<PackageReference Include="SkiaSharp.QrCode" Version="0.7.0" />
+		<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
+	</ItemGroup>
+
+</Project>

src/Bilibili.AspNetCore.Apis/Constants/CacheKeyConstant.cs

@@ -0,0 +1,9 @@
+namespace Bilibili.AspNetCore.Apis.Constants
+{
+    class CacheKeyConstant
+    {
+        public const string COOKIE_KEY = "COOKIE_KEY";
+
+        public const string LOGIN_STATUS_CACHE_KEY = "PAGE_STATUS_CACHE_KEY";
+    }
+}

src/BilibiliAutoLiver/DependencyInjection/RegisteBilibiliServices.cs → src/Bilibili.AspNetCore.Apis/DependencyInjection/RegisteBilibiliApis.cs

@@ -1,23 +1,21 @@
-using BilibiliAutoLiver.Services;
-using BilibiliAutoLiver.Services.Interface;
+using Bilibili.AspNetCore.Apis.Interface;
+using Bilibili.AspNetCore.Apis.Services;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace BilibiliAutoLiver.DependencyInjection
+namespace Bilibili.AspNetCore.Apis.DependencyInjection
 {
-    public static class RegisteBilibiliServices
+    public static class RegisteBilibiliApis
     {
-        public static IServiceCollection AddBilibiliServices(this IServiceCollection services)
+        public static IServiceCollection AddBilibiliApis(this IServiceCollection services)
         {
             //Cookie模块
             services.AddSingleton<IBilibiliCookieService, BilibiliCookieService>();
             //Http请求相关
             services.AddTransient<IHttpClientService, HttpClientService>();
             //账号
-            services.AddTransient<IBilibiliAccountService, BilibiliAccountService>();
+            services.AddTransient<IBilibiliAccountApiService, BilibiliAccountApiService>();
             //直播的API
             services.AddTransient<IBilibiliLiveApiService, BilibiliLiveApiService>();
-            //推流相关
-            services.AddTransient<IPushStreamServiceV1, PushStreamServiceV1>();
 
             return services;
         }

src/BilibiliAutoLiver/Exceptions/ApiRequestException.cs → src/Bilibili.AspNetCore.Apis/Exceptions/ApiRequestException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Net.Http;
 
-namespace BilibiliAutoLiver.Exceptions
+namespace Bilibili.AspNetCore.Apis.Exceptions
 {
     public class ApiRequestException : Exception
     {

src/BilibiliAutoLiver/Exceptions/CookieException.cs → src/Bilibili.AspNetCore.Apis/Exceptions/CookieException.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BilibiliAutoLiver.Exceptions
+namespace Bilibili.AspNetCore.Apis.Exceptions
 {
     public class CookieException : Exception
     {

src/BilibiliAutoLiver/Exceptions/CookieExpiredException.cs → src/Bilibili.AspNetCore.Apis/Exceptions/CookieExpiredException.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BilibiliAutoLiver.Exceptions
+namespace Bilibili.AspNetCore.Apis.Exceptions
 {
     public class CookieExpiredException : Exception
     {

src/BilibiliAutoLiver/Services/Interface/IBilibiliAccountService.cs → src/Bilibili.AspNetCore.Apis/Interface/IBilibiliAccountApiService.cs

@@ -1,10 +1,10 @@
-using BilibiliAutoLiver.Models;
-using BilibiliAutoLiver.Models.Base;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using Bilibili.AspNetCore.Apis.Models;
+using Bilibili.AspNetCore.Apis.Models.Base;
 
-namespace BilibiliAutoLiver.Services.Interface
+namespace Bilibili.AspNetCore.Apis.Interface
 {
-    public interface IBilibiliAccountService
+    public interface IBilibiliAccountApiService
     {
         /// <summary>
         /// 获取用户信息
@@ -24,6 +24,14 @@ public interface IBilibiliAccountService
         /// <returns></returns>
         Task<UserInfo> LoginByQrCode();
 
+        /// <summary>
+        /// 尝试获取二维码扫描登录状态
+        /// 如果能获取到，表示正在进行二维码扫码登录
+        /// </summary>
+        /// <param name="loginStatus"></param>
+        /// <returns></returns>
+        bool TryGetQrCodeLoginStatus(out QrCodeLoginStatus loginStatus);
+
         /// <summary>
         /// 生成登录二维码
         /// </summary>

src/BilibiliAutoLiver/Services/Interface/IBilibiliCookieService.cs → src/Bilibili.AspNetCore.Apis/Interface/IBilibiliCookieService.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using BilibiliAutoLiver.Config;
+using Bilibili.AspNetCore.Apis.Models;
 
-namespace BilibiliAutoLiver.Services.Interface
+namespace Bilibili.AspNetCore.Apis.Interface
 {
     public interface IBilibiliCookieService
     {

src/BilibiliAutoLiver/Services/Interface/IBilibiliLiveApiService.cs → src/Bilibili.AspNetCore.Apis/Interface/IBilibiliLiveApiService.cs

@@ -1,8 +1,8 @@
-using BilibiliAutoLiver.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using Bilibili.AspNetCore.Apis.Models;
 
-namespace BilibiliAutoLiver.Services.Interface
+namespace Bilibili.AspNetCore.Apis.Interface
 {
     public interface IBilibiliLiveApiService
     {

src/BilibiliAutoLiver/Services/Interface/IHttpClientService.cs → src/Bilibili.AspNetCore.Apis/Interface/IHttpClientService.cs

@@ -1,9 +1,9 @@
-using BilibiliAutoLiver.Models.Base;
-using BilibiliAutoLiver.Models.Enums;
-using System.Net.Http;
+using System.Net.Http;
 using System.Threading.Tasks;
+using Bilibili.AspNetCore.Apis.Models.Base;
+using Bilibili.AspNetCore.Apis.Models.Enums;
 
-namespace BilibiliAutoLiver.Services.Interface
+namespace Bilibili.AspNetCore.Apis.Interface
 {
     public interface IHttpClientService
     {

src/BilibiliAutoLiver/Models/Base/ResultModel.cs → src/Bilibili.AspNetCore.Apis/Models/Base/ResultModel.cs

@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
 using System.Net.Http.Headers;
 
-namespace BilibiliAutoLiver.Models.Base
+namespace Bilibili.AspNetCore.Apis.Models.Base
 {
     public class ResultModel<T> where T : class
     {

src/Bilibili.AspNetCore.Apis/Models/ConfirmRefreshModel.cs

@@ -0,0 +1,8 @@
+namespace Bilibili.AspNetCore.Apis.Models
+{
+    public class ConfirmRefreshModel
+    {
+        public string csrf { get; set; }
+        public string refresh_token { get; set; }
+    }
+}

src/Bilibili.AspNetCore.Apis/Models/CookieInfo.cs

@@ -0,0 +1,9 @@
+namespace Bilibili.AspNetCore.Apis.Models
+{
+    public class CookieInfo
+    {
+        public bool refresh { get; set; }
+
+        public long timestamp { get; set; }
+    }
+}

src/BilibiliAutoLiver/Config/CookiesConfig.cs → src/Bilibili.AspNetCore.Apis/Models/CookiesConfig.cs

@@ -2,11 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
 
-namespace BilibiliAutoLiver.Config
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class CookiesConfig
     {

src/BilibiliAutoLiver/Config/CookiesJson.cs → src/Bilibili.AspNetCore.Apis/Models/CookiesJson.cs

@@ -2,11 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
 
-namespace BilibiliAutoLiver.Config
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class CookiesJson
     {

src/BilibiliAutoLiver/Models/Enums/BodyFormat.cs → src/Bilibili.AspNetCore.Apis/Models/Enums/BodyFormat.cs

@@ -1,4 +1,4 @@
-namespace BilibiliAutoLiver.Models.Enums
+namespace Bilibili.AspNetCore.Apis.Models.Enums
 {
     public enum BodyFormat
     {

src/BilibiliAutoLiver/Models/HeartBeat.cs → src/Bilibili.AspNetCore.Apis/Models/HeartBeat.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class HeartBeat
     {

src/BilibiliAutoLiver/Models/LiveAreaItem.cs → src/Bilibili.AspNetCore.Apis/Models/LiveAreaItem.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class LiveAreaItem
     {

src/BilibiliAutoLiver/Models/LiveRoomInfo.cs → src/Bilibili.AspNetCore.Apis/Models/LiveRoomInfo.cs

@@ -1,4 +1,4 @@
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class LiveRoomInfo
     {

src/BilibiliAutoLiver/Models/ProtocolsItem.cs → src/Bilibili.AspNetCore.Apis/Models/ProtocolsItem.cs

@@ -1,4 +1,4 @@
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class ProtocolsItem
     {

src/BilibiliAutoLiver/Models/LoginStatusCacheInfo.cs → src/Bilibili.AspNetCore.Apis/Models/QrCodeLoginStatus.cs

@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
-    public class LoginStatusCacheInfo
+    public class QrCodeLoginStatus
     {
         public bool IsLogged { get; set; }
 

src/BilibiliAutoLiver/Models/QrCodeScanResult.cs → src/Bilibili.AspNetCore.Apis/Models/QrCodeScanResult.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class QrCodeScanResult
     {

src/Bilibili.AspNetCore.Apis/Models/QrCodeUrl.cs

@@ -0,0 +1,25 @@
+using System;
+using System.IO;
+using SkiaSharp;
+using SkiaSharp.QrCode.Image;
+
+namespace Bilibili.AspNetCore.Apis.Models
+{
+    public class QrCodeUrl
+    {
+        public string qrcode_key { get; set; }
+
+        public string url { get; set; }
+
+        public byte[] GetBytes()
+        {
+            if (string.IsNullOrWhiteSpace(this.url)) throw new ArgumentNullException("url");
+            var qrCode = new SkiaSharp.QrCode.Image.QrCode(this.url, new Vector2Slim(512, 512), SKEncodedImageFormat.Png);
+            using (MemoryStream ms = new MemoryStream())
+            {
+                qrCode.GenerateImage(ms, true, SkiaSharp.QrCode.ECCLevel.M);
+                return ms.ToArray();
+            }
+        }
+    }
+}

src/BilibiliAutoLiver/Models/RefreshCookieModel.cs → src/Bilibili.AspNetCore.Apis/Models/RefreshCookieModel.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class RefreshCookieModel
     {

src/BilibiliAutoLiver/Models/RefreshCookieResult.cs → src/Bilibili.AspNetCore.Apis/Models/RefreshCookieResult.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class RefreshCookieResult
     {

src/BilibiliAutoLiver/Models/RoomPlayInfo.cs → src/Bilibili.AspNetCore.Apis/Models/RoomPlayInfo.cs

@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class RoomPlayInfo
     {

src/BilibiliAutoLiver/Models/Rtmp.cs → src/Bilibili.AspNetCore.Apis/Models/Rtmp.cs

@@ -1,4 +1,4 @@
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class Rtmp
     {

src/BilibiliAutoLiver/Models/StartLiveInfo.cs → src/Bilibili.AspNetCore.Apis/Models/StartLiveInfo.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     public class StartLiveInfo
     {

src/Bilibili.AspNetCore.Apis/Models/StopLiveInfo.cs

@@ -0,0 +1,9 @@
+namespace Bilibili.AspNetCore.Apis.Models
+{
+    public class StopLiveInfo
+    {
+        public int change { get; set; }
+
+        public string status { get; set; }
+    }
+}

src/BilibiliAutoLiver/Models/UserInfo.cs → src/Bilibili.AspNetCore.Apis/Models/UserInfo.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace BilibiliAutoLiver.Models
+namespace Bilibili.AspNetCore.Apis.Models
 {
     /// <summary>
     /// 账户信息