Generate protobufs ourselves using protobuf-net.Reflection

Resources/NetHookAnalyzer2/NetHookAnalyzer2/EMsgExtensions.cs

@@ -44,7 +44,6 @@ static IEnumerable<Type> GetGCEMsgEnums(uint appId)
 					yield return typeof(Dota.EDOTAGCMsg);
 					yield return typeof(Dota.EGCBaseMsg);
 					yield return typeof(Dota.ESOMsg);
-					yield return typeof(Dota.EGCSystemMsg);
 					yield return typeof(Dota.EGCItemMsg);
 					yield return typeof(Dota.EGCBaseClientMsg);
 					break;

Resources/NetHookAnalyzer2/NetHookAnalyzer2/NetHookAnalyzer2.csproj

@@ -33,11 +33,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="protobuf-net, Version=2.1.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
-      <HintPath>..\packages\protobuf-net.2.1.0\lib\net451\protobuf-net.dll</HintPath>
+    <Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.2.4.1\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

Resources/NetHookAnalyzer2/NetHookAnalyzer2/ProtoBufFieldReader.cs

@@ -10,7 +10,7 @@ class ProtoBufFieldReader
 		public static Dictionary<int, List<object>> ReadProtobuf(Stream stream)
 		{
 			// try reading it as a protobuf
-			using (var reader = new ProtoReader(stream, null, null))
+			using (var reader = ProtoReader.Create(stream, null))
 			{
 				var fields = new Dictionary<int, List<object>>();
 

Resources/NetHookAnalyzer2/NetHookAnalyzer2/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="protobuf-net" version="2.1.0" targetFramework="net46" />
+  <package id="protobuf-net" version="2.4.1" targetFramework="net472" />
 </packages>

Resources/ProtobufGen/ProtobufGen.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.352
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtobufGen", "ProtobufGen\ProtobufGen.csproj", "{DDC1D975-336F-4F3A-BCEA-D0DE5CEC6188}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DDC1D975-336F-4F3A-BCEA-D0DE5CEC6188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDC1D975-336F-4F3A-BCEA-D0DE5CEC6188}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDC1D975-336F-4F3A-BCEA-D0DE5CEC6188}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDC1D975-336F-4F3A-BCEA-D0DE5CEC6188}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {31851CBB-4C49-402C-9F8B-42476FEDA58A}
+	EndGlobalSection
+EndGlobal

Resources/ProtobufGen/ProtobufGen/Program.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using CommandLine;
+using Google.Protobuf.Reflection;
+
+namespace ProtobufGen
+{
+    static class Program
+    {
+        public static int Main( string[] args )
+        {
+            var arguments = Parser.Default.ParseArguments<Options>( args );
+            switch ( arguments.Tag )
+            {
+                case ParserResultType.Parsed:
+                    var value = ( ( Parsed<Options> )arguments ).Value;
+                    return Run( value );
+
+                case ParserResultType.NotParsed:
+                    // The library will automatically write help text. 
+                    return -1;
+
+                default:
+                    // This should be unreachable.
+                    return int.MinValue;
+            }
+        }
+
+        static int Run( Options arguments )
+        {
+            var set = ParseFiles( arguments );
+
+            if ( set == null )
+            {
+                return -1;
+            }
+
+            var errors = set.GetErrors();
+            PrintErrors( errors, out var numErrors, out var reparse );
+
+            if ( numErrors > 0 )
+            {
+                return numErrors;
+            }
+            else if ( reparse )
+            {
+                set = ReparseFiles( arguments, set );
+                errors = set.GetErrors();
+                PrintErrors( errors, out numErrors, out reparse );
+
+                Debug.Assert( numErrors == 0, "Errors should have been handled by first pass." );
+                Debug.Assert( !reparse, "Should not have to reparse after second pass." );
+            }
+
+            var codegen = new SteamKitCSharpCodeGenerator();
+
+            var options = new Dictionary<string, string>
+            {
+                [ "langver" ] = "7.0",
+                [ "names" ] = "original",
+                [ "services" ] = "1",
+            };
+
+            var files = codegen.Generate( set, options: options );
+            var fileName = Path.GetFileName( arguments.ProtobufPath );
+
+            foreach ( var file in files )
+            {
+                if ( Path.GetFileNameWithoutExtension( file.Name ) != Path.GetFileNameWithoutExtension( fileName ) )
+                {
+                    continue;
+                }
+
+                File.WriteAllText( arguments.Output, file.Text );
+            }
+
+            return 0;
+        }
+
+        static FileDescriptorSet ParseFiles( Options arguments )
+        {
+            var set = new FileDescriptorSet
+            {
+                DefaultPackage = arguments.Namespace
+            };
+            set.AddImportPath( Path.GetDirectoryName( arguments.ProtobufPath ) );
+
+            var fileName = Path.GetFileName( arguments.ProtobufPath );
+            if ( !set.Add( fileName, includeInOutput: true ) )
+            {
+                Console.Error.WriteLine( $"Could not find file '{fileName}'." );
+                return null;
+            }
+
+            set.Process();
+            return set;
+        }
+
+        static FileDescriptorSet ReparseFiles( Options arguments, FileDescriptorSet firstPass )
+        {
+            var set = new FileDescriptorSet
+            {
+                DefaultPackage = firstPass.DefaultPackage
+            };
+
+            set.AddImportPath( Path.GetDirectoryName( arguments.ProtobufPath ) );
+
+            foreach ( var file in firstPass.Files )
+            {
+                if ( string.IsNullOrEmpty( file.Syntax ) )
+                {
+                    file.Syntax = "proto2";
+                }
+                set.Files.Add( file );
+            }
+
+            set.Process();
+            return set;
+        }
+
+        static void PrintErrors( ProtoBuf.Reflection.Error[] errors, out int numErrors, out bool reparse )
+        {
+            numErrors = 0;
+            reparse = false;
+
+            if ( errors.Length > 0 )
+            {
+                foreach ( var error in errors )
+                {
+                    if ( error.IsError )
+                    {
+                        numErrors++;
+                    }
+
+                    if ( error.IsWarning && error.Message.StartsWith( "no syntax specified;" ) )
+                    {
+                        reparse = true;
+                    }
+                    else if ( !error.IsWarning || !error.Message.StartsWith( "import not used:" ) )
+                    {
+                        Console.Error.WriteLine( $"{error.File} ({error.LineNumber}, {error.ColumnNumber}): {error.Message}" );
+                    }
+                }
+            }
+        }
+    }
+
+    class Options
+    {
+        [Option( "namespace" )]
+        public string Namespace { get; set; }
+
+        [Option( "proto", Required = true )]
+        public string ProtobufPath { get; set; }
+
+        [Option( "output", Required = true )]
+        public string Output { get; set; }
+    }
+}

