[Core] lazy initialization of streams (#308)

CrackTC · web-flow · commit e55ed7920306 · 2024-04-13T12:05:38.000+08:00
diff --git a/Lagrange.Core/Internal/Context/Uploader/ImageUploader.cs b/Lagrange.Core/Internal/Context/Uploader/ImageUploader.cs
@@ -32,17 +32,17 @@ public async Task UploadPrivate(ContextCollection context, MessageChain chain, I
                 };
                 var extStream = extend.Serialize();
 
-                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1003, image.ImageStream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
+                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1003, image.ImageStream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
                 if (!hwSuccess)
                 {
-                    await image.ImageStream.DisposeAsync();
+                    await image.ImageStream.Value.DisposeAsync();
                     throw new Exception();
                 }
             }
             
             image.MsgInfo = metaResult.MsgInfo;  // directly constructed by Tencent's BDH Server
             image.CompatImage = metaResult.Compat;  // for legacy QQ
-            await image.ImageStream.DisposeAsync();
+            await image.ImageStream.Value.DisposeAsync();
         }
     }
 
@@ -68,17 +68,17 @@ public async Task UploadGroup(ContextCollection context, MessageChain chain, IMe
                 };
                 var extStream = extend.Serialize();
 
-                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1004, image.ImageStream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
+                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1004, image.ImageStream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
                 if (!hwSuccess)
                 {
-                    await image.ImageStream.DisposeAsync();
+                    await image.ImageStream.Value.DisposeAsync();
                     throw new Exception();
                 }
             }
             
             image.MsgInfo = metaResult.MsgInfo;  // directly constructed by Tencent's BDH Server
             image.CompatFace = metaResult.Compat;  // for legacy QQ
-            await image.ImageStream.DisposeAsync();
+            await image.ImageStream.Value.DisposeAsync();
         }
     }
 }
diff --git a/Lagrange.Core/Internal/Context/Uploader/PttUploader.cs b/Lagrange.Core/Internal/Context/Uploader/PttUploader.cs
@@ -33,17 +33,17 @@ public async Task UploadPrivate(ContextCollection context, MessageChain chain, I
                 };
                 var extStream = extend.Serialize();
 
-                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1007, record.AudioStream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
+                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1007, record.AudioStream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
                 if (!hwSuccess)
                 {
-                    await record.AudioStream.DisposeAsync();
+                    await record.AudioStream.Value.DisposeAsync();
                     throw new Exception();
                 }
             }
 
             record.MsgInfo = metaResult.MsgInfo;  // directly constructed by Tencent's BDH Server
             record.Compat = metaResult.Compat;  // for legacy QQ
-            await record.AudioStream.DisposeAsync();
+            await record.AudioStream.Value.DisposeAsync();
         }
     }
 
@@ -69,17 +69,17 @@ public async Task UploadGroup(ContextCollection context, MessageChain chain, IMe
                 };
                 var extStream = extend.Serialize();
 
-                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1008, record.AudioStream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
+                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1008, record.AudioStream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
                 if (!hwSuccess)
                 {
-                    await record.AudioStream.DisposeAsync();
+                    await record.AudioStream.Value.DisposeAsync();
                     throw new Exception();
                 }
             }
             
             record.MsgInfo = metaResult.MsgInfo;  // directly constructed by Tencent's BDH Server
             record.Compat = metaResult.Compat;  // for legacy QQ
-            await record.AudioStream.DisposeAsync();
+            await record.AudioStream.Value.DisposeAsync();
         }
     }
 }
diff --git a/Lagrange.Core/Internal/Context/Uploader/VideoUploader.cs b/Lagrange.Core/Internal/Context/Uploader/VideoUploader.cs
@@ -31,17 +31,17 @@ public async Task UploadPrivate(ContextCollection context, MessageChain chain, I
                 };
                 var extStream = extend.Serialize();
 
-                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1001, stream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
+                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1001, stream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
                 if (!hwSuccess)
                 {
-                    await stream.DisposeAsync();
+                    await stream.Value.DisposeAsync();
                     throw new Exception();
                 }
             }
 
             video.MsgInfo = metaResult.MsgInfo; // directly constructed by Tencent's BDH Server
             video.Compat = metaResult.Compat; // for legacy QQ
-            await stream.DisposeAsync();
+            await stream.Value.DisposeAsync();
         }
     }
 
