cnpmcore 4.0.2 → 4.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (340) hide show
  1. package/README.md +5 -3
  2. package/dist/app/common/AbstractService.js +5 -9
  3. package/dist/app/common/CryptoUtil.js +9 -17
  4. package/dist/app/common/ErrorUtil.js +2 -5
  5. package/dist/app/common/FileUtil.js +22 -31
  6. package/dist/app/common/LogUtil.js +2 -5
  7. package/dist/app/common/PackageUtil.d.ts +1 -1
  8. package/dist/app/common/PackageUtil.js +27 -75
  9. package/dist/app/common/SyncUtil.js +2 -5
  10. package/dist/app/common/UserUtil.js +19 -64
  11. package/dist/app/common/adapter/BugVersionStore.d.ts +1 -1
  12. package/dist/app/common/adapter/BugVersionStore.js +6 -9
  13. package/dist/app/common/adapter/CacheAdapter.js +7 -10
  14. package/dist/app/common/adapter/NFSAdapter.js +18 -21
  15. package/dist/app/common/adapter/NPMRegistry.d.ts +1 -1
  16. package/dist/app/common/adapter/NPMRegistry.js +13 -16
  17. package/dist/app/common/adapter/binary/AbstractBinary.d.ts +2 -2
  18. package/dist/app/common/adapter/binary/AbstractBinary.js +7 -11
  19. package/dist/app/common/adapter/binary/ApiBinary.d.ts +1 -1
  20. package/dist/app/common/adapter/binary/ApiBinary.js +10 -13
  21. package/dist/app/common/adapter/binary/BucketBinary.d.ts +2 -2
  22. package/dist/app/common/adapter/binary/BucketBinary.js +14 -20
  23. package/dist/app/common/adapter/binary/ChromeForTestingBinary.d.ts +1 -1
  24. package/dist/app/common/adapter/binary/ChromeForTestingBinary.js +11 -14
  25. package/dist/app/common/adapter/binary/CypressBinary.d.ts +1 -1
  26. package/dist/app/common/adapter/binary/CypressBinary.js +9 -12
  27. package/dist/app/common/adapter/binary/EdgedriverBinary.d.ts +1 -1
  28. package/dist/app/common/adapter/binary/EdgedriverBinary.js +12 -18
  29. package/dist/app/common/adapter/binary/ElectronBinary.d.ts +3 -3
  30. package/dist/app/common/adapter/binary/ElectronBinary.js +13 -19
  31. package/dist/app/common/adapter/binary/GithubBinary.d.ts +2 -2
  32. package/dist/app/common/adapter/binary/GithubBinary.js +11 -17
  33. package/dist/app/common/adapter/binary/ImageminBinary.d.ts +2 -2
  34. package/dist/app/common/adapter/binary/ImageminBinary.js +11 -17
  35. package/dist/app/common/adapter/binary/NodeBinary.d.ts +2 -2
  36. package/dist/app/common/adapter/binary/NodeBinary.js +14 -20
  37. package/dist/app/common/adapter/binary/NodePreGypBinary.d.ts +2 -2
  38. package/dist/app/common/adapter/binary/NodePreGypBinary.js +14 -20
  39. package/dist/app/common/adapter/binary/NwjsBinary.d.ts +2 -2
  40. package/dist/app/common/adapter/binary/NwjsBinary.js +12 -18
  41. package/dist/app/common/adapter/binary/PlaywrightBinary.d.ts +1 -1
  42. package/dist/app/common/adapter/binary/PlaywrightBinary.js +13 -19
  43. package/dist/app/common/adapter/binary/PrismaBinary.d.ts +2 -2
  44. package/dist/app/common/adapter/binary/PrismaBinary.js +14 -20
  45. package/dist/app/common/adapter/binary/PuppeteerBinary.d.ts +1 -1
  46. package/dist/app/common/adapter/binary/PuppeteerBinary.js +10 -13
  47. package/dist/app/common/adapter/binary/SqlcipherBinary.d.ts +1 -1
  48. package/dist/app/common/adapter/binary/SqlcipherBinary.js +9 -12
  49. package/dist/app/common/adapter/changesStream/AbstractChangesStream.d.ts +2 -2
  50. package/dist/app/common/adapter/changesStream/AbstractChangesStream.js +7 -11
  51. package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.d.ts +2 -2
  52. package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.js +11 -14
  53. package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.d.ts +2 -2
  54. package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.js +11 -14
  55. package/dist/app/common/adapter/changesStream/NpmChangesStream.d.ts +2 -2
  56. package/dist/app/common/adapter/changesStream/NpmChangesStream.js +11 -14
  57. package/dist/app/common/aop/AsyncTimer.js +10 -13
  58. package/dist/app/common/constants.js +17 -20
  59. package/dist/app/common/dayjs.js +5 -10
  60. package/dist/app/common/enum/Binary.js +3 -6
  61. package/dist/app/common/enum/Hook.js +5 -8
  62. package/dist/app/common/enum/Registry.js +3 -6
  63. package/dist/app/common/enum/Task.js +5 -8
  64. package/dist/app/common/enum/User.js +5 -8
  65. package/dist/app/common/package.json +2 -1
  66. package/dist/app/common/typing.d.ts +1 -1
  67. package/dist/app/common/typing.js +1 -2
  68. package/dist/app/core/entity/Binary.d.ts +2 -2
  69. package/dist/app/core/entity/Binary.js +5 -9
  70. package/dist/app/core/entity/BugVersion.js +2 -6
  71. package/dist/app/core/entity/Change.d.ts +2 -2
  72. package/dist/app/core/entity/Change.js +5 -9
  73. package/dist/app/core/entity/Dist.d.ts +2 -2
  74. package/dist/app/core/entity/Dist.js +5 -9
  75. package/dist/app/core/entity/Entity.js +2 -6
  76. package/dist/app/core/entity/Hook.d.ts +3 -3
  77. package/dist/app/core/entity/Hook.js +7 -14
  78. package/dist/app/core/entity/HookEvent.d.ts +1 -1
  79. package/dist/app/core/entity/HookEvent.js +11 -15
  80. package/dist/app/core/entity/Package.d.ts +4 -3
  81. package/dist/app/core/entity/Package.js +14 -15
  82. package/dist/app/core/entity/PackageTag.d.ts +2 -2
  83. package/dist/app/core/entity/PackageTag.js +5 -9
  84. package/dist/app/core/entity/PackageVersion.d.ts +3 -3
  85. package/dist/app/core/entity/PackageVersion.js +7 -11
  86. package/dist/app/core/entity/PackageVersionBlock.d.ts +2 -2
  87. package/dist/app/core/entity/PackageVersionBlock.js +5 -9
  88. package/dist/app/core/entity/PackageVersionFile.d.ts +3 -3
  89. package/dist/app/core/entity/PackageVersionFile.js +5 -9
  90. package/dist/app/core/entity/PackageVersionManifest.d.ts +2 -2
  91. package/dist/app/core/entity/PackageVersionManifest.js +5 -9
  92. package/dist/app/core/entity/PaddingSemVer.js +5 -9
  93. package/dist/app/core/entity/ProxyCache.d.ts +3 -3
  94. package/dist/app/core/entity/ProxyCache.js +8 -12
  95. package/dist/app/core/entity/Registry.d.ts +3 -3
  96. package/dist/app/core/entity/Registry.js +5 -9
  97. package/dist/app/core/entity/Scope.d.ts +2 -2
  98. package/dist/app/core/entity/Scope.js +5 -9
  99. package/dist/app/core/entity/SqlRange.js +8 -12
  100. package/dist/app/core/entity/Task.d.ts +4 -4
  101. package/dist/app/core/entity/Task.js +46 -53
  102. package/dist/app/core/entity/Token.d.ts +2 -2
  103. package/dist/app/core/entity/Token.js +10 -18
  104. package/dist/app/core/entity/User.d.ts +2 -2
  105. package/dist/app/core/entity/User.js +7 -11
  106. package/dist/app/core/entity/WebauthnCredential.d.ts +2 -2
  107. package/dist/app/core/entity/WebauthnCredential.js +5 -9
  108. package/dist/app/core/event/BugVersionFixHandler.js +12 -15
  109. package/dist/app/core/event/CacheCleaner.js +39 -42
  110. package/dist/app/core/event/ChangesStream.d.ts +4 -4
  111. package/dist/app/core/event/ChangesStream.js +59 -62
  112. package/dist/app/core/event/StoreManifest.js +17 -20
  113. package/dist/app/core/event/SyncESPackage.d.ts +1 -1
  114. package/dist/app/core/event/SyncESPackage.js +22 -25
  115. package/dist/app/core/event/SyncPackageVersionFile.js +25 -28
  116. package/dist/app/core/event/index.d.ts +1 -1
  117. package/dist/app/core/event/index.js +13 -16
  118. package/dist/app/core/package.json +2 -1
  119. package/dist/app/core/service/BinarySyncerService.d.ts +7 -7
  120. package/dist/app/core/service/BinarySyncerService.js +44 -50
  121. package/dist/app/core/service/BugVersionService.d.ts +1 -1
  122. package/dist/app/core/service/BugVersionService.js +28 -34
  123. package/dist/app/core/service/CacheService.d.ts +2 -2
  124. package/dist/app/core/service/CacheService.js +15 -18
  125. package/dist/app/core/service/ChangesStreamService.d.ts +3 -3
  126. package/dist/app/core/service/ChangesStreamService.js +52 -58
  127. package/dist/app/core/service/CreateHookTriggerService.d.ts +2 -2
  128. package/dist/app/core/service/CreateHookTriggerService.js +39 -45
  129. package/dist/app/core/service/EventCorkerAdvice.js +7 -10
  130. package/dist/app/core/service/FixNoPaddingVersionService.js +14 -20
  131. package/dist/app/core/service/HomeService.d.ts +1 -1
  132. package/dist/app/core/service/HomeService.js +13 -16
  133. package/dist/app/core/service/HookManageService.d.ts +2 -2
  134. package/dist/app/core/service/HookManageService.js +20 -23
  135. package/dist/app/core/service/HookTriggerService.d.ts +3 -3
  136. package/dist/app/core/service/HookTriggerService.js +32 -35
  137. package/dist/app/core/service/PackageManagerService.d.ts +7 -7
  138. package/dist/app/core/service/PackageManagerService.js +98 -104
  139. package/dist/app/core/service/PackageSearchService.d.ts +4 -4
  140. package/dist/app/core/service/PackageSearchService.js +31 -37
  141. package/dist/app/core/service/PackageSyncerService.d.ts +6 -6
  142. package/dist/app/core/service/PackageSyncerService.js +92 -99
  143. package/dist/app/core/service/PackageVersionFileService.d.ts +4 -4
  144. package/dist/app/core/service/PackageVersionFileService.js +64 -69
  145. package/dist/app/core/service/PackageVersionService.d.ts +4 -1
  146. package/dist/app/core/service/PackageVersionService.js +41 -59
  147. package/dist/app/core/service/ProxyCacheService.d.ts +5 -6
  148. package/dist/app/core/service/ProxyCacheService.js +62 -69
  149. package/dist/app/core/service/RegistryManagerService.d.ts +3 -3
  150. package/dist/app/core/service/RegistryManagerService.js +33 -36
  151. package/dist/app/core/service/ScopeManagerService.d.ts +3 -3
  152. package/dist/app/core/service/ScopeManagerService.js +13 -16
  153. package/dist/app/core/service/TaskService.d.ts +7 -7
  154. package/dist/app/core/service/TaskService.js +28 -29
  155. package/dist/app/core/service/TokenService.d.ts +4 -4
  156. package/dist/app/core/service/TokenService.js +30 -36
  157. package/dist/app/core/service/UserService.d.ts +6 -6
  158. package/dist/app/core/service/UserService.js +43 -49
  159. package/dist/app/core/util/EntityUtil.d.ts +1 -1
  160. package/dist/app/core/util/EntityUtil.js +7 -13
  161. package/dist/app/infra/AuthAdapter.d.ts +1 -1
  162. package/dist/app/infra/AuthAdapter.js +12 -15
  163. package/dist/app/infra/NFSClientAdapter.d.ts +1 -1
  164. package/dist/app/infra/NFSClientAdapter.js +11 -17
  165. package/dist/app/infra/QueueAdapter.d.ts +1 -1
  166. package/dist/app/infra/QueueAdapter.js +9 -12
  167. package/dist/app/infra/SearchAdapter.d.ts +1 -1
  168. package/dist/app/infra/SearchAdapter.js +10 -13
  169. package/dist/app/infra/package.json +2 -1
  170. package/dist/app/port/UserRoleManager.d.ts +3 -3
  171. package/dist/app/port/UserRoleManager.js +30 -33
  172. package/dist/app/port/config.d.ts +3 -3
  173. package/dist/app/port/config.js +2 -6
  174. package/dist/app/port/controller/AbstractController.d.ts +8 -8
  175. package/dist/app/port/controller/AbstractController.js +33 -37
  176. package/dist/app/port/controller/AccessController.d.ts +1 -1
  177. package/dist/app/port/controller/AccessController.js +22 -25
  178. package/dist/app/port/controller/BinarySyncController.d.ts +2 -2
  179. package/dist/app/port/controller/BinarySyncController.js +42 -48
  180. package/dist/app/port/controller/ChangesStreamController.d.ts +1 -1
  181. package/dist/app/port/controller/ChangesStreamController.js +17 -20
  182. package/dist/app/port/controller/DownloadController.d.ts +1 -1
  183. package/dist/app/port/controller/DownloadController.js +30 -36
  184. package/dist/app/port/controller/HomeController.d.ts +2 -2
  185. package/dist/app/port/controller/HomeController.js +29 -31
  186. package/dist/app/port/controller/HookController.d.ts +5 -5
  187. package/dist/app/port/controller/HookController.js +43 -46
  188. package/dist/app/port/controller/PackageBlockController.d.ts +2 -2
  189. package/dist/app/port/controller/PackageBlockController.js +37 -40
  190. package/dist/app/port/controller/PackageSyncController.d.ts +5 -5
  191. package/dist/app/port/controller/PackageSyncController.js +64 -67
  192. package/dist/app/port/controller/PackageTagController.d.ts +1 -1
  193. package/dist/app/port/controller/PackageTagController.js +33 -36
  194. package/dist/app/port/controller/PackageVersionFileController.d.ts +1 -1
  195. package/dist/app/port/controller/PackageVersionFileController.js +56 -59
  196. package/dist/app/port/controller/ProxyCacheController.d.ts +7 -7
  197. package/dist/app/port/controller/ProxyCacheController.js +56 -58
  198. package/dist/app/port/controller/RegistryController.d.ts +7 -7
  199. package/dist/app/port/controller/RegistryController.js +57 -60
  200. package/dist/app/port/controller/ScopeController.d.ts +3 -3
  201. package/dist/app/port/controller/ScopeController.js +28 -31
  202. package/dist/app/port/controller/TokenController.d.ts +17 -17
  203. package/dist/app/port/controller/TokenController.js +52 -55
  204. package/dist/app/port/controller/UserController.d.ts +8 -8
  205. package/dist/app/port/controller/UserController.js +52 -55
  206. package/dist/app/port/controller/admin/PaddingVersionController.d.ts +1 -1
  207. package/dist/app/port/controller/admin/PaddingVersionController.js +14 -17
  208. package/dist/app/port/controller/convertor/HookConvertor.d.ts +4 -4
  209. package/dist/app/port/controller/convertor/HookConvertor.js +2 -6
  210. package/dist/app/port/controller/package/DownloadPackageVersionTar.d.ts +6 -6
  211. package/dist/app/port/controller/package/DownloadPackageVersionTar.js +69 -60
  212. package/dist/app/port/controller/package/RemovePackageVersionController.d.ts +1 -1
  213. package/dist/app/port/controller/package/RemovePackageVersionController.js +26 -29
  214. package/dist/app/port/controller/package/SavePackageVersionController.d.ts +9 -9
  215. package/dist/app/port/controller/package/SavePackageVersionController.js +57 -96
  216. package/dist/app/port/controller/package/SearchPackageController.d.ts +4 -4
  217. package/dist/app/port/controller/package/SearchPackageController.js +31 -34
  218. package/dist/app/port/controller/package/ShowPackageController.d.ts +1 -1
  219. package/dist/app/port/controller/package/ShowPackageController.js +32 -35
  220. package/dist/app/port/controller/package/ShowPackageVersionController.d.ts +2 -2
  221. package/dist/app/port/controller/package/ShowPackageVersionController.js +33 -36
  222. package/dist/app/port/controller/package/UpdatePackageController.d.ts +6 -6
  223. package/dist/app/port/controller/package/UpdatePackageController.js +25 -28
  224. package/dist/app/port/middleware/AdminAccess.js +6 -9
  225. package/dist/app/port/middleware/AlwaysAuth.js +4 -7
  226. package/dist/app/port/middleware/ErrorHandler.js +4 -7
  227. package/dist/app/port/middleware/Tracing.js +2 -5
  228. package/dist/app/port/middleware/index.js +10 -13
  229. package/dist/app/port/package.json +2 -1
  230. package/dist/app/port/schedule/ChangesStreamWorker.js +12 -15
  231. package/dist/app/port/schedule/CheckProxyCacheUpdateWorker.js +19 -21
  232. package/dist/app/port/schedule/CheckRecentlyUpdatedPackages.js +20 -23
  233. package/dist/app/port/schedule/CleanTempDir.js +23 -30
  234. package/dist/app/port/schedule/CreateSyncBinaryTask.js +13 -19
  235. package/dist/app/port/schedule/CreateTriggerHookWorker.js +18 -21
  236. package/dist/app/port/schedule/SavePackageVersionDownloadCounter.js +10 -13
  237. package/dist/app/port/schedule/SyncBinaryWorker.js +14 -17
  238. package/dist/app/port/schedule/SyncPackageWorker.js +14 -17
  239. package/dist/app/port/schedule/SyncProxyCacheWorker.js +14 -17
  240. package/dist/app/port/schedule/TaskTimeoutHandler.js +14 -17
  241. package/dist/app/port/schedule/TriggerHookWorker.js +18 -21
  242. package/dist/app/port/schedule/UpdateTotalData.js +32 -38
  243. package/dist/app/port/typebox.d.ts +73 -73
  244. package/dist/app/port/typebox.js +83 -90
  245. package/dist/app/port/webauth/WebauthController.d.ts +6 -6
  246. package/dist/app/port/webauth/WebauthController.js +91 -91
  247. package/dist/app/repository/AbstractRepository.js +4 -8
  248. package/dist/app/repository/BinaryRepository.d.ts +2 -2
  249. package/dist/app/repository/BinaryRepository.js +15 -18
  250. package/dist/app/repository/ChangeRepository.d.ts +3 -3
  251. package/dist/app/repository/ChangeRepository.js +11 -14
  252. package/dist/app/repository/DistRepository.d.ts +2 -2
  253. package/dist/app/repository/DistRepository.js +12 -15
  254. package/dist/app/repository/HookRepository.d.ts +2 -2
  255. package/dist/app/repository/HookRepository.js +14 -17
  256. package/dist/app/repository/PackageRepository.d.ts +8 -8
  257. package/dist/app/repository/PackageRepository.js +59 -62
  258. package/dist/app/repository/PackageVersionBlockRepository.d.ts +3 -3
  259. package/dist/app/repository/PackageVersionBlockRepository.js +14 -17
  260. package/dist/app/repository/PackageVersionDownloadRepository.d.ts +2 -2
  261. package/dist/app/repository/PackageVersionDownloadRepository.js +9 -12
  262. package/dist/app/repository/PackageVersionFileRepository.d.ts +2 -2
  263. package/dist/app/repository/PackageVersionFileRepository.js +19 -22
  264. package/dist/app/repository/PackageVersionRepository.d.ts +3 -3
  265. package/dist/app/repository/PackageVersionRepository.js +12 -15
  266. package/dist/app/repository/ProxyCacheRepository.d.ts +5 -5
  267. package/dist/app/repository/ProxyCacheRepository.js +16 -19
  268. package/dist/app/repository/RegistryRepository.d.ts +4 -4
  269. package/dist/app/repository/RegistryRepository.js +19 -22
  270. package/dist/app/repository/ScopeRepository.d.ts +4 -4
  271. package/dist/app/repository/ScopeRepository.js +19 -22
  272. package/dist/app/repository/SearchRepository.d.ts +1 -1
  273. package/dist/app/repository/SearchRepository.js +7 -10
  274. package/dist/app/repository/TaskRepository.d.ts +8 -8
  275. package/dist/app/repository/TaskRepository.js +31 -34
  276. package/dist/app/repository/UserRepository.d.ts +4 -4
  277. package/dist/app/repository/UserRepository.js +38 -41
  278. package/dist/app/repository/model/Binary.d.ts +1 -1
  279. package/dist/app/repository/model/Binary.js +17 -20
  280. package/dist/app/repository/model/Change.d.ts +1 -1
  281. package/dist/app/repository/model/Change.js +14 -17
  282. package/dist/app/repository/model/Dist.d.ts +1 -1
  283. package/dist/app/repository/model/Dist.js +16 -19
  284. package/dist/app/repository/model/HistoryTask.d.ts +2 -2
  285. package/dist/app/repository/model/HistoryTask.js +22 -25
  286. package/dist/app/repository/model/Hook.d.ts +2 -2
  287. package/dist/app/repository/model/Hook.js +19 -22
  288. package/dist/app/repository/model/Maintainer.d.ts +1 -1
  289. package/dist/app/repository/model/Maintainer.js +12 -15
  290. package/dist/app/repository/model/Package.d.ts +1 -1
  291. package/dist/app/repository/model/Package.js +21 -24
  292. package/dist/app/repository/model/PackageDep.d.ts +1 -1
  293. package/dist/app/repository/model/PackageDep.js +15 -18
  294. package/dist/app/repository/model/PackageTag.d.ts +1 -1
  295. package/dist/app/repository/model/PackageTag.js +14 -17
  296. package/dist/app/repository/model/PackageVersion.d.ts +1 -1
  297. package/dist/app/repository/model/PackageVersion.js +27 -30
  298. package/dist/app/repository/model/PackageVersionBlock.d.ts +1 -1
  299. package/dist/app/repository/model/PackageVersionBlock.js +14 -17
  300. package/dist/app/repository/model/PackageVersionDownload.d.ts +1 -1
  301. package/dist/app/repository/model/PackageVersionDownload.js +44 -47
  302. package/dist/app/repository/model/PackageVersionFile.d.ts +1 -1
  303. package/dist/app/repository/model/PackageVersionFile.js +19 -22
  304. package/dist/app/repository/model/PackageVersionManifest.d.ts +1 -1
  305. package/dist/app/repository/model/PackageVersionManifest.js +14 -17
  306. package/dist/app/repository/model/ProxyCache.d.ts +2 -2
  307. package/dist/app/repository/model/ProxyCache.js +15 -18
  308. package/dist/app/repository/model/Registry.d.ts +2 -2
  309. package/dist/app/repository/model/Registry.js +18 -21
  310. package/dist/app/repository/model/Scope.d.ts +1 -1
  311. package/dist/app/repository/model/Scope.js +13 -16
  312. package/dist/app/repository/model/Task.d.ts +2 -2
  313. package/dist/app/repository/model/Task.js +23 -26
  314. package/dist/app/repository/model/Token.d.ts +1 -1
  315. package/dist/app/repository/model/Token.js +23 -26
  316. package/dist/app/repository/model/TokenPackage.d.ts +1 -1
  317. package/dist/app/repository/model/TokenPackage.js +12 -15
  318. package/dist/app/repository/model/User.d.ts +1 -1
  319. package/dist/app/repository/model/User.js +18 -21
  320. package/dist/app/repository/model/WebauthnCredential.d.ts +1 -1
  321. package/dist/app/repository/model/WebauthnCredential.js +15 -18
  322. package/dist/app/repository/package.json +1 -3
  323. package/dist/app/repository/util/EntityProperty.js +6 -9
  324. package/dist/app/repository/util/ErrorUtil.js +2 -5
  325. package/dist/app/repository/util/ModelConvertor.d.ts +5 -5
  326. package/dist/app/repository/util/ModelConvertor.js +17 -24
  327. package/dist/app/repository/util/ModelConvertorUtil.js +5 -9
  328. package/dist/app/repository/util/leoric.d.ts +4 -0
  329. package/dist/app/repository/util/leoric.js +4 -0
  330. package/dist/app.d.ts +3 -3
  331. package/dist/app.js +9 -15
  332. package/dist/config/binaries.d.ts +8 -1
  333. package/dist/config/binaries.js +99 -94
  334. package/dist/config/config.default.d.ts +1 -1
  335. package/dist/config/config.default.js +69 -74
  336. package/dist/config/config.unittest.d.ts +1 -2
  337. package/dist/config/config.unittest.js +11 -16
  338. package/dist/config/database.js +20 -23
  339. package/dist/config/plugin.js +3 -5
  340. package/package.json +17 -16
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
2
  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
