Convert resent requests to HTTP/1 automatically

In future we'll want to support HTTP/2 here, but that's not critical in
the short term.

Author: pimterry

src/components/send/send-request-headers-card.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { observer } from 'mobx-react';
 
-import { styled } from '../../styles';
 import { RawHeaders } from '../../types';
 
 import {

src/model/send/send-request-model.ts

@@ -4,6 +4,7 @@ import { observable } from 'mobx';
 
 import { HttpExchange, RawHeaders } from "../../types";
 import { ObservablePromise } from '../../util/observable';
+import { h2HeadersToH1 } from '../../util/headers';
 
 import { EditableContentType, getEditableContentTypeFromViewable } from "../events/content-types";
 import { EditableBody } from '../http/editable-body';
@@ -112,10 +113,15 @@ export async function buildRequestInputFromExchange(exchange: HttpExchange): Pro
     const body = await exchange.request.body.decodedPromise ??
         Buffer.from('!!! ORIGINAL REQUEST BODY COULD NOT BE DECODED !!!');
 
+    // For now, all sent requests are HTTP/1, so we need to make sure we convert:
+    const headers = exchange.httpVersion === 2
+        ? h2HeadersToH1(exchange.request.rawHeaders)
+        : exchange.request.rawHeaders;
+
     return new RequestInput({
         method: exchange.request.method,
         url: exchange.request.url,
-        headers: exchange.request.rawHeaders,
+        headers: headers,
         requestContentType: getEditableContentTypeFromViewable(exchange.request.contentType) ?? 'text',
         rawBody: body,
     });

src/model/send/send-store.ts

@@ -183,6 +183,7 @@ export class SendStore {
 
         const exchange = this.eventStore.recordSentRequest({
             id: exchangeId,
+            httpVersion: '1.1',
             matchedRuleId: false,
             method: requestInput.method,
             url: requestInput.url,

src/util/headers.ts

@@ -1,6 +1,10 @@
 import * as _ from 'lodash';
 import { Headers, RawHeaders } from '../types';
 
+export {
+    h2HeadersToH1
+} from 'mockttp/dist/util/header-utils';
+
 // Based RFC7230, 3.2.6:
 export const HEADER_NAME_PATTERN = '^[!#$%&\'*+\\-.^_`\\|~A-Za-z0-9]+$';
     // The \\| is required here because in 'v' flag regexes (used in HTML patterns by default) the |