Skip to content

Commit 0332851

Browse files
committed
Implemented Promise requests using PromiseYielder instead of Coroutines.
Replaced RSG with ProtoPromise in demo.
1 parent 14af97e commit 0332851

27 files changed

+8940
-175
lines changed

demo/Assets/MainScript.cs

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,40 @@ public void Get(){
2323

2424
RequestHelper requestOptions = null;
2525

26-
RestClient.GetArray<Post>(basePath + "/posts").Then(res => {
27-
this.LogMessage ("Posts", JsonHelper.ArrayToJsonString<Post>(res, true));
28-
return RestClient.GetArray<Todo>(basePath + "/todos");
29-
}).Then(res => {
30-
this.LogMessage ("Todos", JsonHelper.ArrayToJsonString<Todo>(res, true));
31-
return RestClient.GetArray<User>(basePath + "/users");
32-
}).Then(res => {
33-
this.LogMessage ("Users", JsonHelper.ArrayToJsonString<User>(res, true));
26+
RestClient.GetArray<Post>(basePath + "/posts")
27+
.Then(res =>
28+
{
29+
this.LogMessage ("Posts", JsonHelper.ArrayToJsonString<Post>(res, true));
30+
return RestClient.GetArray<Todo>(basePath + "/todos");
31+
})
32+
.Then(res =>
33+
{
34+
this.LogMessage ("Todos", JsonHelper.ArrayToJsonString<Todo>(res, true));
35+
return RestClient.GetArray<User>(basePath + "/users");
36+
})
37+
.Then(res =>
38+
{
39+
this.LogMessage ("Users", JsonHelper.ArrayToJsonString<User>(res, true));
3440

35-
// We can add specific options and override default headers for a request
36-
requestOptions = new RequestHelper {
37-
Uri = basePath + "/photos",
38-
EnableDebug = true,
39-
Headers = new Dictionary<string, string> {
40-
{ "Authorization", "Other token..." }
41-
}
42-
};
43-
return RestClient.GetArray<Photo>(requestOptions);
44-
}).Then(res => {
45-
this.LogMessage("Header", requestOptions.GetHeader("Authorization"));
41+
// We can add specific options and override default headers for a request
42+
requestOptions = new RequestHelper {
43+
Uri = basePath + "/photos",
44+
EnableDebug = true,
45+
Headers = new Dictionary<string, string> {
46+
{ "Authorization", "Other token..." }
47+
}
48+
};
49+
return RestClient.GetArray<Photo>(requestOptions);
50+
})
51+
.Then(res =>
52+
{
53+
this.LogMessage("Header", requestOptions.GetHeader("Authorization"));
4654

47-
// And later we can clean the default headers for all requests
48-
RestClient.ClearDefaultHeaders();
55+
// And later we can clean the default headers for all requests
56+
RestClient.ClearDefaultHeaders();
4957

50-
}).Catch(err => this.LogMessage ("Error", err.Message));
58+
})
59+
.Catch((RequestException err) => this.LogMessage ("Error", err.Message));
5160
}
5261

5362
public void Post(){
@@ -58,7 +67,7 @@ public void Post(){
5867
userId = 26
5968
})
6069
.Then(res => this.LogMessage ("Success", JsonUtility.ToJson(res, true)))
61-
.Catch(err => this.LogMessage ("Error", err.Message));
70+
.Catch((RequestException err) => this.LogMessage ("Error", err.Message));
6271
}
6372

6473
public void Put(){

demo/Assets/Packages/RSG.Promise.3.0.1.meta renamed to demo/Assets/Packages/ProtoPromise.2.5.0.meta

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/RSG.Promise.3.0.1/lib.meta renamed to demo/Assets/Packages/ProtoPromise.2.5.0/lib.meta

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/RSG.Promise.3.0.1/lib/net35.meta renamed to demo/Assets/Packages/ProtoPromise.2.5.0/lib/net35.meta

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/RSG.Promise.3.0.1/lib/netstandard2.0.meta renamed to demo/Assets/Packages/ProtoPromise.2.5.0/lib/net35/Release.meta

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

demo/Assets/Packages/RSG.Promise.3.0.1/lib/netstandard2.0/RSG.Promise.dll.meta renamed to demo/Assets/Packages/ProtoPromise.2.5.0/lib/net35/Release/ProtoPromise.dll.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/RSG.Promise.3.0.1/RSG.Promise.3.0.1.nupkg.meta renamed to demo/Assets/Packages/ProtoPromise.2.5.0/lib/net35/Release/ProtoPromise.pdb.meta

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/ProtoPromise.2.5.0/lib/net35/Release/ProtoPromise.xml

Lines changed: 8074 additions & 0 deletions
Large diffs are not rendered by default.

demo/Assets/Packages/ProtoPromise.2.5.0/lib/net35/Release/ProtoPromise.xml.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/ProtoPromiseUnityHelpers.2.5.0.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/ProtoPromiseUnityHelpers.2.5.0/lib.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/ProtoPromiseUnityHelpers.2.5.0/lib/net35.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/ProtoPromiseUnityHelpers.2.5.0/lib/net35/Release.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/ProtoPromiseUnityHelpers.2.5.0/lib/net35/Release/ProtoPromiseUnityHelpers.dll.meta

Lines changed: 34 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/Assets/Packages/ProtoPromiseUnityHelpers.2.5.0/lib/net35/Release/ProtoPromiseUnityHelpers.pdb.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)