com.jimuwd.xian.registry-proxy 1.0.24 → 1.0.25
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/index.js +8 -1
- package/package.json +1 -1
- package/src/index.ts +9 -3
package/dist/index.js
CHANGED
|
@@ -34,6 +34,13 @@ class ConcurrencyLimiter {
|
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
const limiter = new ConcurrencyLimiter(3);
|
|
37
|
+
function removeEndingSlashButReserveStartingSlash(str) {
|
|
38
|
+
if (!str)
|
|
39
|
+
return '/';
|
|
40
|
+
if (str === '/')
|
|
41
|
+
return '/';
|
|
42
|
+
return str.replace(/\/+$/, '');
|
|
43
|
+
}
|
|
37
44
|
function normalizeUrl(url) {
|
|
38
45
|
try {
|
|
39
46
|
const urlObj = new URL(url);
|
|
@@ -43,7 +50,7 @@ function normalizeUrl(url) {
|
|
|
43
50
|
else if (urlObj.protocol === 'https:' && (urlObj.port === '443' || urlObj.port === '')) {
|
|
44
51
|
urlObj.port = '';
|
|
45
52
|
}
|
|
46
|
-
urlObj.pathname = urlObj.pathname
|
|
53
|
+
urlObj.pathname = removeEndingSlashButReserveStartingSlash(urlObj.pathname);
|
|
47
54
|
return urlObj.toString();
|
|
48
55
|
}
|
|
49
56
|
catch (e) {
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -74,6 +74,12 @@ class ConcurrencyLimiter {
|
|
|
74
74
|
|
|
75
75
|
const limiter = new ConcurrencyLimiter(3);
|
|
76
76
|
|
|
77
|
+
function removeEndingSlashButReserveStartingSlash(str: string): string {
|
|
78
|
+
if (!str) return '/';
|
|
79
|
+
if (str === '/') return '/';
|
|
80
|
+
return str.replace(/\/+$/, '');
|
|
81
|
+
}
|
|
82
|
+
|
|
77
83
|
function normalizeUrl(url: string): string {
|
|
78
84
|
try {
|
|
79
85
|
const urlObj = new URL(url);
|
|
@@ -82,7 +88,7 @@ function normalizeUrl(url: string): string {
|
|
|
82
88
|
} else if (urlObj.protocol === 'https:' && (urlObj.port === '443' || urlObj.port === '')) {
|
|
83
89
|
urlObj.port = '';
|
|
84
90
|
}
|
|
85
|
-
urlObj.pathname = urlObj.pathname
|
|
91
|
+
urlObj.pathname = removeEndingSlashButReserveStartingSlash(urlObj.pathname);
|
|
86
92
|
return urlObj.toString();
|
|
87
93
|
} catch (e) {
|
|
88
94
|
console.error(`Invalid URL: ${url}`, e);
|
|
@@ -246,8 +252,8 @@ export async function startProxyServer(
|
|
|
246
252
|
const originalSearchParamsStr = originalUrl.search || '';
|
|
247
253
|
const tarballPathPrefixedWithSlash = removeRegistryPrefix(dist.tarball, registries);
|
|
248
254
|
dist.tarball = `${proxyBaseUrlNoSuffixedWithSlash}${tarballPathPrefixedWithSlash}${originalSearchParamsStr}`;
|
|
249
|
-
console.log("tarballPathPrefixedWithSlash",tarballPathPrefixedWithSlash);
|
|
250
|
-
console.log("dist.tarballUrl",dist.tarball);
|
|
255
|
+
console.log("tarballPathPrefixedWithSlash", tarballPathPrefixedWithSlash);
|
|
256
|
+
console.log("dist.tarballUrl", dist.tarball);
|
|
251
257
|
}
|
|
252
258
|
}
|
|
253
259
|
}
|