xypriss 9.6.63 → 9.6.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/src/index.js.map +1 -1
- package/dist/cjs/src/server/core/http/RouteManager.js +33 -11
- package/dist/cjs/src/server/core/http/RouteManager.js.map +1 -1
- package/dist/cjs/src/server/routing/Router.js +9 -1
- package/dist/cjs/src/server/routing/Router.js.map +1 -1
- package/dist/cjs/src/server/routing/modules/path.js +2 -2
- package/dist/cjs/src/server/routing/modules/path.js.map +1 -1
- package/dist/esm/src/index.js.map +1 -1
- package/dist/esm/src/server/core/http/RouteManager.js +33 -11
- package/dist/esm/src/server/core/http/RouteManager.js.map +1 -1
- package/dist/esm/src/server/routing/Router.js +9 -1
- package/dist/esm/src/server/routing/Router.js.map +1 -1
- package/dist/esm/src/server/routing/modules/path.js +2 -2
- package/dist/esm/src/server/routing/modules/path.js.map +1 -1
- package/dist/index.d.ts +2547 -2546
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/index.ts"],"sourcesContent":[null],"names":["configLoader","XyPrissRouter"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;AAsBiF;AACjF;AAEA;AACA;AAqBA;AACA,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE;IACnCA,yBAAY,CAAC,qBAAqB,EAAE;AACxC;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/index.ts"],"sourcesContent":[null],"names":["configLoader","XyPrissRouter"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;AAsBiF;AACjF;AAEA;AACA;AAqBA;AACA,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE;IACnCA,yBAAY,CAAC,qBAAqB,EAAE;AACxC;AA+BA;;AAEG;SACa,MAAM,GAAA;IAClB,OAAO,IAAIC,sBAAa,CAAC;AACrB,QAAA,aAAa,EAAE,KAAK;AACpB,QAAA,WAAW,EAAE,KAAK;AAClB,QAAA,MAAM,EAAE,KAAK;AAChB,KAAA,CAAC;AACN;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -39,14 +39,8 @@ class RouteManager {
|
|
|
39
39
|
for (const route of this.routes) {
|
|
40
40
|
if (route.method !== method)
|
|
41
41
|
continue;
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
if (params !== null) {
|
|
45
|
-
req.params = { ...req.params, ...params };
|
|
46
|
-
return route;
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
else if (route.path instanceof RegExp) {
|
|
42
|
+
// 1. RegExp matching (highest precision, supports constraints/wildcards)
|
|
43
|
+
if (route.path instanceof RegExp) {
|
|
50
44
|
const match = route.path.exec(path);
|
|
51
45
|
if (match) {
|
|
52
46
|
const params = {};
|
|
@@ -65,22 +59,50 @@ class RouteManager {
|
|
|
65
59
|
return route;
|
|
66
60
|
}
|
|
67
61
|
}
|
|
62
|
+
// 2. String matching (fallback for simple static or basic parameterized paths)
|
|
63
|
+
else if (typeof route.path === "string") {
|
|
64
|
+
// If path contains complex markers, it MUST be matched via RegExp (handled above)
|
|
65
|
+
// If it reached here as a string, it might be a simple path or a legacy fallback
|
|
66
|
+
if (route.path.includes("(") ||
|
|
67
|
+
route.path.includes("<") ||
|
|
68
|
+
route.path.includes("**")) {
|
|
69
|
+
continue; // Skip naive matching for complex routes
|
|
70
|
+
}
|
|
71
|
+
const params = this.matchPath(route.path, path);
|
|
72
|
+
if (params !== null) {
|
|
73
|
+
req.params = { ...req.params, ...params };
|
|
74
|
+
return route;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
68
77
|
}
|
|
69
78
|
return null;
|
|
70
79
|
}
|
|
71
80
|
matchPath(routePath, requestPath) {
|
|
72
81
|
if (routePath === requestPath)
|
|
73
82
|
return {};
|
|
83
|
+
// Final sanity check: if it has complex markers, matchPath is NOT safe
|
|
84
|
+
if (routePath.includes("(") ||
|
|
85
|
+
routePath.includes("<") ||
|
|
86
|
+
routePath.includes("**")) {
|
|
87
|
+
return null;
|
|
88
|
+
}
|
|
74
89
|
const routeParts = routePath.split("/");
|
|
75
90
|
const requestParts = requestPath.split("/");
|
|
76
91
|
if (routeParts.length !== requestParts.length)
|
|
77
92
|
return null;
|
|
78
93
|
const params = {};
|
|
79
94
|
for (let i = 0; i < routeParts.length; i++) {
|
|
80
|
-
|
|
81
|
-
|
|
95
|
+
const rp = routeParts[i];
|
|
96
|
+
const qp = requestParts[i];
|
|
97
|
+
if (rp.startsWith(":")) {
|
|
98
|
+
const paramName = rp.substring(1);
|
|
99
|
+
// Ensure paramName doesn't contain type metadata (double protection)
|
|
100
|
+
if (paramName.includes("<") || paramName.includes("(")) {
|
|
101
|
+
return null;
|
|
102
|
+
}
|
|
103
|
+
params[paramName] = qp;
|
|
82
104
|
}
|
|
83
|
-
else if (
|
|
105
|
+
else if (rp !== qp) {
|
|
84
106
|
return null;
|
|
85
107
|
}
|
|
86
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteManager.js","sources":["../../../../../../src/server/core/http/RouteManager.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAQA;;AAEG;MACU,YAAY,CAAA;AAIrB,IAAA,WAAA,CAAY,MAAc,EAAA;QAHlB,IAAA,CAAA,MAAM,GAAY,EAAE;AAIxB,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;IACxB;AAEO,IAAA,QAAQ,CACX,MAAc,EACd,IAAqB,EACrB,QAA+C,EAAA;QAE/C,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAyB;QAChE,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAiB;QAE7D,IAAI,cAAc,GAAG,IAAI;QACzB,IACI,OAAO,cAAc,KAAK,QAAQ;YAClC,cAAc,CAAC,MAAM,GAAG,CAAC;AACzB,YAAA,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAC9B;YACE,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;QAChD;AAEA,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;AACvE,QAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,QAAQ,EACR,CAAA,kBAAA,EAAqB,MAAM,CAAA,CAAA,EAAI,cAAc,CAAA,CAAE,CAClD;IACL;AAEO,IAAA,kBAAkB,CACrB,MAAc,EACd,IAAY,EACZ,UAAoB,EACpB,QAA+C,EAAA;QAE/C,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAyB;QAChE,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAiB;AAC7D,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IACvE;IAEO,cAAc,CAAC,IAAY,EAAE,QAAgB,EAAA;AAChD,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;AACb,YAAA,MAAM,EAAE,KAAK;YACb,IAAI;AACJ,YAAA,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,KACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC;AAClD,YAAA,UAAU,EAAE,EAAE;AACd,YAAA,MAAM,EAAE,QAAQ;YAChB,QAAQ;AACX,SAAA,CAAC;IACN;AAEO,IAAA,SAAS,CACZ,MAAc,EACd,IAAY,EACZ,GAAkB,EAAA;AAElB,QAAA,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;AAC7B,YAAA,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM;gBAAE
|
|
1
|
+
{"version":3,"file":"RouteManager.js","sources":["../../../../../../src/server/core/http/RouteManager.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAQA;;AAEG;MACU,YAAY,CAAA;AAIrB,IAAA,WAAA,CAAY,MAAc,EAAA;QAHlB,IAAA,CAAA,MAAM,GAAY,EAAE;AAIxB,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;IACxB;AAEO,IAAA,QAAQ,CACX,MAAc,EACd,IAAqB,EACrB,QAA+C,EAAA;QAE/C,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAyB;QAChE,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAiB;QAE7D,IAAI,cAAc,GAAG,IAAI;QACzB,IACI,OAAO,cAAc,KAAK,QAAQ;YAClC,cAAc,CAAC,MAAM,GAAG,CAAC;AACzB,YAAA,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAC9B;YACE,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;QAChD;AAEA,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;AACvE,QAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,QAAQ,EACR,CAAA,kBAAA,EAAqB,MAAM,CAAA,CAAA,EAAI,cAAc,CAAA,CAAE,CAClD;IACL;AAEO,IAAA,kBAAkB,CACrB,MAAc,EACd,IAAY,EACZ,UAAoB,EACpB,QAA+C,EAAA;QAE/C,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAyB;QAChE,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAiB;AAC7D,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IACvE;IAEO,cAAc,CAAC,IAAY,EAAE,QAAgB,EAAA;AAChD,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;AACb,YAAA,MAAM,EAAE,KAAK;YACb,IAAI;AACJ,YAAA,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,KACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC;AAClD,YAAA,UAAU,EAAE,EAAE;AACd,YAAA,MAAM,EAAE,QAAQ;YAChB,QAAQ;AACX,SAAA,CAAC;IACN;AAEO,IAAA,SAAS,CACZ,MAAc,EACd,IAAY,EACZ,GAAkB,EAAA;AAElB,QAAA,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;AAC7B,YAAA,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM;gBAAE;;AAG7B,YAAA,IAAI,KAAK,CAAC,IAAI,YAAY,MAAM,EAAE;gBAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;gBACnC,IAAI,KAAK,EAAE;oBACP,MAAM,MAAM,GAA2B,EAAE;oBACzC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,EAAE;AACtC,wBAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACnC,4BAAA,IACI,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS;gCACtB,KAAK,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,EACzB;AACE,gCAAA,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;4BAC9C;wBACJ;oBACJ;AAAO,yBAAA,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;wBACnD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;oBAC1B;AACA,oBAAA,GAAG,CAAC,MAAM,GAAG,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE;AACzC,oBAAA,OAAO,KAAK;gBAChB;YACJ;;AAEK,iBAAA,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;;;AAGrC,gBAAA,IACI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;AACxB,oBAAA,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;oBACxB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC3B;AACE,oBAAA,SAAS;gBACb;AAEA,gBAAA,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC;AAC/C,gBAAA,IAAI,MAAM,KAAK,IAAI,EAAE;AACjB,oBAAA,GAAG,CAAC,MAAM,GAAG,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE;AACzC,oBAAA,OAAO,KAAK;gBAChB;YACJ;QACJ;AACA,QAAA,OAAO,IAAI;IACf;IAEQ,SAAS,CACb,SAAiB,EACjB,WAAmB,EAAA;QAEnB,IAAI,SAAS,KAAK,WAAW;AAAE,YAAA,OAAO,EAAE;;AAGxC,QAAA,IACI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;AACvB,YAAA,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;AACvB,YAAA,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC1B;AACE,YAAA,OAAO,IAAI;QACf;QAEA,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC;QACvC,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;AAC3C,QAAA,IAAI,UAAU,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM;AAAE,YAAA,OAAO,IAAI;QAE1D,MAAM,MAAM,GAA2B,EAAE;AACzC,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACxC,YAAA,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;AACxB,YAAA,MAAM,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC;AAE1B,YAAA,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACpB,MAAM,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;;AAEjC,gBAAA,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AACpD,oBAAA,OAAO,IAAI;gBACf;AACA,gBAAA,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE;YAC1B;AAAO,iBAAA,IAAI,EAAE,KAAK,EAAE,EAAE;AAClB,gBAAA,OAAO,IAAI;YACf;QACJ;AACA,QAAA,OAAO,MAAM;IACjB;IAEO,SAAS,GAAA;AACZ,QAAA,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B;AACH;;;;"}
|
|
@@ -90,7 +90,15 @@ class XyPrissRouter {
|
|
|
90
90
|
meta: { summary: `Redirect → ${to}`, tags: ["redirect"] },
|
|
91
91
|
priority: 10,
|
|
92
92
|
},
|
|
93
|
-
(
|
|
93
|
+
(req, res) => {
|
|
94
|
+
let target = to;
|
|
95
|
+
if (req.params) {
|
|
96
|
+
for (const [key, value] of Object.entries(req.params)) {
|
|
97
|
+
target = target.replace(`:${key}`, String(value));
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
res.redirect(status, target);
|
|
101
|
+
},
|
|
94
102
|
]);
|
|
95
103
|
}
|
|
96
104
|
// ─── Registry & Inspection ───────────────────────────────────────────────
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.js","sources":["../../../../../src/server/routing/Router.ts"],"sourcesContent":[null],"names":["Logger","Upload","normalizePath","mountRouter","SUPPORTED_HTTP_METHODS","handleGroup","addRichRoute"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Router.js","sources":["../../../../../src/server/routing/Router.ts"],"sourcesContent":[null],"names":["Logger","Upload","normalizePath","mountRouter","SUPPORTED_HTTP_METHODS","handleGroup","addRichRoute"],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const PATH_PATTERNS = {
|
|
|
9
9
|
trailingSlash: /\/+$/,
|
|
10
10
|
multipleSlashes: /\/+/g,
|
|
11
11
|
wildcardPattern: /\*+$/,
|
|
12
|
-
pathValidation: /^\/(?:[a-zA-Z0-9\-._~:/?#[\]@!$&'()
|
|
12
|
+
pathValidation: /^\/(?:[a-zA-Z0-9\-._~:/?#[\]@!$&'()*+,;=\\<>{}|^]|%[0-9A-Fa-f]{2})*$/,
|
|
13
13
|
};
|
|
14
14
|
/** Normalize a path string */
|
|
15
15
|
function normalizePath(path) {
|
|
@@ -111,7 +111,7 @@ function compileRoutePattern(path, options) {
|
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
|
-
return s.replace(/[
|
|
114
|
+
return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
115
115
|
}
|
|
116
116
|
return p.value;
|
|
117
117
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sources":["../../../../../../src/server/routing/modules/path.ts"],"sourcesContent":[null],"names":["TYPED_PARAM_REGEX","buildParamPattern"],"mappings":";;;;;AAIA;AACO,MAAM,aAAa,GAAG;AACzB,IAAA,YAAY,EAAE,MAAM;AACpB,IAAA,aAAa,EAAE,MAAM;AACrB,IAAA,eAAe,EAAE,MAAM;AACvB,IAAA,eAAe,EAAE,MAAM;AACvB,IAAA,cAAc,EACV,
|
|
1
|
+
{"version":3,"file":"path.js","sources":["../../../../../../src/server/routing/modules/path.ts"],"sourcesContent":[null],"names":["TYPED_PARAM_REGEX","buildParamPattern"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;AAsBiF;AACjF;AAEA;AACA;AAqBA;AACA,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE;IACnC,YAAY,CAAC,qBAAqB,EAAE;AACxC;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;AAsBiF;AACjF;AAEA;AACA;AAqBA;AACA,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE;IACnC,YAAY,CAAC,qBAAqB,EAAE;AACxC;AA+BA;;AAEG;SACa,MAAM,GAAA;IAClB,OAAO,IAAI,aAAa,CAAC;AACrB,QAAA,aAAa,EAAE,KAAK;AACpB,QAAA,WAAW,EAAE,KAAK;AAClB,QAAA,MAAM,EAAE,KAAK;AAChB,KAAA,CAAC;AACN;;;;"}
|
|
@@ -37,14 +37,8 @@ class RouteManager {
|
|
|
37
37
|
for (const route of this.routes) {
|
|
38
38
|
if (route.method !== method)
|
|
39
39
|
continue;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
if (params !== null) {
|
|
43
|
-
req.params = { ...req.params, ...params };
|
|
44
|
-
return route;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
else if (route.path instanceof RegExp) {
|
|
40
|
+
// 1. RegExp matching (highest precision, supports constraints/wildcards)
|
|
41
|
+
if (route.path instanceof RegExp) {
|
|
48
42
|
const match = route.path.exec(path);
|
|
49
43
|
if (match) {
|
|
50
44
|
const params = {};
|
|
@@ -63,22 +57,50 @@ class RouteManager {
|
|
|
63
57
|
return route;
|
|
64
58
|
}
|
|
65
59
|
}
|
|
60
|
+
// 2. String matching (fallback for simple static or basic parameterized paths)
|
|
61
|
+
else if (typeof route.path === "string") {
|
|
62
|
+
// If path contains complex markers, it MUST be matched via RegExp (handled above)
|
|
63
|
+
// If it reached here as a string, it might be a simple path or a legacy fallback
|
|
64
|
+
if (route.path.includes("(") ||
|
|
65
|
+
route.path.includes("<") ||
|
|
66
|
+
route.path.includes("**")) {
|
|
67
|
+
continue; // Skip naive matching for complex routes
|
|
68
|
+
}
|
|
69
|
+
const params = this.matchPath(route.path, path);
|
|
70
|
+
if (params !== null) {
|
|
71
|
+
req.params = { ...req.params, ...params };
|
|
72
|
+
return route;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
66
75
|
}
|
|
67
76
|
return null;
|
|
68
77
|
}
|
|
69
78
|
matchPath(routePath, requestPath) {
|
|
70
79
|
if (routePath === requestPath)
|
|
71
80
|
return {};
|
|
81
|
+
// Final sanity check: if it has complex markers, matchPath is NOT safe
|
|
82
|
+
if (routePath.includes("(") ||
|
|
83
|
+
routePath.includes("<") ||
|
|
84
|
+
routePath.includes("**")) {
|
|
85
|
+
return null;
|
|
86
|
+
}
|
|
72
87
|
const routeParts = routePath.split("/");
|
|
73
88
|
const requestParts = requestPath.split("/");
|
|
74
89
|
if (routeParts.length !== requestParts.length)
|
|
75
90
|
return null;
|
|
76
91
|
const params = {};
|
|
77
92
|
for (let i = 0; i < routeParts.length; i++) {
|
|
78
|
-
|
|
79
|
-
|
|
93
|
+
const rp = routeParts[i];
|
|
94
|
+
const qp = requestParts[i];
|
|
95
|
+
if (rp.startsWith(":")) {
|
|
96
|
+
const paramName = rp.substring(1);
|
|
97
|
+
// Ensure paramName doesn't contain type metadata (double protection)
|
|
98
|
+
if (paramName.includes("<") || paramName.includes("(")) {
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
params[paramName] = qp;
|
|
80
102
|
}
|
|
81
|
-
else if (
|
|
103
|
+
else if (rp !== qp) {
|
|
82
104
|
return null;
|
|
83
105
|
}
|
|
84
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteManager.js","sources":["../../../../../../src/server/core/http/RouteManager.ts"],"sourcesContent":[null],"names":[],"mappings":"AAQA;;AAEG;MACU,YAAY,CAAA;AAIrB,IAAA,WAAA,CAAY,MAAc,EAAA;QAHlB,IAAA,CAAA,MAAM,GAAY,EAAE;AAIxB,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;IACxB;AAEO,IAAA,QAAQ,CACX,MAAc,EACd,IAAqB,EACrB,QAA+C,EAAA;QAE/C,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAyB;QAChE,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAiB;QAE7D,IAAI,cAAc,GAAG,IAAI;QACzB,IACI,OAAO,cAAc,KAAK,QAAQ;YAClC,cAAc,CAAC,MAAM,GAAG,CAAC;AACzB,YAAA,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAC9B;YACE,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;QAChD;AAEA,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;AACvE,QAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,QAAQ,EACR,CAAA,kBAAA,EAAqB,MAAM,CAAA,CAAA,EAAI,cAAc,CAAA,CAAE,CAClD;IACL;AAEO,IAAA,kBAAkB,CACrB,MAAc,EACd,IAAY,EACZ,UAAoB,EACpB,QAA+C,EAAA;QAE/C,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAyB;QAChE,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAiB;AAC7D,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IACvE;IAEO,cAAc,CAAC,IAAY,EAAE,QAAgB,EAAA;AAChD,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;AACb,YAAA,MAAM,EAAE,KAAK;YACb,IAAI;AACJ,YAAA,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,KACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC;AAClD,YAAA,UAAU,EAAE,EAAE;AACd,YAAA,MAAM,EAAE,QAAQ;YAChB,QAAQ;AACX,SAAA,CAAC;IACN;AAEO,IAAA,SAAS,CACZ,MAAc,EACd,IAAY,EACZ,GAAkB,EAAA;AAElB,QAAA,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;AAC7B,YAAA,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM;gBAAE
|
|
1
|
+
{"version":3,"file":"RouteManager.js","sources":["../../../../../../src/server/core/http/RouteManager.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -88,7 +88,15 @@ class XyPrissRouter {
|
|
|
88
88
|
meta: { summary: `Redirect → ${to}`, tags: ["redirect"] },
|
|
89
89
|
priority: 10,
|
|
90
90
|
},
|
|
91
|
-
(
|
|
91
|
+
(req, res) => {
|
|
92
|
+
let target = to;
|
|
93
|
+
if (req.params) {
|
|
94
|
+
for (const [key, value] of Object.entries(req.params)) {
|
|
95
|
+
target = target.replace(`:${key}`, String(value));
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
res.redirect(status, target);
|
|
99
|
+
},
|
|
92
100
|
]);
|
|
93
101
|
}
|
|
94
102
|
// ─── Registry & Inspection ───────────────────────────────────────────────
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.js","sources":["../../../../../src/server/routing/Router.ts"],"sourcesContent":[null],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Router.js","sources":["../../../../../src/server/routing/Router.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const PATH_PATTERNS = {
|
|
|
7
7
|
trailingSlash: /\/+$/,
|
|
8
8
|
multipleSlashes: /\/+/g,
|
|
9
9
|
wildcardPattern: /\*+$/,
|
|
10
|
-
pathValidation: /^\/(?:[a-zA-Z0-9\-._~:/?#[\]@!$&'()
|
|
10
|
+
pathValidation: /^\/(?:[a-zA-Z0-9\-._~:/?#[\]@!$&'()*+,;=\\<>{}|^]|%[0-9A-Fa-f]{2})*$/,
|
|
11
11
|
};
|
|
12
12
|
/** Normalize a path string */
|
|
13
13
|
function normalizePath(path) {
|
|
@@ -109,7 +109,7 @@ function compileRoutePattern(path, options) {
|
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
|
-
return s.replace(/[
|
|
112
|
+
return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
113
113
|
}
|
|
114
114
|
return p.value;
|
|
115
115
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sources":["../../../../../../src/server/routing/modules/path.ts"],"sourcesContent":[null],"names":[],"mappings":";;;AAIA;AACO,MAAM,aAAa,GAAG;AACzB,IAAA,YAAY,EAAE,MAAM;AACpB,IAAA,aAAa,EAAE,MAAM;AACrB,IAAA,eAAe,EAAE,MAAM;AACvB,IAAA,eAAe,EAAE,MAAM;AACvB,IAAA,cAAc,EACV,
|
|
1
|
+
{"version":3,"file":"path.js","sources":["../../../../../../src/server/routing/modules/path.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|