fix(agent): add method to computeURI (#136)

MyUnisoft · Sep 7, 2023 · 6e6590b · 6e6590b
1 parent e6eca6d
commit 6e6590b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 15 deletions.
diff --git a/src/agents.ts b/src/agents.ts
@@ -3,7 +3,7 @@ import { Agent, ProxyAgent, MockAgent } from "undici";
 import { LRUCache } from "lru-cache";
 
 // Import Internal Dependencies
-import { InlineCallbackAction } from "./request";
+import { InlineCallbackAction, HttpMethod, WebDavMethod } from "./request";
 import { getCurrentEnv } from "./utils";
 
 // CONSTANTS
@@ -97,9 +97,13 @@ export function detectAgentFromURI(uri: URL): CustomHttpAgent | null {
  * @description Compute a given URI (format string or WHATWG URL) and return a fully build URL and paired agent.
  * Under the hood it use a LRU cache
  */
-export function computeURI(uri: string | URL): computedUrlAndAgent {
-  if (URICache.has(uri)) {
-    return URICache.get(uri)!;
+export function computeURI(
+  method: HttpMethod | WebDavMethod,
+  uri: string | URL
+): computedUrlAndAgent {
+  const uriStr = method.toUpperCase() + uri.toString();
+  if (URICache.has(uriStr)) {
+    return URICache.get(uriStr)!;
   }
 
   let response: computedUrlAndAgent;
@@ -111,7 +115,7 @@ export function computeURI(uri: string | URL): computedUrlAndAgent {
 
     response = { url: uri, agent: agent?.agent ?? null, limit: agent?.limit };
   }
-  URICache.set(uri, response);
+  URICache.set(uriStr, response);
 
   return response;
 }
diff --git a/src/request.ts b/src/request.ts
@@ -58,7 +58,7 @@ export async function request<T>(
 ): Promise<RequestResponse<T>> {
   const { maxRedirections = 0 } = options;
 
-  const computedURI = computeURI(uri);
+  const computedURI = computeURI(method, uri);
   if (typeof options.querystring !== "undefined") {
     const qs = typeof options.querystring === "string" ? new URLSearchParams(options.querystring) : options.querystring;
     for (const [key, value] of qs.entries()) {

diff --git a/src/stream.ts b/src/stream.ts
@@ -18,7 +18,7 @@ export function pipeline(
 ): Duplex {
   const { maxRedirections = 0 } = options;
 
-  const computedURI = computeURI(uri);
+  const computedURI = computeURI(method, uri);
   if (typeof options.querystring !== "undefined") {
     const qs = typeof options.querystring === "string" ? new URLSearchParams(options.querystring) : options.querystring;
     for (const [key, value] of qs.entries()) {
@@ -43,7 +43,7 @@ export function stream(
   options: StreamOptions = {}
 ): WritableStreamCallback {
   const { maxRedirections = 0 } = options;
-  const computedURI = computeURI(uri);
+  const computedURI = computeURI(method, uri);
 
   const dispatcher = options.agent ?? computedURI.agent ?? void 0;
   const headers = Utils.createHeaders({ headers: options.headers, authorization: options.authorization });

diff --git a/test/agents.spec.ts b/test/agents.spec.ts
@@ -68,34 +68,44 @@ describe("computeURI", () => {
   });
 
   it("should compute a windev URI (as string)", () => {
-    const result = Agents.computeURI(kWindevMonitoringURL);
+    const result = Agents.computeURI("GET", kWindevMonitoringURL);
 
     expect(result.url.href).toStrictEqual(kWindevMonitoringURL);
     expect(result.agent).toStrictEqual(windev.agent);
 
-    expect(Agents.URICache.has(kWindevMonitoringURL)).toStrictEqual(true);
+    expect(Agents.URICache.has("GET" + kWindevMonitoringURL)).toStrictEqual(true);
   });
 
   it("should compute a windev URI (as WHATWG URL)", () => {
     const localURL = new URL(kWindevMonitoringURL);
-    const result = Agents.computeURI(localURL);
+    const result = Agents.computeURI("POST", localURL);
 
     expect(result.url.href).toStrictEqual(kWindevMonitoringURL);
     expect(result.agent).toStrictEqual(windev.agent);
 
-    expect(Agents.URICache.has(localURL)).toStrictEqual(true);
+    expect(Agents.URICache.has("POST" + localURL.toString())).toStrictEqual(true);
   });
 
   it("should return cached entry", () => {
-    Agents.URICache.set(kWindevMonitoringURL, true as any);
-    const result = Agents.computeURI(kWindevMonitoringURL) as unknown as boolean;
+    Agents.URICache.set("GET" + kWindevMonitoringURL, true as any);
+    const result = Agents.computeURI("GET", kWindevMonitoringURL) as unknown as boolean;
 
     expect(result).toStrictEqual(true);
   });
 
+  it("should not return cached entry because method doesn't match", () => {
+    Agents.URICache.set("POST" + kWindevMonitoringURL, true as any);
+    const result = Agents.computeURI("GET", kWindevMonitoringURL);
+
+    expect(result.url.href).toStrictEqual(kWindevMonitoringURL);
+    expect(result.agent).toStrictEqual(windev.agent);
+
+    expect(Agents.URICache.has("GET" + kWindevMonitoringURL)).toStrictEqual(true);
+  });
+
   it("should compute an URL not related to any local agents", () => {
     const stringURL = "https://www.linkedin.com/feed/";
-    const result = Agents.computeURI(new URL("", stringURL));
+    const result = Agents.computeURI("GET", new URL("", stringURL));
 
     expect(result.url.href).toStrictEqual(stringURL);
     expect(result.agent).toStrictEqual(null);