Feat: New Apis

.github/workflows/nativeaot-test.yml

@@ -26,10 +26,10 @@ jobs:
             ${{ secrets.NETEASE_LOGIN_SECRET }}
 
       - name: Restore
-        run: dotnet restore -r linux-x64 -p:TargetFramework=net9.0
+        run: dotnet restore -r linux-x64 -p:TargetFramework=net10.0 -p:RuntimeIdentifier=linux-x64
 
       - name: Publish with AOT
-        run: dotnet publish -c Release -f net9.0 -r linux-x64 --no-restore
+        run: dotnet publish -c Release -f net10.0 -r linux-x64 --no-restore
 
       - name: Run AOT tests
-        run: ./HyPlayer.NeteaseProvider.Tests/bin/Release/net9.0/linux-x64/publish/HyPlayer.NeteaseProvider.Tests
+        run: ./HyPlayer.NeteaseProvider.Tests/bin/Release/net10.0/linux-x64/publish/HyPlayer.NeteaseProvider.Tests

EasyDumper/EasyDumper.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>

HyPlayer.NeteaseApi/ApiContracts/Album/AlbumApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.Album;
+using HyPlayer.NeteaseApi.ApiContracts.Album;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models;

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistSongsApi.cs

@@ -23,7 +23,7 @@ public class ArtistSongsApi : EApiContractBase<ArtistSongsRequest, ArtistSongsRe
         ArtistSongsActualRequest>
     {
         public override string IdentifyRoute => "/artist/songs";
-        public override string Url { get; protected set; } = "https://interface3.music.163.com/eapi/v2/artist/songs";
+        public override string Url { get; protected set; } = "https://interfacepc.music.163.com/eapi/v2/artist/songs";
         public override HttpMethod Method => HttpMethod.Post;
 
         public override Task MapRequest(ApiHandlerOption option)
@@ -32,19 +32,6 @@ public override Task MapRequest(ApiHandlerOption option)
                 ActualRequest = new ArtistSongsActualRequest
                 {
                     Id = Request.ArtistId,
-                    OrderType = Request.OrderType switch
-                    {
-                        ArtistSongsOrderType.Time => "time",
-                        _ => "hot"
-                    },
-                    WorkType = Request.WorkType switch
-                    {
-                        ArtistSongsWorkType.All => 1,
-                        ArtistSongsWorkType.Sing => 5,
-                        ArtistSongsWorkType.Lyric => 6,
-                        ArtistSongsWorkType.Compose => 7,
-                        _ => 1
-                    },
                     Offset = Request.Offset,
                     Limit = Request.Limit
                 };
@@ -57,44 +44,17 @@ public override Task MapRequest(ApiHandlerOption option)
     public class ArtistSongsActualRequest : EApiActualRequestBase
     {
         [JsonPropertyName("id")] public required string Id { get; set; }
-        [JsonPropertyName("private_cloud")] public bool PrivateCloud => true;
-        [JsonPropertyName("work_type")] public int WorkType = 1;
-        [JsonPropertyName("order")] public string OrderType { get; set; } = "hot";
         [JsonPropertyName("offset")] public int Offset { get; set; } = 0;
         [JsonPropertyName("limit")] public int Limit { get; set; } = 100;
     }
 
-    public enum ArtistSongsOrderType
-    {
-        Hot,
-        Time
-    }
-
-    public enum ArtistSongsWorkType
-    {
-        All,
-        Sing,
-        Lyric,
-        Compose
-    }
-
     public class ArtistSongsRequest : RequestBase
     {
         /// <summary>
         /// 歌手 ID
         /// </summary>
         public required string ArtistId { get; set; }
 
-        /// <summary>
-        /// 排序类型 hot, time
-        /// </summary>
-        public ArtistSongsOrderType OrderType { get; set; } = ArtistSongsOrderType.Hot;
-
-        /// <summary>
-        ///作品类型
-        /// </summary>
-        public ArtistSongsWorkType WorkType { get; set; } = ArtistSongsWorkType.All;
-
         /// <summary>
         /// 起始位置
         /// </summary>
@@ -110,6 +70,6 @@ public class ArtistSongsResponse : CodedResponseBase
     {
         [JsonPropertyName("total")] public int Total { get; set; }
         [JsonPropertyName("more")] public bool HasMore { get; set; }
-        [JsonPropertyName("songs")] public EmittedSongDtoWithPrivilege[]? Songs { get; set; }
+        [JsonPropertyName("songs")] public ArtistSongDto[]? Songs { get; set; }
     }
 }

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistSublistApi.cs

@@ -1,7 +1,7 @@
 using HyPlayer.NeteaseApi.ApiContracts.Artist;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
+using HyPlayer.NeteaseApi.Bases.ApiContractBases;
 using System.Text.Json.Serialization;
 using HyPlayer.NeteaseApi.Bases.WeApiContractBases;
 

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistSubscribeApi.cs

@@ -0,0 +1,56 @@
+using HyPlayer.NeteaseApi.ApiContracts.Artist;
+using HyPlayer.NeteaseApi.Bases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
+using System.Text.Json.Serialization;
+
+namespace HyPlayer.NeteaseApi.ApiContracts
+{
+    public static partial class NeteaseApis
+    {
+        /// <summary>
+        /// 艺术家收藏
+        /// </summary>
+        public static ArtistSubscribeApi ArtistSubscribeApi => new();
+    }
+}
+
+namespace HyPlayer.NeteaseApi.ApiContracts.Artist
+{
+    public class ArtistSubscribeApi : EApiContractBase<ArtistSubscribeRequest, ArtistSubscribeResponse, ErrorResultBase,
+        ArtistSubscribeActualRequest>, IFakeCheckTokenApi
+    {
+        public override string ApiPath { get; protected set; } = "/api/artist/sub";
+
+        public override string IdentifyRoute => "/artist/subscribe";
+
+        public override string Url { get; protected set; } = "https://interface.music.163.com/eapi/artist/sub";
+
+        public override HttpMethod Method => HttpMethod.Post;
+
+        public override Task MapRequest(ApiHandlerOption option)
+        {
+            if (Request is not null)
+            {
+                ActualRequest = new ArtistSubscribeActualRequest
+                {
+                    ArtistId = Request.ArtistId
+                };
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    public class ArtistSubscribeRequest : RequestBase
+    {
+        public required string ArtistId { get; set; }
+    }
+
+    public class ArtistSubscribeResponse : CodedResponseBase
+    {
+    }
+
+    public class ArtistSubscribeActualRequest : EApiActualRequestBase
+    {
+        [JsonPropertyName("artistId")] public required string ArtistId { get; set; }
+    }
+}

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistTopSongApi.cs

@@ -95,4 +95,17 @@ public class ArtistTopSongActualRequest : EApiActualRequestBase
         [JsonPropertyName("offset")] public int Offset { get; set; } = 0;
         [JsonPropertyName("limit")] public int Limit { get; set; } = 100;
     }
+    public enum ArtistSongsOrderType
+    {
+        Hot,
+        Time
+    }
+
+    public enum ArtistSongsWorkType
+    {
+        All,
+        Sing,
+        Lyric,
+        Compose
+    }
 }

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistUnsubscribeApi.cs

@@ -0,0 +1,59 @@
+using HyPlayer.NeteaseApi.Bases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using HyPlayer.NeteaseApi.ApiContracts.Artist;
+
+namespace HyPlayer.NeteaseApi.ApiContracts
+{
+    public static partial class NeteaseApis
+    {
+        public static ArtistUnsubscribeApi ArtistUnsubscribeApi => new();
+    }
+}
+
+namespace HyPlayer.NeteaseApi.ApiContracts.Artist
+{
+    public class ArtistUnsubscribeApi : EApiContractBase<ArtistUnsubscribeRequest, ArtistUnsubscribeResponse, ErrorResultBase,
+        ArtistUnsubscribeActualRequest>
+    {
+        public override string ApiPath { get; protected set; } = "/api/artist/unsub";
+
+        public override string IdentifyRoute => "/artist/unsub";
+
+        public override string Url { get; protected set; } = "https://interface.music.163.com/eapi/artist/";
+
+        public override HttpMethod Method => HttpMethod.Post;
+
+        public override Task MapRequest(ApiHandlerOption option)
+        {
+            if (Request is not null)
+            {
+                ActualRequest = new ArtistUnsubscribeActualRequest
+                {
+                    // serialize C# array of ids to JSON array string expected by the API
+                    ArtistIds = JsonSerializer.Serialize(Request.ArtistIds)
+                };
+                Url += "unsub";
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    public class ArtistUnsubscribeRequest : RequestBase
+    {
+        /// <summary>
+        /// Array of artist ids. Will be converted to a JSON array string in the request, e.g. new long[] { 35374786 } -> "[35374786]"
+        /// </summary>
+        public required long[] ArtistIds { get; set; }
+    }
+
+    public class ArtistUnsubscribeResponse : CodedResponseBase
+    {
+    }
+
+    public class ArtistUnsubscribeActualRequest : EApiActualRequestBase
+    {
+        [JsonPropertyName("artistIds")] public required string ArtistIds { get; set; }
+    }
+}

HyPlayer.NeteaseApi/ApiContracts/Cloud/NeteaseUploadLoadBalancerGetApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.Cloud;
+using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.RawApiContractBases;
 using System.Text.Json.Serialization;

HyPlayer.NeteaseApi/ApiContracts/Comment/CommentLikeApi.cs

@@ -1,8 +1,8 @@
 using HyPlayer.NeteaseApi.ApiContracts.Comment;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
 using HyPlayer.NeteaseApi.Extensions;
 using HyPlayer.NeteaseApi.Models;
+using HyPlayer.NeteaseApi.Bases.ApiContractBases;
 using System.Text.Json.Serialization;
 using HyPlayer.NeteaseApi.Bases.WeApiContractBases;
 

HyPlayer.NeteaseApi/ApiContracts/DjChannel/DjChannelSubscribeApi.cs

@@ -0,0 +1,55 @@
+using HyPlayer.NeteaseApi.Bases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
+using System.Text.Json.Serialization;
+using HyPlayer.NeteaseApi.ApiContracts.DjChannel;
+
+namespace HyPlayer.NeteaseApi.ApiContracts
+{
+    public static partial class NeteaseApis
+    {
+        public static DjChannelSubscribeApi DjChannelSubscribeApi => new();
+    }
+}
+
+namespace HyPlayer.NeteaseApi.ApiContracts.DjChannel
+{
+    public class DjChannelSubscribeApi : EApiContractBase<DjChannelSubscribeRequest, DjChannelSubscribeResponse, ErrorResultBase, DjChannelSubscribeActualRequest>
+    {
+        public override string ApiPath { get; protected set; } = " /api/djradio/sub";
+
+        public override string IdentifyRoute => "/djchannel/subscribe";
+
+        public override string Url { get; protected set; } = "https://interface.music.163.com/eapi/djradio/";
+
+        public override HttpMethod Method => HttpMethod.Post;
+
+        public override Task MapRequest(ApiHandlerOption option)
+        {
+            if (Request is not null)
+            {
+                ActualRequest = new DjChannelSubscribeActualRequest
+                {
+                    Id = Request.Id
+                };
+                Url += Request.IsSubscribe ? "sub" : "unsub";
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+
+    public class DjChannelSubscribeActualRequest : EApiActualRequestBase
+    {
+        [JsonPropertyName("id")] public required string Id { get; set; }
+    }
+
+    public class DjChannelSubscribeResponse : CodedResponseBase
+    {
+    }
+
+    public class DjChannelSubscribeRequest : RequestBase
+    {
+        public required string Id { get; set; }
+        public bool IsSubscribe { get; set; }
+    }
+}

HyPlayer.NeteaseApi/ApiContracts/ListenTogether/Dual/ListenTogetherEndApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.ListenTogether.Dual;
+using HyPlayer.NeteaseApi.ApiContracts.ListenTogether.Dual;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;

HyPlayer.NeteaseApi/ApiContracts/ListenTogether/Dual/ListenTogetherHeartbeatApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.ListenTogether.Dual;
+using HyPlayer.NeteaseApi.ApiContracts.ListenTogether.Dual;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;

HyPlayer.NeteaseApi/ApiContracts/ListenTogether/Dual/ListenTogetherInvitationAcceptApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
+using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
 using HyPlayer.NeteaseApi.ApiContracts.ListenTogether.Dual;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;

HyPlayer.NeteaseApi/ApiContracts/ListenTogether/Dual/ListenTogetherPlayCommandApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
+using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
 using HyPlayer.NeteaseApi.ApiContracts.ListenTogether.Dual;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;

HyPlayer.NeteaseApi/ApiContracts/ListenTogether/Dual/ListenTogetherRoomCheckApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
+using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;

HyPlayer.NeteaseApi/ApiContracts/ListenTogether/Dual/ListenTogetherRoomCreate.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.ListenTogether.Dual;
+using HyPlayer.NeteaseApi.ApiContracts.ListenTogether.Dual;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;

HyPlayer.NeteaseApi/ApiContracts/ListenTogether/Dual/ListenTogetherStatusApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
+using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
 using HyPlayer.NeteaseApi.ApiContracts.ListenTogether.Dual;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;

HyPlayer.NeteaseApi/ApiContracts/ListenTogether/Dual/ListenTogetherSyncListCommandApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
+using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json;

HyPlayer.NeteaseApi/ApiContracts/ListenTogether/Dual/ListenTogetherSyncListGetApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
+using HyPlayer.NeteaseApi.ApiContracts.ListenTogether;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;

HyPlayer.NeteaseApi/ApiContracts/PersonalFM/AiDjContentRcmdInfo.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.PersonalFM;
+using HyPlayer.NeteaseApi.ApiContracts.PersonalFM;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;

HyPlayer.NeteaseApi/ApiContracts/PersonalFM/PersonalFmTrashApi.cs

@@ -1,4 +1,4 @@
-using HyPlayer.NeteaseApi.ApiContracts.PersonalFM;
+using HyPlayer.NeteaseApi.ApiContracts.PersonalFM;
 using HyPlayer.NeteaseApi.Bases;
 using HyPlayer.NeteaseApi.Bases.ApiContractBases;
 using System.Text.Json.Serialization;