com.jimuwd.xian.registry-proxy 1.0.30 → 1.0.31

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 +15 -10
  2. package/package.json +1 -1
  3. package/src/index.ts +15 -10
package/dist/index.js CHANGED
@@ -111,21 +111,26 @@ async function loadProxyInfo(proxyConfigPath = './.registry-proxy.yml', localYar
111
111
  readYarnConfig(globalYarnConfigPath)
112
112
  ]);
113
113
  const registryMap = new Map();
114
- for (const [url, regConfig] of Object.entries(proxyConfig.registries)) {
115
- const normalizedUrl = normalizeUrl(url);
116
- let token = regConfig?.npmAuthToken;
114
+ for (const [proxiedRegUrl, proxyRegConfig] of Object.entries(proxyConfig.registries)) {
115
+ const normalizedProxiedRegUrl = normalizeUrl(proxiedRegUrl);
116
+ let token = proxyRegConfig?.npmAuthToken;
117
117
  if (!token) {
118
118
  const yarnConfigs = [localYarnConfig, globalYarnConfig];
119
- for (const config of yarnConfigs) {
120
- const registryConfig = config.npmRegistries?.[normalizedUrl] ||
121
- config.npmRegistries?.[url];
122
- if (registryConfig?.npmAuthToken) {
123
- token = registryConfig.npmAuthToken;
124
- break;
119
+ for (const yarnConfig of yarnConfigs) {
120
+ if (yarnConfig.npmRegistries) {
121
+ const foundEntry = Object.entries(yarnConfig.npmRegistries)
122
+ .find(([registryUrl]) => normalizedProxiedRegUrl === normalizeUrl(registryUrl));
123
+ if (foundEntry) {
124
+ const [, registryConfig] = foundEntry;
125
+ if (registryConfig?.npmAuthToken) {
126
+ token = registryConfig.npmAuthToken;
127
+ break;
128
+ }
129
+ }
125
130
  }
126
131
  }
127
132
  }
128
- registryMap.set(normalizedUrl, { url: normalizedUrl, token });
133
+ registryMap.set(normalizedProxiedRegUrl, { url: normalizedProxiedRegUrl, token });
129
134
  }
130
135
  const registries = Array.from(registryMap.values());
131
136
  const https = proxyConfig.https;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "com.jimuwd.xian.registry-proxy",
3
- "version": "1.0.30",
3
+ "version": "1.0.31",
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
@@ -158,21 +158,26 @@ async function loadProxyInfo(
158
158
  readYarnConfig(globalYarnConfigPath)
159
159
  ]);
160
160
  const registryMap = new Map<string, RegistryInfo>();
161
- for (const [url, regConfig] of Object.entries(proxyConfig.registries)) {
162
- const normalizedUrl = normalizeUrl(url);
163
- let token = regConfig?.npmAuthToken;
161
+ for (const [proxiedRegUrl, proxyRegConfig] of Object.entries(proxyConfig.registries)) {
162
+ const normalizedProxiedRegUrl = normalizeUrl(proxiedRegUrl);
163
+ let token = proxyRegConfig?.npmAuthToken;
164
164
  if (!token) {
165
165
  const yarnConfigs = [localYarnConfig, globalYarnConfig];
166
- for (const config of yarnConfigs) {
167
- const registryConfig = config.npmRegistries?.[normalizedUrl] ||
168
- config.npmRegistries?.[url];
169
- if (registryConfig?.npmAuthToken) {
170
- token = registryConfig.npmAuthToken;
171
- break;
166
+ for (const yarnConfig of yarnConfigs) {
167
+ if (yarnConfig.npmRegistries) {
168
+ const foundEntry = Object.entries(yarnConfig.npmRegistries)
169
+ .find(([registryUrl]) => normalizedProxiedRegUrl === normalizeUrl(registryUrl))
170
+ if (foundEntry) {
171
+ const [, registryConfig] = foundEntry;
172
+ if (registryConfig?.npmAuthToken) {
173
+ token = registryConfig.npmAuthToken;
174
+ break;
175
+ }
176
+ }
172
177
  }
173
178
  }
174
179
  }
175
- registryMap.set(normalizedUrl, {url: normalizedUrl, token});
180
+ registryMap.set(normalizedProxiedRegUrl, {url: normalizedProxiedRegUrl, token});
176
181
  }
177
182
  const registries = Array.from(registryMap.values());
178
183
  const https = proxyConfig.https;