javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

http client reworked (temporary getString, getJSON and getImage in separate file)

Browse Source
This commit is contained in:
Vladimir Enchev
2014-04-23 17:00:38 +03:00
parent 24e817916e
commit 1bf9c1ecaa
6 changed files with 192 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BCL.csproj
View File

@ -148,6 +148,7 @@
<TypeScriptCompile Include="android17.d.ts" />
<TypeScriptCompile Include="promises\promises.ts" />
<TypeScriptCompile Include="promises\index.ts" />
<TypeScriptCompile Include="net\http_common.ts" />
<Content Include="_references.ts" />
<TypeScriptCompile Include="Console\console.android.ts">
<DependentUpon>console.d.ts</DependentUpon>

23
declarations.android.d.ts vendored
View File

@ -346,7 +346,8 @@ declare module com {
export module ion {
export class Ion {
static with(context: any, url : string) : any;
static with(context: any, url: string): any;
static getDefault(context: any): any;
}
}
@ -356,6 +357,26 @@ declare module com {
constructor(context: any);
}
}
export module http {
export module libcore {
export class RawHeaders {
constructor();
add(name: string, v: string);
}
}
export class AsyncHttpClient {
static getDefaultInstance(): any;
}
export module callback {
export class HttpConnectCallback {
constructor(params: any);
}
}
}
}
}
}

79
net/http_client.android.ts
View File

