Add hint for AOT compile in CodeGenerator (Generic classes)

zestyroad · zestyroad · commit 0deec903dc8b · 2020-11-25T09:20:58.000+09:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 EuNet C# (.NET, .NET Core, Unity)
 ===
-[![GitHub Actions](https://github.com/zestylife/EuNet/workflows/Build-Debug/badge.svg)](https://github.com/zestylife/EuNet/actions) [![GitHub Actions](https://github.com/zestylife/EuNet/workflows/Build-Release/badge.svg)](https://github.com/zestylife/EuNet/actions) [![Releases](https://img.shields.io/github/v/release/zestylife/EuNet)](https://github.com/zestylife/EuNet/releases)
+[![GitHub Actions](https://github.com/zestylife/EuNet/workflows/Build-Debug/badge.svg)](https://github.com/zestylife/EuNet/actions) [![GitHub Actions](https://github.com/zestylife/EuNet/workflows/Build-Release/badge.svg)](https://github.com/zestylife/EuNet/actions) [![nuget](https://img.shields.io/nuget/dt/EuNet.svg)](https://www.nuget.org/packages/EuNet/) [![Releases](https://img.shields.io/github/v/release/zestylife/EuNet)](https://github.com/zestylife/EuNet/releases)
 
 Easy Unity Network (EuNet) is a network solution for multiplayer games.
 
@@ -130,9 +130,9 @@ You can add package from UPM (Unity Package Manager)
 ```
 https://github.com/zestylife/EuNet.git?path=src/EuNet.Unity/Assets/Plugins/EuNet
 ``` 
-If you want to add a specific release version, add `#version` after the url. ex) version 1.1.11
+If you want to add a specific release version, add `#version` after the url. ex) version 1.1.13
 ```
-https://github.com/zestylife/EuNet.git?path=src/EuNet.Unity/Assets/Plugins/EuNet#1.1.11
+https://github.com/zestylife/EuNet.git?path=src/EuNet.Unity/Assets/Plugins/EuNet#1.1.13
 ``` 
 
 ![image](https://github.com/zestylife/EuNet/blob/main/doc/images/AddPackageFromUPM.png?raw=true)
diff --git a/sandbox/Dev/Client/Assets/Shared/Common/CodeGen/EuNet.Rpc.CodeGen.cs b/sandbox/Dev/Client/Assets/Shared/Common/CodeGen/EuNet.Rpc.CodeGen.cs
@@ -763,6 +763,21 @@ public static string GetEnumName(int rpcNameHash)
     }
 }
 
+#endregion
+#region Common.AOT
+
+namespace Common.AOT
+{
+    public sealed class AotCode
+    {
+        private void UsedOnlyForAOTCodeGeneration()
+        {
+            
+            throw new InvalidOperationException("This method is used for AOT code generation only.Do not call it at runtime.");
+        }
+    }
+}
+
 #endregion
 #region Common.UserInfo
 
diff --git a/sandbox/Dev/Common/CodeGen/EuNet.Rpc.CodeGen.cs b/sandbox/Dev/Common/CodeGen/EuNet.Rpc.CodeGen.cs
@@ -763,6 +763,21 @@ public static string GetEnumName(int rpcNameHash)
     }
 }
 
+#endregion
+#region Common.AOT
+
+namespace Common.AOT
+{
+    public sealed class AotCode
+    {
+        private void UsedOnlyForAOTCodeGeneration()
+        {
+            
+            throw new InvalidOperationException("This method is used for AOT code generation only.Do not call it at runtime.");
+        }
+    }
+}
+
 #endregion
 #region Common.UserInfo
 
diff --git a/src/EuNet.Client/EuNet.Client.csproj b/src/EuNet.Client/EuNet.Client.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>zestylife</Authors>
     <Company></Company>
-    <Version>1.1.13</Version>
+    <Version>1.1.14</Version>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/zestylife/EuNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/zestylife/EuNet</RepositoryUrl>
diff --git a/src/EuNet.CodeGenerator.Templates/EuNet.CodeGenerator.Templates.csproj b/src/EuNet.CodeGenerator.Templates/EuNet.CodeGenerator.Templates.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.1.13</Version>
+    <Version>1.1.14</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageOutputPath>../../nupkg</PackageOutputPath>
     <NuspecFile>EuNet.CodeGenerator.Templates.nuspec</NuspecFile>
diff --git a/src/EuNet.CodeGenerator.Templates/EuNet.CodeGenerator.Templates.nuspec b/src/EuNet.CodeGenerator.Templates/EuNet.CodeGenerator.Templates.nuspec
@@ -3,7 +3,7 @@
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>EuNet.CodeGenerator.Templates</id>
     <title>EuNet.CodeGenerator.Templates</title>
-    <version>1.1.13</version>
+    <version>1.1.14</version>
     <authors>zestylife</authors>
     <owners>zestylife</owners>
     <description>EuNet.CodeGenerator.Templates</description>
@@ -13,8 +13,8 @@
     <releaseNotes>EuNet.CodeGenerator.Templates</releaseNotes>
     <tags>C# TCP P2P UDP Network Unity RPC HolePunching Relay</tags>
     <dependencies>
-      <dependency id="EuNet.Core" version="1.1.13" />
-      <dependency id="EuNet.Rpc" version="1.1.13" />
+      <dependency id="EuNet.Core" version="1.1.14" />
+      <dependency id="EuNet.Rpc" version="1.1.14" />
     </dependencies>
     <references>
     </references>
diff --git a/src/EuNet.CodeGenerator/EuNet.CodeGenerator.csproj b/src/EuNet.CodeGenerator/EuNet.CodeGenerator.csproj
@@ -6,7 +6,7 @@
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>enc</ToolCommandName>
     <PackageOutputPath>../../nupkg</PackageOutputPath>
