diff --git a/BCL.csproj b/BCL.csproj index e7b974db2..a7d8f6673 100644 --- a/BCL.csproj +++ b/BCL.csproj @@ -128,16 +128,16 @@ - + http_request.d.ts - + http_request.d.ts - + - + @@ -148,7 +148,7 @@ - + @@ -168,7 +168,7 @@ - + diff --git a/net/Readme.md b/http/Readme.md similarity index 98% rename from net/Readme.md rename to http/Readme.md index eb487b119..a716ff472 100644 --- a/net/Readme.md +++ b/http/Readme.md @@ -1,6 +1,6 @@ Sample code: ```js - var http = require("net"); + var http = require("http"); // Universal request method. You can use HttpRequestOptions to set varios properties like url, headers, etc., // HttpResponse to get status code, headers and content and HttpContent to get body of response: diff --git a/net/http.ts b/http/http.ts similarity index 96% rename from net/http.ts rename to http/http.ts index 2aba2066a..ae19f5429 100644 --- a/net/http.ts +++ b/http/http.ts @@ -1,6 +1,6 @@ import image_module = require("Image/image"); import promises = require("promises/promises"); -import http = require("net/http_request"); +import http = require("http/http_request"); // merge request declare var exports; diff --git a/net/http_request.android.ts b/http/http_request.android.ts similarity index 95% rename from net/http_request.android.ts rename to http/http_request.android.ts index ac6bf00db..83d554e5e 100644 --- a/net/http_request.android.ts +++ b/http/http_request.android.ts @@ -2,7 +2,7 @@ * Android specific http client implementation. */ import promises = require("promises/promises"); -import http = require("net/http_request"); +import http = require("http/http_request"); // TODO: Replace with similar to iOS implementation! export function request(options: http.HttpRequestOptions): promises.Promise { @@ -31,6 +31,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise { return data }, toJSON: () => { return JSON.parse(data) }, toImage: () => { return require("Image/image").Image.imageFromNativeBitmap(data); } diff --git a/net/http_request.d.ts b/http/http_request.d.ts similarity index 97% rename from net/http_request.d.ts rename to http/http_request.d.ts index 7e8df3569..04d87efff 100644 --- a/net/http_request.d.ts +++ b/http/http_request.d.ts @@ -20,6 +20,7 @@ export interface HttpResponse { } export interface HttpContent { + raw: any; toString: () => string; toJSON: () => any; toImage: () => image_module.Image; diff --git a/net/http_request.ios.ts b/http/http_request.ios.ts similarity index 96% rename from net/http_request.ios.ts rename to http/http_request.ios.ts index 6505b159f..cc641bfb8 100644 --- a/net/http_request.ios.ts +++ b/http/http_request.ios.ts @@ -2,7 +2,7 @@ * iOS specific http client implementation. */ import promises = require("promises/promises"); -import http = require("net/http_request"); +import http = require("http/http_request"); export function request(options: http.HttpRequestOptions): promises.Promise { var d = promises.defer(); @@ -38,7 +38,6 @@ export function request(options: http.HttpRequestOptions): promises.Promise { return NSDataToString(data); }, toJSON: () => { return JSON.parse(NSDataToString(data)); }, toImage: () => { return require("Image/image").Image.imageFromData(data); } }, - data : data, statusCode: response.statusCode(), headers: headers }); diff --git a/http/index.ts b/http/index.ts new file mode 100644 index 000000000..3c912a54c --- /dev/null +++ b/http/index.ts @@ -0,0 +1,2 @@ +declare var module, require; +module.exports = require("http/http"); \ No newline at end of file diff --git a/net/index.ts b/net/index.ts deleted file mode 100644 index 053b7482b..000000000 --- a/net/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -declare var module, require; -module.exports = require("net/http"); \ No newline at end of file