🚑 Fix execution on WebGl (#5)

* 🚑 Fix execution on WebGl

Using UnityWebRequest when running inside Unity, as HttpClient is not fully supported in WebGL

* 🔖 Bump version to 2.6.0.8

* ✨ Add Istruction Account public key

Author: GabrielePicco

SharedBuildProperties.props

@@ -2,7 +2,7 @@
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Product>Solana.Unity</Product>
-    <Version>2.6.0.7</Version>
+    <Version>2.6.0.8</Version>
     <Copyright>Copyright 2022 &#169; Solana.Unity</Copyright>
     <Authors>garbles-dev</Authors>
     <PublisherName>garbles-dev</PublisherName>

build.cake

@@ -12,7 +12,8 @@ var testProjectsRelativePaths = new string[]
 };
 
 var target = Argument("target", "Pack");
-var configuration = Argument("configuration", "Release");
+var configuration = Argument("configuration", "Debug");
+var configurationRelease = Argument("configuration", "Release");
 var solutionFolder = "./";
 var artifactsDir = MakeAbsolute(Directory("artifacts"));
 
@@ -47,6 +48,16 @@ Task("Build")
         });
     });
 
+Task("BuildRelease")
+    .IsDependentOn("Clean")
+    .IsDependentOn("Restore")
+    .Does(() => {
+        DotNetCoreBuild(solutionFolder, new DotNetCoreBuildSettings
+        {
+            NoRestore = true,
+            Configuration = configurationRelease
+        });
+    });
 
 Task("Test")
     .IsDependentOn("Build")
@@ -94,11 +105,12 @@ Task("Report")
 
 Task("Publish")
     .IsDependentOn("Report")
+    .IsDependentOn("BuildRelease")
     .Does(() => {
         DotNetCorePublish(solutionFolder, new DotNetCorePublishSettings
         {
             NoRestore = true,
-            Configuration = configuration,
+            Configuration = configurationRelease,
             NoBuild = true,
             OutputDirectory = artifactsDir
         });
@@ -110,7 +122,7 @@ Task("Pack")
     {
         var settings = new DotNetCorePackSettings
         {
-            Configuration = configuration,
+            Configuration = configurationRelease,
             NoBuild = true,
             NoRestore = true,
             OutputDirectory = packagesDir,

src/Solana.Unity.Programs/SysVars.cs

@@ -30,5 +30,9 @@ public static readonly PublicKey
         /// The public key of the Stake History System Variable.
         /// </summary>
         public static readonly PublicKey StakeHistoryKey = new("SysvarStakeHistory1111111111111111111111111");
+        /// <summary>
+        /// The public key of the Instruction Account Variable.
+        /// </summary>
+        public static readonly PublicKey InstructionAccount = new("Sysvar1nstructions1111111111111111111111111");
     }
 }

src/Solana.Unity.Rpc/Core/Http/JsonRpcClient.cs

@@ -6,10 +6,13 @@
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using Solana.Unity.Rpc.Converters;
+using System.ComponentModel;
+using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using JsonException = Newtonsoft.Json.JsonException;
+using UnityEngine;
+using UnityEngine.Networking;
 
 namespace Solana.Unity.Rpc.Core.Http
 {
@@ -101,14 +104,12 @@ protected async Task<RequestResult<T>> SendRequest<T>(JsonRpcRequest req)
                 };
 
                 // execute POST
-                using (var response = await _httpClient.SendAsync(httpReq).ConfigureAwait(false))
+                using (var response = await SendAsyncRequest(_httpClient, httpReq))
                 {
                     var result = await HandleResult<T>(req, response).ConfigureAwait(false);
                     result.RawRpcRequest = requestJson;
                     return result;
                 }
-
-
             }
             catch (HttpRequestException e)
             {
@@ -130,10 +131,10 @@ protected async Task<RequestResult<T>> SendRequest<T>(JsonRpcRequest req)
                 }
                 return result;
             }
-
-
+            
         }
 
+
         /// <summary>
         /// Handles the result after sending a request.
         /// </summary>
