Simplify callback dispatching

Author: xPaw

SteamKit2/SteamKit2/Steam/Handlers/SteamApps/Callbacks.cs

@@ -9,6 +9,7 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
+using System.Text;
 using SteamKit2.Internal;
 
 namespace SteamKit2
@@ -146,8 +147,11 @@ internal License( CMsgClientLicenseList.License license )
             public ReadOnlyCollection<License> LicenseList { get; private set; }
 
 
-            internal LicenseListCallback( CMsgClientLicenseList msg )
+            internal LicenseListCallback( IPacketMsg packetMsg )
             {
+                var licenseList = new ClientMsgProtobuf<CMsgClientLicenseList>( packetMsg );
+                var msg = licenseList.Body;
+
                 this.Result = ( EResult )msg.eresult;
 
                 var list = msg.licenses
@@ -181,9 +185,12 @@ public sealed class FreeLicenseCallback : CallbackMsg
             /// <value>List of granted packages.</value>
             public ReadOnlyCollection<uint> GrantedPackages { get; private set; }
 
-            internal FreeLicenseCallback( JobID jobID, CMsgClientRequestFreeLicenseResponse msg )
+            internal FreeLicenseCallback( IPacketMsg packetMsg )
             {
-                this.JobID = jobID;
+                var grantedLicenses = new ClientMsgProtobuf<CMsgClientRequestFreeLicenseResponse>( packetMsg );
+                var msg = grantedLicenses.Body;
+
+                this.JobID = grantedLicenses.TargetJobID;
 
                 this.Result = ( EResult )msg.eresult;
 
@@ -211,10 +218,12 @@ public sealed class AppOwnershipTicketCallback : CallbackMsg
             /// </summary>
             public byte[] Ticket { get; private set; }
 
-
-            internal AppOwnershipTicketCallback( JobID jobID, CMsgClientGetAppOwnershipTicketResponse msg )
+            internal AppOwnershipTicketCallback( IPacketMsg packetMsg )
             {
-                this.JobID = jobID;
+                var ticketResponse = new ClientMsgProtobuf<CMsgClientGetAppOwnershipTicketResponse>( packetMsg );
+                var msg = ticketResponse.Body;
+
+                this.JobID = ticketResponse.TargetJobID;
 
                 this.Result = ( EResult )msg.eresult;
                 this.AppID = msg.app_id;
@@ -242,9 +251,12 @@ public sealed class DepotKeyCallback : CallbackMsg
             public byte[] DepotKey { get; private set; }
 
 
-            internal DepotKeyCallback( JobID jobID, CMsgClientGetDepotDecryptionKeyResponse msg )
+            internal DepotKeyCallback( IPacketMsg packetMsg )
             {
-                JobID = jobID;
+                var keyResponse = new ClientMsgProtobuf<CMsgClientGetDepotDecryptionKeyResponse>( packetMsg );
+                var msg = keyResponse.Body;
+
+                JobID = keyResponse.TargetJobID;
 
                 Result = ( EResult )msg.eresult;
                 DepotID = msg.depot_id;
@@ -270,15 +282,19 @@ public sealed class LegacyGameKeyCallback : CallbackMsg
             /// </summary>
             public string? Key { get; private set; }
 
-            internal LegacyGameKeyCallback( JobID jobID, MsgClientGetLegacyGameKeyResponse msg, byte[] payload )
+            internal LegacyGameKeyCallback( IPacketMsg packetMsg )
             {
-                JobID = jobID;
+                var keyResponse = new ClientMsg<MsgClientGetLegacyGameKeyResponse>( packetMsg );
+                var msg = keyResponse.Body;
+
+                JobID = keyResponse.TargetJobID;
                 AppID = msg.AppId;
                 Result = msg.Result;
 
                 if ( msg.Length > 0 )
                 {
                     var length = ( int )msg.Length - 1;
+                    var payload = keyResponse.Payload.ToArray();
                     Key = System.Text.Encoding.ASCII.GetString( payload, 0, length );
                 }
             }
@@ -299,8 +315,11 @@ public sealed class GameConnectTokensCallback : CallbackMsg
             public ReadOnlyCollection<byte[]> Tokens { get; private set; }
 
 
-            internal GameConnectTokensCallback( CMsgClientGameConnectTokens msg )
+            internal GameConnectTokensCallback( IPacketMsg packetMsg )
             {
+                var gcTokens = new ClientMsgProtobuf<CMsgClientGameConnectTokens>( packetMsg );
+                var msg = gcTokens.Body;
+
                 TokensToKeep = msg.max_tokens_to_keep;
                 Tokens = new ReadOnlyCollection<byte[]>( msg.tokens );
             }
@@ -317,12 +336,14 @@ public sealed class VACStatusCallback : CallbackMsg
             public ReadOnlyCollection<uint> BannedApps { get; private set; }
 
 
-            internal VACStatusCallback( MsgClientVACBanStatus msg, byte[] payload )
+            internal VACStatusCallback( IPacketMsg packetMsg )
             {
+                var vacStatus = new ClientMsg<MsgClientVACBanStatus>( packetMsg );
+                var msg = vacStatus.Body;
+
                 var tempList = new List<uint>();
 
-                using var ms = new MemoryStream( payload );
-                using var br = new BinaryReader( ms );
+                using var br = new BinaryReader( vacStatus.Payload, Encoding.UTF8, leaveOpen: true );
                 for ( int x = 0; x < msg.NumBans; x++ )
                 {
                     tempList.Add( br.ReadUInt32() );
@@ -355,9 +376,12 @@ public sealed class PICSTokensCallback : CallbackMsg
             public Dictionary<uint, ulong> AppTokens { get; private set; }
 
 
-            internal PICSTokensCallback( JobID jobID, CMsgClientPICSAccessTokenResponse msg )
+            internal PICSTokensCallback( IPacketMsg packetMsg )
             {
-                JobID = jobID;
+                var tokensResponse = new ClientMsgProtobuf<CMsgClientPICSAccessTokenResponse>( packetMsg );
+                var msg = tokensResponse.Body;
+
+                JobID = tokensResponse.TargetJobID;
 
                 PackageTokensDenied = new ReadOnlyCollection<uint>( msg.package_denied_tokens );
                 AppTokensDenied = new ReadOnlyCollection<uint>( msg.app_denied_tokens );
@@ -444,9 +468,12 @@ internal PICSChangeData( CMsgClientPICSChangesSinceResponse.PackageChange change
             public Dictionary<uint, PICSChangeData> AppChanges { get; private set; }
 
 
-            internal PICSChangesCallback( JobID jobID, CMsgClientPICSChangesSinceResponse msg )
+            internal PICSChangesCallback( IPacketMsg packetMsg )
             {
-                JobID = jobID;
+                var changesResponse = new ClientMsgProtobuf<CMsgClientPICSChangesSinceResponse>( packetMsg );
+                var msg = changesResponse.Body;
+
+                JobID = changesResponse.TargetJobID;
 
                 LastChangeNumber = msg.since_change_number;
                 CurrentChangeNumber = msg.current_change_number;
@@ -591,9 +618,12 @@ internal PICSProductInfo( CMsgClientPICSProductInfoResponse.PackageInfo package_
             public Dictionary<uint, PICSProductInfo> Packages { get; private set; }
 
 
-            internal PICSProductInfoCallback( JobID jobID, CMsgClientPICSProductInfoResponse msg )
+            internal PICSProductInfoCallback( IPacketMsg packetMsg )
             {
-                JobID = jobID;
+                var productResponse = new ClientMsgProtobuf<CMsgClientPICSProductInfoResponse>( packetMsg );
+                var msg = productResponse.Body;
+
+                JobID = productResponse.TargetJobID;
 
                 MetaDataOnly = msg.meta_data_only;
                 ResponsePending = msg.response_pending;
@@ -637,8 +667,11 @@ public sealed class GuestPassListCallback : CallbackMsg
             public List<KeyValue> GuestPasses { get; set; }
 
 
-            internal GuestPassListCallback( MsgClientUpdateGuestPassesList msg, Stream payload )
+            internal GuestPassListCallback( IPacketMsg packetMsg )
             {
+                var guestPasses = new ClientMsg<MsgClientUpdateGuestPassesList>( packetMsg );
+                var msg = guestPasses.Body;
+
                 Result = msg.Result;
                 CountGuestPassesToGive = msg.CountGuestPassesToGive;
                 CountGuestPassesToRedeem = msg.CountGuestPassesToRedeem;
@@ -647,7 +680,7 @@ internal GuestPassListCallback( MsgClientUpdateGuestPassesList msg, Stream paylo
                 for ( int i = 0; i < CountGuestPassesToGive + CountGuestPassesToRedeem; i++ )
                 {
                     var kv = new KeyValue();
-                    kv.TryReadAsBinary( payload );
+                    kv.TryReadAsBinary( guestPasses.Payload );
                     GuestPasses.Add( kv );
                 }
             }
@@ -672,9 +705,12 @@ public sealed class RedeemGuestPassResponseCallback : CallbackMsg
             public uint MustOwnAppID { get; set; }
 
 
-            internal RedeemGuestPassResponseCallback( JobID jobID, CMsgClientRedeemGuestPassResponse msg )
+            internal RedeemGuestPassResponseCallback( IPacketMsg packetMsg )
             {
-                JobID = jobID;
+                var redeemedGuestPass = new ClientMsgProtobuf<CMsgClientRedeemGuestPassResponse>( packetMsg );
+                var msg = redeemedGuestPass.Body;
+
+                JobID = redeemedGuestPass.TargetJobID;
                 Result = ( EResult )msg.eresult;
                 PackageID = msg.package_id;
                 MustOwnAppID = msg.must_own_appid;
@@ -700,9 +736,12 @@ public sealed class PurchaseResponseCallback : CallbackMsg
             public KeyValue PurchaseReceiptInfo { get; set; }
 
 
-            internal PurchaseResponseCallback( JobID jobID, CMsgClientPurchaseResponse msg )
+            internal PurchaseResponseCallback( IPacketMsg packetMsg )
             {
-                JobID = jobID;
+                var purchaseResponse = new ClientMsgProtobuf<CMsgClientPurchaseResponse>( packetMsg );
+                var msg = purchaseResponse.Body;
+
+                JobID = purchaseResponse.TargetJobID;
                 Result = ( EResult )msg.eresult;
                 PurchaseResultDetail = ( EPurchaseResultDetail )msg.purchase_result_details;
                 PurchaseReceiptInfo = new KeyValue();
@@ -735,9 +774,12 @@ public sealed class CDNAuthTokenCallback : CallbackMsg
             /// </summary>
             public DateTime Expiration { get; set; }
 
-            internal CDNAuthTokenCallback( JobID jobID, CMsgClientGetCDNAuthTokenResponse msg )
+            internal CDNAuthTokenCallback( IPacketMsg packetMsg )
             {
-                JobID = jobID;
+                var response = new ClientMsgProtobuf<CMsgClientGetCDNAuthTokenResponse>( packetMsg );
+                var msg = response.Body;
+
+                JobID = response.TargetJobID;
 
                 Result = ( EResult )msg.eresult;
                 Token = msg.token;
@@ -759,9 +801,12 @@ public sealed class CheckAppBetaPasswordCallback : CallbackMsg
             /// </summary>
             public Dictionary<string, byte[]> BetaPasswords { get; private set; }
 
-            internal CheckAppBetaPasswordCallback( JobID jobID, CMsgClientCheckAppBetaPasswordResponse msg )
+            internal CheckAppBetaPasswordCallback( IPacketMsg packetMsg )
             {
-                JobID = jobID;
+                var response = new ClientMsgProtobuf<CMsgClientCheckAppBetaPasswordResponse>( packetMsg );
+                var msg = response.Body;
+
+                JobID = response.TargetJobID;
 
                 Result = ( EResult )msg.eresult;
                 BetaPasswords = [];