From 8a5936834dbd2cf536ae720af4e499e429310d15 Mon Sep 17 00:00:00 2001
From: Tim <cassell.timothy@gmail.com>
Date: Sun, 25 Sep 2022 11:39:39 -0400
Subject: [PATCH] Switch RSG to ProtoPromise.

---
 .../Proyecto26.RestClient.csproj              |   8 +-
 .../Proyecto26.RestClient.nuspec              |   3 +-
 .../RestClientPromise.cs                      | 189 +++++++++---------
 src/Proyecto26.RestClient/packages.config     |   3 +-
 4 files changed, 101 insertions(+), 102 deletions(-)

diff --git a/src/Proyecto26.RestClient/Proyecto26.RestClient.csproj b/src/Proyecto26.RestClient/Proyecto26.RestClient.csproj
index 9c255c1..fc2e89e 100644
--- a/src/Proyecto26.RestClient/Proyecto26.RestClient.csproj
+++ b/src/Proyecto26.RestClient/Proyecto26.RestClient.csproj
@@ -53,8 +53,12 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="RSG.Promise">
-      <HintPath>..\packages\RSG.Promise.3.0.1\lib\net35\RSG.Promise.dll</HintPath>
+    <Reference Include="ProtoPromise, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ProtoPromise.2.3.0\lib\net35\Release\ProtoPromise.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ProtoPromiseUnityHelpers, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ProtoPromiseUnityHelpers.2.3.0\lib\net35\Release\ProtoPromiseUnityHelpers.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine">
diff --git a/src/Proyecto26.RestClient/Proyecto26.RestClient.nuspec b/src/Proyecto26.RestClient/Proyecto26.RestClient.nuspec
index 0a35221..dfd754d 100644
--- a/src/Proyecto26.RestClient/Proyecto26.RestClient.nuspec
+++ b/src/Proyecto26.RestClient/Proyecto26.RestClient.nuspec
@@ -21,7 +21,8 @@
     <copyright>Copyright ©2019 Proyecto 26</copyright>
     <tags>Unity Promises Http Rest http-client HttpClient rest-client RestClient Request API Requests APIs JSON Networking</tags>
     <dependencies>
-      <dependency id="RSG.Promise" version="3.0.1" />
+      <dependency id="ProtoPromise" version="2.3.0" />
+      <dependency id="ProtoPromiseUnityHelpers" version="2.3.0" />
     </dependencies>
   </metadata>
 </package>
