Build a reusable getEffectivePort helper

Author: pimterry

src/rules/requests/request-handlers.ts

@@ -29,7 +29,8 @@ import {
     isAbsoluteUrl,
     writeHead,
     encodeBodyBuffer,
-    validateHeader
+    validateHeader,
+    getEffectivePort
 } from '../../util/request-utils';
 import {
     h1HeadersToH2,
@@ -639,13 +640,11 @@ export class PassThroughHandler extends PassThroughHandlerDefinition {
             rawHeaders = objectHeadersToRaw(headers);
         }
 
-        const effectivePort = !!port
-            ? parseInt(port, 10)
-            : (protocol === 'https:' ? 443 : 80);
+        const effectivePort = getEffectivePort({ protocol, port });
 
         const strictHttpsChecks = shouldUseStrictHttps(
             hostname!,
-            effectivePort!,
+            effectivePort,
             this.ignoreHostHttpsErrors
         );
 

src/rules/websockets/websocket-handlers.ts

@@ -19,6 +19,7 @@ import {
     TimeoutHandler
 } from '../requests/request-handlers';
 import {
+    getEffectivePort,
     isHttp2
 } from '../../util/request-utils';
 import {
@@ -293,9 +294,7 @@ export class PassThroughWebSocketHandler extends PassThroughWebSocketHandlerDefi
     ) {
         const parsedUrl = url.parse(wsUrl);
 
-        const effectivePort = !!parsedUrl.port
-            ? parseInt(parsedUrl.port, 10)
-            : parsedUrl.protocol == 'wss:' ? 443 : 80;
+        const effectivePort = getEffectivePort(parsedUrl);
 
         const checkServerCertificate = shouldUseStrictHttps(
             parsedUrl.hostname!,

src/util/request-utils.ts

@@ -64,6 +64,16 @@ export const getPathFromAbsoluteUrl = (url: string) => {
     }
 }
 
+export const getEffectivePort = (url: { protocol: string | null, port: string | null }) => {
+    if (url.port) {
+        return parseInt(url.port, 10);
+    } else if (url.protocol === 'https:' || url.protocol === 'wss:') {
+        return 443;
+    } else {
+        return 80;
+    }
+}
+
 export const shouldKeepAlive = (req: OngoingRequest): boolean =>
     req.httpVersion !== '1.0' &&
     req.headers['connection'] !== 'close' &&

test/test-utils.ts

@@ -29,6 +29,7 @@ import { Mockttp } from "..";
 export { getDeferred, Deferred } from '../src/util/promise';
 import { makeDestroyable, DestroyableServer } from "destroyable-server";
 import { isNode, isWeb, delay } from '../src/util/util';
+import { getEffectivePort } from '../src/util/request-utils';
 export { isNode, isWeb, delay, makeDestroyable, DestroyableServer };
 
 if (isNode) {
@@ -363,7 +364,7 @@ export async function http2ProxyRequest(
     const isTLS = parsedUrl.protocol === 'https:';
 
     const targetHost = parsedUrl.hostname!;
-    const targetPort = parsedUrl.port! ?? (isTLS ? 443 : 80);
+    const targetPort = getEffectivePort(parsedUrl);
 
     const proxyClient = http2.connect(proxyServer.url);
     return await new Promise<Http2TestRequestResult>(async (resolve, reject) => {