Merge pull request #287 from LossyDragon/protobufs

Update protobufs and steamd
Longi94 · Oct 16, 2024 · 2d3193b · 2d3193b
2 parents 976049b + 0a2b42b
commit 2d3193b
Show file tree

Hide file tree

Showing 24 changed files with 2,227 additions and 2,013 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,24 +12,24 @@ kotlinter = "4.4.1" # https://plugins.gradle.org/plugin/org.jmailen.kotlinter
 
 # Standard Library versions
 bouncyCastle = "1.78.1" # https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on
-commons-io = "2.16.1" # https://mvnrepository.com/artifact/commons-io/commons-io
+commons-io = "2.17.0" # https://mvnrepository.com/artifact/commons-io/commons-io
 commons-lang3 = "3.17.0" # https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
 commons-validator = "1.9.0" # https://mvnrepository.com/artifact/commons-validator/commons-validator
 gson = "2.11.0" # https://mvnrepository.com/artifact/com.google.code.gson/gson
 jacoco = "0.8.12" # https://www.eclemma.org/jacoco
 javaWebSocket = "1.5.7" # https://mvnrepository.com/artifact/org.java-websocket/Java-WebSocket
-kotlin-coroutines = "1.8.1" # https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core
+kotlin-coroutines = "1.9.0" # https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core
 okHttp = "5.0.0-alpha.14" # https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
-protobuf = "4.28.0" # https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java
+protobuf = "4.28.2" # https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java
 protobuf-gradle = "0.9.4" # https://mvnrepository.com/artifact/com.google.protobuf/protobuf-gradle-plugin
 publishPlugin = "1.3.0" # https://mvnrepository.com/artifact/io.github.gradle-nexus/publish-plugin
 qrCode = "1.0.1" # https://mvnrepository.com/artifact/pro.leaco.qrcode/console-qrcode
 
 # Testing Lib versions
 commonsCodec = "1.17.1" # https://mvnrepository.com/artifact/commons-codec/commons-codec
-junit5 = "5.11.0" # https://mvnrepository.com/artifact/org.junit/junit-bom
+junit5 = "5.11.2" # https://mvnrepository.com/artifact/org.junit/junit-bom
 mockWebServer = "5.0.0-alpha.14" # https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver3-junit5
-mockitoVersion = "5.13.0" # https://mvnrepository.com/artifact/org.mockito/mockito-core
+mockitoVersion = "5.14.1" # https://mvnrepository.com/artifact/org.mockito/mockito-core
 
 [libraries]
 bouncyCastle = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncyCastle" }

diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/callback/LoggedOnCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/callback/LoggedOnCallback.kt
@@ -8,7 +8,7 @@ import `in`.dragonbra.javasteam.enums.EAccountFlags
 import `in`.dragonbra.javasteam.enums.EResult
 import `in`.dragonbra.javasteam.generated.MsgClientLogOnResponse
 import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesClientserverLogin.CMsgClientLogonResponse
-import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesParentalSteamclient
+import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesParentalObjects.ParentalSettings
 import `in`.dragonbra.javasteam.steam.handlers.steamuser.LogOnDetails
 import `in`.dragonbra.javasteam.steam.handlers.steamuser.SteamUser
 import `in`.dragonbra.javasteam.steam.steamclient.callbackmgr.CallbackMsg
