Move header utils into the HTTP model

pimterry · pimterry · commit 5477f2949f92 · 2025-10-24T18:27:29.000+02:00
diff --git a/src/components/common/editable-headers.tsx b/src/components/common/editable-headers.tsx
@@ -4,7 +4,7 @@ import { action, observable, reaction, runInAction } from 'mobx';
 import { disposeOnUnmount, observer } from 'mobx-react';
 
 import { RawHeaders } from '../../types';
-import { HEADER_NAME_PATTERN } from '../../util/headers';
+import { HEADER_NAME_PATTERN } from '../../model/http/headers';
 
 import { EditablePairs, PairsArray } from './editable-pairs';
 
diff --git a/src/components/editor/body-card-components.tsx b/src/components/editor/body-card-components.tsx
@@ -6,7 +6,7 @@ import { Headers, RawHeaders } from '../../types';
 import { styled, css } from '../../styles';
 import { WarningIcon } from '../../icons';
 
-import { asHeaderArray, getHeaderValue, getHeaderValues } from '../../util/headers';
+import { asHeaderArray, getHeaderValue, getHeaderValues } from '../../model/http/headers';
 import { saveFile } from '../../util/ui';
 import { ErrorLike } from '../../util/error';
 
diff --git a/src/components/editor/content-viewer.tsx b/src/components/editor/content-viewer.tsx
@@ -10,7 +10,7 @@ import { styled } from '../../styles';
 import { ObservablePromise, isObservablePromise } from '../../util/observable';
 import { asError, unreachableCheck } from '../../util/error';
 import { stringToBuffer } from '../../util/buffer';
-import { getHeaderValue } from '../../util/headers';
+import { getHeaderValue } from '../../model/http/headers';
 
 import { ViewableContentType } from '../../model/events/content-types';
 import { Formatters, isEditorFormatter } from '../../model/events/body-formatting';