@ -1,66 +1,61 @@
/**
* Android specific http client implementation.
*/
import image_module = require("Image/image");
import app_module = require("Application/application");
import promises = require("promises/promises");
export class http {
/**
* Gets string from url.
*/
public static getString(url: string): promises.Promise<string> {
var d = promises.defer<string>();
http.get(url, r => d.resolve(r), e => d.reject(e));
return d.promise();
}
import http = require("net/http_client");
/**
* Gets JSON from url.
*/
public static getJSON<T>(url: string): promises.Promise<T> {
var d = promises.defer<T>();
http.get(url, r => d.resolve(JSON.parse(r)), e => d.reject(e));
return d.promise();
}
/*
// merge common
import http_common = require("net/http_common");
declare var exports;
exports.getString = http_common.getString;
exports.getJSON = http_common.getJSON;
exports.getImage = http_common.getImage;
*/
/**
* Gets image from url.
*/
public static getImage(url: string): promises.Promise<image_module.Image> {
var d = promises.defer<image_module.Image>();
http.get(url, r => {
var image = new image_module.Image();
image.loadFromNativeBitmap(r);
d.resolve(image);
}, e => d.reject(e));
return d.promise();
}
// TODO: Replace with similar to iOS implementation!
export function request(options: http.HttpRequestOptions): promises.Promise<http.HttpResponse> {
var d = promises.defer<http.HttpResponse>();
// TODO: Accept: application/json header for JSON calls and check the response for Image not url!
private static get(url: string, successCallback: (result: any) => void, errorCallback?: (e: Error) => void) {
try {
var isImage = url.match(/\.(jpeg|jpg|gif|png)$/i) != null;
var headers = new com.koushikdutta.async.http.libcore.RawHeaders();
if (options.headers && options.headers.length) {
for (var i = 0, l = options.headers.length; i < l; i++) {
var header = options.headers[i];
headers.add(header.name, header.value)
}
}
var isImage = options.url.match(/\.(jpeg|jpg|gif|png)$/i) != null;
var context = app_module.Application.current.android.context;
var request = com.koushikdutta.ion.Ion.with(context, url);
var request = com.koushikdutta.ion.Ion.with(context, options.url);
request = isImage ? request.asBitmap() : request.asString();
request.setCallback(new com.koushikdutta.async.future.FutureCallback({
onCompleted: function (error, data) {
if (error && errorCallback) {
errorCallback(new Error(error.toString()));
} else if (successCallback) {
successCallback(data);
if (error) {
d.reject(error);
} else {
d.resolve({
body: {
toString: () => { return data },
toJSON: () => { return JSON.parse(data) },
toImage: () => { return image_module.Image.imageFromNativeBitmap(data); }
},
statusCode: 0,
headers: []
});
}
}
}));
} catch (ex) {
if (errorCallback) {
errorCallback(ex);
}
}
d.reject(ex);
}
return d.promise();
}

30
net/http_client.d.ts vendored
View File

@ -4,28 +4,32 @@
import image_module = require("Image/image");
import promises = require("promises/promises");
export declare class http {
static getString(url: string): promises.Promise<string>;
static getJSON<T>(url: string): promises.Promise<T>;
static getImage(url: string): promises.Promise<image_module.Image>;
export declare function getString(url: string): promises.Promise<string>;
export declare function getJSON<T>(url: string): promises.Promise<T>;
export declare function getImage(url: string): promises.Promise<image_module.Image>;
static request(options: IHttpRequestOptions, successCallback: (r: IHttpResponse) => void, errorCallback?: (e: Error) => void);
}
export declare function request(options: HttpRequestOptions): promises.Promise<HttpResponse>;
export interface IHttpRequestOptions {
export interface HttpRequestOptions {
url: string;
method: string;
headers?: IHttpHeader[];
body?: string;
headers?: HttpHeader[];
body?: any;
}
export interface IHttpHeader {
export interface HttpHeader {
name: string;
value: string;
}
export interface IHttpResponse {
export interface HttpResponse {
statusCode: number;
headers: IHttpHeader[];
body: any;
headers: HttpHeader[];
body: HttpContent;
}
export interface HttpContent {
toString: () => string;
toJSON: () => any;
toImage: () => image_module.Image;
}

88
net/http_client.ios.ts
View File

@ -1,57 +1,21 @@
/**
* iOS specific http client implementation.
*/
import http_client = require("net/http_client");
import image_module = require("Image/image");
import image = require("Image/image");
import promises = require("promises/promises");
import http = require("net/http_client");
export class http {
/**
* Gets string from url.
*/
public static getString(url: string): promises.Promise<string> {
var d = promises.defer<string>();
/*
// merge common
import http_common = require("net/http_common");
declare var exports;
exports.getString = http_common.getString;
exports.getJSON = http_common.getJSON;
exports.getImage = http_common.getImage;
*/
http.request({ url: url, method: "GET" },
r => d.resolve(Foundation.NSString.initWithDataEncoding(r.body, 4).toString()),
e => d.reject(e));
return d.promise();
}
/**
* Gets JSON from url.
*/
public static getJSON<T>(url: string): promises.Promise<T> {
var d = promises.defer<T>();
http.request({ url: url, method: "GET" },
r => d.resolve(JSON.parse(Foundation.NSString.initWithDataEncoding(r.body, 4).toString())),
e => d.reject(e));
return d.promise();
}
/**
* Gets image from url.
*/
public static getImage(url: string): promises.Promise<image_module.Image> {
var d = promises.defer<image_module.Image>();
http.request({ url: url, method: "GET" },
r => {
var image = new image_module.Image();
image.loadFromData(r.body);
d.resolve(image);
},
e => d.reject(e));
return d.promise();
}
private static request(options: http_client.IHttpRequestOptions,
successCallback: (r: http_client.IHttpResponse) => void,
errorCallback?: (e: Error) => void) {
export function request(options: http.HttpRequestOptions): promises.Promise<http.HttpResponse> {
var d = promises.defer<http.HttpResponse>();
try {
var sessionConfig = Foundation.NSURLSessionConfiguration.defaultSessionConfiguration();
@ -79,12 +43,10 @@ export class http {
var dataTask = session.dataTaskWithRequestCompletionHandler(urlRequest,
function (data, response, error) {
if (error) {
if (errorCallback) {
errorCallback(new Error(error.localizedDescription()));
}
} else if (successCallback) {
d.reject(error);
} else {
var headers = new Array<http_client.IHttpHeader>();
var headers = new Array<http.HttpHeader>();
var headerFields = response.allHeaderFields();
var keys = headerFields.allKeys();
@ -94,9 +56,12 @@ export class http {
headers.push({ name: key, value: headerFields.valueForKey(key) });
}
successCallback(
{
body: data,
d.resolve({
body: {
toString: () => { return NSDataToString(data); },
toJSON: () => { return JSON.parse(NSDataToString(data)); },
toImage: () => { return image.Image.imageFromData(data); }
},
statusCode: response.statusCode,
headers: headers
});
@ -105,10 +70,11 @@ export class http {
dataTask.resume();
} catch (ex) {
if (errorCallback) {
errorCallback(ex);
}
}
d.reject(ex);
}
return d.promise();
}
function NSDataToString(data: any): string {
return Foundation.NSString.initWithDataEncoding(data, 4).toString();
}

42
net/http_common.ts Normal file
View File

@ -0,0 +1,42 @@
import image_module = require("Image/image");
import promises = require("promises/promises");
import http = require("net/http_client");
/**
* Gets string from url.
*/
export function getString(url: string): promises.Promise<string> {
var d = promises.defer<string>();
http.request({ url: url, method: "GET" })
.then(r => d.resolve(r.body.toString()))
.fail(e => d.reject(e));
return d.promise();
}
/**
* Gets JSON from url.
*/
export function getJSON<T>(url: string): promises.Promise<T> {
var d = promises.defer<T>();
http.request({ url: url, method: "GET" })
.then(r => d.resolve(r.body.toJSON()))
.fail(e => d.reject(e));
return d.promise();
}
/**
* Gets image from url.
*/
export function getImage(url: string): promises.Promise<image_module.Image> {
var d = promises.defer<image_module.Image>();
http.request({ url: url, method: "GET" })
.then(r => d.resolve(r.body.toImage()))
.fail(e => d.reject(e));
return d.promise();
}