Skip to content

Commit

Permalink
feat: support auto complete for http header names (#542)
Browse files Browse the repository at this point in the history
Co-authored-by: Pooya Parsa <[email protected]>
  • Loading branch information
GalacticHypernova and pi0 authored Oct 3, 2023
1 parent 9e81e4e commit fb79f41
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 7 deletions.
12 changes: 11 additions & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,14 @@ export type EventHandlerObject<

export type LazyEventHandler = () => EventHandler | Promise<EventHandler>;

export type RequestHeaders = { [name: string]: string | undefined };
export type RequestHeaders = Partial<
Record<HTTPHeaderName, string | undefined>
>;

// prettier-ignore
type _HTTPHeaderName = "WWW-Authenticate" | "Authorization" | "Proxy-Authenticate" | "Proxy-Authorization" | "Age" | "Cache-Control" | "Clear-Site-Data" | "Expires" | "Pragma" | "Accept-CH" | "Critical-CH" | "Sec-CH-UA" | "Sec-CH-UA-Arch" | "Sec-CH-UA-Bitness" | "Sec-CH-UA-Full-Version-List" | "Sec-CH-UA-Mobile" | "Sec-CH-UA-Model" | "Sec-CH-UA-Platform" | "Sec-CH-UA-Platform-Version" | "Sec-CH-UA-Prefers-Color-Scheme" | "Sec-CH-UA-Prefers-Reduced-Motion" | "Downlink" | "ECT" | "RTT" | "Save-Data" | "Last-Modified" | "ETag" | "If-Match" | "If-None-Match" | "If-Modified-Since" | "If-Unmodified-Since" | "Vary" | "Connection" | "Keep-Alive" | "Accept" | "Accept-Encoding" | "Accept-Language" | "Expect" | "Max-Forwards" | "Cookie" | "Set-Cookie" | "Access-Control-Allow-Origin" | "Access-Control-Allow-Credentials" | "Access-Control-Allow-Headers" | "Access-Control-Allow-Methods" | "Access-Control-Expose-Headers" | "Access-Control-Max-Age" | "Access-Control-Request-Headers" | "Access-Control-Request-Method" | "Origin" | "Timing-Allow-Origin" | "Content-Disposition" | "Content-Length" | "Content-Type" | "Content-Encoding" | "Content-Language" | "Content-Location" | "Forwarded" | "X-Forwarded-For" | "X-Forwarded-Host" | "X-Forwarded-Proto" | "Via" | "Location" | "Refresh" | "From" | "Host" | "Referer" | "Referrer-Policy" | "User-Agent" | "Allow" | "Server" | "Accept-Ranges" | "Range" | "If-Range" | "Content-Range" | "Cross-Origin-Embedder-Policy" | "Cross-Origin-Opener-Policy" | "Cross-Origin-Resource-Policy" | "Content-Security-Policy" | "Content-Security-Policy-Report-Only" | "Expect-CT" | "Origin-Isolation" | "Permissions-Policy" | "Strict-Transport-Security" | "Upgrade-Insecure-Requests" | "X-Content-Type-Options" | "X-Frame-Options" | "X-Permitted-Cross-Domain-Policies" | "X-Powered-By" | "X-XSS-Protection" | "Sec-Fetch-Site" | "Sec-Fetch-Mode" | "Sec-Fetch-User" | "Sec-Fetch-Dest" | "Sec-Purpose" | "Service-Worker-Navigation-Preload" | "Last-Event-ID" | "NEL" | "Ping-From" | "Ping-To" | "Report-To" | "Transfer-Encoding" | "TE" | "Trailer" | "Sec-WebSocket-Key" | "Sec-WebSocket-Extensions" | "Sec-WebSocket-Accept" | "Sec-WebSocket-Protocol" | "Sec-WebSocket-Version" | "Accept-Push-Policy" | "Accept-Signature" | "Alt-Svc" | "Alt-Used" | "Date" | "Early-Data" | "Link" | "Push-Policy" | "Retry-After" | "Signature" | "Signed-Headers" | "Server-Timing" | "Service-Worker-Allowed" | "SourceMap" | "Upgrade" | "X-DNS-Prefetch-Control" | "X-Pingback" | "X-Requested-With" | "X-Robots-Tag";

export type HTTPHeaderName =
| _HTTPHeaderName
| Lowercase<_HTTPHeaderName>
| (string & {}); // eslint-disable-line @typescript-eslint/ban-types
9 changes: 7 additions & 2 deletions src/utils/request.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { getQuery as _getQuery } from "ufo";
import { createError } from "../error";
import type { HTTPMethod, InferEventInput, RequestHeaders } from "../types";
import type {
HTTPHeaderName,
HTTPMethod,
InferEventInput,
RequestHeaders,
} from "../types";
import type { H3Event } from "../event";
import { validateData, ValidateFunction } from "./internal/validate";
import { getRequestWebStream } from "./body";
Expand Down Expand Up @@ -94,7 +99,7 @@ export const getHeaders = getRequestHeaders;

export function getRequestHeader(
event: H3Event,
name: string,
name: HTTPHeaderName,
): RequestHeaders[string] {
const headers = getRequestHeaders(event);
const value = headers[name.toLowerCase()];
Expand Down
12 changes: 8 additions & 4 deletions src/utils/response.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { OutgoingMessage } from "node:http";
import type { Readable } from "node:stream";
import type { Socket } from "node:net";
import type { H3Event } from "../event";
import type { HTTPHeaderName } from "../types";
import { MIMES } from "./consts";
import { sanitizeStatusCode, sanitizeStatusMessage } from "./sanitize";
import { splitCookiesString } from "./cookie";
Expand Down Expand Up @@ -94,7 +95,7 @@ export function getResponseHeaders(

export function getResponseHeader(
event: H3Event,
name: string,
name: HTTPHeaderName,
): ReturnType<H3Event["res"]["getHeader"]> {
return event.node.res.getHeader(name);
}
Expand All @@ -112,7 +113,7 @@ export const setHeaders = setResponseHeaders;

export function setResponseHeader(
event: H3Event,
name: string,
name: HTTPHeaderName,
value: Parameters<OutgoingMessage["setHeader"]>[1],
): void {
event.node.res.setHeader(name, value);
Expand All @@ -133,7 +134,7 @@ export const appendHeaders = appendResponseHeaders;

export function appendResponseHeader(
event: H3Event,
name: string,
name: HTTPHeaderName,
value: string,
): void {
let current = event.node.res.getHeader(name);
Expand Down Expand Up @@ -172,7 +173,10 @@ export function clearResponseHeaders(
}
}

export function removeResponseHeader(event: H3Event, name: string): void {
export function removeResponseHeader(
event: H3Event,
name: HTTPHeaderName,
): void {
return event.node.res.removeHeader(name);
}

Expand Down

0 comments on commit fb79f41

Please sign in to comment.