-    <Version>1.1.13</Version>
+    <Version>1.1.14</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/EuNet.Core/EuNet.Core.csproj b/src/EuNet.Core/EuNet.Core.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>zestylife</Authors>
     <Company></Company>
-    <Version>1.1.13</Version>
+    <Version>1.1.14</Version>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/zestylife/EuNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/zestylife/EuNet</RepositoryUrl>
diff --git a/src/EuNet.Core/Util/NetUtil.cs b/src/EuNet.Core/Util/NetUtil.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Net;
+using System.Net.Sockets;
 
 namespace EuNet.Core
 {
@@ -36,6 +37,29 @@ public static IPEndPoint GetEndPoint(string address, int port)
             return null;
         }
 
+        public static string GetPublicIpAddress(int timeoutMilliseconds = 5000)
+        {
+            var client = new WebClient();
+            var task = client.DownloadStringTaskAsync("http://icanhazip.com");
+            if (task.Wait(timeoutMilliseconds) == false)
+                return string.Empty;
+
+            return task.Result.Trim();
+        }
+
+        public static string GetLocalIpAddress()
+        {
+            IPHostEntry host = Dns.GetHostEntry(Dns.GetHostName());
+            for (int i = 0; i < host.AddressList.Length; i++)
+            {
+                if (host.AddressList[i].AddressFamily == AddressFamily.InterNetwork)
+                {
+                    return host.AddressList[i].ToString();
+                }
+            }
+            return string.Empty;
+        }
+
         internal static int RelativeSequenceNumber(int number, int expected)
         {
             return (number - expected + NetPacket.MaxSequence + NetPacket.HalfMaxSequence) % NetPacket.MaxSequence - NetPacket.HalfMaxSequence;
diff --git a/src/EuNet.Rpc/EuNet.Rpc.csproj b/src/EuNet.Rpc/EuNet.Rpc.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>zestylife</Authors>
     <Company></Company>
-    <Version>1.1.13</Version>
+    <Version>1.1.14</Version>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/zestylife/EuNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/zestylife/EuNet</RepositoryUrl>
diff --git a/src/EuNet.Server/EuNet.Server.csproj b/src/EuNet.Server/EuNet.Server.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>zestylife</Authors>
     <Company></Company>
-    <Version>1.1.13</Version>
+    <Version>1.1.14</Version>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/zestylife/EuNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/zestylife/EuNet</RepositoryUrl>
diff --git a/src/EuNet.Server/Server/NetServer.cs b/src/EuNet.Server/Server/NetServer.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -131,6 +132,8 @@ public void AddRpcService(IRpcInvokable service)
             if (_rpcHandlers.Contains(service))
                 throw new Exception("Already exist IRpcInvokable in _rpcHandlers");
 
+            _logger.LogInformation($"Add Rpc Service : {service.GetType().Name}");
+
             _rpcHandlers.Add(service);
         }
 
@@ -139,6 +142,15 @@ public void AddRpcService(IRpcInvokable service)
         /// </summary>
         public async Task StartAsync()
         {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendLine();
+            builder.AppendLine();
+            builder.AppendLine($"----------\t[{_serverOption.Name}] powered by EuNet\t----------");
+            builder.AppendLine();
+            try { builder.AppendLine($"Public IP : {NetUtil.GetPublicIpAddress()}"); } catch { }
+            try { builder.AppendLine($"Private IP : {NetUtil.GetLocalIpAddress()}"); } catch { }
+            _logger.LogInformation(builder.ToString());
+
             var state = _state;
 
             if (state != ServerState.None && state != ServerState.Stopped)
diff --git a/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Util/NetUtil.cs b/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Util/NetUtil.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Net;
+using System.Net.Sockets;
 
 namespace EuNet.Core
 {
@@ -36,6 +37,29 @@ public static IPEndPoint GetEndPoint(string address, int port)
             return null;
         }
 
+        public static string GetPublicIpAddress(int timeoutMilliseconds = 5000)
+        {
+            var client = new WebClient();
+            var task = client.DownloadStringTaskAsync("http://icanhazip.com");
+            if (task.Wait(timeoutMilliseconds) == false)
+                return string.Empty;
+
+            return task.Result.Trim();
+        }
+
+        public static string GetLocalIpAddress()
+        {
+            IPHostEntry host = Dns.GetHostEntry(Dns.GetHostName());
+            for (int i = 0; i < host.AddressList.Length; i++)
+            {
+                if (host.AddressList[i].AddressFamily == AddressFamily.InterNetwork)
+                {
+                    return host.AddressList[i].ToString();
+                }
+            }
+            return string.Empty;
+        }
+
         internal static int RelativeSequenceNumber(int number, int expected)
         {
             return (number - expected + NetPacket.MaxSequence + NetPacket.HalfMaxSequence) % NetPacket.MaxSequence - NetPacket.HalfMaxSequence;
diff --git a/src/EuNet.Unity/Assets/Scripts/Rpc/DataEnum.cs.meta b/src/EuNet.Unity/Assets/Scripts/Rpc/DataEnum.cs.meta
diff --git a/src/EuNet.UnityShims/EuNet.UnityShims.csproj b/src/EuNet.UnityShims/EuNet.UnityShims.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>zestylife</Authors>
     <Company></Company>
-    <Version>1.1.13</Version>
+    <Version>1.1.14</Version>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/zestylife/EuNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/zestylife/EuNet</RepositoryUrl>
diff --git a/src/EuNet/EuNet.csproj b/src/EuNet/EuNet.csproj
@@ -4,7 +4,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>zestylife</Authors>
     <Company></Company>
-    <Version>1.1.13</Version>
+    <Version>1.1.14</Version>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/zestylife/EuNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/zestylife/EuNet</RepositoryUrl>
