pass request by reference

cypress-io · Sep 26, 2019 · d921ae7 · d921ae7
1 parent 71487d4
commit d921ae7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/packages/proxy/lib/http/index.ts b/packages/proxy/lib/http/index.ts
@@ -48,6 +48,7 @@ const READONLY_MIDDLEWARE_KEYS : (keyof HttpMiddlewareThis<{}>)[] = [
  'buffers',
  'config',
  'getRemoteState',
+ 'request',
  'next',
  'end',
  'onResponse',
@@ -59,6 +60,7 @@ type HttpMiddlewareThis<T> = HttpMiddlewareCtx<T> & Readonly<{
  buffers: HttpBuffers
  config: any
  getRemoteState: () => any
+ request: any
 
  next: () => void
  /**
@@ -173,16 +175,19 @@ export class Http {
  config: any
  getRemoteState: () => any
  middleware: MiddlewareStacks
+ request: any
 
  constructor (opts: {
  config: any
  getRemoteState: () => any
  middleware?: MiddlewareStacks
+ request: any
  }) {
  this.buffers = new HttpBuffers()
 
  this.config = opts.config
  this.getRemoteState = opts.getRemoteState
+ this.request = opts.request
 
  if (typeof opts.middleware === 'undefined') {
  this.middleware = {
@@ -203,6 +208,7 @@ export class Http {
  buffers: this.buffers,
  config: this.config,
  getRemoteState: this.getRemoteState,
+ request: this.request,
  middleware: _.cloneDeep(this.middleware),
  }
 

diff --git a/packages/proxy/lib/http/request-middleware.ts b/packages/proxy/lib/http/request-middleware.ts
@@ -129,7 +129,7 @@ const SendRequestOutgoing : RequestMiddleware = function () {
  requestOptions.url = requestOptions.url.replace(remoteState.origin, remoteState.fileServer)
  }
 
- const req = request.create(requestOptions)
+ const req = this.request.create(requestOptions)
 
  req.on('error', this.onError)
  req.on('response', (incomingRes) => this.onResponse(incomingRes, req))

diff --git a/packages/proxy/lib/network-proxy.ts b/packages/proxy/lib/network-proxy.ts
@@ -7,6 +7,7 @@ export class NetworkProxy {
  config: any
  getRemoteState: () => any
  middleware?: any
+ request: any
  }) {
  this.http = new Http(opts)
  }

diff --git a/packages/server/lib/server.coffee b/packages/server/lib/server.coffee
@@ -141,7 +141,7 @@ class Server
 
  getRemoteState = => @_getRemoteState()
 
- @_networkProxy = new NetworkProxy({ config, getRemoteState })
+ @_networkProxy = new NetworkProxy({ config, getRemoteState, request: @_request })
 
  @createHosts(config.hosts)