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
63 changes: 42 additions & 21 deletions packages/http-api/src/http-server.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { IHttpRequest, IHttpResponse } from '@testring/types';
import { PluggableModule } from '@testring/pluggable-module';
import { loggerClientLocal } from '@testring/logger';
import { LoggerClientLocal, loggerClientLocal } from '@testring/logger';
import {
IConfig,
ITransport,
Expand All @@ -19,7 +19,10 @@ interface QueueRequest {
type MakeRequest = (request: IHttpRequest) => Promise<IHttpResponse>;

export class HttpServer extends PluggableModule {
private _logger: LoggerClientLocal | null = null;

private queue: QueueRequest[] = [];

private isBusy: boolean = false;

constructor(
Expand All @@ -29,60 +32,77 @@ export class HttpServer extends PluggableModule {
) {
super([
HttpServerPlugins.beforeResponse,
HttpServerPlugins.beforeRequest
HttpServerPlugins.beforeRequest,
HttpServerPlugins.beforeError,
]);
this.registerTransportListener();
}

private get logger(): LoggerClientLocal {
if (this._logger) {
return this._logger;
}

this._logger = loggerClientLocal.getLogger('[http-server]');

return this._logger;
}


private addToQueue(data, src): void {
private addToQueue(data: IHttpRequestMessage, src: string): void {
this.queue.push({
data,
src
});
}

private async makeRequest({ data, src }: QueueRequest): Promise<any> {
private async makeRequest(data, src): Promise<any> {
let uid;
try {
uid = data.uid;
const request = data.request;
loggerClientLocal.verbose(`[http server] Sending http request to ${request.url}`);
this.logger.verbose(`Sending http request to ${request.url}`);

this.isBusy = true;

const requestAfterHook = await this.callHook(HttpServerPlugins.beforeRequest, request);
const requestAfterHook = await this.callHook(HttpServerPlugins.beforeRequest, request, data);
const response = await this.request(requestAfterHook);

if (response.statusCode >= 400) {
throw new Error(response.statusMessage);
}

loggerClientLocal.verbose('[http server] Successful response');
this.logger.verbose(`Successful response form ${request.url}`);

const responseAfterHook = await this.callHook(HttpServerPlugins.beforeResponse, response);
const responseAfterHook = await this.callHook(HttpServerPlugins.beforeResponse, response, data);

this.send<IHttpResponseMessage>(src, HttpMessageType.response, {
await this.send<IHttpResponseMessage>(src, HttpMessageType.response, {
uid,
response: responseAfterHook
});
this.setTimer();
} catch (error) {
this.send<IHttpResponseRejectMessage>(src, HttpMessageType.reject, {
const errorAfterHook = await this.callHook(HttpServerPlugins.beforeError, error, data);

await this.send<IHttpResponseRejectMessage>(src, HttpMessageType.reject, {
uid,
error
error: errorAfterHook
});

loggerClientLocal.error(error);
this.logger.debug(errorAfterHook);
this.setTimer();
}
}

private send<T>(source: string | null, messageType: string, payload: T) {
if (source) {
this.transportInstance.send<T>(source, messageType, payload)
.catch((error) => loggerClientLocal.error(error));
} else {
this.transportInstance.broadcastLocal<T>(messageType, payload);
private async send<T>(source: string | null, messageType: string, payload: T) {
try {
if (source) {
await this.transportInstance.send<T>(source, messageType, payload);
} else {
this.transportInstance.broadcastLocal<T>(messageType, payload);
}
} catch (err) {
this.logger.debug(err);
}
}

Expand All @@ -92,7 +112,8 @@ export class HttpServer extends PluggableModule {
const request = this.queue.shift();

if (request) {
this.makeRequest(request);
const { data, src } = request;
this.makeRequest(data, src);
}
} else {
this.isBusy = false;
Expand All @@ -101,15 +122,15 @@ export class HttpServer extends PluggableModule {
}

private registerTransportListener(): void {
loggerClientLocal.debug(`Http server: Register listener for messages [type = ${HttpMessageType.send}]`);
this.logger.debug(`Http server: Register listener for messages [type = ${HttpMessageType.send}]`);

this.transportInstance.on(HttpMessageType.send, (data: IHttpRequestMessage, src: string) => {

// todo validate data
if (this.isBusy) {
this.addToQueue(data, src);
} else {
this.makeRequest({ data, src });
this.makeRequest(data, src);
}
});
}
Expand Down
103 changes: 93 additions & 10 deletions packages/http-api/test/http-server.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { HttpServer } from '../src/http-server';

const DEFAULT_CONFIG: any = { httpThrottle: 0 };

// TODO add tests for cookies
// TODO (flops) add tests for cookies and hooks

describe('HttpServer', () => {
it('Should get data from broadcast', (callback) => {
Expand All @@ -29,9 +29,12 @@ describe('HttpServer', () => {
});

transport.on(HttpMessageType.response, (response) => {
chai.expect(response.response).to.be.equal(responseMock);

callback();
try {
chai.expect(response.response).to.be.equal(responseMock);
callback();
} catch (err) {
callback(err);
}
});

transport.broadcast(HttpMessageType.send, {
Expand All @@ -47,8 +50,12 @@ describe('HttpServer', () => {
new HttpServer(transport, DEFAULT_CONFIG, rp as any);

transport.on(HttpMessageType.reject, (response) => {
chai.expect(response.error).to.be.instanceOf(Error);
callback();
try {
chai.expect(response.error).to.be.instanceOf(Error);
callback();
} catch (err) {
callback(err);
}
});

transport.on(HttpMessageType.response, (response) => {
Expand All @@ -69,14 +76,21 @@ describe('HttpServer', () => {
new HttpServer(transport, DEFAULT_CONFIG, rp as any);

transport.on(HttpMessageType.reject, (response) => {
chai.expect(response.error).to.be.instanceOf(Error);
callback();
try {
chai.expect(response.error).to.be.instanceOf(Error);
callback();
} catch (err) {
callback(err);
}
});

transport.on(HttpMessageType.response, (response) => {
if (response.status > 400) {
callback('response error');
try {
chai.expect(response.status < 400, 'Response error').to.equal(true);
} catch (err) {
callback(err);
}

callback(`request complete somehow ${response}`);
});

Expand All @@ -85,4 +99,73 @@ describe('HttpServer', () => {
request: {}
});
});

it('Should finish queued requests', (callback) => {
const responseMock: IHttpResponse = {
statusCode: 200,
statusMessage: '',
body: null,
headers: {},
cookies: []
};
const transport = new TransportMock();


const rp = (request) => {
return new Promise((resolve, reject) => {
setTimeout(() => {
switch (request.url) {
case 'test1':
reject(new Error('rejected'));
break;
case 'test2':
resolve(responseMock);
break;
default:
callback('Invalid request call');
}
}, 200);
});
};

let responseId = 0;
const spy = (...args) => {
try {
switch (responseId) {
case 0:
chai.expect(args[0].error).to.be.instanceOf(Error);
break;
case 1:
chai.expect(args[0].response).to.be.deep.equal(responseMock);
callback();
break;
default:
throw new Error('Called to many times');
}
} catch (err) {
callback(err);
}

responseId++;
};

new HttpServer(transport, DEFAULT_CONFIG, rp as any);

transport.on(HttpMessageType.response, spy);
transport.on(HttpMessageType.reject, spy);

transport.broadcast(HttpMessageType.send, {
uid: 'uuid1',
request: {
url: 'test1',
}
});

transport.broadcast(HttpMessageType.send, {
uid: 'uuid2',
request: {
url: 'test2',
}
});
});
});
1 change: 1 addition & 0 deletions packages/test-worker/src/test-worker-instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ export class TestWorkerInstance implements ITestWorkerInstance {
parameters,
envParameters
});
//await this.kill();
}

private async compileSource(source: string, filename: string): Promise<string> {
Expand Down
5 changes: 3 additions & 2 deletions packages/types/src/http-api/enums.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
export const enum HttpMessageType {
send = 'sendHttpRequest',
response = 'responseHttpRequest',
reject = 'rejectHttpRequest'
reject = 'rejectHttpRequest',
}

export const enum HttpServerPlugins {
beforeRequest = 'beforeRequest',
beforeResponse = 'beforeResponse'
beforeResponse = 'beforeResponse',
beforeError = 'beforeError',
}