com.jimuwd.xian.registry-proxy 1.0.24 → 1.0.26

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.
Files changed (3) hide show
  1. package/dist/index.js +26 -19
  2. package/package.json +1 -1
  3. package/src/index.ts +24 -21
package/dist/index.js CHANGED
@@ -34,42 +34,49 @@ class ConcurrencyLimiter {
34
34
  }
35
35
  }
36
36
  const limiter = new ConcurrencyLimiter(3);
37
- function normalizeUrl(url) {
37
+ function removeEndingSlashAndForceStartingSlash(str) {
38
+ if (!str)
39
+ return '/';
40
+ let trimmed = str.trim();
41
+ if (trimmed === '/')
42
+ return '/';
43
+ if (trimmed === '')
44
+ return '/';
45
+ if (!trimmed.startsWith('/'))
46
+ trimmed = '/' + trimmed;
47
+ return trimmed.replace(/\/+$/, '');
48
+ }
49
+ function normalizeUrl(httpOrHttpsUrl) {
50
+ if (!httpOrHttpsUrl.startsWith("http"))
51
+ throw new Error("http(s) url must starts with 'http(s)://'");
38
52
  try {
39
- const urlObj = new URL(url);
53
+ const urlObj = new URL(httpOrHttpsUrl);
40
54
  if (urlObj.protocol === 'http:' && (urlObj.port === '80' || urlObj.port === '')) {
41
55
  urlObj.port = '';
42
56
  }
43
57
  else if (urlObj.protocol === 'https:' && (urlObj.port === '443' || urlObj.port === '')) {
44
58
  urlObj.port = '';
45
59
  }
46
- urlObj.pathname = urlObj.pathname.replace(/\/+$/, '');
47
- return urlObj.toString();
60
+ return urlObj.toString().replace(/\/+$/, '');
48
61
  }
49
62
  catch (e) {
50
- console.error(`Invalid URL: ${url}`, e);
51
- return url.replace(/\/+$/, '');
63
+ throw new Error(`Invalid URL: ${httpOrHttpsUrl}`, { cause: e });
52
64
  }
53
65
  }
54
66
  function resolvePath(path) {
55
67
  return path.startsWith('~/') ? join(homedir(), path.slice(2)) : resolve(path);
56
68
  }
57
69
  function removeRegistryPrefix(tarballUrl, registries) {
58
- try {
59
- const normalizedTarball = normalizeUrl(tarballUrl);
60
- const normalizedRegistries = registries
61
- .map(r => normalizeUrl(r.url))
62
- .sort((a, b) => b.length - a.length);
63
- for (const normalizedRegistry of normalizedRegistries) {
64
- if (normalizedTarball.startsWith(normalizedRegistry)) {
65
- return normalizedTarball.slice(normalizedRegistry.length) || '/';
66
- }
70
+ const normalizedTarball = normalizeUrl(tarballUrl);
71
+ const normalizedRegistries = registries
72
+ .map(r => normalizeUrl(r.url))
73
+ .sort((a, b) => b.length - a.length);
74
+ for (const normalizedRegistry of normalizedRegistries) {
75
+ if (normalizedTarball.startsWith(normalizedRegistry)) {
76
+ return normalizedTarball.slice(normalizedRegistry.length) || '/';
67
77
  }
68
78
  }
69
- catch (e) {
70
- console.error(`Invalid URL in removeRegistryPrefix: ${tarballUrl}`, e);
71
- }
72
- return tarballUrl;
79
+ throw new Error(`Can't find tarball url ${tarballUrl} does not match given registries ${normalizedRegistries}`);
73
80
  }
74
81
  async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
75
82
  const resolvedPath = resolvePath(proxyConfigPath);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "com.jimuwd.xian.registry-proxy",
3
- "version": "1.0.24",
3
+ "version": "1.0.26",
4
4
  "type": "module",
5
5
  "description": "A lightweight npm registry proxy with fallback support",
6
6
  "main": "dist/index.js",
package/src/index.ts CHANGED
@@ -74,19 +74,27 @@ class ConcurrencyLimiter {
74
74
 
75
75
  const limiter = new ConcurrencyLimiter(3);
76
76
 
77
- function normalizeUrl(url: string): string {
77
+ function removeEndingSlashAndForceStartingSlash(str: string): string {
78
+ if (!str) return '/';
79
+ let trimmed = str.trim();
80
+ if (trimmed === '/') return '/';
81
+ if (trimmed === '') return '/';
82
+ if (!trimmed.startsWith('/')) trimmed = '/' + trimmed;
83
+ return trimmed.replace(/\/+$/, '');
84
+ }
85
+
86
+ function normalizeUrl(httpOrHttpsUrl: string): string {
87
+ if (!httpOrHttpsUrl.startsWith("http")) throw new Error("http(s) url must starts with 'http(s)://'");
78
88
  try {
79
- const urlObj = new URL(url);
89
+ const urlObj = new URL(httpOrHttpsUrl);
80
90
  if (urlObj.protocol === 'http:' && (urlObj.port === '80' || urlObj.port === '')) {
81
91
  urlObj.port = '';
82
92
  } else if (urlObj.protocol === 'https:' && (urlObj.port === '443' || urlObj.port === '')) {
83
93
  urlObj.port = '';
84
94
  }
85
- urlObj.pathname = urlObj.pathname.replace(/\/+$/, '');
86
- return urlObj.toString();
95
+ return urlObj.toString().replace(/\/+$/, '');
87
96
  } catch (e) {
88
- console.error(`Invalid URL: ${url}`, e);
89
- return url.replace(/\/+$/, '');
97
+ throw new Error(`Invalid URL: ${httpOrHttpsUrl}`, {cause: e});
90
98
  }
91
99
  }
92
100
 
@@ -95,21 +103,16 @@ function resolvePath(path: string): string {
95
103
  }
96
104
 
97
105
  function removeRegistryPrefix(tarballUrl: string, registries: RegistryInfo[]): string {
98
- try {
99
- const normalizedTarball = normalizeUrl(tarballUrl);
100
- const normalizedRegistries = registries
101
- .map(r => normalizeUrl(r.url))
102
- .sort((a, b) => b.length - a.length);
103
-
104
- for (const normalizedRegistry of normalizedRegistries) {
105
- if (normalizedTarball.startsWith(normalizedRegistry)) {
106
- return normalizedTarball.slice(normalizedRegistry.length) || '/';
107
- }
106
+ const normalizedTarball = normalizeUrl(tarballUrl);
107
+ const normalizedRegistries = registries
108
+ .map(r => normalizeUrl(r.url))
109
+ .sort((a, b) => b.length - a.length);
110
+ for (const normalizedRegistry of normalizedRegistries) {
111
+ if (normalizedTarball.startsWith(normalizedRegistry)) {
112
+ return normalizedTarball.slice(normalizedRegistry.length) || '/';
108
113
  }
109
- } catch (e) {
110
- console.error(`Invalid URL in removeRegistryPrefix: ${tarballUrl}`, e);
111
114
  }
112
- return tarballUrl;
115
+ throw new Error(`Can't find tarball url ${tarballUrl} does not match given registries ${normalizedRegistries}`)
113
116
  }
114
117
 
115
118
  async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml'): Promise<ProxyConfig> {
@@ -246,8 +249,8 @@ export async function startProxyServer(
246
249
  const originalSearchParamsStr = originalUrl.search || '';
247
250
  const tarballPathPrefixedWithSlash = removeRegistryPrefix(dist.tarball, registries);
248
251
  dist.tarball = `${proxyBaseUrlNoSuffixedWithSlash}${tarballPathPrefixedWithSlash}${originalSearchParamsStr}`;
249
- console.log("tarballPathPrefixedWithSlash",tarballPathPrefixedWithSlash);
250
- console.log("dist.tarballUrl",dist.tarball);
252
+ console.log("tarballPathPrefixedWithSlash", tarballPathPrefixedWithSlash);
253
+ console.log("dist.tarballUrl", dist.tarball);
251
254
  }
252
255
  }
253
256
  }