diff --git a/src/components/modify/matcher-config.tsx b/src/components/modify/matcher-config.tsx
@@ -15,7 +15,7 @@ import {
     headersToFlatHeaders,
     headersToRawHeaders,
     rawHeadersToHeaders
-} from '../../util/headers';
+} from '../../model/http/headers';
 
 import {
     Matcher,
diff --git a/src/components/modify/step-config.tsx b/src/components/modify/step-config.tsx
@@ -27,7 +27,7 @@ import {
     rawHeadersToHeaders,
     HEADER_NAME_REGEX,
     setHeaderValue
-} from '../../util/headers';
+} from '../../model/http/headers';
 import {
     ADVANCED_PATCH_TRANSFORMS,
     serverSupports
diff --git a/src/components/send/sent-response-body.tsx b/src/components/send/sent-response-body.tsx
@@ -7,7 +7,7 @@ import * as portals from 'react-reverse-portal';
 import { ExchangeMessage } from '../../types';
 
 import { ErrorLike } from '../../util/error';
-import { getHeaderValue } from '../../util/headers';
+import { getHeaderValue } from '../../model/http/headers';
 
 import { ViewableContentType, getCompatibleTypes } from '../../model/events/content-types';
 
diff --git a/src/components/view/http/http-body-card.tsx b/src/components/view/http/http-body-card.tsx
@@ -7,7 +7,7 @@ import * as portals from 'react-reverse-portal';
 
 import { ExchangeMessage } from '../../../types';
 
-import { getHeaderValue } from '../../../util/headers';
+import { getHeaderValue } from '../../../model/http/headers';
 
 import { ViewableContentType, getCompatibleTypes } from '../../../model/events/content-types';
 
diff --git a/src/components/view/http/http-breakpoint-body-card.tsx b/src/components/view/http/http-breakpoint-body-card.tsx
@@ -9,7 +9,7 @@ import {
     bufferToString,
     stringToBuffer
 } from '../../../util/buffer';
-import { getHeaderValue } from '../../../util/headers';
+import { getHeaderValue } from '../../../model/http/headers';
 import {
     EditableContentType,
     EditableContentTypes,
diff --git a/src/components/view/http/http-breakpoint-request-card.tsx b/src/components/view/http/http-breakpoint-request-card.tsx
@@ -8,7 +8,7 @@ import { BreakpointRequestResult, HttpExchange, RawHeaders } from '../../../type
 import { styled } from '../../../styles';
 
 import { getSummaryColor } from '../../../model/events/categorization';
-import { withHeaderValue } from '../../../util/headers';
+import { withHeaderValue } from '../../../model/http/headers';
 
 import {
     CollapsibleCardHeading,
diff --git a/src/components/view/http/http-breakpoint-response-card.tsx b/src/components/view/http/http-breakpoint-response-card.tsx
@@ -7,7 +7,7 @@ import { BreakpointResponseResult, HttpExchange, RawHeaders } from '../../../typ
 import { styled, Theme } from '../../../styles';
 
 import { getStatusColor } from '../../../model/events/categorization';
-import { withHeaderValue } from '../../../util/headers';
+import { withHeaderValue } from '../../../model/http/headers';
 
 import {
     CollapsibleCardHeading,
diff --git a/src/components/view/http/http-performance-card.tsx b/src/components/view/http/http-performance-card.tsx
@@ -7,7 +7,7 @@ import { styled } from '../../../styles';
 import { ExchangeMessage, HttpExchangeView } from '../../../types';
 
 import { getReadableSize } from '../../../util/buffer';
-import { asHeaderArray } from '../../../util/headers';
+import { asHeaderArray } from '../../../model/http/headers';
 import { joinAnd } from '../../../util/text';
 import { Icon, WarningIcon, SuggestionIcon } from '../../../icons';
 
diff --git a/src/model/api/openapi.ts b/src/model/api/openapi.ts
@@ -22,7 +22,7 @@ import {
     Html
 } from "../../types";
 import { firstMatch, empty } from '../../util';
-import { getHeaderValue } from '../../util/headers';
+import { getHeaderValue } from '../http/headers';
 import { formatAjvError } from '../../util/json-schema';
 
 import {
diff --git a/src/model/events/categorization.ts b/src/model/events/categorization.ts
@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 
 import { ExchangeMessage } from '../../types';
 import { Theme } from '../../styles';
-import { getHeaderValue } from '../../util/headers';
+import { getHeaderValue } from '../http/headers';
 
 import { getBaseContentType } from './content-types';
 
diff --git a/src/model/http/caching.ts b/src/model/http/caching.ts
@@ -8,7 +8,7 @@ import {
 } from 'date-fns';
 
 import { ExchangeMessage, HttpExchangeView } from '../../types';
-import { getHeaderValue, asHeaderArray } from '../../util/headers';
+import { getHeaderValue, asHeaderArray } from './headers';
 import { joinAnd } from '../../util/text';
 import { escapeForMarkdownEmbedding } from '../ui/markdown';
 
diff --git a/src/model/http/editable-body.ts b/src/model/http/editable-body.ts
@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import { computed, observable, action, runInAction, reaction } from 'mobx';
 
 import { RawHeaders } from '../../types';
-import { asHeaderArray, getHeaderValues } from "../../util/headers";
+import { asHeaderArray, getHeaderValues } from "./headers";
 import {
     observablePromise,
     ObservablePromise,
diff --git a/src/model/http/editable-request-parts.ts b/src/model/http/editable-request-parts.ts
@@ -1,7 +1,7 @@
 import { reaction } from 'mobx';
 
 import { RawHeaders } from '../../types';
-import { getHeaderValue, setHeaderValue, removeHeader } from '../../util/headers';
+import { getHeaderValue, setHeaderValue, removeHeader } from './headers';
 import { EditableBody } from './editable-body';
 import { EditableContentType, getDefaultMimeType, getEditableContentType } from '../events/content-types';
 
diff --git a/src/model/http/exchange-breakpoint.ts b/src/model/http/exchange-breakpoint.ts
@@ -22,7 +22,7 @@ import {
     getHeaderValue,
     headersToRawHeaders,
     rawHeadersToHeaders
-} from '../../util/headers';
+} from './headers';
 
 import {
     RAW_BODY_SUPPORTED,
diff --git a/src/model/http/har.ts b/src/model/http/har.ts
@@ -20,7 +20,7 @@ import {
 } from '../../types';
 
 import { stringToBuffer } from '../../util/buffer';
-import { getHeaderValues, getHeaderValue } from '../../util/headers';
+import { getHeaderValues, getHeaderValue } from './headers';
 import { ObservablePromise, observablePromise } from '../../util/observable';
 import { unreachableCheck } from '../../util/error';
 
diff --git a/src/model/http/headers.ts b/src/model/http/headers.ts
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import { Headers, RawHeaders } from '../types';
+import { Headers, RawHeaders } from '../../types';
 
 export {
     h2HeadersToH1
diff --git a/src/model/http/http-body.ts b/src/model/http/http-body.ts
@@ -18,7 +18,7 @@ import {
 import {
     asHeaderArray,
     getHeaderValues
-} from '../../util/headers';
+} from './headers';
 
 import { logError } from '../../errors';
 import { decodeBody } from '../../services/ui-worker-api';
diff --git a/src/model/http/http-exchange.ts b/src/model/http/http-exchange.ts
@@ -15,7 +15,7 @@ import {
     MockttpBreakpointResponseResult,
     InputRuleEventDataMap
 } from "../../types";
-import { getHeaderValue } from '../../util/headers';
+import { getHeaderValue } from './headers';
 import { ParsedUrl } from '../../util/url';
 
 
diff --git a/src/model/http/upstream-exchange.ts b/src/model/http/upstream-exchange.ts
@@ -8,7 +8,7 @@ import {
     HtkResponse
 } from '../../types';
 
-import { getHeaderValue, rawHeadersToHeaders, withoutPseudoHeaders } from '../../util/headers';
+import { getHeaderValue, rawHeadersToHeaders, withoutPseudoHeaders } from './headers';
 import { ParsedUrl } from '../../util/url';
 import { asBuffer } from '../../util/buffer';
 
diff --git a/src/model/send/send-request-model.ts b/src/model/send/send-request-model.ts
@@ -4,7 +4,7 @@ import { observable } from 'mobx';
 
 import { HttpExchange, RawHeaders, HttpExchangeView } from "../../types";
 import { ObservablePromise } from '../../util/observable';
-import { h2HeadersToH1 } from '../../util/headers';
+import { h2HeadersToH1 } from '../http/headers';
 
 import { EditableContentType, getEditableContentTypeFromViewable } from "../events/content-types";
 import { EditableBody } from '../http/editable-body';
diff --git a/src/model/send/send-store.ts b/src/model/send/send-store.ts
@@ -15,7 +15,7 @@ import { logError } from '../../errors';
 import { getObservableDeferred, lazyObservablePromise } from '../../util/observable';
 import { persist, hydrate } from '../../util/mobx-persist/persist';
 import { ErrorLike, unreachableWarning } from '../../util/error';
-import { rawHeadersToHeaders } from '../../util/headers';
+import { rawHeadersToHeaders } from '../http/headers';
 import { getEffectivePort } from '../../util/url';
 import { trackEvent } from '../../metrics';
 
diff --git a/src/util/protobuf.ts b/src/util/protobuf.ts
@@ -2,7 +2,7 @@ import parseRawProto from 'rawprotoparse';
 import { gunzipSync, inflateSync } from 'zlib';
 
 import { Headers } from '../types';
-import { getHeaderValue } from './headers';
+import { getHeaderValue } from '../model/http/headers';
 
 export function isProbablyProtobuf(input: Uint8Array) {
     // Protobuf data starts with a varint, consisting of a
