Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 84 additions & 1 deletion apps/automated/src/http/http-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ImageSource } from '@nativescript/core';
import * as TKUnit from '../tk-unit';
import * as http from '@nativescript/core/http';
import * as fs from '@nativescript/core/file-system';
import { addHeader } from '@nativescript/core/http/http-request';
import { requestInternal, addHeader, BaseHttpContent } from '@nativescript/core/http/http-request-internal';

export var test_getString_isDefined = function () {
TKUnit.assert(typeof http.getString !== 'undefined', 'Method http.getString() should be defined!');
Expand Down Expand Up @@ -329,6 +329,89 @@ export var test_request_requestShouldTimeout = function (done) {
});
};

export var test_requestInternal_responseStatusCodeShouldBeDefined = function (done) {
requestInternal({ url: 'https://http-echo.nativescript.org/get', method: 'GET' }).then(
function (response) {
//// Argument (response) is HttpResponse!
var statusCode = response.statusCode;
try {
TKUnit.assert(typeof statusCode !== 'undefined', 'response.statusCode should be defined!');
done(null);
} catch (err) {
done(err);
}
},
function (e) {
//// Argument (e) is Error!
done(e);
},
);
};

export var test_requestInternal_responseContentShouldExposeNativeContentFunctions = function (done) {
requestInternal({ url: 'https://http-echo.nativescript.org/get', method: 'GET' }).then(
function (response) {
try {
TKUnit.assert(typeof response.content.toNativeImage === 'function' && typeof response.content.toNativeString === 'function', `response.content should expose native content functions!`);
done(null);
} catch (err) {
done(err);
}
},
function (e) {
//// Argument (e) is Error!
done(e);
},
);
};

export var test_requestInternal_responseContentShouldExposeHandlerFunctions = function (done) {
const responseHandler = {
toDummy1: () => 'dummy1',
toDummy2: () => 'dummy2',
};

requestInternal({ url: 'https://http-echo.nativescript.org/get', method: 'GET' }, responseHandler).then(
function (response) {
try {
TKUnit.assert(typeof response.content.toDummy1 === 'function' && typeof response.content.toDummy2 === 'function', `response.content should expose content handler functions!`);
done(null);
} catch (err) {
done(err);
}
},
function (e) {
//// Argument (e) is Error!
done(e);
},
);
};

export var test_requestInternal_responseHandlerShouldBeAvailable = function (done) {
const suffix = '-nsformatted';
const responseHandler = {
toFormattedString: function (this: BaseHttpContent) {
return this.toNativeString() + suffix;
},
};

requestInternal({ url: 'https://http-echo.nativescript.org/get', method: 'GET' }, responseHandler).then(
function (response) {
const value = response.content.toFormattedString();
try {
TKUnit.assert(typeof value === 'string' && value.endsWith(suffix), `response.content.toFormattedString should return the response string appended with ${suffix} at the end!`);
done(null);
} catch (err) {
done(err);
}
},
function (e) {
//// Argument (e) is Error!
done(e);
},
);
};

export var test_request_responseStatusCodeShouldBeDefined = function (done) {
var result: http.HttpResponse;

Expand Down
34 changes: 0 additions & 34 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 9 additions & 10 deletions packages/core/http/http-interfaces.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { ImageSource } from '../image-source';
import type { File } from '../file-system';
import type { BaseHttpContent } from './http-request-internal';

/**
* Provides options for the http requests.
Expand Down Expand Up @@ -39,7 +40,7 @@ export interface HttpRequestOptions {
/**
* Encapsulates HTTP-response information from an HTTP-request.
*/
export interface HttpResponse {
export interface HttpResponse<T = HttpContent> {
/**
* Gets the response status code.
*/
Expand All @@ -53,7 +54,7 @@ export interface HttpResponse {
/**
* Gets the response content.
*/
content?: HttpContent;
content?: T;
}

export type Headers = { [key: string]: string | string[] };
Expand All @@ -62,15 +63,8 @@ export enum HttpResponseEncoding {
UTF8,
GBK,
}
/**
* Encapsulates the content of an HttpResponse.
*/
export interface HttpContent {
/**
* Gets the response body as raw data.
*/
raw: any;

export interface HttpContentHandler {
/**
* Gets the response body as ArrayBuffer
*/
Expand All @@ -96,3 +90,8 @@ export interface HttpContent {
*/
toFile: (destinationFilePath?: string) => File;
}

/**
* Encapsulates the content of an HttpResponse.
*/
export interface HttpContent extends HttpContentHandler, BaseHttpContent {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import type { Headers } from '../http-interfaces';

export function addHeader(headers: Headers, key: string, value: string): void {
if (!headers[key]) {
headers[key] = value;
} else if (Array.isArray(headers[key])) {
headers[key].push(value);
} else {
headers[key] = [headers[key], value];
}
}
Loading
Loading