Merge pull request #177 from shiguredo/feature/fix-rpc-timeout

RPC タイムアウトの処理を修正する

Author: melpon

SoraUnitySdkExamples/.vscode/settings.json

@@ -52,5 +52,5 @@
         "temp/": true,
         "Temp/": true
     },
-    "dotnet.defaultSolution": "SoraUnitySdkExamples.sln"
+    "dotnet.defaultSolution": "SoraUnitySdkExamples.slnx"
 }

SoraUnitySdkExamples/Assets/SoraSample.cs

@@ -1206,15 +1206,12 @@ void HandleRpcResult(Sora.RpcResult result)
     {
         switch (result.ResultKind)
         {
-            case Sora.RpcResultKind.ResponseReceived:
+            case Sora.RpcResultKind.Response:
                 Debug.LogFormat("RPC response: method={0}, response={1}", result.Method, result.ResponseJson);
                 break;
             case Sora.RpcResultKind.Timeout:
                 Debug.LogErrorFormat("RPC timeout: method={0}", result.Method);
                 break;
-            case Sora.RpcResultKind.Canceled:
-                Debug.LogWarningFormat("RPC canceled: method={0}", result.Method);
-                break;
         }
     }
 
@@ -1227,7 +1224,7 @@ void RequestRpcWithInspectorSettings(string method, string paramsJson)
 
         if (string.IsNullOrWhiteSpace(rpcTimeoutMillis))
         {
-            sora.RequestRpc(method, paramsJson, HandleRpcResult);
+            sora.RequestRpc(method, paramsJson, HandleRpcResult, Sora.DefaultRpcTimeoutMillis);
             return;
         }
 
@@ -1237,11 +1234,6 @@ void RequestRpcWithInspectorSettings(string method, string paramsJson)
             Debug.LogErrorFormat("RPC timeoutMillis の形式が不正です: timeoutMillis={0}", rpcTimeoutMillis);
             return;
         }
-        if (timeoutMillis <= 0)
-        {
-            Debug.LogErrorFormat("RPC timeoutMillis は 1 以上を指定してください: timeoutMillis={0}", timeoutMillis);
-            return;
-        }
 
         sora.RequestRpc(method, paramsJson, HandleRpcResult, timeoutMillis);
     }