Skip to content

fix(deps): update dependency path-to-regexp to v8 #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renovate wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(deps): update dependency path-to-regexp to v8 #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37a7d70
fix(deps): update dependency path-to-regexp to v8
renovate[bot] Sep 13, 2024
f892621
refactor: migrate to v8 of path-to-regexp
wkillerud Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions lib/proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { pathToRegexp } from 'path-to-regexp';
import { match } from 'path-to-regexp';
import Metrics from '@metrics/client';
import { URL } from 'url';
import abslog from 'abslog';
Expand All @@ -23,8 +23,7 @@ export default class PodiumProxy {
#proxy;
#metrics;
#histogram;
#pathnameEntries;
#pathnameParser;
#pathnameMatcher;

/**
* @constructor
Expand All @@ -40,17 +39,12 @@ export default class PodiumProxy {
this.#prefix = utils.pathnameBuilder(prefix);
this.#log = abslog(logger);

this.#pathnameEntries = [];
this.#pathnameParser = pathToRegexp(
utils.pathnameBuilder(
this.#pathname,
this.#prefix,
':podiumPodletName',
':podiumProxyName',
':podiumProxyExtras*',
),
this.#pathnameEntries,
const expresslikePath = utils.pathnameBuilder(
this.#pathname,
this.#prefix,
'/:podiumPodletName/:podiumProxyName{/*podiumProxyExtras}',
);
this.#pathnameMatcher = match(expresslikePath);

this.#proxy = Proxy.createProxy({
proxyTimeout: timeout,
Expand Down Expand Up @@ -172,7 +166,7 @@ export default class PodiumProxy {
});

return new Promise((resolve, reject) => {
const match = this.#pathnameParser.exec(incoming.url.pathname);
const match = this.#pathnameMatcher(incoming.url.pathname);
let errored = false;

if (match) {
Expand All @@ -184,13 +178,12 @@ export default class PodiumProxy {

// Turn matched uri parameters into an object of parameters
const params = {};
for (let i = 1; i < match.length; i += 1) {
const key = this.#pathnameEntries[i - 1];
params[key.name] = match[i];
for (const [key, value] of Object.entries(match.params)) {
// This should never really be an array, but let's be extra safe
params[key] = Array.isArray(value) ? value[0] : value;
}

const key = `${params.podiumPodletName}/${params.podiumProxyName}`;

// See if podlet has a matching proxy entry.
// If so we want to proxy. If not, skip rest of processing
if (!this.#registry.has(key)) {
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"test": "run-s test:*",
"test:unit": "tap tests/*.js --disable-coverage --allow-empty-coverage",
"test:unit": "tap tests/*.test.js --disable-coverage --allow-empty-coverage",
"test:types": "tsc --project tsconfig.test.json",
"types": "tsc --declaration --emitDeclarationOnly"
},
Expand All @@ -43,7 +43,7 @@
"@podium/schemas": "5.0.6",
"@podium/utils": "5.2.0",
"abslog": "2.4.4",
"path-to-regexp": "6.3.0"
"path-to-regexp": "8.1.0"
},
"devDependencies": {
"@babel/eslint-parser": "7.24.7",
Expand Down