cnpmcore 3.71.1 → 3.71.3
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/app/core/service/PackageSearchService.js +10 -1
- package/dist/app/core/service/ProxyCacheService.d.ts +4 -7
- package/dist/app/core/service/ProxyCacheService.js +78 -53
- package/dist/app/port/controller/ProxyCacheController.d.ts +3 -5
- package/dist/app/port/controller/ProxyCacheController.js +15 -29
- package/dist/app/port/controller/package/ShowPackageController.js +3 -2
- package/dist/app/repository/SearchRepository.d.ts +4 -0
- package/dist/app/repository/SearchRepository.js +1 -1
- package/package.json +1 -1
|
@@ -127,6 +127,15 @@ let PackageSearchService = class PackageSearchService extends AbstractService_1.
|
|
|
127
127
|
const { hits, total } = res;
|
|
128
128
|
return {
|
|
129
129
|
objects: hits?.map(item => {
|
|
130
|
+
// 从 https://github.com/npm/cli/pull/7407 (npm cli v10.6.0) 开始,npm cli 使用 publisher 字段(以前使用 maintainers 字段)
|
|
131
|
+
// 从现有数据来看,_npmUser 字段和 publisher 字段是等价的
|
|
132
|
+
// 为了兼容老版本,不删除 _npmUser 字段
|
|
133
|
+
if (!item._source?.package.publisher && item._source?.package._npmUser) {
|
|
134
|
+
item._source.package.publisher = {
|
|
135
|
+
username: item._source.package._npmUser.name,
|
|
136
|
+
email: item._source.package._npmUser.email,
|
|
137
|
+
};
|
|
138
|
+
}
|
|
130
139
|
return item._source;
|
|
131
140
|
}),
|
|
132
141
|
total: total.value,
|
|
@@ -254,4 +263,4 @@ exports.PackageSearchService = PackageSearchService = __decorate([
|
|
|
254
263
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
255
264
|
})
|
|
256
265
|
], PackageSearchService);
|
|
257
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
266
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSearchService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSearchService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { HttpClientResponse } from 'egg';
|
|
1
|
+
import { HttpClientRequestOptions, HttpClientResponse } from 'egg';
|
|
2
2
|
import { EggContext } from '@eggjs/tegg';
|
|
3
3
|
import { AbstractService } from '../../common/AbstractService';
|
|
4
4
|
import { Task, UpdateProxyCacheTaskOptions, CreateUpdateProxyCacheTask } from '../entity/Task';
|
|
@@ -19,15 +19,12 @@ export declare class ProxyCacheService extends AbstractService {
|
|
|
19
19
|
getPackageManifest(fullname: string, fileType: DIST_NAMES.FULL_MANIFESTS | DIST_NAMES.ABBREVIATED_MANIFESTS): Promise<AbbreviatedPackageManifestType | PackageManifestType>;
|
|
20
20
|
getPackageVersionManifest(fullname: string, fileType: DIST_NAMES.ABBREVIATED | DIST_NAMES.MANIFEST, versionOrTag: string): Promise<AbbreviatedPackageJSONType | PackageJSONType>;
|
|
21
21
|
removeProxyCache(fullname: string, fileType: DIST_NAMES, version?: string): Promise<void>;
|
|
22
|
+
replaceTarballUrl<T extends DIST_NAMES>(manifest: GetSourceManifestAndCacheReturnType<T>, fileType: T): GetSourceManifestAndCacheReturnType<T>;
|
|
22
23
|
createTask(targetName: string, options: UpdateProxyCacheTaskOptions): Promise<CreateUpdateProxyCacheTask>;
|
|
23
24
|
findExecuteTask(): Promise<Task<import("../entity/Task").TaskBaseData> | null>;
|
|
24
25
|
executeTask(task: Task): Promise<void>;
|
|
25
|
-
getRewrittenManifest
|
|
26
|
+
private getRewrittenManifest;
|
|
26
27
|
private storeRewrittenManifest;
|
|
27
|
-
|
|
28
|
-
private getUpstreamFullManifests;
|
|
29
|
-
private getUpstreamAbbreviatedManifests;
|
|
30
|
-
private getUpstreamPackageVersionManifest;
|
|
31
|
-
private getUpstreamAbbreviatedPackageVersionManifest;
|
|
28
|
+
getProxyResponse(ctx: Partial<EggContext>, options?: HttpClientRequestOptions): Promise<HttpClientResponse>;
|
|
32
29
|
}
|
|
33
30
|
export {};
|
|
@@ -42,12 +42,28 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
42
42
|
return await this.getProxyResponse(ctx);
|
|
43
43
|
}
|
|
44
44
|
async getPackageManifest(fullname, fileType) {
|
|
45
|
+
const isFullManifests = fileType === Package_1.DIST_NAMES.FULL_MANIFESTS;
|
|
45
46
|
const cachedStoreKey = (await this.proxyCacheRepository.findProxyCache(fullname, fileType))?.filePath;
|
|
46
47
|
if (cachedStoreKey) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
try {
|
|
49
|
+
const nfsBytes = await this.nfsAdapter.getBytes(cachedStoreKey);
|
|
50
|
+
if (!nfsBytes)
|
|
51
|
+
throw new Error('not found proxy cache, try again later.');
|
|
52
|
+
const nfsBuffer = Buffer.from(nfsBytes);
|
|
53
|
+
const { shasum: etag } = await (0, PackageUtil_1.calculateIntegrity)(nfsBytes);
|
|
54
|
+
await this.cacheService.savePackageEtagAndManifests(fullname, isFullManifests, etag, nfsBuffer);
|
|
55
|
+
const nfsString = nfsBuffer.toString();
|
|
56
|
+
const nfsPkgManifest = JSON.parse(nfsString);
|
|
57
|
+
return nfsPkgManifest;
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
/* c8 ignore next 6 */
|
|
61
|
+
if (error.message.includes('not found proxy cache') || error.message.includes('Unexpected token : in JSON at')) {
|
|
62
|
+
await this.nfsAdapter.remove(cachedStoreKey);
|
|
63
|
+
await this.proxyCacheRepository.removeProxyCache(fullname, fileType);
|
|
64
|
+
}
|
|
65
|
+
throw error;
|
|
66
|
+
}
|
|
51
67
|
}
|
|
52
68
|
const manifest = await this.getRewrittenManifest(fullname, fileType);
|
|
53
69
|
this.backgroundTaskHelper.run(async () => {
|
|
@@ -70,9 +86,21 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
70
86
|
}
|
|
71
87
|
const cachedStoreKey = (await this.proxyCacheRepository.findProxyCache(fullname, fileType, version))?.filePath;
|
|
72
88
|
if (cachedStoreKey) {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
89
|
+
try {
|
|
90
|
+
const nfsBytes = await this.nfsAdapter.getBytes(cachedStoreKey);
|
|
91
|
+
if (!nfsBytes)
|
|
92
|
+
throw new Error('not found proxy cache, try again later.');
|
|
93
|
+
const nfsString = Buffer.from(nfsBytes).toString();
|
|
94
|
+
return JSON.parse(nfsString);
|
|
95
|
+
}
|
|
96
|
+
catch (error) {
|
|
97
|
+
/* c8 ignore next 6 */
|
|
98
|
+
if (error.message.includes('not found proxy cache') || error.message.includes('Unexpected token : in JSON at')) {
|
|
99
|
+
await this.nfsAdapter.remove(cachedStoreKey);
|
|
100
|
+
await this.proxyCacheRepository.removeProxyCache(fullname, fileType);
|
|
101
|
+
}
|
|
102
|
+
throw error;
|
|
103
|
+
}
|
|
76
104
|
}
|
|
77
105
|
const manifest = await this.getRewrittenManifest(fullname, fileType, versionOrTag);
|
|
78
106
|
this.backgroundTaskHelper.run(async () => {
|
|
@@ -89,6 +117,27 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
89
117
|
await this.nfsAdapter.remove(storeKey);
|
|
90
118
|
await this.proxyCacheRepository.removeProxyCache(fullname, fileType, version);
|
|
91
119
|
}
|
|
120
|
+
replaceTarballUrl(manifest, fileType) {
|
|
121
|
+
const { sourceRegistry, registry } = this.config.cnpmcore;
|
|
122
|
+
if (isPkgManifest(fileType)) {
|
|
123
|
+
// pkg manifest
|
|
124
|
+
const versionMap = manifest?.versions;
|
|
125
|
+
for (const key in versionMap) {
|
|
126
|
+
const versionItem = versionMap[key];
|
|
127
|
+
if (versionItem?.dist?.tarball) {
|
|
128
|
+
versionItem.dist.tarball = versionItem.dist.tarball.replace(sourceRegistry, registry);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
// pkg version manifest
|
|
134
|
+
const distItem = manifest.dist;
|
|
135
|
+
if (distItem?.tarball) {
|
|
136
|
+
distItem.tarball = distItem.tarball.replace(sourceRegistry, registry);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
return manifest;
|
|
140
|
+
}
|
|
92
141
|
async createTask(targetName, options) {
|
|
93
142
|
return await this.taskService.createTask(Task_1.Task.createUpdateProxyCache(targetName, options), false);
|
|
94
143
|
}
|
|
@@ -129,44 +178,36 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
129
178
|
}
|
|
130
179
|
await this.taskService.finishTask(task, Task_2.TaskState.Success, logs.join('\n'));
|
|
131
180
|
}
|
|
181
|
+
// only used by schedule task
|
|
132
182
|
async getRewrittenManifest(fullname, fileType, versionOrTag) {
|
|
133
183
|
let responseResult;
|
|
184
|
+
const USER_AGENT = 'npm_service.cnpmjs.org/cnpmcore';
|
|
134
185
|
switch (fileType) {
|
|
135
|
-
case Package_1.DIST_NAMES.FULL_MANIFESTS:
|
|
136
|
-
|
|
186
|
+
case Package_1.DIST_NAMES.FULL_MANIFESTS: {
|
|
187
|
+
const url = `/${encodeURIComponent(fullname)}?t=${Date.now()}&cache=0`;
|
|
188
|
+
responseResult = await this.getProxyResponse({ url, headers: { accept: 'application/json', 'user-agent': USER_AGENT } }, { dataType: 'json' });
|
|
137
189
|
break;
|
|
138
|
-
|
|
139
|
-
|
|
190
|
+
}
|
|
191
|
+
case Package_1.DIST_NAMES.ABBREVIATED_MANIFESTS: {
|
|
192
|
+
const url = `/${encodeURIComponent(fullname)}?t=${Date.now()}&cache=0`;
|
|
193
|
+
responseResult = await this.getProxyResponse({ url, headers: { accept: constants_1.ABBREVIATED_META_TYPE, 'user-agent': USER_AGENT } }, { dataType: 'json' });
|
|
140
194
|
break;
|
|
141
|
-
|
|
142
|
-
|
|
195
|
+
}
|
|
196
|
+
case Package_1.DIST_NAMES.MANIFEST: {
|
|
197
|
+
const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
|
|
198
|
+
responseResult = await this.getProxyResponse({ url, headers: { accept: 'application/json', 'user-agent': USER_AGENT } }, { dataType: 'json' });
|
|
143
199
|
break;
|
|
144
|
-
|
|
145
|
-
|
|
200
|
+
}
|
|
201
|
+
case Package_1.DIST_NAMES.ABBREVIATED: {
|
|
202
|
+
const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
|
|
203
|
+
responseResult = await this.getProxyResponse({ url, headers: { accept: constants_1.ABBREVIATED_META_TYPE, 'user-agent': USER_AGENT } }, { dataType: 'json' });
|
|
146
204
|
break;
|
|
205
|
+
}
|
|
147
206
|
default:
|
|
148
207
|
break;
|
|
149
208
|
}
|
|
150
209
|
// replace tarball url
|
|
151
|
-
const manifest = responseResult.data;
|
|
152
|
-
const { sourceRegistry, registry } = this.config.cnpmcore;
|
|
153
|
-
if (isPkgManifest(fileType)) {
|
|
154
|
-
// pkg manifest
|
|
155
|
-
const versionMap = manifest.versions || {};
|
|
156
|
-
for (const key in versionMap) {
|
|
157
|
-
const versionItem = versionMap[key];
|
|
158
|
-
if (versionItem?.dist?.tarball) {
|
|
159
|
-
versionItem.dist.tarball = versionItem.dist.tarball.replace(sourceRegistry, registry);
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
else {
|
|
164
|
-
// pkg version manifest
|
|
165
|
-
const distItem = manifest.dist || {};
|
|
166
|
-
if (distItem.tarball) {
|
|
167
|
-
distItem.tarball = distItem.tarball.replace(sourceRegistry, registry);
|
|
168
|
-
}
|
|
169
|
-
}
|
|
210
|
+
const manifest = this.replaceTarballUrl(responseResult.data, fileType);
|
|
170
211
|
return manifest;
|
|
171
212
|
}
|
|
172
213
|
async storeRewrittenManifest(manifest, fullname, fileType) {
|
|
@@ -196,8 +237,8 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
196
237
|
compressed: true,
|
|
197
238
|
...options,
|
|
198
239
|
headers: {
|
|
199
|
-
accept: ctx.
|
|
200
|
-
'user-agent': ctx.
|
|
240
|
+
accept: ctx.headers?.accept,
|
|
241
|
+
'user-agent': ctx.headers?.['user-agent'],
|
|
201
242
|
authorization,
|
|
202
243
|
'x-forwarded-for': ctx?.ip,
|
|
203
244
|
via: `1.1, ${this.config.cnpmcore.registry}`,
|
|
@@ -206,22 +247,6 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
206
247
|
this.logger.info('[ProxyCacheService:getProxyStreamResponse] %s, status: %s', url, res.status);
|
|
207
248
|
return res;
|
|
208
249
|
}
|
|
209
|
-
async getUpstreamFullManifests(fullname) {
|
|
210
|
-
const url = `/${encodeURIComponent(fullname)}?t=${Date.now()}&cache=0`;
|
|
211
|
-
return await this.getProxyResponse({ url }, { dataType: 'json' });
|
|
212
|
-
}
|
|
213
|
-
async getUpstreamAbbreviatedManifests(fullname) {
|
|
214
|
-
const url = `/${encodeURIComponent(fullname)}?t=${Date.now()}&cache=0`;
|
|
215
|
-
return await this.getProxyResponse({ url, headers: { accept: constants_1.ABBREVIATED_META_TYPE } }, { dataType: 'json' });
|
|
216
|
-
}
|
|
217
|
-
async getUpstreamPackageVersionManifest(fullname, versionOrTag) {
|
|
218
|
-
const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
|
|
219
|
-
return await this.getProxyResponse({ url }, { dataType: 'json' });
|
|
220
|
-
}
|
|
221
|
-
async getUpstreamAbbreviatedPackageVersionManifest(fullname, versionOrTag) {
|
|
222
|
-
const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
|
|
223
|
-
return await this.getProxyResponse({ url, headers: { accept: constants_1.ABBREVIATED_META_TYPE } }, { dataType: 'json' });
|
|
224
|
-
}
|
|
225
250
|
};
|
|
226
251
|
exports.ProxyCacheService = ProxyCacheService;
|
|
227
252
|
__decorate([
|
|
@@ -261,4 +286,4 @@ exports.ProxyCacheService = ProxyCacheService = __decorate([
|
|
|
261
286
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
262
287
|
})
|
|
263
288
|
], ProxyCacheService);
|
|
264
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ProxyCacheService.js","sourceRoot":"","sources":["../../../../app/core/service/ProxyCacheService.ts"],"names":[],"mappings":"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"}
|
|
289
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ProxyCacheService.js","sourceRoot":"","sources":["../../../../app/core/service/ProxyCacheService.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,18 +5,16 @@ import { QueryPageOptions } from '../typebox';
|
|
|
5
5
|
export declare class ProxyCacheController extends AbstractController {
|
|
6
6
|
private readonly proxyCacheRepository;
|
|
7
7
|
private readonly proxyCacheService;
|
|
8
|
-
private readonly
|
|
8
|
+
private readonly cacheService;
|
|
9
9
|
listProxyCache(pageSize: Static<typeof QueryPageOptions>['pageSize'], pageIndex: Static<typeof QueryPageOptions>['pageIndex']): Promise<import("../../core/util/EntityUtil").PageResult<import("../../core/entity/ProxyCache").ProxyCache>>;
|
|
10
10
|
showProxyCaches(pageSize: Static<typeof QueryPageOptions>['pageSize'], pageIndex: Static<typeof QueryPageOptions>['pageIndex'], fullname: string): Promise<import("../../core/util/EntityUtil").PageResult<import("../../core/entity/ProxyCache").ProxyCache>>;
|
|
11
11
|
refreshProxyCaches(fullname: string): Promise<{
|
|
12
12
|
ok: boolean;
|
|
13
13
|
tasks: import("../../core/entity/Task").CreateUpdateProxyCacheTask[];
|
|
14
14
|
}>;
|
|
15
|
-
removeProxyCaches(
|
|
15
|
+
removeProxyCaches(fullname: string): Promise<{
|
|
16
16
|
ok: boolean;
|
|
17
17
|
result: import("leoric").Collection<import("../../repository/model/ProxyCache").ProxyCache>;
|
|
18
18
|
}>;
|
|
19
|
-
truncateProxyCaches(ctx: EggContext): Promise<
|
|
20
|
-
ok: boolean;
|
|
21
|
-
}>;
|
|
19
|
+
truncateProxyCaches(ctx: EggContext): Promise<void>;
|
|
22
20
|
}
|
|
@@ -20,7 +20,7 @@ const ProxyCacheRepository_1 = require("../../repository/ProxyCacheRepository");
|
|
|
20
20
|
const PackageUtil_1 = require("../../common/PackageUtil");
|
|
21
21
|
const ProxyCacheService_1 = require("../../core/service/ProxyCacheService");
|
|
22
22
|
const constants_1 = require("../../common/constants");
|
|
23
|
-
const
|
|
23
|
+
const CacheService_1 = require("../../core/service/CacheService");
|
|
24
24
|
let ProxyCacheController = class ProxyCacheController extends AbstractController_1.AbstractController {
|
|
25
25
|
async listProxyCache(pageSize, pageIndex) {
|
|
26
26
|
if (this.config.cnpmcore.syncMode !== constants_1.SyncMode.proxy) {
|
|
@@ -48,26 +48,24 @@ let ProxyCacheController = class ProxyCacheController extends AbstractController
|
|
|
48
48
|
if (refreshList.length === 0) {
|
|
49
49
|
throw new egg_errors_1.NotFoundError();
|
|
50
50
|
}
|
|
51
|
+
await this.cacheService.removeCache(fullname);
|
|
51
52
|
const taskList = refreshList
|
|
52
|
-
//
|
|
53
|
+
// only refresh package.json and abbreviated.json
|
|
53
54
|
.filter(i => (0, ProxyCacheService_1.isPkgManifest)(i.fileType))
|
|
54
|
-
.map(
|
|
55
|
-
const task =
|
|
55
|
+
.map(item => {
|
|
56
|
+
const task = this.proxyCacheService.createTask(`${item.fullname}/${item.fileType}`, {
|
|
56
57
|
fullname: item.fullname,
|
|
57
58
|
fileType: item.fileType,
|
|
58
59
|
});
|
|
59
60
|
return task;
|
|
60
61
|
});
|
|
62
|
+
const tasks = await Promise.all(taskList);
|
|
61
63
|
return {
|
|
62
64
|
ok: true,
|
|
63
|
-
tasks
|
|
65
|
+
tasks,
|
|
64
66
|
};
|
|
65
67
|
}
|
|
66
|
-
async removeProxyCaches(
|
|
67
|
-
const isAdmin = await this.userRoleManager.isAdmin(ctx);
|
|
68
|
-
if (!isAdmin) {
|
|
69
|
-
throw new egg_errors_1.UnauthorizedError('only admin can do this');
|
|
70
|
-
}
|
|
68
|
+
async removeProxyCaches(fullname) {
|
|
71
69
|
if (this.config.cnpmcore.syncMode !== constants_1.SyncMode.proxy) {
|
|
72
70
|
throw new egg_errors_1.ForbiddenError('proxy mode is not enabled');
|
|
73
71
|
}
|
|
@@ -75,6 +73,7 @@ let ProxyCacheController = class ProxyCacheController extends AbstractController
|
|
|
75
73
|
if (proxyCachesList.length === 0) {
|
|
76
74
|
throw new egg_errors_1.NotFoundError();
|
|
77
75
|
}
|
|
76
|
+
await this.cacheService.removeCache(fullname);
|
|
78
77
|
const removingList = proxyCachesList.map(item => {
|
|
79
78
|
return this.proxyCacheService.removeProxyCache(item.fullname, item.fileType, item.version);
|
|
80
79
|
});
|
|
@@ -92,19 +91,7 @@ let ProxyCacheController = class ProxyCacheController extends AbstractController
|
|
|
92
91
|
if (this.config.cnpmcore.syncMode !== constants_1.SyncMode.proxy) {
|
|
93
92
|
throw new egg_errors_1.ForbiddenError('proxy mode is not enabled');
|
|
94
93
|
}
|
|
95
|
-
|
|
96
|
-
// 尝试删除proxy cache目录,若失败可手动管理
|
|
97
|
-
ctx.runInBackground(async () => {
|
|
98
|
-
try {
|
|
99
|
-
await this.nfsAdapter.remove(`/${constants_1.PROXY_CACHE_DIR_NAME}`);
|
|
100
|
-
}
|
|
101
|
-
catch (err) {
|
|
102
|
-
this.logger.error('[ProxyCacheService.truncateProxyCaches] remove proxy cache dir error: %s', err);
|
|
103
|
-
}
|
|
104
|
-
});
|
|
105
|
-
return {
|
|
106
|
-
ok: true,
|
|
107
|
-
};
|
|
94
|
+
throw new egg_errors_1.NotImplementedError('not implemented yet');
|
|
108
95
|
}
|
|
109
96
|
};
|
|
110
97
|
exports.ProxyCacheController = ProxyCacheController;
|
|
@@ -118,8 +105,8 @@ __decorate([
|
|
|
118
105
|
], ProxyCacheController.prototype, "proxyCacheService", void 0);
|
|
119
106
|
__decorate([
|
|
120
107
|
(0, tegg_1.Inject)(),
|
|
121
|
-
__metadata("design:type",
|
|
122
|
-
], ProxyCacheController.prototype, "
|
|
108
|
+
__metadata("design:type", CacheService_1.CacheService)
|
|
109
|
+
], ProxyCacheController.prototype, "cacheService", void 0);
|
|
123
110
|
__decorate([
|
|
124
111
|
(0, tegg_1.HTTPMethod)({
|
|
125
112
|
method: tegg_1.HTTPMethodEnum.GET,
|
|
@@ -158,10 +145,9 @@ __decorate([
|
|
|
158
145
|
method: tegg_1.HTTPMethodEnum.DELETE,
|
|
159
146
|
path: `/-/proxy-cache/:fullname(${PackageUtil_1.FULLNAME_REG_STRING})`,
|
|
160
147
|
}),
|
|
161
|
-
__param(0, (0, tegg_1.
|
|
162
|
-
__param(1, (0, tegg_1.HTTPParam)()),
|
|
148
|
+
__param(0, (0, tegg_1.HTTPParam)()),
|
|
163
149
|
__metadata("design:type", Function),
|
|
164
|
-
__metadata("design:paramtypes", [
|
|
150
|
+
__metadata("design:paramtypes", [String]),
|
|
165
151
|
__metadata("design:returntype", Promise)
|
|
166
152
|
], ProxyCacheController.prototype, "removeProxyCaches", null);
|
|
167
153
|
__decorate([
|
|
@@ -177,4 +163,4 @@ __decorate([
|
|
|
177
163
|
exports.ProxyCacheController = ProxyCacheController = __decorate([
|
|
178
164
|
(0, tegg_1.HTTPController)()
|
|
179
165
|
], ProxyCacheController);
|
|
180
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
166
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJveHlDYWNoZUNvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL1Byb3h5Q2FjaGVDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVNxQjtBQUNyQiwyQ0FBbUc7QUFDbkcsNkRBQTBEO0FBQzFELGdGQUE2RTtBQUc3RSwwREFBK0Q7QUFDL0QsNEVBRzhDO0FBQzlDLHNEQUFrRDtBQUNsRCxrRUFBK0Q7QUFHeEQsSUFBTSxvQkFBb0IsR0FBMUIsTUFBTSxvQkFBcUIsU0FBUSx1Q0FBa0I7SUFZcEQsQUFBTixLQUFLLENBQUMsY0FBYyxDQUNMLFFBQXFELEVBQ3JELFNBQXVEO1FBRXBFLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxLQUFLLG9CQUFRLENBQUMsS0FBSyxFQUFFO1lBQ3BELE1BQU0sSUFBSSwyQkFBYyxDQUFDLDJCQUEyQixDQUFDLENBQUM7U0FDdkQ7UUFDRCxPQUFPLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixDQUFDLGVBQWUsQ0FBQztZQUNyRCxRQUFRO1lBQ1IsU0FBUztTQUNWLENBQUMsQ0FBQztJQUNMLENBQUM7SUFNSyxBQUFOLEtBQUssQ0FBQyxlQUFlLENBQWMsUUFBcUQsRUFDM0UsU0FBdUQsRUFBZSxRQUFnQjtRQUNqRyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsS0FBSyxvQkFBUSxDQUFDLEtBQUssRUFBRTtZQUNwRCxNQUFNLElBQUksMkJBQWMsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO1NBQ3ZEO1FBQ0QsT0FBTyxNQUFNLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxlQUFlLENBQUM7WUFDckQsUUFBUTtZQUNSLFNBQVM7U0FDVixFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ2YsQ0FBQztJQU1LLEFBQU4sS0FBSyxDQUFDLGtCQUFrQixDQUFj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
|
|
@@ -63,7 +63,8 @@ let ShowPackageController = class ShowPackageController extends AbstractControll
|
|
|
63
63
|
if (this.config.cnpmcore.syncMode === constants_1.SyncMode.proxy) {
|
|
64
64
|
// proxy mode
|
|
65
65
|
const fileType = isFullManifests ? Package_1.DIST_NAMES.FULL_MANIFESTS : Package_1.DIST_NAMES.ABBREVIATED_MANIFESTS;
|
|
66
|
-
const
|
|
66
|
+
const { data: sourceManifest } = await this.proxyCacheService.getProxyResponse(ctx, { dataType: 'json' });
|
|
67
|
+
const pkgManifest = this.proxyCacheService.replaceTarballUrl(sourceManifest, fileType);
|
|
67
68
|
const nfsBytes = Buffer.from(JSON.stringify(pkgManifest));
|
|
68
69
|
const { shasum: etag } = await (0, PackageUtil_2.calculateIntegrity)(nfsBytes);
|
|
69
70
|
result = { data: pkgManifest, etag, blockReason: '' };
|
|
@@ -134,4 +135,4 @@ __decorate([
|
|
|
134
135
|
exports.ShowPackageController = ShowPackageController = __decorate([
|
|
135
136
|
(0, tegg_1.HTTPController)()
|
|
136
137
|
], ShowPackageController);
|
|
137
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hvd1BhY2thZ2VDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9wYWNrYWdlL1Nob3dQYWNrYWdlQ29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzQ0FRcUI7QUFDckIsOERBQTJEO0FBQzNELDZEQUFtRjtBQUNuRix1REFBK0Q7QUFDL0QsdUZBQW9GO0FBQ3BGLHFFQUFrRTtBQUNsRSx5REFBNEU7QUFDNUUsK0VBQTRFO0FBQzVFLDZEQUFpRTtBQUNqRSwwREFBMEQ7QUFHbkQsSUFBTSxxQkFBcUIsR0FBM0IsTUFBTSxxQkFBc0IsU0FBUSx1Q0FBa0I7SUFjckQsQUFBTixLQUFLLENBQUMsSUFBSSxDQUFZLEdBQWUsRUFBZSxRQUFnQjtRQUNsRSxNQUFNLENBQUUsS0FBSyxFQUFFLElBQUksQ0FBRSxHQUFHLElBQUEsNkJBQWUsRUFBQyxRQUFRLENBQUMsQ0FBQztRQUNsRCxNQUFNLE1BQU0sR0FBRyxJQUFBLDhCQUFtQixFQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sZUFBZSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBRSxNQUFNLEVBQUUsaUNBQXFCLENBQUUsQ0FBQyxLQUFLLGlDQUFxQixDQUFDO1FBRWpHLGVBQWU7UUFDZixrQ0FBa0M7UUFDbEMsSUFBSTtZQUNGLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxjQUFjLENBQUMsUUFBUSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1lBQ3BGLElBQUksQ0FBQyxNQUFNLElBQUksU0FBUyxFQUFFO2dCQUN4QixJQUFJLFdBQVcsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztnQkFDbkQsSUFBSSxXQUFXLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFO29CQUNoQyxXQUFXLEdB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
|
|
@@ -13,6 +13,10 @@ export type SearchMappingType = Pick<PackageManifestType, SearchJSONPickKey> & C
|
|
|
13
13
|
name: string;
|
|
14
14
|
email: string;
|
|
15
15
|
};
|
|
16
|
+
publisher?: {
|
|
17
|
+
username: string;
|
|
18
|
+
email: string;
|
|
19
|
+
};
|
|
16
20
|
};
|
|
17
21
|
export type SearchManifestType = {
|
|
18
22
|
package: SearchMappingType;
|
|
@@ -32,4 +32,4 @@ exports.SearchRepository = SearchRepository = __decorate([
|
|
|
32
32
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
33
33
|
})
|
|
34
34
|
], SearchRepository);
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VhcmNoUmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L1NlYXJjaFJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsc0NBQWtFO0FBb0MzRCxJQUFNLGdCQUFnQixHQUF0QixNQUFNLGdCQUFnQjtJQUszQixLQUFLLENBQUMsYUFBYSxDQUFDLEtBQUs7UUFDdkIsT0FBTyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFxQixLQUFLLENBQUMsQ0FBQztJQUNwRSxDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxRQUE0QjtRQUM5QyxPQUFPLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDMUUsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhLENBQUMsUUFBZ0I7UUFDbEMsT0FBTyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ25ELENBQUM7Q0FDRixDQUFBO0FBaEJZLDRDQUFnQjtBQUVWO0lBRGhCLElBQUEsYUFBTSxHQUFFOzt1REFDcUM7MkJBRm5DLGdCQUFnQjtJQUg1QixJQUFBLHFCQUFjLEVBQUM7UUFDZCxXQUFXLEVBQUUsa0JBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxnQkFBZ0IsQ0FnQjVCIn0=
|