3
  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -8,26 +7,24 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
7
  var __metadata = (this && this.__metadata) || function (k, v) {
9
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
9
  };
11
- Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.TaskService = void 0;
13
- const tegg_1 = require("@eggjs/tegg");
14
- const NFSAdapter_1 = require("../../common/adapter/NFSAdapter");
15
- const Task_1 = require("../../common/enum/Task");
16
- const AbstractService_1 = require("../../common/AbstractService");
17
- const TaskRepository_1 = require("../../repository/TaskRepository");
18
- const Task_2 = require("../entity/Task");
19
- let TaskService = class TaskService extends AbstractService_1.AbstractService {
10
+ import { AccessLevel, SingletonProto, Inject, } from '@eggjs/tegg';
11
+ import { NFSAdapter } from '../../common/adapter/NFSAdapter.js';
12
+ import { TaskState, TaskType } from '../../common/enum/Task.js';
13
+ import { AbstractService } from '../../common/AbstractService.js';
14
+ import { TaskRepository } from '../../repository/TaskRepository.js';
15
+ import { Task } from '../entity/Task.js';
16
+ let TaskService = class TaskService extends AbstractService {
20
17
  async getTaskQueueLength(taskType) {
21
18
  return await this.queueAdapter.length(taskType);
22
19
  }
23
20
  async createTask(task, addTaskQueueOnExists) {
24
21
  const existsTask = await this.taskRepository.findTaskByTargetName(task.targetName, task.type);
25
22
  // 只在包同步场景下做任务合并,其余场景通过 bizId 来进行任务幂等
26
- if (existsTask && Task_2.Task.needMergeWhenWaiting(task.type)) {
23
+ if (existsTask && Task.needMergeWhenWaiting(task.type)) {
27
24
  // 在包同步场景,如果任务还未被触发,就不继续重复创建
28
25
  // 如果任务正在执行,可能任务状态已更新,这种情况需要继续创建
29
- if (existsTask.state === Task_1.TaskState.Waiting) {
30
- if (task.type === Task_1.TaskType.SyncPackage) {
26
+ if (existsTask.state === TaskState.Waiting) {
27
+ if (task.type === TaskType.SyncPackage) {
31
28
  // 如果是specificVersions的任务则可能可以和存量任务进行合并
32
29
  const specificVersions = task.data?.specificVersions;
33
30
  const existsTaskSpecificVersions = existsTask.data?.specificVersions;
@@ -65,7 +62,7 @@ let TaskService = class TaskService extends AbstractService_1.AbstractService {
65
62
  if (appendLog) {
66
63
  await this.appendLogToNFS(task, appendLog);
67
64
  }
68
- task.state = Task_1.TaskState.Waiting;
65
+ task.state = TaskState.Waiting;
69
66
  await this.taskRepository.saveTask(task);
70
67
  await this.queueAdapter.push(task.type, task.taskId);
71
68
  const queueLength = await this.getTaskQueueLength(task.type);
@@ -87,7 +84,7 @@ let TaskService = class TaskService extends AbstractService_1.AbstractService {
87
84
  task = await this.taskRepository.findTask(taskId);
88
85
  // 任务已删除或任务已执行
89
86
  // 继续取下一个任务
90
- if (task === null || task?.state !== Task_1.TaskState.Waiting) {
87
+ if (task === null || task?.state !== TaskState.Waiting) {
91
88
  taskId = await this.queueAdapter.pop(taskType);
92
89
  continue;
93
90
  }
@@ -103,12 +100,12 @@ let TaskService = class TaskService extends AbstractService_1.AbstractService {
103
100
  }
104
101
  async retryExecuteTimeoutTasks() {
105
102
  // try processing timeout tasks in 10 mins
106
- const tasks = await this.taskRepository.findTimeoutTasks(Task_1.TaskState.Processing, 60000 * 10);
103
+ const tasks = await this.taskRepository.findTimeoutTasks(TaskState.Processing, 60000 * 10);
107
104
  for (const task of tasks) {
108
105
  try {
109
106
  // ignore ChangesStream task, it won't timeout
110
- if (task.attempts >= 3 && task.type !== Task_1.TaskType.ChangesStream) {
111
- await this.finishTask(task, Task_1.TaskState.Timeout);
107
+ if (task.attempts >= 3 && task.type !== TaskType.ChangesStream) {
108
+ await this.finishTask(task, TaskState.Timeout);
112
109
  this.logger.warn('[TaskService.retryExecuteTimeoutTasks:timeout] taskType: %s, targetName: %s, taskId: %s, attempts %s set to fail', task.type, task.targetName, task.taskId, task.attempts);
113
110
  continue;
114
111
  }
@@ -121,10 +118,11 @@ let TaskService = class TaskService extends AbstractService_1.AbstractService {
121
118
  }
122
119
  catch (e) {
123
120
  this.logger.error('[TaskService.retryExecuteTimeoutTasks:error] processing task, taskType: %s, targetName: %s, taskId: %s, attempts %s will retry again', task.type, task.targetName, task.taskId, task.attempts);
121
+ this.logger.error(e);
124
122
  }
125
123
  }
126
124
  // try waiting timeout tasks in 30 mins
127
- const waitingTasks = await this.taskRepository.findTimeoutTasks(Task_1.TaskState.Waiting, 60000 * 30);
125
+ const waitingTasks = await this.taskRepository.findTimeoutTasks(TaskState.Waiting, 60000 * 30);
128
126
  for (const task of waitingTasks) {
129
127
  try {
130
128
  await this.retryTask(task);
@@ -132,6 +130,7 @@ let TaskService = class TaskService extends AbstractService_1.AbstractService {
132
130
  }
133
131
  catch (e) {
134
132
  this.logger.error('[TaskService.retryExecuteTimeoutTasks:error] waiting task, taskType: %s, targetName: %s, taskId: %s, attempts %s will retry again', task.type, task.targetName, task.taskId, task.attempts);
133
+ this.logger.error(e);
135
134
  }
136
135
  }
137
136
  return {
@@ -171,22 +170,22 @@ let TaskService = class TaskService extends AbstractService_1.AbstractService {
171
170
  }
172
171
  }
173
172
  };
174
- exports.TaskService = TaskService;
175
173
  __decorate([
176
- (0, tegg_1.Inject)(),
177
- __metadata("design:type", TaskRepository_1.TaskRepository)
174
+ Inject(),
175
+ __metadata("design:type", TaskRepository)
178
176
  ], TaskService.prototype, "taskRepository", void 0);
179
177
  __decorate([
180
- (0, tegg_1.Inject)(),
181
- __metadata("design:type", NFSAdapter_1.NFSAdapter)
178
+ Inject(),
179
+ __metadata("design:type", NFSAdapter)
182
180
  ], TaskService.prototype, "nfsAdapter", void 0);
183
181
  __decorate([
184
- (0, tegg_1.Inject)(),
182
+ Inject(),
185
183
  __metadata("design:type", Object)
186
184
  ], TaskService.prototype, "queueAdapter", void 0);
187
- exports.TaskService = TaskService = __decorate([
188
- (0, tegg_1.SingletonProto)({
189
- accessLevel: tegg_1.AccessLevel.PUBLIC,
185
+ TaskService = __decorate([
186
+ SingletonProto({
187
+ accessLevel: AccessLevel.PUBLIC,
190
188
  })
191
189
  ], TaskService);
192
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TaskService.js","sourceRoot":"","sources":["../../../../app/core/service/TaskService.ts"],"names":[],"mappings":"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"}
190
+ export { TaskService };
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,6 +1,6 @@
1
- import { AbstractService } from '../../common/AbstractService';
2
- import { Token } from '../entity/Token';
3
- import { Package as PackageEntity } from '../entity/Package';
1
+ import { AbstractService } from '../../common/AbstractService.js';
2
+ import { Token } from '../entity/Token.js';
3
+ import { Package as PackageEntity } from '../entity/Package.js';
4
4
  export declare class TokenService extends AbstractService {
5
5
  private readonly TokenPackage;
6
6
  private readonly Package;
@@ -10,6 +10,6 @@ export declare class TokenService extends AbstractService {
10
10
  checkGranularTokenAccess(token: Token, fullname: string): Promise<boolean>;
11
11
  getUserAndToken(authorization: string): Promise<{
12
12
  token: Token;
13
- user: import("../entity/User").User;
13
+ user: import("../entity/User.js").User;
14
14
  } | null>;
15
15
  }
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
2
  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
3
  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -8,46 +7,41 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
7
  var __metadata = (this && this.__metadata) || function (k, v) {
9
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
9
  };
11
- var __importDefault = (this && this.__importDefault) || function (mod) {
12
- return (mod && mod.__esModule) ? mod : { "default": mod };
13
- };
14
- Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.TokenService = void 0;
16
- const dayjs_1 = __importDefault(require("dayjs"));
17
- const tegg_1 = require("@eggjs/tegg");
18
- const lodash_1 = require("lodash");
19
- const AbstractService_1 = require("../../common/AbstractService");
20
- const Token_1 = require("../entity/Token");
21
- const ModelConvertor_1 = require("../../../app/repository/util/ModelConvertor");
22
- const Package_1 = require("../entity/Package");
23
- const egg_errors_1 = require("egg-errors");
24
- const PackageUtil_1 = require("../../../app/common/PackageUtil");
25
- const UserUtil_1 = require("../../../app/common/UserUtil");
26
- const UserRepository_1 = require("../../../app/repository/UserRepository");
27
- let TokenService = class TokenService extends AbstractService_1.AbstractService {
10
+ import dayjs from 'dayjs';
11
+ import { AccessLevel, SingletonProto, Inject, } from '@eggjs/tegg';
12
+ import { isEmpty } from 'lodash-es';
13
+ import { ForbiddenError, UnauthorizedError } from 'egg-errors';
14
+ import { AbstractService } from '../../common/AbstractService.js';
15
+ import { isGranularToken } from '../entity/Token.js';
16
+ import { ModelConvertor } from '../../../app/repository/util/ModelConvertor.js';
17
+ import { Package as PackageEntity } from '../entity/Package.js';
18
+ import { getScopeAndName } from '../../../app/common/PackageUtil.js';
19
+ import { sha512 } from '../../../app/common/UserUtil.js';
20
+ import { UserRepository } from '../../../app/repository/UserRepository.js';
21
+ let TokenService = class TokenService extends AbstractService {
28
22
  async listTokenPackages(token) {
29
- if ((0, Token_1.isGranularToken)(token)) {
23
+ if (isGranularToken(token)) {
30
24
  const models = await this.TokenPackage.find({ tokenId: token.tokenId });
31
25
  const packages = await this.Package.find({ packageId: models.map(m => m.packageId) });
32
- return packages.map(pkg => ModelConvertor_1.ModelConvertor.convertModelToEntity(pkg, Package_1.Package));
26
+ return packages.map(pkg => ModelConvertor.convertModelToEntity(pkg, PackageEntity));
33
27
  }
34
28
  return null;
35
29
  }
36
30
  async checkTokenStatus(token) {
37
31
  // check for expires
38
- if ((0, Token_1.isGranularToken)(token) && (0, dayjs_1.default)(token.expiredAt).isBefore(new Date())) {
39
- throw new egg_errors_1.UnauthorizedError('Token expired');
32
+ if (isGranularToken(token) && dayjs(token.expiredAt).isBefore(new Date())) {
33
+ throw new UnauthorizedError('Token expired');
40
34
  }
41
35
  token.lastUsedAt = new Date();
42
36
  this.userRepository.saveToken(token);
43
37
  }
44
38
  async checkGranularTokenAccess(token, fullname) {
45
39
  // check for scope whitelist
46
- const [scope, name] = (0, PackageUtil_1.getScopeAndName)(fullname);
40
+ const [scope, name] = getScopeAndName(fullname);
47
41
  // check for packages whitelist
48
42
  const allowedPackages = await this.listTokenPackages(token);
49
43
  // check for scope & packages access
50
- if ((0, lodash_1.isEmpty)(allowedPackages) && (0, lodash_1.isEmpty)(token.allowedScopes)) {
44
+ if (isEmpty(allowedPackages) && isEmpty(token.allowedScopes)) {
51
45
  return true;
52
46
  }
53
47
  const existPkgConfig = allowedPackages?.find(pkg => pkg.scope === scope && pkg.name === name);
@@ -58,36 +52,36 @@ let TokenService = class TokenService extends AbstractService_1.AbstractService
58
52
  if (existScopeConfig) {
59
53
  return true;
60
54
  }
61
- throw new egg_errors_1.ForbiddenError(`can't access package "${fullname}"`);
55
+ throw new ForbiddenError(`can't access package "${fullname}"`);
62
56
  }
63
57
  async getUserAndToken(authorization) {
64
58
  if (!authorization)
65
59
  return null;
66
- const matchs = /^Bearer ([\w\.]+?)$/.exec(authorization);
60
+ const matchs = /^Bearer ([\w.]+?)$/.exec(authorization);
67
61
  if (!matchs)
68
62
  return null;
69
63
  const tokenValue = matchs[1];
70
- const tokenKey = (0, UserUtil_1.sha512)(tokenValue);
64
+ const tokenKey = sha512(tokenValue);
71
65
  const authorizedUserAndToken = await this.userRepository.findUserAndTokenByTokenKey(tokenKey);
72
66
  return authorizedUserAndToken;
73
67
  }
74
68
  };
75
- exports.TokenService = TokenService;
76
69
  __decorate([
77
- (0, tegg_1.Inject)(),
70
+ Inject(),
78
71
  __metadata("design:type", Object)
79
72
  ], TokenService.prototype, "TokenPackage", void 0);
80
73
  __decorate([
81
- (0, tegg_1.Inject)(),
74
+ Inject(),
82
75
  __metadata("design:type", Object)
83
76
  ], TokenService.prototype, "Package", void 0);
84
77
  __decorate([
85
- (0, tegg_1.Inject)(),
86
- __metadata("design:type", UserRepository_1.UserRepository)
78
+ Inject(),
79
+ __metadata("design:type", UserRepository)
87
80
  ], TokenService.prototype, "userRepository", void 0);
88
- exports.TokenService = TokenService = __decorate([
89
- (0, tegg_1.SingletonProto)({
90
- accessLevel: tegg_1.AccessLevel.PUBLIC,
81
+ TokenService = __decorate([
82
+ SingletonProto({
83
+ accessLevel: AccessLevel.PUBLIC,
91
84
  })
92
85
  ], TokenService);
93
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW5TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvcmUvc2VydmljZS9Ub2tlblNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLHNDQUlxQjtBQUNyQixtQ0FBaUM7QUFDakMsa0VBQStEO0FBQy9ELDJDQUF5RDtBQUd6RCxnRkFBNkU7QUFDN0UsK0NBQTZEO0FBQzdELDJDQUErRDtBQUMvRCxpRUFBa0U7QUFDbEUsMkRBQXNEO0FBQ3RELDJFQUF3RTtBQUtqRSxJQUFNLFlBQVksR0FBbEIsTUFBTSxZQUFhLFNBQVEsaUNBQWU7SUFReEMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLEtBQVk7UUFDekMsSUFBSSxJQUFBLHVCQUFlLEVBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUMzQixNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1lBQ3hFLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxTQUFTLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDdEYsT0FBTyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxHQUFHLEVBQUUsaUJBQWEsQ0FBQyxDQUFDLENBQUM7UUFDdEYsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFZO1FBQ3hDLG9CQUFvQjtRQUNwQixJQUFJLElBQUEsdUJBQWUsRUFBQyxLQUFLLENBQUMsSUFBSSxJQUFB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
86
+ export { TokenService };
87
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW5TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvcmUvc2VydmljZS9Ub2tlblNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBQzFCLE9BQU8sRUFDTCxXQUFXLEVBQ1gsY0FBYyxFQUNkLE1BQU0sR0FDUCxNQUFNLGFBQWEsQ0FBQztBQUNyQixPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxjQUFjLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDL0QsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sRUFBUyxlQUFlLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUc1RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0RBQWdELENBQUM7QUFDaEYsT0FBTyxFQUFFLE9BQU8sSUFBSSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNoRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDckUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUtwRSxJQUFNLFlBQVksR0FBbEIsTUFBTSxZQUFhLFNBQVEsZUFBZTtJQVF4QyxLQUFLLENBQUMsaUJBQWlCLENBQUMsS0FBWTtRQUN6QyxJQUFJLGVBQWUsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQzNCLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDeEUsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxD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
@@ -1,9 +1,9 @@
1
- import { User as UserEntity } from '../entity/User';
2
- import { Token as TokenEntity, TokenType } from '../entity/Token';
3
- import { WebauthnCredential as WebauthnCredentialEntity } from '../entity/WebauthnCredential';
4
- import { LoginResultCode } from '../../common/enum/User';
5
- import { AbstractService } from '../../common/AbstractService';
6
- import { Registry } from '../entity/Registry';
1
+ import { User as UserEntity } from '../entity/User.js';
2
+ import { Token as TokenEntity, TokenType } from '../entity/Token.js';
3
+ import { WebauthnCredential as WebauthnCredentialEntity } from '../entity/WebauthnCredential.js';
4
+ import { LoginResultCode } from '../../common/enum/User.js';
5
+ import { AbstractService } from '../../common/AbstractService.js';
6
+ import { Registry } from '../entity/Registry.js';
7
7
  type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
8
8
  type CreateUser = {
9
9
  name: string;
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
2
  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
3
  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -8,27 +7,22 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
7
  var __metadata = (this && this.__metadata) || function (k, v) {
9
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
9
  };
11
- var __importDefault = (this && this.__importDefault) || function (mod) {
12
- return (mod && mod.__esModule) ? mod : { "default": mod };
13
- };
14
- Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.UserService = void 0;
16
- const node_crypto_1 = __importDefault(require("node:crypto"));
17
- const tegg_1 = require("@eggjs/tegg");
18
- const egg_errors_1 = require("egg-errors");
19
- const UserRepository_1 = require("../../repository/UserRepository");
20
- const User_1 = require("../entity/User");
21
- const Token_1 = require("../entity/Token");
22
- const WebauthnCredential_1 = require("../entity/WebauthnCredential");
23
- const User_2 = require("../../common/enum/User");
24
- const UserUtil_1 = require("../../common/UserUtil");
25
- const AbstractService_1 = require("../../common/AbstractService");
26
- const RegistryManagerService_1 = require("./RegistryManagerService");
27
- const PackageUtil_1 = require("../../common/PackageUtil");
28
- let UserService = class UserService extends AbstractService_1.AbstractService {
10
+ import crypto from 'node:crypto';
11
+ import { AccessLevel, SingletonProto, Inject, } from '@eggjs/tegg';
12
+ import { NotFoundError, ForbiddenError } from 'egg-errors';
13
+ import { UserRepository } from '../../repository/UserRepository.js';
14
+ import { User as UserEntity } from '../entity/User.js';
15
+ import { Token as TokenEntity } from '../entity/Token.js';
16
+ import { WebauthnCredential as WebauthnCredentialEntity } from '../entity/WebauthnCredential.js';
17
+ import { LoginResultCode } from '../../common/enum/User.js';
18
+ import { integrity, checkIntegrity, randomToken, sha512 } from '../../common/UserUtil.js';
19
+ import { AbstractService } from '../../common/AbstractService.js';
20
+ import { RegistryManagerService } from './RegistryManagerService.js';
21
+ import { getPrefixedName } from '../../common/PackageUtil.js';
22
+ let UserService = class UserService extends AbstractService {
29
23
  checkPassword(user, password) {
30
24
  const plain = `${user.passwordSalt}${password}`;
31
- return (0, UserUtil_1.checkIntegrity)(plain, user.passwordIntegrity);
25
+ return checkIntegrity(plain, user.passwordIntegrity);
32
26
  }
33
27
  async findUserByNameOrDisplayName(name) {
34
28
  const hasPrefix = name.includes(':');
@@ -36,16 +30,16 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
36
30
  return await this.findUserByName(name);
37
31
  }
38
32
  const selfRegistry = await this.registryManagerService.ensureSelfRegistry();
39
- const selfUser = await this.findUserByName((0, PackageUtil_1.getPrefixedName)(selfRegistry.userPrefix, name));
33
+ const selfUser = await this.findUserByName(getPrefixedName(selfRegistry.userPrefix, name));
40
34
  if (selfUser) {
41
35
  return selfUser;
42
36
  }
43
37
  const defaultRegistry = await this.registryManagerService.ensureDefaultRegistry();
44
- const defaultUser = await this.findUserByName((0, PackageUtil_1.getPrefixedName)(defaultRegistry.userPrefix, name));
38
+ const defaultUser = await this.findUserByName(getPrefixedName(defaultRegistry.userPrefix, name));
45
39
  return defaultUser;
46
40
  }
47
41
  async findInRegistry(registry, name) {
48
- return await this.findUserByName((0, PackageUtil_1.getPrefixedName)(registry.userPrefix, name));
42
+ return await this.findUserByName(getPrefixedName(registry.userPrefix, name));
49
43
  }
50
44
  async findUserByName(name) {
51
45
  return await this.userRepository.findUserByName(name);
@@ -53,14 +47,14 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
53
47
  async login(name, password) {
54
48
  const user = await this.userRepository.findUserByName(name);
55
49
  if (!user)
56
- return { code: User_2.LoginResultCode.UserNotFound };
50
+ return { code: LoginResultCode.UserNotFound };
57
51
  if (!this.checkPassword(user, password)) {
58
- return { code: User_2.LoginResultCode.Fail };
52
+ return { code: LoginResultCode.Fail };
59
53
  }
60
54
  const token = await this.createToken(user.userId);
61
- return { code: User_2.LoginResultCode.Success, user, token };
55
+ return { code: LoginResultCode.Success, user, token };
62
56
  }
63
- async findOrCreateUser({ name, email, ip, password = node_crypto_1.default.randomUUID() }) {
57
+ async findOrCreateUser({ name, email, ip, password = crypto.randomUUID() }) {
64
58
  let user = await this.userRepository.findUserByName(name);
65
59
  if (!user) {
66
60
  const createRes = await this.create({
@@ -79,10 +73,10 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
79
73
  return { user, token };
80
74
  }
81
75
  async create(createUser) {
82
- const passwordSalt = node_crypto_1.default.randomBytes(30).toString('hex');
76
+ const passwordSalt = crypto.randomBytes(30).toString('hex');
83
77
  const plain = `${passwordSalt}${createUser.password}`;
84
- const passwordIntegrity = (0, UserUtil_1.integrity)(plain);
85
- const userEntity = User_1.User.create({
78
+ const passwordIntegrity = integrity(plain);
79
+ const userEntity = UserEntity.create({
86
80
  name: createUser.name,
87
81
  email: createUser.email,
88
82
  ip: createUser.ip,
@@ -98,9 +92,9 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
98
92
  const storeName = name.startsWith('name:') ? name : `${userPrefix}${name}`;
99
93
  let user = await this.userRepository.findUserByName(storeName);
100
94
  if (!user) {
101
- const passwordSalt = node_crypto_1.default.randomBytes(20).toString('hex');
102
- const passwordIntegrity = (0, UserUtil_1.integrity)(passwordSalt);
103
- user = User_1.User.create({
95
+ const passwordSalt = crypto.randomBytes(20).toString('hex');
96
+ const passwordIntegrity = integrity(passwordSalt);
97
+ user = UserEntity.create({
104
98
  name: storeName,
105
99
  email,
106
100
  ip: '',
@@ -123,10 +117,10 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
123
117
  // https://github.blog/2021-09-23-announcing-npms-new-access-token-format/
124
118
  // https://github.blog/2021-04-05-behind-githubs-new-authentication-token-formats/
125
119
  // https://github.blog/changelog/2022-12-06-limit-scope-of-npm-tokens-with-the-new-granular-access-tokens/
126
- const token = (0, UserUtil_1.randomToken)(this.config.cnpmcore.name);
127
- const tokenKey = (0, UserUtil_1.sha512)(token);
120
+ const token = randomToken(this.config.cnpmcore.name);
121
+ const tokenKey = sha512(token);
128
122
  const tokenMark = token.substring(0, token.indexOf('_') + 4);
129
- const tokenEntity = Token_1.Token.create({
123
+ const tokenEntity = TokenEntity.create({
130
124
  tokenKey,
131
125
  tokenMark,
132
126
  userId,
@@ -140,13 +134,13 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
140
134
  let token = await this.userRepository.findTokenByTokenKey(tokenKeyOrTokenValue);
141
135
  if (!token) {
142
136
  // tokenKeyOrTokenValue is token value, sha512 and find again
143
- token = await this.userRepository.findTokenByTokenKey((0, UserUtil_1.sha512)(tokenKeyOrTokenValue));
137
+ token = await this.userRepository.findTokenByTokenKey(sha512(tokenKeyOrTokenValue));
144
138
  }
145
139
  if (!token) {
146
- throw new egg_errors_1.NotFoundError(`Token "${tokenKeyOrTokenValue}" not exists`);
140
+ throw new NotFoundError(`Token "${tokenKeyOrTokenValue}" not exists`);
147
141
  }
148
142
  if (token.userId !== userId) {
149
- throw new egg_errors_1.ForbiddenError(`Not authorized to remove token "${tokenKeyOrTokenValue}"`);
143
+ throw new ForbiddenError(`Not authorized to remove token "${tokenKeyOrTokenValue}"`);
150
144
  }
151
145
  await this.userRepository.removeToken(token.tokenId);
152
146
  }
@@ -155,7 +149,7 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
155
149
  return credential;
156
150
  }
157
151
  async createWebauthnCredential(userId, options) {
158
- const credentialEntity = WebauthnCredential_1.WebauthnCredential.create({
152
+ const credentialEntity = WebauthnCredentialEntity.create({
159
153
  userId: userId,
160
154
  credentialId: options.credentialId,
161
155
  publicKey: options.publicKey,
@@ -171,18 +165,18 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
171
165
  }
172
166
  }
173
167
  };
174
- exports.UserService = UserService;
175
168
  __decorate([
176
- (0, tegg_1.Inject)(),
177
- __metadata("design:type", UserRepository_1.UserRepository)
169
+ Inject(),
170
+ __metadata("design:type", UserRepository)
178
171
  ], UserService.prototype, "userRepository", void 0);
179
172
  __decorate([
180
- (0, tegg_1.Inject)(),
181
- __metadata("design:type", RegistryManagerService_1.RegistryManagerService)
173
+ Inject(),
174
+ __metadata("design:type", RegistryManagerService)
182
175
  ], UserService.prototype, "registryManagerService", void 0);
183
- exports.UserService = UserService = __decorate([
184
- (0, tegg_1.SingletonProto)({
185
- accessLevel: tegg_1.AccessLevel.PUBLIC,
176
+ UserService = __decorate([
177
+ SingletonProto({
178
+ accessLevel: AccessLevel.PUBLIC,
186
179
  })
187
180
  ], UserService);
188
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"UserService.js","sourceRoot":"","sources":["../../../../app/core/service/UserService.ts"],"names":[],"mappings":"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"}
181
+ export { UserService };
182
+ //# 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';
1
+ import { 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 {
@@ -1,13 +1,7 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.EntityUtil = void 0;
7
- const bson_objectid_1 = __importDefault(require("bson-objectid"));
8
- const egg_errors_1 = require("egg-errors");
1
+ import ObjectID from 'bson-objectid';
2
+ import { E400 } from 'egg-errors';
9
3
  const MAX_PAGE_SIZE = 100;
10
- class EntityUtil {
4
+ export class EntityUtil {
11
5
  static defaultData(data, id) {
12
6
  Reflect.set(data, id, EntityUtil.createId());
13
7
  data.createdAt = data.createdAt || new Date();
@@ -15,12 +9,13 @@ class EntityUtil {
15
9
  return data;
16
10
  }
17
11
  static createId() {
18
- return new bson_objectid_1.default().toHexString();
12
+ // @ts-expect-error ObjectID has no construct signatures
13
+ return new ObjectID().toHexString();
19
14
  }
20
15
  static convertPageOptionsToLimitOption(page) {
21
16
  const { pageIndex = 0, pageSize = 20 } = page;
22
17
  if (pageSize > MAX_PAGE_SIZE) {
23
- throw new egg_errors_1.E400(`max page size is 100, current request is ${pageSize}`);
18
+ throw new E400(`max page size is 100, current request is ${pageSize}`);
24
19
  }
25
20
  return {
26
21
  offset: pageIndex * pageSize,
@@ -28,5 +23,4 @@ class EntityUtil {
28
23
  };
29
24
  }
30
25
  }
31
- exports.EntityUtil = EntityUtil;
32
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW50aXR5VXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3V0aWwvRW50aXR5VXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxrRUFBcUM7QUFDckMsMkNBQWtDO0FBT2xDLE1BQU0sYUFBYSxHQUFHLEdBQVksQ0FBQztBQWNuQyxNQUFhLFVBQVU7SUFDckIsTUFBTSxDQUFDLFdBQVcsQ0FBMkMsSUFBcUIsRUFBRSxFQUFNO1FBQ3hGLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUM3QyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUM5QyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUM5QyxPQUFPLElBQVMsQ0FBQztJQUNuQixDQUFDO0lBRUQsTUFBTSxDQUFDLFFBQVE7UUFDYixPQUFPLElBQUksdUJBQVEsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ3RDLENBQUM7SUFFRCxNQUFNLENBQUMsK0JBQStCLENBQUMsSUFBaUI7UUFDdEQsTUFBTSxFQUFFLFNBQVMsR0FBRyxDQUFDLEVBQUUsUUFBUSxHQUFHLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FBQztRQUM5QyxJQUFJLFFBQVEsR0FBRyxhQUFhLEVBQUUsQ0FBQztZQUM3QixNQUFNLElBQUksaUJBQUksQ0FBQyw0Q0FBNEMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUN6RSxDQUFDO1FBQ0QsT0FBTztZQUNMLE1BQU0sRUFBRSxTQUFTLEdBQUcsUUFBUTtZQUM1QixLQUFLLEVBQUUsUUFBUTtTQUNoQixDQUFDO0lBQ0osQ0FBQztDQUNGO0FBdEJELGdDQXNCQyJ9
26
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW50aXR5VXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3V0aWwvRW50aXR5VXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLFFBQVEsTUFBTSxlQUFlLENBQUM7QUFDckMsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFlBQVksQ0FBQztBQVFsQyxNQUFNLGFBQWEsR0FBRyxHQUFZLENBQUM7QUFjbkMsTUFBTSxPQUFPLFVBQVU7SUFDckIsTUFBTSxDQUFDLFdBQVcsQ0FBMkMsSUFBcUIsRUFBRSxFQUFNO1FBQ3hGLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUM3QyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUM5QyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUM5QyxPQUFPLElBQVMsQ0FBQztJQUNuQixDQUFDO0lBRUQsTUFBTSxDQUFDLFFBQVE7UUFDYix3REFBd0Q7UUFDeEQsT0FBTyxJQUFJLFFBQVEsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ3RDLENBQUM7SUFFRCxNQUFNLENBQUMsK0JBQStCLENBQUMsSUFBaUI7UUFDdEQsTUFBTSxFQUFFLFNBQVMsR0FBRyxDQUFDLEVBQUUsUUFBUSxHQUFHLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FBQztRQUM5QyxJQUFJLFFBQVEsR0FBRyxhQUFhLEVBQUUsQ0FBQztZQUM3QixNQUFNLElBQUksSUFBSSxDQUFDLDRDQUE0QyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQ3pFLENBQUM7UUFDRCxPQUFPO1lBQ0wsTUFBTSxFQUFFLFNBQVMsR0FBRyxRQUFRO1lBQzVCLEtBQUssRUFBRSxRQUFRO1NBQ2hCLENBQUM7SUFDSixDQUFDO0NBQ0YifQ==
@@ -1,6 +1,6 @@
1
1
  import { EggContext } from '@eggjs/tegg';
2
2
  import { Redis } from 'ioredis';
3
- import { AuthClient, AuthUrlResult, userResult } from '../common/typing';
3
+ import { AuthClient, AuthUrlResult, userResult } from '../common/typing.js';
4
4
  type SSO_USER = {
5
5
  name: string;
6
6
  email: string;