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

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 +41 -12
  11. package/Runtime/Networking/Http/HttpPeer.cs +6 -2
  12. package/Runtime/Networking/Http/NetworkingPeerHttpClientRequest.cs +480 -363
  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,490 @@
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
+ var content = Encoding.UTF8.GetBytes(Serializer.Serialize(param.toData()));
153
+
154
+ requestMessage.Content = new ByteArrayContent(content);
155
+
156
+ requestMessage.Headers.TryAddWithoutValidation(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
157
+ }
158
+ else if (postType == PostType.MsgPack)
159
+ {
160
+ var content = MsgPackSerializer.Serialize(param.toData());
161
+
162
+ requestMessage.Content = new ByteArrayContent(content);
163
+
164
+ requestMessage.Headers.TryAddWithoutValidation(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
165
+ }
166
+
167
+ if (!string.IsNullOrEmpty(authToken)) requestMessage.Headers.TryAddWithoutValidation(Commands.RequestAuthTokenCmd, authToken);
168
+ if (!string.IsNullOrEmpty(secretKey)) requestMessage.Headers.TryAddWithoutValidation(Commands.RequestSecretCmd, secretKey);
169
+
170
+ try
171
+ {
172
+ var webResponse = await this.client.SendAsync(requestMessage);
173
+
174
+ var httpAppResponse = new HttpAppResponse();
175
+ httpAppResponse.statusCode = (int)webResponse.StatusCode;
176
+
177
+ if (webResponse.StatusCode == HttpStatusCode.OK)
178
+ {
179
+ httpAppResponse.data = await webResponse.Content.ReadAsByteArrayAsync();
180
+ httpAppResponse.text = await webResponse.Content.ReadAsStringAsync();
181
+ }
182
+ else
183
+ {
184
+ httpAppResponse.error = webResponse.ReasonPhrase;
185
+ }
186
+
187
+ onHttpAppResponse?.Invoke(httpAppResponse);
188
+ }
189
+ catch (Exception e)
190
+ {
191
+ var httpAppResponse = new HttpAppResponse();
192
+
193
+ httpAppResponse.statusCode = -1;
194
+ httpAppResponse.error = e.Message;
195
+
196
+ onHttpAppResponse?.Invoke(httpAppResponse);
197
+ }
198
+ }
199
+ }
200
+
201
+ //private async void postRequestViaHttpWeb(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
202
+ //{
203
+ // try
204
+ // {
205
+ // var httpRequest = (HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
206
+ // httpRequest.UserAgent = this.userAgent;
207
+ // httpRequest.SendChunked = false;
208
+ // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
209
+ // httpRequest.Proxy = null;
210
+
211
+ // httpRequest.Method = NetworkingPeerHttpWebRequest.POST;
212
+ // httpRequest.KeepAlive = false;
213
+ // httpRequest.Timeout = (int)timeout;
214
+ // httpRequest.ReadWriteTimeout = (int)timeout;
215
+
216
+ // if (param == null) param = new GNHashtable();
217
+
218
+ // if (customTags != null) param.add(GNParameterCode.CustomTags, customTags);
219
+
220
+ // if (postType == PostType.Json)
221
+ // {
222
+ // httpRequest.Headers.Add(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
223
+
224
+ // var content = Encoding.UTF8.GetBytes(Serializer.Serialize(param.toData()));
225
+
226
+ // using (var stream = httpRequest.GetRequestStream())
227
+ // {
228
+ // stream.Write(content, 0, content.Length);
229
+ // }
230
+ // }
231
+ // else if (postType == PostType.MsgPack)
232
+ // {
233
+ // httpRequest.Headers.Add(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
234
+
235
+ // var content = MsgPackSerializer.Serialize(param.toData());
236
+
237
+ // using (var stream = httpRequest.GetRequestStream())
238
+ // {
239
+ // stream.Write(content, 0, content.Length);
240
+ // }
241
+ // }
242
+
243
+ // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
244
+ // if (!string.IsNullOrEmpty(secretKey)) httpRequest.Headers.Add(Commands.RequestSecretCmd, secretKey);
245
+
246
+ // var response = await httpRequest.GetResponseAsync();
247
+
248
+ // var webResponse = (HttpWebResponse)response;
249
+
250
+ // var httpAppResponse = new HttpAppResponse();
251
+ // httpAppResponse.statusCode = (int)webResponse.StatusCode;
252
+
253
+ // if (webResponse.StatusCode == HttpStatusCode.OK)
254
+ // {
255
+ // using (var responseStream = webResponse.GetResponseStream())
256
+ // {
257
+ // using (var memoryStream = new MemoryStream())
258
+ // {
259
+ // responseStream.CopyTo(memoryStream);
260
+
261
+ // httpAppResponse.data = memoryStream.ToArray();
262
+ // }
263
+
264
+ // using (var stream = new StreamReader(responseStream))
265
+ // {
266
+ // httpAppResponse.text = stream.ReadToEnd();
267
+ // }
268
+ // }
269
+ // }
270
+ // else
271
+ // {
272
+ // httpAppResponse.error = webResponse.StatusDescription;
273
+ // }
274
+
275
+ // onHttpAppResponse?.Invoke(httpAppResponse);
276
+ // }
277
+ // catch (WebException e)
278
+ // {
279
+ // var httpAppResponse = new HttpAppResponse();
280
+
281
+ // httpAppResponse.statusCode = -1;
282
+
283
+ // using (var stream = new StreamReader(e.Response.GetResponseStream()))
284
+ // {
285
+ // httpAppResponse.error = stream.ReadToEnd();
286
+ // }
287
+
288
+ // if (string.IsNullOrEmpty(httpAppResponse.error)) httpAppResponse.error = e.Message;
289
+
290
+ // onHttpAppResponse?.Invoke(httpAppResponse);
291
+ // }
292
+ // catch (Exception e)
293
+ // {
294
+ // var httpAppResponse = new HttpAppResponse();
295
+
296
+ // httpAppResponse.statusCode = -1;
297
+ // httpAppResponse.error = e.Message;
298
+
299
+ // onHttpAppResponse?.Invoke(httpAppResponse);
300
+ // }
301
+ //}
302
+
303
+ public override void postRequestUpload(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
304
+ {
305
+ this.postRequestUploadViaHttpWeb(subUri, content, mimetype, onHttpAppResponse, timeout);
306
+ }
307
+
308
+ private async void postRequestUploadViaHttpWeb(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
309
+ {
310
+ //try
311
+ //{
312
+ // var httpRequest = (HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
313
+ // httpRequest.UserAgent = this.userAgent;
314
+ // httpRequest.SendChunked = false;
315
+ // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
316
+ // httpRequest.Proxy = null;
317
+
318
+ // httpRequest.Method = NetworkingPeerHttpWebRequest.POST;
319
+ // httpRequest.KeepAlive = false;
320
+ // httpRequest.Timeout = (int)timeout;
321
+ // httpRequest.ReadWriteTimeout = (int)timeout;
322
+
323
+ // var authToken = GNNetwork.getAuthenticateStatus().getAuthToken();
324
+
325
+ // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
326
+
327
+ // var headerTemplate = "Content-Disposition: form-data; name=\"{0}\"; filename=\"{1}\"\r\n" + "Content-Type: application/octet-stream\r\n\r\n";
328
+
329
+ // using (var stream = httpRequest.GetRequestStream())
330
+ // {
331
+ // stream.Write(content, 0, content.Length);
332
+ // }
333
+
334
+ // var response = await httpRequest.GetResponseAsync();
335
+
336
+ // var webResponse = (HttpWebResponse)response;
337
+
338
+ // var httpAppResponse = new HttpAppResponse();
339
+ // httpAppResponse.statusCode = (int)webResponse.StatusCode;
340
+
341
+ // if (webResponse.StatusCode == HttpStatusCode.OK)
342
+ // {
343
+ // using (var responseStream = webResponse.GetResponseStream())
344
+ // {
345
+ // using (var memoryStream = new MemoryStream())
346
+ // {
347
+ // responseStream.CopyTo(memoryStream);
348
+
349
+ // httpAppResponse.data = memoryStream.ToArray();
350
+ // }
351
+
352
+ // using (var stream = new StreamReader(responseStream))
353
+ // {
354
+ // httpAppResponse.text = stream.ReadToEnd();
355
+ // }
356
+ // }
357
+ // }
358
+ // else
359
+ // {
360
+ // httpAppResponse.error = webResponse.StatusDescription;
361
+ // }
362
+
363
+ // onHttpAppResponse?.Invoke(httpAppResponse);
364
+ //}
365
+ //catch (WebException e)
366
+ //{
367
+ // var httpAppResponse = new HttpAppResponse();
368
+
369
+ // httpAppResponse.statusCode = -1;
370
+
371
+ // using (var stream = new StreamReader(e.Response.GetResponseStream()))
372
+ // {
373
+ // httpAppResponse.error = stream.ReadToEnd();
374
+ // }
375
+
376
+ // if (string.IsNullOrEmpty(httpAppResponse.error)) httpAppResponse.error = e.Message;
377
+
378
+ // onHttpAppResponse?.Invoke(httpAppResponse);
379
+ //}
380
+ //catch (Exception e)
381
+ //{
382
+ // var httpAppResponse = new HttpAppResponse();
383
+
384
+ // httpAppResponse.statusCode = -1;
385
+ // httpAppResponse.error = e.Message;
386
+
387
+ // onHttpAppResponse?.Invoke(httpAppResponse);
388
+ //}
389
+ }
390
+
391
+ //private async void postRequestUploadViaHttpWeb(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
392
+ //{
393
+ // try
394
+ // {
395
+ // var httpRequest = (HttpWebRequest)WebRequest.Create(this.httpUrl + "/" + subUri);
396
+ // httpRequest.UserAgent = this.userAgent;
397
+ // httpRequest.SendChunked = false;
398
+ // // Prevents hitting a proxy if no proxy is available. TODO: Add support for proxy's.
399
+ // httpRequest.Proxy = null;
400
+
401
+ // httpRequest.Method = NetworkingPeerHttpWebRequest.POST;
402
+ // httpRequest.KeepAlive = false;
403
+ // httpRequest.Timeout = (int)timeout;
404
+ // httpRequest.ReadWriteTimeout = (int)timeout;
405
+
406
+ // var authToken = GNNetwork.getAuthenticateStatus().getAuthToken();
407
+
408
+ // if (!string.IsNullOrEmpty(authToken)) httpRequest.Headers.Add(Commands.RequestAuthTokenCmd, authToken);
409
+
410
+ // var headerTemplate = "Content-Disposition: form-data; name=\"{0}\"; filename=\"{1}\"\r\n" + "Content-Type: application/octet-stream\r\n\r\n";
411
+
412
+ // using (var stream = httpRequest.GetRequestStream())
413
+ // {
414
+ // stream.Write(content, 0, content.Length);
415
+ // }
279
416
 
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;
417
+ // var response = await httpRequest.GetResponseAsync();
418
+
419
+ // var webResponse = (HttpWebResponse)response;
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 httpAppResponse = new HttpAppResponse();
422
+ // httpAppResponse.statusCode = (int)webResponse.StatusCode;
423
+
424
+ // if (webResponse.StatusCode == HttpStatusCode.OK)
425
+ // {
426
+ // using (var responseStream = webResponse.GetResponseStream())
427
+ // {
428
+ // using (var memoryStream = new MemoryStream())
429
+ // {
430
+ // responseStream.CopyTo(memoryStream);
431
+
432
+ // httpAppResponse.data = memoryStream.ToArray();
433
+ // }
434
+
435
+ // using (var stream = new StreamReader(responseStream))
436
+ // {
437
+ // httpAppResponse.text = stream.ReadToEnd();
438
+ // }
439
+ // }
440
+ // }
441
+ // else
442
+ // {
443
+ // httpAppResponse.error = webResponse.StatusDescription;
444
+ // }
445
+
446
+ // onHttpAppResponse?.Invoke(httpAppResponse);
447
+ // }
448
+ // catch (WebException e)
449
+ // {
450
+ // var httpAppResponse = new HttpAppResponse();
451
+
452
+ // httpAppResponse.statusCode = -1;
453
+
454
+ // using (var stream = new StreamReader(e.Response.GetResponseStream()))
455
+ // {
456
+ // httpAppResponse.error = stream.ReadToEnd();
457
+ // }
458
+
459
+ // if (string.IsNullOrEmpty(httpAppResponse.error)) httpAppResponse.error = e.Message;
297
460
 
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;
461
+ // onHttpAppResponse?.Invoke(httpAppResponse);
462
+ // }
463
+ // catch (Exception e)
464
+ // {
465
+ // var httpAppResponse = new HttpAppResponse();
307
466
 
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;
467
+ // httpAppResponse.statusCode = -1;
468
+ // httpAppResponse.error = e.Message;
317
469
 
318
- // // if (postType == PostType.Json)
319
- // // {
320
- // // httpRequest.ContentType = Commands.APPLICATION_JSON;
470
+ // onHttpAppResponse?.Invoke(httpAppResponse);
471
+ // }
472
+ //}
321
473
 
322
- // // var dataSend = param.toData();
474
+ public override void init(string httpUrl, string userAgent)
475
+ {
476
+ base.init(httpUrl, userAgent);
323
477
 
324
- // // var content = Encoding.UTF8.GetBytes(Serializer.Serialize(dataSend));
478
+ this.client.DefaultRequestHeaders.TryAddWithoutValidation(Commands.USER_AGENT, userAgent);
479
+ }
325
480
 
326
- // // httpRequest.ContentLength = content.LongLength;
481
+ public NetworkingPeerHttpWebRequest()
482
+ {
483
+ //HTTPManager.KeepAliveDefaultValue = true;
327
484
 
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;
485
+ this.client = new HttpClient();
486
+ }
487
+
488
+ }
336
489
 
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
- // // }
348
-
349
- // // var response = await httpRequest.GetResponseAsync();
350
-
351
- // // response.
352
- // // }
353
- // // catch (Exception e)
354
- // // {
355
-
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
- //}
490
+ }