cnpmcore 4.0.2 → 4.1.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 +5 -3
- package/dist/app/common/AbstractService.js +5 -9
- package/dist/app/common/CryptoUtil.js +9 -17
- package/dist/app/common/ErrorUtil.js +2 -5
- package/dist/app/common/FileUtil.js +22 -31
- package/dist/app/common/LogUtil.js +2 -5
- package/dist/app/common/PackageUtil.d.ts +1 -1
- package/dist/app/common/PackageUtil.js +27 -75
- package/dist/app/common/SyncUtil.js +2 -5
- package/dist/app/common/UserUtil.js +19 -64
- package/dist/app/common/adapter/BugVersionStore.d.ts +1 -1
- package/dist/app/common/adapter/BugVersionStore.js +6 -9
- package/dist/app/common/adapter/CacheAdapter.js +7 -10
- package/dist/app/common/adapter/NFSAdapter.js +18 -21
- package/dist/app/common/adapter/NPMRegistry.d.ts +1 -1
- package/dist/app/common/adapter/NPMRegistry.js +13 -16
- package/dist/app/common/adapter/binary/AbstractBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/AbstractBinary.js +7 -11
- package/dist/app/common/adapter/binary/ApiBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/ApiBinary.js +10 -13
- package/dist/app/common/adapter/binary/BucketBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/BucketBinary.js +14 -20
- package/dist/app/common/adapter/binary/ChromeForTestingBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/ChromeForTestingBinary.js +11 -14
- package/dist/app/common/adapter/binary/CypressBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/CypressBinary.js +9 -12
- package/dist/app/common/adapter/binary/EdgedriverBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/EdgedriverBinary.js +12 -18
- package/dist/app/common/adapter/binary/ElectronBinary.d.ts +3 -3
- package/dist/app/common/adapter/binary/ElectronBinary.js +13 -19
- package/dist/app/common/adapter/binary/GithubBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/GithubBinary.js +11 -17
- package/dist/app/common/adapter/binary/ImageminBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/ImageminBinary.js +11 -17
- package/dist/app/common/adapter/binary/NodeBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/NodeBinary.js +14 -20
- package/dist/app/common/adapter/binary/NodePreGypBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/NodePreGypBinary.js +14 -20
- package/dist/app/common/adapter/binary/NwjsBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/NwjsBinary.js +12 -18
- package/dist/app/common/adapter/binary/PlaywrightBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/PlaywrightBinary.js +13 -19
- package/dist/app/common/adapter/binary/PrismaBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/PrismaBinary.js +14 -20
- package/dist/app/common/adapter/binary/PuppeteerBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/PuppeteerBinary.js +10 -13
- package/dist/app/common/adapter/binary/SqlcipherBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/SqlcipherBinary.js +9 -12
- package/dist/app/common/adapter/changesStream/AbstractChangesStream.d.ts +2 -2
- package/dist/app/common/adapter/changesStream/AbstractChangesStream.js +7 -11
- package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.d.ts +2 -2
- package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.js +11 -14
- package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.d.ts +2 -2
- package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.js +11 -14
- package/dist/app/common/adapter/changesStream/NpmChangesStream.d.ts +2 -2
- package/dist/app/common/adapter/changesStream/NpmChangesStream.js +11 -14
- package/dist/app/common/aop/AsyncTimer.js +10 -13
- package/dist/app/common/constants.js +17 -20
- package/dist/app/common/dayjs.js +5 -10
- package/dist/app/common/enum/Binary.js +3 -6
- package/dist/app/common/enum/Hook.js +5 -8
- package/dist/app/common/enum/Registry.js +3 -6
- package/dist/app/common/enum/Task.js +5 -8
- package/dist/app/common/enum/User.js +5 -8
- package/dist/app/common/package.json +2 -1
- package/dist/app/common/typing.d.ts +1 -1
- package/dist/app/common/typing.js +1 -2
- package/dist/app/core/entity/Binary.d.ts +2 -2
- package/dist/app/core/entity/Binary.js +5 -9
- package/dist/app/core/entity/BugVersion.js +2 -6
- package/dist/app/core/entity/Change.d.ts +2 -2
- package/dist/app/core/entity/Change.js +5 -9
- package/dist/app/core/entity/Dist.d.ts +2 -2
- package/dist/app/core/entity/Dist.js +5 -9
- package/dist/app/core/entity/Entity.js +2 -6
- package/dist/app/core/entity/Hook.d.ts +3 -3
- package/dist/app/core/entity/Hook.js +7 -14
- package/dist/app/core/entity/HookEvent.d.ts +1 -1
- package/dist/app/core/entity/HookEvent.js +11 -15
- package/dist/app/core/entity/Package.d.ts +4 -3
- package/dist/app/core/entity/Package.js +14 -15
- package/dist/app/core/entity/PackageTag.d.ts +2 -2
- package/dist/app/core/entity/PackageTag.js +5 -9
- package/dist/app/core/entity/PackageVersion.d.ts +3 -3
- package/dist/app/core/entity/PackageVersion.js +7 -11
- package/dist/app/core/entity/PackageVersionBlock.d.ts +2 -2
- package/dist/app/core/entity/PackageVersionBlock.js +5 -9
- package/dist/app/core/entity/PackageVersionFile.d.ts +3 -3
- package/dist/app/core/entity/PackageVersionFile.js +5 -9
- package/dist/app/core/entity/PackageVersionManifest.d.ts +2 -2
- package/dist/app/core/entity/PackageVersionManifest.js +5 -9
- package/dist/app/core/entity/PaddingSemVer.js +5 -9
- package/dist/app/core/entity/ProxyCache.d.ts +3 -3
- package/dist/app/core/entity/ProxyCache.js +8 -12
- package/dist/app/core/entity/Registry.d.ts +3 -3
- package/dist/app/core/entity/Registry.js +5 -9
- package/dist/app/core/entity/Scope.d.ts +2 -2
- package/dist/app/core/entity/Scope.js +5 -9
- package/dist/app/core/entity/SqlRange.js +8 -12
- package/dist/app/core/entity/Task.d.ts +4 -4
- package/dist/app/core/entity/Task.js +46 -53
- package/dist/app/core/entity/Token.d.ts +2 -2
- package/dist/app/core/entity/Token.js +10 -18
- package/dist/app/core/entity/User.d.ts +2 -2
- package/dist/app/core/entity/User.js +7 -11
- package/dist/app/core/entity/WebauthnCredential.d.ts +2 -2
- package/dist/app/core/entity/WebauthnCredential.js +5 -9
- package/dist/app/core/event/BugVersionFixHandler.js +12 -15
- package/dist/app/core/event/CacheCleaner.js +39 -42
- package/dist/app/core/event/ChangesStream.d.ts +4 -4
- package/dist/app/core/event/ChangesStream.js +59 -62
- package/dist/app/core/event/StoreManifest.js +17 -20
- package/dist/app/core/event/SyncESPackage.d.ts +1 -1
- package/dist/app/core/event/SyncESPackage.js +22 -25
- package/dist/app/core/event/SyncPackageVersionFile.js +25 -28
- package/dist/app/core/event/index.d.ts +1 -1
- package/dist/app/core/event/index.js +13 -16
- package/dist/app/core/package.json +2 -1
- package/dist/app/core/service/BinarySyncerService.d.ts +7 -7
- package/dist/app/core/service/BinarySyncerService.js +44 -50
- package/dist/app/core/service/BugVersionService.d.ts +1 -1
- package/dist/app/core/service/BugVersionService.js +28 -34
- package/dist/app/core/service/CacheService.d.ts +2 -2
- package/dist/app/core/service/CacheService.js +15 -18
- package/dist/app/core/service/ChangesStreamService.d.ts +3 -3
- package/dist/app/core/service/ChangesStreamService.js +52 -58
- package/dist/app/core/service/CreateHookTriggerService.d.ts +2 -2
- package/dist/app/core/service/CreateHookTriggerService.js +39 -45
- package/dist/app/core/service/EventCorkerAdvice.js +7 -10
- package/dist/app/core/service/FixNoPaddingVersionService.js +14 -20
- package/dist/app/core/service/HomeService.d.ts +1 -1
- package/dist/app/core/service/HomeService.js +13 -16
- package/dist/app/core/service/HookManageService.d.ts +2 -2
- package/dist/app/core/service/HookManageService.js +20 -23
- package/dist/app/core/service/HookTriggerService.d.ts +3 -3
- package/dist/app/core/service/HookTriggerService.js +32 -35
- package/dist/app/core/service/PackageManagerService.d.ts +7 -7
- package/dist/app/core/service/PackageManagerService.js +98 -104
- package/dist/app/core/service/PackageSearchService.d.ts +4 -4
- package/dist/app/core/service/PackageSearchService.js +31 -37
- package/dist/app/core/service/PackageSyncerService.d.ts +6 -6
- package/dist/app/core/service/PackageSyncerService.js +92 -99
- package/dist/app/core/service/PackageVersionFileService.d.ts +4 -4
- package/dist/app/core/service/PackageVersionFileService.js +64 -69
- package/dist/app/core/service/PackageVersionService.d.ts +4 -1
- package/dist/app/core/service/PackageVersionService.js +41 -59
- package/dist/app/core/service/ProxyCacheService.d.ts +5 -6
- package/dist/app/core/service/ProxyCacheService.js +62 -69
- package/dist/app/core/service/RegistryManagerService.d.ts +3 -3
- package/dist/app/core/service/RegistryManagerService.js +33 -36
- package/dist/app/core/service/ScopeManagerService.d.ts +3 -3
- package/dist/app/core/service/ScopeManagerService.js +13 -16
- package/dist/app/core/service/TaskService.d.ts +7 -7
- package/dist/app/core/service/TaskService.js +28 -29
- package/dist/app/core/service/TokenService.d.ts +4 -4
- package/dist/app/core/service/TokenService.js +30 -36
- package/dist/app/core/service/UserService.d.ts +6 -6
- package/dist/app/core/service/UserService.js +43 -49
- package/dist/app/core/util/EntityUtil.d.ts +1 -1
- package/dist/app/core/util/EntityUtil.js +7 -13
- package/dist/app/infra/AuthAdapter.d.ts +1 -1
- package/dist/app/infra/AuthAdapter.js +12 -15
- package/dist/app/infra/NFSClientAdapter.d.ts +1 -1
- package/dist/app/infra/NFSClientAdapter.js +11 -17
- package/dist/app/infra/QueueAdapter.d.ts +1 -1
- package/dist/app/infra/QueueAdapter.js +9 -12
- package/dist/app/infra/SearchAdapter.d.ts +1 -1
- package/dist/app/infra/SearchAdapter.js +10 -13
- package/dist/app/infra/package.json +2 -1
- package/dist/app/port/UserRoleManager.d.ts +3 -3
- package/dist/app/port/UserRoleManager.js +30 -33
- package/dist/app/port/config.d.ts +3 -3
- package/dist/app/port/config.js +2 -6
- package/dist/app/port/controller/AbstractController.d.ts +8 -8
- package/dist/app/port/controller/AbstractController.js +33 -37
- package/dist/app/port/controller/AccessController.d.ts +1 -1
- package/dist/app/port/controller/AccessController.js +22 -25
- package/dist/app/port/controller/BinarySyncController.d.ts +2 -2
- package/dist/app/port/controller/BinarySyncController.js +42 -48
- package/dist/app/port/controller/ChangesStreamController.d.ts +1 -1
- package/dist/app/port/controller/ChangesStreamController.js +17 -20
- package/dist/app/port/controller/DownloadController.d.ts +1 -1
- package/dist/app/port/controller/DownloadController.js +30 -36
- package/dist/app/port/controller/HomeController.d.ts +2 -2
- package/dist/app/port/controller/HomeController.js +29 -31
- package/dist/app/port/controller/HookController.d.ts +5 -5
- package/dist/app/port/controller/HookController.js +43 -46
- package/dist/app/port/controller/PackageBlockController.d.ts +2 -2
- package/dist/app/port/controller/PackageBlockController.js +37 -40
- package/dist/app/port/controller/PackageSyncController.d.ts +5 -5
- package/dist/app/port/controller/PackageSyncController.js +64 -67
- package/dist/app/port/controller/PackageTagController.d.ts +1 -1
- package/dist/app/port/controller/PackageTagController.js +33 -36
- package/dist/app/port/controller/PackageVersionFileController.d.ts +1 -1
- package/dist/app/port/controller/PackageVersionFileController.js +56 -59
- package/dist/app/port/controller/ProxyCacheController.d.ts +7 -7
- package/dist/app/port/controller/ProxyCacheController.js +56 -58
- package/dist/app/port/controller/RegistryController.d.ts +7 -7
- package/dist/app/port/controller/RegistryController.js +57 -60
- package/dist/app/port/controller/ScopeController.d.ts +3 -3
- package/dist/app/port/controller/ScopeController.js +28 -31
- package/dist/app/port/controller/TokenController.d.ts +17 -17
- package/dist/app/port/controller/TokenController.js +52 -55
- package/dist/app/port/controller/UserController.d.ts +8 -8
- package/dist/app/port/controller/UserController.js +52 -55
- package/dist/app/port/controller/admin/PaddingVersionController.d.ts +1 -1
- package/dist/app/port/controller/admin/PaddingVersionController.js +14 -17
- package/dist/app/port/controller/convertor/HookConvertor.d.ts +4 -4
- package/dist/app/port/controller/convertor/HookConvertor.js +2 -6
- package/dist/app/port/controller/package/DownloadPackageVersionTar.d.ts +6 -6
- package/dist/app/port/controller/package/DownloadPackageVersionTar.js +69 -60
- package/dist/app/port/controller/package/RemovePackageVersionController.d.ts +1 -1
- package/dist/app/port/controller/package/RemovePackageVersionController.js +26 -29
- package/dist/app/port/controller/package/SavePackageVersionController.d.ts +9 -9
- package/dist/app/port/controller/package/SavePackageVersionController.js +57 -96
- package/dist/app/port/controller/package/SearchPackageController.d.ts +4 -4
- package/dist/app/port/controller/package/SearchPackageController.js +31 -34
- package/dist/app/port/controller/package/ShowPackageController.d.ts +1 -1
- package/dist/app/port/controller/package/ShowPackageController.js +32 -35
- package/dist/app/port/controller/package/ShowPackageVersionController.d.ts +2 -2
- package/dist/app/port/controller/package/ShowPackageVersionController.js +33 -36
- package/dist/app/port/controller/package/UpdatePackageController.d.ts +6 -6
- package/dist/app/port/controller/package/UpdatePackageController.js +25 -28
- package/dist/app/port/middleware/AdminAccess.js +6 -9
- package/dist/app/port/middleware/AlwaysAuth.js +4 -7
- package/dist/app/port/middleware/ErrorHandler.js +4 -7
- package/dist/app/port/middleware/Tracing.js +2 -5
- package/dist/app/port/middleware/index.js +10 -13
- package/dist/app/port/package.json +2 -1
- package/dist/app/port/schedule/ChangesStreamWorker.js +12 -15
- package/dist/app/port/schedule/CheckProxyCacheUpdateWorker.js +19 -21
- package/dist/app/port/schedule/CheckRecentlyUpdatedPackages.js +20 -23
- package/dist/app/port/schedule/CleanTempDir.js +23 -30
- package/dist/app/port/schedule/CreateSyncBinaryTask.js +13 -19
- package/dist/app/port/schedule/CreateTriggerHookWorker.js +18 -21
- package/dist/app/port/schedule/SavePackageVersionDownloadCounter.js +10 -13
- package/dist/app/port/schedule/SyncBinaryWorker.js +14 -17
- package/dist/app/port/schedule/SyncPackageWorker.js +14 -17
- package/dist/app/port/schedule/SyncProxyCacheWorker.js +14 -17
- package/dist/app/port/schedule/TaskTimeoutHandler.js +14 -17
- package/dist/app/port/schedule/TriggerHookWorker.js +18 -21
- package/dist/app/port/schedule/UpdateTotalData.js +32 -38
- package/dist/app/port/typebox.d.ts +73 -73
- package/dist/app/port/typebox.js +83 -90
- package/dist/app/port/webauth/WebauthController.d.ts +6 -6
- package/dist/app/port/webauth/WebauthController.js +91 -91
- package/dist/app/repository/AbstractRepository.js +4 -8
- package/dist/app/repository/BinaryRepository.d.ts +2 -2
- package/dist/app/repository/BinaryRepository.js +15 -18
- package/dist/app/repository/ChangeRepository.d.ts +3 -3
- package/dist/app/repository/ChangeRepository.js +11 -14
- package/dist/app/repository/DistRepository.d.ts +2 -2
- package/dist/app/repository/DistRepository.js +12 -15
- package/dist/app/repository/HookRepository.d.ts +2 -2
- package/dist/app/repository/HookRepository.js +14 -17
- package/dist/app/repository/PackageRepository.d.ts +8 -8
- package/dist/app/repository/PackageRepository.js +59 -62
- package/dist/app/repository/PackageVersionBlockRepository.d.ts +3 -3
- package/dist/app/repository/PackageVersionBlockRepository.js +14 -17
- package/dist/app/repository/PackageVersionDownloadRepository.d.ts +2 -2
- package/dist/app/repository/PackageVersionDownloadRepository.js +9 -12
- package/dist/app/repository/PackageVersionFileRepository.d.ts +2 -2
- package/dist/app/repository/PackageVersionFileRepository.js +19 -22
- package/dist/app/repository/PackageVersionRepository.d.ts +3 -3
- package/dist/app/repository/PackageVersionRepository.js +12 -15
- package/dist/app/repository/ProxyCacheRepository.d.ts +5 -5
- package/dist/app/repository/ProxyCacheRepository.js +16 -19
- package/dist/app/repository/RegistryRepository.d.ts +4 -4
- package/dist/app/repository/RegistryRepository.js +19 -22
- package/dist/app/repository/ScopeRepository.d.ts +4 -4
- package/dist/app/repository/ScopeRepository.js +19 -22
- package/dist/app/repository/SearchRepository.d.ts +1 -1
- package/dist/app/repository/SearchRepository.js +7 -10
- package/dist/app/repository/TaskRepository.d.ts +8 -8
- package/dist/app/repository/TaskRepository.js +31 -34
- package/dist/app/repository/UserRepository.d.ts +4 -4
- package/dist/app/repository/UserRepository.js +38 -41
- package/dist/app/repository/model/Binary.d.ts +1 -1
- package/dist/app/repository/model/Binary.js +17 -20
- package/dist/app/repository/model/Change.d.ts +1 -1
- package/dist/app/repository/model/Change.js +14 -17
- package/dist/app/repository/model/Dist.d.ts +1 -1
- package/dist/app/repository/model/Dist.js +16 -19
- package/dist/app/repository/model/HistoryTask.d.ts +2 -2
- package/dist/app/repository/model/HistoryTask.js +22 -25
- package/dist/app/repository/model/Hook.d.ts +2 -2
- package/dist/app/repository/model/Hook.js +19 -22
- package/dist/app/repository/model/Maintainer.d.ts +1 -1
- package/dist/app/repository/model/Maintainer.js +12 -15
- package/dist/app/repository/model/Package.d.ts +1 -1
- package/dist/app/repository/model/Package.js +21 -24
- package/dist/app/repository/model/PackageDep.d.ts +1 -1
- package/dist/app/repository/model/PackageDep.js +15 -18
- package/dist/app/repository/model/PackageTag.d.ts +1 -1
- package/dist/app/repository/model/PackageTag.js +14 -17
- package/dist/app/repository/model/PackageVersion.d.ts +1 -1
- package/dist/app/repository/model/PackageVersion.js +27 -30
- package/dist/app/repository/model/PackageVersionBlock.d.ts +1 -1
- package/dist/app/repository/model/PackageVersionBlock.js +14 -17
- package/dist/app/repository/model/PackageVersionDownload.d.ts +1 -1
- package/dist/app/repository/model/PackageVersionDownload.js +44 -47
- package/dist/app/repository/model/PackageVersionFile.d.ts +1 -1
- package/dist/app/repository/model/PackageVersionFile.js +19 -22
- package/dist/app/repository/model/PackageVersionManifest.d.ts +1 -1
- package/dist/app/repository/model/PackageVersionManifest.js +14 -17
- package/dist/app/repository/model/ProxyCache.d.ts +2 -2
- package/dist/app/repository/model/ProxyCache.js +15 -18
- package/dist/app/repository/model/Registry.d.ts +2 -2
- package/dist/app/repository/model/Registry.js +18 -21
- package/dist/app/repository/model/Scope.d.ts +1 -1
- package/dist/app/repository/model/Scope.js +13 -16
- package/dist/app/repository/model/Task.d.ts +2 -2
- package/dist/app/repository/model/Task.js +23 -26
- package/dist/app/repository/model/Token.d.ts +1 -1
- package/dist/app/repository/model/Token.js +23 -26
- package/dist/app/repository/model/TokenPackage.d.ts +1 -1
- package/dist/app/repository/model/TokenPackage.js +12 -15
- package/dist/app/repository/model/User.d.ts +1 -1
- package/dist/app/repository/model/User.js +18 -21
- package/dist/app/repository/model/WebauthnCredential.d.ts +1 -1
- package/dist/app/repository/model/WebauthnCredential.js +15 -18
- package/dist/app/repository/package.json +1 -3
- package/dist/app/repository/util/EntityProperty.js +6 -9
- package/dist/app/repository/util/ErrorUtil.js +2 -5
- package/dist/app/repository/util/ModelConvertor.d.ts +5 -5
- package/dist/app/repository/util/ModelConvertor.js +17 -24
- package/dist/app/repository/util/ModelConvertorUtil.js +5 -9
- package/dist/app/repository/util/leoric.d.ts +4 -0
- package/dist/app/repository/util/leoric.js +4 -0
- package/dist/app.d.ts +3 -3
- package/dist/app.js +9 -15
- package/dist/config/binaries.d.ts +8 -1
- package/dist/config/binaries.js +99 -94
- package/dist/config/config.default.d.ts +1 -1
- package/dist/config/config.default.js +69 -74
- package/dist/config/config.unittest.d.ts +1 -2
- package/dist/config/config.unittest.js +11 -16
- package/dist/config/database.js +20 -23
- package/dist/config/plugin.js +3 -5
- package/package.json +17 -16
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
2
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
3
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -8,41 +7,35 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
9
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const PackageUtil_1 = require("../../common/PackageUtil");
|
|
29
|
-
const constants_1 = require("../../common/constants");
|
|
30
|
-
const Package_1 = require("../entity/Package");
|
|
10
|
+
import { ForbiddenError } from 'egg-errors';
|
|
11
|
+
import { SingletonProto, AccessLevel, Inject } from '@eggjs/tegg';
|
|
12
|
+
import { BackgroundTaskHelper } from '@eggjs/tegg-background-task';
|
|
13
|
+
import { valid as semverValid } from 'semver';
|
|
14
|
+
import { AbstractService } from '../../common/AbstractService.js';
|
|
15
|
+
import { TaskService } from './TaskService.js';
|
|
16
|
+
import { CacheService } from './CacheService.js';
|
|
17
|
+
import { RegistryManagerService } from './RegistryManagerService.js';
|
|
18
|
+
import { NPMRegistry } from '../../common/adapter/NPMRegistry.js';
|
|
19
|
+
import { NFSAdapter } from '../../common/adapter/NFSAdapter.js';
|
|
20
|
+
import { ProxyCache } from '../entity/ProxyCache.js';
|
|
21
|
+
import { Task } from '../entity/Task.js';
|
|
22
|
+
import { ProxyCacheRepository } from '../../repository/ProxyCacheRepository.js';
|
|
23
|
+
import { TaskType, TaskState } from '../../common/enum/Task.js';
|
|
24
|
+
import { calculateIntegrity } from '../../common/PackageUtil.js';
|
|
25
|
+
import { ABBREVIATED_META_TYPE, PROXY_CACHE_DIR_NAME } from '../../common/constants.js';
|
|
26
|
+
import { DIST_NAMES, isPkgManifest } from '../entity/Package.js';
|
|
31
27
|
function isoNow() {
|
|
32
28
|
return new Date().toISOString();
|
|
33
29
|
}
|
|
34
|
-
|
|
35
|
-
return fileType === Package_1.DIST_NAMES.FULL_MANIFESTS || fileType === Package_1.DIST_NAMES.ABBREVIATED_MANIFESTS;
|
|
36
|
-
}
|
|
37
|
-
let ProxyCacheService = class ProxyCacheService extends AbstractService_1.AbstractService {
|
|
30
|
+
let ProxyCacheService = class ProxyCacheService extends AbstractService {
|
|
38
31
|
async getPackageVersionTarResponse(fullname, ctx) {
|
|
39
32
|
if (this.config.cnpmcore.syncPackageBlockList.includes(fullname)) {
|
|
40
|
-
throw new
|
|
33
|
+
throw new ForbiddenError(`stop proxy by block list: ${JSON.stringify(this.config.cnpmcore.syncPackageBlockList)}`);
|
|
41
34
|
}
|
|
42
35
|
return await this.getProxyResponse(ctx);
|
|
43
36
|
}
|
|
44
37
|
async getPackageManifest(fullname, fileType) {
|
|
45
|
-
const isFullManifests = fileType ===
|
|
38
|
+
const isFullManifests = fileType === DIST_NAMES.FULL_MANIFESTS;
|
|
46
39
|
const cachedStoreKey = (await this.proxyCacheRepository.findProxyCache(fullname, fileType))?.filePath;
|
|
47
40
|
if (cachedStoreKey) {
|
|
48
41
|
try {
|
|
@@ -50,7 +43,7 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
50
43
|
if (!nfsBytes)
|
|
51
44
|
throw new Error('not found proxy cache, try again later.');
|
|
52
45
|
const nfsBuffer = Buffer.from(nfsBytes);
|
|
53
|
-
const { shasum: etag } = await
|
|
46
|
+
const { shasum: etag } = await calculateIntegrity(nfsBytes);
|
|
54
47
|
await this.cacheService.savePackageEtagAndManifests(fullname, isFullManifests, etag, nfsBuffer);
|
|
55
48
|
const nfsString = nfsBuffer.toString();
|
|
56
49
|
const nfsPkgManifest = JSON.parse(nfsString);
|
|
@@ -68,7 +61,7 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
68
61
|
const manifest = await this.getRewrittenManifest(fullname, fileType);
|
|
69
62
|
this.backgroundTaskHelper.run(async () => {
|
|
70
63
|
await this.storeRewrittenManifest(manifest, fullname, fileType);
|
|
71
|
-
const cachedFiles =
|
|
64
|
+
const cachedFiles = ProxyCache.create({ fullname, fileType });
|
|
72
65
|
await this.proxyCacheRepository.saveProxyCache(cachedFiles);
|
|
73
66
|
});
|
|
74
67
|
return manifest;
|
|
@@ -76,11 +69,11 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
76
69
|
// used by GET /:fullname/:versionOrTag
|
|
77
70
|
async getPackageVersionManifest(fullname, fileType, versionOrTag) {
|
|
78
71
|
let version;
|
|
79
|
-
if ((
|
|
72
|
+
if (semverValid(versionOrTag)) {
|
|
80
73
|
version = versionOrTag;
|
|
81
74
|
}
|
|
82
75
|
else {
|
|
83
|
-
const pkgManifest = await this.getPackageManifest(fullname,
|
|
76
|
+
const pkgManifest = await this.getPackageManifest(fullname, DIST_NAMES.ABBREVIATED_MANIFESTS);
|
|
84
77
|
const distTags = pkgManifest['dist-tags'] || {};
|
|
85
78
|
version = distTags[versionOrTag] ? distTags[versionOrTag] : versionOrTag;
|
|
86
79
|
}
|
|
@@ -105,15 +98,15 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
105
98
|
const manifest = await this.getRewrittenManifest(fullname, fileType, versionOrTag);
|
|
106
99
|
this.backgroundTaskHelper.run(async () => {
|
|
107
100
|
await this.storeRewrittenManifest(manifest, fullname, fileType);
|
|
108
|
-
const cachedFiles =
|
|
101
|
+
const cachedFiles = ProxyCache.create({ fullname, fileType, version });
|
|
109
102
|
await this.proxyCacheRepository.saveProxyCache(cachedFiles);
|
|
110
103
|
});
|
|
111
104
|
return manifest;
|
|
112
105
|
}
|
|
113
106
|
async removeProxyCache(fullname, fileType, version) {
|
|
114
107
|
const storeKey = isPkgManifest(fileType)
|
|
115
|
-
? `/${
|
|
116
|
-
: `/${
|
|
108
|
+
? `/${PROXY_CACHE_DIR_NAME}/${fullname}/${fileType}`
|
|
109
|
+
: `/${PROXY_CACHE_DIR_NAME}/${fullname}/${version}/${fileType}`;
|
|
117
110
|
await this.nfsAdapter.remove(storeKey);
|
|
118
111
|
await this.proxyCacheRepository.removeProxyCache(fullname, fileType, version);
|
|
119
112
|
}
|
|
@@ -139,10 +132,10 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
139
132
|
return manifest;
|
|
140
133
|
}
|
|
141
134
|
async createTask(targetName, options) {
|
|
142
|
-
return await this.taskService.createTask(
|
|
135
|
+
return await this.taskService.createTask(Task.createUpdateProxyCache(targetName, options), false);
|
|
143
136
|
}
|
|
144
137
|
async findExecuteTask() {
|
|
145
|
-
return await this.taskService.findExecuteTask(
|
|
138
|
+
return await this.taskService.findExecuteTask(TaskType.UpdateProxyCache);
|
|
146
139
|
}
|
|
147
140
|
async executeTask(task) {
|
|
148
141
|
const logs = [];
|
|
@@ -156,51 +149,51 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
156
149
|
throw new Error('task params error, can not found record in repo.');
|
|
157
150
|
cachedManifest = await this.getRewrittenManifest(fullname, fileType);
|
|
158
151
|
await this.storeRewrittenManifest(cachedManifest, fullname, fileType);
|
|
159
|
-
|
|
152
|
+
ProxyCache.update(cachedFiles);
|
|
160
153
|
await this.proxyCacheRepository.saveProxyCache(cachedFiles);
|
|
161
154
|
}
|
|
162
155
|
catch (error) {
|
|
163
156
|
task.error = error;
|
|
164
157
|
logs.push(`[${isoNow()}] ❌ ${task.error}`);
|
|
165
158
|
logs.push(`[${isoNow()}] ❌❌❌❌❌ ${fullname}-${fileType} ${version ?? ''} ❌❌❌❌❌`);
|
|
166
|
-
await this.taskService.finishTask(task,
|
|
159
|
+
await this.taskService.finishTask(task, TaskState.Fail, logs.join('\n'));
|
|
167
160
|
this.logger.info('[ProxyCacheService.executeTask:fail] taskId: %s, targetName: %s, %s', task.taskId, task.targetName, task.error);
|
|
168
161
|
return;
|
|
169
162
|
}
|
|
170
163
|
logs.push(`[${isoNow()}] 🟢 Update Success.`);
|
|
171
|
-
const isFullManifests = fileType ===
|
|
164
|
+
const isFullManifests = fileType === DIST_NAMES.FULL_MANIFESTS;
|
|
172
165
|
const cachedKey = await this.cacheService.getPackageEtag(fullname, isFullManifests);
|
|
173
166
|
if (cachedKey) {
|
|
174
167
|
const cacheBytes = Buffer.from(JSON.stringify(cachedManifest));
|
|
175
|
-
const { shasum: etag } = await
|
|
168
|
+
const { shasum: etag } = await calculateIntegrity(cacheBytes);
|
|
176
169
|
await this.cacheService.savePackageEtagAndManifests(fullname, isFullManifests, etag, cacheBytes);
|
|
177
170
|
logs.push(`[${isoNow()}] 🟢 Update Cache Success.`);
|
|
178
171
|
}
|
|
179
|
-
await this.taskService.finishTask(task,
|
|
172
|
+
await this.taskService.finishTask(task, TaskState.Success, logs.join('\n'));
|
|
180
173
|
}
|
|
181
174
|
// only used by schedule task
|
|
182
175
|
async getRewrittenManifest(fullname, fileType, versionOrTag) {
|
|
183
176
|
let responseResult;
|
|
184
177
|
const USER_AGENT = 'npm_service.cnpmjs.org/cnpmcore';
|
|
185
178
|
switch (fileType) {
|
|
186
|
-
case
|
|
179
|
+
case DIST_NAMES.FULL_MANIFESTS: {
|
|
187
180
|
const url = `/${encodeURIComponent(fullname)}?t=${Date.now()}&cache=0`;
|
|
188
181
|
responseResult = await this.getProxyResponse({ url, headers: { accept: 'application/json', 'user-agent': USER_AGENT } }, { dataType: 'json' });
|
|
189
182
|
break;
|
|
190
183
|
}
|
|
191
|
-
case
|
|
184
|
+
case DIST_NAMES.ABBREVIATED_MANIFESTS: {
|
|
192
185
|
const url = `/${encodeURIComponent(fullname)}?t=${Date.now()}&cache=0`;
|
|
193
|
-
responseResult = await this.getProxyResponse({ url, headers: { accept:
|
|
186
|
+
responseResult = await this.getProxyResponse({ url, headers: { accept: ABBREVIATED_META_TYPE, 'user-agent': USER_AGENT } }, { dataType: 'json' });
|
|
194
187
|
break;
|
|
195
188
|
}
|
|
196
|
-
case
|
|
189
|
+
case DIST_NAMES.MANIFEST: {
|
|
197
190
|
const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
|
|
198
191
|
responseResult = await this.getProxyResponse({ url, headers: { accept: 'application/json', 'user-agent': USER_AGENT } }, { dataType: 'json' });
|
|
199
192
|
break;
|
|
200
193
|
}
|
|
201
|
-
case
|
|
194
|
+
case DIST_NAMES.ABBREVIATED: {
|
|
202
195
|
const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
|
|
203
|
-
responseResult = await this.getProxyResponse({ url, headers: { accept:
|
|
196
|
+
responseResult = await this.getProxyResponse({ url, headers: { accept: ABBREVIATED_META_TYPE, 'user-agent': USER_AGENT } }, { dataType: 'json' });
|
|
204
197
|
break;
|
|
205
198
|
}
|
|
206
199
|
default:
|
|
@@ -213,11 +206,11 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
213
206
|
async storeRewrittenManifest(manifest, fullname, fileType) {
|
|
214
207
|
let storeKey;
|
|
215
208
|
if (isPkgManifest(fileType)) {
|
|
216
|
-
storeKey = `/${
|
|
209
|
+
storeKey = `/${PROXY_CACHE_DIR_NAME}/${fullname}/${fileType}`;
|
|
217
210
|
}
|
|
218
211
|
else {
|
|
219
212
|
const version = manifest.version;
|
|
220
|
-
storeKey = `/${
|
|
213
|
+
storeKey = `/${PROXY_CACHE_DIR_NAME}/${fullname}/${version}/${fileType}`;
|
|
221
214
|
}
|
|
222
215
|
const nfsBytes = Buffer.from(JSON.stringify(manifest));
|
|
223
216
|
await this.nfsAdapter.uploadBytes(storeKey, nfsBytes);
|
|
@@ -248,42 +241,42 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
|
|
|
248
241
|
return res;
|
|
249
242
|
}
|
|
250
243
|
};
|
|
251
|
-
exports.ProxyCacheService = ProxyCacheService;
|
|
252
244
|
__decorate([
|
|
253
|
-
|
|
245
|
+
Inject(),
|
|
254
246
|
__metadata("design:type", Function)
|
|
255
247
|
], ProxyCacheService.prototype, "httpclient", void 0);
|
|
256
248
|
__decorate([
|
|
257
|
-
|
|
258
|
-
__metadata("design:type",
|
|
249
|
+
Inject(),
|
|
250
|
+
__metadata("design:type", NPMRegistry)
|
|
259
251
|
], ProxyCacheService.prototype, "npmRegistry", void 0);
|
|
260
252
|
__decorate([
|
|
261
|
-
|
|
262
|
-
__metadata("design:type",
|
|
253
|
+
Inject(),
|
|
254
|
+
__metadata("design:type", NFSAdapter)
|
|
263
255
|
], ProxyCacheService.prototype, "nfsAdapter", void 0);
|
|
264
256
|
__decorate([
|
|
265
|
-
|
|
266
|
-
__metadata("design:type",
|
|
257
|
+
Inject(),
|
|
258
|
+
__metadata("design:type", ProxyCacheRepository)
|
|
267
259
|
], ProxyCacheService.prototype, "proxyCacheRepository", void 0);
|
|
268
260
|
__decorate([
|
|
269
|
-
|
|
270
|
-
__metadata("design:type",
|
|
261
|
+
Inject(),
|
|
262
|
+
__metadata("design:type", RegistryManagerService)
|
|
271
263
|
], ProxyCacheService.prototype, "registryManagerService", void 0);
|
|
272
264
|
__decorate([
|
|
273
|
-
|
|
274
|
-
__metadata("design:type",
|
|
265
|
+
Inject(),
|
|
266
|
+
__metadata("design:type", TaskService)
|
|
275
267
|
], ProxyCacheService.prototype, "taskService", void 0);
|
|
276
268
|
__decorate([
|
|
277
|
-
|
|
278
|
-
__metadata("design:type",
|
|
269
|
+
Inject(),
|
|
270
|
+
__metadata("design:type", CacheService)
|
|
279
271
|
], ProxyCacheService.prototype, "cacheService", void 0);
|
|
280
272
|
__decorate([
|
|
281
|
-
|
|
282
|
-
__metadata("design:type",
|
|
273
|
+
Inject(),
|
|
274
|
+
__metadata("design:type", BackgroundTaskHelper)
|
|
283
275
|
], ProxyCacheService.prototype, "backgroundTaskHelper", void 0);
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
accessLevel:
|
|
276
|
+
ProxyCacheService = __decorate([
|
|
277
|
+
SingletonProto({
|
|
278
|
+
accessLevel: AccessLevel.PUBLIC,
|
|
287
279
|
})
|
|
288
280
|
], ProxyCacheService);
|
|
289
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ProxyCacheService.js","sourceRoot":"","sources":["../../../../app/core/service/ProxyCacheService.ts"],"names":[],"mappings":"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"}
|
|
281
|
+
export { ProxyCacheService };
|
|
282
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ProxyCacheService.js","sourceRoot":"","sources":["../../../../app/core/service/ProxyCacheService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { AbstractService } from '../../common/AbstractService';
|
|
2
|
-
import { Registry } from '../entity/Registry';
|
|
3
|
-
import { PageOptions, PageResult } from '../util/EntityUtil';
|
|
1
|
+
import { AbstractService } from '../../common/AbstractService.js';
|
|
2
|
+
import { Registry } from '../entity/Registry.js';
|
|
3
|
+
import { PageOptions, PageResult } from '../util/EntityUtil.js';
|
|
4
4
|
export interface CreateRegistryCmd extends Pick<Registry, 'changeStream' | 'host' | 'userPrefix' | 'type' | 'name' | 'authToken'> {
|
|
5
5
|
operatorId?: string;
|
|
6
6
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
2
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
3
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -8,39 +7,37 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
9
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const Registry_2 = require("../../common/enum/Registry");
|
|
23
|
-
let RegistryManagerService = class RegistryManagerService extends AbstractService_1.AbstractService {
|
|
10
|
+
import { AccessLevel, SingletonProto, Inject, } from '@eggjs/tegg';
|
|
11
|
+
import { E400, NotFoundError } from 'egg-errors';
|
|
12
|
+
import { RegistryRepository } from '../../repository/RegistryRepository.js';
|
|
13
|
+
import { AbstractService } from '../../common/AbstractService.js';
|
|
14
|
+
import { Registry } from '../entity/Registry.js';
|
|
15
|
+
import { ScopeManagerService } from './ScopeManagerService.js';
|
|
16
|
+
import { TaskService } from './TaskService.js';
|
|
17
|
+
import { Task } from '../entity/Task.js';
|
|
18
|
+
import { ChangesStreamMode, PresetRegistryName } from '../../common/constants.js';
|
|
19
|
+
import { RegistryType } from '../../common/enum/Registry.js';
|
|
20
|
+
let RegistryManagerService = class RegistryManagerService extends AbstractService {
|
|
24
21
|
async createSyncChangesStream(startSyncCmd) {
|
|
25
22
|
const { registryId, operatorId = '-', since } = startSyncCmd;
|
|
26
23
|
this.logger.info('[RegistryManagerService.startSyncChangesStream:prepare] operatorId: %s, registryId: %s, since: %s', operatorId, registryId, since);
|
|
27
24
|
const registry = await this.registryRepository.findRegistryByRegistryId(registryId);
|
|
28
25
|
if (!registry) {
|
|
29
|
-
throw new
|
|
26
|
+
throw new NotFoundError(`registry ${registryId} not found`);
|
|
30
27
|
}
|
|
31
28
|
// 防止和 GLOBAL_WORKER 冲突,只能有一个默认的全局 registry
|
|
32
29
|
const scopesCount = await this.scopeManagerService.countByRegistryId(registryId);
|
|
33
30
|
if (scopesCount === 0) {
|
|
34
|
-
throw new
|
|
31
|
+
throw new E400(`registry ${registryId} has no scopes, please create scopes first`);
|
|
35
32
|
}
|
|
36
33
|
// 启动 changeStream
|
|
37
34
|
const targetName = `${registry.name.toUpperCase()}_WORKER`;
|
|
38
|
-
await this.taskService.createTask(
|
|
35
|
+
await this.taskService.createTask(Task.createChangesStream(targetName, registryId, since), false);
|
|
39
36
|
}
|
|
40
37
|
async createRegistry(createCmd) {
|
|
41
38
|
const { name, changeStream = '', host, userPrefix = '', type, operatorId = '-', authToken } = createCmd;
|
|
42
39
|
this.logger.info('[RegistryManagerService.createRegistry:prepare] operatorId: %s, createCmd: %j', operatorId, createCmd);
|
|
43
|
-
const registry =
|
|
40
|
+
const registry = Registry.create({
|
|
44
41
|
name,
|
|
45
42
|
changeStream,
|
|
46
43
|
host,
|
|
@@ -58,7 +55,7 @@ let RegistryManagerService = class RegistryManagerService extends AbstractServic
|
|
|
58
55
|
this.logger.info('[RegistryManagerService.updateRegistry:prepare] operatorId: %s, updateCmd: %j', operatorId, updateCmd);
|
|
59
56
|
const registry = await this.registryRepository.findRegistryByRegistryId(registryId);
|
|
60
57
|
if (!registry) {
|
|
61
|
-
throw new
|
|
58
|
+
throw new NotFoundError(`registry ${registryId} not found`);
|
|
62
59
|
}
|
|
63
60
|
Object.assign(registry, {
|
|
64
61
|
name,
|
|
@@ -92,30 +89,30 @@ let RegistryManagerService = class RegistryManagerService extends AbstractServic
|
|
|
92
89
|
await this.scopeManagerService.removeByRegistryId({ registryId, operatorId });
|
|
93
90
|
}
|
|
94
91
|
async ensureSelfRegistry() {
|
|
95
|
-
const existRegistry = await this.registryRepository.findRegistry(
|
|
92
|
+
const existRegistry = await this.registryRepository.findRegistry(PresetRegistryName.self);
|
|
96
93
|
if (existRegistry) {
|
|
97
94
|
return existRegistry;
|
|
98
95
|
}
|
|
99
96
|
const { registry: registryHost } = this.config.cnpmcore;
|
|
100
97
|
const newRegistry = await this.createRegistry({
|
|
101
|
-
name:
|
|
98
|
+
name: PresetRegistryName.self,
|
|
102
99
|
host: registryHost,
|
|
103
|
-
type:
|
|
100
|
+
type: RegistryType.Cnpmcore,
|
|
104
101
|
changeStream: '',
|
|
105
102
|
userPrefix: '',
|
|
106
103
|
});
|
|
107
104
|
return newRegistry;
|
|
108
105
|
}
|
|
109
106
|
async ensureDefaultRegistry() {
|
|
110
|
-
const existRegistry = await this.registryRepository.findRegistry(
|
|
107
|
+
const existRegistry = await this.registryRepository.findRegistry(PresetRegistryName.default);
|
|
111
108
|
if (existRegistry) {
|
|
112
109
|
return existRegistry;
|
|
113
110
|
}
|
|
114
111
|
// 从配置文件默认生成
|
|
115
112
|
const { changesStreamRegistryMode, changesStreamRegistry: changesStreamHost, sourceRegistry: host } = this.config.cnpmcore;
|
|
116
|
-
const type = changesStreamRegistryMode ===
|
|
113
|
+
const type = changesStreamRegistryMode === ChangesStreamMode.json ? RegistryType.Cnpmcore : RegistryType.Npm;
|
|
117
114
|
const registry = await this.createRegistry({
|
|
118
|
-
name:
|
|
115
|
+
name: PresetRegistryName.default,
|
|
119
116
|
type,
|
|
120
117
|
userPrefix: 'npm:',
|
|
121
118
|
host,
|
|
@@ -131,22 +128,22 @@ let RegistryManagerService = class RegistryManagerService extends AbstractServic
|
|
|
131
128
|
return registry.authToken;
|
|
132
129
|
}
|
|
133
130
|
};
|
|
134
|
-
exports.RegistryManagerService = RegistryManagerService;
|
|
135
131
|
__decorate([
|
|
136
|
-
|
|
137
|
-
__metadata("design:type",
|
|
132
|
+
Inject(),
|
|
133
|
+
__metadata("design:type", RegistryRepository)
|
|
138
134
|
], RegistryManagerService.prototype, "registryRepository", void 0);
|
|
139
135
|
__decorate([
|
|
140
|
-
|
|
141
|
-
__metadata("design:type",
|
|
136
|
+
Inject(),
|
|
137
|
+
__metadata("design:type", ScopeManagerService)
|
|
142
138
|
], RegistryManagerService.prototype, "scopeManagerService", void 0);
|
|
143
139
|
__decorate([
|
|
144
|
-
|
|
145
|
-
__metadata("design:type",
|
|
140
|
+
Inject(),
|
|
141
|
+
__metadata("design:type", TaskService)
|
|
146
142
|
], RegistryManagerService.prototype, "taskService", void 0);
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
accessLevel:
|
|
143
|
+
RegistryManagerService = __decorate([
|
|
144
|
+
SingletonProto({
|
|
145
|
+
accessLevel: AccessLevel.PUBLIC,
|
|
150
146
|
})
|
|
151
147
|
], RegistryManagerService);
|
|
152
|
-
|
|
148
|
+
export { RegistryManagerService };
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVnaXN0cnlNYW5hZ2VyU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3NlcnZpY2UvUmVnaXN0cnlNYW5hZ2VyU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsV0FBVyxFQUNYLGNBQWMsRUFDZCxNQUFNLEdBQ1AsTUFBTSxhQUFhLENBQUM7QUFDckIsT0FBTyxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDakQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDNUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVqRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDL0MsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQXFCdEQsSUFBTSxzQkFBc0IsR0FBNUIsTUFBTSxzQkFBdUIsU0FBUSxlQUFlO0lBUXpELEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxZQUEwQjtRQUN0RCxNQUFNLEVBQUUsVUFBVSxFQUFFLFVBQVUsR0FBRyxHQUFHLEVBQUUsS0FBSyxFQUFFLEdBQUcsWUFBWSxDQUFDO1FBQzdELElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLG1HQUFtRyxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDckosTUFBTSxRQUFRLEdBQUcsTUFBTSxJ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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { AbstractService } from '../../common/AbstractService';
|
|
2
|
-
import { Scope } from '../entity/Scope';
|
|
3
|
-
import { PageOptions, PageResult } from '../util/EntityUtil';
|
|
1
|
+
import { AbstractService } from '../../common/AbstractService.js';
|
|
2
|
+
import { Scope } from '../entity/Scope.js';
|
|
3
|
+
import { PageOptions, PageResult } from '../util/EntityUtil.js';
|
|
4
4
|
export interface CreateScopeCmd extends Pick<Scope, 'name' | 'registryId'> {
|
|
5
5
|
operatorId?: string;
|
|
6
6
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
2
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
3
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -8,13 +7,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
9
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const Scope_1 = require("../entity/Scope");
|
|
17
|
-
let ScopeManagerService = class ScopeManagerService extends AbstractService_1.AbstractService {
|
|
10
|
+
import { AccessLevel, SingletonProto, Inject, } from '@eggjs/tegg';
|
|
11
|
+
import { ScopeRepository } from '../../repository/ScopeRepository.js';
|
|
12
|
+
import { AbstractService } from '../../common/AbstractService.js';
|
|
13
|
+
import { Scope } from '../entity/Scope.js';
|
|
14
|
+
let ScopeManagerService = class ScopeManagerService extends AbstractService {
|
|
18
15
|
async findByName(name) {
|
|
19
16
|
const scope = await this.scopeRepository.findByName(name);
|
|
20
17
|
return scope;
|
|
@@ -26,7 +23,7 @@ let ScopeManagerService = class ScopeManagerService extends AbstractService_1.Ab
|
|
|
26
23
|
async createScope(createCmd) {
|
|
27
24
|
const { name, registryId, operatorId } = createCmd;
|
|
28
25
|
this.logger.info('[ScopeManagerService.CreateScope:prepare] operatorId: %s, createCmd: %s', operatorId, createCmd);
|
|
29
|
-
const scope =
|
|
26
|
+
const scope = Scope.create({
|
|
30
27
|
name,
|
|
31
28
|
registryId,
|
|
32
29
|
});
|
|
@@ -50,14 +47,14 @@ let ScopeManagerService = class ScopeManagerService extends AbstractService_1.Ab
|
|
|
50
47
|
return await this.scopeRepository.removeScope(scopeId);
|
|
51
48
|
}
|
|
52
49
|
};
|
|
53
|
-
exports.ScopeManagerService = ScopeManagerService;
|
|
54
50
|
__decorate([
|
|
55
|
-
|
|
56
|
-
__metadata("design:type",
|
|
51
|
+
Inject(),
|
|
52
|
+
__metadata("design:type", ScopeRepository)
|
|
57
53
|
], ScopeManagerService.prototype, "scopeRepository", void 0);
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
accessLevel:
|
|
54
|
+
ScopeManagerService = __decorate([
|
|
55
|
+
SingletonProto({
|
|
56
|
+
accessLevel: AccessLevel.PUBLIC,
|
|
61
57
|
})
|
|
62
58
|
], ScopeManagerService);
|
|
63
|
-
|
|
59
|
+
export { ScopeManagerService };
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2NvcGVNYW5hZ2VyU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3NlcnZpY2UvU2NvcGVNYW5hZ2VyU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsV0FBVyxFQUNYLGNBQWMsRUFDZCxNQUFNLEdBQ1AsTUFBTSxhQUFhLENBQUM7QUFDckIsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNsRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFzQnBDLElBQU0sbUJBQW1CLEdBQXpCLE1BQU0sbUJBQW9CLFNBQVEsZUFBZTtJQUl0RCxLQUFLLENBQUMsVUFBVSxDQUFDLElBQVk7UUFDM0IsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMxRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFRCxLQUFLLENBQUMsaUJBQWlCLENBQUMsVUFBa0I7UUFDeEMsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLGlCQUFpQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3ZFLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUMsU0FBeUI7UUFDekMsTUFBTSxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLEdBQUcsU0FBUyxDQUFDO1FBQ25ELElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHlFQUF5RSxFQUFFLFVBQVUsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNuSCxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDO1lBQ3pCLElBQUk7WUFDSixVQUFVO1NBQ1gsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM1QyxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFRCxLQUFLLENBQUMsVUFBVSxDQUFDLElBQWlCO1FBQ2hDLE9BQU8sTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBRUQsS0FBSyxDQUFDLHNCQUFzQixDQUFDLFVBQWtCLEVBQUUsSUFBaUI7UUFDaEUsT0FBTyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsc0JBQXNCLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzdFLENBQUM7SUFFRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsU0FBcUM7UUFDNUQsTUFBTSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUM7UUFDN0MsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMscUVBQXFFLEVBQUUsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQ2hILE9BQU8sTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLHVCQUF1QixDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ3hFLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLFNBQXlCO1FBQ3BDLE1BQU0sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsU0FBUyxDQUFDO1FBQzFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGtFQUFrRSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUMxRyxPQUFPLE1BQU0sSUFBSSxDQUFDLGVBQWUsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDekQsQ0FBQztDQUNGLENBQUE7QUExQ2tCO0lBRGhCLE1BQU0sRUFBRTs4QkFDeUIsZUFBZTs0REFBQztBQUZ2QyxtQkFBbUI7SUFIL0IsY0FBYyxDQUFDO1FBQ2QsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxtQkFBbUIsQ0E0Qy9CIn0=
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import { TaskState, TaskType } from '../../common/enum/Task';
|
|
2
|
-
import { AbstractService } from '../../common/AbstractService';
|
|
3
|
-
import { Task } from '../entity/Task';
|
|
1
|
+
import { TaskState, TaskType } from '../../common/enum/Task.js';
|
|
2
|
+
import { AbstractService } from '../../common/AbstractService.js';
|
|
3
|
+
import { Task } from '../entity/Task.js';
|
|
4
4
|
export declare class TaskService extends AbstractService {
|
|
5
5
|
private readonly taskRepository;
|
|
6
6
|
private readonly nfsAdapter;
|
|
7
7
|
private readonly queueAdapter;
|
|
8
8
|
getTaskQueueLength(taskType: TaskType): Promise<number>;
|
|
9
|
-
createTask(task: Task, addTaskQueueOnExists: boolean): Promise<Task<import("../entity/Task").TaskBaseData>>;
|
|
9
|
+
createTask(task: Task, addTaskQueueOnExists: boolean): Promise<Task<import("../entity/Task.js").TaskBaseData>>;
|
|
10
10
|
retryTask(task: Task, appendLog?: string): Promise<void>;
|
|
11
|
-
findTask(taskId: string): Promise<Task<import("../entity/Task").TaskBaseData> | null>;
|
|
12
|
-
findTasks(taskIdList: Array<string>): Promise<Task<import("../entity/Task").TaskBaseData>[]>;
|
|
11
|
+
findTask(taskId: string): Promise<Task<import("../entity/Task.js").TaskBaseData> | null>;
|
|
12
|
+
findTasks(taskIdList: Array<string>): Promise<Task<import("../entity/Task.js").TaskBaseData>[]>;
|
|
13
13
|
findTaskLog(task: Task): Promise<string | import("stream").Readable | undefined>;
|
|
14
|
-
findExecuteTask(taskType: TaskType): Promise<Task<import("../entity/Task").TaskBaseData> | null>;
|
|
14
|
+
findExecuteTask(taskType: TaskType): Promise<Task<import("../entity/Task.js").TaskBaseData> | null>;
|
|
15
15
|
retryExecuteTimeoutTasks(): Promise<{
|
|
16
16
|
processing: number;
|
|
17
17
|
waiting: number;
|