fix all tests
This commit is contained in:
parent
1112663f87
commit
b236072cd6
|
|
@ -19,8 +19,8 @@ import type { RootDispatcher } from './dispatcher';
|
||||||
import { Dispatcher, existingDispatcher } from './dispatcher';
|
import { Dispatcher, existingDispatcher } from './dispatcher';
|
||||||
import type * as channels from '@protocol/channels';
|
import type * as channels from '@protocol/channels';
|
||||||
import { APIRequestContextDispatcher, RequestDispatcher, ResponseDispatcher, RouteDispatcher } from './networkDispatchers';
|
import { APIRequestContextDispatcher, RequestDispatcher, ResponseDispatcher, RouteDispatcher } from './networkDispatchers';
|
||||||
import { urlMatches } from '@isomorphic/urlMatch';
|
|
||||||
import type { Request, Response, Route } from '../network';
|
import type { Request, Response, Route } from '../network';
|
||||||
|
import { urlMatches } from '../../utils/isomorphic/urlMatch';
|
||||||
|
|
||||||
export class MockingProxyDispatcher extends Dispatcher<MockingProxy, channels.MockingProxyChannel, RootDispatcher> implements channels.MockingProxyChannel {
|
export class MockingProxyDispatcher extends Dispatcher<MockingProxy, channels.MockingProxyChannel, RootDispatcher> implements channels.MockingProxyChannel {
|
||||||
_type_MockingProxy = true;
|
_type_MockingProxy = true;
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,7 @@ export class MockingProxy extends SdkObject implements RequestContext {
|
||||||
const body = await collectBody(req);
|
const body = await collectBody(req);
|
||||||
const request = new Request(this, null, null, null, undefined, req.url!, '', req.method!, body, headers);
|
const request = new Request(this, null, null, null, undefined, req.url!, '', req.method!, body, headers);
|
||||||
request.setRawRequestHeaders(headers);
|
request.setRawRequestHeaders(headers);
|
||||||
|
this.emit(MockingProxy.Events.Request, request);
|
||||||
|
|
||||||
const route = new Route(request, {
|
const route = new Route(request, {
|
||||||
abort: async errorCode => {
|
abort: async errorCode => {
|
||||||
|
|
@ -135,7 +136,7 @@ export class MockingProxy extends SdkObject implements RequestContext {
|
||||||
const address = socket.address() as AddressInfo;
|
const address = socket.address() as AddressInfo;
|
||||||
const responseBodyPromise = new ManualPromise<Buffer>();
|
const responseBodyPromise = new ManualPromise<Buffer>();
|
||||||
const response = new Response(request, proxyRes.statusCode!, proxyRes.statusMessage!, headersArray(proxyRes), timings, () => responseBodyPromise, false, proxyRes.httpVersion);
|
const response = new Response(request, proxyRes.statusCode!, proxyRes.statusMessage!, headersArray(proxyRes), timings, () => responseBodyPromise, false, proxyRes.httpVersion);
|
||||||
response.setRawResponseHeaders(headers);
|
response.setRawResponseHeaders(headersArray(proxyRes));
|
||||||
response._securityDetailsFinished(securityDetails);
|
response._securityDetailsFinished(securityDetails);
|
||||||
response._serverAddrFinished({ ipAddress: address.family === 'IPv6' ? `[${address.address}]` : address.address, port: address.port });
|
response._serverAddrFinished({ ipAddress: address.family === 'IPv6' ? `[${address.address}]` : address.address, port: address.port });
|
||||||
this.emit(MockingProxy.Events.Response, response);
|
this.emit(MockingProxy.Events.Response, response);
|
||||||
|
|
@ -163,7 +164,7 @@ export class MockingProxy extends SdkObject implements RequestContext {
|
||||||
response.setTransferSize(transferSize);
|
response.setTransferSize(transferSize);
|
||||||
response.setEncodedBodySize(encodedBodySize);
|
response.setEncodedBodySize(encodedBodySize);
|
||||||
response.setResponseHeadersSize(transferSize - encodedBodySize);
|
response.setResponseHeadersSize(transferSize - encodedBodySize);
|
||||||
this.emit(MockingProxy.Events.RequestFinished, response);
|
this.emit(MockingProxy.Events.RequestFinished, request);
|
||||||
resolve();
|
resolve();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
request._setFailureText('' + error);
|
request._setFailureText('' + error);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue