cnpmcore 4.1.4 → 4.1.6
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/common/ErrorUtil.js +5 -5
- package/dist/app/common/FileUtil.d.ts +1 -2
- package/dist/app/common/FileUtil.js +43 -39
- package/dist/app/common/PackageUtil.d.ts +6 -3
- package/dist/app/common/PackageUtil.js +6 -6
- package/dist/app/common/adapter/CacheAdapter.js +3 -3
- package/dist/app/common/adapter/NFSAdapter.js +2 -2
- package/dist/app/common/adapter/NPMRegistry.js +5 -4
- package/dist/app/common/adapter/binary/AbstractBinary.d.ts +8 -8
- package/dist/app/common/adapter/binary/AbstractBinary.js +6 -5
- package/dist/app/common/adapter/binary/ApiBinary.d.ts +1 -2
- package/dist/app/common/adapter/binary/ApiBinary.js +3 -2
- package/dist/app/common/adapter/binary/BucketBinary.d.ts +2 -3
- package/dist/app/common/adapter/binary/BucketBinary.js +5 -5
- package/dist/app/common/adapter/binary/ChromeForTestingBinary.d.ts +1 -2
- package/dist/app/common/adapter/binary/ChromeForTestingBinary.js +4 -4
- package/dist/app/common/adapter/binary/CypressBinary.d.ts +1 -2
- package/dist/app/common/adapter/binary/CypressBinary.js +3 -3
- package/dist/app/common/adapter/binary/EdgedriverBinary.d.ts +1 -2
- package/dist/app/common/adapter/binary/EdgedriverBinary.js +6 -6
- package/dist/app/common/adapter/binary/ElectronBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/ElectronBinary.js +4 -4
- package/dist/app/common/adapter/binary/GithubBinary.d.ts +2 -3
- package/dist/app/common/adapter/binary/GithubBinary.js +6 -3
- package/dist/app/common/adapter/binary/ImageminBinary.d.ts +2 -3
- package/dist/app/common/adapter/binary/ImageminBinary.js +8 -7
- package/dist/app/common/adapter/binary/NodeBinary.d.ts +2 -3
- package/dist/app/common/adapter/binary/NodeBinary.js +3 -3
- package/dist/app/common/adapter/binary/NodePreGypBinary.d.ts +2 -3
- package/dist/app/common/adapter/binary/NodePreGypBinary.js +4 -3
- package/dist/app/common/adapter/binary/NwjsBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/NwjsBinary.js +3 -3
- package/dist/app/common/adapter/binary/PlaywrightBinary.d.ts +1 -2
- package/dist/app/common/adapter/binary/PlaywrightBinary.js +5 -5
- package/dist/app/common/adapter/binary/PrismaBinary.d.ts +2 -3
- package/dist/app/common/adapter/binary/PrismaBinary.js +5 -5
- package/dist/app/common/adapter/binary/PuppeteerBinary.d.ts +3 -3
- package/dist/app/common/adapter/binary/PuppeteerBinary.js +35 -63
- package/dist/app/common/adapter/binary/SqlcipherBinary.d.ts +1 -2
- package/dist/app/common/adapter/binary/SqlcipherBinary.js +3 -3
- package/dist/app/common/adapter/changesStream/AbstractChangesStream.d.ts +3 -3
- package/dist/app/common/adapter/changesStream/AbstractChangesStream.js +2 -2
- package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.js +3 -3
- package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.js +4 -4
- package/dist/app/common/adapter/changesStream/NpmChangesStream.d.ts +1 -2
- package/dist/app/common/adapter/changesStream/NpmChangesStream.js +3 -3
- package/dist/app/common/aop/AsyncTimer.d.ts +1 -1
- package/dist/app/common/aop/AsyncTimer.js +1 -1
- package/dist/app/common/enum/User.js +1 -1
- package/dist/app/core/entity/Binary.d.ts +3 -4
- package/dist/app/core/entity/Binary.js +1 -1
- package/dist/app/core/entity/BugVersion.d.ts +2 -2
- package/dist/app/core/entity/BugVersion.js +6 -3
- package/dist/app/core/entity/Change.d.ts +2 -3
- package/dist/app/core/entity/Change.js +1 -1
- package/dist/app/core/entity/Dist.d.ts +2 -3
- package/dist/app/core/entity/Dist.js +1 -1
- package/dist/app/core/entity/Hook.d.ts +2 -3
- package/dist/app/core/entity/Hook.js +4 -3
- package/dist/app/core/entity/Package.d.ts +2 -3
- package/dist/app/core/entity/Package.js +1 -1
- package/dist/app/core/entity/PackageTag.d.ts +2 -3
- package/dist/app/core/entity/PackageTag.js +1 -1
- package/dist/app/core/entity/PackageVersion.d.ts +2 -3
- package/dist/app/core/entity/PackageVersion.js +1 -1
- package/dist/app/core/entity/PackageVersionBlock.d.ts +2 -3
- package/dist/app/core/entity/PackageVersionBlock.js +1 -1
- package/dist/app/core/entity/PackageVersionFile.d.ts +2 -3
- package/dist/app/core/entity/PackageVersionFile.js +1 -1
- package/dist/app/core/entity/PackageVersionManifest.d.ts +2 -3
- package/dist/app/core/entity/PackageVersionManifest.js +1 -1
- package/dist/app/core/entity/PaddingSemVer.js +9 -6
- package/dist/app/core/entity/ProxyCache.d.ts +2 -3
- package/dist/app/core/entity/ProxyCache.js +1 -1
- package/dist/app/core/entity/Registry.d.ts +2 -3
- package/dist/app/core/entity/Registry.js +1 -1
- package/dist/app/core/entity/Scope.d.ts +2 -3
- package/dist/app/core/entity/Scope.js +1 -1
- package/dist/app/core/entity/SqlRange.js +5 -3
- package/dist/app/core/entity/Task.d.ts +12 -13
- package/dist/app/core/entity/Task.js +2 -2
- package/dist/app/core/entity/Token.d.ts +3 -4
- package/dist/app/core/entity/Token.js +1 -1
- package/dist/app/core/entity/User.d.ts +2 -3
- package/dist/app/core/entity/User.js +1 -1
- package/dist/app/core/entity/WebauthnCredential.d.ts +2 -3
- package/dist/app/core/entity/WebauthnCredential.js +1 -1
- package/dist/app/core/event/CacheCleaner.js +2 -2
- package/dist/app/core/event/ChangesStream.d.ts +1 -1
- package/dist/app/core/event/ChangesStream.js +2 -2
- package/dist/app/core/event/SyncESPackage.js +2 -2
- package/dist/app/core/event/SyncPackageVersionFile.js +2 -2
- package/dist/app/core/event/index.d.ts +2 -2
- package/dist/app/core/service/BinarySyncerService.d.ts +2 -2
- package/dist/app/core/service/BinarySyncerService.js +31 -16
- package/dist/app/core/service/BugVersionService.js +13 -5
- package/dist/app/core/service/CacheService.d.ts +4 -4
- package/dist/app/core/service/CacheService.js +2 -2
- package/dist/app/core/service/ChangesStreamService.d.ts +1 -1
- package/dist/app/core/service/ChangesStreamService.js +3 -3
- package/dist/app/core/service/CreateHookTriggerService.d.ts +1 -1
- package/dist/app/core/service/CreateHookTriggerService.js +3 -3
- package/dist/app/core/service/EventCorkerAdvice.d.ts +1 -1
- package/dist/app/core/service/EventCorkerAdvice.js +1 -1
- package/dist/app/core/service/FixNoPaddingVersionService.js +2 -2
- package/dist/app/core/service/HookManageService.js +2 -2
- package/dist/app/core/service/HookTriggerService.js +4 -4
- package/dist/app/core/service/PackageManagerService.d.ts +1 -1
- package/dist/app/core/service/PackageManagerService.js +45 -27
- package/dist/app/core/service/PackageSearchService.js +2 -2
- package/dist/app/core/service/PackageSyncerService.d.ts +1 -2
- package/dist/app/core/service/PackageSyncerService.js +29 -30
- package/dist/app/core/service/PackageVersionFileService.js +6 -4
- package/dist/app/core/service/PackageVersionService.d.ts +1 -1
- package/dist/app/core/service/PackageVersionService.js +8 -7
- package/dist/app/core/service/ProxyCacheService.d.ts +3 -4
- package/dist/app/core/service/ProxyCacheService.js +16 -12
- package/dist/app/core/service/RegistryManagerService.js +2 -2
- package/dist/app/core/service/ScopeManagerService.js +2 -2
- package/dist/app/core/service/TaskService.d.ts +1 -1
- package/dist/app/core/service/TaskService.js +4 -4
- package/dist/app/core/service/TokenService.d.ts +1 -1
- package/dist/app/core/service/TokenService.js +2 -2
- package/dist/app/core/service/UserService.d.ts +12 -13
- package/dist/app/core/service/UserService.js +6 -6
- package/dist/app/core/util/EntityUtil.d.ts +1 -1
- package/dist/app/infra/AuthAdapter.d.ts +3 -3
- package/dist/app/infra/AuthAdapter.js +2 -2
- package/dist/app/infra/NFSClientAdapter.d.ts +1 -1
- package/dist/app/infra/NFSClientAdapter.js +2 -2
- package/dist/app/infra/SearchAdapter.js +2 -1
- package/dist/app/port/UserRoleManager.d.ts +1 -1
- package/dist/app/port/UserRoleManager.js +5 -4
- package/dist/app/port/config.d.ts +3 -3
- package/dist/app/port/controller/AbstractController.d.ts +6 -5
- package/dist/app/port/controller/AbstractController.js +15 -12
- package/dist/app/port/controller/AccessController.js +6 -6
- package/dist/app/port/controller/BinarySyncController.d.ts +7 -2
- package/dist/app/port/controller/BinarySyncController.js +32 -2
- package/dist/app/port/controller/ChangesStreamController.d.ts +1 -1
- package/dist/app/port/controller/ChangesStreamController.js +2 -2
- package/dist/app/port/controller/DownloadController.js +4 -4
- package/dist/app/port/controller/HomeController.d.ts +8 -8
- package/dist/app/port/controller/HomeController.js +4 -4
- package/dist/app/port/controller/HookController.d.ts +1 -1
- package/dist/app/port/controller/HookController.js +1 -1
- package/dist/app/port/controller/PackageBlockController.d.ts +2 -2
- package/dist/app/port/controller/PackageBlockController.js +2 -2
- package/dist/app/port/controller/PackageSyncController.d.ts +2 -2
- package/dist/app/port/controller/PackageSyncController.js +10 -12
- package/dist/app/port/controller/PackageTagController.d.ts +1 -1
- package/dist/app/port/controller/PackageTagController.js +2 -2
- package/dist/app/port/controller/PackageVersionFileController.d.ts +5 -5
- package/dist/app/port/controller/PackageVersionFileController.js +4 -4
- package/dist/app/port/controller/ProxyCacheController.d.ts +1 -1
- package/dist/app/port/controller/ProxyCacheController.js +3 -3
- package/dist/app/port/controller/RegistryController.d.ts +2 -3
- package/dist/app/port/controller/RegistryController.js +11 -13
- package/dist/app/port/controller/ScopeController.d.ts +1 -1
- package/dist/app/port/controller/ScopeController.js +1 -1
- package/dist/app/port/controller/TokenController.d.ts +4 -4
- package/dist/app/port/controller/TokenController.js +2 -2
- package/dist/app/port/controller/UserController.d.ts +2 -2
- package/dist/app/port/controller/UserController.js +7 -7
- package/dist/app/port/controller/admin/PaddingVersionController.d.ts +1 -1
- package/dist/app/port/controller/admin/PaddingVersionController.js +3 -3
- package/dist/app/port/controller/package/DownloadPackageVersionTar.d.ts +1 -1
- package/dist/app/port/controller/package/DownloadPackageVersionTar.js +2 -2
- package/dist/app/port/controller/package/RemovePackageVersionController.d.ts +1 -1
- package/dist/app/port/controller/package/RemovePackageVersionController.js +3 -3
- package/dist/app/port/controller/package/SavePackageVersionController.d.ts +2 -2
- package/dist/app/port/controller/package/SavePackageVersionController.js +7 -7
- package/dist/app/port/controller/package/SearchPackageController.d.ts +1 -1
- package/dist/app/port/controller/package/SearchPackageController.js +2 -2
- package/dist/app/port/controller/package/ShowPackageController.d.ts +1 -1
- package/dist/app/port/controller/package/ShowPackageController.js +5 -5
- package/dist/app/port/controller/package/ShowPackageVersionController.d.ts +1 -1
- package/dist/app/port/controller/package/ShowPackageVersionController.js +3 -3
- package/dist/app/port/controller/package/UpdatePackageController.d.ts +2 -2
- package/dist/app/port/controller/package/UpdatePackageController.js +3 -3
- package/dist/app/port/middleware/ErrorHandler.js +2 -2
- package/dist/app/port/schedule/ChangesStreamWorker.js +3 -3
- package/dist/app/port/schedule/CheckProxyCacheUpdateWorker.js +5 -4
- package/dist/app/port/schedule/CheckRecentlyUpdatedPackages.js +4 -4
- package/dist/app/port/schedule/CleanTempDir.js +2 -2
- package/dist/app/port/schedule/CreateSyncBinaryTask.js +3 -3
- package/dist/app/port/schedule/CreateTriggerHookWorker.js +2 -2
- package/dist/app/port/schedule/SavePackageVersionDownloadCounter.js +3 -3
- package/dist/app/port/schedule/SyncBinaryWorker.js +3 -3
- package/dist/app/port/schedule/SyncPackageWorker.js +2 -2
- package/dist/app/port/schedule/SyncProxyCacheWorker.js +2 -2
- package/dist/app/port/schedule/TaskTimeoutHandler.js +3 -3
- package/dist/app/port/schedule/TriggerHookWorker.js +2 -2
- package/dist/app/port/schedule/UpdateTotalData.js +3 -3
- package/dist/app/port/typebox.d.ts +1 -1
- package/dist/app/port/typebox.js +3 -3
- package/dist/app/port/webauth/WebauthController.d.ts +7 -7
- package/dist/app/port/webauth/WebauthController.js +10 -10
- package/dist/app/repository/BinaryRepository.d.ts +1 -0
- package/dist/app/repository/BinaryRepository.js +9 -2
- package/dist/app/repository/ChangeRepository.d.ts +1 -1
- package/dist/app/repository/ChangeRepository.js +2 -2
- package/dist/app/repository/DistRepository.js +3 -3
- package/dist/app/repository/HookRepository.d.ts +1 -1
- package/dist/app/repository/HookRepository.js +5 -5
- package/dist/app/repository/PackageRepository.d.ts +17 -18
- package/dist/app/repository/PackageRepository.js +2 -2
- package/dist/app/repository/PackageVersionBlockRepository.js +9 -4
- package/dist/app/repository/PackageVersionDownloadRepository.js +3 -5
- package/dist/app/repository/PackageVersionFileRepository.js +16 -6
- package/dist/app/repository/PackageVersionRepository.d.ts +1 -1
- package/dist/app/repository/PackageVersionRepository.js +3 -1
- package/dist/app/repository/ProxyCacheRepository.d.ts +1 -1
- package/dist/app/repository/ProxyCacheRepository.js +9 -6
- package/dist/app/repository/RegistryRepository.d.ts +3 -4
- package/dist/app/repository/RegistryRepository.js +3 -3
- package/dist/app/repository/ScopeRepository.d.ts +1 -1
- package/dist/app/repository/ScopeRepository.js +3 -3
- package/dist/app/repository/SearchRepository.d.ts +2 -2
- package/dist/app/repository/SearchRepository.js +5 -3
- package/dist/app/repository/TaskRepository.d.ts +5 -6
- package/dist/app/repository/TaskRepository.js +8 -5
- package/dist/app/repository/UserRepository.js +4 -4
- package/dist/app/repository/model/Binary.js +2 -2
- package/dist/app/repository/model/Change.js +5 -3
- package/dist/app/repository/model/Dist.js +2 -2
- package/dist/app/repository/model/HistoryTask.js +2 -2
- package/dist/app/repository/model/Hook.js +2 -2
- package/dist/app/repository/model/Maintainer.js +2 -2
- package/dist/app/repository/model/Package.js +3 -3
- package/dist/app/repository/model/PackageDep.js +2 -2
- package/dist/app/repository/model/PackageTag.js +2 -2
- package/dist/app/repository/model/PackageVersion.js +2 -2
- package/dist/app/repository/model/PackageVersionBlock.js +2 -2
- package/dist/app/repository/model/PackageVersionDownload.js +2 -2
- package/dist/app/repository/model/PackageVersionFile.js +2 -2
- package/dist/app/repository/model/PackageVersionManifest.js +5 -3
- package/dist/app/repository/model/ProxyCache.js +2 -2
- package/dist/app/repository/model/Registry.js +2 -2
- package/dist/app/repository/model/Scope.js +2 -2
- package/dist/app/repository/model/Task.js +5 -3
- package/dist/app/repository/model/Token.js +2 -2
- package/dist/app/repository/model/TokenPackage.js +2 -2
- package/dist/app/repository/model/User.js +2 -2
- package/dist/app/repository/model/WebauthnCredential.js +2 -2
- package/dist/app/repository/util/EntityProperty.js +3 -2
- package/dist/app/repository/util/ErrorUtil.d.ts +1 -1
- package/dist/app/repository/util/ErrorUtil.js +2 -1
- package/dist/app/repository/util/ModelConvertor.d.ts +3 -3
- package/dist/app/repository/util/ModelConvertor.js +1 -1
- package/dist/app/repository/util/ModelConvertorUtil.d.ts +1 -1
- package/dist/app/repository/util/ModelConvertorUtil.js +1 -1
- package/dist/app.js +2 -2
- package/dist/config/binaries.d.ts +21 -21
- package/dist/config/binaries.js +9 -13
- package/dist/config/config.default.d.ts +2 -3
- package/dist/config/config.default.js +7 -5
- package/package.json +5 -5
|
@@ -27,4 +27,4 @@ EventCorkAdvice = __decorate([
|
|
|
27
27
|
})
|
|
28
28
|
], EventCorkAdvice);
|
|
29
29
|
export { EventCorkAdvice };
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXZlbnRDb3JrZXJBZHZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL0V2ZW50Q29ya2VyQWR2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUNBLE9BQU8sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUF3QixNQUFNLGFBQWEsQ0FBQztBQUMzRSxPQUFPLEVBQUUsTUFBTSxFQUFnQixNQUFNLGlCQUFpQixDQUFDO0FBS2hELElBQU0sZUFBZSxHQUFyQixNQUFNLGVBQWU7SUFJMUIsS0FBSyxDQUFDLFVBQVU7UUFDZCxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxLQUFLLENBQUMsWUFBWTtRQUNoQixJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLENBQUM7Q0FDRixDQUFBO0FBVFM7SUFEUCxNQUFNLEVBQUU7O2lEQUN5QjtBQUZ2QixlQUFlO0lBSDNCLE1BQU0sQ0FBQztRQUNOLFFBQVEsRUFBRSxjQUFjLENBQUMsT0FBTztLQUNqQyxDQUFDO0dBQ1csZUFBZSxDQVczQiJ9
|
|
@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import {
|
|
10
|
+
import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
11
11
|
import pMap from 'p-map';
|
|
12
12
|
import { PaddingSemVer } from '../entity/PaddingSemVer.js';
|
|
13
13
|
let FixNoPaddingVersionService = class FixNoPaddingVersionService {
|
|
@@ -43,4 +43,4 @@ FixNoPaddingVersionService = __decorate([
|
|
|
43
43
|
})
|
|
44
44
|
], FixNoPaddingVersionService);
|
|
45
45
|
export { FixNoPaddingVersionService };
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRml4Tm9QYWRkaW5nVmVyc2lvblNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL0ZpeE5vUGFkZGluZ1ZlcnNpb25TZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsRSxPQUFPLElBQUksTUFBTSxPQUFPLENBQUM7QUFFekIsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBS3BELElBQU0sMEJBQTBCLEdBQWhDLE1BQU0sMEJBQTBCO0lBT3JDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxFQUFXO1FBQ2pDLGlEQUFpRDtRQUNqRCxPQUFPLElBQUksRUFBRSxDQUFDO1lBQ1osTUFBTSxlQUFlLEdBQ25CLE1BQU0sSUFBSSxDQUFDLHdCQUF3QixDQUFDLHlCQUF5QixDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ3BFLElBQUksZUFBZSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDakMsTUFBTTtZQUNSLENBQUM7WUFDRCxFQUFFO2dCQUNDLGVBQWUsQ0FBQyxlQUFlLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQXdCO29CQUNyRSxDQUFDLENBQUM7WUFDSixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZCx5REFBeUQsRUFDekQsZUFBZSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FDL0IsQ0FBQztZQUVGLE1BQU0sSUFBSSxDQUNSLGVBQWUsRUFDZixLQUFLLEVBQUMsY0FBYyxFQUFDLEVBQUU7Z0JBQ3JCLE1BQU0sYUFBYSxHQUFHLElBQUksYUFBYSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDaEUsTUFBTSxJQUFJLENBQUMsd0JBQXdCLENBQUMsaUJBQWlCLENBQ25ELGNBQWMsQ0FBQyxnQkFBZ0IsRUFDL0IsYUFBYSxDQUNkLENBQUM7WUFDSixDQUFDLEVBQ0QsRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLENBQ3BCLENBQUM7UUFDSixDQUFDO0lBQ0gsQ0FBQztDQUNGLENBQUE7QUFsQ2tCO0lBRGhCLE1BQU0sRUFBRTs7NEVBQzJEO0FBR25EO0lBRGhCLE1BQU0sRUFBRTs7MERBQzBCO0FBTHhCLDBCQUEwQjtJQUh0QyxjQUFjLENBQUM7UUFDZCxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLDBCQUEwQixDQW9DdEMifQ==
|
|
@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { AccessLevel,
|
|
10
|
+
import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
11
11
|
import { ForbiddenError, NotFoundError } from 'egg-errors';
|
|
12
12
|
import { Hook } from '../entity/Hook.js';
|
|
13
13
|
let HookManageService = class HookManageService {
|
|
@@ -76,4 +76,4 @@ HookManageService = __decorate([
|
|
|
76
76
|
})
|
|
77
77
|
], HookManageService);
|
|
78
78
|
export { HookManageService };
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSG9va01hbmFnZVNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL0hvb2tNYW5hZ2VTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLGFBQWEsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUczRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUEwQmxDLElBQU0saUJBQWlCLEdBQXZCLE1BQU0saUJBQWlCO0lBTzVCLElBQUksVUFBVTtRQUNaLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ3pDLENBQUM7SUFFRCxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQXNCO1FBQ3JDLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDeEUsOEJBQThCO1FBQzlCLElBQUksS0FBSyxDQUFDLE1BQU0sSUFBSSxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDcEMsTUFBTSxJQUFJLGNBQWMsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO1FBQ25ELENBQUM7UUFDRCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzlCLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDekMsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFzQjtRQUNyQyxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxN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
|
|
@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { AccessLevel,
|
|
10
|
+
import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
11
11
|
import { isoNow } from '../../common/LogUtil.js';
|
|
12
12
|
import { TaskState } from '../../common/enum/Task.js';
|
|
13
13
|
import { getScopeAndName } from '../../common/PackageUtil.js';
|
|
@@ -50,8 +50,8 @@ let HookTriggerService = class HookTriggerService {
|
|
|
50
50
|
},
|
|
51
51
|
// webhook 场景下,由于 endpoint 都不同
|
|
52
52
|
// 因此几乎不存在连接复用的情况,因此这里不使用 keepAlive
|
|
53
|
-
agent: false,
|
|
54
|
-
httpsAgent: false,
|
|
53
|
+
// agent: false,
|
|
54
|
+
// httpsAgent: false,
|
|
55
55
|
data: payloadStr,
|
|
56
56
|
});
|
|
57
57
|
if (res.status >= 200 && res.status < 300) {
|
|
@@ -116,4 +116,4 @@ HookTriggerService = __decorate([
|
|
|
116
116
|
})
|
|
117
117
|
], HookTriggerService);
|
|
118
118
|
export { HookTriggerService };
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSG9va1RyaWdnZXJTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvcmUvc2VydmljZS9Ib29rVHJpZ2dlclNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBU2xFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFdEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBTXZELElBQU0sa0JBQWtCLEdBQXhCLE1BQU0sa0JBQWtCO0lBbUI3QixLQUFLLENBQUMsV0FBVyxDQUFDLElBQXFCO1FBQ3JDLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUN4QyxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzVELElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNWLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxVQUFVLENBQy9CLElBQUksRUFDSixTQUFTLENBQUMsT0FBTyxFQUNqQixJQUFJLE1BQU0sRUFBRSx3QkFBd0IsTUFBTSxZQUFZLENBQ3ZELENBQUM7WUFDRixPQUFPO1FBQ1QsQ0FBQztRQUNELElBQUksQ0FBQztZQUNILE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDdkUsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUNiLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxVQUFVLENBQy9CLElBQUksRUFDSixTQUFTLENB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
|
|
@@ -84,7 +84,7 @@ export declare class PackageManagerService extends AbstractService {
|
|
|
84
84
|
savePackageVersionCounters(): Promise<void>;
|
|
85
85
|
saveDeprecatedVersions(pkg: Package, deprecatedList: {
|
|
86
86
|
version: string;
|
|
87
|
-
deprecated
|
|
87
|
+
deprecated?: string;
|
|
88
88
|
}[]): Promise<void>;
|
|
89
89
|
savePackageVersionManifest(pkgVersion: PackageVersion, mergeManifest: object, mergeAbbreviated: object): Promise<void>;
|
|
90
90
|
/**
|
|
@@ -8,9 +8,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
var PackageManagerService_1;
|
|
11
|
-
import {
|
|
12
|
-
import
|
|
13
|
-
import { AccessLevel, SingletonProto,
|
|
11
|
+
import { readFile, stat } from 'node:fs/promises';
|
|
12
|
+
import assert from 'node:assert/strict';
|
|
13
|
+
import { AccessLevel, Inject, SingletonProto, } from '@eggjs/tegg';
|
|
14
14
|
import { BadRequestError, ForbiddenError, NotFoundError } from 'egg-errors';
|
|
15
15
|
import npa from 'npm-package-arg';
|
|
16
16
|
import semver from 'semver';
|
|
@@ -22,7 +22,7 @@ import { Package } from '../entity/Package.js';
|
|
|
22
22
|
import { PackageVersion } from '../entity/PackageVersion.js';
|
|
23
23
|
import { PackageVersionBlock } from '../entity/PackageVersionBlock.js';
|
|
24
24
|
import { PackageTag } from '../entity/PackageTag.js';
|
|
25
|
-
import {
|
|
25
|
+
import { PACKAGE_BLOCKED, PACKAGE_MAINTAINER_CHANGED, PACKAGE_MAINTAINER_REMOVED, PACKAGE_META_CHANGED, PACKAGE_TAG_ADDED, PACKAGE_TAG_CHANGED, PACKAGE_TAG_REMOVED, PACKAGE_UNBLOCKED, PACKAGE_UNPUBLISHED, PACKAGE_VERSION_ADDED, PACKAGE_VERSION_REMOVED, } from '../event/index.js';
|
|
26
26
|
const TOTAL = '@@TOTAL@@';
|
|
27
27
|
const SCOPE_TOTAL_PREFIX = '@@SCOPE@@:';
|
|
28
28
|
const DESCRIPTION_LIMIT = 1024 * 10;
|
|
@@ -33,16 +33,7 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
33
33
|
await this._checkPackageDepsVersion(cmd.packageJson);
|
|
34
34
|
}
|
|
35
35
|
let pkg = await this.packageRepository.findPackage(cmd.scope, cmd.name);
|
|
36
|
-
if (
|
|
37
|
-
pkg = Package.create({
|
|
38
|
-
scope: cmd.scope,
|
|
39
|
-
name: cmd.name,
|
|
40
|
-
isPrivate: cmd.isPrivate,
|
|
41
|
-
description: cmd.description || '',
|
|
42
|
-
registryId: cmd.registryId,
|
|
43
|
-
});
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
36
|
+
if (pkg) {
|
|
46
37
|
// update description
|
|
47
38
|
// will read database twice to update description by model to entity and entity to model
|
|
48
39
|
if (pkg.description !== cmd.description) {
|
|
@@ -54,9 +45,18 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
54
45
|
pkg.registryId = cmd.registryId;
|
|
55
46
|
}
|
|
56
47
|
}
|
|
48
|
+
else {
|
|
49
|
+
pkg = Package.create({
|
|
50
|
+
scope: cmd.scope,
|
|
51
|
+
name: cmd.name,
|
|
52
|
+
isPrivate: cmd.isPrivate,
|
|
53
|
+
description: cmd.description || '',
|
|
54
|
+
registryId: cmd.registryId,
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
57
|
// 防止 description 长度超过 db 限制
|
|
58
58
|
if (pkg.description?.length > DESCRIPTION_LIMIT) {
|
|
59
|
-
pkg.description = pkg.description.
|
|
59
|
+
pkg.description = pkg.description.slice(0, DESCRIPTION_LIMIT);
|
|
60
60
|
}
|
|
61
61
|
await this.packageRepository.savePackage(pkg);
|
|
62
62
|
// create maintainer
|
|
@@ -78,7 +78,11 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
78
78
|
cmd.packageJson.publish_time = publishTime.getTime();
|
|
79
79
|
}
|
|
80
80
|
if (cmd.packageJson._hasShrinkwrap === undefined) {
|
|
81
|
-
|
|
81
|
+
const contentOrFile = cmd.dist.content || cmd.dist.localFile;
|
|
82
|
+
if (contentOrFile) {
|
|
83
|
+
cmd.packageJson._hasShrinkwrap =
|
|
84
|
+
await hasShrinkWrapInTgz(contentOrFile);
|
|
85
|
+
}
|
|
82
86
|
}
|
|
83
87
|
// set _npmUser field to cmd.packageJson
|
|
84
88
|
cmd.packageJson._npmUser = {
|
|
@@ -102,7 +106,8 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
102
106
|
tarDistIntegrity = await calculateIntegrity(tarDistBytes);
|
|
103
107
|
tarDistSize = tarDistBytes.length;
|
|
104
108
|
}
|
|
105
|
-
else
|
|
109
|
+
else {
|
|
110
|
+
// should has localFile
|
|
106
111
|
const localFile = cmd.dist.localFile;
|
|
107
112
|
const fileStat = await stat(localFile);
|
|
108
113
|
tarDistIntegrity = await calculateIntegrity(localFile);
|
|
@@ -431,7 +436,7 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
431
436
|
const fullManifests = await this.distRepository.readDistBytesToJSON(pkg.manifestsDist);
|
|
432
437
|
if (!fullManifests)
|
|
433
438
|
return;
|
|
434
|
-
fullManifests.readme = await readFile(readmeFile, '
|
|
439
|
+
fullManifests.readme = await readFile(readmeFile, 'utf8');
|
|
435
440
|
await this._updatePackageManifestsToDists(pkg, fullManifests, null);
|
|
436
441
|
this.logger.info('[PackageManagerService.savePackageReadme] save packageId:%s readme, size: %s', pkg.packageId, fullManifests.readme.length);
|
|
437
442
|
}
|
|
@@ -469,8 +474,12 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
469
474
|
// https://github.com/cnpm/cnpmjs.org/blob/ad622d55e384743b48e79bb6aec574a7f354ee9f/controllers/sync_module_worker.js#L828
|
|
470
475
|
'dist-tags': {},
|
|
471
476
|
};
|
|
472
|
-
await this._mergeManifestDist(
|
|
473
|
-
|
|
477
|
+
await this._mergeManifestDist(
|
|
478
|
+
// oxlint-disable-next-line typescript-eslint/no-non-null-assertion
|
|
479
|
+
pkg.manifestsDist, undefined, unpublishedInfo);
|
|
480
|
+
await this._mergeManifestDist(
|
|
481
|
+
// oxlint-disable-next-line typescript-eslint/no-non-null-assertion
|
|
482
|
+
pkg.abbreviatedsDist, undefined, unpublishedInfo);
|
|
474
483
|
this.eventBus.emit(PACKAGE_UNPUBLISHED, pkg.fullname);
|
|
475
484
|
}
|
|
476
485
|
async removePackageVersion(pkg, pkgVersion, skipRefreshPackageManifests = false) {
|
|
@@ -575,8 +584,11 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
575
584
|
}
|
|
576
585
|
if (removeVersions) {
|
|
577
586
|
for (const version of removeVersions) {
|
|
587
|
+
// eslint-disable-next-line typescript-eslint/no-dynamic-delete
|
|
578
588
|
delete fullManifests.versions[version];
|
|
589
|
+
// eslint-disable-next-line typescript-eslint/no-dynamic-delete
|
|
579
590
|
delete fullManifests.time[version];
|
|
591
|
+
// eslint-disable-next-line typescript-eslint/no-dynamic-delete
|
|
580
592
|
delete abbreviatedManifests.versions[version];
|
|
581
593
|
}
|
|
582
594
|
}
|
|
@@ -614,7 +626,9 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
614
626
|
// only refresh root attributes only, e.g.: dist-tags, maintainers
|
|
615
627
|
async _refreshPackageManifestRootAttributeOnlyToDists(pkg, refreshAttr) {
|
|
616
628
|
if (refreshAttr === 'maintainers') {
|
|
617
|
-
const fullManifests = await this.distRepository.readDistBytesToJSON(
|
|
629
|
+
const fullManifests = await this.distRepository.readDistBytesToJSON(
|
|
630
|
+
// oxlint-disable-next-line typescript-eslint/no-non-null-assertion
|
|
631
|
+
pkg.manifestsDist);
|
|
618
632
|
const maintainers = await this._listPackageMaintainers(pkg);
|
|
619
633
|
if (fullManifests) {
|
|
620
634
|
fullManifests.maintainers = maintainers;
|
|
@@ -622,9 +636,13 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
622
636
|
}
|
|
623
637
|
}
|
|
624
638
|
else if (refreshAttr === 'dist-tags') {
|
|
625
|
-
const fullManifests = await this.distRepository.readDistBytesToJSON(
|
|
639
|
+
const fullManifests = await this.distRepository.readDistBytesToJSON(
|
|
640
|
+
// oxlint-disable-next-line typescript-eslint/no-non-null-assertion
|
|
641
|
+
pkg.manifestsDist);
|
|
626
642
|
if (fullManifests) {
|
|
627
|
-
const abbreviatedManifests = await this.distRepository.readDistBytesToJSON(
|
|
643
|
+
const abbreviatedManifests = await this.distRepository.readDistBytesToJSON(
|
|
644
|
+
// oxlint-disable-next-line typescript-eslint/no-non-null-assertion
|
|
645
|
+
pkg.abbreviatedsDist);
|
|
628
646
|
if (abbreviatedManifests) {
|
|
629
647
|
await this._setPackageDistTagsAndLatestInfos(pkg, fullManifests, abbreviatedManifests);
|
|
630
648
|
}
|
|
@@ -650,8 +668,7 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
650
668
|
// the latest version metas
|
|
651
669
|
for (const field of fieldsFromLatestManifest) {
|
|
652
670
|
if (latestManifest[field]) {
|
|
653
|
-
fullManifests[field]
|
|
654
|
-
latestManifest[field];
|
|
671
|
+
Reflect.set(fullManifests, field, latestManifest[field]);
|
|
655
672
|
}
|
|
656
673
|
}
|
|
657
674
|
}
|
|
@@ -782,6 +799,7 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
782
799
|
}
|
|
783
800
|
else {
|
|
784
801
|
dist = isFullManifests ? pkg.manifestsDist : pkg.abbreviatedsDist;
|
|
802
|
+
// oxlint-disable-next-line typescript-eslint/no-non-null-assertion
|
|
785
803
|
etag = `"${dist.shasum}"`;
|
|
786
804
|
}
|
|
787
805
|
return { etag, data: manifests, blockReason };
|
|
@@ -868,7 +886,7 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
868
886
|
return data;
|
|
869
887
|
}
|
|
870
888
|
async _listPackageAbbreviatedManifests(pkg) {
|
|
871
|
-
// read all
|
|
889
|
+
// read all versions from db
|
|
872
890
|
const packageVersions = await this.packageRepository.listPackageVersions(pkg.packageId);
|
|
873
891
|
if (packageVersions.length === 0)
|
|
874
892
|
return null;
|
|
@@ -950,4 +968,4 @@ PackageManagerService = PackageManagerService_1 = __decorate([
|
|
|
950
968
|
})
|
|
951
969
|
], PackageManagerService);
|
|
952
970
|
export { PackageManagerService };
|
|
953
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageManagerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageManagerService.ts"],"names":[],"mappings":"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"}
|
|
971
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageManagerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageManagerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,7 +107,7 @@ let PackageSearchService = class PackageSearchService extends AbstractService {
|
|
|
107
107
|
query: {
|
|
108
108
|
bool: {
|
|
109
109
|
should: matchQueries,
|
|
110
|
-
minimum_should_match: matchQueries.length ? 1 : 0,
|
|
110
|
+
minimum_should_match: matchQueries.length > 0 ? 1 : 0,
|
|
111
111
|
},
|
|
112
112
|
},
|
|
113
113
|
script_score: scriptScore,
|
|
@@ -255,4 +255,4 @@ PackageSearchService = __decorate([
|
|
|
255
255
|
})
|
|
256
256
|
], PackageSearchService);
|
|
257
257
|
export { PackageSearchService };
|
|
258
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
258
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSearchService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSearchService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { BadRequestError } from 'egg-errors';
|
|
2
2
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
3
|
-
import type
|
|
4
|
-
import { Task } from '../entity/Task.js';
|
|
3
|
+
import { type CreateSyncPackageTask, type SyncPackageTaskOptions, Task } from '../entity/Task.js';
|
|
5
4
|
import type { Package } from '../entity/Package.js';
|
|
6
5
|
import type { Registry } from '../entity/Registry.js';
|
|
7
6
|
export declare class RegistryNotMatchError extends BadRequestError {
|