@@ -63,21 +63,21 @@ public async Task UploadGroup(ContextCollection context, MessageChain chain, IMe
                     Network = Common.Convert(metaResult.Network),
                     MsgInfoBody = metaResult.MsgInfo.MsgInfoBody,
                     BlockSize = 1024 * 1024,
-                    Hash = new NTHighwayHash { FileSha1 = Common.CalculateStreamBytes(stream) }
+                    Hash = new NTHighwayHash { FileSha1 = Common.CalculateStreamBytes(stream.Value) }
                 };
                 var extStream = extend.Serialize();
 
-                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1005, stream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
+                bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1005, stream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());
                 if (!hwSuccess)
                 {
-                    await stream.DisposeAsync();
+                    await stream.Value.DisposeAsync();
                     throw new Exception();
                 }
             }
             
             video.MsgInfo = metaResult.MsgInfo;  // directly constructed by Tencent's BDH Server
             video.Compat = metaResult.Compat;  // for legacy QQ
-            await stream.DisposeAsync();
+            await stream.Value.DisposeAsync();
         }
     }
 }
diff --git a/Lagrange.Core/Internal/Service/Message/ImageGroupUploadService.cs b/Lagrange.Core/Internal/Service/Message/ImageGroupUploadService.cs
@@ -22,11 +22,11 @@ protected override bool Build(ImageGroupUploadEvent input, BotKeystore keystore,
     {
         if (input.Entity.ImageStream is null) throw new Exception();
         
-        string md5 = input.Entity.ImageStream.Md5(true);
-        string sha1 = input.Entity.ImageStream.Sha1(true);
+        string md5 = input.Entity.ImageStream.Value.Md5(true);
+        string sha1 = input.Entity.ImageStream.Value.Sha1(true);
         
         var buffer = new byte[1024]; // parse image header
-        int _ = input.Entity.ImageStream.Read(buffer.AsSpan());
+        int _ = input.Entity.ImageStream.Value.Read(buffer.AsSpan());
         var type = ImageResolver.Resolve(buffer, out var size);
         string imageExt = type switch
         {
@@ -38,7 +38,7 @@ protected override bool Build(ImageGroupUploadEvent input, BotKeystore keystore,
             ImageFormat.Tiff => ".tiff",
             _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
         };
-        input.Entity.ImageStream.Position = 0;
+        input.Entity.ImageStream.Value.Position = 0;
 
         var packet = new OidbSvcTrpcTcpBase<NTV2RichMediaReq>(new NTV2RichMediaReq
         {
@@ -66,7 +66,7 @@ protected override bool Build(ImageGroupUploadEvent input, BotKeystore keystore,
                     {
                         FileInfo = new FileInfo
                         {
-                            FileSize = (uint)input.Entity.ImageStream.Length,
+                            FileSize = (uint)input.Entity.ImageStream.Value.Length,
                             FileHash = md5,
                             FileSha1 = sha1,
                             FileName = md5 + imageExt,
diff --git a/Lagrange.Core/Internal/Service/Message/ImageUploadService.cs b/Lagrange.Core/Internal/Service/Message/ImageUploadService.cs
@@ -22,11 +22,11 @@ protected override bool Build(ImageUploadEvent input, BotKeystore keystore, BotA
     {
         if (input.Entity.ImageStream is null) throw new Exception();
         
-        string md5 = input.Entity.ImageStream.Md5(true);
-        string sha1 = input.Entity.ImageStream.Sha1(true);
+        string md5 = input.Entity.ImageStream.Value.Md5(true);
+        string sha1 = input.Entity.ImageStream.Value.Sha1(true);
         
         var buffer = new byte[1024]; // parse image header
-        int _ = input.Entity.ImageStream.Read(buffer.AsSpan());
+        int _ = input.Entity.ImageStream.Value.Read(buffer.AsSpan());
         var type = ImageResolver.Resolve(buffer, out var size);
         string imageExt = type switch
         {
@@ -38,7 +38,7 @@ protected override bool Build(ImageUploadEvent input, BotKeystore keystore, BotA
             ImageFormat.Tiff => ".tiff",
             _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
         };
-        input.Entity.ImageStream.Position = 0;
+        input.Entity.ImageStream.Value.Position = 0;
 
         string uid = (string.IsNullOrEmpty(input.TargetUid) ? keystore.Uid : input.TargetUid) ?? "";
 
@@ -72,7 +72,7 @@ protected override bool Build(ImageUploadEvent input, BotKeystore keystore, BotA
                     {
                         FileInfo = new FileInfo
                         {
-                            FileSize = (uint)input.Entity.ImageStream.Length,
+                            FileSize = (uint)input.Entity.ImageStream.Value.Length,
                             FileHash = md5,
                             FileSha1 = sha1,
                             FileName = md5 + imageExt,
diff --git a/Lagrange.Core/Internal/Service/Message/RecordGroupUploadService.cs b/Lagrange.Core/Internal/Service/Message/RecordGroupUploadService.cs
@@ -21,8 +21,8 @@ protected override bool Build(RecordGroupUploadEvent input, BotKeystore keystore
     {
         if (input.Entity.AudioStream is null) throw new Exception();
         
-        string md5 = input.Entity.AudioStream.Md5(true);
-        string sha1 = input.Entity.AudioStream.Sha1(true);
+        string md5 = input.Entity.AudioStream.Value.Md5(true);
+        string sha1 = input.Entity.AudioStream.Value.Sha1(true);
 
         var packet = new OidbSvcTrpcTcpBase<NTV2RichMediaReq>(new NTV2RichMediaReq
         {
@@ -50,7 +50,7 @@ protected override bool Build(RecordGroupUploadEvent input, BotKeystore keystore
                     {
                         FileInfo = new FileInfo
                         {
-                            FileSize = (uint)input.Entity.AudioStream.Length,
+                            FileSize = (uint)input.Entity.AudioStream.Value.Length,
                             FileHash = md5,
                             FileSha1 = sha1,
                             FileName = md5 + ".amr",
diff --git a/Lagrange.Core/Internal/Service/Message/RecordUploadService.cs b/Lagrange.Core/Internal/Service/Message/RecordUploadService.cs
@@ -20,8 +20,8 @@ protected override bool Build(RecordUploadEvent input, BotKeystore keystore, Bot
     {
         if (input.Entity.AudioStream is null) throw new Exception();
         
-        string md5 = input.Entity.AudioStream.Md5(true);
-        string sha1 = input.Entity.AudioStream.Sha1(true);
+        string md5 = input.Entity.AudioStream.Value.Md5(true);
+        string sha1 = input.Entity.AudioStream.Value.Sha1(true);
 
         var packet = new OidbSvcTrpcTcpBase<NTV2RichMediaReq>(new NTV2RichMediaReq
         {
@@ -53,7 +53,7 @@ protected override bool Build(RecordUploadEvent input, BotKeystore keystore, Bot
                     {
                         FileInfo = new FileInfo
                         {
-                            FileSize = (uint)input.Entity.AudioStream.Length,
+                            FileSize = (uint)input.Entity.AudioStream.Value.Length,
                             FileHash = md5,
                             FileSha1 = sha1,
                             FileName = md5 + ".amr",
diff --git a/Lagrange.Core/Internal/Service/Message/VideoGroupUploadService.cs b/Lagrange.Core/Internal/Service/Message/VideoGroupUploadService.cs
@@ -21,8 +21,8 @@ protected override bool Build(VideoGroupUploadEvent input, BotKeystore keystore,
     {
         if (input.Entity.VideoStream is null) throw new Exception();
         
-        string md5 = input.Entity.VideoStream.Md5(true);
-        string sha1 = input.Entity.VideoStream.Sha1(true);
+        string md5 = input.Entity.VideoStream.Value.Md5(true);
+        string sha1 = input.Entity.VideoStream.Value.Sha1(true);
         
         var packet = new OidbSvcTrpcTcpBase<NTV2RichMediaReq>(new NTV2RichMediaReq
         {
@@ -50,7 +50,7 @@ protected override bool Build(VideoGroupUploadEvent input, BotKeystore keystore,
                     {
                         FileInfo = new FileInfo
                         {
-                            FileSize = (uint)input.Entity.VideoStream.Length,
+                            FileSize = (uint)input.Entity.VideoStream.Value.Length,
                             FileHash = md5,
                             FileSha1 = sha1,
                             FileName = "video.mp4",
@@ -72,7 +72,7 @@ protected override bool Build(VideoGroupUploadEvent input, BotKeystore keystore,
                     {
                         FileInfo = new FileInfo  // dummy images
                         {
-                            FileSize = (uint)input.Entity.VideoStream.Length - 1200,
+                            FileSize = (uint)input.Entity.VideoStream.Value.Length - 1200,
                             FileHash = md5,
                             FileSha1 = sha1,
                             FileName = "video.jpg",
diff --git a/Lagrange.Core/Internal/Service/Message/VideoUploadService.cs b/Lagrange.Core/Internal/Service/Message/VideoUploadService.cs
@@ -21,8 +21,8 @@ protected override bool Build(VideoUploadEvent input, BotKeystore keystore, BotA
     {
         if (input.Entity.VideoStream is null) throw new Exception();
         
-        string md5 = input.Entity.VideoStream.Md5(true);
-        string sha1 = input.Entity.VideoStream.Sha1(true);
+        string md5 = input.Entity.VideoStream.Value.Md5(true);
+        string sha1 = input.Entity.VideoStream.Value.Sha1(true);
         
         var packet = new OidbSvcTrpcTcpBase<NTV2RichMediaReq>(new NTV2RichMediaReq
         {
@@ -54,7 +54,7 @@ protected override bool Build(VideoUploadEvent input, BotKeystore keystore, BotA
                     {
                         FileInfo = new FileInfo
                         {
-                            FileSize = (uint)input.Entity.VideoStream.Length,
+                            FileSize = (uint)input.Entity.VideoStream.Value.Length,
                             FileHash = md5,
                             FileSha1 = sha1,
                             FileName = "video.mp4",
@@ -76,7 +76,7 @@ protected override bool Build(VideoUploadEvent input, BotKeystore keystore, BotA
                     {
                         FileInfo = new FileInfo  // dummy images
                         {
-                            FileSize = (uint)input.Entity.VideoStream.Length - 1200,
+                            FileSize = (uint)input.Entity.VideoStream.Value.Length - 1200,
                             FileHash = md5,
                             FileSha1 = sha1,
                             FileName = "video.jpg",
diff --git a/Lagrange.Core/Message/Entity/ImageEntity.cs b/Lagrange.Core/Message/Entity/ImageEntity.cs
@@ -25,7 +25,7 @@ public class ImageEntity : IMessageEntity
 
     public string ImageUrl { get; set; } = string.Empty;
 
-    internal Stream? ImageStream { get; set; }
+    internal Lazy<Stream>? ImageStream { get; set; }
 
     internal string? Path { get; set; }
 
@@ -44,19 +44,19 @@ public ImageEntity() { }
     public ImageEntity(string filePath)
     {
         FilePath = filePath;
-        ImageStream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
+        ImageStream = new Lazy<Stream>(() => new FileStream(filePath, FileMode.Open, FileAccess.Read));
     }
 
     public ImageEntity(byte[] file)
     {
         FilePath = "";
-        ImageStream = new MemoryStream(file);
+        ImageStream = new Lazy<Stream>(() => new MemoryStream(file));
     }
     
     public ImageEntity(Stream stream)
     {
         FilePath = "";
-        ImageStream = stream;
+        ImageStream = new Lazy<Stream>(stream);
     }
 
     IEnumerable<Elem> IMessageEntity.PackElement()
diff --git a/Lagrange.Core/Message/Entity/RecordEntity.cs b/Lagrange.Core/Message/Entity/RecordEntity.cs
@@ -17,13 +17,13 @@ public class RecordEntity : IMessageEntity
 
     public string AudioName { get; set; } = string.Empty;
     
-    public int AudioSize { get; set; }
+    public int AudioSize => (int)AudioStream!.Value.Length;
     
     public string AudioUrl { get; set; } = string.Empty;
 
     #region Internal Properties
 
-    internal Stream? AudioStream { get; set; }
+    internal Lazy<Stream>? AudioStream { get; set; }
     
     internal string? AudioUuid { get; set; }
     
@@ -40,16 +40,14 @@ internal RecordEntity() { }
     public RecordEntity(string filePath, int audioLength = 0)
     {
         FilePath = filePath;
-        AudioStream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
-        AudioSize = (int)AudioStream.Length;
+        AudioStream = new Lazy<Stream>(() => new FileStream(filePath, FileMode.Open, FileAccess.Read));
         AudioLength = audioLength;
     }
 
     public RecordEntity(byte[] file, int audioLength = 0)
     {
         FilePath = string.Empty;
-        AudioStream = new MemoryStream(file);
-        AudioSize = (int)AudioStream.Length;
+        AudioStream = new Lazy<Stream>(() => new MemoryStream(file));
         AudioLength = audioLength;
     }
 
@@ -98,4 +96,4 @@ IEnumerable<Elem> IMessageEntity.PackElement()
     public string ToPreviewString() =>  $"[{nameof(RecordEntity)}: {AudioUrl}]";
 
     public string ToPreviewText() => "[语音]";
-}
+}
diff --git a/Lagrange.Core/Message/Entity/VideoEntity.cs b/Lagrange.Core/Message/Entity/VideoEntity.cs
diff --git a/Lagrange.OneBot/Message/Entity/ImageSegment.cs b/Lagrange.OneBot/Message/Entity/ImageSegment.cs

Original file line number	Diff line number	Diff line change
`@@ -32,17 +32,17 @@ public async Task UploadPrivate(ContextCollection context, MessageChain chain, I`
`32`	`32`	`};`
`33`	`33`	`var extStream = extend.Serialize();`
`34`	`34`
`35`		`- bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1003, image.ImageStream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
	`35`	`+ bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1003, image.ImageStream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
`36`	`36`	`if (!hwSuccess)`
`37`	`37`	`{`
`38`		`- await image.ImageStream.DisposeAsync();`
	`38`	`+ await image.ImageStream.Value.DisposeAsync();`
`39`	`39`	`throw new Exception();`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`image.MsgInfo = metaResult.MsgInfo; // directly constructed by Tencent's BDH Server`
`44`	`44`	`image.CompatImage = metaResult.Compat; // for legacy QQ`
`45`		`- await image.ImageStream.DisposeAsync();`
	`45`	`+ await image.ImageStream.Value.DisposeAsync();`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`@@ -68,17 +68,17 @@ public async Task UploadGroup(ContextCollection context, MessageChain chain, IMe`
`68`	`68`	`};`
`69`	`69`	`var extStream = extend.Serialize();`
`70`	`70`
`71`		`- bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1004, image.ImageStream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
	`71`	`+ bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1004, image.ImageStream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
`72`	`72`	`if (!hwSuccess)`
`73`	`73`	`{`
`74`		`- await image.ImageStream.DisposeAsync();`
	`74`	`+ await image.ImageStream.Value.DisposeAsync();`
`75`	`75`	`throw new Exception();`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`image.MsgInfo = metaResult.MsgInfo; // directly constructed by Tencent's BDH Server`
`80`	`80`	`image.CompatFace = metaResult.Compat; // for legacy QQ`
`81`		`- await image.ImageStream.DisposeAsync();`
	`81`	`+ await image.ImageStream.Value.DisposeAsync();`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,17 +33,17 @@ public async Task UploadPrivate(ContextCollection context, MessageChain chain, I`
`33`	`33`	`};`
`34`	`34`	`var extStream = extend.Serialize();`
`35`	`35`
`36`		`- bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1007, record.AudioStream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
	`36`	`+ bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1007, record.AudioStream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
`37`	`37`	`if (!hwSuccess)`
`38`	`38`	`{`
`39`		`- await record.AudioStream.DisposeAsync();`
	`39`	`+ await record.AudioStream.Value.DisposeAsync();`
`40`	`40`	`throw new Exception();`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`record.MsgInfo = metaResult.MsgInfo; // directly constructed by Tencent's BDH Server`
`45`	`45`	`record.Compat = metaResult.Compat; // for legacy QQ`
`46`		`- await record.AudioStream.DisposeAsync();`
	`46`	`+ await record.AudioStream.Value.DisposeAsync();`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`@@ -69,17 +69,17 @@ public async Task UploadGroup(ContextCollection context, MessageChain chain, IMe`
`69`	`69`	`};`
`70`	`70`	`var extStream = extend.Serialize();`
`71`	`71`
`72`		`- bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1008, record.AudioStream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
	`72`	`+ bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1008, record.AudioStream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
`73`	`73`	`if (!hwSuccess)`
`74`	`74`	`{`
`75`		`- await record.AudioStream.DisposeAsync();`
	`75`	`+ await record.AudioStream.Value.DisposeAsync();`
`76`	`76`	`throw new Exception();`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`record.MsgInfo = metaResult.MsgInfo; // directly constructed by Tencent's BDH Server`
`81`	`81`	`record.Compat = metaResult.Compat; // for legacy QQ`
`82`		`- await record.AudioStream.DisposeAsync();`
	`82`	`+ await record.AudioStream.Value.DisposeAsync();`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,17 +31,17 @@ public async Task UploadPrivate(ContextCollection context, MessageChain chain, I`
`31`	`31`	`};`
`32`	`32`	`var extStream = extend.Serialize();`
`33`	`33`
`34`		`- bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1001, stream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
	`34`	`+ bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1001, stream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
`35`	`35`	`if (!hwSuccess)`
`36`	`36`	`{`
`37`		`- await stream.DisposeAsync();`
	`37`	`+ await stream.Value.DisposeAsync();`
`38`	`38`	`throw new Exception();`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`video.MsgInfo = metaResult.MsgInfo; // directly constructed by Tencent's BDH Server`
`43`	`43`	`video.Compat = metaResult.Compat; // for legacy QQ`
`44`		`- await stream.DisposeAsync();`
	`44`	`+ await stream.Value.DisposeAsync();`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`@@ -63,21 +63,21 @@ public async Task UploadGroup(ContextCollection context, MessageChain chain, IMe`
`63`	`63`	`Network = Common.Convert(metaResult.Network),`
`64`	`64`	`MsgInfoBody = metaResult.MsgInfo.MsgInfoBody,`
`65`	`65`	`BlockSize = 1024 * 1024,`
`66`		`- Hash = new NTHighwayHash { FileSha1 = Common.CalculateStreamBytes(stream) }`
	`66`	`+ Hash = new NTHighwayHash { FileSha1 = Common.CalculateStreamBytes(stream.Value) }`
`67`	`67`	`};`
`68`	`68`	`var extStream = extend.Serialize();`
`69`	`69`
`70`		`- bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1005, stream, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
	`70`	`+ bool hwSuccess = await context.Highway.UploadSrcByStreamAsync(1005, stream.Value, await Common.GetTicket(context), index.Info.FileHash.UnHex(), extStream.ToArray());`
`71`	`71`	`if (!hwSuccess)`
`72`	`72`	`{`
`73`		`- await stream.DisposeAsync();`
	`73`	`+ await stream.Value.DisposeAsync();`
`74`	`74`	`throw new Exception();`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`video.MsgInfo = metaResult.MsgInfo; // directly constructed by Tencent's BDH Server`
`79`	`79`	`video.Compat = metaResult.Compat; // for legacy QQ`
`80`		`- await stream.DisposeAsync();`
	`80`	`+ await stream.Value.DisposeAsync();`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ protected override bool Build(ImageGroupUploadEvent input, BotKeystore keystore,`
`22`	`22`	`{`
`23`	`23`	`if (input.Entity.ImageStream is null) throw new Exception();`
`24`	`24`
`25`		`- string md5 = input.Entity.ImageStream.Md5(true);`
`26`		`- string sha1 = input.Entity.ImageStream.Sha1(true);`
	`25`	`+ string md5 = input.Entity.ImageStream.Value.Md5(true);`
	`26`	`+ string sha1 = input.Entity.ImageStream.Value.Sha1(true);`
`27`	`27`
`28`	`28`	`var buffer = new byte[1024]; // parse image header`
`29`		`- int _ = input.Entity.ImageStream.Read(buffer.AsSpan());`
	`29`	`+ int _ = input.Entity.ImageStream.Value.Read(buffer.AsSpan());`
`30`	`30`	`var type = ImageResolver.Resolve(buffer, out var size);`
`31`	`31`	`string imageExt = type switch`
`32`	`32`	`{`
`@@ -38,7 +38,7 @@ protected override bool Build(ImageGroupUploadEvent input, BotKeystore keystore,`
`38`	`38`	`ImageFormat.Tiff => ".tiff",`
`39`	`39`	`_ => throw new ArgumentOutOfRangeException(nameof(type), type, null)`
`40`	`40`	`};`
`41`		`- input.Entity.ImageStream.Position = 0;`
	`41`	`+ input.Entity.ImageStream.Value.Position = 0;`
`42`	`42`
`43`	`43`	`var packet = new OidbSvcTrpcTcpBase<NTV2RichMediaReq>(new NTV2RichMediaReq`
`44`	`44`	`{`
`@@ -66,7 +66,7 @@ protected override bool Build(ImageGroupUploadEvent input, BotKeystore keystore,`
`66`	`66`	`{`
`67`	`67`	`FileInfo = new FileInfo`
`68`	`68`	`{`
`69`		`- FileSize = (uint)input.Entity.ImageStream.Length,`
	`69`	`+ FileSize = (uint)input.Entity.ImageStream.Value.Length,`
`70`	`70`	`FileHash = md5,`
`71`	`71`	`FileSha1 = sha1,`
`72`	`72`	`FileName = md5 + imageExt,`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ protected override bool Build(RecordGroupUploadEvent input, BotKeystore keystore`
`21`	`21`	`{`
`22`	`22`	`if (input.Entity.AudioStream is null) throw new Exception();`
`23`	`23`
`24`		`- string md5 = input.Entity.AudioStream.Md5(true);`
`25`		`- string sha1 = input.Entity.AudioStream.Sha1(true);`
	`24`	`+ string md5 = input.Entity.AudioStream.Value.Md5(true);`
	`25`	`+ string sha1 = input.Entity.AudioStream.Value.Sha1(true);`
`26`	`26`
`27`	`27`	`var packet = new OidbSvcTrpcTcpBase<NTV2RichMediaReq>(new NTV2RichMediaReq`
`28`	`28`	`{`
`@@ -50,7 +50,7 @@ protected override bool Build(RecordGroupUploadEvent input, BotKeystore keystore`
`50`	`50`	`{`
`51`	`51`	`FileInfo = new FileInfo`
`52`	`52`	`{`
`53`		`- FileSize = (uint)input.Entity.AudioStream.Length,`
	`53`	`+ FileSize = (uint)input.Entity.AudioStream.Value.Length,`
`54`	`54`	`FileHash = md5,`
`55`	`55`	`FileSha1 = sha1,`
`56`	`56`	`FileName = md5 + ".amr",`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ protected override bool Build(RecordUploadEvent input, BotKeystore keystore, Bot`
`20`	`20`	`{`
`21`	`21`	`if (input.Entity.AudioStream is null) throw new Exception();`
`22`	`22`
`23`		`- string md5 = input.Entity.AudioStream.Md5(true);`
`24`		`- string sha1 = input.Entity.AudioStream.Sha1(true);`
	`23`	`+ string md5 = input.Entity.AudioStream.Value.Md5(true);`
	`24`	`+ string sha1 = input.Entity.AudioStream.Value.Sha1(true);`
`25`	`25`
`26`	`26`	`var packet = new OidbSvcTrpcTcpBase<NTV2RichMediaReq>(new NTV2RichMediaReq`
`27`	`27`	`{`
`@@ -53,7 +53,7 @@ protected override bool Build(RecordUploadEvent input, BotKeystore keystore, Bot`
`53`	`53`	`{`
`54`	`54`	`FileInfo = new FileInfo`
`55`	`55`	`{`
`56`		`- FileSize = (uint)input.Entity.AudioStream.Length,`
	`56`	`+ FileSize = (uint)input.Entity.AudioStream.Value.Length,`
`57`	`57`	`FileHash = md5,`
`58`	`58`	`FileSha1 = sha1,`
`59`	`59`	`FileName = md5 + ".amr",`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class ImageEntity : IMessageEntity`
`25`	`25`
`26`	`26`	`public string ImageUrl { get; set; } = string.Empty;`
`27`	`27`
`28`		`- internal Stream? ImageStream { get; set; }`
	`28`	`+ internal Lazy<Stream>? ImageStream { get; set; }`
`29`	`29`
`30`	`30`	`internal string? Path { get; set; }`
`31`	`31`
`@@ -44,19 +44,19 @@ public ImageEntity() { }`
`44`	`44`	`public ImageEntity(string filePath)`
`45`	`45`	`{`
`46`	`46`	`FilePath = filePath;`
`47`		`- ImageStream = new FileStream(filePath, FileMode.Open, FileAccess.Read);`
	`47`	`+ ImageStream = new Lazy<Stream>(() => new FileStream(filePath, FileMode.Open, FileAccess.Read));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public ImageEntity(byte[] file)`
`51`	`51`	`{`
`52`	`52`	`FilePath = "";`
`53`		`- ImageStream = new MemoryStream(file);`
	`53`	`+ ImageStream = new Lazy<Stream>(() => new MemoryStream(file));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public ImageEntity(Stream stream)`
`57`	`57`	`{`
`58`	`58`	`FilePath = "";`
`59`		`- ImageStream = stream;`
	`59`	`+ ImageStream = new Lazy<Stream>(stream);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`IEnumerable<Elem> IMessageEntity.PackElement()`