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
|
@@ -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
|
let DistRepository = class DistRepository {
|
|
12
12
|
async findPackageVersionManifest(packageId, version) {
|
|
13
13
|
const packageVersion = await this.packageRepository.findPackageVersion(packageId, version);
|
|
@@ -60,7 +60,7 @@ let DistRepository = class DistRepository {
|
|
|
60
60
|
}
|
|
61
61
|
async downloadDistToFile(dist, file) {
|
|
62
62
|
// max up to 5mins
|
|
63
|
-
return await this.nfsAdapter.downloadFile(dist.path, file,
|
|
63
|
+
return await this.nfsAdapter.downloadFile(dist.path, file, 60_000 * 5);
|
|
64
64
|
}
|
|
65
65
|
};
|
|
66
66
|
__decorate([
|
|
@@ -77,4 +77,4 @@ DistRepository = __decorate([
|
|
|
77
77
|
})
|
|
78
78
|
], DistRepository);
|
|
79
79
|
export { DistRepository };
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzdFJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9EaXN0UmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFZM0QsSUFBTSxjQUFjLEdBQXBCLE1BQU0sY0FBYztJQU96QixLQUFLLENBQUMsMEJBQTBCLENBQzlCLFNBQWlCLEVBQ2pCLE9BQWU7UUFFZixNQUFNLGNBQWMsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxrQkFBa0IsQ0FDcEUsU0FBUyxFQUNULE9BQU8sQ0FDUixDQUFDO1FBQ0YsSUFBSSxjQUFjLEVBQUUsQ0FBQztZQUNuQixNQUFNLENBQUMsa0JBQWtCLEVBQUUsTUFBTSxDQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDO2dCQUNyRCxJQUFJLENBQUMsbUJBQW1CLENBQWtCLGNBQWMsQ0FBQyxZQUFZLENBQUM7Z0JBQ3RFLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxjQUFjLENBQUMsVUFBVSxDQUFDO2FBQ3RELENBQUMsQ0FBQztZQUNILElBQUksa0JBQWtCLEVBQUUsQ0FBQztnQkFDdkIsa0JBQWtCLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztZQUNyQyxDQUFDO1lBQ0QsT0FBTyxrQkFBa0IsQ0FBQztRQUM1QixDQUFDO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyw4QkFBOEIsQ0FDbEMsU0FBaUIsRUFDakIsT0FBZTtRQUVmLE1BQU0sY0FBYyxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLGtCQUFrQixDQUNwRSxTQUFTLEVBQ1QsT0FBTyxDQUNSLENBQUM7UUFDRixJQUFJLGNBQWMsRUFBRSxDQUFDO1lBQ25CLE9BQU8sTUFBTSxJQUFJLENBQUMsbUJBQW1CLENBQUMsY0FBYyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ3hFLENBQUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLG1CQUFtQixDQUFJLElBQVU7UUFDckMsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMscUJBQXFCLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbkQsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNSLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQU0sQ0FBQztRQUM5QixDQUFDO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxxQkFBcUIsQ0FBQyxJQUFVO1FBQ3BDLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxJQUFJLENBQUMsS0FBSztZQUFFLE9BQU8sRUFBRSxDQUFDO1FBQ3RCLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDN0MsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhLENBQUMsSUFBVTtRQUM1QixPQUFPLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ25ELENBQUM7SUFFRCxLQUFLLENBQUMsYUFBYSxDQUFDLElBQVU7UUFDNUIsT0FBTyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFVLEVBQUUsR0FBd0I7UUFDakQsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLEVBQUUsQ0FBQztZQUM1QixPQUFPLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztRQUMxRCxDQUFDO1FBQ0QsT0FBTyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDM0QsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUMsSUFBVTtRQUMxQixPQUFPLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxLQUFLLENBQUMsWUFBWSxDQUFDLElBQVU7UUFDM0IsT0FBTyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsc0JBQXNCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFFRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsSUFBVSxFQUFFLElBQVk7UUFDL0Msa0JBQWtCO1FBQ2xCLE9BQU8sTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDekUsQ0FBQztDQUNGLENBQUE7QUE5RWtCO0lBRGhCLE1BQU0sRUFBRTs7eURBQzZDO0FBR3JDO0lBRGhCLE1BQU0sRUFBRTs7a0RBQytCO0FBTDdCLGNBQWM7SUFIMUIsY0FBYyxDQUFDO1FBQ2QsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxjQUFjLENBZ0YxQiJ9
|
|
@@ -15,5 +15,5 @@ export declare class HookRepository {
|
|
|
15
15
|
*/
|
|
16
16
|
updateHook(cmd: UpdateHookCommand): Promise<void>;
|
|
17
17
|
listHooksByOwnerId(ownerId: string): Promise<Hook[]>;
|
|
18
|
-
listHooksByTypeAndName(type: HookType, name: string, since?: bigint): Promise<
|
|
18
|
+
listHooksByTypeAndName(type: HookType, name: string, since?: bigint): Promise<Hook[]>;
|
|
19
19
|
}
|
|
@@ -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 { Hook } from '../core/entity/Hook.js';
|
|
12
12
|
import { ModelConvertor } from './util/ModelConvertor.js';
|
|
13
13
|
let HookRepository = class HookRepository {
|
|
@@ -48,11 +48,11 @@ let HookRepository = class HookRepository {
|
|
|
48
48
|
}
|
|
49
49
|
async listHooksByTypeAndName(type, name, since) {
|
|
50
50
|
let hookRows;
|
|
51
|
-
if (
|
|
52
|
-
hookRows = await this.Hook.find({ type, name
|
|
51
|
+
if (since === undefined) {
|
|
52
|
+
hookRows = await this.Hook.find({ type, name }).limit(100);
|
|
53
53
|
}
|
|
54
54
|
else {
|
|
55
|
-
hookRows = await this.Hook.find({ type, name }).limit(100);
|
|
55
|
+
hookRows = await this.Hook.find({ type, name, id: { $gt: since } }).limit(100);
|
|
56
56
|
}
|
|
57
57
|
return hookRows.map(row => ModelConvertor.convertModelToEntity(row, Hook));
|
|
58
58
|
}
|
|
@@ -67,4 +67,4 @@ HookRepository = __decorate([
|
|
|
67
67
|
})
|
|
68
68
|
], HookRepository);
|
|
69
69
|
export { HookRepository };
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSG9va1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9Ib29rUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFbEUsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQVluRCxJQUFNLGNBQWMsR0FBcEIsTUFBTSxjQUFjO0lBSXpCLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBVTtRQUN2QixJQUFJLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNaLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDdkQsSUFBSSxDQUFDLEtBQUs7Z0JBQUUsT0FBTztZQUNuQixNQUFNLGNBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDdEQsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdELENBQUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVksQ0FBQyxNQUFjO1FBQy9CLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxLQUFLO1lBQUUsT0FBTztRQUNuQixPQUFPLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDMUQsQ0FBQztJQUVELEtBQUssQ0FBQyxVQUFVLENBQUMsTUFBYztRQUM3QixNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQXNCO1FBQ3JDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUNkO1lBQ0UsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNO1NBQ25CLEVBQ0Q7WUFDRSxRQUFRLEVBQUUsR0FBRyxDQUFDLFFBQVE7WUFDdEIsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNO1NBQ25CLENBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsT0FBZTtRQUN0QyxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUNuRCxPQUFPLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsb0JBQW9CLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDN0UsQ0FBQztJQUVELEtBQUssQ0FBQyxzQkFBc0IsQ0FDMUIsSUFBYyxFQUNkLElBQVksRUFDWixLQUFjO1FBRWQsSUFBSSxRQUFxQixDQUFDO1FBQzFCLElBQUksS0FBSyxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQ3hCLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzdELENBQUM7YUFBTSxDQUFDO1lBQ04sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUN2RSxHQUFHLENBQ0osQ0FBQztRQUNKLENBQUM7UUFDRCxPQUFPLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsb0JBQW9CLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDN0UsQ0FBQztDQUNGLENBQUE7QUF6RGtCO0lBRGhCLE1BQU0sRUFBRTs7NENBQytCO0FBRjdCLGNBQWM7SUFIMUIsY0FBYyxDQUFDO1FBQ2QsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxjQUFjLENBMkQxQiJ9
|
|
@@ -89,50 +89,50 @@ export type PackageJSONType = CnpmcorePatchInfo & {
|
|
|
89
89
|
};
|
|
90
90
|
[key: string]: unknown;
|
|
91
91
|
};
|
|
92
|
-
type PackageJSONPickKey = 'name' | 'author' | 'bugs' | 'description' | 'homepage' | 'keywords' | 'license' | 'readme' | 'readmeFilename' | 'repository' | 'versions' | 'contributors';
|
|
93
|
-
export
|
|
92
|
+
export type PackageJSONPickKey = 'name' | 'author' | 'bugs' | 'description' | 'homepage' | 'keywords' | 'license' | 'readme' | 'readmeFilename' | 'repository' | 'versions' | 'contributors';
|
|
93
|
+
export interface CnpmcorePatchInfo {
|
|
94
94
|
_cnpmcore_publish_time?: Date;
|
|
95
95
|
publish_time?: number;
|
|
96
96
|
_source_registry_name?: string;
|
|
97
97
|
block?: string;
|
|
98
|
-
}
|
|
99
|
-
type AbbreviatedKey = 'name' | 'version' | 'deprecated' | 'dependencies' | 'optionalDependencies' | 'devDependencies' | 'bundleDependencies' | 'peerDependencies' | 'peerDependenciesMeta' | 'bin' | 'os' | 'cpu' | 'libc' | 'workspaces' | 'directories' | 'dist' | 'engines' | 'hasInstallScript' | 'publish_time' | 'block' | '_hasShrinkwrap' | 'acceptDependencies' | 'funding';
|
|
100
|
-
|
|
98
|
+
}
|
|
99
|
+
export type AbbreviatedKey = 'name' | 'version' | 'deprecated' | 'dependencies' | 'optionalDependencies' | 'devDependencies' | 'bundleDependencies' | 'peerDependencies' | 'peerDependenciesMeta' | 'bin' | 'os' | 'cpu' | 'libc' | 'workspaces' | 'directories' | 'dist' | 'engines' | 'hasInstallScript' | 'publish_time' | 'block' | '_hasShrinkwrap' | 'acceptDependencies' | 'funding';
|
|
100
|
+
export interface DistType {
|
|
101
101
|
tarball: string;
|
|
102
102
|
size: number;
|
|
103
103
|
shasum: string;
|
|
104
104
|
integrity: string;
|
|
105
105
|
[key: string]: unknown;
|
|
106
|
-
}
|
|
107
|
-
export
|
|
106
|
+
}
|
|
107
|
+
export interface AuthorType {
|
|
108
108
|
name: string;
|
|
109
109
|
username?: string;
|
|
110
110
|
email?: string;
|
|
111
111
|
url?: string;
|
|
112
|
-
}
|
|
113
|
-
|
|
112
|
+
}
|
|
113
|
+
export interface LicenseType {
|
|
114
114
|
type: string;
|
|
115
115
|
url: string;
|
|
116
|
-
}
|
|
117
|
-
|
|
116
|
+
}
|
|
117
|
+
export interface ContributorType {
|
|
118
118
|
name?: string;
|
|
119
119
|
email?: string;
|
|
120
120
|
url?: string;
|
|
121
121
|
[key: string]: unknown;
|
|
122
|
-
}
|
|
123
|
-
|
|
122
|
+
}
|
|
123
|
+
export interface DirectoriesType {
|
|
124
124
|
lib?: string;
|
|
125
125
|
bin?: string;
|
|
126
126
|
man?: string;
|
|
127
127
|
test?: string;
|
|
128
128
|
[key: string]: string | undefined;
|
|
129
|
-
}
|
|
130
|
-
|
|
129
|
+
}
|
|
130
|
+
export interface RepositoryType {
|
|
131
131
|
type: string;
|
|
132
132
|
url: string;
|
|
133
133
|
[key: string]: unknown;
|
|
134
|
-
}
|
|
135
|
-
type DepInfo = Record<string, string>;
|
|
134
|
+
}
|
|
135
|
+
export type DepInfo = Record<string, string>;
|
|
136
136
|
export declare class PackageRepository extends AbstractRepository {
|
|
137
137
|
#private;
|
|
138
138
|
private readonly Package;
|
|
@@ -177,4 +177,3 @@ export declare class PackageRepository extends AbstractRepository {
|
|
|
177
177
|
removePackageTag(packageTagEntity: PackageTagEntity): Promise<void>;
|
|
178
178
|
listPackageTags(packageId: string): Promise<PackageTagEntity[]>;
|
|
179
179
|
}
|
|
180
|
-
export {};
|
|
@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
13
13
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
14
14
|
};
|
|
15
15
|
var _PackageRepository_instances, _PackageRepository_convertPackageModelToEntity;
|
|
16
|
-
import { AccessLevel,
|
|
16
|
+
import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
17
17
|
import { Package as PackageModel } from './model/Package.js';
|
|
18
18
|
import { Package as PackageEntity } from '../core/entity/Package.js';
|
|
19
19
|
import { ModelConvertor } from './util/ModelConvertor.js';
|
|
@@ -406,4 +406,4 @@ PackageRepository = __decorate([
|
|
|
406
406
|
})
|
|
407
407
|
], PackageRepository);
|
|
408
408
|
export { PackageRepository };
|
|
409
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}
|
|
409
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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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 { ModelConvertor } from './util/ModelConvertor.js';
|
|
12
12
|
import { PackageVersionBlock as PackageVersionBlockEntity } from '../core/entity/PackageVersionBlock.js';
|
|
13
13
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
@@ -28,7 +28,10 @@ let PackageVersionBlockRepository = class PackageVersionBlockRepository extends
|
|
|
28
28
|
return await this.findPackageVersionBlock(packageId, '*');
|
|
29
29
|
}
|
|
30
30
|
async findPackageVersionBlock(packageId, version) {
|
|
31
|
-
const model = await this.PackageVersionBlock.findOne({
|
|
31
|
+
const model = await this.PackageVersionBlock.findOne({
|
|
32
|
+
packageId,
|
|
33
|
+
version,
|
|
34
|
+
});
|
|
32
35
|
if (model)
|
|
33
36
|
return ModelConvertor.convertModelToEntity(model, PackageVersionBlockEntity);
|
|
34
37
|
return null;
|
|
@@ -37,7 +40,9 @@ let PackageVersionBlockRepository = class PackageVersionBlockRepository extends
|
|
|
37
40
|
return await this.PackageVersionBlock.find({ packageId });
|
|
38
41
|
}
|
|
39
42
|
async removePackageVersionBlock(packageVersionBlockId) {
|
|
40
|
-
const removeCount = await this.PackageVersionBlock.remove({
|
|
43
|
+
const removeCount = await this.PackageVersionBlock.remove({
|
|
44
|
+
packageVersionBlockId,
|
|
45
|
+
});
|
|
41
46
|
this.logger.info('[PackageVersionBlockRepository:removePackageVersionBlock:remove] %d rows, packageVersionBlockId: %s', removeCount, packageVersionBlockId);
|
|
42
47
|
}
|
|
43
48
|
};
|
|
@@ -51,4 +56,4 @@ PackageVersionBlockRepository = __decorate([
|
|
|
51
56
|
})
|
|
52
57
|
], PackageVersionBlockRepository);
|
|
53
58
|
export { PackageVersionBlockRepository };
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25CbG9ja1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9QYWNrYWdlVmVyc2lvbkJsb2NrUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTFELE9BQU8sRUFBRSxtQkFBbUIsSUFBSSx5QkFBeUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ3pHLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS3RELElBQU0sNkJBQTZCLEdBQW5DLE1BQU0sNkJBQThCLFNBQVEsa0JBQWtCO0lBSW5FLEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxLQUFnQztRQUM1RCxJQUFJLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNiLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN2RSxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sY0FBYyxDQUFDLGlCQUFpQixDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN2RCxDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sS0FBSyxHQUFHLE1BQU0sY0FBYyxDQUFDLG9CQUFvQixDQUNyRCxLQUFLLEVBQ0wsSUFBSSxDQUFDLG1CQUFtQixDQUN6QixDQUFDO1lBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2QsK0ZBQStGLEVBQy9GLEtBQUssQ0FBQyxFQUFFLEVBQ1IsS0FBSyxDQUFDLHFCQUFxQixDQUM1QixDQUFDO1FBQ0osQ0FBQztJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsZ0JBQWdCLENBQUMsU0FBaUI7UUFDdEMsT0FBTyxNQUFNLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVELEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxTQUFpQixFQUFFLE9BQWU7UUFDOUQsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDO1lBQ25ELFNBQVM7WUFDVCxPQUFPO1NBQ1IsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxLQUFLO1lBQ1AsT0FBTyxjQUFjLENBQUMsb0JBQW9CLENBQ3hDLEtBQUssRUFDTCx5QkFBeUIsQ0FDMUIsQ0FBQztRQUNKLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxTQUFpQjtRQUM5QyxPQUFPLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVELEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxxQkFBNkI7UUFDM0QsTUFBTSxXQUFXLEdBQUcsTUFBTSxJQUFJLENBQUMsbUJBQW1CLENBQUMsTUFBTSxDQUFDO1lBQ3hELHFCQUFxQjtTQUN0QixDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZCxxR0FBcUcsRUFDckcsV0FBVyxFQUNYLHFCQUFxQixDQUN0QixDQUFDO0lBQ0osQ0FBQztDQUNGLENBQUE7QUFuRGtCO0lBRGhCLE1BQU0sRUFBRTs7MEVBQzZEO0FBRjNELDZCQUE2QjtJQUh6QyxjQUFjLENBQUM7UUFDZCxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLDZCQUE2QixDQXFEekMifQ==
|
|
@@ -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 { AbstractRepository } from './AbstractRepository.js';
|
|
12
12
|
let PackageVersionDownloadRepository = class PackageVersionDownloadRepository extends AbstractRepository {
|
|
13
13
|
async plus(packageId, version, counter) {
|
|
@@ -30,9 +30,7 @@ let PackageVersionDownloadRepository = class PackageVersionDownloadRepository ex
|
|
|
30
30
|
model = await this.PackageVersionDownload.create(attributes);
|
|
31
31
|
this.logger.info('[PackageVersionDownloadRepository:plus:new] id: %s, packageId: %s, version: %s, yearMonth: %s', model.id, model.packageId, model.version, model.yearMonth);
|
|
32
32
|
}
|
|
33
|
-
await this.PackageVersionDownload
|
|
34
|
-
.where({ id: model.id })
|
|
35
|
-
.increment(field, counter);
|
|
33
|
+
await this.PackageVersionDownload.where({ id: model.id }).increment(field, counter);
|
|
36
34
|
this.logger.info('[PackageVersionDownloadRepository:plus:increment] id: %s, packageId: %s, version: %s, field: %s%s, plus: %d', model.id, model.packageId, model.version, model.yearMonth, field, counter);
|
|
37
35
|
}
|
|
38
36
|
async query(packageId, start, end) {
|
|
@@ -77,4 +75,4 @@ PackageVersionDownloadRepository = __decorate([
|
|
|
77
75
|
})
|
|
78
76
|
], PackageVersionDownloadRepository);
|
|
79
77
|
export { PackageVersionDownloadRepository };
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25Eb3dubG9hZFJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9QYWNrYWdlVmVyc2lvbkRvd25sb2FkUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFbEUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFNdEQsSUFBTSxnQ0FBZ0MsR0FBdEMsTUFBTSxnQ0FBaUMsU0FBUSxrQkFBa0I7SUFJdEUsS0FBSyxDQUFDLElBQUksQ0FDUixTQUFpQixFQUNqQixPQUFlLEVBQ2YsT0FBZTtRQUVmLE1BQU0sR0FBRyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7UUFDdkIsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDLFdBQVcsRUFBRSxHQUFHLEdBQUcsR0FBRyxHQUFHLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQy9ELE1BQU0sSUFBSSxHQUFHLElBQUksSUFBSSxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbEMsTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUNuRCxJQUFJLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxPQUFPLENBQUM7WUFDcEQsU0FBUztZQUNULE9BQU87WUFDUCxTQUFTO1NBQ1YsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ1gsa0JBQWtCO1lBQ2xCLE1BQU0sVUFBVSxHQUFHO2dCQUNqQixTQUFTO2dCQUNULE9BQU87Z0JBQ1AsU0FBUzthQUNWLENBQUM7WUFDRixLQUFLLEdBQUcs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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 { ModelConvertor } from './util/ModelConvertor.js';
|
|
12
12
|
import { Dist as DistEntity } from '../core/entity/Dist.js';
|
|
13
13
|
import { PackageVersionFile as PackageVersionFileEntity } from '../core/entity/PackageVersionFile.js';
|
|
@@ -22,7 +22,11 @@ let PackageVersionFileRepository = class PackageVersionFileRepository extends Ab
|
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
24
|
async findPackageVersionFile(packageVersionId, directory, name) {
|
|
25
|
-
const model = await this.PackageVersionFile.findOne({
|
|
25
|
+
const model = await this.PackageVersionFile.findOne({
|
|
26
|
+
packageVersionId,
|
|
27
|
+
directory,
|
|
28
|
+
name,
|
|
29
|
+
});
|
|
26
30
|
if (!model)
|
|
27
31
|
return null;
|
|
28
32
|
const distModel = await this.Dist.findOne({ distId: model.distId });
|
|
@@ -31,8 +35,12 @@ let PackageVersionFileRepository = class PackageVersionFileRepository extends Ab
|
|
|
31
35
|
}
|
|
32
36
|
async listPackageVersionFiles(packageVersionId, directory) {
|
|
33
37
|
const isRoot = directory === '/';
|
|
34
|
-
const where = isRoot
|
|
35
|
-
{ packageVersionId
|
|
38
|
+
const where = isRoot
|
|
39
|
+
? { packageVersionId }
|
|
40
|
+
: {
|
|
41
|
+
packageVersionId,
|
|
42
|
+
directory: { $or: [{ $eq: directory }, { $like: `${directory}/%` }] },
|
|
43
|
+
};
|
|
36
44
|
// only return current directory's files and directories
|
|
37
45
|
// https://github.com/cnpm/cnpmcore/issues/680
|
|
38
46
|
const models = await this.PackageVersionFile.find(where);
|
|
@@ -49,7 +57,9 @@ let PackageVersionFileRepository = class PackageVersionFileRepository extends Ab
|
|
|
49
57
|
else {
|
|
50
58
|
// only keep directory = '/' or sub directory like `/dist` but not `/dist/foo`
|
|
51
59
|
// sub directory
|
|
52
|
-
const subDirectoryName = item.directory
|
|
60
|
+
const subDirectoryName = item.directory
|
|
61
|
+
.slice(prefix.length)
|
|
62
|
+
.split('/')[0];
|
|
53
63
|
subDirectories.add(`${prefix}${subDirectoryName}`);
|
|
54
64
|
}
|
|
55
65
|
}
|
|
@@ -84,4 +94,4 @@ PackageVersionFileRepository = __decorate([
|
|
|
84
94
|
})
|
|
85
95
|
], PackageVersionFileRepository);
|
|
86
96
|
export { PackageVersionFileRepository };
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25GaWxlUmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L1BhY2thZ2VWZXJzaW9uRmlsZVJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRWxFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUcxRCxPQUFPLEVBQUUsSUFBSSxJQUFJLFVBQVUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVELE9BQU8sRUFBRSxrQkFBa0IsSUFBSSx3QkFBd0IsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ3RHLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS3RELElBQU0sNEJBQTRCLEdBQWxDLE1BQU0sNEJBQTZCLFNBQVEsa0JBQWtCO0lBTWxFLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxJQUE4QjtRQUMzRCxNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFDLFdBQVcsRUFBQyxFQUFFO1lBQzVELE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztnQkFDaEIsY0FBYyxDQUFDLG9CQUFvQixDQUNqQyxJQUFJLEVBQ0osSUFBSSxDQUFDLGtCQUFrQixFQUN2QixXQUFXLENBQ1o7Z0JBQ0QsY0FBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxXQUFXLENBQUM7YUFDdkUsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsS0FBSyxDQUFDLHNCQUFzQixDQUMxQixnQkFBd0IsRUFDeEIsU0FBaUIsRUFDakIsSUFBWTtRQUVaLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFD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
|
|
@@ -12,5 +12,5 @@ export declare class PackageVersionRepository {
|
|
|
12
12
|
* if sql version not contains prerelease, find the max version
|
|
13
13
|
*/
|
|
14
14
|
findMaxSatisfyVersion(scope: string, name: string, sqlRange: SqlRange): Promise<string | undefined>;
|
|
15
|
-
findSatisfyVersionsWithPrerelease(scope: string, name: string, sqlRange: SqlRange): Promise<
|
|
15
|
+
findSatisfyVersionsWithPrerelease(scope: string, name: string, sqlRange: SqlRange): Promise<string[]>;
|
|
16
16
|
}
|
|
@@ -21,6 +21,7 @@ let PackageVersionRepository = class PackageVersionRepository {
|
|
|
21
21
|
id: { $gte: id },
|
|
22
22
|
}).limit(1000);
|
|
23
23
|
const versionModels = versions.map(t => ModelConvertor.convertModelToEntity(t, PackageVersion));
|
|
24
|
+
// oxlint-disable-next-line typescript-eslint/no-explicit-any
|
|
24
25
|
return versionModels.toObject();
|
|
25
26
|
}
|
|
26
27
|
async fixPaddingVersion(pkgVersionId, paddingSemver) {
|
|
@@ -62,6 +63,7 @@ let PackageVersionRepository = class PackageVersionRepository {
|
|
|
62
63
|
name,
|
|
63
64
|
...sqlRange.condition,
|
|
64
65
|
});
|
|
66
|
+
// oxlint-disable-next-line typescript-eslint/no-explicit-any
|
|
65
67
|
return versions
|
|
66
68
|
.toObject()
|
|
67
69
|
.map((t) => t.version);
|
|
@@ -85,4 +87,4 @@ PackageVersionRepository = __decorate([
|
|
|
85
87
|
})
|
|
86
88
|
], PackageVersionRepository);
|
|
87
89
|
export { PackageVersionRepository };
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25SZXBvc2l0b3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3JlcG9zaXRvcnkvUGFja2FnZVZlcnNpb25SZXBvc2l0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUlsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBT25ELElBQU0sd0JBQXdCLEdBQTlCLE1BQU0sd0JBQXdCO0lBVW5DLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxFQUFXO1FBQ3pDLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNSLEVBQUUsR0FBRyxDQUFDLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxDQUNqRCx3QkFBd0IsQ0FDekIsQ0FBVyxDQUFDO1FBQ2YsQ0FBQztRQUNELElBQUksQ0FBQyxFQUFFO1lBQUUsT0FBTyxFQUFFLENBQUM7UUFDbkIsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQztZQUM5QyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFO1NBQ1AsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN6QixNQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQ3JDLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLEVBQUUsY0FBYyxDQUFDLENBQ3ZELENBQUM7UUFDRiw2REFBNkQ7UUFDN0QsT0FBUSxhQUFxQixDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzNDLENBQUM7SUFFRCxLQUFLLENBQUMsaUJBQWlCLENBQ3JCLFlBQW9CLEVBQ3BCLGFBQTRCO1FBRTVCLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQzlCLEVBQUUsZ0JBQWdCLEVBQUUsWUFBWSxFQUFFLEVBQ2xDO1lBQ0UsY0FBYyxFQUFFLGFBQWEsQ0FBQyxjQUFjO1lBQzVDLFlBQVksRUFBRSxhQUFhLENBQUMsWUFBWTtTQUN6QyxDQUNGLENBQUM7SUFDSixDQUFDO0lBRUQsS0FBSyxDQUFDLGdCQUFnQixDQUNwQixLQUFhLEVBQ2IsSUFBWSxFQUNaLEdBQVc7UUFFWCxNQUFNLElBQUksR0FBRyxDQUFDLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDO2FBQ2xELElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLDRDQUE0QyxDQUFDO2FBQ2hFLEtBQUssQ0FBQztZQUNMLEtBQUs7WUFDTCxJQUFJO1lBQ0osR0FBRztTQUNNLENBQUMsQ0FBMEIsQ0FBQztRQUN6QyxNQUFNLFFBQVEsR0FBRyxJQUFJLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLE9BQU8sUUFBUSxFQUFFLE9BQU8sQ0FBQztJQUMzQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxLQUFLLENBQUMscUJBQXFCLENBQ3pCLEtBQWEsRUFDYixJQUFZLEVBQ1osUUFBa0I7UUFFbEIsTUFBTSxRQUFRLEdBQUcsQ0FBQyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUNoRCx5QkFBeUIsQ0FDMUI7YUFDRSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxnREFBZ0QsQ0FBQzthQUNwRSxLQUFLLENBQUM7WUFDTCxnQkFBZ0IsRUFBRSxLQUFLO1lBQ3ZCLGVBQWUsRUFBRSxJQUFJO1lBQ3JCLEdBQUcsUUFBUSxDQUFDLFNBQVM7U0FDWixDQUFDO2FBQ1gsS0FBSyxDQUFDLGdDQUFnQyxFQUFFLE1BQU0sQ0FBQyxDQUUvQyxDQUFDO1FBQ0osT0FBTyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDaEMsQ0FBQztJQUVELEtBQUssQ0FBQyxpQ0FBaUMsQ0FDckMsS0FBYSxFQUNiLElBQVksRUFDWixRQUFrQjtRQUVsQixNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQzthQUN6RCxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxnREFBZ0QsQ0FBQzthQUNwRSxLQUFLLENBQUM7WUFDTCxLQUFLO1lBQ0wsSUFBSTtZQUNKLEdBQUcsUUFBUSxDQUFDLFNBQVM7U0FDWixDQUFDLENBQUM7UUFDZiw2REFBNkQ7UUFDN0QsT0FBUSxRQUFnQjthQUNyQixRQUFRLEVBQUU7YUFDVixHQUFHLENBQUMsQ0FBQyxDQUFzQixFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDaEQsQ0FBQztDQUNGLENBQUE7QUE5RmtCO0lBRGhCLE1BQU0sRUFBRTs7eURBQ3FDO0FBRzdCO0lBRGhCLE1BQU0sRUFBRTs7Z0VBQ21EO0FBRzNDO0lBRGhCLE1BQU0sRUFBRTs7NERBQ3NDO0FBUnBDLHdCQUF3QjtJQUhwQyxjQUFjLENBQUM7UUFDZCxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLHdCQUF3QixDQWdHcEMifQ==
|
|
@@ -2,7 +2,7 @@ import type { ProxyCache as ProxyModeCachedFilesModel } from './model/ProxyCache
|
|
|
2
2
|
import { ProxyCache as ProxyCacheEntity } from '../core/entity/ProxyCache.js';
|
|
3
3
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
4
4
|
import type { DIST_NAMES } from '../core/entity/Package.js';
|
|
5
|
-
import type
|
|
5
|
+
import { type PageOptions, type PageResult } from '../core/util/EntityUtil.js';
|
|
6
6
|
export declare class ProxyCacheRepository extends AbstractRepository {
|
|
7
7
|
private readonly ProxyCache;
|
|
8
8
|
saveProxyCache(proxyCacheEntity: ProxyCacheEntity): Promise<ProxyModeCachedFilesModel>;
|
|
@@ -7,11 +7,11 @@ 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 { ModelConvertor } from './util/ModelConvertor.js';
|
|
12
12
|
import { ProxyCache as ProxyCacheEntity } from '../core/entity/ProxyCache.js';
|
|
13
13
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
14
|
-
import { EntityUtil } from '../core/util/EntityUtil.js';
|
|
14
|
+
import { EntityUtil, } from '../core/util/EntityUtil.js';
|
|
15
15
|
let ProxyCacheRepository = class ProxyCacheRepository extends AbstractRepository {
|
|
16
16
|
async saveProxyCache(proxyCacheEntity) {
|
|
17
17
|
let model = proxyCacheEntity.version
|
|
@@ -69,9 +69,12 @@ let ProxyCacheRepository = class ProxyCacheRepository extends AbstractRepository
|
|
|
69
69
|
};
|
|
70
70
|
}
|
|
71
71
|
async removeProxyCache(fullname, fileType, version) {
|
|
72
|
-
version
|
|
73
|
-
|
|
74
|
-
|
|
72
|
+
if (version) {
|
|
73
|
+
await this.ProxyCache.remove({ fullname, version, fileType });
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
await this.ProxyCache.remove({ fullname, fileType });
|
|
77
|
+
}
|
|
75
78
|
}
|
|
76
79
|
async truncateProxyCache() {
|
|
77
80
|
await this.ProxyCache.truncate();
|
|
@@ -87,4 +90,4 @@ ProxyCacheRepository = __decorate([
|
|
|
87
90
|
})
|
|
88
91
|
], ProxyCacheRepository);
|
|
89
92
|
export { ProxyCacheRepository };
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJveHlDYWNoZVJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9Qcm94eUNhY2hlUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTFELE9BQU8sRUFBRSxVQUFVLElBQUksZ0JBQWdCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUM5RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUU3RCxPQUFPLEVBQ0wsVUFBVSxHQUdYLE1BQU0sNEJBQTRCLENBQUM7QUFLN0IsSUFBTSxvQkFBb0IsR0FBMUIsTUFBTSxvQkFBcUIsU0FBUSxrQkFBa0I7SUFJMUQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxnQkFBa0M7UUFDckQsSUFBSSxLQUFLLEdBQUcsZ0JBQWdCLENBQUMsT0FBTztZQUNsQyxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztnQkFDNUIsUUFBUSxFQUFFLGdCQUFnQixDQUFDLFFBQVE7Z0JBQ25DLE9BQU8sRUFBRSxnQkFBZ0IsQ0FBQyxPQUFPO2dCQUNqQyxRQUFRLEVBQUUsZ0JBQWdCLENBQUMsUUFBUTthQUNwQyxDQUFDO1lBQ0osQ0FBQyxDQUFDLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUM7Z0JBQzVCLFFBQVEsRUFBRSxnQkFBZ0IsQ0FBQyxRQUFRO2dCQUNuQyxRQUFRLEVBQUUsZ0JBQWdCLENBQUMsUUFBUTthQUNwQyxDQUFDLENBQUM7UUFDUCxJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ1YsS0FBSyxDQUFDLFNBQVMsR0FBRyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUM7WUFDN0MsTUFB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
|
|
@@ -1,14 +1,13 @@
|
|
|
1
|
-
import type { Registry } from '../core/entity/Registry.js';
|
|
2
1
|
import { Registry as RegistryEntity } from '../core/entity/Registry.js';
|
|
3
2
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
4
3
|
import type { Registry as RegistryModel } from './model/Registry.js';
|
|
5
|
-
import type
|
|
4
|
+
import { type PageOptions, type PageResult } from '../core/util/EntityUtil.js';
|
|
6
5
|
export declare class RegistryRepository extends AbstractRepository {
|
|
7
6
|
private readonly Registry;
|
|
8
|
-
listRegistries(page: PageOptions): Promise<PageResult<
|
|
7
|
+
listRegistries(page: PageOptions): Promise<PageResult<RegistryEntity>>;
|
|
9
8
|
findRegistry(name?: string): Promise<RegistryEntity | null>;
|
|
10
9
|
findRegistryByRegistryId(registryId: string): Promise<RegistryEntity | null>;
|
|
11
10
|
findRegistryByRegistryHost(host: string): Promise<RegistryEntity | null>;
|
|
12
|
-
saveRegistry(registry:
|
|
11
|
+
saveRegistry(registry: RegistryEntity): Promise<RegistryModel | undefined>;
|
|
13
12
|
removeRegistry(registryId: string): Promise<void>;
|
|
14
13
|
}
|
|
@@ -7,11 +7,11 @@ 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 { ModelConvertor } from './util/ModelConvertor.js';
|
|
12
12
|
import { Registry as RegistryEntity } from '../core/entity/Registry.js';
|
|
13
13
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
14
|
-
import { EntityUtil } from '../core/util/EntityUtil.js';
|
|
14
|
+
import { EntityUtil, } from '../core/util/EntityUtil.js';
|
|
15
15
|
let RegistryRepository = class RegistryRepository extends AbstractRepository {
|
|
16
16
|
async listRegistries(page) {
|
|
17
17
|
const { offset, limit } = EntityUtil.convertPageOptionsToLimitOption(page);
|
|
@@ -69,4 +69,4 @@ RegistryRepository = __decorate([
|
|
|
69
69
|
})
|
|
70
70
|
], RegistryRepository);
|
|
71
71
|
export { RegistryRepository };
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVnaXN0cnlSZXBvc2l0b3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3JlcG9zaXRvcnkvUmVnaXN0cnlSZXBvc2l0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDMUQsT0FBTyxFQUFFLFFBQVEsSUFBSSxjQUFjLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUN4RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUU3RCxPQUFPLEVBQ0wsVUFBVSxHQUdYLE1BQU0sNEJBQTRCLENBQUM7QUFLN0IsSUFBTSxrQkFBa0IsR0FBeEIsTUFBTSxrQkFBbUIsU0FBUSxrQkFBa0I7SUFJeEQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxJQUFpQjtRQUNwQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxHQUFHLFVBQVUsQ0FBQywrQkFBK0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMzRSxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDakQsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDdEUsT0FBTztZQUNMLEtBQUs7WUFDTCxJQUFJLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUN2QixjQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLGNBQWMsQ0FBQyxDQUMzRDtTQUNGLENBQUM7SUFDSixDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVksQ0FBQyxJQUFhO1FBQzlCLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3BELElBQUksS0FBSyxFQUFFLENBQUM7WUFDVixPQUFPLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsY0FBYyxDQUFDLENBQUM7UUFDcEUsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELEtBQUssQ0FBQyx3QkFBd0IsQ0FDNUIsVUFBa0I7UUFFbEIsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUM7UUFDMUQsSUFBSSxLQUFLLEVBQUUsQ0FBQztZQUNWLE9BQU8sY0FBYyxDQUFDLG9CQUFvQixDQUFDLEtBQUssRUFBRSxjQUFjLENBQUMsQ0FBQztRQUNwRSxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLDBCQUEwQixDQUM5QixJQUFZO1FBRVosTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDcEQsSUFBSSxLQUFLLEVBQUUsQ0FBQztZQUNWLE9BQU8sY0FBYyxDQUFDLG9CQUFvQixDQUFDLEtBQUssRUFBRSxjQUFjLENBQUMsQ0FBQztRQUNwRSxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVksQ0FBQyxRQUF3QjtRQUN6QyxJQUFJLFFBQVEsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNoQixNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLFFBQVEsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQy9ELElBQUksQ0FBQyxLQUFLO2dCQUFFLE9BQU87WUFDbkIsTUFBTSxjQUFjLENBQUMsaUJBQWlCLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQ3hELE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQztRQUNELE1BQU0sS0FBSyxHQUFHLE1BQU0sY0FBYyxDQUFDLG9CQUFvQixDQUNyRCxRQUFRLEVBQ1IsSUFBSSxDQUFDLFFBQVEsQ0FDZCxDQUFDO1FBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2QsOERBQThELEVBQzlELEtBQUssQ0FBQyxFQUFFLEVBQ1IsS0FBSyxDQUFDLFVBQVUsQ0FDakIsQ0FBQztRQUNGLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyxjQUFjLENBQUMsVUFBa0I7UUFDckMsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDN0MsQ0FBQztDQUNGLENBQUE7QUFoRWtCO0lBRGhCLE1BQU0sRUFBRTs7b0RBQ3VDO0FBRnJDLGtCQUFrQjtJQUg5QixjQUFjLENBQUM7UUFDZCxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLGtCQUFrQixDQWtFOUIifQ==
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
2
2
|
import type { Scope as ScopeModel } from './model/Scope.js';
|
|
3
3
|
import { Scope } from '../core/entity/Scope.js';
|
|
4
|
-
import type
|
|
4
|
+
import { type PageOptions, type PageResult } from '../core/util/EntityUtil.js';
|
|
5
5
|
export declare class ScopeRepository extends AbstractRepository {
|
|
6
6
|
private readonly Scope;
|
|
7
7
|
countByRegistryId(registryId: string): Promise<number>;
|