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
|
@@ -8,12 +8,12 @@ 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 { ForbiddenError } from 'egg-errors';
|
|
11
|
-
import {
|
|
11
|
+
import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
12
12
|
import { valid as semverValid } from 'semver';
|
|
13
13
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
14
14
|
import { ProxyCache } from '../entity/ProxyCache.js';
|
|
15
|
-
import { Task } from '../entity/Task.js';
|
|
16
|
-
import {
|
|
15
|
+
import { Task, } from '../entity/Task.js';
|
|
16
|
+
import { TaskState, TaskType } from '../../common/enum/Task.js';
|
|
17
17
|
import { calculateIntegrity } from '../../common/PackageUtil.js';
|
|
18
18
|
import { ABBREVIATED_META_TYPE, PROXY_CACHE_DIR_NAME, } from '../../common/constants.js';
|
|
19
19
|
import { DIST_NAMES, isPkgManifest } from '../entity/Package.js';
|
|
@@ -29,7 +29,8 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService {
|
|
|
29
29
|
}
|
|
30
30
|
async getPackageManifest(fullname, fileType) {
|
|
31
31
|
const isFullManifests = fileType === DIST_NAMES.FULL_MANIFESTS;
|
|
32
|
-
const
|
|
32
|
+
const proxyCache = await this.proxyCacheRepository.findProxyCache(fullname, fileType);
|
|
33
|
+
const cachedStoreKey = proxyCache?.filePath;
|
|
33
34
|
if (cachedStoreKey) {
|
|
34
35
|
try {
|
|
35
36
|
const nfsBytes = await this.nfsAdapter.getBytes(cachedStoreKey);
|
|
@@ -69,9 +70,10 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService {
|
|
|
69
70
|
else {
|
|
70
71
|
const pkgManifest = await this.getPackageManifest(fullname, DIST_NAMES.ABBREVIATED_MANIFESTS);
|
|
71
72
|
const distTags = pkgManifest['dist-tags'] || {};
|
|
72
|
-
version = distTags[versionOrTag]
|
|
73
|
+
version = distTags[versionOrTag] ?? versionOrTag;
|
|
73
74
|
}
|
|
74
|
-
const
|
|
75
|
+
const proxyCache = await this.proxyCacheRepository.findProxyCache(fullname, fileType, version);
|
|
76
|
+
const cachedStoreKey = proxyCache?.filePath;
|
|
75
77
|
if (cachedStoreKey) {
|
|
76
78
|
try {
|
|
77
79
|
const nfsBytes = await this.nfsAdapter.getBytes(cachedStoreKey);
|
|
@@ -191,7 +193,7 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService {
|
|
|
191
193
|
break;
|
|
192
194
|
}
|
|
193
195
|
case DIST_NAMES.MANIFEST: {
|
|
194
|
-
const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
|
|
196
|
+
const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag ?? '')}`;
|
|
195
197
|
responseResult = await this.getProxyResponse({
|
|
196
198
|
url,
|
|
197
199
|
headers: { accept: 'application/json', 'user-agent': USER_AGENT },
|
|
@@ -199,7 +201,7 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService {
|
|
|
199
201
|
break;
|
|
200
202
|
}
|
|
201
203
|
case DIST_NAMES.ABBREVIATED: {
|
|
202
|
-
const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
|
|
204
|
+
const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag ?? '')}`;
|
|
203
205
|
responseResult = await this.getProxyResponse({
|
|
204
206
|
url,
|
|
205
207
|
headers: {
|
|
@@ -213,10 +215,12 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService {
|
|
|
213
215
|
break;
|
|
214
216
|
}
|
|
215
217
|
// replace tarball url
|
|
216
|
-
const manifest = this.replaceTarballUrl(responseResult
|
|
218
|
+
const manifest = this.replaceTarballUrl(responseResult?.data, fileType);
|
|
217
219
|
return manifest;
|
|
218
220
|
}
|
|
219
|
-
async storeRewrittenManifest(
|
|
221
|
+
async storeRewrittenManifest(
|
|
222
|
+
// oxlint-disable-next-line typescript-eslint/no-explicit-any
|
|
223
|
+
manifest, fullname, fileType) {
|
|
220
224
|
let storeKey;
|
|
221
225
|
if (isPkgManifest(fileType)) {
|
|
222
226
|
storeKey = `/${PROXY_CACHE_DIR_NAME}/${fullname}/${fileType}`;
|
|
@@ -239,7 +243,7 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService {
|
|
|
239
243
|
// once redirection is also count as a retry
|
|
240
244
|
retry: 7,
|
|
241
245
|
dataType: 'stream',
|
|
242
|
-
timeout:
|
|
246
|
+
timeout: 10_000,
|
|
243
247
|
compressed: true,
|
|
244
248
|
...options,
|
|
245
249
|
headers: {
|
|
@@ -292,4 +296,4 @@ ProxyCacheService = __decorate([
|
|
|
292
296
|
})
|
|
293
297
|
], ProxyCacheService);
|
|
294
298
|
export { ProxyCacheService };
|
|
295
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ProxyCacheService.js","sourceRoot":"","sources":["../../../../app/core/service/ProxyCacheService.ts"],"names":[],"mappings":"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"}
|
|
299
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ProxyCacheService.js","sourceRoot":"","sources":["../../../../app/core/service/ProxyCacheService.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 { E400, NotFoundError } from 'egg-errors';
|
|
12
12
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
13
13
|
import { Registry } from '../entity/Registry.js';
|
|
@@ -150,4 +150,4 @@ RegistryManagerService = __decorate([
|
|
|
150
150
|
})
|
|
151
151
|
], RegistryManagerService);
|
|
152
152
|
export { RegistryManagerService };
|
|
153
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
153
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVnaXN0cnlNYW5hZ2VyU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3NlcnZpY2UvUmVnaXN0cnlNYW5hZ2VyU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbEUsT0FBTyxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFakQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUlqRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDekMsT0FBTyxFQUNMLGlCQUFpQixFQUNqQixrQkFBa0IsR0FDbkIsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUE2QnRELElBQU0sc0JBQXNCLEdBQTVCLE1BQU0sc0JBQXVCLFNBQVEsZUFBZTtJQVF6RCxLQUFLLENBQUMsdUJBQXVCLENBQUMsWUFBMEI7UUFDdEQsTUFBTSxFQUFFLFVBQVUsRUFBRSxVQUFVLEdBQUcsR0FBRyxFQUFFLEtBQUssRUFBRSxHQUFHLFlBQVksQ0FBQztRQUM3RCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZCxtR0FBbUcsRUFDbkcsVUFBVSxFQUNWLFVBQVUsRUFDVixLQUFLLENBQ04sQ0FBQztRQUNGLE1BQU0sUUFBUSxHQUNaLE1BQU0sSUFBSSxDQUFDLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3JFLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNkLE1BQU0sSUFBSSxhQUFhLENBQUMsWUFBWSxVQUFVLFlBQVksQ0FBQyxDQUFDO1FB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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 { AbstractService } from '../../common/AbstractService.js';
|
|
12
12
|
import { Scope } from '../entity/Scope.js';
|
|
13
13
|
let ScopeManagerService = class ScopeManagerService extends AbstractService {
|
|
@@ -56,4 +56,4 @@ ScopeManagerService = __decorate([
|
|
|
56
56
|
})
|
|
57
57
|
], ScopeManagerService);
|
|
58
58
|
export { ScopeManagerService };
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2NvcGVNYW5hZ2VyU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3NlcnZpY2UvU2NvcGVNYW5hZ2VyU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFbEUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQXVCcEMsSUFBTSxtQkFBbUIsR0FBekIsTUFBTSxtQkFBb0IsU0FBUSxlQUFlO0lBSXRELEtBQUssQ0FBQyxVQUFVLENBQUMsSUFBWTtRQUMzQixNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxVQUFrQjtRQUN4QyxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsaUJBQWlCLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDdkUsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVcsQ0FBQyxTQUF5QjtRQUN6QyxNQUFNLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUM7UUFDbkQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2QseUVBQXlFLEVBQ3pFLFVBQVUsRUFDVixTQUFTLENBQ1YsQ0FBQztRQUNGLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUM7WUFDekIsSUFBSTtZQUNKLFVBQVU7U0FDWCxDQUFDLENBQUM7UUFDSCxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVDLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyxVQUFVLENBQUMsSUFBaUI7UUFDaEMsT0FBTyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JELENBQUM7SUFFRCxLQUFLLENBQUMsc0JBQXNCLENBQzFCLFVBQWtCLEVBQ2xCLElBQWlCO1FBRWpCLE9BQU8sTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLHNCQUFzQixDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM3RSxDQUFDO0lBRUQsS0FBSyxDQUFDLGtCQUFrQixDQUN0QixTQUFxQztRQUVyQyxNQUFNLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxHQUFHLFNBQVMsQ0FBQztRQUM3QyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZCxxRUFBcUUsRUFDckUsVUFBVSxFQUNWLFVBQVUsQ0FDWCxDQUFDO1FBQ0YsT0FBTyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsdUJBQXVCLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDeEUsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsU0FBeUI7UUFDcEMsTUFBTSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUM7UUFDMUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2Qsa0VBQWtFLEVBQ2xFLFVBQVUsRUFDVixPQUFPLENBQ1IsQ0FBQztRQUNGLE9BQU8sTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN6RCxDQUFDO0NBQ0YsQ0FBQTtBQTNEa0I7SUFEaEIsTUFBTSxFQUFFOzs0REFDeUM7QUFGdkMsbUJBQW1CO0lBSC9CLGNBQWMsQ0FBQztRQUNkLFdBQVcsRUFBRSxXQUFXLENBQUMsTUFBTTtLQUNoQyxDQUFDO0dBQ1csbUJBQW1CLENBNkQvQiJ9
|
|
@@ -9,7 +9,7 @@ export declare class TaskService extends AbstractService {
|
|
|
9
9
|
createTask(task: Task, addTaskQueueOnExists: boolean): Promise<Task<import("../entity/Task.js").TaskBaseData>>;
|
|
10
10
|
retryTask(task: Task, appendLog?: string): Promise<void>;
|
|
11
11
|
findTask(taskId: string): Promise<Task<import("../entity/Task.js").TaskBaseData> | null>;
|
|
12
|
-
findTasks(taskIdList:
|
|
12
|
+
findTasks(taskIdList: string[]): Promise<Task<import("../entity/Task.js").TaskBaseData>[]>;
|
|
13
13
|
findTaskLog(task: Task): Promise<string | import("stream").Readable | undefined>;
|
|
14
14
|
findExecuteTask(taskType: TaskType): Promise<Task<import("../entity/Task.js").TaskBaseData> | null>;
|
|
15
15
|
retryExecuteTimeoutTasks(): Promise<{
|
|
@@ -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 { TaskState, TaskType } from '../../common/enum/Task.js';
|
|
12
12
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
13
13
|
import { Task } from '../entity/Task.js';
|
|
@@ -99,7 +99,7 @@ let TaskService = class TaskService extends AbstractService {
|
|
|
99
99
|
}
|
|
100
100
|
async retryExecuteTimeoutTasks() {
|
|
101
101
|
// try processing timeout tasks in 10 mins
|
|
102
|
-
const tasks = await this.taskRepository.findTimeoutTasks(TaskState.Processing,
|
|
102
|
+
const tasks = await this.taskRepository.findTimeoutTasks(TaskState.Processing, 60_000 * 10);
|
|
103
103
|
for (const task of tasks) {
|
|
104
104
|
try {
|
|
105
105
|
// ignore ChangesStream task, it won't timeout
|
|
@@ -121,7 +121,7 @@ let TaskService = class TaskService extends AbstractService {
|
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
// try waiting timeout tasks in 30 mins
|
|
124
|
-
const waitingTasks = await this.taskRepository.findTimeoutTasks(TaskState.Waiting,
|
|
124
|
+
const waitingTasks = await this.taskRepository.findTimeoutTasks(TaskState.Waiting, 60_000 * 30);
|
|
125
125
|
for (const task of waitingTasks) {
|
|
126
126
|
try {
|
|
127
127
|
await this.retryTask(task);
|
|
@@ -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":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
2
|
-
import type
|
|
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,
|
|
11
|
+
import { AccessLevel, Inject, SingletonProto } 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';
|
|
@@ -85,4 +85,4 @@ TokenService = __decorate([
|
|
|
85
85
|
})
|
|
86
86
|
], TokenService);
|
|
87
87
|
export { TokenService };
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW5TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvcmUvc2VydmljZS9Ub2tlblNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBQzFCLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxjQUFjLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFL0QsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxlQUFlLEVBQWMsTUFBTSxvQkFBb0IsQ0FBQztBQUdqRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0RBQWdELENBQUM7QUFDaEYsT0FBTyxFQUFFLE9BQU8sSUFBSSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNoRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDckUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBTWxELElBQU0sWUFBWSxHQUFsQixNQUFNLFlBQWEsU0FBUSxlQUFlO0lBUXhDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFZO1FBQ3pDLElBQUksZUFBZSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDM0IsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztZQUN4RSxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO2dCQUN2QyxTQUFTLEVBQUUsTUFBTSxDQUFDLEdB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
|
|
@@ -1,24 +1,23 @@
|
|
|
1
1
|
import { User as UserEntity } from '../entity/User.js';
|
|
2
|
-
import type
|
|
3
|
-
import { Token as TokenEntity } from '../entity/Token.js';
|
|
2
|
+
import { Token as TokenEntity, type TokenType } from '../entity/Token.js';
|
|
4
3
|
import { WebauthnCredential as WebauthnCredentialEntity } from '../entity/WebauthnCredential.js';
|
|
5
4
|
import { LoginResultCode } from '../../common/enum/User.js';
|
|
6
5
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
7
6
|
import type { Registry } from '../entity/Registry.js';
|
|
8
7
|
type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
|
|
9
|
-
|
|
8
|
+
interface CreateUser {
|
|
10
9
|
name: string;
|
|
11
10
|
email: string;
|
|
12
11
|
password: string;
|
|
13
12
|
ip: string;
|
|
14
|
-
}
|
|
15
|
-
|
|
13
|
+
}
|
|
14
|
+
interface LoginResult {
|
|
16
15
|
code: LoginResultCode;
|
|
17
16
|
user?: UserEntity;
|
|
18
17
|
token?: TokenEntity;
|
|
19
|
-
}
|
|
18
|
+
}
|
|
20
19
|
type CreateTokenOption = CreateClassicTokenOptions | CreateGranularTokenOptions;
|
|
21
|
-
|
|
20
|
+
interface CreateGranularTokenOptions {
|
|
22
21
|
type: TokenType.granular;
|
|
23
22
|
name: string;
|
|
24
23
|
description?: string;
|
|
@@ -27,17 +26,17 @@ type CreateGranularTokenOptions = {
|
|
|
27
26
|
isReadonly?: boolean;
|
|
28
27
|
cidrWhitelist?: string[];
|
|
29
28
|
expires: number;
|
|
30
|
-
}
|
|
31
|
-
|
|
29
|
+
}
|
|
30
|
+
interface CreateClassicTokenOptions {
|
|
32
31
|
isReadonly?: boolean;
|
|
33
32
|
isAutomation?: boolean;
|
|
34
33
|
cidrWhitelist?: string[];
|
|
35
|
-
}
|
|
36
|
-
|
|
34
|
+
}
|
|
35
|
+
interface CreateWebauthnCredentialOptions {
|
|
37
36
|
credentialId: string;
|
|
38
37
|
publicKey: string;
|
|
39
38
|
browserType?: string;
|
|
40
|
-
}
|
|
39
|
+
}
|
|
41
40
|
export declare class UserService extends AbstractService {
|
|
42
41
|
private readonly userRepository;
|
|
43
42
|
private readonly registryManagerService;
|
|
@@ -55,7 +54,7 @@ export declare class UserService extends AbstractService {
|
|
|
55
54
|
user: UserEntity;
|
|
56
55
|
token: TokenEntity;
|
|
57
56
|
}>;
|
|
58
|
-
saveUser(
|
|
57
|
+
saveUser(name: string, email: string, userPrefix?: string): Promise<{
|
|
59
58
|
changed: boolean;
|
|
60
59
|
user: UserEntity;
|
|
61
60
|
}>;
|
|
@@ -8,13 +8,13 @@ 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,
|
|
12
|
-
import {
|
|
11
|
+
import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
12
|
+
import { ForbiddenError, NotFoundError } from 'egg-errors';
|
|
13
13
|
import { User as UserEntity } from '../entity/User.js';
|
|
14
14
|
import { Token as TokenEntity } from '../entity/Token.js';
|
|
15
15
|
import { WebauthnCredential as WebauthnCredentialEntity } from '../entity/WebauthnCredential.js';
|
|
16
16
|
import { LoginResultCode } from '../../common/enum/User.js';
|
|
17
|
-
import {
|
|
17
|
+
import { checkIntegrity, integrity, randomToken, sha512, } from '../../common/UserUtil.js';
|
|
18
18
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
19
19
|
import { getPrefixedName } from '../../common/PackageUtil.js';
|
|
20
20
|
let UserService = class UserService extends AbstractService {
|
|
@@ -86,7 +86,7 @@ let UserService = class UserService extends AbstractService {
|
|
|
86
86
|
const token = await this.createToken(userEntity.userId);
|
|
87
87
|
return { user: userEntity, token };
|
|
88
88
|
}
|
|
89
|
-
async saveUser(userPrefix = 'npm:'
|
|
89
|
+
async saveUser(name, email, userPrefix = 'npm:') {
|
|
90
90
|
const storeName = name.startsWith('name:') ? name : `${userPrefix}${name}`;
|
|
91
91
|
let user = await this.userRepository.findUserByName(storeName);
|
|
92
92
|
if (!user) {
|
|
@@ -117,7 +117,7 @@ let UserService = class UserService extends AbstractService {
|
|
|
117
117
|
// https://github.blog/changelog/2022-12-06-limit-scope-of-npm-tokens-with-the-new-granular-access-tokens/
|
|
118
118
|
const token = randomToken(this.config.cnpmcore.name);
|
|
119
119
|
const tokenKey = sha512(token);
|
|
120
|
-
const tokenMark = token.
|
|
120
|
+
const tokenMark = token.slice(0, token.indexOf('_') + 4);
|
|
121
121
|
const tokenEntity = TokenEntity.create({
|
|
122
122
|
tokenKey,
|
|
123
123
|
tokenMark,
|
|
@@ -177,4 +177,4 @@ UserService = __decorate([
|
|
|
177
177
|
})
|
|
178
178
|
], UserService);
|
|
179
179
|
export { UserService };
|
|
180
|
-
//# 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,10 +1,10 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type EggContext } from '@eggjs/tegg';
|
|
2
2
|
import type { Redis } from 'ioredis';
|
|
3
3
|
import type { AuthClient, AuthUrlResult, userResult } from '../common/typing.js';
|
|
4
|
-
|
|
4
|
+
interface SSO_USER {
|
|
5
5
|
name: string;
|
|
6
6
|
email: string;
|
|
7
|
-
}
|
|
7
|
+
}
|
|
8
8
|
/**
|
|
9
9
|
* Use sort set to keep queue in order and keep same value only insert once
|
|
10
10
|
*/
|
|
@@ -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, Inject, SingletonProto } from '@eggjs/tegg';
|
|
10
|
+
import { AccessLevel, Inject, SingletonProto, } from '@eggjs/tegg';
|
|
11
11
|
import { randomUUID } from 'node:crypto';
|
|
12
12
|
const ONE_DAY = 3600 * 24;
|
|
13
13
|
/**
|
|
@@ -48,4 +48,4 @@ AuthAdapter = __decorate([
|
|
|
48
48
|
})
|
|
49
49
|
], AuthAdapter);
|
|
50
50
|
export { AuthAdapter };
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXV0aEFkYXB0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvaW5mcmEvQXV0aEFkYXB0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUVMLFdBQVcsRUFDWCxNQUFNLEVBQ04sY0FBYyxHQUNmLE1BQU0sYUFBYSxDQUFDO0FBRXJCLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFRekMsTUFBTSxPQUFPLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztBQU8xQjs7R0FFRztBQUtJLElBQU0sV0FBVyxHQUFqQixNQUFNLFdBQVc7SUFPdEIsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFlO1FBQzlCLE1BQU0sU0FBUyxHQUFHLFVBQVUsRUFBRSxDQUFDO1FBQy9CLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUUvQyxlQUFlO1FBQ2YsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQztRQUNsRCxPQUFPO1lBQ0wsUUFBUSxFQUFFLEdBQUcsUUFBUSwrQkFBK0IsU0FBUyxFQUFFO1lBQy9ELE9BQU8sRUFBRSxHQUFHLFFBQVEsNEJBQTRCLFNBQVMsRUFBRTtTQUM1RCxDQUFDO0lBQ0osQ0FBQztJQUVELDZCQUE2QjtJQUM3QixLQUFLLENBQUMsaUJBQWlCO1FBQ3JCLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2QsTUFBTSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1lBQ2xDLE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFnQixDQUFDO1FBQ3ZDLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7Q0FDRixDQUFBO0FBekJVO0lBRFIsTUFBTSxFQUFFOzswQ0FDYTtBQUdiO0lBRFIsTUFBTSxFQUFFOzt5Q0FDZTtBQUxiLFdBQVc7SUFKdkIsY0FBYyxDQUFDO1FBQ2QsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO1FBQy9CLElBQUksRUFBRSxhQUFhO0tBQ3BCLENBQUM7R0FDVyxXQUFXLENBMkJ2QiJ9
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Readable } from 'node:stream';
|
|
2
|
-
import type { AppendResult, NFSClient, UploadOptions, UploadResult
|
|
2
|
+
import type { AppendResult, DownloadOptions, NFSClient, UploadOptions, UploadResult } from '../common/typing.js';
|
|
3
3
|
export declare class NFSClientAdapter implements NFSClient {
|
|
4
4
|
private logger;
|
|
5
5
|
private config;
|
|
@@ -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, LifecycleInit, SingletonProto, } from '@eggjs/tegg';
|
|
11
11
|
import FSClient from 'fs-cnpm';
|
|
12
12
|
let NFSClientAdapter = class NFSClientAdapter {
|
|
13
13
|
get client() {
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTkZTQ2xpZW50QWRhcHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9pbmZyYS9ORlNDbGllbnRBZGFwdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUNBLE9BQU8sRUFDTCxXQUFXLEVBQ1gsTUFBTSxFQUNOLGFBQWEsRUFDYixjQUFjLEdBQ2YsTUFBTSxhQUFhLENBQUM7QUFFckIsT0FBTyxRQUFRLE1BQU0sU0FBUyxDQUFDO0FBY3hCLElBQU0sZ0JBQWdCLEdBQXRCLE1BQU0sZ0JBQWdCO0lBVTNCLElBQUksTUFBTTtRQUNSLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN0QixDQUFDO0lBS2UsQUFBTixLQUFLLENBQUMsSUFBSTtRQUNsQixrRUFBa0U7UUFDbEUsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUMzQixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztRQUN4QyxDQUFDO2FBQU0sQ0FBQztZQUNOLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEtBQUssTUFBTSxFQUFFLENBQUM7Z0JBQy9CLE1BQU0sSUFBSSxLQUFLLENBQ2IsdURBQXVELENBQ3hELENBQUM7WUFDSixDQUFDO1lBRUQscURBQXFEO1lBQ3JELElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUNkLG9FQUFvRSxFQUNwRSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQ3BCLENBQUM7WUFDRixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksUUFBUSxDQUFDLEVBQUUsR0FBRyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDNUQsQ0FBQztRQUVELElBQUksT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsS0FBSyxVQUFV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
|
|
@@ -12,6 +12,7 @@ import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
|
12
12
|
* Use elasticsearch to search the huge npm packages.
|
|
13
13
|
*/
|
|
14
14
|
let ESSearchAdapter = class ESSearchAdapter {
|
|
15
|
+
// oxlint-disable-next-line typescript-eslint/no-explicit-any
|
|
15
16
|
async search(query) {
|
|
16
17
|
const { cnpmcore: { elasticsearchIndex: index }, } = this.config;
|
|
17
18
|
const result = await this.elasticsearch.search({
|
|
@@ -53,4 +54,4 @@ ESSearchAdapter = __decorate([
|
|
|
53
54
|
})
|
|
54
55
|
], ESSearchAdapter);
|
|
55
56
|
export { ESSearchAdapter };
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VhcmNoQWRhcHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9pbmZyYS9TZWFyY2hBZGFwdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQVNsRTs7R0FFRztBQUtJLElBQU0sZUFBZSxHQUFyQixNQUFNLGVBQWU7SUFPMUIsNkRBQTZEO0lBQzdELEtBQUssQ0FBQyxNQUFNLENBQUksS0FBVTtRQUN4QixNQUFNLEVBQ0osUUFBUSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsS0FBSyxFQUFFLEdBQ3hDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUNoQixNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFJO1lBQ2hELEtBQUs7WUFDTCxHQUFHLEtBQUs7U0FDVCxDQUFDLENBQUM7UUFDSCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUM7SUFDckIsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUksRUFBVSxFQUFFLFFBQVc7UUFDckMsTUFBTSxFQUNKLFFBQVEsRUFBRSxFQUFFLGtCQUFrQixFQUFFLEtBQUssRUFBRSxHQUN4QyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDaEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQztZQUN6QyxFQUFFO1lBQ0YsS0FBSztZQUNMLFFBQVE7U0FDVCxDQUFDLENBQUM7UUFDSCxPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUM7SUFDakIsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBVTtRQUNyQixNQUFNLEVBQ0osUUFBUSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsS0FBSyxFQUFFLEdBQ3hDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUNoQixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDO1lBQzFDLEtBQUs7WUFDTCxFQUFFO1NBQ0gsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxHQUFHLENBQUMsR0FBRyxDQUFDO0lBQ2pCLENBQUM7Q0FDRixDQUFBO0FBdkNTO0lBRFAsTUFBTSxFQUFFOzsrQ0FDb0I7QUFHWjtJQURoQixNQUFNLEVBQUU7O3NEQUMyQztBQUx6QyxlQUFlO0lBSjNCLGNBQWMsQ0FBQztRQUNkLFdBQVcsRUFBRSxXQUFXLENBQUMsTUFBTTtRQUMvQixJQUFJLEVBQUUsZUFBZTtLQUN0QixDQUFDO0dBQ1csZUFBZSxDQXlDM0IifQ==
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type EggContext } from '@eggjs/tegg';
|
|
2
2
|
import type { EggLogger } from 'egg';
|
|
3
3
|
import type { Package as PackageEntity } from '../core/entity/Package.js';
|
|
4
4
|
import type { User as UserEntity } from '../core/entity/User.js';
|