Merged
Conversation
gurgunday
reviewed
Oct 6, 2023
gurgunday
reviewed
Oct 6, 2023
gurgunday
reviewed
Oct 6, 2023
Member
|
Can you use https://www.npmjs.com/package/fast-querystring/v/1.1.0 instead? |
Member
Author
|
@mcollina should be updated to use |
gurgunday
requested changes
Oct 7, 2023
Member
There was a problem hiding this comment.
Looks good!
Since Matteo proposed changes to benefit performance, I think we can lower the amount of object creations and repetition
In line 337, dest === path because we initialize dest like so:
let dest = request.raw.url.slice(0, queryParamIndex !== -1 ? queryParamIndex : undefined)We are essentially redoing this inside the function you've added using split, so I propose a small simplification where you call extractUrlComponents a little earlier, maybe right after where queryParamIndex is defined, and initialize dest with path
Finally, inside extractUrlComponents, we don't want to create an object if queryString doesn't exist. Instead, we can initialize with null and reassign if necessary
Here's what it'd look like
function extractUrlComponents(urlString) {
const [path, queryString] = urlString.split("?");
const components = {
path,
queryParams: null,
};
if (queryString) {
components.queryParams = qs.parse(queryString);
}
return components;
}
// ...
// ...
// delete -> const queryParamIndex = request.raw.url.indexOf("?");
const { path, queryParams } = extractUrlComponents(request.url);
let dest = path;
// ...
// ...
// instead of checking queryParamIndex we check if queryParams is truthy
if (queryParams) {
dest += `?${qs.stringify(queryParams)}`;
}
Member
Author
|
@gurgunday great feedback! this should be updated now |
gurgunday
reviewed
Oct 21, 2023
gurgunday
approved these changes
Oct 22, 2023
renovate bot
referenced
this pull request
in redwoodjs/graphql
Nov 15, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@fastify/http-proxy](https://togithub.com/fastify/fastify-http-proxy) | [`9.2.1` -> `9.3.0`](https://renovatebot.com/diffs/npm/@fastify%2fhttp-proxy/9.2.1/9.3.0) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>fastify/fastify-http-proxy (@​fastify/http-proxy)</summary> ### [`v9.3.0`](https://togithub.com/fastify/fastify-http-proxy/releases/tag/v9.3.0) [Compare Source](https://togithub.com/fastify/fastify-http-proxy/compare/v9.2.1...v9.3.0) #### What's Changed - Listen only to IPv4 network for websockets tests by [@​mcollina](https://togithub.com/mcollina) in [https://github.com/fastify/fastify-http-proxy/pull/316](https://togithub.com/fastify/fastify-http-proxy/pull/316) - opt to validate incoming data before proxy is executed by [@​kovalenp](https://togithub.com/kovalenp) in [https://github.com/fastify/fastify-http-proxy/pull/312](https://togithub.com/fastify/fastify-http-proxy/pull/312) - build(deps-dev): bump [@​typescript-eslint/eslint-plugin](https://togithub.com/typescript-eslint/eslint-plugin) from 5.62.0 to 6.2.1 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/fastify/fastify-http-proxy/pull/318](https://togithub.com/fastify/fastify-http-proxy/pull/318) - build(deps-dev): bump tsd from 0.28.1 to 0.29.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/fastify/fastify-http-proxy/pull/320](https://togithub.com/fastify/fastify-http-proxy/pull/320) - perf: use `node:` prefix to bypass require.cache call for builtins by [@​Fdawgs](https://togithub.com/Fdawgs) in [https://github.com/fastify/fastify-http-proxy/pull/321](https://togithub.com/fastify/fastify-http-proxy/pull/321) - build(deps-dev): bump express-http-proxy from 1.6.3 to 2.0.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/fastify/fastify-http-proxy/pull/323](https://togithub.com/fastify/fastify-http-proxy/pull/323) - test(websocket): optimize split param by [@​Fdawgs](https://togithub.com/Fdawgs) in [https://github.com/fastify/fastify-http-proxy/pull/326](https://togithub.com/fastify/fastify-http-proxy/pull/326) - keep query params on proxy by [@​dancastillo](https://togithub.com/dancastillo) in [https://github.com/fastify/fastify-http-proxy/pull/325](https://togithub.com/fastify/fastify-http-proxy/pull/325) - chore(package): explicitly declare js module type by [@​Fdawgs](https://togithub.com/Fdawgs) in [https://github.com/fastify/fastify-http-proxy/pull/327](https://togithub.com/fastify/fastify-http-proxy/pull/327) #### New Contributors - [@​kovalenp](https://togithub.com/kovalenp) made their first contribution in [https://github.com/fastify/fastify-http-proxy/pull/312](https://togithub.com/fastify/fastify-http-proxy/pull/312) - [@​dancastillo](https://togithub.com/dancastillo) made their first contribution in [https://github.com/fastify/fastify-http-proxy/pull/325](https://togithub.com/fastify/fastify-http-proxy/pull/325) **Full Changelog**: fastify/fastify-http-proxy@v9.2.1...v9.3.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40Ni4wIiwidXBkYXRlZEluVmVyIjoiMzcuNDYuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
jtoar
referenced
this pull request
in redwoodjs/graphql
Nov 16, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@fastify/http-proxy](https://togithub.com/fastify/fastify-http-proxy) | [`9.2.1` -> `9.3.0`](https://renovatebot.com/diffs/npm/@fastify%2fhttp-proxy/9.2.1/9.3.0) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>fastify/fastify-http-proxy (@​fastify/http-proxy)</summary> ### [`v9.3.0`](https://togithub.com/fastify/fastify-http-proxy/releases/tag/v9.3.0) [Compare Source](https://togithub.com/fastify/fastify-http-proxy/compare/v9.2.1...v9.3.0) #### What's Changed - Listen only to IPv4 network for websockets tests by [@​mcollina](https://togithub.com/mcollina) in [https://github.com/fastify/fastify-http-proxy/pull/316](https://togithub.com/fastify/fastify-http-proxy/pull/316) - opt to validate incoming data before proxy is executed by [@​kovalenp](https://togithub.com/kovalenp) in [https://github.com/fastify/fastify-http-proxy/pull/312](https://togithub.com/fastify/fastify-http-proxy/pull/312) - build(deps-dev): bump [@​typescript-eslint/eslint-plugin](https://togithub.com/typescript-eslint/eslint-plugin) from 5.62.0 to 6.2.1 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/fastify/fastify-http-proxy/pull/318](https://togithub.com/fastify/fastify-http-proxy/pull/318) - build(deps-dev): bump tsd from 0.28.1 to 0.29.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/fastify/fastify-http-proxy/pull/320](https://togithub.com/fastify/fastify-http-proxy/pull/320) - perf: use `node:` prefix to bypass require.cache call for builtins by [@​Fdawgs](https://togithub.com/Fdawgs) in [https://github.com/fastify/fastify-http-proxy/pull/321](https://togithub.com/fastify/fastify-http-proxy/pull/321) - build(deps-dev): bump express-http-proxy from 1.6.3 to 2.0.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/fastify/fastify-http-proxy/pull/323](https://togithub.com/fastify/fastify-http-proxy/pull/323) - test(websocket): optimize split param by [@​Fdawgs](https://togithub.com/Fdawgs) in [https://github.com/fastify/fastify-http-proxy/pull/326](https://togithub.com/fastify/fastify-http-proxy/pull/326) - keep query params on proxy by [@​dancastillo](https://togithub.com/dancastillo) in [https://github.com/fastify/fastify-http-proxy/pull/325](https://togithub.com/fastify/fastify-http-proxy/pull/325) - chore(package): explicitly declare js module type by [@​Fdawgs](https://togithub.com/Fdawgs) in [https://github.com/fastify/fastify-http-proxy/pull/327](https://togithub.com/fastify/fastify-http-proxy/pull/327) #### New Contributors - [@​kovalenp](https://togithub.com/kovalenp) made their first contribution in [https://github.com/fastify/fastify-http-proxy/pull/312](https://togithub.com/fastify/fastify-http-proxy/pull/312) - [@​dancastillo](https://togithub.com/dancastillo) made their first contribution in [https://github.com/fastify/fastify-http-proxy/pull/325](https://togithub.com/fastify/fastify-http-proxy/pull/325) **Full Changelog**: fastify/fastify-http-proxy@v9.2.1...v9.3.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40Ni4wIiwidXBkYXRlZEluVmVyIjoiMzcuNDYuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Checklist
closes: #322
npm run testandnpm run benchmarkand the Code of conduct