Implement origin normalization in MockAgent for case-insensitivity and URL handling #4731

SksOp · 2026-01-07T15:15:07Z

This relates to #4703

Changes

adds a normalizeOrigin function in lib/mock/mock-utils.js

Features

Bug Fixes

MockAgent origin is case-sensetive #4703

Status

…d URL handling

metcoder95 · 2026-01-08T09:20:02Z

lib/mock/mock-agent.js

-        dispatcher[kDispatches] = result.dispatcher[kDispatches]
-        return dispatcher
+      if (result && typeof keyMatcher !== 'string') {
+        const normalizedKeyMatcher = normalizeOrigin(keyMatcher, this[kIgnoreTrailingSlash])


At this point, if stored correctly, the key matcher doe snot need new normalization, isn't it?

metcoder95 · 2026-01-08T09:20:53Z

lib/mock/mock-agent.js

  [kMockAgentGet] (origin) {
-    // First check if we can immediately find it
-    const result = this[kClients].get(origin)
+    const normalizedOrigin = normalizeOrigin(origin, this[kIgnoreTrailingSlash])


On L59 the origin is already normalized by the caller, we can save another normalization, wdyt?

metcoder95 · 2026-01-08T09:22:47Z

lib/mock/mock-agent.js


  [kMockAgentSet] (origin, dispatcher) {
-    this[kClients].set(origin, { count: 0, dispatcher })
+    const normalizedOrigin = normalizeOrigin(origin, this[kIgnoreTrailingSlash])


Same as per the getter one, unless this is called explicitly somewhere else and the origin is not normalized, we can save this call as well

metcoder95 · 2026-01-08T09:23:55Z

lib/mock/mock-utils.js

+    return origin
+  }
+
+  let originString = typeof origin === 'string' ? origin : origin.toString()


maybe?

Suggested change

let originString = typeof origin === 'string' ? origin : origin.toString()

let originString = typeof origin === 'string' ? origin : origin.origin

Yahh true, since we are just dealing with origin and its an instance of URL

So maybe I should just check if its a URL instance i can just return origin

metcoder95 · 2026-01-08T09:25:04Z

lib/mock/mock-utils.js

+  let originString = typeof origin === 'string' ? origin : origin.toString()
+
+  try {
+    const url = new URL(originString)


If the passed arg is already an URL instance, maybe we can try to just infer the origin first?

metcoder95 · 2026-01-08T09:25:44Z

lib/mock/mock-utils.js

+
+  try {
+    const url = new URL(originString)
+    url.hostname = url.hostname.toLowerCase()


The URL already does the parsing into lower case as part of the spec

…eter and simplify URL handling. Update MockAgent to utilize the new implementation for origin normalization.

…ethod, improving clarity and consistency in origin handling.

SksOp · 2026-01-08T10:25:44Z

I removed the redundant normalisation in mock agent and kept the normalising logic to dispatch and get only. Also changed the logic of normalization

… returning the origin of a URL instance, simplifying the logic and enhancing readability.

…ameter, allowing for flexible origin normalization. Update MockAgent methods to utilize the new parameter for improved origin handling.

SksOp · 2026-01-08T10:49:35Z

I think passed option ignoreTrailingSpace is not affecting the result.
As the URL.origin always removes the trailing space.
Even if a string is passed as origin, I am converting it to the URL instance and retreiving the origin, which again remove the trailing space.

In general, trailing space in the origin do not makes sense?
Should I just remove the option ?
WDYT?

mcollina · 2026-01-08T13:29:39Z

Remove it!

SksOp · 2026-01-08T13:42:09Z

Okay I will remove it.

SksOp · 2026-01-09T03:46:06Z

Done

metcoder95 · 2026-01-09T09:44:11Z

Tests are not happy 😞

mcollina · 2026-01-09T16:25:45Z

CI is red

…ing slagh behavior consistent

SksOp · 2026-01-09T16:50:47Z

I suspected this would happend, now the only other way I can think of is
use toLowerCase for string type origin instead of originString = new URL(origin).origin

And move the logic of ignoreTrailingSlash back to the get as it was.

Locally tests looks happy

mcollina

lgtm

mcollina · 2026-01-11T20:22:47Z

CI is red

SksOp · 2026-01-12T11:35:32Z

I see there are some tests hanging in the normalizeOrigin function that I implemented which were ment to be for ignore trailing slash argument. Since I removed that param from the utility function. It needs a cleanup.
I will push new changes soon.

Cleanup the IgnoreTrailingSlash parameter in normalizeOrigin unit tests from mockutils.js

SksOp · 2026-01-13T06:45:43Z

CI should be fine now, I tried in my local fork, here.

The one that are failing, are failing for all the PRs out there I think.

codecov-commenter · 2026-01-13T07:24:26Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 92.87%. Comparing base (7e5cb2d) to head (8b8cfb3).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #4731   +/-   ##
=======================================
  Coverage   92.87%   92.87%           
=======================================
  Files         109      109           
  Lines       33826    33843   +17     
=======================================
+ Hits        31415    31432   +17     
  Misses       2411     2411

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

mcollina

lgtm

Implement origin normalization in MockAgent for case-insensitivity an…

fb16f5f

…d URL handling

metcoder95 reviewed Jan 8, 2026

View reviewed changes

SksOp added 2 commits January 8, 2026 15:48

Refactor normalizeOrigin function to remove ignoreTrailingSlash param…

41d1b1a

…eter and simplify URL handling. Update MockAgent to utilize the new implementation for origin normalization.

Refactor MockAgent to directly assign normalized origin in dispatch m…

b2f9b61

…ethod, improving clarity and consistency in origin handling.

SksOp added 2 commits January 8, 2026 16:01

Refactor normalizeOrigin function to improve URL handling by directly…

452dfb4

… returning the origin of a URL instance, simplifying the logic and enhancing readability.

Enhance normalizeOrigin function to accept an ignoreTrailingSlash par…

1ba094a

…ameter, allowing for flexible origin normalization. Update MockAgent methods to utilize the new parameter for improved origin handling.

remove ignoreTrailingSlash parameter from normalizeOrigin

adcf391

simplify normalize origin to use string.toLowerCase to keep the trail…

d7de6f4

…ing slagh behavior consistent

SksOp requested a review from metcoder95 January 9, 2026 16:51

mcollina approved these changes Jan 11, 2026

View reviewed changes

update tests for mock agent utils.

8b8cfb3

Cleanup the IgnoreTrailingSlash parameter in normalizeOrigin unit tests from mockutils.js

SksOp requested a review from mcollina January 13, 2026 11:32

mcollina approved these changes Jan 13, 2026

View reviewed changes

mcollina merged commit 250efc8 into nodejs:main Jan 13, 2026
37 of 39 checks passed

	let originString = typeof origin === 'string' ? origin : origin.toString()
	let originString = typeof origin === 'string' ? origin : origin.origin

Uh oh!

Implement origin normalization in MockAgent for case-insensitivity and URL handling #4731

Implement origin normalization in MockAgent for case-insensitivity and URL handling #4731

Conversation

SksOp commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

This relates to #4703

Changes

Features

Bug Fixes

Status

Uh oh!

metcoder95 Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

metcoder95 Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

metcoder95 Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

metcoder95 Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

SksOp Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

metcoder95 Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

metcoder95 Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

SksOp commented Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SksOp commented Jan 8, 2026

Uh oh!

mcollina commented Jan 8, 2026

Uh oh!

SksOp commented Jan 8, 2026

Uh oh!

SksOp commented Jan 9, 2026

Uh oh!

metcoder95 commented Jan 9, 2026

Uh oh!

mcollina commented Jan 9, 2026

Uh oh!

SksOp commented Jan 9, 2026

Uh oh!

mcollina left a comment

Choose a reason for hiding this comment

Uh oh!

mcollina commented Jan 11, 2026

Uh oh!

SksOp commented Jan 12, 2026

Uh oh!

SksOp commented Jan 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Jan 13, 2026

Codecov Report

Uh oh!

mcollina left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

SksOp commented Jan 7, 2026 •

edited

Loading

SksOp commented Jan 8, 2026 •

edited

Loading

SksOp commented Jan 13, 2026 •

edited

Loading