Merge pr TooTallNate#96 with minor change

patrickheeney · patrickheeney · commit a0158738fa39 · 2021-10-04T12:37:40.000-07:00
diff --git a/src/agent.ts b/src/agent.ts
@@ -27,6 +27,7 @@ const debug = createDebug('https-proxy-agent:agent');
 export default class HttpsProxyAgent extends Agent {
 	private secureProxy: boolean;
 	private proxy: HttpsProxyAgentOptions;
+	public timeout: number | null;
 
 	constructor(_opts: string | HttpsProxyAgentOptions) {
 		let opts: HttpsProxyAgentOptions;
@@ -43,6 +44,8 @@ export default class HttpsProxyAgent extends Agent {
 		debug('creating new HttpsProxyAgent instance: %o', opts);
 		super(opts);
 
+		this.timeout = opts.timeout || null;
+
 		const proxy: HttpsProxyAgentOptions = { ...opts };
 
 		// If `true`, then connect to the proxy server over TLS.
@@ -98,6 +101,10 @@ export default class HttpsProxyAgent extends Agent {
 			socket = net.connect(proxy as net.NetConnectOpts);
 		}
 
+		if (this.timeout) {
+			socket.setTimeout(this.timeout);
+		}
+
 		const headers: OutgoingHttpHeaders = { ...proxy.headers };
 		const hostname = `${opts.host}:${opts.port}`;
 		let payload = `CONNECT ${hostname} HTTP/1.1\r\n`;
diff --git a/src/index.ts b/src/index.ts
@@ -18,6 +18,7 @@ namespace createHttpsProxyAgent {
 		host?: string | null;
 		path?: string | null;
 		port?: string | number | null;
+		timeout?: number;
 	}
 
 	export interface HttpsProxyAgentOptions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ namespace createHttpsProxyAgent {`
`18`	`18`	`host?: string \| null;`
`19`	`19`	`path?: string \| null;`
`20`	`20`	`port?: string \| number \| null;`
	`21`	`+ timeout?: number;`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`export interface HttpsProxyAgentOptions`