-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Import TransportLayer logic from C# SDK, add WebGL Threading Patcher,…
… implement Unity-side IHttpClientService
- Loading branch information
1 parent
4854227
commit 753d2ea
Showing
6 changed files
with
239 additions
and
8 deletions.
There are no files selected for viewing
Binary file modified
BIN
-34.5 KB
(96%)
PubNubUnity/Assets/PubNub/Runtime/Plugins/PubnubApiUnity.dll
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
194 changes: 194 additions & 0 deletions
194
PubNubUnity/Assets/PubNub/Runtime/Util/UnityHttpClientService.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,194 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using UnityEngine.Networking; | ||
|
|
||
| namespace PubnubApi.Unity { | ||
|
|
||
| public class UnityHttpClientService : IHttpClientService { | ||
| private TransportResponse UnityRequestToResponse(UnityWebRequest request) { | ||
| return new TransportResponse() { | ||
| StatusCode = (int)request.responseCode, | ||
| Content = request.downloadHandler?.data, | ||
| RequestUrl = request.url, | ||
| Error = new Exception(request.error), | ||
| Headers = request.GetResponseHeaders() | ||
| .ToDictionary( | ||
| x => x.Key, | ||
| y => (IEnumerable<string>)new[] { y.Value }) | ||
| }; | ||
| } | ||
|
|
||
| private void PrepareUnityRequest(UnityWebRequest request, TransportRequest transportRequest) { | ||
| if (transportRequest.Timeout.HasValue) { | ||
| request.timeout = (int)transportRequest.Timeout.Value.TotalSeconds; | ||
| } | ||
|
|
||
| if (transportRequest.Headers.Keys.Count > 0) { | ||
| foreach (var kvp in transportRequest.Headers) { | ||
| request.SetRequestHeader(kvp.Key, kvp.Value); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public async Task<TransportResponse> DeleteRequest(TransportRequest transportRequest) { | ||
| TransportResponse response; | ||
| try { | ||
| var deleteRequest = UnityWebRequest.Delete(transportRequest.RequestUrl); | ||
| PrepareUnityRequest(deleteRequest, transportRequest); | ||
| var taskCompletionSource = new TaskCompletionSource<TransportResponse>(); | ||
| deleteRequest.SendWebRequest().completed += _ => { | ||
| //will raise an exception if cancellation token is triggered | ||
| //but shouldn't because we also Abort (probably?) | ||
| taskCompletionSource.SetResult(UnityRequestToResponse(deleteRequest)); | ||
| }; | ||
| await using (transportRequest.CancellationToken.Register(() => { | ||
| deleteRequest.Abort(); | ||
| taskCompletionSource.TrySetCanceled(); | ||
| })) { | ||
| response = await taskCompletionSource.Task; | ||
| } | ||
| } catch (Exception ex) { | ||
| response = new TransportResponse() { | ||
| RequestUrl = transportRequest.RequestUrl, | ||
| Error = ex | ||
| }; | ||
| } | ||
|
|
||
| return response; | ||
| } | ||
|
|
||
| public async Task<TransportResponse> GetRequest(TransportRequest transportRequest) { | ||
| TransportResponse response; | ||
| try { | ||
| var getRequest = UnityWebRequest.Get(transportRequest.RequestUrl); | ||
| PrepareUnityRequest(getRequest, transportRequest); | ||
| var taskCompletionSource = new TaskCompletionSource<TransportResponse>(); | ||
| getRequest.SendWebRequest().completed += _ => { | ||
| //will raise an exception if cancellation token is triggered | ||
| //but shouldn't because we also Abort (probably?) | ||
| taskCompletionSource.SetResult(UnityRequestToResponse(getRequest)); | ||
| }; | ||
| await using (transportRequest.CancellationToken.Register(() => { | ||
| getRequest.Abort(); | ||
| taskCompletionSource.TrySetCanceled(); | ||
| })) { | ||
| response = await taskCompletionSource.Task; | ||
| } | ||
| } catch (Exception ex) { | ||
| response = new TransportResponse() { | ||
| RequestUrl = transportRequest.RequestUrl, | ||
| Error = ex | ||
| }; | ||
| } | ||
|
|
||
| return response; | ||
| } | ||
|
|
||
| public async Task<TransportResponse> PostRequest(TransportRequest transportRequest) { | ||
| TransportResponse response; | ||
| try { | ||
| var formData = new List<IMultipartFormSection>(); | ||
| if (!string.IsNullOrEmpty(transportRequest.BodyContentString)) { | ||
| formData.Add(new MultipartFormDataSection(transportRequest.BodyContentString)); | ||
| } else if (transportRequest.BodyContentBytes != null) { | ||
| formData.Add(new MultipartFormDataSection(transportRequest.BodyContentBytes)); | ||
| } | ||
|
|
||
| var postRequest = UnityWebRequest.Post(transportRequest.RequestUrl, formData); | ||
| PrepareUnityRequest(postRequest, transportRequest); | ||
| var taskCompletionSource = new TaskCompletionSource<TransportResponse>(); | ||
| postRequest.SendWebRequest().completed += _ => { | ||
| //will raise an exception if cancellation token is triggered | ||
| //but shouldn't because we also Abort (probably?) | ||
| taskCompletionSource.SetResult(UnityRequestToResponse(postRequest)); | ||
| }; | ||
| await using (transportRequest.CancellationToken.Register(() => { | ||
| postRequest.Abort(); | ||
| taskCompletionSource.TrySetCanceled(); | ||
| })) { | ||
| response = await taskCompletionSource.Task; | ||
| } | ||
| } catch (Exception ex) { | ||
| response = new TransportResponse() { | ||
| RequestUrl = transportRequest.RequestUrl, | ||
| Error = ex | ||
| }; | ||
| } | ||
|
|
||
| return response; | ||
| } | ||
|
|
||
| public async Task<TransportResponse> PatchRequest(TransportRequest transportRequest) { | ||
| TransportResponse response; | ||
| try { | ||
| UnityWebRequest patchRequest; | ||
| if (!string.IsNullOrEmpty(transportRequest.BodyContentString)) { | ||
| patchRequest = UnityWebRequest.Put(transportRequest.RequestUrl, transportRequest.BodyContentString); | ||
| } else if (transportRequest.BodyContentBytes != null) { | ||
| patchRequest = UnityWebRequest.Put(transportRequest.RequestUrl, transportRequest.BodyContentBytes); | ||
| } else { | ||
| throw new ArgumentException("PATCH Transport Request has no body!"); | ||
| } | ||
| patchRequest.method = "PATCH"; | ||
|
|
||
| PrepareUnityRequest(patchRequest, transportRequest); | ||
| var taskCompletionSource = new TaskCompletionSource<TransportResponse>(); | ||
| patchRequest.SendWebRequest().completed += _ => { | ||
| //will raise an exception if cancellation token is triggered | ||
| //but shouldn't because we also Abort (probably?) | ||
| taskCompletionSource.SetResult(UnityRequestToResponse(patchRequest)); | ||
| }; | ||
| await using (transportRequest.CancellationToken.Register(() => { | ||
| patchRequest.Abort(); | ||
| taskCompletionSource.TrySetCanceled(); | ||
| })) { | ||
| response = await taskCompletionSource.Task; | ||
| } | ||
| } catch (Exception ex) { | ||
| response = new TransportResponse() { | ||
| RequestUrl = transportRequest.RequestUrl, | ||
| Error = ex | ||
| }; | ||
| } | ||
|
|
||
| return response; | ||
| } | ||
|
|
||
| public async Task<TransportResponse> PutRequest(TransportRequest transportRequest) { | ||
| TransportResponse response; | ||
| try { | ||
| UnityWebRequest putRequest; | ||
| if (!string.IsNullOrEmpty(transportRequest.BodyContentString)) { | ||
| putRequest = UnityWebRequest.Put(transportRequest.RequestUrl, transportRequest.BodyContentString); | ||
| } else if (transportRequest.BodyContentBytes != null) { | ||
| putRequest = UnityWebRequest.Put(transportRequest.RequestUrl, transportRequest.BodyContentBytes); | ||
| } else { | ||
| throw new ArgumentException("PUT Transport Request has no body!"); | ||
| } | ||
|
|
||
| PrepareUnityRequest(putRequest, transportRequest); | ||
| var taskCompletionSource = new TaskCompletionSource<TransportResponse>(); | ||
| putRequest.SendWebRequest().completed += _ => { | ||
| //will raise an exception if cancellation token is triggered | ||
| //but shouldn't because we also Abort (probably?) | ||
| taskCompletionSource.SetResult(UnityRequestToResponse(putRequest)); | ||
| }; | ||
| await using (transportRequest.CancellationToken.Register(() => { | ||
| putRequest.Abort(); | ||
| taskCompletionSource.TrySetCanceled(); | ||
| })) { | ||
| response = await taskCompletionSource.Task; | ||
| } | ||
| } catch (Exception ex) { | ||
| response = new TransportResponse() { | ||
| RequestUrl = transportRequest.RequestUrl, | ||
| Error = ex | ||
| }; | ||
| } | ||
|
|
||
| return response; | ||
| } | ||
| } | ||
| } |
11 changes: 11 additions & 0 deletions
11
PubNubUnity/Assets/PubNub/Runtime/Util/UnityHttpClientService.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters