fix: add target pathname currectly (#6)

Co-authored-by: Pooya Parsa <[email protected]>
unjs · Aug 26, 2023 · e045521 · e045521
1 parent 1ed43da
commit e045521
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/_utils.ts b/src/_utils.ts
@@ -84,7 +84,9 @@ export function setupOutgoing(outgoing, options, req, forward?) {
   // the final path is target path + relative path requested by user:
   const target = options[forward || "target"];
   const targetPath =
-    target && options.prependPath !== false ? target.path || "" : "";
+    target && options.prependPath !== false
+      ? target.pathname || target.path || ""
+      : "";
 
   const parsed = new URL(req.url, "http://localhost");
   let outgoingPath = options.toProxy

diff --git a/test/index.test.ts b/test/index.test.ts
@@ -28,7 +28,7 @@ describe("httpxy", () => {
       lastResolved = false;
       lastRejected = undefined;
       try {
-        await proxy.web(req, res, { target: mainListener.url });
+        await proxy.web(req, res, { target: mainListener.url + "base" });
         lastResolved = true;
       } catch (error) {
         lastRejected = error;
@@ -39,8 +39,8 @@ describe("httpxy", () => {
   });
 
   it("works", async () => {
-    const mainResponse = await $fetch(mainListener.url + "?foo");
-    const proxyResponse = await $fetch(proxyListener.url + "?foo");
+    const mainResponse = await $fetch(mainListener.url + "base/test?foo");
+    const proxyResponse = await $fetch(proxyListener.url + "test?foo");
 
     const maskResponse = (obj: any) => ({
       ...obj,
@@ -51,6 +51,8 @@ describe("httpxy", () => {
       maskResponse(proxyResponse),
     );
 
+    expect(proxyResponse.path).toBe("/base/test?foo");
+
     expect(lastResolved).toBe(true);
     expect(lastRejected).toBe(undefined);
   });