Make sure no exceptions are thrown if headers is undefined

firecow · Apr 1, 2024 · 7ab20c8 · 7ab20c8
1 parent a5ceba4
commit 7ab20c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/index.test.ts b/src/index.test.ts
@@ -175,7 +175,7 @@ test("Expand request (query params)", () => {
 });
 
 test("Expand request (no x-forwarded-proto or host header)", () => {
-    const info = {req: {url: "/", headers: {}}};
+    const info = {req: {url: "/"}};
     Utils.expandRequest(info);
     expect(info).toStrictEqual({});
 });

diff --git a/src/utils.ts b/src/utils.ts
@@ -25,8 +25,8 @@ export class Utils {
         const req: any = info["request"] || info["req"];
         if (!req) return;
 
-        const protocol = req.headers["x-forwarded-proto"] ?? "https";
-        if (req.headers["host"]) {
+        if (req.headers) {
+            const protocol = (req.protocol ?? req.headers["x-forwarded-proto"] ?? "https").replace(":", "");
             const url = new URL(req.url, `${protocol}://${req.headers.host}`);
             info["url.path"] = url.pathname;
             info["url.full"] = url.href;