cnpmcore 4.1.1 → 4.1.3
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/AbstractService.d.ts +1 -1
- package/dist/app/common/AbstractService.js +2 -2
- package/dist/app/common/ErrorUtil.js +6 -6
- package/dist/app/common/FileUtil.d.ts +1 -1
- package/dist/app/common/FileUtil.js +8 -6
- package/dist/app/common/PackageUtil.js +5 -6
- package/dist/app/common/SyncUtil.d.ts +1 -1
- package/dist/app/common/UserUtil.js +4 -4
- package/dist/app/common/adapter/BugVersionStore.d.ts +1 -1
- package/dist/app/common/adapter/NFSAdapter.d.ts +2 -2
- package/dist/app/common/adapter/NFSAdapter.js +2 -2
- package/dist/app/common/adapter/NPMRegistry.d.ts +2 -2
- package/dist/app/common/adapter/NPMRegistry.js +4 -4
- package/dist/app/common/adapter/binary/AbstractBinary.d.ts +5 -5
- package/dist/app/common/adapter/binary/AbstractBinary.js +1 -1
- package/dist/app/common/adapter/binary/ApiBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/ApiBinary.js +3 -2
- package/dist/app/common/adapter/binary/BucketBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/BucketBinary.js +1 -1
- package/dist/app/common/adapter/binary/ChromeForTestingBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/ChromeForTestingBinary.js +4 -2
- package/dist/app/common/adapter/binary/CypressBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/CypressBinary.js +5 -3
- package/dist/app/common/adapter/binary/EdgedriverBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/EdgedriverBinary.js +2 -2
- package/dist/app/common/adapter/binary/ElectronBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/ElectronBinary.js +3 -2
- package/dist/app/common/adapter/binary/GithubBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/GithubBinary.js +3 -2
- package/dist/app/common/adapter/binary/ImageminBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/ImageminBinary.js +1 -1
- package/dist/app/common/adapter/binary/NodeBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/NodeBinary.js +2 -2
- package/dist/app/common/adapter/binary/NodePreGypBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/NodePreGypBinary.js +35 -22
- package/dist/app/common/adapter/binary/NwjsBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/NwjsBinary.js +5 -3
- package/dist/app/common/adapter/binary/PlaywrightBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/PlaywrightBinary.js +94 -72
- package/dist/app/common/adapter/binary/PrismaBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/PrismaBinary.js +4 -3
- package/dist/app/common/adapter/binary/PuppeteerBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/PuppeteerBinary.js +4 -2
- package/dist/app/common/adapter/binary/SqlcipherBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/SqlcipherBinary.js +2 -2
- package/dist/app/common/adapter/changesStream/AbstractChangesStream.d.ts +4 -4
- package/dist/app/common/adapter/changesStream/AbstractChangesStream.js +2 -2
- package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.d.ts +1 -1
- package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.js +3 -3
- package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.d.ts +1 -1
- package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.js +3 -3
- package/dist/app/common/adapter/changesStream/NpmChangesStream.d.ts +3 -2
- package/dist/app/common/adapter/changesStream/NpmChangesStream.js +3 -3
- package/dist/app/common/aop/AsyncTimer.d.ts +3 -5
- package/dist/app/common/aop/AsyncTimer.js +10 -10
- package/dist/app/common/typing.d.ts +5 -5
- package/dist/app/core/entity/Binary.d.ts +3 -2
- package/dist/app/core/entity/Binary.js +1 -1
- package/dist/app/core/entity/Change.d.ts +3 -2
- package/dist/app/core/entity/Change.js +1 -1
- package/dist/app/core/entity/Dist.d.ts +3 -2
- package/dist/app/core/entity/Dist.js +1 -1
- package/dist/app/core/entity/Hook.d.ts +4 -3
- package/dist/app/core/entity/Hook.js +3 -2
- package/dist/app/core/entity/Package.d.ts +3 -2
- package/dist/app/core/entity/Package.js +3 -2
- package/dist/app/core/entity/PackageTag.d.ts +3 -2
- package/dist/app/core/entity/PackageTag.js +1 -1
- package/dist/app/core/entity/PackageVersion.d.ts +4 -3
- package/dist/app/core/entity/PackageVersion.js +1 -1
- package/dist/app/core/entity/PackageVersionBlock.d.ts +3 -2
- package/dist/app/core/entity/PackageVersionBlock.js +1 -1
- package/dist/app/core/entity/PackageVersionFile.d.ts +4 -3
- package/dist/app/core/entity/PackageVersionFile.js +4 -2
- package/dist/app/core/entity/PackageVersionManifest.d.ts +3 -2
- package/dist/app/core/entity/PackageVersionManifest.js +1 -1
- package/dist/app/core/entity/PaddingSemVer.js +2 -2
- package/dist/app/core/entity/ProxyCache.d.ts +4 -3
- package/dist/app/core/entity/ProxyCache.js +1 -1
- package/dist/app/core/entity/Registry.d.ts +3 -2
- package/dist/app/core/entity/Registry.js +1 -1
- package/dist/app/core/entity/Scope.d.ts +3 -2
- package/dist/app/core/entity/Scope.js +1 -1
- package/dist/app/core/entity/Task.d.ts +4 -3
- package/dist/app/core/entity/Task.js +1 -1
- package/dist/app/core/entity/Token.d.ts +3 -2
- package/dist/app/core/entity/Token.js +4 -2
- package/dist/app/core/entity/User.d.ts +3 -2
- package/dist/app/core/entity/User.js +1 -1
- package/dist/app/core/entity/WebauthnCredential.d.ts +3 -2
- package/dist/app/core/entity/WebauthnCredential.js +1 -1
- package/dist/app/core/event/BugVersionFixHandler.js +2 -3
- package/dist/app/core/event/CacheCleaner.js +2 -3
- package/dist/app/core/event/ChangesStream.d.ts +4 -4
- package/dist/app/core/event/ChangesStream.js +15 -9
- package/dist/app/core/event/StoreManifest.d.ts +1 -1
- package/dist/app/core/event/StoreManifest.js +3 -5
- package/dist/app/core/event/SyncESPackage.d.ts +2 -2
- package/dist/app/core/event/SyncESPackage.js +2 -3
- package/dist/app/core/event/SyncPackageVersionFile.d.ts +1 -1
- package/dist/app/core/event/SyncPackageVersionFile.js +6 -7
- package/dist/app/core/event/index.d.ts +1 -1
- package/dist/app/core/service/BinarySyncerService.d.ts +1 -1
- package/dist/app/core/service/BinarySyncerService.js +10 -15
- package/dist/app/core/service/BugVersionService.js +5 -9
- package/dist/app/core/service/CacheService.d.ts +1 -1
- package/dist/app/core/service/CacheService.js +27 -26
- package/dist/app/core/service/ChangesStreamService.d.ts +2 -2
- package/dist/app/core/service/ChangesStreamService.js +13 -18
- package/dist/app/core/service/CreateHookTriggerService.d.ts +1 -1
- package/dist/app/core/service/CreateHookTriggerService.js +4 -7
- package/dist/app/core/service/EventCorkerAdvice.d.ts +1 -1
- package/dist/app/core/service/EventCorkerAdvice.js +5 -3
- package/dist/app/core/service/FixNoPaddingVersionService.js +5 -4
- package/dist/app/core/service/HookManageService.d.ts +1 -1
- package/dist/app/core/service/HookManageService.js +3 -4
- package/dist/app/core/service/HookTriggerService.d.ts +3 -3
- package/dist/app/core/service/HookTriggerService.js +6 -11
- package/dist/app/core/service/PackageManagerService.d.ts +4 -4
- package/dist/app/core/service/PackageManagerService.js +54 -32
- package/dist/app/core/service/PackageSearchService.d.ts +3 -3
- package/dist/app/core/service/PackageSearchService.js +11 -13
- package/dist/app/core/service/PackageSyncerService.d.ts +4 -3
- package/dist/app/core/service/PackageSyncerService.js +76 -53
- package/dist/app/core/service/PackageVersionFileService.d.ts +2 -2
- package/dist/app/core/service/PackageVersionFileService.js +13 -17
- package/dist/app/core/service/PackageVersionService.d.ts +1 -1
- package/dist/app/core/service/PackageVersionService.js +6 -11
- package/dist/app/core/service/ProxyCacheService.d.ts +3 -2
- package/dist/app/core/service/ProxyCacheService.js +38 -25
- package/dist/app/core/service/RegistryManagerService.d.ts +1 -1
- package/dist/app/core/service/RegistryManagerService.js +19 -15
- package/dist/app/core/service/ScopeManagerService.d.ts +1 -1
- package/dist/app/core/service/ScopeManagerService.js +3 -4
- package/dist/app/core/service/TaskService.js +8 -8
- package/dist/app/core/service/TokenService.d.ts +1 -1
- package/dist/app/core/service/TokenService.js +6 -5
- package/dist/app/core/service/UserService.d.ts +4 -3
- package/dist/app/core/service/UserService.js +6 -8
- package/dist/app/core/util/EntityUtil.d.ts +1 -1
- package/dist/app/core/util/EntityUtil.js +1 -1
- package/dist/app/infra/AuthAdapter.d.ts +3 -3
- package/dist/app/infra/AuthAdapter.js +3 -4
- package/dist/app/infra/NFSClientAdapter.d.ts +2 -2
- package/dist/app/infra/NFSClientAdapter.js +3 -3
- package/dist/app/infra/QueueAdapter.d.ts +1 -1
- package/dist/app/infra/QueueAdapter.js +3 -4
- package/dist/app/infra/SearchAdapter.d.ts +2 -2
- package/dist/app/infra/SearchAdapter.js +6 -7
- package/dist/app/port/UserRoleManager.d.ts +5 -5
- package/dist/app/port/UserRoleManager.js +7 -9
- package/dist/app/port/config.d.ts +6 -6
- package/dist/app/port/config.js +1 -1
- package/dist/app/port/controller/AbstractController.d.ts +8 -8
- package/dist/app/port/controller/AbstractController.js +16 -15
- package/dist/app/port/controller/BinarySyncController.d.ts +2 -2
- package/dist/app/port/controller/BinarySyncController.js +5 -4
- package/dist/app/port/controller/ChangesStreamController.d.ts +1 -1
- package/dist/app/port/controller/ChangesStreamController.js +2 -3
- package/dist/app/port/controller/DownloadController.js +3 -4
- package/dist/app/port/controller/HomeController.d.ts +2 -2
- package/dist/app/port/controller/HomeController.js +3 -5
- package/dist/app/port/controller/HookController.d.ts +1 -1
- package/dist/app/port/controller/HookController.js +7 -10
- package/dist/app/port/controller/PackageBlockController.d.ts +2 -2
- package/dist/app/port/controller/PackageBlockController.js +3 -5
- package/dist/app/port/controller/PackageSyncController.d.ts +2 -2
- package/dist/app/port/controller/PackageSyncController.js +13 -11
- package/dist/app/port/controller/PackageTagController.d.ts +1 -1
- package/dist/app/port/controller/PackageTagController.js +2 -3
- package/dist/app/port/controller/PackageVersionFileController.d.ts +1 -1
- package/dist/app/port/controller/PackageVersionFileController.js +12 -10
- package/dist/app/port/controller/ProxyCacheController.d.ts +3 -3
- package/dist/app/port/controller/ProxyCacheController.js +5 -8
- package/dist/app/port/controller/RegistryController.d.ts +5 -4
- package/dist/app/port/controller/RegistryController.js +22 -11
- package/dist/app/port/controller/ScopeController.d.ts +2 -2
- package/dist/app/port/controller/ScopeController.js +7 -6
- package/dist/app/port/controller/TokenController.d.ts +2 -2
- package/dist/app/port/controller/TokenController.js +11 -7
- package/dist/app/port/controller/UserController.d.ts +2 -2
- package/dist/app/port/controller/UserController.js +2 -2
- package/dist/app/port/controller/admin/PaddingVersionController.d.ts +1 -1
- package/dist/app/port/controller/admin/PaddingVersionController.js +2 -3
- package/dist/app/port/controller/convertor/HookConvertor.d.ts +4 -4
- package/dist/app/port/controller/convertor/HookConvertor.js +1 -1
- package/dist/app/port/controller/package/DownloadPackageVersionTar.d.ts +2 -2
- package/dist/app/port/controller/package/DownloadPackageVersionTar.js +8 -13
- package/dist/app/port/controller/package/RemovePackageVersionController.d.ts +1 -1
- package/dist/app/port/controller/package/RemovePackageVersionController.js +5 -5
- package/dist/app/port/controller/package/SavePackageVersionController.d.ts +3 -3
- package/dist/app/port/controller/package/SavePackageVersionController.js +27 -15
- package/dist/app/port/controller/package/SearchPackageController.d.ts +3 -3
- package/dist/app/port/controller/package/SearchPackageController.js +2 -3
- package/dist/app/port/controller/package/ShowPackageController.d.ts +1 -1
- package/dist/app/port/controller/package/ShowPackageController.js +13 -11
- package/dist/app/port/controller/package/ShowPackageVersionController.d.ts +1 -1
- package/dist/app/port/controller/package/ShowPackageVersionController.js +3 -5
- package/dist/app/port/controller/package/UpdatePackageController.d.ts +2 -2
- package/dist/app/port/controller/package/UpdatePackageController.js +5 -5
- package/dist/app/port/middleware/AdminAccess.d.ts +1 -1
- package/dist/app/port/middleware/AlwaysAuth.d.ts +1 -1
- package/dist/app/port/middleware/AlwaysAuth.js +1 -1
- package/dist/app/port/middleware/ErrorHandler.d.ts +1 -1
- package/dist/app/port/middleware/ErrorHandler.js +13 -5
- package/dist/app/port/middleware/Tracing.d.ts +1 -1
- package/dist/app/port/middleware/Tracing.js +1 -1
- package/dist/app/port/schedule/ChangesStreamWorker.js +4 -4
- package/dist/app/port/schedule/CheckProxyCacheUpdateWorker.js +11 -7
- package/dist/app/port/schedule/CheckRecentlyUpdatedPackages.js +10 -7
- package/dist/app/port/schedule/CleanTempDir.js +1 -1
- package/dist/app/port/schedule/CreateSyncBinaryTask.js +2 -3
- package/dist/app/port/schedule/CreateTriggerHookWorker.js +9 -9
- package/dist/app/port/schedule/SavePackageVersionDownloadCounter.js +2 -3
- package/dist/app/port/schedule/SyncBinaryWorker.js +2 -3
- package/dist/app/port/schedule/SyncPackageWorker.js +4 -4
- package/dist/app/port/schedule/SyncProxyCacheWorker.js +4 -4
- package/dist/app/port/schedule/TaskTimeoutHandler.js +3 -5
- package/dist/app/port/schedule/TriggerHookWorker.js +7 -8
- package/dist/app/port/schedule/UpdateTotalData.js +11 -15
- package/dist/app/port/typebox.d.ts +2 -2
- package/dist/app/port/typebox.js +5 -2
- package/dist/app/port/webauth/WebauthController.d.ts +4 -4
- package/dist/app/port/webauth/WebauthController.js +52 -21
- package/dist/app/repository/AbstractRepository.d.ts +1 -1
- package/dist/app/repository/AbstractRepository.js +2 -2
- package/dist/app/repository/ChangeRepository.d.ts +1 -1
- package/dist/app/repository/ChangeRepository.js +4 -2
- package/dist/app/repository/DistRepository.d.ts +2 -2
- package/dist/app/repository/DistRepository.js +3 -5
- package/dist/app/repository/HookRepository.d.ts +1 -1
- package/dist/app/repository/HookRepository.js +1 -1
- package/dist/app/repository/PackageRepository.d.ts +2 -2
- package/dist/app/repository/PackageRepository.js +68 -27
- package/dist/app/repository/PackageVersionRepository.d.ts +2 -2
- package/dist/app/repository/PackageVersionRepository.js +12 -13
- package/dist/app/repository/ProxyCacheRepository.d.ts +2 -2
- package/dist/app/repository/ProxyCacheRepository.js +28 -10
- package/dist/app/repository/RegistryRepository.d.ts +3 -2
- package/dist/app/repository/RegistryRepository.js +1 -1
- package/dist/app/repository/ScopeRepository.d.ts +2 -2
- package/dist/app/repository/ScopeRepository.js +4 -2
- package/dist/app/repository/SearchRepository.d.ts +2 -2
- package/dist/app/repository/SearchRepository.js +1 -1
- package/dist/app/repository/TaskRepository.d.ts +3 -2
- package/dist/app/repository/TaskRepository.js +1 -1
- package/dist/app/repository/UserRepository.js +8 -5
- package/dist/app/repository/model/HistoryTask.d.ts +1 -1
- package/dist/app/repository/model/HistoryTask.js +1 -2
- package/dist/app/repository/model/Hook.d.ts +1 -1
- package/dist/app/repository/model/Hook.js +1 -2
- package/dist/app/repository/model/ProxyCache.d.ts +1 -1
- package/dist/app/repository/model/ProxyCache.js +1 -2
- package/dist/app/repository/model/Registry.d.ts +1 -1
- package/dist/app/repository/model/Registry.js +1 -2
- package/dist/app/repository/model/Task.d.ts +1 -1
- package/dist/app/repository/model/Task.js +1 -2
- package/dist/app/repository/util/EntityProperty.js +1 -1
- package/dist/app/repository/util/ModelConvertor.d.ts +2 -2
- package/dist/app/repository/util/ModelConvertor.js +7 -4
- package/dist/app/repository/util/ModelConvertorUtil.d.ts +1 -1
- package/dist/app/repository/util/ModelConvertorUtil.js +1 -1
- package/dist/app.d.ts +1 -1
- package/dist/app.js +1 -1
- package/dist/config/config.default.d.ts +3 -3
- package/dist/config/config.default.js +5 -9
- package/dist/config/config.unittest.d.ts +2 -3
- package/dist/config/config.unittest.js +3 -3
- package/dist/config/plugin.d.ts +1 -1
- package/package.json +18 -10
|
@@ -7,8 +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, SingletonProto, Inject
|
|
11
|
-
import { ScopeRepository } from '../../repository/ScopeRepository.js';
|
|
10
|
+
import { AccessLevel, SingletonProto, Inject } from '@eggjs/tegg';
|
|
12
11
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
13
12
|
import { Scope } from '../entity/Scope.js';
|
|
14
13
|
let ScopeManagerService = class ScopeManagerService extends AbstractService {
|
|
@@ -49,7 +48,7 @@ let ScopeManagerService = class ScopeManagerService extends AbstractService {
|
|
|
49
48
|
};
|
|
50
49
|
__decorate([
|
|
51
50
|
Inject(),
|
|
52
|
-
__metadata("design:type",
|
|
51
|
+
__metadata("design:type", Function)
|
|
53
52
|
], ScopeManagerService.prototype, "scopeRepository", void 0);
|
|
54
53
|
ScopeManagerService = __decorate([
|
|
55
54
|
SingletonProto({
|
|
@@ -57,4 +56,4 @@ ScopeManagerService = __decorate([
|
|
|
57
56
|
})
|
|
58
57
|
], ScopeManagerService);
|
|
59
58
|
export { ScopeManagerService };
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2NvcGVNYW5hZ2VyU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3NlcnZpY2UvU2NvcGVNYW5hZ2VyU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGNBQWMsRUFBRSxNQUFNLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFbEUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQXVCcEMsSUFBTSxtQkFBbUIsR0FBekIsTUFBTSxtQkFBb0IsU0FBUSxlQUFlO0lBSXRELEtBQUssQ0FBQyxVQUFVLENBQUMsSUFBWTtRQUMzQixNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxVQUFrQjtRQUN4QyxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsaUJBQWlCLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDdkUsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVcsQ0FBQyxTQUF5QjtRQUN6QyxNQUFNLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUM7UUFDbkQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2QseUVBQXlFLEVBQ3pFLFVBQVUsRUFDVixTQUFTLENBQ1YsQ0FBQztRQUNGLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUM7WUFDekIsSUFBSTtZQUNKLFVBQVU7U0FDWCxDQUFDLENBQUM7UUFDSCxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVDLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyxVQUFVLENBQUMsSUFBaUI7UUFDaEMsT0FBTyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JELENBQUM7SUFFRCxLQUFLLENBQUMsc0JBQXNCLENBQzFCLFVBQWtCLEVBQ2xCLElBQWlCO1FBRWpCLE9BQU8sTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLHNCQUFzQixDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM3RSxDQUFDO0lBRUQsS0FBSyxDQUFDLGtCQUFrQixDQUN0QixTQUFxQztRQUVyQyxNQUFNLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxHQUFHLFNBQVMsQ0FBQztRQUM3QyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZCxxRUFBcUUsRUFDckUsVUFBVSxFQUNWLFVBQVUsQ0FDWCxDQUFDO1FBQ0YsT0FBTyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsdUJBQXVCLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDeEUsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsU0FBeUI7UUFDcEMsTUFBTSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUM7UUFDMUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2Qsa0VBQWtFLEVBQ2xFLFVBQVUsRUFDVixPQUFPLENBQ1IsQ0FBQztRQUNGLE9BQU8sTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN6RCxDQUFDO0NBQ0YsQ0FBQTtBQTNEa0I7SUFEaEIsTUFBTSxFQUFFOzs0REFDeUM7QUFGdkMsbUJBQW1CO0lBSC9CLGNBQWMsQ0FBQztRQUNkLFdBQVcsRUFBRSxXQUFXLENBQUMsTUFBTTtLQUNoQyxDQUFDO0dBQ1csbUJBQW1CLENBNkQvQiJ9
|
|
@@ -7,11 +7,9 @@ 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, SingletonProto, Inject
|
|
11
|
-
import { NFSAdapter } from '../../common/adapter/NFSAdapter.js';
|
|
10
|
+
import { AccessLevel, SingletonProto, Inject } from '@eggjs/tegg';
|
|
12
11
|
import { TaskState, TaskType } from '../../common/enum/Task.js';
|
|
13
12
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
14
|
-
import { TaskRepository } from '../../repository/TaskRepository.js';
|
|
15
13
|
import { Task } from '../entity/Task.js';
|
|
16
14
|
let TaskService = class TaskService extends AbstractService {
|
|
17
15
|
async getTaskQueueLength(taskType) {
|
|
@@ -26,7 +24,8 @@ let TaskService = class TaskService extends AbstractService {
|
|
|
26
24
|
if (existsTask.state === TaskState.Waiting) {
|
|
27
25
|
if (task.type === TaskType.SyncPackage) {
|
|
28
26
|
// 如果是specificVersions的任务则可能可以和存量任务进行合并
|
|
29
|
-
const specificVersions = task
|
|
27
|
+
const specificVersions = task
|
|
28
|
+
.data?.specificVersions;
|
|
30
29
|
const existsTaskSpecificVersions = existsTask.data?.specificVersions;
|
|
31
30
|
if (existsTaskSpecificVersions) {
|
|
32
31
|
if (specificVersions) {
|
|
@@ -161,7 +160,8 @@ let TaskService = class TaskService extends AbstractService {
|
|
|
161
160
|
catch (err) {
|
|
162
161
|
// [PositionNotEqualToLengthError]: Position is not equal to file length, status: 409
|
|
163
162
|
// [ObjectNotAppendableError]: The object is not appendable
|
|
164
|
-
if (err.code === 'PositionNotEqualToLength' ||
|
|
163
|
+
if (err.code === 'PositionNotEqualToLength' ||
|
|
164
|
+
err.code === 'ObjectNotAppendable') {
|
|
165
165
|
// override exists log file
|
|
166
166
|
await this.nfsAdapter.uploadBytes(task.logPath, Buffer.from(appendLog + '\n'));
|
|
167
167
|
return;
|
|
@@ -172,11 +172,11 @@ let TaskService = class TaskService extends AbstractService {
|
|
|
172
172
|
};
|
|
173
173
|
__decorate([
|
|
174
174
|
Inject(),
|
|
175
|
-
__metadata("design:type",
|
|
175
|
+
__metadata("design:type", Function)
|
|
176
176
|
], TaskService.prototype, "taskRepository", void 0);
|
|
177
177
|
__decorate([
|
|
178
178
|
Inject(),
|
|
179
|
-
__metadata("design:type",
|
|
179
|
+
__metadata("design:type", Function)
|
|
180
180
|
], TaskService.prototype, "nfsAdapter", void 0);
|
|
181
181
|
__decorate([
|
|
182
182
|
Inject(),
|
|
@@ -188,4 +188,4 @@ TaskService = __decorate([
|
|
|
188
188
|
})
|
|
189
189
|
], TaskService);
|
|
190
190
|
export { TaskService };
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TaskService.js","sourceRoot":"","sources":["../../../../app/core/service/TaskService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAGlE,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAMlC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,eAAe;IAQvC,KAAK,CAAC,kBAAkB,CAAC,QAAkB;QAChD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,IAAU,EAAE,oBAA6B;QAC/D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAC/D,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,IAAI,CACV,CAAC;QAEF,qCAAqC;QACrC,IAAI,UAAU,IAAI,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACvD,4BAA4B;YAC5B,gCAAgC;YAChC,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;gBAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;oBACvC,uCAAuC;oBACvC,MAAM,gBAAgB,GAAI,IAAwC;yBAC/D,IAAI,EAAE,gBAAgB,CAAC;oBAC1B,MAAM,0BAA0B,GAC9B,UACD,CAAC,IAAI,EAAE,gBAAgB,CAAC;oBACzB,IAAI,0BAA0B,EAAE,CAAC;wBAC/B,IAAI,gBAAgB,EAAE,CAAC;4BACrB,oCAAoC;4BACpC,MAAM,IAAI,CAAC,cAAc,CAAC,mCAAmC,CAC3D,UAAU,EACV,gBAAgB,CACjB,CAAC;wBACJ,CAAC;6BAAM,CAAC;4BACN,qCAAqC;4BACrC,MAAM,IAAI,CAAC,cAAc,CAAC,mCAAmC,CAC3D,UAAU,CACX,CAAC;wBACJ,CAAC;oBACH,CAAC;oBACD,wBAAwB;gBAC1B,CAAC;gBACD,WAAW;gBACX,IAAI,oBAAoB,EAAE,CAAC;oBACzB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC7D,IAAI,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAC;wBAC9D,kCAAkC;wBAClC,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAS,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;wBACnE,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,mGAAmG,EACnG,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,EACX,WAAW,CACZ,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAS,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,uFAAuF,EACvF,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,EACX,WAAW,CACZ,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,IAAU,EAAE,SAAkB;QACnD,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC;QAC/B,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAS,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,uFAAuF,EACvF,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,EACX,WAAW,CACZ,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,MAAc;QAClC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,UAAyB;QAC9C,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,IAAU;QACjC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,QAAkB;QAC7C,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAS,QAAQ,CAAC,CAAC;QAC3D,IAAI,IAAiB,CAAC;QAEtB,OAAO,MAAM,EAAE,CAAC;YACd,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAElD,cAAc;YACd,WAAW;YACX,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,EAAE,KAAK,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;gBACvD,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAS,QAAQ,CAAC,CAAC;gBACvD,SAAS;YACX,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAC/B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAC9D,IAAI,EACJ,SAAS,CACV,CAAC;YACF,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAS,QAAQ,CAAC,CAAC;gBACvD,SAAS;YACX,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,wBAAwB;QACnC,0CAA0C;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CACtD,SAAS,CAAC,UAAU,EACpB,KAAK,GAAG,EAAE,CACX,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,8CAA8C;gBAC9C,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,aAAa,EAAE,CAAC;oBAC/D,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;oBAC/C,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,kHAAkH,EAClH,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,QAAQ,CACd,CAAC;oBACF,SAAS;gBACX,CAAC;gBACD,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC;oBACvB,gBAAgB;oBAChB,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,CAAC;gBACD,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,qHAAqH,EACrH,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,QAAQ,CACd,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,sIAAsI,EACtI,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,QAAQ,CACd,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QACD,uCAAuC;QACvC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAC7D,SAAS,CAAC,OAAO,EACjB,KAAK,GAAG,EAAE,CACX,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,+GAA+G,EAC/G,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,CACZ,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mIAAmI,EACnI,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,QAAQ,CACd,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QACD,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,MAAM;YACxB,OAAO,EAAE,YAAY,CAAC,MAAM;SAC7B,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,IAAU,EAAE,SAAiB;QACtD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,IAAU,EACV,SAAoB,EACpB,SAAkB;QAElB,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,IAAU,EAAE,SAAiB;QACxD,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CACpD,IAAI,CAAC,OAAO,EACZ,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,EAC7B,IAAI,CAAC,gBAAgB,EACrB;gBACE,cAAc,EAAE,2BAA2B;aAC5C,CACF,CAAC;YACF,IAAI,YAAY,EAAE,CAAC;gBACjB,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC;YACvC,CAAC;QACH,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,qFAAqF;YACrF,2DAA2D;YAC3D,IACE,GAAG,CAAC,IAAI,KAAK,0BAA0B;gBACvC,GAAG,CAAC,IAAI,KAAK,qBAAqB,EAClC,CAAC;gBACD,2BAA2B;gBAC3B,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAC/B,IAAI,CAAC,OAAO,EACZ,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,CAC9B,CAAC;gBACF,OAAO;YACT,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;CACF,CAAA;AA9PkB;IADhB,MAAM,EAAE;;mDACuC;AAE/B;IADhB,MAAM,EAAE;;+CAC+B;AAEvB;IADhB,MAAM,EAAE;;iDACmC;AANjC,WAAW;IAHvB,cAAc,CAAC;QACd,WAAW,EAAE,WAAW,CAAC,MAAM;KAChC,CAAC;GACW,WAAW,CAgQvB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
2
|
-
import { Token } from '../entity/Token.js';
|
|
2
|
+
import type { Token } from '../entity/Token.js';
|
|
3
3
|
import { Package as PackageEntity } from '../entity/Package.js';
|
|
4
4
|
export declare class TokenService extends AbstractService {
|
|
5
5
|
private readonly TokenPackage;
|
|
@@ -8,7 +8,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
10
|
import dayjs from 'dayjs';
|
|
11
|
-
import { AccessLevel, SingletonProto, Inject
|
|
11
|
+
import { AccessLevel, SingletonProto, Inject } from '@eggjs/tegg';
|
|
12
12
|
import { isEmpty } from 'lodash-es';
|
|
13
13
|
import { ForbiddenError, UnauthorizedError } from 'egg-errors';
|
|
14
14
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
@@ -17,12 +17,13 @@ import { ModelConvertor } from '../../../app/repository/util/ModelConvertor.js';
|
|
|
17
17
|
import { Package as PackageEntity } from '../entity/Package.js';
|
|
18
18
|
import { getScopeAndName } from '../../../app/common/PackageUtil.js';
|
|
19
19
|
import { sha512 } from '../../../app/common/UserUtil.js';
|
|
20
|
-
import { UserRepository } from '../../../app/repository/UserRepository.js';
|
|
21
20
|
let TokenService = class TokenService extends AbstractService {
|
|
22
21
|
async listTokenPackages(token) {
|
|
23
22
|
if (isGranularToken(token)) {
|
|
24
23
|
const models = await this.TokenPackage.find({ tokenId: token.tokenId });
|
|
25
|
-
const packages = await this.Package.find({
|
|
24
|
+
const packages = await this.Package.find({
|
|
25
|
+
packageId: models.map(m => m.packageId),
|
|
26
|
+
});
|
|
26
27
|
return packages.map(pkg => ModelConvertor.convertModelToEntity(pkg, PackageEntity));
|
|
27
28
|
}
|
|
28
29
|
return null;
|
|
@@ -76,7 +77,7 @@ __decorate([
|
|
|
76
77
|
], TokenService.prototype, "Package", void 0);
|
|
77
78
|
__decorate([
|
|
78
79
|
Inject(),
|
|
79
|
-
__metadata("design:type",
|
|
80
|
+
__metadata("design:type", Function)
|
|
80
81
|
], TokenService.prototype, "userRepository", void 0);
|
|
81
82
|
TokenService = __decorate([
|
|
82
83
|
SingletonProto({
|
|
@@ -84,4 +85,4 @@ TokenService = __decorate([
|
|
|
84
85
|
})
|
|
85
86
|
], TokenService);
|
|
86
87
|
export { TokenService };
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW5TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvcmUvc2VydmljZS9Ub2tlblNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBQzFCLE9BQU8sRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxjQUFjLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDL0QsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWxFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUdyRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0RBQWdELENBQUM7QUFDaEYsT0FBTyxFQUFFLE9BQU8sSUFBSSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNoRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDckUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBTWxELElBQU0sWUFBWSxHQUFsQixNQUFNLFlBQWEsU0FBUSxlQUFlO0lBUXhDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFZO1FBQ3pDLElBQUksZUFBZSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDM0IsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztZQUN4RSxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO2dCQUN2QyxTQUFTLEVBQUUsTUFBTSxDQUFDLEdB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
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { User as UserEntity } from '../entity/User.js';
|
|
2
|
-
import {
|
|
2
|
+
import type { TokenType } from '../entity/Token.js';
|
|
3
|
+
import { Token as TokenEntity } from '../entity/Token.js';
|
|
3
4
|
import { WebauthnCredential as WebauthnCredentialEntity } from '../entity/WebauthnCredential.js';
|
|
4
5
|
import { LoginResultCode } from '../../common/enum/User.js';
|
|
5
6
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
6
|
-
import { Registry } from '../entity/Registry.js';
|
|
7
|
+
import type { Registry } from '../entity/Registry.js';
|
|
7
8
|
type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
|
|
8
9
|
type CreateUser = {
|
|
9
10
|
name: string;
|
|
@@ -45,7 +46,7 @@ export declare class UserService extends AbstractService {
|
|
|
45
46
|
findInRegistry(registry: Registry, name: string): Promise<UserEntity | null>;
|
|
46
47
|
findUserByName(name: string): Promise<UserEntity | null>;
|
|
47
48
|
login(name: string, password: string): Promise<LoginResult>;
|
|
48
|
-
findOrCreateUser({ name, email, ip, password }: Optional<CreateUser, 'password'>): Promise<UserEntity>;
|
|
49
|
+
findOrCreateUser({ name, email, ip, password, }: Optional<CreateUser, 'password'>): Promise<UserEntity>;
|
|
49
50
|
ensureTokenByUser(opts: Optional<CreateUser, 'password'>): Promise<{
|
|
50
51
|
user: UserEntity;
|
|
51
52
|
token: TokenEntity;
|
|
@@ -8,16 +8,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
import crypto from 'node:crypto';
|
|
11
|
-
import { AccessLevel, SingletonProto, Inject
|
|
11
|
+
import { AccessLevel, SingletonProto, Inject } from '@eggjs/tegg';
|
|
12
12
|
import { NotFoundError, ForbiddenError } from 'egg-errors';
|
|
13
|
-
import { UserRepository } from '../../repository/UserRepository.js';
|
|
14
13
|
import { User as UserEntity } from '../entity/User.js';
|
|
15
14
|
import { Token as TokenEntity } from '../entity/Token.js';
|
|
16
15
|
import { WebauthnCredential as WebauthnCredentialEntity } from '../entity/WebauthnCredential.js';
|
|
17
16
|
import { LoginResultCode } from '../../common/enum/User.js';
|
|
18
|
-
import { integrity, checkIntegrity, randomToken, sha512 } from '../../common/UserUtil.js';
|
|
17
|
+
import { integrity, checkIntegrity, randomToken, sha512, } from '../../common/UserUtil.js';
|
|
19
18
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
20
|
-
import { RegistryManagerService } from './RegistryManagerService.js';
|
|
21
19
|
import { getPrefixedName } from '../../common/PackageUtil.js';
|
|
22
20
|
let UserService = class UserService extends AbstractService {
|
|
23
21
|
checkPassword(user, password) {
|
|
@@ -54,7 +52,7 @@ let UserService = class UserService extends AbstractService {
|
|
|
54
52
|
const token = await this.createToken(user.userId);
|
|
55
53
|
return { code: LoginResultCode.Success, user, token };
|
|
56
54
|
}
|
|
57
|
-
async findOrCreateUser({ name, email, ip, password = crypto.randomUUID() }) {
|
|
55
|
+
async findOrCreateUser({ name, email, ip, password = crypto.randomUUID(), }) {
|
|
58
56
|
let user = await this.userRepository.findUserByName(name);
|
|
59
57
|
if (!user) {
|
|
60
58
|
const createRes = await this.create({
|
|
@@ -167,11 +165,11 @@ let UserService = class UserService extends AbstractService {
|
|
|
167
165
|
};
|
|
168
166
|
__decorate([
|
|
169
167
|
Inject(),
|
|
170
|
-
__metadata("design:type",
|
|
168
|
+
__metadata("design:type", Function)
|
|
171
169
|
], UserService.prototype, "userRepository", void 0);
|
|
172
170
|
__decorate([
|
|
173
171
|
Inject(),
|
|
174
|
-
__metadata("design:type",
|
|
172
|
+
__metadata("design:type", Function)
|
|
175
173
|
], UserService.prototype, "registryManagerService", void 0);
|
|
176
174
|
UserService = __decorate([
|
|
177
175
|
SingletonProto({
|
|
@@ -179,4 +177,4 @@ UserService = __decorate([
|
|
|
179
177
|
})
|
|
180
178
|
], UserService);
|
|
181
179
|
export { UserService };
|
|
182
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
180
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"UserService.js","sourceRoot":"","sources":["../../../../app/core/service/UserService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EntityData } from '../entity/Entity.js';
|
|
1
|
+
import type { EntityData } from '../entity/Entity.js';
|
|
2
2
|
type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
|
|
3
3
|
export type EasyData<T extends EntityData, Id extends keyof T> = PartialBy<T, 'createdAt' | 'updatedAt' | Id>;
|
|
4
4
|
export interface PageOptions {
|
|
@@ -23,4 +23,4 @@ export class EntityUtil {
|
|
|
23
23
|
};
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW50aXR5VXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3V0aWwvRW50aXR5VXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLFFBQVEsTUFBTSxlQUFlLENBQUM7QUFDckMsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFlBQVksQ0FBQztBQVdsQyxNQUFNLGFBQWEsR0FBRyxHQUFZLENBQUM7QUFjbkMsTUFBTSxPQUFPLFVBQVU7SUFDckIsTUFBTSxDQUFDLFdBQVcsQ0FDaEIsSUFBcUIsRUFDckIsRUFBTTtRQUVOLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUM3QyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUM5QyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUM5QyxPQUFPLElBQVMsQ0FBQztJQUNuQixDQUFDO0lBRUQsTUFBTSxDQUFDLFFBQVE7UUFDYix3REFBd0Q7UUFDeEQsT0FBTyxJQUFJLFFBQVEsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ3RDLENBQUM7SUFFRCxNQUFNLENBQUMsK0JBQStCLENBQUMsSUFBaUI7UUFDdEQsTUFBTSxFQUFFLFNBQVMsR0FBRyxDQUFDLEVBQUUsUUFBUSxHQUFHLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FBQztRQUM5QyxJQUFJLFFBQVEsR0FBRyxhQUFhLEVBQUUsQ0FBQztZQUM3QixNQUFNLElBQUksSUFBSSxDQUFDLDRDQUE0QyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQ3pFLENBQUM7UUFDRCxPQUFPO1lBQ0wsTUFBTSxFQUFFLFNBQVMsR0FBRyxRQUFRO1lBQzVCLEtBQUssRUFBRSxRQUFRO1NBQ2hCLENBQUM7SUFDSixDQUFDO0NBQ0YifQ==
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { EggContext } from '@eggjs/tegg';
|
|
2
|
-
import { Redis } from 'ioredis';
|
|
3
|
-
import { AuthClient, AuthUrlResult, userResult } from '../common/typing.js';
|
|
1
|
+
import type { EggContext } from '@eggjs/tegg';
|
|
2
|
+
import type { Redis } from 'ioredis';
|
|
3
|
+
import type { AuthClient, AuthUrlResult, userResult } from '../common/typing.js';
|
|
4
4
|
type SSO_USER = {
|
|
5
5
|
name: string;
|
|
6
6
|
email: string;
|
|
@@ -7,8 +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, Inject, SingletonProto
|
|
11
|
-
import { Redis } from 'ioredis';
|
|
10
|
+
import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
12
11
|
import { randomUUID } from 'node:crypto';
|
|
13
12
|
const ONE_DAY = 3600 * 24;
|
|
14
13
|
/**
|
|
@@ -36,7 +35,7 @@ let AuthAdapter = class AuthAdapter {
|
|
|
36
35
|
};
|
|
37
36
|
__decorate([
|
|
38
37
|
Inject(),
|
|
39
|
-
__metadata("design:type",
|
|
38
|
+
__metadata("design:type", Function)
|
|
40
39
|
], AuthAdapter.prototype, "redis", void 0);
|
|
41
40
|
__decorate([
|
|
42
41
|
Inject(),
|
|
@@ -49,4 +48,4 @@ AuthAdapter = __decorate([
|
|
|
49
48
|
})
|
|
50
49
|
], AuthAdapter);
|
|
51
50
|
export { AuthAdapter };
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXV0aEFkYXB0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvaW5mcmEvQXV0aEFkYXB0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQ0EsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRWxFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFRekMsTUFBTSxPQUFPLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztBQU8xQjs7R0FFRztBQUtJLElBQU0sV0FBVyxHQUFqQixNQUFNLFdBQVc7SUFPdEIsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFlO1FBQzlCLE1BQU0sU0FBUyxHQUFHLFVBQVUsRUFBRSxDQUFDO1FBQy9CLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUUvQyxlQUFlO1FBQ2YsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQztRQUNsRCxPQUFPO1lBQ0wsUUFBUSxFQUFFLEdBQUcsUUFBUSwrQkFBK0IsU0FBUyxFQUFFO1lBQy9ELE9BQU8sRUFBRSxHQUFHLFFBQVEsNEJBQTRCLFNBQVMsRUFBRTtTQUM1RCxDQUFDO0lBQ0osQ0FBQztJQUVELDZCQUE2QjtJQUM3QixLQUFLLENBQUMsaUJBQWlCO1FBQ3JCLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2QsTUFBTSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1lBQ2xDLE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFnQixDQUFDO1FBQ3ZDLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7Q0FDRixDQUFBO0FBekJVO0lBRFIsTUFBTSxFQUFFOzswQ0FDYTtBQUdiO0lBRFIsTUFBTSxFQUFFOzt5Q0FDZTtBQUxiLFdBQVc7SUFKdkIsY0FBYyxDQUFDO1FBQ2QsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO1FBQy9CLElBQUksRUFBRSxhQUFhO0tBQ3BCLENBQUM7R0FDVyxXQUFXLENBMkJ2QiJ9
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Readable } from 'node:stream';
|
|
2
|
-
import { AppendResult, NFSClient, UploadOptions, UploadResult, DownloadOptions } from '../common/typing.js';
|
|
1
|
+
import type { Readable } from 'node:stream';
|
|
2
|
+
import type { AppendResult, NFSClient, UploadOptions, UploadResult, DownloadOptions } from '../common/typing.js';
|
|
3
3
|
export declare class NFSClientAdapter implements NFSClient {
|
|
4
4
|
private logger;
|
|
5
5
|
private config;
|
|
@@ -20,10 +20,10 @@ let NFSClientAdapter = class NFSClientAdapter {
|
|
|
20
20
|
}
|
|
21
21
|
else {
|
|
22
22
|
if (this.config.env === 'prod') {
|
|
23
|
-
throw new Error(
|
|
23
|
+
throw new Error("[NFSAdapter] Can't use local fs NFS on production env");
|
|
24
24
|
}
|
|
25
25
|
// try to use fs-cnpm, don't use it on production env
|
|
26
|
-
this.logger.warn(
|
|
26
|
+
this.logger.warn("[NFSAdapter] Don't use local fs NFS on production env, store on %s", this.config.nfs.dir);
|
|
27
27
|
this._client = new FSClient({ dir: this.config.nfs.dir });
|
|
28
28
|
}
|
|
29
29
|
if (typeof this._client.url === 'function') {
|
|
@@ -85,4 +85,4 @@ NFSClientAdapter = __decorate([
|
|
|
85
85
|
})
|
|
86
86
|
], NFSClientAdapter);
|
|
87
87
|
export { NFSClientAdapter };
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTkZTQ2xpZW50QWRhcHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9pbmZyYS9ORlNDbGllbnRBZGFwdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUNBLE9BQU8sRUFDTCxXQUFXLEVBQ1gsYUFBYSxFQUNiLE1BQU0sRUFDTixjQUFjLEdBQ2YsTUFBTSxhQUFhLENBQUM7QUFFckIsT0FBTyxRQUFRLE1BQU0sU0FBUyxDQUFDO0FBY3hCLElBQU0sZ0JBQWdCLEdBQXRCLE1BQU0sZ0JBQWdCO0lBUzNCLElBQUksTUFBTTtRQUNSLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN0QixDQUFDO0lBS2UsQUFBTixLQUFLLENBQUMsSUFBSTtRQUNsQixrRUFBa0U7UUFDbEUsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUMzQixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztRQUN4QyxDQUFDO2FBQU0sQ0FBQztZQUNOLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEtBQUssTUFBTSxFQUFFLENBQUM7Z0JBQy9CLE1BQU0sSUFBSSxLQUFLLENBQ2IsdURBQXVELENBQ3hELENBQUM7WUFDSixDQUFDO1lBRUQscURBQXFEO1lBQ3JELElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUNkLG9FQUFvRSxFQUNwRSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQ3BCLENBQUM7WUFDRixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksUUFBUSxDQUFDLEVBQUUsR0FBRyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDNUQsQ0FBQztRQUVELElBQUksT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsS0FBSyxVQUFV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
|
|
@@ -7,8 +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, Inject, SingletonProto
|
|
11
|
-
import { Redis } from 'ioredis';
|
|
10
|
+
import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
12
11
|
/**
|
|
13
12
|
* Use sort set to keep queue in order and keep same value only insert once
|
|
14
13
|
*/
|
|
@@ -40,7 +39,7 @@ let RedisQueueAdapter = class RedisQueueAdapter {
|
|
|
40
39
|
};
|
|
41
40
|
__decorate([
|
|
42
41
|
Inject(),
|
|
43
|
-
__metadata("design:type",
|
|
42
|
+
__metadata("design:type", Function)
|
|
44
43
|
], RedisQueueAdapter.prototype, "redis", void 0);
|
|
45
44
|
RedisQueueAdapter = __decorate([
|
|
46
45
|
SingletonProto({
|
|
@@ -49,4 +48,4 @@ RedisQueueAdapter = __decorate([
|
|
|
49
48
|
})
|
|
50
49
|
], RedisQueueAdapter);
|
|
51
50
|
export { RedisQueueAdapter };
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUXVldWVBZGFwdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL2luZnJhL1F1ZXVlQWRhcHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFLbEU7O0dBRUc7QUFLSSxJQUFNLGlCQUFpQixHQUF2QixNQUFNLGlCQUFpQjtJQUlwQixZQUFZLENBQUMsR0FBVztRQUM5QixPQUFPLGlCQUFpQixHQUFHLEVBQUUsQ0FBQztJQUNoQyxDQUFDO0lBRU8saUJBQWlCLENBQUMsR0FBVztRQUNuQyxPQUFPLG1CQUFtQixHQUFHLEVBQUUsQ0FBQztJQUNsQyxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLElBQUksQ0FBSSxHQUFXLEVBQUUsSUFBTztRQUNoQyxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ2pFLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQy9CLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEVBQ3RCLEtBQUssRUFDTCxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUNyQixDQUFDO1FBQ0YsT0FBTyxHQUFHLEtBQUssQ0FBQyxDQUFDO0lBQ25CLENBQUM7SUFFRCxLQUFLLENBQUMsR0FBRyxDQUFJLEdBQVc7UUFDdEIsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ2hFLElBQUksQ0FBQyxJQUFJO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDdkIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBTSxDQUFDO0lBQy9CLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQVc7UUFDdEIsT0FBTyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3pFLENBQUM7Q0FDRixDQUFBO0FBakNrQjtJQURoQixNQUFNLEVBQUU7O2dEQUNxQjtBQUZuQixpQkFBaUI7SUFKN0IsY0FBYyxDQUFDO1FBQ2QsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO1FBQy9CLElBQUksRUFBRSxjQUFjO0tBQ3JCLENBQUM7R0FDVyxpQkFBaUIsQ0FtQzdCIn0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { estypes } from '@elastic/elasticsearch';
|
|
2
|
-
import { SearchAdapter } from '../common/typing.js';
|
|
1
|
+
import type { estypes } from '@elastic/elasticsearch';
|
|
2
|
+
import type { SearchAdapter } from '../common/typing.js';
|
|
3
3
|
/**
|
|
4
4
|
* Use elasticsearch to search the huge npm packages.
|
|
5
5
|
*/
|
|
@@ -7,14 +7,13 @@ 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, Inject, SingletonProto
|
|
11
|
-
import { Client as ElasticsearchClient } from '@elastic/elasticsearch';
|
|
10
|
+
import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
12
11
|
/**
|
|
13
12
|
* Use elasticsearch to search the huge npm packages.
|
|
14
13
|
*/
|
|
15
14
|
let ESSearchAdapter = class ESSearchAdapter {
|
|
16
15
|
async search(query) {
|
|
17
|
-
const { cnpmcore: { elasticsearchIndex: index } } = this.config;
|
|
16
|
+
const { cnpmcore: { elasticsearchIndex: index }, } = this.config;
|
|
18
17
|
const result = await this.elasticsearch.search({
|
|
19
18
|
index,
|
|
20
19
|
...query,
|
|
@@ -22,7 +21,7 @@ let ESSearchAdapter = class ESSearchAdapter {
|
|
|
22
21
|
return result.hits;
|
|
23
22
|
}
|
|
24
23
|
async upsert(id, document) {
|
|
25
|
-
const { cnpmcore: { elasticsearchIndex: index } } = this.config;
|
|
24
|
+
const { cnpmcore: { elasticsearchIndex: index }, } = this.config;
|
|
26
25
|
const res = await this.elasticsearch.index({
|
|
27
26
|
id,
|
|
28
27
|
index,
|
|
@@ -31,7 +30,7 @@ let ESSearchAdapter = class ESSearchAdapter {
|
|
|
31
30
|
return res._id;
|
|
32
31
|
}
|
|
33
32
|
async delete(id) {
|
|
34
|
-
const { cnpmcore: { elasticsearchIndex: index } } = this.config;
|
|
33
|
+
const { cnpmcore: { elasticsearchIndex: index }, } = this.config;
|
|
35
34
|
const res = await this.elasticsearch.delete({
|
|
36
35
|
index,
|
|
37
36
|
id,
|
|
@@ -45,7 +44,7 @@ __decorate([
|
|
|
45
44
|
], ESSearchAdapter.prototype, "config", void 0);
|
|
46
45
|
__decorate([
|
|
47
46
|
Inject(),
|
|
48
|
-
__metadata("design:type",
|
|
47
|
+
__metadata("design:type", Function)
|
|
49
48
|
], ESSearchAdapter.prototype, "elasticsearch", void 0);
|
|
50
49
|
ESSearchAdapter = __decorate([
|
|
51
50
|
SingletonProto({
|
|
@@ -54,4 +53,4 @@ ESSearchAdapter = __decorate([
|
|
|
54
53
|
})
|
|
55
54
|
], ESSearchAdapter);
|
|
56
55
|
export { ESSearchAdapter };
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VhcmNoQWRhcHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9pbmZyYS9TZWFyY2hBZGFwdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQVNsRTs7R0FFRztBQUtJLElBQU0sZUFBZSxHQUFyQixNQUFNLGVBQWU7SUFPMUIsS0FBSyxDQUFDLE1BQU0sQ0FBSSxLQUFVO1FBQ3hCLE1BQU0sRUFDSixRQUFRLEVBQUUsRUFBRSxrQkFBa0IsRUFBRSxLQUFLLEVBQUUsR0FDeEMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQ2hCLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUk7WUFDaEQsS0FBSztZQUNMLEdBQUcsS0FBSztTQUNULENBQUMsQ0FBQztRQUNILE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQztJQUNyQixDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU0sQ0FBSSxFQUFVLEVBQUUsUUFBVztRQUNyQyxNQUFNLEVBQ0osUUFBUSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsS0FBSyxFQUFFLEdBQ3hDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUNoQixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDO1lBQ3pDLEVBQUU7WUFDRixLQUFLO1lBQ0wsUUFBUTtTQUNULENBQUMsQ0FBQztRQUNILE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQztJQUNqQixDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFVO1FBQ3JCLE1BQU0sRUFDSixRQUFRLEVBQUUsRUFBRSxrQkFBa0IsRUFBRSxLQUFLLEVBQUUsR0FDeEMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQ2hCLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUM7WUFDMUMsS0FBSztZQUNMLEVBQUU7U0FDSCxDQUFDLENBQUM7UUFDSCxPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUM7SUFDakIsQ0FBQztDQUNGLENBQUE7QUF0Q1M7SUFEUCxNQUFNLEVBQUU7OytDQUNvQjtBQUdaO0lBRGhCLE1BQU0sRUFBRTs7c0RBQzJDO0FBTHpDLGVBQWU7SUFKM0IsY0FBYyxDQUFDO1FBQ2QsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO1FBQy9CLElBQUksRUFBRSxlQUFlO0tBQ3RCLENBQUM7R0FDVyxlQUFlLENBd0MzQiJ9
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { EggContext } from '@eggjs/tegg';
|
|
2
|
-
import { EggLogger } from 'egg';
|
|
3
|
-
import { Package as PackageEntity } from '../core/entity/Package.js';
|
|
4
|
-
import { User as UserEntity } from '../core/entity/User.js';
|
|
5
|
-
import { Token as TokenEntity } from '../core/entity/Token.js';
|
|
1
|
+
import type { EggContext } from '@eggjs/tegg';
|
|
2
|
+
import type { EggLogger } from 'egg';
|
|
3
|
+
import type { Package as PackageEntity } from '../core/entity/Package.js';
|
|
4
|
+
import type { User as UserEntity } from '../core/entity/User.js';
|
|
5
|
+
import type { Token as TokenEntity } from '../core/entity/Token.js';
|
|
6
6
|
export type TokenRole = 'read' | 'publish' | 'setting';
|
|
7
7
|
export declare class UserRoleManager {
|
|
8
8
|
private readonly packageRepository;
|
|
@@ -7,12 +7,9 @@ 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, Inject, ContextProto
|
|
10
|
+
import { AccessLevel, Inject, ContextProto } from '@eggjs/tegg';
|
|
11
11
|
import { UnauthorizedError, ForbiddenError } from 'egg-errors';
|
|
12
|
-
import { PackageRepository } from '../repository/PackageRepository.js';
|
|
13
12
|
import { getScopeAndName } from '../common/PackageUtil.js';
|
|
14
|
-
import { RegistryManagerService } from '../core/service/RegistryManagerService.js';
|
|
15
|
-
import { TokenService } from '../core/service/TokenService.js';
|
|
16
13
|
let UserRoleManager = class UserRoleManager {
|
|
17
14
|
constructor() {
|
|
18
15
|
this.handleAuthorized = false;
|
|
@@ -101,7 +98,8 @@ let UserRoleManager = class UserRoleManager {
|
|
|
101
98
|
}
|
|
102
99
|
const { user, token } = authorizedUserAndToken;
|
|
103
100
|
// only enable npm client and version check setting will go into this condition
|
|
104
|
-
if (this.config.cnpmcore.enableNpmClientAndVersionCheck &&
|
|
101
|
+
if (this.config.cnpmcore.enableNpmClientAndVersionCheck &&
|
|
102
|
+
role === 'publish') {
|
|
105
103
|
if (token.isReadonly) {
|
|
106
104
|
throw new ForbiddenError(`Read-only Token "${token.tokenMark}" can't publish`);
|
|
107
105
|
}
|
|
@@ -159,7 +157,7 @@ let UserRoleManager = class UserRoleManager {
|
|
|
159
157
|
};
|
|
160
158
|
__decorate([
|
|
161
159
|
Inject(),
|
|
162
|
-
__metadata("design:type",
|
|
160
|
+
__metadata("design:type", Function)
|
|
163
161
|
], UserRoleManager.prototype, "packageRepository", void 0);
|
|
164
162
|
__decorate([
|
|
165
163
|
Inject(),
|
|
@@ -171,11 +169,11 @@ __decorate([
|
|
|
171
169
|
], UserRoleManager.prototype, "logger", void 0);
|
|
172
170
|
__decorate([
|
|
173
171
|
Inject(),
|
|
174
|
-
__metadata("design:type",
|
|
172
|
+
__metadata("design:type", Function)
|
|
175
173
|
], UserRoleManager.prototype, "registryManagerService", void 0);
|
|
176
174
|
__decorate([
|
|
177
175
|
Inject(),
|
|
178
|
-
__metadata("design:type",
|
|
176
|
+
__metadata("design:type", Function)
|
|
179
177
|
], UserRoleManager.prototype, "tokenService", void 0);
|
|
180
178
|
UserRoleManager = __decorate([
|
|
181
179
|
ContextProto({
|
|
@@ -184,4 +182,4 @@ UserRoleManager = __decorate([
|
|
|
184
182
|
})
|
|
185
183
|
], UserRoleManager);
|
|
186
184
|
export { UserRoleManager };
|
|
187
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
185
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJvbGVNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3BvcnQvVXNlclJvbGVNYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVoRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsY0FBYyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBTS9ELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQVdwRCxJQUFNLGVBQWUsR0FBckIsTUFBTSxlQUFlO0lBQXJCO1FBWUcscUJBQWdCLEdBQUcsS0FBSyxDQUFDO0lBeUtuQyxDQUFDO0lBcktDLHVCQUF1QjtJQUN2QiwwQkFBMEI7SUFDMUIsdUNBQXVDO0lBQ3ZDLHFDQUFxQztJQUNyQyxnRUFBZ0U7SUFDekQsS0FBSyxDQUFDLGtCQUFrQixDQUFDLEdBQWUsRUFBRSxRQUFnQjtRQUMvRCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFFL0QsMEJBQTBCO1FBQzFCLE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN4QyxJQUFJLE9BQU8sRUFBRSxDQUFDO1lBQ1osT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBRUQsd0NBQXdDO1FBQ3hDLE1BQU0sc0JBQXNCLEdBQUcsTUFBTSxJQUFJLENBQUMseUJBQXlCLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDekUsTUFBTSxFQUFFLEtBQUssRUFBRSxHQUFHLHNCQUF1QixDQUFDO1FBQzFDLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFFbEUsdUNBQXVDO1FBQ3ZDLE1BQU0sQ0FB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
|