com.xmobitea.changx.gn-unity 2.0.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/Editor/GNServerSettingsEditor.cs +294 -294
  2. package/Runtime/Config/GNServerSettings.cs +5 -9
  3. package/Runtime/Constant/EnumType/MatchmakingMemberStatus.cs.meta +11 -11
  4. package/Runtime/Constant/EnumType/MatchmakingTicketStatus.cs.meta +11 -11
  5. package/Runtime/Entity/DataMember.cs +1 -1
  6. package/Runtime/Entity/Models/MultiplayerModels.cs.meta +11 -11
  7. package/Runtime/Entity/Models/MultiplayerRequestModels.cs.meta +11 -11
  8. package/Runtime/Entity/Models/MultiplayerResponseModels.cs.meta +11 -11
  9. package/Runtime/GNNetworkMultiplayerApi.cs.meta +11 -11
  10. package/Runtime/Helper/ConverterService.cs +22 -12
  11. package/Runtime/Networking/Http/HttpPeer.cs +6 -2
  12. package/Runtime/Networking/Http/NetworkingPeerHttpClientRequest.cs +473 -360
  13. package/Runtime/Networking/Http/NetworkingPeerHttpRequest.cs +3 -68
  14. package/Runtime/Networking/Http/NetworkingPeerUnityWebRequest.cs +5 -1
  15. package/package.json +1 -1