@@ -123,7 +123,7 @@ class LoggedOnCallback : CallbackMsg {
     /**
      * Gets the Steam parental settings.
      */
-    var parentalSettings: SteammessagesParentalSteamclient.ParentalSettings? = null
+    var parentalSettings: ParentalSettings? = null
 
     constructor(packetMsg: IPacketMsg) {
         if (!packetMsg.isProto) {
@@ -167,7 +167,7 @@ class LoggedOnCallback : CallbackMsg {
 
         resp.parentalSettings?.let {
             try {
-                parentalSettings = SteammessagesParentalSteamclient.ParentalSettings.parseFrom(it)
+                parentalSettings = ParentalSettings.parseFrom(it)
             } catch (e: InvalidProtocolBufferException) {
                 e.printStackTrace()
             }

diff --git a/src/main/proto/in/dragonbra/javasteam/protobufs/steamclient/encrypted_app_ticket.proto b/src/main/proto/in/dragonbra/javasteam/protobufs/steamclient/encrypted_app_ticket.proto
@@ -4,9 +4,9 @@ option optimize_for = SPEED;
 option java_generic_services = false;
 
 message EncryptedAppTicket {
-	optional uint32 ticket_version_no = 1;
-	optional uint32 crc_encryptedticket = 2;
-	optional uint32 cb_encrypteduserdata = 3;
-	optional uint32 cb_encrypted_appownershipticket = 4;
-	optional bytes encrypted_ticket = 5;
+  optional uint32 ticket_version_no = 1;
+  optional uint32 crc_encryptedticket = 2;
+  optional uint32 cb_encrypteduserdata = 3;
+  optional uint32 cb_encrypted_appownershipticket = 4;
+  optional bytes encrypted_ticket = 5;
 }
diff --git a/src/main/proto/in/dragonbra/javasteam/protobufs/steamclient/enums.proto b/src/main/proto/in/dragonbra/javasteam/protobufs/steamclient/enums.proto
@@ -144,6 +144,12 @@ enum EColorGamutLabelSet {
   k_ColorGamutLabelSet_Native_sRGB_Boosted = 2;
 }
 
+enum EWindowStackingOrder {
+  k_EWindowStackingOrder_Invalid = 0;
+  k_EWindowStackingOrder_Top = 1;
+  k_EWindowStackingOrder_Bottom = 2;
+}
+
 enum EBluetoothDeviceType {
   k_BluetoothDeviceType_Invalid = 0;
   k_BluetoothDeviceType_Unknown = 1;
@@ -296,6 +302,7 @@ enum EUpdaterState {
   k_EUpdaterState_Applying = 5;
   k_EUpdaterState_ClientRestartPending = 6;
   k_EUpdaterState_SystemRestartPending = 7;
+  k_EUpdaterState_RollBack = 8;
 }
 
 enum EStorageBlockContentType {
@@ -370,8 +377,10 @@ enum EOSBranch {
   k_EOSBranch_ReleaseCandidate = 2;
   k_EOSBranch_Beta = 3;
   k_EOSBranch_BetaCandidate = 4;
-  k_EOSBranch_Main = 5;
-  k_EOSBranch_Staging = 6;
+  k_EOSBranch_Preview = 5;
+  k_EOSBranch_PreviewCandidate = 6;
+  k_EOSBranch_Main = 7;
+  k_EOSBranch_Staging = 8;
 }
 
 enum ECommunityItemClass {
@@ -438,6 +447,18 @@ enum ENewSteamAnnouncementState {
   k_ENewSteamAnnouncementState_FeaturedAnnouncement = 3;
 }
 
+enum EForumType {
+  k_EForumType_Invalid = 0;
+  k_EForumType_General = 1;
+  k_EForumType_ReportedPosts = 2;
+  k_EForumType_Workshop = 3;
+  k_EForumType_PublishedFile = 4;
+  k_EForumType_Trading = 5;
+  k_EForumType_PlayTest = 6;
+  k_EForumType_Event = 7;
+  k_EForumType_Max = 8;
+}
+
 enum ECommentThreadType {
   k_ECommentThreadTypeInvalid = 0;
   k_ECommentThreadTypeScreenshot_Deprecated = 1;
@@ -486,6 +507,7 @@ enum ECompromiseDetectionType {
   k_ECompromiseDetectionType_None = 0;
   k_ECompromiseDetectionType_TradeEvent = 1;
   k_ECompromiseDetectionType_ApiCallRate = 2;
+  k_ECompromiseDetectionType_Manual = 3;
 }
 
 enum EAsyncGameSessionUserState {
@@ -500,3 +522,57 @@ enum EAsyncGameSessionUserVisibility {
   k_EAsyncGameSessionUserVisibilitySessionListOnly = 1;
   k_EAsyncGameSessionUserVisibilityDismissed = 2;
 }
+
+enum EGameRecordingType {
+  k_EGameRecordingType_Unknown = 0;
+  k_EGameRecordingType_NotRecording = 1;
+  k_EGameRecordingType_ManualRecording = 2;
+  k_EGameRecordingType_BackgroundRecording = 3;
+  k_EGameRecordingType_Clip = 4;
+}
+
+enum EProtoAppType {
+  k_EAppTypeInvalid = 0;
+  k_EAppTypeGame = 1;
+  k_EAppTypeApplication = 2;
+  k_EAppTypeTool = 4;
+  k_EAppTypeDemo = 8;
+  k_EAppTypeDeprected = 16;
+  k_EAppTypeDLC = 32;
+  k_EAppTypeGuide = 64;
+  k_EAppTypeDriver = 128;
+  k_EAppTypeConfig = 256;
+  k_EAppTypeHardware = 512;
+  k_EAppTypeFranchise = 1024;
+  k_EAppTypeVideo = 2048;
+  k_EAppTypePlugin = 4096;
+  k_EAppTypeMusicAlbum = 8192;
+  k_EAppTypeSeries = 16384;
+  k_EAppTypeComic = 32768;
+  k_EAppTypeBeta = 65536;
+  k_EAppTypeShortcut = 1073741824;
+  k_EAppTypeDepotOnly = -2147483648;
+}
+
+enum EWindowsUpdateInstallationImpact {
+  k_EWindowsUpdateInstallationImpact_Unknown = -1;
+  k_EWindowsUpdateInstallationImpact_Normal = 0;
+  k_EWindowsUpdateInstallationImpact_Minor = 1;
+  k_EWindowsUpdateInstallationImpact_ExclusiveHandling = 2;
+}
+
+enum EWindowsUpdateRebootBehavior {
+  k_EWindowsUpdateRebootBehavior_Unknown = -1;
+  k_EWindowsUpdateRebootBehavior_NeverNeedsReboot = 0;
+  k_EWindowsUpdateRebootBehavior_AlwaysNeedsReboot = 1;
+  k_EWindowsUpdateRebootBehavior_MightNeedReboot = 2;
+}
+
+enum EExternalSaleEventType {
+  k_EExternalSaleEventType_Unknown = 0;
+  k_EExternalSaleEventType_Publisher = 1;
+  k_EExternalSaleEventType_Showcase = 2;
+  k_EExternalSaleEventType_Region = 3;
+  k_EExternalSaleEventType_Theme = 4;
+  k_EExternalSaleEventType_Franchise = 5;
+}
diff --git a/...n/proto/in/dragonbra/javasteam/protobufs/steamclient/steammessages_auth.steamclient.proto b/...n/proto/in/dragonbra/javasteam/protobufs/steamclient/steammessages_auth.steamclient.proto
@@ -36,6 +36,14 @@ enum ETokenRenewalType {
   k_ETokenRenewalType_Allow = 1;
 }
 
+enum EAuthenticationType {
+  k_EAuthenticationType_Unknown = 0;
+  k_EAuthenticationType_Password = 1;
+  k_EAuthenticationType_QR = 2;
+  k_EAuthenticationType_AccountCreation = 3;
+  k_EAuthenticationType_GuestAccount = 4;
+}
+
 enum EAuthTokenRevokeAction {
   k_EAuthTokenRevokeLogout = 0;
   k_EAuthTokenRevokePermanent = 1;
@@ -219,6 +227,7 @@ message CAuthentication_RefreshToken_Enumerate_Response {
     optional .CAuthentication_RefreshToken_Enumerate_Response.TokenUsageEvent first_seen = 9;
     optional .CAuthentication_RefreshToken_Enumerate_Response.TokenUsageEvent last_seen = 10;
     optional int32 os_type = 11;
+    optional .EAuthenticationType authentication_type = 12 [default = k_EAuthenticationType_Unknown];
   }
 
   repeated .CAuthentication_RefreshToken_Enumerate_Response.RefreshTokenDescription refresh_tokens = 1;