cnpmcore 3.38.0 → 3.38.1
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.
|
@@ -8,6 +8,6 @@ export declare class CacheAdapter {
|
|
|
8
8
|
delete(key: string): Promise<void>;
|
|
9
9
|
lock(key: string, seconds: number): Promise<string | null>;
|
|
10
10
|
unlock(key: string, lockTimestamp: string): Promise<void>;
|
|
11
|
-
usingLock(key: string, seconds: number, func: () => Promise<void>): Promise<
|
|
11
|
+
usingLock(key: string, seconds: number, func: () => Promise<void>): Promise<boolean>;
|
|
12
12
|
private getLockName;
|
|
13
13
|
}
|
|
@@ -57,13 +57,14 @@ let CacheAdapter = exports.CacheAdapter = class CacheAdapter {
|
|
|
57
57
|
async usingLock(key, seconds, func) {
|
|
58
58
|
const lockTimestamp = await this.lock(key, seconds);
|
|
59
59
|
if (!lockTimestamp)
|
|
60
|
-
return;
|
|
60
|
+
return false;
|
|
61
61
|
try {
|
|
62
62
|
await func();
|
|
63
63
|
}
|
|
64
64
|
finally {
|
|
65
65
|
await this.unlock(key, lockTimestamp);
|
|
66
66
|
}
|
|
67
|
+
return true;
|
|
67
68
|
}
|
|
68
69
|
getLockName(key) {
|
|
69
70
|
return `CNPMCORE_L_${key}`;
|
|
@@ -78,4 +79,4 @@ exports.CacheAdapter = CacheAdapter = __decorate([
|
|
|
78
79
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
79
80
|
})
|
|
80
81
|
], CacheAdapter);
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FjaGVBZGFwdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvbW1vbi9hZGFwdGVyL0NhY2hlQWRhcHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FJcUI7QUFLckIsTUFBTSxPQUFPLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztBQUtuQixJQUFNLFlBQVksMEJBQWxCLE1BQU0sWUFBWTtJQUl2QixLQUFLLENBQUMsUUFBUSxDQUFDLEdBQVcsRUFBRSxLQUFhO1FBQ3ZDLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxHQUFXO1FBQ3hCLE9BQU8sTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN6QyxDQUFDO0lBRUQsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFXLEVBQUUsSUFBWTtRQUNqQyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDN0MsQ0FBQztJQUVELEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBVztRQUNuQixPQUFPLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbkMsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBVztRQUN0QixNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzVCLENBQUM7SUFFRCxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQVcsRUFBRSxPQUFlO1FBQ3JDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDdkMsTUFBTSxlQUFlLEdBQUcsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUN2RCxJQUFJLGVBQWUsRUFBRTtZQUNuQixJQUFJLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxRQUFRLENBQUMsZUFBZSxDQUFDLEdBQUcsT0FBTyxHQUFHLElBQUksRUFBRTtnQkFDM0QsT0FBTyxJQUFJLENBQUM7YUFDYjtZQUNELDBCQUEwQjtZQUMxQixNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1NBQ2hDO1FBQ0QsTUFBTSxTQUFTLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsT0FBTyxHQUFHLElBQUksRUFBRSxDQUFDO1FBQ25ELE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ3pELHdCQUF3QjtRQUN4QixJQUFJLElBQUksS0FBSyxDQUFDO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDNUIsU0FBUztRQUNULE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQzNDLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQVcsRUFBRSxhQUFxQjtRQUM3QyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sZUFBZSxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDdkQsSUFBSSxDQUFDLGVBQWUsSUFBSSxhQUFhLEtBQUssZUFBZTtZQUFFLE9BQU87UUFDbEUsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFXLEVBQUUsT0FBZSxFQUFFLElBQXlCO1FBQ3JFLE1BQU0sYUFBYSxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDcEQsSUFBSSxDQUFDLGFBQWE7WUFBRSxPQUFPLEtBQUssQ0FBQztRQUNqQyxJQUFJO1lBQ0YsTUFBTSxJQUFJLEVBQUUsQ0FBQztTQUNkO2dCQUFTO1lBQ1IsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxhQUFhLENBQUMsQ0FBQztTQUN2QztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVPLFdBQVcsQ0FBQyxHQUFXO1FBQzdCLE9BQU8sY0FBYyxHQUFHLEVBQUUsQ0FBQztJQUM3QixDQUFDO0NBQ0YsQ0FBQTtBQTlEa0I7SUFEaEIsSUFBQSxhQUFNLEdBQUU7OzJDQUNxQjt1QkFGbkIsWUFBWTtJQUh4QixJQUFBLHFCQUFjLEVBQUM7UUFDZCxXQUFXLEVBQUUsa0JBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxZQUFZLENBZ0V4QiJ9
|
|
@@ -37,6 +37,7 @@ type FullPackage = Omit<Static<typeof FullPackageRule>, 'versions' | '_attachmen
|
|
|
37
37
|
export declare class SavePackageVersionController extends AbstractController {
|
|
38
38
|
private readonly packageManagerService;
|
|
39
39
|
private readonly registryManagerService;
|
|
40
|
+
private readonly cacheAdapter;
|
|
40
41
|
save(ctx: EggContext, fullname: string, pkg: FullPackage): Promise<{
|
|
41
42
|
ok: boolean;
|
|
42
43
|
} | {
|
|
@@ -50,6 +50,7 @@ const PackageUtil_1 = require("../../../common/PackageUtil");
|
|
|
50
50
|
const PackageManagerService_1 = require("../../../core/service/PackageManagerService");
|
|
51
51
|
const typebox_2 = require("../../typebox");
|
|
52
52
|
const RegistryManagerService_1 = require("../../../core/service/RegistryManagerService");
|
|
53
|
+
const CacheAdapter_1 = require("../../../common/adapter/CacheAdapter");
|
|
53
54
|
const STRICT_CHECK_TARBALL_FIELDS = ['name', 'version', 'scripts', 'dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies', 'license', 'licenses', 'bin'];
|
|
54
55
|
const FullPackageRule = typebox_1.Type.Object({
|
|
55
56
|
name: typebox_2.Name,
|
|
@@ -171,20 +172,28 @@ let SavePackageVersionController = exports.SavePackageVersionController = class
|
|
|
171
172
|
packageVersion.description = '';
|
|
172
173
|
}
|
|
173
174
|
const registry = await this.registryManagerService.ensureSelfRegistry();
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
175
|
+
let packageVersionEntity;
|
|
176
|
+
const lockRes = await this.cacheAdapter.usingLock(`${pkg.name}:publish`, 60, async () => {
|
|
177
|
+
packageVersionEntity = await this.packageManagerService.publish({
|
|
178
|
+
scope,
|
|
179
|
+
name,
|
|
180
|
+
version: packageVersion.version,
|
|
181
|
+
description: packageVersion.description,
|
|
182
|
+
packageJson: packageVersion,
|
|
183
|
+
readme,
|
|
184
|
+
dist: {
|
|
185
|
+
content: tarballBytes,
|
|
186
|
+
},
|
|
187
|
+
tag: tagWithVersion.tag,
|
|
188
|
+
registryId: registry.registryId,
|
|
189
|
+
isPrivate: true,
|
|
190
|
+
}, user);
|
|
191
|
+
});
|
|
192
|
+
// lock fail
|
|
193
|
+
if (!lockRes) {
|
|
194
|
+
this.logger.warn('[package:version:add] check lock fail');
|
|
195
|
+
throw new egg_errors_1.ConflictError('Unable to create the publication lock, please try again later.');
|
|
196
|
+
}
|
|
188
197
|
this.logger.info('[package:version:add] %s@%s, packageVersionId: %s, tag: %s, userId: %s', packageVersion.name, packageVersion.version, packageVersionEntity.packageVersionId, tagWithVersion.tag, user.userId);
|
|
189
198
|
ctx.status = 201;
|
|
190
199
|
return {
|
|
@@ -221,6 +230,10 @@ __decorate([
|
|
|
221
230
|
(0, tegg_1.Inject)(),
|
|
222
231
|
__metadata("design:type", RegistryManagerService_1.RegistryManagerService)
|
|
223
232
|
], SavePackageVersionController.prototype, "registryManagerService", void 0);
|
|
233
|
+
__decorate([
|
|
234
|
+
(0, tegg_1.Inject)(),
|
|
235
|
+
__metadata("design:type", CacheAdapter_1.CacheAdapter)
|
|
236
|
+
], SavePackageVersionController.prototype, "cacheAdapter", void 0);
|
|
224
237
|
__decorate([
|
|
225
238
|
(0, tegg_1.HTTPMethod)({
|
|
226
239
|
// PUT /:fullname
|
|
@@ -238,4 +251,4 @@ __decorate([
|
|
|
238
251
|
exports.SavePackageVersionController = SavePackageVersionController = __decorate([
|
|
239
252
|
(0, tegg_1.HTTPController)()
|
|
240
253
|
], SavePackageVersionController);
|
|
241
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
254
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SavePackageVersionController.js","sourceRoot":"","sources":["../../../../../app/port/controller/package/SavePackageVersionController.ts"],"names":[],"mappings":"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"}
|