cnpmcore 3.75.1 → 3.76.0
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/README.md +2 -3
- package/dist/app/core/service/PackageManagerService.d.ts +2 -0
- package/dist/app/core/service/PackageManagerService.js +77 -1
- package/dist/app/core/service/PackageSyncerService.d.ts +1 -0
- package/dist/app/core/service/PackageSyncerService.js +14 -1
- package/dist/app/port/config.d.ts +7 -0
- package/dist/app/port/controller/AbstractController.d.ts +2 -0
- package/dist/app/port/controller/AbstractController.js +11 -1
- package/dist/app/port/controller/PackageBlockController.d.ts +10 -1
- package/dist/app/port/controller/PackageBlockController.js +68 -6
- package/dist/app/port/controller/PackageVersionFileController.js +5 -2
- package/dist/app/port/controller/package/DownloadPackageVersionTar.d.ts +0 -1
- package/dist/app/port/controller/package/DownloadPackageVersionTar.js +1 -13
- package/dist/app/repository/PackageRepository.d.ts +1 -0
- package/dist/app/repository/PackageRepository.js +1 -1
- package/dist/app/repository/PackageVersionBlockRepository.d.ts +7 -0
- package/dist/app/repository/PackageVersionBlockRepository.js +38 -1
- package/dist/config/config.default.js +2 -1
- package/package.json +1 -1
|
@@ -173,6 +173,13 @@ export type CnpmcoreConfig = {
|
|
|
173
173
|
* strictly enforces/validates dependencies version when publish or sync
|
|
174
174
|
*/
|
|
175
175
|
strictValidatePackageDeps?: boolean;
|
|
176
|
+
/**
|
|
177
|
+
* enable block specific package version feature
|
|
178
|
+
* when disabled, only package-level block (version='*') is supported
|
|
179
|
+
* when enabled, can block individual versions
|
|
180
|
+
* default is false
|
|
181
|
+
*/
|
|
182
|
+
enableBlockPackageVersion?: boolean;
|
|
176
183
|
/**
|
|
177
184
|
* database config
|
|
178
185
|
*/
|
|
@@ -4,6 +4,7 @@ import { EggLogger, EggAppConfig } from 'egg';
|
|
|
4
4
|
import { MiddlewareController } from '../middleware';
|
|
5
5
|
import { UserRoleManager } from '../UserRoleManager';
|
|
6
6
|
import { PackageRepository } from '../../repository/PackageRepository';
|
|
7
|
+
import { PackageVersionBlockRepository } from '../../repository/PackageVersionBlockRepository';
|
|
7
8
|
import { UserRepository } from '../../repository/UserRepository';
|
|
8
9
|
import { Package as PackageEntity } from '../../core/entity/Package';
|
|
9
10
|
import { PackageVersion as PackageVersionEntity } from '../../core/entity/PackageVersion';
|
|
@@ -20,6 +21,7 @@ export declare abstract class AbstractController extends MiddlewareController {
|
|
|
20
21
|
protected config: EggAppConfig;
|
|
21
22
|
protected userRoleManager: UserRoleManager;
|
|
22
23
|
protected packageRepository: PackageRepository;
|
|
24
|
+
protected packageVersionBlockRepository: PackageVersionBlockRepository;
|
|
23
25
|
protected userRepository: UserRepository;
|
|
24
26
|
protected userService: UserService;
|
|
25
27
|
protected get sourceRegistry(): string;
|
|
@@ -15,6 +15,7 @@ const tegg_1 = require("@eggjs/tegg");
|
|
|
15
15
|
const middleware_1 = require("../middleware");
|
|
16
16
|
const UserRoleManager_1 = require("../UserRoleManager");
|
|
17
17
|
const PackageRepository_1 = require("../../repository/PackageRepository");
|
|
18
|
+
const PackageVersionBlockRepository_1 = require("../../repository/PackageVersionBlockRepository");
|
|
18
19
|
const UserRepository_1 = require("../../repository/UserRepository");
|
|
19
20
|
const PackageUtil_1 = require("../../common/PackageUtil");
|
|
20
21
|
const UserService_1 = require("../../core/service/UserService");
|
|
@@ -131,6 +132,11 @@ class AbstractController extends middleware_1.MiddlewareController {
|
|
|
131
132
|
if (!packageVersion) {
|
|
132
133
|
throw this.createPackageNotFoundErrorWithRedirect(pkg.fullname, version, allowSync);
|
|
133
134
|
}
|
|
135
|
+
// Check version block
|
|
136
|
+
const blockResult = await this.packageVersionBlockRepository.isVersionBlocked(pkg.packageId, version);
|
|
137
|
+
if (blockResult.blocked) {
|
|
138
|
+
throw this.createPackageBlockError(blockResult.reason, pkg.fullname, version);
|
|
139
|
+
}
|
|
134
140
|
return packageVersion;
|
|
135
141
|
}
|
|
136
142
|
getAndCheckVersionFromFilename(ctx, fullname, filenameWithVersion) {
|
|
@@ -169,6 +175,10 @@ __decorate([
|
|
|
169
175
|
(0, tegg_1.Inject)(),
|
|
170
176
|
__metadata("design:type", PackageRepository_1.PackageRepository)
|
|
171
177
|
], AbstractController.prototype, "packageRepository", void 0);
|
|
178
|
+
__decorate([
|
|
179
|
+
(0, tegg_1.Inject)(),
|
|
180
|
+
__metadata("design:type", PackageVersionBlockRepository_1.PackageVersionBlockRepository)
|
|
181
|
+
], AbstractController.prototype, "packageVersionBlockRepository", void 0);
|
|
172
182
|
__decorate([
|
|
173
183
|
(0, tegg_1.Inject)(),
|
|
174
184
|
__metadata("design:type", UserRepository_1.UserRepository)
|
|
@@ -177,4 +187,4 @@ __decorate([
|
|
|
177
187
|
(0, tegg_1.Inject)(),
|
|
178
188
|
__metadata("design:type", UserService_1.UserService)
|
|
179
189
|
], AbstractController.prototype, "userService", void 0);
|
|
180
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
190
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWJzdHJhY3RDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9BYnN0cmFjdENvbnRyb2xsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsMkNBR29CO0FBQ3BCLHNDQUdxQjtBQUtyQiw4Q0FBcUQ7QUFDckQsd0RBQXFEO0FBQ3JELDBFQUF1RTtBQUN2RSxrR0FBK0Y7QUFDL0Ysb0VBQWlFO0FBQ2pFLDBEQUF3RTtBQUd4RSxnRUFBNkQ7QUFDN0Qsd0NBRW9CO0FBQ3BCLHNEQUFrRDtBQUVsRCxNQUFNLG9CQUFxQixTQUFRLDBCQUFhO0NBRS9DO0FBRUQsTUFBTSx1QkFBd0IsU0FBUSwwQkFBYTtJQUVqRCxZQUFZLFFBQWdCO1FBQzFCLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7SUFDM0IsQ0FBQztDQUNGO0FBRUQsTUFBc0Isa0JBQW1CLFNBQVEsaUNBQW9CO0lBZ0JuRSxJQUFjLGNBQWM7UUFDMUIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUM7SUFDN0MsQ0FBQztJQUVELElBQWMsVUFBVTtRQUN0QixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsS0FBSyxvQkFBUSxDQUFDLElBQUksQ0FBQztJQUN6RCxDQUFDO0lBRVMsY0FBYyxDQUFDLEtBQWE7UUFDcEMsT0FBTyxLQUFLLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRVMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLEdBQWUsRUFBRSxRQUFnQixFQUFFLGFBQWEsR0FBRyxJQUFJO1FBQ3pGLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLGVBQWUsQ0FBQyxrQkFBa0IsQ0FB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
|
|
@@ -3,7 +3,6 @@ import { AbstractController } from './AbstractController';
|
|
|
3
3
|
import { BlockPackageType } from '../typebox';
|
|
4
4
|
export declare class PackageBlockController extends AbstractController {
|
|
5
5
|
private packageManagerService;
|
|
6
|
-
private packageVersionBlockRepository;
|
|
7
6
|
blockPackage(ctx: EggContext, fullname: string, data: BlockPackageType): Promise<{
|
|
8
7
|
ok: boolean;
|
|
9
8
|
id: string;
|
|
@@ -17,8 +16,18 @@ export declare class PackageBlockController extends AbstractController {
|
|
|
17
16
|
id: string;
|
|
18
17
|
version: string;
|
|
19
18
|
reason: string;
|
|
19
|
+
scope: string;
|
|
20
20
|
created: Date;
|
|
21
21
|
modified: Date;
|
|
22
22
|
}[];
|
|
23
23
|
}>;
|
|
24
|
+
blockPackageVersion(ctx: EggContext, fullname: string, version: string, data: BlockPackageType): Promise<{
|
|
25
|
+
ok: boolean;
|
|
26
|
+
id: string;
|
|
27
|
+
package_id: string;
|
|
28
|
+
version: string;
|
|
29
|
+
}>;
|
|
30
|
+
unblockPackageVersion(ctx: EggContext, fullname: string, version: string): Promise<{
|
|
31
|
+
ok: boolean;
|
|
32
|
+
}>;
|
|
24
33
|
}
|
|
@@ -18,7 +18,6 @@ const egg_errors_1 = require("egg-errors");
|
|
|
18
18
|
const AbstractController_1 = require("./AbstractController");
|
|
19
19
|
const PackageUtil_1 = require("../../common/PackageUtil");
|
|
20
20
|
const PackageManagerService_1 = require("../../core/service/PackageManagerService");
|
|
21
|
-
const PackageVersionBlockRepository_1 = require("../../repository/PackageVersionBlockRepository");
|
|
22
21
|
const typebox_1 = require("../typebox");
|
|
23
22
|
const AdminAccess_1 = require("../middleware/AdminAccess");
|
|
24
23
|
let PackageBlockController = class PackageBlockController extends AbstractController_1.AbstractController {
|
|
@@ -59,22 +58,56 @@ let PackageBlockController = class PackageBlockController extends AbstractContro
|
|
|
59
58
|
id: block.packageVersionBlockId,
|
|
60
59
|
version: block.version,
|
|
61
60
|
reason: block.reason,
|
|
61
|
+
scope: block.version === '*' ? 'package' : 'version',
|
|
62
62
|
created: block.createdAt,
|
|
63
63
|
modified: block.updatedAt,
|
|
64
64
|
};
|
|
65
65
|
}),
|
|
66
66
|
};
|
|
67
67
|
}
|
|
68
|
+
async blockPackageVersion(ctx, fullname, version, data) {
|
|
69
|
+
// Check if feature is enabled
|
|
70
|
+
if (!this.config.cnpmcore.enableBlockPackageVersion) {
|
|
71
|
+
throw new egg_errors_1.ForbiddenError('Block package version feature is not enabled');
|
|
72
|
+
}
|
|
73
|
+
const params = { fullname, version, reason: data.reason };
|
|
74
|
+
ctx.tValidate(typebox_1.BlockPackageRule, params);
|
|
75
|
+
const packageEntity = await this.getPackageEntityByFullname(params.fullname);
|
|
76
|
+
if (packageEntity.isPrivate) {
|
|
77
|
+
throw new egg_errors_1.ForbiddenError(`Can't block private package "${params.fullname}"`);
|
|
78
|
+
}
|
|
79
|
+
const authorized = await this.userRoleManager.getAuthorizedUserAndToken(ctx);
|
|
80
|
+
const block = await this.packageManagerService.blockPackageVersion(packageEntity, version, `${params.reason} (operator: ${authorized?.user.name}/${authorized?.user.userId})`);
|
|
81
|
+
ctx.logger.info('[PackageBlockController.blockPackageVersion:success] fullname: %s, version: %s, packageId: %s, packageVersionBlockId: %s', fullname, version, packageEntity.packageId, block.packageVersionBlockId);
|
|
82
|
+
ctx.status = 201;
|
|
83
|
+
return {
|
|
84
|
+
ok: true,
|
|
85
|
+
id: block.packageVersionBlockId,
|
|
86
|
+
package_id: packageEntity.packageId,
|
|
87
|
+
version,
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
async unblockPackageVersion(ctx, fullname, version) {
|
|
91
|
+
// Check if feature is enabled
|
|
92
|
+
if (!this.config.cnpmcore.enableBlockPackageVersion) {
|
|
93
|
+
throw new egg_errors_1.ForbiddenError('Block package version feature is not enabled');
|
|
94
|
+
}
|
|
95
|
+
const packageEntity = await this.getPackageEntityByFullname(fullname);
|
|
96
|
+
if (packageEntity.isPrivate) {
|
|
97
|
+
throw new egg_errors_1.ForbiddenError(`Can't unblock private package "${fullname}"`);
|
|
98
|
+
}
|
|
99
|
+
await this.packageManagerService.unblockPackageVersion(packageEntity, version);
|
|
100
|
+
ctx.logger.info('[PackageBlockController.unblockPackageVersion:success] fullname: %s, version: %s, packageId: %s', fullname, version, packageEntity.packageId);
|
|
101
|
+
return {
|
|
102
|
+
ok: true,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
68
105
|
};
|
|
69
106
|
exports.PackageBlockController = PackageBlockController;
|
|
70
107
|
__decorate([
|
|
71
108
|
(0, tegg_1.Inject)(),
|
|
72
109
|
__metadata("design:type", PackageManagerService_1.PackageManagerService)
|
|
73
110
|
], PackageBlockController.prototype, "packageManagerService", void 0);
|
|
74
|
-
__decorate([
|
|
75
|
-
(0, tegg_1.Inject)(),
|
|
76
|
-
__metadata("design:type", PackageVersionBlockRepository_1.PackageVersionBlockRepository)
|
|
77
|
-
], PackageBlockController.prototype, "packageVersionBlockRepository", void 0);
|
|
78
111
|
__decorate([
|
|
79
112
|
(0, tegg_1.HTTPMethod)({
|
|
80
113
|
// PUT /-/package/:fullname/blocks
|
|
@@ -113,7 +146,36 @@ __decorate([
|
|
|
113
146
|
__metadata("design:paramtypes", [String]),
|
|
114
147
|
__metadata("design:returntype", Promise)
|
|
115
148
|
], PackageBlockController.prototype, "listPackageBlocks", null);
|
|
149
|
+
__decorate([
|
|
150
|
+
(0, tegg_1.HTTPMethod)({
|
|
151
|
+
// PUT /-/package/:fullname/blocks/:version
|
|
152
|
+
path: `/-/package/:fullname(${PackageUtil_1.FULLNAME_REG_STRING})/blocks/:version`,
|
|
153
|
+
method: tegg_1.HTTPMethodEnum.PUT,
|
|
154
|
+
}),
|
|
155
|
+
(0, tegg_1.Middleware)(AdminAccess_1.AdminAccess),
|
|
156
|
+
__param(0, (0, tegg_1.Context)()),
|
|
157
|
+
__param(1, (0, tegg_1.HTTPParam)()),
|
|
158
|
+
__param(2, (0, tegg_1.HTTPParam)()),
|
|
159
|
+
__param(3, (0, tegg_1.HTTPBody)()),
|
|
160
|
+
__metadata("design:type", Function),
|
|
161
|
+
__metadata("design:paramtypes", [Object, String, String, Object]),
|
|
162
|
+
__metadata("design:returntype", Promise)
|
|
163
|
+
], PackageBlockController.prototype, "blockPackageVersion", null);
|
|
164
|
+
__decorate([
|
|
165
|
+
(0, tegg_1.HTTPMethod)({
|
|
166
|
+
// DELETE /-/package/:fullname/blocks/:version
|
|
167
|
+
path: `/-/package/:fullname(${PackageUtil_1.FULLNAME_REG_STRING})/blocks/:version`,
|
|
168
|
+
method: tegg_1.HTTPMethodEnum.DELETE,
|
|
169
|
+
}),
|
|
170
|
+
(0, tegg_1.Middleware)(AdminAccess_1.AdminAccess),
|
|
171
|
+
__param(0, (0, tegg_1.Context)()),
|
|
172
|
+
__param(1, (0, tegg_1.HTTPParam)()),
|
|
173
|
+
__param(2, (0, tegg_1.HTTPParam)()),
|
|
174
|
+
__metadata("design:type", Function),
|
|
175
|
+
__metadata("design:paramtypes", [Object, String, String]),
|
|
176
|
+
__metadata("design:returntype", Promise)
|
|
177
|
+
], PackageBlockController.prototype, "unblockPackageVersion", null);
|
|
116
178
|
exports.PackageBlockController = PackageBlockController = __decorate([
|
|
117
179
|
(0, tegg_1.HTTPController)()
|
|
118
180
|
], PackageBlockController);
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZUJsb2NrQ29udHJvbGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9wb3J0L2NvbnRyb2xsZXIvUGFja2FnZUJsb2NrQ29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzQ0FVcUI7QUFDckIsMkNBQTRDO0FBQzVDLDZEQUEwRDtBQUMxRCwwREFBK0Q7QUFDL0Qsb0ZBQWlGO0FBQ2pGLHdDQUFnRTtBQUNoRSwyREFBd0Q7QUFHakQsSUFBTSxzQkFBc0IsR0FBNUIsTUFBTSxzQkFBdUIsU0FBUSx1Q0FBa0I7SUFVdEQsQUFBTixLQUFLLENBQUMsWUFBWSxDQUFZLEdBQWUsRUFBZSxRQUFnQixFQUFjLElBQXNCO1FBQzlHLE1BQU0sTUFBTSxHQUFHLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDakQsR0FBRyxDQUFDLFNBQVMsQ0FBQywwQkFBZ0IsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUN4QyxNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDN0UsSUFBSSxhQUFhLENBQUMsU0FBUyxFQUFFO1lBQzNCLE1BQU0sSUFBSSwyQkFBYyxDQUFDLGlDQUFpQyxNQUFNLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQztTQUMvRTtRQUVELE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLGVBQWUsQ0FBQyx5QkFBeUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM3RSxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxZQUFZLENBQUMsYUFBYSxFQUN2RSxHQUFHLE1BQU0sQ0FBQyxNQUFNLGVBQWUsVUFBVSxFQUFFLElBQUksQ0FBQyxJQUFJLElBQUksVUFBVSxFQUFFLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxD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
|
|
@@ -73,7 +73,10 @@ let PackageVersionFileController = class PackageVersionFileController extends Ab
|
|
|
73
73
|
}
|
|
74
74
|
return files;
|
|
75
75
|
}
|
|
76
|
-
const { manifest } = await this.packageManagerService.showPackageVersionManifest(scope, name, versionSpec, false, true);
|
|
76
|
+
const { blockReason, manifest } = await this.packageManagerService.showPackageVersionManifest(scope, name, versionSpec, false, true);
|
|
77
|
+
if (blockReason) {
|
|
78
|
+
throw this.createPackageBlockError(blockReason, fullname, versionSpec);
|
|
79
|
+
}
|
|
77
80
|
// GET /foo/1.0.0/files => /foo/1.0.0/files/{main}
|
|
78
81
|
// ignore empty entry exp: @types/node@20.2.5/
|
|
79
82
|
const indexFile = manifest?.main || 'index.js';
|
|
@@ -243,4 +246,4 @@ __decorate([
|
|
|
243
246
|
exports.PackageVersionFileController = PackageVersionFileController = __decorate([
|
|
244
247
|
(0, tegg_1.HTTPController)()
|
|
245
248
|
], PackageVersionFileController);
|
|
246
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
249
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageVersionFileController.js","sourceRoot":"","sources":["../../../../app/port/controller/PackageVersionFileController.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ export declare class DownloadPackageVersionTarController extends AbstractControl
|
|
|
7
7
|
registryManagerService: RegistryManagerService;
|
|
8
8
|
private proxyCacheService;
|
|
9
9
|
private packageSyncerService;
|
|
10
|
-
private packageVersionService;
|
|
11
10
|
private nfsAdapter;
|
|
12
11
|
downloadForOptions(ctx: EggContext): Promise<void>;
|
|
13
12
|
download(ctx: EggContext, fullname: string, filenameWithVersion: string): Promise<import("stream").Readable | undefined>;
|
|
@@ -24,7 +24,6 @@ const PackageManagerService_1 = require("../../../core/service/PackageManagerSer
|
|
|
24
24
|
const ProxyCacheService_1 = require("../../../core/service/ProxyCacheService");
|
|
25
25
|
const PackageSyncerService_1 = require("../../../core/service/PackageSyncerService");
|
|
26
26
|
const RegistryManagerService_1 = require("../../../core/service/RegistryManagerService");
|
|
27
|
-
const PackageVersionService_1 = require("../../../core/service/PackageVersionService");
|
|
28
27
|
let DownloadPackageVersionTarController = class DownloadPackageVersionTarController extends AbstractController_1.AbstractController {
|
|
29
28
|
// Support OPTIONS Request on tgz download
|
|
30
29
|
async downloadForOptions(ctx) {
|
|
@@ -37,13 +36,6 @@ let DownloadPackageVersionTarController = class DownloadPackageVersionTarControl
|
|
|
37
36
|
const version = this.getAndCheckVersionFromFilename(ctx, fullname, filenameWithVersion);
|
|
38
37
|
const storeKey = `/packages/${fullname}/${version}/${filenameWithVersion}.tgz`;
|
|
39
38
|
const downloadUrl = await this.nfsAdapter.getDownloadUrl(storeKey);
|
|
40
|
-
// block tgz only all versions have been blocked
|
|
41
|
-
const blockInfo = await this.packageVersionService.findBlockInfo(fullname);
|
|
42
|
-
if (blockInfo?.reason) {
|
|
43
|
-
this.setCDNHeaders(ctx);
|
|
44
|
-
ctx.logger.info('[PackageController:downloadVersionTar] %s@%s, block for %s', fullname, version, blockInfo.reason);
|
|
45
|
-
throw this.createPackageBlockError(blockInfo.reason, fullname, version);
|
|
46
|
-
}
|
|
47
39
|
if (this.config.cnpmcore.syncMode === constants_1.SyncMode.all && downloadUrl) {
|
|
48
40
|
// try nfs url first, avoid db query
|
|
49
41
|
this.packageManagerService.plusPackageVersionCounter(fullname, version);
|
|
@@ -137,10 +129,6 @@ __decorate([
|
|
|
137
129
|
(0, tegg_1.Inject)(),
|
|
138
130
|
__metadata("design:type", PackageSyncerService_1.PackageSyncerService)
|
|
139
131
|
], DownloadPackageVersionTarController.prototype, "packageSyncerService", void 0);
|
|
140
|
-
__decorate([
|
|
141
|
-
(0, tegg_1.Inject)(),
|
|
142
|
-
__metadata("design:type", PackageVersionService_1.PackageVersionService)
|
|
143
|
-
], DownloadPackageVersionTarController.prototype, "packageVersionService", void 0);
|
|
144
132
|
__decorate([
|
|
145
133
|
(0, tegg_1.Inject)(),
|
|
146
134
|
__metadata("design:type", NFSAdapter_1.NFSAdapter)
|
|
@@ -209,4 +197,4 @@ __decorate([
|
|
|
209
197
|
exports.DownloadPackageVersionTarController = DownloadPackageVersionTarController = __decorate([
|
|
210
198
|
(0, tegg_1.HTTPController)()
|
|
211
199
|
], DownloadPackageVersionTarController);
|
|
212
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
200
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRG93bmxvYWRQYWNrYWdlVmVyc2lvblRhci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9wb3J0L2NvbnRyb2xsZXIvcGFja2FnZS9Eb3dubG9hZFBhY2thZ2VWZXJzaW9uVGFyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDZDQUEwQztBQUMxQywyQ0FFb0I7QUFDcEIsc0NBUXFCO0FBQ3JCLDhEQUEyRDtBQUMzRCw2REFBbUY7QUFDbkYseURBQXFEO0FBQ3JELG1FQUFnRTtBQUNoRSx1RkFBb0Y7QUFDcEYsK0VBQTRFO0FBQzVFLHFGQUFrRjtBQUNsRix5RkFBc0Y7QUFHL0UsSUFBTSxtQ0FBbUMsR0FBekMsTUFBTSxtQ0FBb0MsU0FBUSx1Q0FBa0I7SUFZekUsMENBQTBDO0lBTXBDLEFBQU4sS0FBSyxDQUFDLGtCQUFrQixDQUFZLEdBQWU7UUFDakQsR0FBRyxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUM1QyxHQUFHLENBQUMsR0FBRyxDQUFDLDhCQUE4QixFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQ3BELEdBQUcsQ0FBQyxNQUFNLEdBQUcsR0FBRyxDQUFDO0lBQ25CLENBQUM7SUFPSyxBQUFOLEtBQUssQ0FBQyxRQUFRLENBQVksR0FBZSxFQUFlLFFBQWdCLEVBQWUsbUJBQTJCO1FBQ2hILHlFQUF5RTtRQUN6RSxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsOEJBQThCLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO1FBQ3hGLE1BQU0sUUFBUSxHQUFHLGFBQWEsUUFBUSxJQUFJLE9BQU8sSUFBSSxtQkFBbUIsTUFBTSxDQUFDO1FBQy9FLE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxjQUFjLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFbkUsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFD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
|
|
@@ -95,6 +95,7 @@ export type CnpmcorePatchInfo = {
|
|
|
95
95
|
publish_time?: number;
|
|
96
96
|
_source_registry_name?: string;
|
|
97
97
|
block?: string;
|
|
98
|
+
blockVersions?: Record<string, string>;
|
|
98
99
|
};
|
|
99
100
|
type AbbreviatedKey = 'name' | 'version' | 'deprecated' | 'dependencies' | 'optionalDependencies' | 'devDependencies' | 'bundleDependencies' | 'peerDependencies' | 'peerDependenciesMeta' | 'bin' | 'os' | 'cpu' | 'libc' | 'workspaces' | 'directories' | 'dist' | 'engines' | 'hasInstallScript' | 'publish_time' | 'block' | '_hasShrinkwrap' | 'acceptDependencies' | 'funding';
|
|
100
101
|
type DistType = {
|
|
@@ -368,4 +368,4 @@ exports.PackageRepository = PackageRepository = __decorate([
|
|
|
368
368
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
369
369
|
})
|
|
370
370
|
], PackageRepository);
|
|
371
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}
|
|
371
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,sCAAkE;AAClE,0EAA8D;AAG9D,6CAA0D;AAC1D,oDAAkE;AAClE,0DAAuD;AACvD,kEAAuF;AACvF,2DAA+E;AAI/E,8CAAyD;AACzD,0DAA2E;AAI3E,8CAAyD;AACzD,6DAA0D;AAE1D,oDAAsD;AAuJ/C,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,uCAAkB;IAAlD;;;IA4VP,CAAC;IArTC,KAAK,CAAC,WAAW,CAAC,KAAa,EAAE,IAAY;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,MAAM,uBAAA,IAAI,oFAA6B,MAAjC,IAAI,EAA8B,KAAK,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,SAAiB;QAC5C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,MAAM,uBAAA,IAAI,oFAA6B,MAAjC,IAAI,EAA8B,KAAK,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,IAAY;QAC7C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC9E,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,KAAK,CAAC,SAAS,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,SAAwB;QACxC,IAAI,SAAS,CAAC,EAAE,EAAE;YAChB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/D,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,MAAM,+BAAc,CAAC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;SAC1D;aAAM;YACL,MAAM,KAAK,GAAG,MAAM,+BAAc,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACjF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2DAA2D,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;SAC1G;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAwB,EAAE,eAAwB;QACtE,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACpF,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,IAAI,IAAI,CAAC,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,MAAM,+BAAc,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACrD;aAAM;YACL,MAAM,KAAK,GAAG,MAAM,+BAAc,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACzE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2EAA2E,EAC1F,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;SAChD;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAwB,EAAE,eAAwB;QACxE,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACpF,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gFAAgF,EAC/F,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QAC/C,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAClC,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,sBAAsB;IACtB,wCAAwC;IACxC,KAAK,CAAC,qBAAqB,CAAC,SAAiB,EAAE,MAAc;QAC3D,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gFAAgF,EAC/F,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,SAAiB;QAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/E,OAAO,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,+BAAc,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAU,CAAC,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,SAAiB,EAAE,OAAiB;QAClE,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;YACzD,gBAAgB;YAChB,0FAA0F;YAC1F,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6EAA6E,EAC5F,WAAW,EAAE,SAAS,CAAC,CAAC;YAC1B,WAAW;YACX,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,kFAAkF;gBAClF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;gBAClF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qFAAqF,EACpG,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,SAAiB,EAAE,MAAc;QAC7D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QACnE,IAAI,KAAK,EAAE;YACT,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sFAAsF,EACrG,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uBAAuB;IACvB,KAAK,CAAC,oBAAoB,CAAC,MAAc;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC3F,OAAO,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,+BAAc,CAAC,oBAAoB,CAAC,GAAG,EAAE,iBAAa,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,gBAAsC;QAC/D,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,EAAC,WAAW,EAAC,EAAE;YACxD,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,wCAAwC;gBACxC,+BAAc,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC;gBACvF,+BAAc,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;gBAC1F,+BAAc,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;gBACrF,+BAAc,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;gBACxF,+BAAc,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;aAC9F,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAsC;QAC7D,mFAAmF;QACnF,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9E,IAAI,KAAK,EAAE;YACT,MAAM,+BAAc,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;SAC9E;QACD,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7E,IAAI,KAAK,EAAE;YACT,MAAM,+BAAc,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;SACjF;QACD,IAAI,gBAAgB,CAAC,EAAE,EAAE;YACvB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7E,IAAI,KAAK,EAAE;gBACT,MAAM,+BAAc,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;aACjE;SACF;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,SAAiB,EAAE,OAAe;QACzD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QAClF,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC;QAClC,OAAO,MAAM,IAAI,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,SAAiB;QACzC,qDAAqD;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAA2B,EAAE,CAAC;QAC5C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAC;SAC/D;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,SAAiB;QAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9F,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,wBAAwB;IACxB,KAAK,CAAC,qBAAqB,CAAC,SAAiB;QAC3C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yEAAyE,EACxF,WAAW,EAAE,SAAS,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,UAAgC;QACzD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7C,MAAM,EAAE;gBACN,UAAU,CAAC,eAAe,CAAC,MAAM;gBACjC,UAAU,CAAC,YAAY,CAAC,MAAM;gBAC9B,UAAU,CAAC,UAAU,CAAC,MAAM;gBAC5B,UAAU,CAAC,OAAO,CAAC,MAAM;aAC1B;SACF,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACxG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6FAA6F,EAC5G,eAAe,EAAE,WAAW,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,cAA4C;QAC3E,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,cAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC7G,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;YACzC,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;SACpB;aAAM;YACL,KAAK,GAAG,MAAM,+BAAc,CAAC,oBAAoB,CAAC,cAAc,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;YAC/F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iFAAiF,EAChG,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACrC;IACH,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,gBAAwB;QACvD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC9E,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACjF,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,KAAkB;QACnD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,wBAAa,CAAC,KAAK,EAAE;YAC9D,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,GAA2B,CAAC;YAC7D,MAAM,GAAG,GAAG;;;;;;8BAMY,QAAQ;gCACN,KAAK,CAAC,KAAK;OACpC,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAChD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,UAAoB,CAAC;SAC9C;QACD,MAAM,GAAG,GAAG,kCAAkC,KAAK,CAAC,KAAK,GAAG,CAAC;QAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC5E,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,mBAAmB,GAAG,CAAC,CAAC;QAC5B,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,kBAAkB,GAAG,EAAE,CAAC;QAE5B,IAAI,OAAO,EAAE;YACX,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;YAChF,wCAAwC;YACxC,+BAA+B;YAC/B,YAAY,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,iBAAY,CAAC,CAAC;SAC9D;QAED,IAAI,WAAW,EAAE;YACf,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC;YAC7E,IAAI,GAAG,EAAE;gBACP,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;gBACnE,kBAAkB,GAAG,GAAG,QAAQ,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;aAC3D;YACD,mBAAmB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,+BAAmB,CAAC,CAAC;SAC5E;QACD,OAAO;YACL,YAAY;YACZ,mBAAmB;YACnB,WAAW;YACX,kBAAkB;SACnB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,KAA0B;QACnE,MAAM,CACJ,YAAY,EACZ,eAAe,EACf,iBAAiB,EACjB,oBAAoB,EACrB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC;YACjD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC;YACnD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,iBAAiB,EAAE,CAAC;SACvD,CAAC,CAAC;QACH,MAAM,IAAI,GAAG;YACX,OAAO,EAAE,YAAY,IAAI,+BAAc,CAAC,oBAAoB,CAAC,YAAY,EAAE,WAAU,CAAC;YACtF,UAAU,EAAE,eAAe,IAAI,+BAAc,CAAC,oBAAoB,CAAC,eAAe,EAAE,WAAU,CAAC;YAC/F,YAAY,EAAE,iBAAiB,IAAI,+BAAc,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,WAAU,CAAC;YACrG,eAAe,EAAE,oBAAoB,IAAI,+BAAc,CAAC,oBAAoB,CAAC,oBAAoB,EAAE,WAAU,CAAC;SAC/G,CAAC;QACF,OAAO,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,+BAAoB,EAAE,IAAI,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,SAAiB,EAAE,GAAW;QACjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,MAAM,MAAM,GAAG,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,uBAAgB,CAAC,CAAC;QAC5E,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,gBAAkC;QACrD,IAAI,gBAAgB,CAAC,EAAE,EAAE;YACvB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;YACzE,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,MAAM,+BAAc,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;SACjE;aAAM;YACL,MAAM,KAAK,GAAG,MAAM,+BAAc,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YAC3F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iFAAiF,EAChG,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;SAC3D;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,gBAAkC;QACvD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qFAAqF,EACpG,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAiB;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAuB,EAAE,CAAC;QACxC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,QAAQ,CAAC,IAAI,CAAC,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,uBAAgB,CAAC,CAAC,CAAC;SAC7E;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;CAEF,CAAA;AA5VY,8CAAiB;;iDA4B5B,KAAK,yDAA8B,KAAmB;IACpD,MAAM,kBAAkB,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACrH,MAAM,qBAAqB,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9H,MAAM,IAAI,GAAG;QACX,aAAa,EAAE,kBAAkB,IAAI,+BAAc,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,WAAU,CAAC;QACxG,gBAAgB,EAAE,qBAAqB,IAAI,+BAAc,CAAC,oBAAoB,CAAC,qBAAqB,EAAE,WAAU,CAAC;KAClH,CAAC;IACF,MAAM,MAAM,GAAG,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,iBAAa,EAAE,IAAI,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC;AAChB,CAAC;AAnCgB;IADhB,IAAA,aAAM,GAAE;;kDACqC;AAG7B;IADhB,IAAA,aAAM,GAAE;;+CAC+B;AAGvB;IADhB,IAAA,aAAM,GAAE;;yDACmD;AAG3C;IADhB,IAAA,aAAM,GAAE;;iEACmE;AAG3D;IADhB,IAAA,aAAM,GAAE;;qDAC2C;AAGnC;IADhB,IAAA,aAAM,GAAE;;qDAC2C;AAGnC;IADhB,IAAA,aAAM,GAAE;;+CAC+B;AAGvB;IADhB,IAAA,aAAM,GAAE;;iDAC6B;AAGrB;IADhB,IAAA,aAAM,GAAE;8BACa,kBAAG;8CAAC;4BA1Bf,iBAAiB;IAH7B,IAAA,qBAAc,EAAC;QACd,WAAW,EAAE,kBAAW,CAAC,MAAM;KAChC,CAAC;GACW,iBAAiB,CA4V7B"}
|
|
@@ -8,4 +8,11 @@ export declare class PackageVersionBlockRepository extends AbstractRepository {
|
|
|
8
8
|
findPackageVersionBlock(packageId: string, version: string): Promise<PackageVersionBlockEntity | null>;
|
|
9
9
|
listPackageVersionBlocks(packageId: string): Promise<import("leoric").Collection<PackageVersionBlockModel>>;
|
|
10
10
|
removePackageVersionBlock(packageVersionBlockId: string): Promise<void>;
|
|
11
|
+
findPackageVersionBlockExact(packageId: string, version: string): Promise<PackageVersionBlockEntity | null>;
|
|
12
|
+
isVersionBlocked(packageId: string, version: string): Promise<{
|
|
13
|
+
blocked: boolean;
|
|
14
|
+
reason?: string;
|
|
15
|
+
version?: string;
|
|
16
|
+
}>;
|
|
17
|
+
listBlockedVersions(packageId: string): Promise<PackageVersionBlockEntity[]>;
|
|
11
18
|
}
|
|
@@ -43,6 +43,43 @@ let PackageVersionBlockRepository = class PackageVersionBlockRepository extends
|
|
|
43
43
|
const removeCount = await this.PackageVersionBlock.remove({ packageVersionBlockId });
|
|
44
44
|
this.logger.info('[PackageVersionBlockRepository:removePackageVersionBlock:remove] %d rows, packageVersionBlockId: %s', removeCount, packageVersionBlockId);
|
|
45
45
|
}
|
|
46
|
+
// Find a specific version block (not '*')
|
|
47
|
+
async findPackageVersionBlockExact(packageId, version) {
|
|
48
|
+
const model = await this.PackageVersionBlock.findOne({ packageId, version });
|
|
49
|
+
if (model)
|
|
50
|
+
return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, PackageVersionBlock_1.PackageVersionBlock);
|
|
51
|
+
return null;
|
|
52
|
+
}
|
|
53
|
+
// Check if a version is blocked (including package-level block)
|
|
54
|
+
async isVersionBlocked(packageId, version) {
|
|
55
|
+
// First check package-level block (version='*')
|
|
56
|
+
const packageBlock = await this.findPackageBlock(packageId);
|
|
57
|
+
if (packageBlock) {
|
|
58
|
+
return {
|
|
59
|
+
blocked: true,
|
|
60
|
+
reason: packageBlock.reason,
|
|
61
|
+
version: '*',
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
// Then check version-level block
|
|
65
|
+
const versionBlock = await this.findPackageVersionBlockExact(packageId, version);
|
|
66
|
+
if (versionBlock) {
|
|
67
|
+
return {
|
|
68
|
+
blocked: true,
|
|
69
|
+
reason: versionBlock.reason,
|
|
70
|
+
version: versionBlock.version,
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
return { blocked: false };
|
|
74
|
+
}
|
|
75
|
+
// List all blocked versions (exclude '*')
|
|
76
|
+
async listBlockedVersions(packageId) {
|
|
77
|
+
const models = await this.PackageVersionBlock.find({
|
|
78
|
+
packageId,
|
|
79
|
+
version: { $ne: '*' },
|
|
80
|
+
});
|
|
81
|
+
return models.map(model => ModelConvertor_1.ModelConvertor.convertModelToEntity(model, PackageVersionBlock_1.PackageVersionBlock));
|
|
82
|
+
}
|
|
46
83
|
};
|
|
47
84
|
exports.PackageVersionBlockRepository = PackageVersionBlockRepository;
|
|
48
85
|
__decorate([
|
|
@@ -54,4 +91,4 @@ exports.PackageVersionBlockRepository = PackageVersionBlockRepository = __decora
|
|
|
54
91
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
55
92
|
})
|
|
56
93
|
], PackageVersionBlockRepository);
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25CbG9ja1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9QYWNrYWdlVmVyc2lvbkJsb2NrUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FBa0U7QUFDbEUsMERBQXVEO0FBRXZELDRFQUFzRztBQUN0Ryw2REFBMEQ7QUFLbkQsSUFBTSw2QkFBNkIsR0FBbkMsTUFBTSw2QkFBOEIsU0FBUSx1Q0FBa0I7SUFJbkUsS0FBSyxDQUFDLHVCQUF1QixDQUFDLEtBQWdDO1FBQzVELElBQUksS0FBSyxDQUFDLEVBQUUsRUFBRTtZQUNaLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN2RSxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDdEQ7YUFBTTtZQUNMLE1BQU0sS0FBSyxHQUFHLE1BQU0sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLENBQUM7WUFDekYsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsK0ZBQStGLEVBQzlHLEtBQUssQ0FBQyxFQUFFLEVBQUUsS0FBSyxDQUFDLHFCQUFxQixDQUFDLENBQUM7U0FDMUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLGdCQUFnQixDQUFDLFNBQWlCO1FBQ3RDLE9BQU8sTUFBTSxJQUFJLENBQUMsdUJBQXVCLENBQUMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRCxLQUFLLENBQUMsdUJBQXVCLENBQUMsU0FBaUIsRUFBRSxPQUFlO1FBQzlELE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBQzdFLElBQUksS0FBSztZQUFFLE9BQU8sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUseUNBQXlCLENBQUMsQ0FBQztRQUN4RixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxLQUFLLENBQUMsd0JBQXdCLENBQUMsU0FBaUI7UUFDOUMsT0FBTyxNQUFNLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRCxLQUFLLENBQUMseUJBQXlCLENBQUMscUJBQTZCO1FBQzNELE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxFQUFFLHFCQUFxQixFQUFFLENBQUMsQ0FBQztRQUNyRixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxxR0FBcUcsRUFDcEgsV0FBVyxFQUFFLHFCQUFxQixDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUVELDBDQUEwQztJQUMxQyxLQUFLLENBQUMsNEJBQTRCLENBQUMsU0FBaUIsRUFBRSxPQUFlO1FBQ25FLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBQzdFLElBQUksS0FBSztZQUFFLE9BQU8sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUseUNBQXlCLENBQUMsQ0FBQztRQUN4RixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxnRUFBZ0U7SUFDaEUsS0FBSyxDQUFDLGdCQUFnQixDQUFDLFNBQWlCLEVBQUUsT0FBZTtRQUt2RCxnREFBZ0Q7UUFDaEQsTUFBTSxZQUFZLEdBQUcsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDNUQsSUFBSSxZQUFZLEVBQUU7WUFDaEIsT0FBTztnQkFDTCxPQUFPLEVBQUUsSUFBSTtnQkFDYixNQUFNLEVBQUUsWUFBWSxDQUFDLE1BQU07Z0JBQzNCLE9BQU8sRUFBRSxHQUFHO2FBQ2IsQ0FBQztTQUNIO1FBRUQsaUNBQWlDO1FBQ2pDLE1BQU0sWUFBWSxHQUFHLE1BQU0sSUFBSSxDQUFDLDRCQUE0QixDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUNqRixJQUFJLFlBQVksRUFBRTtZQUNoQixPQUFPO2dCQUNMLE9BQU8sRUFBRSxJQUFJO2dCQUNiLE1BQU0sRUFBRSxZQUFZLENBQUMsTUFBTTtnQkFDM0IsT0FBTyxFQUFFLFlBQVksQ0FBQyxPQUFPO2FBQzlCLENBQUM7U0FDSDtRQUVELE9BQU8sRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUM7SUFDNUIsQ0FBQztJQUVELDBDQUEwQztJQUMxQyxLQUFLLENBQUMsbUJBQW1CLENBQUMsU0FBaUI7UUFDekMsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDO1lBQ2pELFNBQVM7WUFDVCxPQUFPLEVBQUUsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFO1NBQ3RCLENBQUMsQ0FBQztRQUNILE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLHlDQUF5QixDQUFDLENBQUMsQ0FBQztJQUNwRyxDQUFDO0NBQ0YsQ0FBQTtBQWhGWSxzRUFBNkI7QUFFdkI7SUFEaEIsSUFBQSxhQUFNLEdBQUU7OzBFQUM2RDt3Q0FGM0QsNkJBQTZCO0lBSHpDLElBQUEscUJBQWMsRUFBQztRQUNkLFdBQVcsRUFBRSxrQkFBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLDZCQUE2QixDQWdGekMifQ==
|
|
@@ -65,6 +65,7 @@ exports.cnpmcoreConfig = {
|
|
|
65
65
|
elasticsearchIndex: 'cnpmcore_packages',
|
|
66
66
|
strictValidateTarballPkg: false,
|
|
67
67
|
strictValidatePackageDeps: false,
|
|
68
|
+
enableBlockPackageVersion: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ENABLE_BLOCK_PACKAGE_VERSION', 'boolean', false),
|
|
68
69
|
database: {
|
|
69
70
|
type: database_1.database.type,
|
|
70
71
|
},
|
|
@@ -209,4 +210,4 @@ exports.default = (appInfo) => {
|
|
|
209
210
|
}
|
|
210
211
|
return config;
|
|
211
212
|
};
|
|
212
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
213
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.default.js","sourceRoot":"","sources":["../../config/config.default.ts"],"names":[],"mappings":"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"}
|