diff --git a/src/Proyecto26.RestClient/RestClientPromise.cs b/src/Proyecto26.RestClient/RestClientPromise.cs
index b0e92f2..ee2b972 100644
--- a/src/Proyecto26.RestClient/RestClientPromise.cs
+++ b/src/Proyecto26.RestClient/RestClientPromise.cs
@@ -1,4 +1,5 @@
-using RSG;
+using Proto.Promises;
+using System;
 
 namespace Proyecto26
 {
@@ -12,11 +13,11 @@ public static partial class RestClient
         /// </summary>
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="options">The options of the request.</param>
-        public static IPromise<ResponseHelper> Request(RequestHelper options)
+        public static Promise<ResponseHelper> Request(RequestHelper options)
         {
-            var promise = new Promise<ResponseHelper>();
-            Request(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<ResponseHelper>();
+            Request(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -25,11 +26,11 @@ public static IPromise<ResponseHelper> Request(RequestHelper options)
         /// <returns>Returns a promise for a value of a specified type.</returns>
         /// <param name="options">The options of the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Request<T>(RequestHelper options)
+        public static Promise<T> Request<T>(RequestHelper options)
         {
-            var promise = new Promise<T>();
-            Request<T>(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<T>();
+            Request<T>(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -37,7 +38,7 @@ public static IPromise<T> Request<T>(RequestHelper options)
         /// </summary>
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
-        public static IPromise<ResponseHelper> Get(string url)
+        public static Promise<ResponseHelper> Get(string url)
         {
             return Get(new RequestHelper { Uri = url });
         }
@@ -47,11 +48,11 @@ public static IPromise<ResponseHelper> Get(string url)
         /// </summary>
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="options">The options of the request.</param>
-        public static IPromise<ResponseHelper> Get(RequestHelper options)
+        public static Promise<ResponseHelper> Get(RequestHelper options)
         {
-            var promise = new Promise<ResponseHelper>();
-            Get(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<ResponseHelper>();
+            Get(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -60,7 +61,7 @@ public static IPromise<ResponseHelper> Get(RequestHelper options)
         /// <returns>Returns a promise for a value of a specified type.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Get<T>(string url)
+        public static Promise<T> Get<T>(string url)
         {
             return Get<T>(new RequestHelper { Uri = url });
         }
@@ -71,11 +72,11 @@ public static IPromise<T> Get<T>(string url)
         /// <returns>Returns a promise for a value of a specified type.</returns>
         /// <param name="options">The options of the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Get<T>(RequestHelper options)
+        public static Promise<T> Get<T>(RequestHelper options)
         {
-            var promise = new Promise<T>();
-            Get<T>(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<T>();
+            Get<T>(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -84,7 +85,7 @@ public static IPromise<T> Get<T>(RequestHelper options)
         /// <returns>Returns a promise for an array of values.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <typeparam name="T">The element type of the array.</typeparam>
-        public static IPromise<T[]> GetArray<T>(string url)
+        public static Promise<T[]> GetArray<T>(string url)
         {
             return GetArray<T>(new RequestHelper { Uri = url });
         }
@@ -95,11 +96,11 @@ public static IPromise<T[]> GetArray<T>(string url)
         /// <returns>Returns a promise for an array of values.</returns>
         /// <param name="options">The options of the request.</param>
         /// <typeparam name="T">The element type of the array.</typeparam>
-        public static IPromise<T[]> GetArray<T>(RequestHelper options)
+        public static Promise<T[]> GetArray<T>(RequestHelper options)
         {
-            var promise = new Promise<T[]>();
-            GetArray<T>(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<T[]>();
+            GetArray<T>(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -108,7 +109,7 @@ public static IPromise<T[]> GetArray<T>(RequestHelper options)
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="body">A plain object that is sent to the server with the request.</param>
-        public static IPromise<ResponseHelper> Post(string url, object body)
+        public static Promise<ResponseHelper> Post(string url, object body)
         {
             return Post(new RequestHelper { Uri = url, Body = body });
         }
@@ -119,7 +120,7 @@ public static IPromise<ResponseHelper> Post(string url, object body)
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="bodyString">A string that is sent to the server with the request.</param>
-        public static IPromise<ResponseHelper> Post(string url, string bodyString)
+        public static Promise<ResponseHelper> Post(string url, string bodyString)
         {
             return Post(new RequestHelper { Uri = url, BodyString = bodyString });
         }
@@ -129,11 +130,11 @@ public static IPromise<ResponseHelper> Post(string url, string bodyString)
         /// </summary>
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="options">The options of the request.</param>
-        public static IPromise<ResponseHelper> Post(RequestHelper options)
+        public static Promise<ResponseHelper> Post(RequestHelper options)
         {
-            var promise = new Promise<ResponseHelper>();
-            Post(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<ResponseHelper>();
+            Post(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -143,7 +144,7 @@ public static IPromise<ResponseHelper> Post(RequestHelper options)
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="body">A plain object that is sent to the server with the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Post<T>(string url, object body)
+        public static Promise<T> Post<T>(string url, object body)
         {
             return Post<T>(new RequestHelper { Uri = url, Body = body });
         }
@@ -155,7 +156,7 @@ public static IPromise<T> Post<T>(string url, object body)
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="bodyString">A string that is sent to the server with the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Post<T>(string url, string bodyString)
+        public static Promise<T> Post<T>(string url, string bodyString)
         {
             return Post<T>(new RequestHelper { Uri = url, BodyString = bodyString });
         }
@@ -166,11 +167,11 @@ public static IPromise<T> Post<T>(string url, string bodyString)
         /// <returns>Returns a promise for a value of a specified type.</returns>
         /// <param name="options">The options of the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Post<T>(RequestHelper options)
+        public static Promise<T> Post<T>(RequestHelper options)
         {
-            var promise = new Promise<T>();
-            Post<T>(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<T>();
+            Post<T>(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -180,7 +181,7 @@ public static IPromise<T> Post<T>(RequestHelper options)
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="body">A plain object that is sent to the server with the request.</param>
         /// <typeparam name="T">The element type of the array.</typeparam>
-        public static IPromise<T[]> PostArray<T>(string url, object body)
+        public static Promise<T[]> PostArray<T>(string url, object body)
         {
             return PostArray<T>(new RequestHelper { Uri = url, Body = body });
         }
@@ -192,7 +193,7 @@ public static IPromise<T[]> PostArray<T>(string url, object body)
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="bodyString">A string that is sent to the server with the request.</param>
         /// <typeparam name="T">The element type of the array.</typeparam>
-        public static IPromise<T[]> PostArray<T>(string url, string bodyString)
+        public static Promise<T[]> PostArray<T>(string url, string bodyString)
         {
             return PostArray<T>(new RequestHelper { Uri = url, BodyString = bodyString });
         }
@@ -203,11 +204,11 @@ public static IPromise<T[]> PostArray<T>(string url, string bodyString)
         /// <returns>Returns a promise for an array of values.</returns>
         /// <param name="options">The options of the request.</param>
         /// <typeparam name="T">The element type of the array.</typeparam>
-        public static IPromise<T[]> PostArray<T>(RequestHelper options)
+        public static Promise<T[]> PostArray<T>(RequestHelper options)
         {
-            var promise = new Promise<T[]>();
-            PostArray<T>(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<T[]>();
+            PostArray<T>(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -216,7 +217,7 @@ public static IPromise<T[]> PostArray<T>(RequestHelper options)
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="body">A plain object that is sent to the server with the request.</param>
-        public static IPromise<ResponseHelper> Put(string url, object body)
+        public static Promise<ResponseHelper> Put(string url, object body)
         {
             return Put(new RequestHelper { Uri = url, Body = body });
         }
@@ -227,7 +228,7 @@ public static IPromise<ResponseHelper> Put(string url, object body)
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="bodyString">A string that is sent to the server with the request.</param>
-        public static IPromise<ResponseHelper> Put(string url, string bodyString)
+        public static Promise<ResponseHelper> Put(string url, string bodyString)
         {
             return Put(new RequestHelper { Uri = url, BodyString = bodyString });
         }
@@ -237,11 +238,11 @@ public static IPromise<ResponseHelper> Put(string url, string bodyString)
         /// </summary>
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="options">The options of the request.</param>
-        public static IPromise<ResponseHelper> Put(RequestHelper options)
+        public static Promise<ResponseHelper> Put(RequestHelper options)
         {
-            var promise = new Promise<ResponseHelper>();
-            Put(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<ResponseHelper>();
+            Put(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -251,7 +252,7 @@ public static IPromise<ResponseHelper> Put(RequestHelper options)
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="body">A plain object that is sent to the server with the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Put<T>(string url, object body)
+        public static Promise<T> Put<T>(string url, object body)
         {
             return Put<T>(new RequestHelper { Uri = url, Body = body });
         }
@@ -263,7 +264,7 @@ public static IPromise<T> Put<T>(string url, object body)
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="bodyString">A string that is sent to the server with the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Put<T>(string url, string bodyString)
+        public static Promise<T> Put<T>(string url, string bodyString)
         {
             return Put<T>(new RequestHelper { Uri = url, BodyString = bodyString });
         }
@@ -274,11 +275,11 @@ public static IPromise<T> Put<T>(string url, string bodyString)
         /// <returns>Returns a promise for a value of a specified type.</returns>
         /// <param name="options">The options of the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Put<T>(RequestHelper options)
+        public static Promise<T> Put<T>(RequestHelper options)
         {
-            var promise = new Promise<T>();
-            Put<T>(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<T>();
+            Put<T>(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -287,7 +288,7 @@ public static IPromise<T> Put<T>(RequestHelper options)
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="body">A plain object that is sent to the server with the request.</param>
-        public static IPromise<ResponseHelper> Patch(string url, object body)
+        public static Promise<ResponseHelper> Patch(string url, object body)
         {
             return Patch(new RequestHelper { Uri = url, Body = body });
         }
@@ -298,7 +299,7 @@ public static IPromise<ResponseHelper> Patch(string url, object body)
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="bodyString">A string that is sent to the server with the request.</param>
-        public static IPromise<ResponseHelper> Patch(string url, string bodyString)
+        public static Promise<ResponseHelper> Patch(string url, string bodyString)
         {
             return Patch(new RequestHelper { Uri = url, BodyString = bodyString });
         }
@@ -308,11 +309,11 @@ public static IPromise<ResponseHelper> Patch(string url, string bodyString)
         /// </summary>
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="options">The options of the request.</param>
-        public static IPromise<ResponseHelper> Patch(RequestHelper options)
+        public static Promise<ResponseHelper> Patch(RequestHelper options)
         {
-            var promise = new Promise<ResponseHelper>();
-            Patch(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<ResponseHelper>();
+            Patch(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -322,7 +323,7 @@ public static IPromise<ResponseHelper> Patch(RequestHelper options)
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="body">A plain object that is sent to the server with the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Patch<T>(string url, object body)
+        public static Promise<T> Patch<T>(string url, object body)
         {
             return Patch<T>(new RequestHelper { Uri = url, Body = body });
         }
@@ -334,7 +335,7 @@ public static IPromise<T> Patch<T>(string url, object body)
         /// <param name="url">A string containing the URL to which the request is sent.</param>
         /// <param name="bodyString">A string that is sent to the server with the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Patch<T>(string url, string bodyString)
+        public static Promise<T> Patch<T>(string url, string bodyString)
         {
             return Patch<T>(new RequestHelper { Uri = url, BodyString = bodyString });
         }
@@ -345,11 +346,11 @@ public static IPromise<T> Patch<T>(string url, string bodyString)
         /// <returns>Returns a promise for a value of a specified type.</returns>
         /// <param name="options">The options of the request.</param>
         /// <typeparam name="T">The element type of the response.</typeparam>
-        public static IPromise<T> Patch<T>(RequestHelper options)
+        public static Promise<T> Patch<T>(RequestHelper options)
         {
-            var promise = new Promise<T>();
-            Patch<T>(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<T>();
+            Patch<T>(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -357,7 +358,7 @@ public static IPromise<T> Patch<T>(RequestHelper options)
         /// </summary>
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
-        public static IPromise<ResponseHelper> Delete(string url)
+        public static Promise<ResponseHelper> Delete(string url)
         {
             return Delete(new RequestHelper { Uri = url });
         }
@@ -367,11 +368,11 @@ public static IPromise<ResponseHelper> Delete(string url)
         /// </summary>
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="options">The options of the request.</param>
-        public static IPromise<ResponseHelper> Delete(RequestHelper options)
+        public static Promise<ResponseHelper> Delete(RequestHelper options)
         {
-            var promise = new Promise<ResponseHelper>();
-            Delete(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<ResponseHelper>();
+            Delete(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
         /// <summary>
@@ -379,7 +380,7 @@ public static IPromise<ResponseHelper> Delete(RequestHelper options)
         /// </summary>
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="url">A string containing the URL to which the request is sent.</param>
-        public static IPromise<ResponseHelper> Head(string url)
+        public static Promise<ResponseHelper> Head(string url)
         {
             return Delete(new RequestHelper { Uri = url });
         }
@@ -389,43 +390,35 @@ public static IPromise<ResponseHelper> Head(string url)
         /// </summary>
         /// <returns>Returns a promise for a value of type ResponseHelper.</returns>
         /// <param name="options">The options of the request.</param>
-        public static IPromise<ResponseHelper> Head(RequestHelper options)
+        public static Promise<ResponseHelper> Head(RequestHelper options)
         {
-            var promise = new Promise<ResponseHelper>();
-            Head(options, promise.Promisify);
-            return promise;
+            var deferred = Promise.NewDeferred<ResponseHelper>();
+            Head(options, GetCallback(deferred));
+            return deferred.Promise;
         }
 
     #endregion
 
     #region Helpers
 
-        /// <summary>
-        /// Promisify the specified callback.
-        /// </summary>
-        /// <param name="promise">The promise to resolve.</param>
-        /// <param name="error">The exception of the request.</param>
-        /// <param name="response">The response of the request.</param>
-        /// <typeparam name="T">The element type of the response.</typeparam>
-        private static void Promisify<T>(this Promise<T> promise, RequestException error, T response)
+        private static Action<RequestException, ResponseHelper> GetCallback(Promise<ResponseHelper>.Deferred deferred)
         {
-            if (error != null) { promise.Reject(error); } else { promise.Resolve(response); }
+            return (RequestException error, ResponseHelper response) =>
+            {
+                if (error != null) { deferred.Reject(error); } else { deferred.Resolve(response); }
+            };
         }
 
-        /// <summary>
-        /// Promisify the specified callback ignoring the response.
-        /// </summary>
-        /// <param name="promise">The promise to resolve.</param>
-        /// <param name="error">The exception of the request.</param>
-        /// <param name="response">The response of the request.</param>
-        /// <param name="body">A body of the response.</param>
-        /// <typeparam name="T">The element type of the response.</typeparam>
-        private static void Promisify<T>(this Promise<T> promise, RequestException error, ResponseHelper response, T body)
+        private static Action<RequestException, ResponseHelper, T> GetCallback<T>(Promise<T>.Deferred deferred)
         {
-            if (error != null && response != null) {
-                error.ServerMessage = response.Error ?? error.Message;
-            }
-            promise.Promisify(error, body);
+            return (RequestException error, ResponseHelper response, T body) =>
+            {
+                if (error != null && response != null)
+                {
+                    error.ServerMessage = response.Error ?? error.Message;
+                }
+                if (error != null) { deferred.Reject(error); } else { deferred.Resolve(body); }
+            };
         }
 
     #endregion
diff --git a/src/Proyecto26.RestClient/packages.config b/src/Proyecto26.RestClient/packages.config
index 1055811..057458f 100644
--- a/src/Proyecto26.RestClient/packages.config
+++ b/src/Proyecto26.RestClient/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RSG.Promise" version="3.0.1" targetFramework="net35" />
+  <package id="ProtoPromise" version="2.3.0" targetFramework="net35" />
+  <package id="ProtoPromiseUnityHelpers" version="2.3.0" targetFramework="net35" />
 </packages>
\ No newline at end of file