Austin/BililiveRecorder
1
0
Fork 0
mirror of https://github.com/BililiveRecorder/BililiveRecorder.git synced 2024-11-16 11:42:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(core): support brotli compressed danmaku

Browse Source
This commit is contained in:
genteure 2023-08-25 00:26:19 +08:00
parent 3f150e30bd
commit c4c5aeb36a
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BililiveRecorder.Core/Api/Danmaku/DanmakuClient.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.Buffers; using System.Buffers;
using System.Buffers.Binary; using System.Buffers.Binary;
using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.IO.Pipelines; using System.IO.Pipelines;
using System.Net; using System.Net;
@ -221,7 +222,7 @@ namespace BililiveRecorder.Core.Api.Danmaku
{ {
uid, uid,
roomid, roomid,
protover = 0, protover = 3,
buvid, buvid,
platform = "web", platform = "web",
type = 2, type = 2,
@ -334,17 +335,28 @@ namespace BililiveRecorder.Core.Api.Danmaku
} }
if (header.Version == 2 && header.Action == 5) if (header.Version == 2 && header.Action == 5)
ParseCommandDeflateBody(ref bodySlice, callback); {
using var deflate = new DeflateStream(bodySlice.Slice(2, bodySlice.End).AsStream(), CompressionMode.Decompress, leaveOpen: false);
ParseCommandCompressedBody(deflate, callback);
}
else if (header.Version == 3 && header.Action == 5)
{
#if NET6_0_OR_GREATER
using var brotli = new BrotliStream(bodySlice.AsStream(), CompressionMode.Decompress, leaveOpen: false);
#else
using var brotli = new BrotliSharpLib.BrotliStream(bodySlice.AsStream(), CompressionMode.Decompress, leaveOpen: false);
#endif
ParseCommandCompressedBody(brotli, callback);
}
else else
ParseCommandNormalBody(ref bodySlice, header.Action, callback); ParseCommandNormalBody(ref bodySlice, header.Action, callback);
return true; return true;
} }
private static void ParseCommandDeflateBody(ref ReadOnlySequence<byte> buffer, Action<string> callback) private static void ParseCommandCompressedBody(Stream decompressed, Action<string> callback)
{ {
using var deflate = new DeflateStream(buffer.Slice(2, buffer.End).AsStream(), CompressionMode.Decompress, leaveOpen: false); var reader = PipeReader.Create(decompressed);
var reader = PipeReader.Create(deflate);
while (true) while (true)
{ {
#pragma warning disable VSTHRD002 // Avoid problematic synchronous waits #pragma warning disable VSTHRD002 // Avoid problematic synchronous waits

1
BililiveRecorder.Core/BililiveRecorder.Core.csproj
View File

@ -38,6 +38,7 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net472'"> <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<PackageReference Include="BrotliSharpLib" Version="0.3.3" />
</ItemGroup> </ItemGroup>
</Project> </Project>