Resources/ProtobufGen/ProtobufGen/ProtobufGen.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="2.5.0" />
+    <PackageReference Include="protobuf-net.Reflection" Version="3.0.0-alpha.91" />
+  </ItemGroup>
+
+</Project>

Resources/ProtobufGen/ProtobufGen/SteamKitCSharpCodeGenerator.cs

@@ -0,0 +1,56 @@
+using Google.Protobuf.Reflection;
+using ProtoBuf.Reflection;
+
+namespace ProtobufGen
+{
+    public class SteamKitCSharpCodeGenerator : CSharpCodeGenerator
+    {
+        public SteamKitCSharpCodeGenerator()
+            : base()
+        {
+        }
+
+        protected override bool UseArray( FieldDescriptorProto field ) => false;
+
+        protected override void WriteExtension( GeneratorContext ctx, FieldDescriptorProto field )
+        {
+        }
+
+        protected override void WriteExtensionsHeader( GeneratorContext ctx, DescriptorProto message, ref object state )
+        {
+        }
+
+        protected override void WriteExtensionsHeader( GeneratorContext ctx, FileDescriptorProto file, ref object state )
+        {
+        }
+
+        protected override void WriteExtensionsFooter( GeneratorContext ctx, DescriptorProto message, ref object state )
+        {
+        }
+
+        protected override void WriteExtensionsFooter( GeneratorContext ctx, FileDescriptorProto file, ref object state )
+        {
+        }
+
+        /// <summary>
+        /// Starts a service block
+        /// </summary>
+        protected override void WriteServiceHeader( GeneratorContext ctx, ServiceDescriptorProto service, ref object state )
+        {
+            ctx.WriteLine( $"{GetAccess( GetAccess( service ) )} interface I{Escape( service.Name )}" ).WriteLine( "{" ).Indent();
+        }
+
+        protected override void WriteServiceFooter( GeneratorContext ctx, ServiceDescriptorProto service, ref object state )
+        {
+            ctx.Outdent().WriteLine( "}" ).WriteLine();
+        }
+
+        protected override void WriteServiceMethod( GeneratorContext ctx, MethodDescriptorProto method, ref object state )
+        {
+            var outputType = MakeRelativeName( ctx, method.OutputType );
+            var inputType = MakeRelativeName( ctx, method.InputType );
+
+            ctx.WriteLine( $"{Escape( outputType )} {Escape( method.Name )}({Escape( inputType )} request);" );
+        }
+    }
+}

Resources/Protogen/gc.proto → Resources/ProtobufGen/gc.proto

@@ -1,21 +1,21 @@
-enum GCProtoBufMsgSrc {
-	GCProtoBufMsgSrc_Unspecified = 0;
-	GCProtoBufMsgSrc_FromSystem = 1;
-	GCProtoBufMsgSrc_FromSteamID = 2;
-	GCProtoBufMsgSrc_FromGC = 3;
-	GCProtoBufMsgSrc_ReplySystem = 4;
-}
-
-message CMsgProtoBufHeader {
-	optional fixed64 client_steam_id = 1;
-	optional int32 client_session_id = 2;
-	optional uint32 source_app_id = 3;
-	optional fixed64 job_id_source = 10 [default = 18446744073709551615];
-	optional fixed64 job_id_target = 11 [default = 18446744073709551615];
-	optional string target_job_name = 12;
-	optional int32 eresult = 13 [default = 2];
-	optional string error_message = 14;
-	optional uint32 ip = 15;
-	optional .GCProtoBufMsgSrc gc_msg_src = 200 [default = GCProtoBufMsgSrc_Unspecified];
-	optional uint32 gc_dir_index_source = 201;
-}
+enum GCProtoBufMsgSrc {
+	GCProtoBufMsgSrc_Unspecified = 0;
+	GCProtoBufMsgSrc_FromSystem = 1;
+	GCProtoBufMsgSrc_FromSteamID = 2;
+	GCProtoBufMsgSrc_FromGC = 3;
+	GCProtoBufMsgSrc_ReplySystem = 4;
+}
+
+message CMsgProtoBufHeader {
+	optional fixed64 client_steam_id = 1;
+	optional int32 client_session_id = 2;
+	optional uint32 source_app_id = 3;
+	optional fixed64 job_id_source = 10 [default = 18446744073709551615];
+	optional fixed64 job_id_target = 11 [default = 18446744073709551615];
+	optional string target_job_name = 12;
+	optional int32 eresult = 13 [default = 2];
+	optional string error_message = 14;
+	optional uint32 ip = 15;
+	optional .GCProtoBufMsgSrc gc_msg_src = 200 [default = GCProtoBufMsgSrc_Unspecified];
+	optional uint32 gc_dir_index_source = 201;
+}