@@ -143,7 +144,7 @@ protected async Task<RequestResult<T>> SendRequest<T>(JsonRpcRequest req)
         /// <returns>A task that represents the asynchronous operation that holds the request result.</returns>
         private async Task<RequestResult<T>> HandleResult<T>(JsonRpcRequest req, HttpResponseMessage response)
         {
-            RequestResult<T> result = new RequestResult<T>(response);
+            RequestResult<T> result = new(response);
             try
             {
                 result.RawRpcResponse = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
@@ -154,9 +155,10 @@ private async Task<RequestResult<T>> HandleResult<T>(JsonRpcRequest req, HttpRes
                 }
                 var res = JsonConvert.DeserializeObject<JsonRpcResponse<T>>(result.RawRpcResponse, _serializerOptions);
 
+                
                 if (res.Result != null)
                 {
-                    result.Result = (T)res.Result;
+                    result.Result = res.Result;
                     result.WasRequestSuccessfullyHandled = true;
                 }
                 else
@@ -226,7 +228,7 @@ public async Task<RequestResult<JsonRpcBatchResponse>> SendBatchRequestAsync(Jso
                 };
 
                 // execute POST
-                using (var response = await _httpClient.SendAsync(httpReq).ConfigureAwait(false))
+                using (var response = await SendAsyncRequest(_httpClient, httpReq))
                 {
                     var result = await HandleBatchResult(reqs, response).ConfigureAwait(false);
                     result.RawRpcRequest = requestsJson;
@@ -315,7 +317,74 @@ private async Task<RequestResult<JsonRpcBatchResponse>> HandleBatchResult(JsonRp
 
             return result;
         }
-
+        
+        /// <summary>
+        /// Return True if running on Unity, False otherwise
+        /// </summary>
+        /// <returns>Return True if running on Unity, False otherwise</returns>
+        private bool IsUnityPlayer()
+        {
+            #if NETSTANDARD2_0 && !DEBUG
+            try
+            {
+                if (Application.platform != null)
+                {
+                    return true;
+                }
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+            #endif
+            return false;
+        }
+        
+        /// <summary>
+        /// Send an async request using HttpClient or UnityWebRequest if running on Unity
+        /// </summary>
+        /// <param name="httpClient"></param>
+        /// <param name="httpReq"></param>
+        /// <returns></returns>
+        private async Task<HttpResponseMessage> SendAsyncRequest(HttpClient httpClient, HttpRequestMessage httpReq)
+        {
+            if (IsUnityPlayer())
+            {
+                return await SendUnityWebRequest(httpClient.BaseAddress, httpReq);
+            }
+            return await _httpClient.SendAsync(httpReq).ConfigureAwait(false);
+        }
+        
+        /// <summary>
+        /// Convert a httReq to a Unity Web request
+        /// </summary>
+        /// <param name="uri">RPC URI</param> 
+        /// <param name="httpReq">The http request</param>
+        /// <returns>Http response</returns>
+        /// <exception cref="HttpRequestException"></exception>
+        private async Task<HttpResponseMessage> SendUnityWebRequest(Uri uri, HttpRequestMessage httpReq)
+        {
+            Byte[] buffer = await httpReq.Content.ReadAsByteArrayAsync();
+            Console.WriteLine($"Send A");
+            using (var request = new UnityWebRequest(uri, httpReq.Method.ToString()))
+            {
+                request.uploadHandler = new UploadHandlerRaw(buffer);
+                request.downloadHandler = new DownloadHandlerBuffer();
+                request.SetRequestHeader("Content-Type", "application/json");
+                request.SendWebRequest();
+                if (request.result == UnityWebRequest.Result.ConnectionError)
+                {
+                    throw new HttpRequestException("Error While Sending: " + request.error);
+                }
+                while (!request.isDone)
+                {
+                    await Task.Yield();
+                }
+                var response = new HttpResponseMessage(HttpStatusCode.OK);
+                response.Content = new ByteArrayContent(Encoding.UTF8.GetBytes(request.downloadHandler.text));
+                return response;
+            }
+        }
     }
 
 }

src/Solana.Unity.Rpc/Solana.Unity.Rpc.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.*" />
     <PackageReference Include="System.Collections.Immutable" Version="6.0.*" />
     <PackageReference Include="IsExternalInit" Version="1.0.*" PrivateAssets="all" />
+    <PackageReference Include="Unity3D.SDK" Version="2021.*" />
     <ProjectReference Include="..\Solana.Unity.Wallet\Solana.Unity.Wallet.csproj" />
   </ItemGroup>