package/Runtime/Networking/Http/NetworkingPeerHttpClientRequest.cs CHANGED
@@ -1,373 +1,486 @@
1
- //namespace XmobiTea.GN.Networking.Http
2
- //{
3
- // using System;
4
- // using System.IO;
5
- // using System.Net;
6
- // using System.Net.Http;
7
- // using System.Text;
8
- // using XmobiTea.GN.Common;
9
- // using XmobiTea.GN.Constant;
10
- // using XmobiTea.GN.Helper;
11
- // using XmobiTea.MsgPack;
12
-
13
- // internal class NetworkingPeerHttpWebRequest : NetworkingHttpPeerBase
14
- // {
15
- // private static string POST = "POST";
16
- // private static string GET = "GET";
17
-
18
- // public override void getRequest(string subUri, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey)
19
- // {
20
- // this.getRequestViaHttpWeb(subUri, onHttpAppResponse, timeout, authToken, secretKey);
21
- // }
22
-
23
- // private async void getRequestViaHttpWeb(string subUri, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey)
24
- // {
25
- // try
26
- // {
27
- // var httpRequest = (HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
28
- // httpRequest.UserAgent = this.userAgent;
29
- // httpRequest.SendChunked = false;
30
- // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
31
- // httpRequest.Proxy = null;
32
-
33
- // httpRequest.Method = NetworkingPeerHttpWebRequest.GET;
34
- // httpRequest.KeepAlive = false;
35
- // httpRequest.Timeout = (int)timeout;
36
- // httpRequest.ReadWriteTimeout = (int)timeout;
37
-
38
- // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
39
- // if (!string.IsNullOrEmpty(secretKey)) httpRequest.Headers.Add(Commands.RequestSecretCmd, secretKey);
40
-
41
- // var response = await httpRequest.GetResponseAsync();
42
-
43
- // var webResponse = (HttpWebResponse)response;
44
-
45
- // var httpAppResponse = new HttpAppResponse();
46
- // httpAppResponse.statusCode = (int)webResponse.StatusCode;
47
-
48
- // if (webResponse.StatusCode == HttpStatusCode.OK)
49
- // {
50
- // using (var responseStream = webResponse.GetResponseStream())
51
- // {
52
- // using (var memoryStream = new MemoryStream())
53
- // {
54
- // responseStream.CopyTo(memoryStream);
55
-
56
- // httpAppResponse.data = memoryStream.ToArray();
57
- // }
58
-
59
- // using (var stream = new StreamReader(responseStream))
60
- // {
61
- // httpAppResponse.text = stream.ReadToEnd();
62
- // }
63
- // }
64
- // }
65
- // else
66
- // {
67
- // httpAppResponse.error = webResponse.StatusDescription;
68
- // }
69
-
70
- // onHttpAppResponse?.Invoke(httpAppResponse);
71
- // }
72
- // catch (WebException e)
73
- // {
74
- // var httpAppResponse = new HttpAppResponse();
75
-
76
- // httpAppResponse.statusCode = -1;
77
-
78
- // using (var stream = new StreamReader(e.Response.GetResponseStream()))
79
- // {
80
- // httpAppResponse.error = stream.ReadToEnd();
81
- // }
82
-
83
- // if (string.IsNullOrEmpty(httpAppResponse.error)) httpAppResponse.error = e.Message;
84
-
85
- // onHttpAppResponse?.Invoke(httpAppResponse);
86
- // }
87
- // catch (Exception e)
88
- // {
89
- // var httpAppResponse = new HttpAppResponse();
90
-
91
- // httpAppResponse.statusCode = -1;
92
- // httpAppResponse.error = e.Message;
93
-
94
- // onHttpAppResponse?.Invoke(httpAppResponse);
95
- // }
96
- // }
97
-
98
- // public override void postRequest(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
99
- // {
100
- // this.postRequestViaHttpWeb(subUri, param, postType, onHttpAppResponse, timeout, authToken, secretKey, customTags);
101
- // }
102
-
103
- // private async void postRequestViaHttpWeb(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
104
- // {
105
- // try
106
- // {
107
- // var httpRequest = (HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
108
- // httpRequest.UserAgent = this.userAgent;
109
- // httpRequest.SendChunked = false;
110
- // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
111
- // httpRequest.Proxy = null;
112
-
113
- // httpRequest.Method = NetworkingPeerHttpWebRequest.POST;
114
- // httpRequest.KeepAlive = false;
115
- // httpRequest.Timeout = (int)timeout;
116
- // httpRequest.ReadWriteTimeout = (int)timeout;
117
-
118
- // if (param == null) param = new GNHashtable();
119
-
120
- // if (customTags != null) param.add(GNParameterCode.CustomTags, customTags);
121
-
122
- // if (postType == PostType.Json)
123
- // {
124
- // httpRequest.Headers.Add(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
125
-
126
- // var content = Encoding.UTF8.GetBytes(Serializer.Serialize(param.toData()));
127
-
128
- // using (var stream = httpRequest.GetRequestStream())
129
- // {
130
- // stream.Write(content, 0, content.Length);
131
- // }
132
- // }
133
- // else if (postType == PostType.MsgPack)
134
- // {
135
- // httpRequest.Headers.Add(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
136
-
137
- // var content = MsgPackSerializer.Serialize(param.toData());
138
-
139
- // using (var stream = httpRequest.GetRequestStream())
140
- // {
141
- // stream.Write(content, 0, content.Length);
142
- // }
143
- // }
144
-
145
- // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
146
- // if (!string.IsNullOrEmpty(secretKey)) httpRequest.Headers.Add(Commands.RequestSecretCmd, secretKey);
147
-
148
- // var response = await httpRequest.GetResponseAsync();
149
-
150
- // var webResponse = (HttpWebResponse)response;
151
-
152
- // var httpAppResponse = new HttpAppResponse();
153
- // httpAppResponse.statusCode = (int)webResponse.StatusCode;
154
-
155
- // if (webResponse.StatusCode == HttpStatusCode.OK)
156
- // {
157
- // using (var responseStream = webResponse.GetResponseStream())
158
- // {
159
- // using (var memoryStream = new MemoryStream())
160
- // {
161
- // responseStream.CopyTo(memoryStream);
162
-
163
- // httpAppResponse.data = memoryStream.ToArray();
164
- // }
165
-
166
- // using (var stream = new StreamReader(responseStream))
167
- // {
168
- // httpAppResponse.text = stream.ReadToEnd();
169
- // }
170
- // }
171
- // }
172
- // else
173
- // {
174
- // httpAppResponse.error = webResponse.StatusDescription;
175
- // }
176
-
177
- // onHttpAppResponse?.Invoke(httpAppResponse);
178
- // }
179
- // catch (WebException e)
180
- // {
181
- // var httpAppResponse = new HttpAppResponse();
182
-
183
- // httpAppResponse.statusCode = -1;
184
-
185
- // using (var stream = new StreamReader(e.Response.GetResponseStream()))
186
- // {
187
- // httpAppResponse.error = stream.ReadToEnd();
188
- // }
189
-
190
- // if (string.IsNullOrEmpty(httpAppResponse.error)) httpAppResponse.error = e.Message;
191
-
192
- // onHttpAppResponse?.Invoke(httpAppResponse);
193
- // }
194
- // catch (Exception e)
195
- // {
196
- // var httpAppResponse = new HttpAppResponse();
197
-
198
- // httpAppResponse.statusCode = -1;
199
- // httpAppResponse.error = e.Message;
200
-
201
- // onHttpAppResponse?.Invoke(httpAppResponse);
202
- // }
203
- // }
204
-
205
- // public override void postRequestUpload(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
206
- // {
207
- // this.postRequestUploadViaHttpWeb(subUri, content, mimetype, onHttpAppResponse, timeout);
208
- // }
209
-
210
- // private async void postRequestUploadViaHttpWeb(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
211
- // {
212
- // try
213
- // {
214
- // var httpRequest = (HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
215
- // httpRequest.UserAgent = this.userAgent;
216
- // httpRequest.SendChunked = false;
217
- // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
218
- // httpRequest.Proxy = null;
219
-
220
- // httpRequest.Method = NetworkingPeerHttpWebRequest.POST;
221
- // httpRequest.KeepAlive = false;
222
- // httpRequest.Timeout = (int)timeout;
223
- // httpRequest.ReadWriteTimeout = (int)timeout;
224
-
225
- // var authToken = GNNetwork.getAuthenticateStatus().getAuthToken();
226
-
227
- // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
228
-
229
- // var headerTemplate = "Content-Disposition: form-data; name=\"{0}\"; filename=\"{1}\"\r\n" + "Content-Type: application/octet-stream\r\n\r\n";
230
-
231
- // using (var stream = httpRequest.GetRequestStream())
232
- // {
233
- // stream.Write(content, 0, content.Length);
234
- // }
235
-
236
- // var response = await httpRequest.GetResponseAsync();
237
-
238
- // var webResponse = (HttpWebResponse)response;
239
-
240
- // var httpAppResponse = new HttpAppResponse();
241
- // httpAppResponse.statusCode = (int)webResponse.StatusCode;
242
-
243
- // if (webResponse.StatusCode == HttpStatusCode.OK)
244
- // {
245
- // using (var responseStream = webResponse.GetResponseStream())
246
- // {
247
- // using (var memoryStream = new MemoryStream())
248
- // {
249
- // responseStream.CopyTo(memoryStream);
250
-
251
- // httpAppResponse.data = memoryStream.ToArray();
252
- // }
253
-
254
- // using (var stream = new StreamReader(responseStream))
255
- // {
256
- // httpAppResponse.text = stream.ReadToEnd();
257
- // }
258
- // }
259
- // }
260
- // else
261
- // {
262
- // httpAppResponse.error = webResponse.StatusDescription;
263
- // }
264
-
265
- // onHttpAppResponse?.Invoke(httpAppResponse);
266
- // }
267
- // catch (WebException e)
268
- // {
269
- // var httpAppResponse = new HttpAppResponse();
270
-
271
- // httpAppResponse.statusCode = -1;
272
-
273
- // using (var stream = new StreamReader(e.Response.GetResponseStream()))
274
- // {
275
- // httpAppResponse.error = stream.ReadToEnd();
276
- // }
277
-
278
- // if (string.IsNullOrEmpty(httpAppResponse.error)) httpAppResponse.error = e.Message;
1
+ namespace XmobiTea.GN.Networking.Http
2
+ {
3
+ using System;
4
+ using System.Net;
5
+ using System.Net.Http;
6
+ using System.Text;
7
+ using XmobiTea.GN.Common;
8
+ using XmobiTea.GN.Constant;
9
+ using XmobiTea.GN.Helper;
10
+ using XmobiTea.MsgPack;
11
+
12
+ internal class NetworkingPeerHttpWebRequest : NetworkingHttpPeerBase
13
+ {
14
+ private readonly HttpClient client;
15
+
16
+ //private static string POST = "POST";
17
+ //private static string GET = "GET";
18
+
19
+ public override void getRequest(string subUri, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey)
20
+ {
21
+ this.getRequestViaHttpWeb(subUri, onHttpAppResponse, timeout, authToken, secretKey);
22
+ }
23
+
24
+ private async void getRequestViaHttpWeb(string subUri, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey)
25
+ {
26
+ using (var requestMessage = new HttpRequestMessage(HttpMethod.Get, this.httpUrl + "/" + subUri))
27
+ {
28
+ if (!string.IsNullOrEmpty(authToken)) requestMessage.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
29
+ if (!string.IsNullOrEmpty(secretKey)) requestMessage.Headers.Add(Commands.RequestSecretCmd, secretKey);
30
+
31
+ try
32
+ {
33
+ var webResponse = await this.client.SendAsync(requestMessage);
34
+
35
+ var httpAppResponse = new HttpAppResponse();
36
+ httpAppResponse.statusCode = (int)webResponse.StatusCode;
37
+
38
+ if (webResponse.StatusCode == HttpStatusCode.OK)
39
+ {
40
+ httpAppResponse.data = await webResponse.Content.ReadAsByteArrayAsync();
41
+ httpAppResponse.text = await webResponse.Content.ReadAsStringAsync();
42
+ }
43
+ else
44
+ {
45
+ httpAppResponse.error = webResponse.ReasonPhrase;
46
+ }
47
+
48
+ onHttpAppResponse?.Invoke(httpAppResponse);
49
+ }
50
+ catch (Exception e)
51
+ {
52
+ var httpAppResponse = new HttpAppResponse();
53
+
54
+ httpAppResponse.statusCode = -1;
55
+ httpAppResponse.error = e.Message;
56
+
57
+ onHttpAppResponse?.Invoke(httpAppResponse);
58
+ }
59
+ }
60
+ }
61
+
62
+ //private async void getRequestViaHttpWeb(string subUri, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey)
63
+ //{
64
+ // try
65
+ // {
66
+ // var httpRequest = (HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
67
+ // httpRequest.UserAgent = this.userAgent;
68
+ // httpRequest.SendChunked = false;
69
+ // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
70
+ // httpRequest.Proxy = null;
71
+
72
+ // httpRequest.Method = NetworkingPeerHttpWebRequest.GET;
73
+ // httpRequest.KeepAlive = false;
74
+ // httpRequest.Timeout = (int)timeout;
75
+ // httpRequest.ReadWriteTimeout = (int)timeout;
76
+
77
+ // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
78
+ // if (!string.IsNullOrEmpty(secretKey)) httpRequest.Headers.Add(Commands.RequestSecretCmd, secretKey);
79
+
80
+ // var response = await httpRequest.GetResponseAsync();
81
+
82
+ // var webResponse = (HttpWebResponse)response;
83
+
84
+ // var httpAppResponse = new HttpAppResponse();
85
+ // httpAppResponse.statusCode = (int)webResponse.StatusCode;
86
+
87
+ // if (webResponse.StatusCode == HttpStatusCode.OK)
88
+ // {
89
+ // using (var responseStream = webResponse.GetResponseStream())
90
+ // {
91
+ // using (var memoryStream = new MemoryStream())
92
+ // {
93
+ // responseStream.CopyTo(memoryStream);
94
+
95
+ // httpAppResponse.data = memoryStream.ToArray();
96
+ // }
97
+
98
+ // using (var stream = new StreamReader(responseStream))
99
+ // {
100
+ // httpAppResponse.text = stream.ReadToEnd();
101
+ // }
102
+ // }
103
+ // }
104
+ // else
105
+ // {
106
+ // httpAppResponse.error = webResponse.StatusDescription;
107
+ // }
108
+
109
+ // onHttpAppResponse?.Invoke(httpAppResponse);
110
+ // }
111
+ // catch (WebException e)
112
+ // {
113
+ // var httpAppResponse = new HttpAppResponse();
114
+
115
+ // httpAppResponse.statusCode = -1;
116
+
117
+ // using (var stream = new StreamReader(e.Response.GetResponseStream()))
118
+ // {
119
+ // httpAppResponse.error = stream.ReadToEnd();
120
+ // }
121
+
122
+ // if (string.IsNullOrEmpty(httpAppResponse.error)) httpAppResponse.error = e.Message;
123
+
124
+ // onHttpAppResponse?.Invoke(httpAppResponse);
125
+ // }
126
+ // catch (Exception e)
127
+ // {
128
+ // var httpAppResponse = new HttpAppResponse();
129
+
130
+ // httpAppResponse.statusCode = -1;
131
+ // httpAppResponse.error = e.Message;
132
+
133
+ // onHttpAppResponse?.Invoke(httpAppResponse);
134
+ // }
135
+ //}
136
+
137
+ public override void postRequest(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
138
+ {
139
+ this.postRequestViaHttpWeb(subUri, param, postType, onHttpAppResponse, timeout, authToken, secretKey, customTags);
140
+ }
141
+
142
+ private async void postRequestViaHttpWeb(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
143
+ {
144
+ using (var requestMessage = new HttpRequestMessage(HttpMethod.Post, this.httpUrl + "/" + subUri))
145
+ {
146
+ if (param == null) param = new GNHashtable();
147
+
148
+ if (customTags != null) param.add(GNParameterCode.CustomTags, customTags);
149
+
150
+ if (postType == PostType.Json)
151
+ {
152
+
153
+ var content = Encoding.UTF8.GetBytes(Serializer.Serialize(param.toData()));
154
+
155
+ requestMessage.Content = new ByteArrayContent(content);
156
+
157
+ requestMessage.Headers.Add(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
158
+ }
159
+ else if (postType == PostType.MsgPack)
160
+ {
161
+
162
+ var content = MsgPackSerializer.Serialize(param.toData());
163
+
164
+ requestMessage.Content = new ByteArrayContent(content);
165
+
166
+ requestMessage.Headers.Add(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
167
+ }
168
+
169
+ if (!string.IsNullOrEmpty(authToken)) requestMessage.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
170
+ if (!string.IsNullOrEmpty(secretKey)) requestMessage.Headers.Add(Commands.RequestSecretCmd, secretKey);
171
+
172
+ try
173
+ {
174
+ var webResponse = await this.client.SendAsync(requestMessage);
175
+
176
+ var httpAppResponse = new HttpAppResponse();
177
+ httpAppResponse.statusCode = (int)webResponse.StatusCode;
178
+
179
+ if (webResponse.StatusCode == HttpStatusCode.OK)
180
+ {
181
+ httpAppResponse.data = await webResponse.Content.ReadAsByteArrayAsync();
182
+ httpAppResponse.text = await webResponse.Content.ReadAsStringAsync();
183
+ }
184
+ else
185
+ {
186
+ httpAppResponse.error = webResponse.ReasonPhrase;
187
+ }
188
+
189
+ onHttpAppResponse?.Invoke(httpAppResponse);
190
+ }
191
+ catch (Exception e)
192
+ {
193
+ var httpAppResponse = new HttpAppResponse();
194
+
195
+ httpAppResponse.statusCode = -1;
196
+ httpAppResponse.error = e.Message;
197
+
198
+ onHttpAppResponse?.Invoke(httpAppResponse);
199
+ }
200
+ }
201
+ }
202
+
203
+ //private async void postRequestViaHttpWeb(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
204
+ //{
205
+ // try
206
+ // {
207
+ // var httpRequest = (HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
208
+ // httpRequest.UserAgent = this.userAgent;
209
+ // httpRequest.SendChunked = false;
210
+ // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
211
+ // httpRequest.Proxy = null;
212
+
213
+ // httpRequest.Method = NetworkingPeerHttpWebRequest.POST;
214
+ // httpRequest.KeepAlive = false;
215
+ // httpRequest.Timeout = (int)timeout;
216
+ // httpRequest.ReadWriteTimeout = (int)timeout;
217
+
218
+ // if (param == null) param = new GNHashtable();
219
+
220
+ // if (customTags != null) param.add(GNParameterCode.CustomTags, customTags);
221
+
222
+ // if (postType == PostType.Json)
223
+ // {
224
+ // httpRequest.Headers.Add(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
225
+
226
+ // var content = Encoding.UTF8.GetBytes(Serializer.Serialize(param.toData()));
227
+
228
+ // using (var stream = httpRequest.GetRequestStream())
229
+ // {
230
+ // stream.Write(content, 0, content.Length);
231
+ // }
232
+ // }
233
+ // else if (postType == PostType.MsgPack)
234
+ // {
235
+ // httpRequest.Headers.Add(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
236
+
237
+ // var content = MsgPackSerializer.Serialize(param.toData());
238
+
239
+ // using (var stream = httpRequest.GetRequestStream())
240
+ // {
241
+ // stream.Write(content, 0, content.Length);
242
+ // }
243
+ // }
244
+
245
+ // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
246
+ // if (!string.IsNullOrEmpty(secretKey)) httpRequest.Headers.Add(Commands.RequestSecretCmd, secretKey);
247
+
248
+ // var response = await httpRequest.GetResponseAsync();
249
+
250
+ // var webResponse = (HttpWebResponse)response;
251
+
252
+ // var httpAppResponse = new HttpAppResponse();
253
+ // httpAppResponse.statusCode = (int)webResponse.StatusCode;
254
+
255
+ // if (webResponse.StatusCode == HttpStatusCode.OK)
256
+ // {
257
+ // using (var responseStream = webResponse.GetResponseStream())
258
+ // {
259
+ // using (var memoryStream = new MemoryStream())
260
+ // {
261
+ // responseStream.CopyTo(memoryStream);
262
+
263
+ // httpAppResponse.data = memoryStream.ToArray();
264
+ // }
265
+
266
+ // using (var stream = new StreamReader(responseStream))
267
+ // {
268
+ // httpAppResponse.text = stream.ReadToEnd();
269
+ // }
270
+ // }
271
+ // }
272
+ // else
273
+ // {
274
+ // httpAppResponse.error = webResponse.StatusDescription;
275
+ // }
276
+
277
+ // onHttpAppResponse?.Invoke(httpAppResponse);
278
+ // }
279
+ // catch (WebException e)
280
+ // {
281
+ // var httpAppResponse = new HttpAppResponse();
282
+
283
+ // httpAppResponse.statusCode = -1;
284
+
285
+ // using (var stream = new StreamReader(e.Response.GetResponseStream()))
286
+ // {
287
+ // httpAppResponse.error = stream.ReadToEnd();
288
+ // }
289
+
290
+ // if (string.IsNullOrEmpty(httpAppResponse.error)) httpAppResponse.error = e.Message;
291
+
292
+ // onHttpAppResponse?.Invoke(httpAppResponse);
293
+ // }
294
+ // catch (Exception e)
295
+ // {
296
+ // var httpAppResponse = new HttpAppResponse();
297
+
298
+ // httpAppResponse.statusCode = -1;
299
+ // httpAppResponse.error = e.Message;
300
+
301
+ // onHttpAppResponse?.Invoke(httpAppResponse);
302
+ // }
303
+ //}
304
+
305
+ public override void postRequestUpload(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
306
+ {
307
+ this.postRequestUploadViaHttpWeb(subUri, content, mimetype, onHttpAppResponse, timeout);
308
+ }
309
+
310
+ private async void postRequestUploadViaHttpWeb(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
311
+ {
312
+ //try
313
+ //{
314
+ // var httpRequest = (HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
315
+ // httpRequest.UserAgent = this.userAgent;
316
+ // httpRequest.SendChunked = false;
317
+ // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
318
+ // httpRequest.Proxy = null;
319
+
320
+ // httpRequest.Method = NetworkingPeerHttpWebRequest.POST;
321
+ // httpRequest.KeepAlive = false;
322
+ // httpRequest.Timeout = (int)timeout;
323
+ // httpRequest.ReadWriteTimeout = (int)timeout;
324
+
325
+ // var authToken = GNNetwork.getAuthenticateStatus().getAuthToken();
326
+
327
+ // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
328
+
329
+ // var headerTemplate = "Content-Disposition: form-data; name=\"{0}\"; filename=\"{1}\"\r\n" + "Content-Type: application/octet-stream\r\n\r\n";
330
+
331
+ // using (var stream = httpRequest.GetRequestStream())
332
+ // {
333
+ // stream.Write(content, 0, content.Length);
334
+ // }
335
+
336
+ // var response = await httpRequest.GetResponseAsync();
337
+
338
+ // var webResponse = (HttpWebResponse)response;
339
+
340
+ // var httpAppResponse = new HttpAppResponse();
341
+ // httpAppResponse.statusCode = (int)webResponse.StatusCode;
342
+
343
+ // if (webResponse.StatusCode == HttpStatusCode.OK)
344
+ // {
345
+ // using (var responseStream = webResponse.GetResponseStream())
346
+ // {
347
+ // using (var memoryStream = new MemoryStream())
348
+ // {
349
+ // responseStream.CopyTo(memoryStream);
350
+
351
+ // httpAppResponse.data = memoryStream.ToArray();
352
+ // }
353
+
354
+ // using (var stream = new StreamReader(responseStream))
355
+ // {
356
+ // httpAppResponse.text = stream.ReadToEnd();
357
+ // }
358
+ // }
359
+ // }
360
+ // else
361
+ // {
362
+ // httpAppResponse.error = webResponse.StatusDescription;
363
+ // }
364
+
365
+ // onHttpAppResponse?.Invoke(httpAppResponse);
366
+ //}
367
+ //catch (WebException e)
368
+ //{
369
+ // var httpAppResponse = new HttpAppResponse();
370
+
371
+ // httpAppResponse.statusCode = -1;
372
+
373
+ // using (var stream = new StreamReader(e.Response.GetResponseStream()))
374
+ // {
375
+ // httpAppResponse.error = stream.ReadToEnd();
376
+ // }
377
+
378
+ // if (string.IsNullOrEmpty(httpAppResponse.error)) httpAppResponse.error = e.Message;
379
+
380
+ // onHttpAppResponse?.Invoke(httpAppResponse);
381
+ //}
382
+ //catch (Exception e)
383
+ //{
384
+ // var httpAppResponse = new HttpAppResponse();
385
+
386
+ // httpAppResponse.statusCode = -1;
387
+ // httpAppResponse.error = e.Message;
388
+
389
+ // onHttpAppResponse?.Invoke(httpAppResponse);
390
+ //}
391
+ }
392
+
393
+ //private async void postRequestUploadViaHttpWeb(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
394
+ //{
395
+ // try
396
+ // {
397
+ // var httpRequest = (HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
398
+ // httpRequest.UserAgent = this.userAgent;
399
+ // httpRequest.SendChunked = false;
400
+ // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
401
+ // httpRequest.Proxy = null;
402
+
403
+ // httpRequest.Method = NetworkingPeerHttpWebRequest.POST;
404
+ // httpRequest.KeepAlive = false;
405
+ // httpRequest.Timeout = (int)timeout;
406
+ // httpRequest.ReadWriteTimeout = (int)timeout;
407
+
408
+ // var authToken = GNNetwork.getAuthenticateStatus().getAuthToken();
409
+
410
+ // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
411
+
412
+ // var headerTemplate = "Content-Disposition: form-data; name=\"{0}\"; filename=\"{1}\"\r\n" + "Content-Type: application/octet-stream\r\n\r\n";
413
+
414
+ // using (var stream = httpRequest.GetRequestStream())
415
+ // {
416
+ // stream.Write(content, 0, content.Length);
417
+ // }
279
418
 
280
- // onHttpAppResponse?.Invoke(httpAppResponse);
281
- // }
282
- // catch (Exception e)
283
- // {
284
- // var httpAppResponse = new HttpAppResponse();
285
-
286
- // httpAppResponse.statusCode = -1;
287
- // httpAppResponse.error = e.Message;
419
+ // var response = await httpRequest.GetResponseAsync();
288
420
 
289
- // onHttpAppResponse?.Invoke(httpAppResponse);
290
- // }
291
- // }
292
-
293
- // //public override void postRequest(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
294
- // //{
295
- // // postRequestViaHttpRequest(subUri, param, postType, onHttpAppResponse, timeout, authToken, secretKey, customTags);
296
- // //}
421
+ // var webResponse = (HttpWebResponse)response;
297
422
 
298
- // //public async void postRequestViaHttpRequest(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
299
- // //{
300
- // // try
301
- // // {
302
- // // var httpRequest = (System.Net.HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
303
- // // httpRequest.UserAgent = this.userAgent;
304
- // // httpRequest.SendChunked = false;
305
- // // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
306
- // // httpRequest.Proxy = null;
423
+ // var httpAppResponse = new HttpAppResponse();
424
+ // httpAppResponse.statusCode = (int)webResponse.StatusCode;
307
425
 
308
- // // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
309
- // // if (!string.IsNullOrEmpty(secretKey)) httpRequest.Headers.Add(Commands.RequestSecretCmd, secretKey);
310
-
311
- // // httpRequest.Method = "POST";
312
- // // httpRequest.KeepAlive = false;
313
- // // httpRequest.Timeout = (int)timeout;
314
- // // httpRequest.AllowWriteStreamBuffering = false;
315
- // // httpRequest.Proxy = null;
316
- // // httpRequest.ReadWriteTimeout = (int)timeout;
426
+ // if (webResponse.StatusCode == HttpStatusCode.OK)
427
+ // {
428
+ // using (var responseStream = webResponse.GetResponseStream())
429
+ // {
430
+ // using (var memoryStream = new MemoryStream())
431
+ // {
432
+ // responseStream.CopyTo(memoryStream);
433
+
434
+ // httpAppResponse.data = memoryStream.ToArray();
435
+ // }
436
+
437
+ // using (var stream = new StreamReader(responseStream))
438
+ // {
439
+ // httpAppResponse.text = stream.ReadToEnd();
440
+ // }
441
+ // }
442
+ // }
443
+ // else
444
+ // {
445
+ // httpAppResponse.error = webResponse.StatusDescription;
446
+ // }
447
+
448
+ // onHttpAppResponse?.Invoke(httpAppResponse);
449
+ // }
450
+ // catch (WebException e)
451
+ // {
452
+ // var httpAppResponse = new HttpAppResponse();
453
+
454
+ // httpAppResponse.statusCode = -1;
455
+
456
+ // using (var stream = new StreamReader(e.Response.GetResponseStream()))
457
+ // {
458
+ // httpAppResponse.error = stream.ReadToEnd();
459
+ // }
317
460
 
318
- // // if (postType == PostType.Json)
319
- // // {
320
- // // httpRequest.ContentType = Commands.APPLICATION_JSON;
461
+ // if (string.IsNullOrEmpty(httpAppResponse.error)) httpAppResponse.error = e.Message;
321
462
 
322
- // // var dataSend = param.toData();
463
+ // onHttpAppResponse?.Invoke(httpAppResponse);
464
+ // }
465
+ // catch (Exception e)
466
+ // {
467
+ // var httpAppResponse = new HttpAppResponse();
323
468
 
324
- // // var content = Encoding.UTF8.GetBytes(Serializer.Serialize(dataSend));
469
+ // httpAppResponse.statusCode = -1;
470
+ // httpAppResponse.error = e.Message;
325
471
 
326
- // // httpRequest.ContentLength = content.LongLength;
472
+ // onHttpAppResponse?.Invoke(httpAppResponse);
473
+ // }
474
+ //}
327
475
 
328
- // // using (var stream = httpRequest.GetRequestStream())
329
- // // {
330
- // // stream.Write(content, 0, content.Length);
331
- // // }
332
- // // }
333
- // // else if (postType == PostType.MsgPack)
334
- // // {
335
- // // httpRequest.ContentType = Commands.APPLICATION_MSGPACK;
476
+ public NetworkingPeerHttpWebRequest()
477
+ {
478
+ //HTTPManager.KeepAliveDefaultValue = true;
336
479
 
337
- // // var dataSend = param.toData();
338
-
339
- // // var content = MsgPackSerializer.Serialize(dataSend);
340
-
341
- // // httpRequest.ContentLength = content.LongLength;
342
-
343
- // // using (var stream = httpRequest.GetRequestStream())
344
- // // {
345
- // // stream.Write(content, 0, content.Length);
346
- // // }
347
- // // }
480
+ this.client = new HttpClient();
481
+ }
348
482
 
349
- // // var response = await httpRequest.GetResponseAsync();
350
483
 
351
- // // response.
352
- // // }
353
- // // catch (Exception e)
354
- // // {
484
+ }
355
485
 
356
- // // }
357
- // //}
358
-
359
-
360
- // public override void init(string httpUrl, string userAgent)
361
- // {
362
- // base.init(httpUrl, userAgent);
363
- // }
364
-
365
- // public NetworkingPeerHttpWebRequest()
366
- // {
367
- // //HTTPManager.KeepAliveDefaultValue = true;
368
- // }
369
-
370
-
371
- // }
372
-
373
- //}
486
+ }