From 0972f91806daee4625e06bba58642b51d2ef7d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Thu, 5 Jun 2025 01:41:15 +0200 Subject: [PATCH] feat(dev/vite): detect HTTPS protocol Co-authored-by: Bogdan Chadkin --- .changeset/calm-swans-tap.md | 5 +++++ packages/react-router-dev/vite/node-adapter.ts | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .changeset/calm-swans-tap.md diff --git a/.changeset/calm-swans-tap.md b/.changeset/calm-swans-tap.md new file mode 100644 index 0000000000..14f654a375 --- /dev/null +++ b/.changeset/calm-swans-tap.md @@ -0,0 +1,5 @@ +--- +"@react-router/dev": minor +--- + +Detect HTTPS protocol diff --git a/packages/react-router-dev/vite/node-adapter.ts b/packages/react-router-dev/vite/node-adapter.ts index 8f2bc29b78..3068348104 100644 --- a/packages/react-router-dev/vite/node-adapter.ts +++ b/packages/react-router-dev/vite/node-adapter.ts @@ -1,5 +1,6 @@ -import type { IncomingMessage, ServerResponse } from "node:http"; import { once } from "node:events"; +import type { IncomingMessage, ServerResponse } from "node:http"; +import { TLSSocket } from "node:tls"; import { Readable } from "node:stream"; import { splitCookiesString } from "set-cookie-parser"; import { createReadableStreamFromReadable } from "@react-router/node"; @@ -48,10 +49,14 @@ export function fromNodeRequest( nodeReq: Vite.Connect.IncomingMessage, nodeRes: ServerResponse ): Request { + let protocol = + nodeReq.socket instanceof TLSSocket && nodeReq.socket.encrypted + ? "https" + : "http"; let origin = nodeReq.headers.origin && "null" !== nodeReq.headers.origin ? nodeReq.headers.origin - : `http://${nodeReq.headers.host}`; + : `${protocol}://${nodeReq.headers.host}`; // Use `req.originalUrl` so React Router is aware of the full path invariant( nodeReq.originalUrl,