beatsaber-bot-core 0.2.0-dev.9 → 0.2.0-rc.2

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 (196) hide show
  1. package/lib/api/base/aioclient.d.ts +11 -0
  2. package/lib/api/base/aioclient.js +20 -0
  3. package/lib/api/base/aioclient.js.map +1 -0
  4. package/lib/api/base/blclient.d.ts +18 -0
  5. package/lib/api/base/blclient.js +60 -0
  6. package/lib/api/base/blclient.js.map +1 -0
  7. package/lib/api/base/bsclient.d.ts +17 -0
  8. package/lib/api/base/bsclient.js +75 -0
  9. package/lib/api/base/bsclient.js.map +1 -0
  10. package/lib/api/base/index.d.ts +4 -12
  11. package/lib/api/base/index.js +4 -4
  12. package/lib/api/base/index.js.map +1 -1
  13. package/lib/api/base/ssclient.d.ts +13 -0
  14. package/lib/api/base/ssclient.js +48 -0
  15. package/lib/api/base/ssclient.js.map +1 -0
  16. package/lib/api/composed/beatleader.d.ts +3 -3
  17. package/lib/api/composed/beatleader.js +22 -9
  18. package/lib/api/composed/beatleader.js.map +1 -1
  19. package/lib/api/composed/beatsaver.d.ts +2 -3
  20. package/lib/api/composed/beatsaver.js +2 -1
  21. package/lib/api/composed/beatsaver.js.map +1 -1
  22. package/lib/api/composed/scoresaber.js +5 -1
  23. package/lib/api/composed/scoresaber.js.map +1 -1
  24. package/lib/api/helper.d.ts +19 -0
  25. package/lib/api/helper.js +102 -0
  26. package/lib/api/helper.js.map +1 -0
  27. package/lib/api/index.d.ts +6 -23
  28. package/lib/api/index.js +22 -113
  29. package/lib/api/index.js.map +1 -1
  30. package/lib/api/interfaces/beatsaver/bsmap.d.ts +2 -0
  31. package/lib/api/interfaces/beatsaver/index.d.ts +2 -1
  32. package/lib/api/interfaces/index.d.ts +12 -0
  33. package/lib/api/interfaces/index.js +3 -0
  34. package/lib/{db → api/interfaces}/index.js.map +1 -1
  35. package/lib/api/interfaces/scoresaber/item.d.ts +12 -3
  36. package/lib/api/interfaces/scoresaber/leaderboard.d.ts +10 -0
  37. package/lib/api/interfaces/scoresaber/leaderboard.js +3 -0
  38. package/lib/api/interfaces/scoresaber/leaderboard.js.map +1 -0
  39. package/lib/cmd/bind/bind-beatleader.js +15 -17
  40. package/lib/cmd/bind/bind-beatleader.js.map +1 -1
  41. package/lib/cmd/bind/bind-beatsaver.js +27 -21
  42. package/lib/cmd/bind/bind-beatsaver.js.map +1 -1
  43. package/lib/cmd/bind/bind-id-beatleader.js +8 -10
  44. package/lib/cmd/bind/bind-id-beatleader.js.map +1 -1
  45. package/lib/cmd/bind/bind-id-beatsaver.js +8 -10
  46. package/lib/cmd/bind/bind-id-beatsaver.js.map +1 -1
  47. package/lib/cmd/bind/bind-scoresaber.js +7 -9
  48. package/lib/cmd/bind/bind-scoresaber.js.map +1 -1
  49. package/lib/cmd/bind/index.js +6 -3
  50. package/lib/cmd/bind/index.js.map +1 -1
  51. package/lib/cmd/bsmap/id-search.js +5 -6
  52. package/lib/cmd/bsmap/id-search.js.map +1 -1
  53. package/lib/cmd/bsmap/key-search.js +10 -10
  54. package/lib/cmd/bsmap/key-search.js.map +1 -1
  55. package/lib/cmd/bsmap/latest.js +13 -19
  56. package/lib/cmd/bsmap/latest.js.map +1 -1
  57. package/lib/cmd/config/index.d.ts +12 -0
  58. package/lib/cmd/config/index.js +70 -0
  59. package/lib/cmd/config/index.js.map +1 -0
  60. package/lib/cmd/deprecated/me.d.ts +1 -1
  61. package/lib/cmd/deprecated/me.js +6 -6
  62. package/lib/cmd/deprecated/me.js.map +1 -1
  63. package/lib/cmd/deprecated/tmp.js +2 -0
  64. package/lib/cmd/deprecated/tmp.js.map +1 -1
  65. package/lib/cmd/deprecated/whois.js +2 -2
  66. package/lib/cmd/deprecated/whois.js.map +1 -1
  67. package/lib/cmd/help.js +2 -2
  68. package/lib/cmd/index.js +3 -1
  69. package/lib/cmd/index.js.map +1 -1
  70. package/lib/cmd/rank.js +13 -18
  71. package/lib/cmd/rank.js.map +1 -1
  72. package/lib/cmd/score.d.ts +1 -1
  73. package/lib/cmd/score.js +20 -12
  74. package/lib/cmd/score.js.map +1 -1
  75. package/lib/cmd/subscribe/id-beatleader-score.d.ts +2 -0
  76. package/lib/cmd/subscribe/id-beatleader-score.js +41 -0
  77. package/lib/cmd/subscribe/id-beatleader-score.js.map +1 -0
  78. package/lib/cmd/subscribe/id-beatsaver-mapper.d.ts +2 -0
  79. package/lib/cmd/subscribe/id-beatsaver-mapper.js +42 -0
  80. package/lib/cmd/subscribe/id-beatsaver-mapper.js.map +1 -0
  81. package/lib/cmd/subscribe/index.js +22 -6
  82. package/lib/cmd/subscribe/index.js.map +1 -1
  83. package/lib/cmd/subscribe/unsubscribe.d.ts +4 -3
  84. package/lib/cmd/subscribe/unsubscribe.js +38 -0
  85. package/lib/cmd/subscribe/unsubscribe.js.map +1 -1
  86. package/lib/config.d.ts +21 -4
  87. package/lib/errors/index.d.ts +30 -0
  88. package/lib/errors/index.js +94 -1
  89. package/lib/errors/index.js.map +1 -1
  90. package/lib/i18n/index.js +17 -11
  91. package/lib/i18n/index.js.map +1 -1
  92. package/lib/i18n/parser.d.ts +14 -0
  93. package/lib/i18n/parser.js +165 -0
  94. package/lib/i18n/parser.js.map +1 -0
  95. package/lib/i18n/zh-cn.json +1 -1
  96. package/lib/img-render/components/RankDifficulty.d.ts +3 -2
  97. package/lib/img-render/components/RankDifficulty.js +8 -2
  98. package/lib/img-render/components/RankDifficulty.js.map +1 -1
  99. package/lib/img-render/components/{rankScoreItem.d.ts → bl-rank-score-item.d.ts} +4 -1
  100. package/lib/img-render/components/bl-rank-score-item.js +42 -0
  101. package/lib/img-render/components/bl-rank-score-item.js.map +1 -0
  102. package/lib/img-render/components/{blScoreItem.js → bl-score-item.js} +3 -3
  103. package/lib/img-render/components/bl-score-item.js.map +1 -0
  104. package/lib/img-render/components/scoregraph.js +1 -1
  105. package/lib/img-render/components/scoregraph.js.map +1 -1
  106. package/lib/img-render/components/ss-rank-score-item.d.ts +18 -0
  107. package/lib/img-render/components/ss-rank-score-item.js +42 -0
  108. package/lib/img-render/components/ss-rank-score-item.js.map +1 -0
  109. package/lib/img-render/components/{ssScoreItem.js → ss-score-item.js} +2 -2
  110. package/lib/img-render/components/ss-score-item.js.map +1 -0
  111. package/lib/img-render/index.d.ts +13 -10
  112. package/lib/img-render/index.js +61 -38
  113. package/lib/img-render/index.js.map +1 -1
  114. package/lib/img-render/interfaces.d.ts +2 -0
  115. package/lib/img-render/render.js +1 -1
  116. package/lib/img-render/render.js.map +1 -1
  117. package/lib/img-render/result/bl-player.d.ts +2 -1
  118. package/lib/img-render/result/bl-player.js +7 -4
  119. package/lib/img-render/result/bl-player.js.map +1 -1
  120. package/lib/img-render/result/{bs-score-with-rank.d.ts → bl-score-with-rank.d.ts} +2 -1
  121. package/lib/img-render/result/{bs-score-with-rank.js → bl-score-with-rank.js} +19 -7
  122. package/lib/img-render/result/bl-score-with-rank.js.map +1 -0
  123. package/lib/img-render/result/index.d.ts +3 -3
  124. package/lib/img-render/result/index.js +7 -7
  125. package/lib/img-render/result/index.js.map +1 -1
  126. package/lib/img-render/result/ss-player.d.ts +2 -1
  127. package/lib/img-render/result/ss-player.js +3 -4
  128. package/lib/img-render/result/ss-player.js.map +1 -1
  129. package/lib/img-render/utils/canvas.js +9 -3
  130. package/lib/img-render/utils/canvas.js.map +1 -1
  131. package/lib/img-render/utils/format.d.ts +1 -0
  132. package/lib/img-render/utils/format.js +16 -2
  133. package/lib/img-render/utils/format.js.map +1 -1
  134. package/lib/img-render/utils/qrcode.js +8 -1
  135. package/lib/img-render/utils/qrcode.js.map +1 -1
  136. package/lib/interface/cmd.d.ts +3 -0
  137. package/lib/interface/db/index.d.ts +7 -0
  138. package/lib/interface/db/models.d.ts +5 -0
  139. package/lib/interface/render.d.ts +7 -5
  140. package/lib/schedules/index.d.ts +6 -2
  141. package/lib/schedules/index.js +9 -2
  142. package/lib/schedules/index.js.map +1 -1
  143. package/lib/schedules/interface.d.ts +2 -1
  144. package/lib/schedules/oauthTokenRefreshTask.js +8 -8
  145. package/lib/schedules/oauthTokenRefreshTask.js.map +1 -1
  146. package/lib/schedules/temp.d.ts +2 -1
  147. package/lib/schedules/temp.js +20 -25
  148. package/lib/schedules/temp.js.map +1 -1
  149. package/lib/utils/cache.d.ts +1 -0
  150. package/lib/utils/cache.js +3 -1
  151. package/lib/utils/cache.js.map +1 -1
  152. package/lib/utils/fetch/error.d.ts +9 -0
  153. package/lib/utils/fetch/error.js +27 -0
  154. package/lib/utils/fetch/error.js.map +1 -0
  155. package/lib/utils/fetch/index.d.ts +4 -0
  156. package/lib/utils/fetch/index.js +34 -0
  157. package/lib/utils/fetch/index.js.map +1 -0
  158. package/lib/utils/fetch/ofetch.d.ts +23 -0
  159. package/lib/utils/fetch/ofetch.js +85 -0
  160. package/lib/utils/fetch/ofetch.js.map +1 -0
  161. package/lib/utils/index.d.ts +3 -0
  162. package/lib/utils/index.js +4 -1
  163. package/lib/utils/index.js.map +1 -1
  164. package/lib/utils/preference.d.ts +35 -0
  165. package/lib/utils/preference.js +115 -0
  166. package/lib/utils/preference.js.map +1 -0
  167. package/lib/utils/puppeteer.d.ts +23 -0
  168. package/lib/utils/puppeteer.js +92 -0
  169. package/lib/utils/puppeteer.js.map +1 -0
  170. package/lib/utils/s3.d.ts +11 -0
  171. package/lib/utils/s3.js +60 -0
  172. package/lib/utils/s3.js.map +1 -0
  173. package/lib/ws/beatsaver.js +16 -2
  174. package/lib/ws/beatsaver.js.map +1 -1
  175. package/package.json +12 -4
  176. package/lib/api/base/aioRequest.d.ts +0 -6
  177. package/lib/api/base/aioRequest.js +0 -24
  178. package/lib/api/base/aioRequest.js.map +0 -1
  179. package/lib/api/base/blRequset.d.ts +0 -12
  180. package/lib/api/base/blRequset.js +0 -68
  181. package/lib/api/base/blRequset.js.map +0 -1
  182. package/lib/api/base/bsRequest.d.ts +0 -24
  183. package/lib/api/base/bsRequest.js +0 -64
  184. package/lib/api/base/bsRequest.js.map +0 -1
  185. package/lib/api/base/scRequest.d.ts +0 -6
  186. package/lib/api/base/scRequest.js +0 -28
  187. package/lib/api/base/scRequest.js.map +0 -1
  188. package/lib/db/index.d.ts +0 -0
  189. package/lib/db/index.js +0 -1
  190. package/lib/img-render/components/blScoreItem.js.map +0 -1
  191. package/lib/img-render/components/rankScoreItem.js +0 -38
  192. package/lib/img-render/components/rankScoreItem.js.map +0 -1
  193. package/lib/img-render/components/ssScoreItem.js.map +0 -1
  194. package/lib/img-render/result/bs-score-with-rank.js.map +0 -1
  195. /package/lib/img-render/components/{blScoreItem.d.ts → bl-score-item.d.ts} +0 -0
  196. /package/lib/img-render/components/{ssScoreItem.d.ts → ss-score-item.d.ts} +0 -0
@@ -0,0 +1,11 @@
1
+ import { Config } from '../../config';
2
+ import { AioOauthTokenResponse } from '../../api/interfaces/aiosaber';
3
+ import { Fetch } from '../../utils/fetch/ofetch';
4
+ import { Logger } from '../../interface';
5
+ export declare class AIOSaberClient {
6
+ cfg: Config;
7
+ f: Fetch;
8
+ constructor(cfg: Config, logger: Logger);
9
+ getBSOAuthToken(key: string): Promise<AioOauthTokenResponse>;
10
+ getBLOAuthToken(key: string): Promise<AioOauthTokenResponse>;
11
+ }
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.AIOSaberClient = void 0;
4
+ const fetch_1 = require("../../utils/fetch");
5
+ class AIOSaberClient {
6
+ cfg;
7
+ f;
8
+ constructor(cfg, logger) {
9
+ this.f = (0, fetch_1.createFetch)(logger).baseUrl('https://abs.ktlab.io');
10
+ this.cfg = cfg;
11
+ }
12
+ async getBSOAuthToken(key) {
13
+ return this.f.get(`/api/oauth/beatsaver/token/${key}`);
14
+ }
15
+ async getBLOAuthToken(key) {
16
+ return this.f.get(`/api/oauth/beatleader/token/${key}`);
17
+ }
18
+ }
19
+ exports.AIOSaberClient = AIOSaberClient;
20
+ //# sourceMappingURL=aioclient.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"aioclient.js","sourceRoot":"","sources":["../../../src/api/base/aioclient.ts"],"names":[],"mappings":";;;AAGA,yCAA2C;AAG3C,MAAa,cAAc;IACzB,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW,EAAE,MAAc;QACrC,IAAI,CAAC,CAAC,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAA;QAC5D,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,GAAW;QAC/B,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CACf,8BAA8B,GAAG,EAAE,CACpC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,GAAW;QAC/B,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CACf,+BAA+B,GAAG,EAAE,CACrC,CAAA;IACH,CAAC;CACF;AAjBD,wCAiBC"}
@@ -0,0 +1,18 @@
1
+ import { OAuthTokenInfoResponse, OAuthTokenResponse } from '../interfaces';
2
+ import { Config } from '../../config';
3
+ import { Fetch } from '../../utils/fetch';
4
+ import { BeadLeaderScoresResponse, BeatLeaderPlayerScoreRequest, BeatLeaderUser, Leaderboard, Score } from '../../api/interfaces/beatleader';
5
+ import { Logger } from '../../interface';
6
+ export declare class BeatLeaderClient {
7
+ cfg: Config;
8
+ f: Fetch;
9
+ constructor(cfg: Config, logger: Logger);
10
+ getPlayerScore(req: BeatLeaderPlayerScoreRequest): Promise<Leaderboard>;
11
+ getTokenInfo(accessToken: string): Promise<OAuthTokenInfoResponse>;
12
+ refreshOAuthToken(refreshToken: string): Promise<OAuthTokenResponse>;
13
+ getPlayerInfo(accountId: string): Promise<BeatLeaderUser>;
14
+ getPlayerScores(accountId: string): Promise<BeadLeaderScoresResponse>;
15
+ getPlayerPinnedScores(accountId: string): Promise<Score[]>;
16
+ getBeatScore(scoreId: string): Promise<Score>;
17
+ getLeaderboard(leaderboardId: string, params?: Record<string, any>): Promise<any>;
18
+ }
@@ -0,0 +1,60 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.BeatLeaderClient = void 0;
4
+ const fetch_1 = require("../../utils/fetch");
5
+ class BeatLeaderClient {
6
+ cfg;
7
+ f;
8
+ constructor(cfg, logger) {
9
+ this.f = (0, fetch_1.createFetch)(logger).baseUrl('https://api.beatleader.xyz').extend({
10
+ ignoreResponseError: false,
11
+ });
12
+ this.cfg = cfg;
13
+ }
14
+ async getPlayerScore(req) {
15
+ const res = await this.f.get(`/score/${req.leaderboardContext}/${req.playerID}/${req.hash}/${req.diff}/${req.mode}`);
16
+ return res;
17
+ }
18
+ async getTokenInfo(accessToken) {
19
+ return this.f.get(`/oauth2/identity`, {
20
+ headers: {
21
+ Authorization: `Bearer ${accessToken}`,
22
+ },
23
+ });
24
+ }
25
+ async refreshOAuthToken(refreshToken) {
26
+ const form = new URLSearchParams();
27
+ form.append('client_id', this.cfg.blOauthClientId);
28
+ form.append('client_secret', this.cfg.blOauthClientSecret);
29
+ form.append('grant_type', 'refresh_token');
30
+ form.append('refresh_token', refreshToken);
31
+ const res = await fetch('https://beatsaver.com/api/oauth2/token', {
32
+ method: 'POST',
33
+ headers: {
34
+ 'Content-Type': 'application/x-www-form-urlencoded',
35
+ },
36
+ body: form,
37
+ }).then((res) => res.json());
38
+ if (!res.access_token) {
39
+ throw new Error('refreshToken failed');
40
+ }
41
+ return res;
42
+ }
43
+ async getPlayerInfo(accountId) {
44
+ return this.f.get(`/player/${accountId}`);
45
+ }
46
+ async getPlayerScores(accountId) {
47
+ return this.f.get(`/player/${accountId}/scores?count=24&sortBy=pp`);
48
+ }
49
+ async getPlayerPinnedScores(accountId) {
50
+ return this.f.get(`/player/${accountId}/pinnedScores`);
51
+ }
52
+ async getBeatScore(scoreId) {
53
+ return this.f.get(`/score/${scoreId}`);
54
+ }
55
+ async getLeaderboard(leaderboardId, params) {
56
+ return this.f.get(`/leaderboard/${leaderboardId}`, { query: params });
57
+ }
58
+ }
59
+ exports.BeatLeaderClient = BeatLeaderClient;
60
+ //# sourceMappingURL=blclient.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"blclient.js","sourceRoot":"","sources":["../../../src/api/base/blclient.ts"],"names":[],"mappings":";;;AAEA,yCAAkD;AAUlD,MAAa,gBAAgB;IAC3B,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW,EAAE,MAAc;QACrC,IAAI,CAAC,CAAC,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,MAAM,CAAC;YACxE,mBAAmB,EAAE,KAAK;SAC3B,CAAC,CAAA;QACF,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,GAAiC;QACpD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,CAC1B,UAAU,GAAG,CAAC,kBAAkB,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,EAAE,CACvF,CAAA;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,WAAmB;QACpC,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAyB,kBAAkB,EAAE;YAC5D,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,WAAW,EAAE;aACvC;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,YAAoB;QAC1C,MAAM,IAAI,GAAG,IAAI,eAAe,EAAE,CAAA;QAClC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;QAClD,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;QAC1D,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,CAAA;QAC1C,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;QAC1C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,wCAAwC,EAAE;YAChE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,mCAAmC;aACpD;YACD,IAAI,EAAE,IAAI;SACX,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAiC,CAAC,CAAA;QAC3D,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACxC,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB;QACnC,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAiB,WAAW,SAAS,EAAE,CAAC,CAAA;IAC3D,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAiB;QACrC,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CACf,WAAW,SAAS,4BAA4B,CACjD,CAAA;IACH,CAAC;IACD,KAAK,CAAC,qBAAqB,CAAC,SAAiB;QAC3C,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAU,WAAW,SAAS,eAAe,CAAC,CAAA;IACjE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAe;QAChC,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAQ,UAAU,OAAO,EAAE,CAAC,CAAA;IAC/C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,aAAqB,EAAE,MAA4B;QACtE,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IACvE,CAAC;CACF;AA/DD,4CA+DC"}
@@ -0,0 +1,17 @@
1
+ import { OAuthTokenInfoResponse, OAuthTokenResponse } from '../interfaces';
2
+ import { Config } from '../../config';
3
+ import { Fetch } from '../../utils/fetch';
4
+ import { BSMap, BSUserResponse, HashReqResponse } from '../../api/interfaces/beatsaver';
5
+ import { Logger } from '../../interface';
6
+ export declare class BeatSaverClient {
7
+ cfg: Config;
8
+ f: Fetch;
9
+ constructor(cfg: Config, logger: Logger);
10
+ getBSMapperById(userId: string): Promise<BSUserResponse>;
11
+ getLatestMaps(pageSize?: number): Promise<BSMap[]>;
12
+ searchMapByKeyword(key: string, params?: Record<string, boolean | number | string>): Promise<BSMap[]>;
13
+ searchMapById(id: string): Promise<BSMap>;
14
+ getTokenInfo(ak: string): Promise<OAuthTokenInfoResponse>;
15
+ getMapsByHashes(hashes: string[]): Promise<HashReqResponse>;
16
+ refreshOAuthToken(rk: string): Promise<OAuthTokenResponse>;
17
+ }
@@ -0,0 +1,75 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.BeatSaverClient = void 0;
4
+ const fetch_1 = require("../../utils/fetch");
5
+ const error_1 = require("../../utils/fetch/error");
6
+ class BeatSaverClient {
7
+ cfg;
8
+ f;
9
+ constructor(cfg, logger) {
10
+ this.f = (0, fetch_1.createFetch)(logger)
11
+ .baseUrl(cfg.beatSaverHost ?? 'https://api.beatsaver.com')
12
+ .extend({
13
+ ignoreResponseError: false,
14
+ onResponseError: (context) => {
15
+ if (context.response.status === 404 ||
16
+ context.response.status === 400) {
17
+ throw new error_1.NotFoundError();
18
+ }
19
+ },
20
+ });
21
+ this.cfg = cfg;
22
+ }
23
+ async getBSMapperById(userId) {
24
+ return this.f.get(`/users/id/${userId}`);
25
+ }
26
+ async getLatestMaps(pageSize = 5) {
27
+ return this.f
28
+ .get(`/maps/latest`, {
29
+ query: {
30
+ sort: 'FIRST_PUBLISHED',
31
+ pageSize,
32
+ },
33
+ })
34
+ .then((res) => res.docs);
35
+ }
36
+ async searchMapByKeyword(key, params) {
37
+ return this.f
38
+ .get(`/search/text/0`, {
39
+ query: {
40
+ q: key,
41
+ ...params,
42
+ },
43
+ })
44
+ .then((res) => res.docs);
45
+ }
46
+ async searchMapById(id) {
47
+ return this.f.get(`/maps/id/${id}`);
48
+ }
49
+ async getTokenInfo(ak) {
50
+ return this.f.get(`/oauth2/identity`, {
51
+ headers: {
52
+ Authorization: `Bearer ${ak}`,
53
+ },
54
+ });
55
+ }
56
+ async getMapsByHashes(hashes) {
57
+ return this.f.get(`/maps/hash/${hashes.join(',')}`);
58
+ }
59
+ async refreshOAuthToken(rk) {
60
+ const res = await this.f.post('https://beatsaver.com/api/oauth2/token', {
61
+ form: {
62
+ client_id: this.cfg.bsOauthClientId,
63
+ client_secret: this.cfg.bsOauthClientSecret,
64
+ grant_type: 'refresh_token',
65
+ refresh_token: rk,
66
+ },
67
+ });
68
+ if (!res.access_token) {
69
+ throw new Error('refreshToken failed');
70
+ }
71
+ return res;
72
+ }
73
+ }
74
+ exports.BeatSaverClient = BeatSaverClient;
75
+ //# sourceMappingURL=bsclient.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bsclient.js","sourceRoot":"","sources":["../../../src/api/base/bsclient.ts"],"names":[],"mappings":";;;AAEA,yCAAkD;AAQlD,+CAAmD;AAEnD,MAAa,eAAe;IAC1B,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW,EAAE,MAAc;QACrC,IAAI,CAAC,CAAC,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;aACzB,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,2BAA2B,CAAC;aACzD,MAAM,CAAC;YACN,mBAAmB,EAAE,KAAK;YAC1B,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC3B,IACE,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG;oBAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAC/B,CAAC;oBACD,MAAM,IAAI,qBAAa,EAAE,CAAA;gBAC3B,CAAC;YACH,CAAC;SACF,CAAC,CAAA;QACJ,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,MAAc;QAClC,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAiB,aAAa,MAAM,EAAE,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAmB,CAAC;QACtC,OAAO,IAAI,CAAC,CAAC;aACV,GAAG,CAAsB,cAAc,EAAE;YACxC,KAAK,EAAE;gBACL,IAAI,EAAE,iBAAiB;gBACvB,QAAQ;aACT;SACF,CAAC;aACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,GAAW,EACX,MAAkD;QAElD,OAAO,IAAI,CAAC,CAAC;aACV,GAAG,CAAsB,gBAAgB,EAAE;YAC1C,KAAK,EAAE;gBACL,CAAC,EAAE,GAAG;gBACN,GAAG,MAAM;aACV;SACF,CAAC;aACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU;QAC5B,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAQ,YAAY,EAAE,EAAE,CAAC,CAAA;IAC5C,CAAC;IACD,KAAK,CAAC,YAAY,CAAC,EAAU;QAC3B,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAyB,kBAAkB,EAAE;YAC5D,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,EAAE,EAAE;aAC9B;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAgB;QACpC,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAkB,cAAc,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACtE,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,EAAU;QAChC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAC3B,wCAAwC,EACxC;YACE,IAAI,EAAE;gBACJ,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,eAAe;gBACnC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,mBAAmB;gBAC3C,UAAU,EAAE,eAAe;gBAC3B,aAAa,EAAE,EAAE;aAClB;SACF,CACF,CAAA;QACD,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACxC,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CACF;AAhFD,0CAgFC"}
@@ -1,12 +1,4 @@
1
- import { blRequest } from './blRequset';
2
- import { bsRequest } from './bsRequest';
3
- import { scRequest } from './scRequest';
4
- import { aioRequest } from './aioRequest';
5
- export type BeatLeaderClient = ReturnType<typeof blRequest>;
6
- export type BeatSaverClient = ReturnType<typeof bsRequest>;
7
- export type ScoreSaberClient = ReturnType<typeof scRequest>;
8
- export type AIOSaberClient = ReturnType<typeof aioRequest>;
9
- export * from './scRequest';
10
- export * from './blRequset';
11
- export * from './aioRequest';
12
- export * from './bsRequest';
1
+ export * from './ssclient';
2
+ export * from './blclient';
3
+ export * from './aioclient';
4
+ export * from './bsclient';
@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- __exportStar(require("./scRequest"), exports);
18
- __exportStar(require("./blRequset"), exports);
19
- __exportStar(require("./aioRequest"), exports);
20
- __exportStar(require("./bsRequest"), exports);
17
+ __exportStar(require("./ssclient"), exports);
18
+ __exportStar(require("./blclient"), exports);
19
+ __exportStar(require("./aioclient"), exports);
20
+ __exportStar(require("./bsclient"), exports);
21
21
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAUA,8CAA2B;AAE3B,8CAA2B;AAE3B,+CAA4B;AAE5B,8CAA2B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAE1B,6CAA0B;AAE1B,8CAA2B;AAE3B,6CAA0B"}
@@ -0,0 +1,13 @@
1
+ import { Config } from '../../config';
2
+ import { Fetch } from '../../utils/fetch';
3
+ import { ScoreSaberUser, ScoreSaberUserResponse } from '../../api/interfaces/scoresaber';
4
+ import { ScoresaberLeaderboardResp } from '../../api/interfaces/scoresaber/leaderboard';
5
+ import { Logger } from '../../interface';
6
+ export declare class ScoreSaberClient {
7
+ cfg: Config;
8
+ f: Fetch;
9
+ constructor(cfg: Config, logger: Logger);
10
+ getScoreUserById(userId: string): Promise<ScoreSaberUser>;
11
+ getScoreItemsById(userId: string, page: number, pageSize?: number): Promise<ScoreSaberUserResponse>;
12
+ getScoreItemsByMapId(mapId: string, diff: string, mode: string, page: number, pageSize?: number): Promise<ScoresaberLeaderboardResp>;
13
+ }
@@ -0,0 +1,48 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ScoreSaberClient = void 0;
4
+ const fetch_1 = require("../../utils/fetch");
5
+ const error_1 = require("../../utils/fetch/error");
6
+ class ScoreSaberClient {
7
+ cfg;
8
+ f;
9
+ constructor(cfg, logger) {
10
+ this.f = (0, fetch_1.createFetch)(logger).extend({
11
+ baseURL: 'https://scoresaber.com',
12
+ ignoreResponseError: false,
13
+ onResponseError: (context) => {
14
+ if (context.response.status === 500 ||
15
+ context.response.status === 404) {
16
+ throw new error_1.NotFoundError();
17
+ }
18
+ },
19
+ });
20
+ this.cfg = cfg;
21
+ }
22
+ async getScoreUserById(userId) {
23
+ return this.f.get(`/api/player/${userId}/full`);
24
+ }
25
+ async getScoreItemsById(userId, page, pageSize = 8) {
26
+ return this.f.get(`/api/player/${userId}/scores`, {
27
+ query: {
28
+ sort: 'top',
29
+ page: page,
30
+ limit: pageSize,
31
+ },
32
+ });
33
+ }
34
+ async getScoreItemsByMapId(mapId, diff, mode, page, pageSize = 8) {
35
+ const id = convertToLeaderboardId(mapId, diff, mode);
36
+ return this.f.get(`/api/leaderboard/by-id/${id}/scores`, {
37
+ query: {
38
+ page: page,
39
+ limit: pageSize,
40
+ },
41
+ });
42
+ }
43
+ }
44
+ exports.ScoreSaberClient = ScoreSaberClient;
45
+ const convertToLeaderboardId = (mapid, diff, mode) => {
46
+ return mapid;
47
+ };
48
+ //# sourceMappingURL=ssclient.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ssclient.js","sourceRoot":"","sources":["../../../src/api/base/ssclient.ts"],"names":[],"mappings":";;;AACA,yCAAkD;AAOlD,+CAAmD;AAEnD,MAAa,gBAAgB;IAC3B,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW,EAAE,MAAc;QACrC,IAAI,CAAC,CAAC,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC;YAClC,OAAO,EAAE,wBAAwB;YACjC,mBAAmB,EAAE,KAAK;YAC1B,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC3B,IACE,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG;oBAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAC/B,CAAC;oBACD,MAAM,IAAI,qBAAa,EAAE,CAAA;gBAC3B,CAAC;YACH,CAAC;SACF,CAAC,CAAA;QACF,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IACD,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACnC,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAiB,eAAe,MAAM,OAAO,CAAC,CAAA;IACjE,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,MAAc,EAAE,IAAY,EAAE,WAAmB,CAAC;QACxE,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAyB,eAAe,MAAM,SAAS,EAAE;YACxE,KAAK,EAAE;gBACL,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,QAAQ;aAChB;SACF,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,oBAAoB,CACxB,KAAa,EACb,IAAY,EACZ,IAAY,EACZ,IAAY,EACZ,WAAmB,CAAC;QAEpB,MAAM,EAAE,GAAG,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QACpD,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,EAAE;YACvD,KAAK,EAAE;gBACL,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,QAAQ;aAChB;SACF,CAAC,CAAA;IACJ,CAAC;CACF;AA9CD,4CA8CC;AAED,MAAM,sBAAsB,GAAG,CAAC,KAAa,EAAE,IAAY,EAAE,IAAY,EAAE,EAAE;IAC3E,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
@@ -8,11 +8,11 @@ export declare class BeatLeaderService {
8
8
  private bsClient;
9
9
  private blClient;
10
10
  constructor(bsClient: BeatSaverClient, blClient: BeatLeaderClient);
11
- getPlayerInfoById(id: string): Promise<any>;
11
+ getPlayerInfoById(id: string): Promise<import("../interfaces/beatleader").BeatLeaderUser>;
12
12
  getScore(item: any): Promise<any>;
13
13
  getScoreByPlayerIdAndMapId(playerId: string, mapId: string, option?: MapDiffOption): Promise<Leaderboard>;
14
- getTokenInfo(ak: string): Promise<import("../base").OAuthTokenInfoResponse>;
15
- refreshOAuthToken: (rk: string) => Promise<import("../base").OAuthTokenResponse>;
14
+ getTokenInfo(ak: string): Promise<import("../interfaces").OAuthTokenInfoResponse>;
15
+ refreshOAuthToken: (rk: string) => Promise<import("../interfaces").OAuthTokenResponse>;
16
16
  getPlayerScoresWithUserInfo(accountId: string, queryParams?: any): Promise<{
17
17
  scores: import("../interfaces/beatleader").Score[];
18
18
  userInfo: import("../interfaces/beatleader").BeatLeaderUser;
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.BeatLeaderService = void 0;
4
4
  const sortScore_1 = require("../sortScore");
5
5
  const bsorDecoder_1 = require("../../img-render/utils/bl/bsorDecoder");
6
+ const errors_1 = require("../../errors");
7
+ const error_1 = require("../../utils/fetch/error");
6
8
  class BeatLeaderService {
7
9
  bsClient;
8
10
  blClient;
@@ -24,9 +26,9 @@ class BeatLeaderService {
24
26
  return r;
25
27
  }
26
28
  async getScoreByPlayerIdAndMapId(playerId, mapId, option) {
27
- const [map] = await Promise.all([this.bsClient.searchMapById(mapId)]);
29
+ const map = await this.bsClient.searchMapById(mapId);
28
30
  if (!map) {
29
- throw Error('error.not.found');
31
+ throw new errors_1.MapIdNotFoundError();
30
32
  }
31
33
  const hash = map.versions[0].hash;
32
34
  let reqs = map.versions[0].diffs.map((it) => ({
@@ -43,10 +45,9 @@ class BeatLeaderService {
43
45
  reqs = reqs.filter((item) => item.mode == option.mode);
44
46
  }
45
47
  const res = await Promise.all(reqs.map((it) => this.getScore(it)));
46
- const scores = res.map((it) => it.data).filter((item) => item != null);
47
- // todo sort score
48
+ const scores = res.filter((item) => item != null);
48
49
  if (scores.length < 1) {
49
- throw Error('error.not.found');
50
+ throw new error_1.NotFoundError();
50
51
  }
51
52
  scores.sort(sortScore_1.sortScore);
52
53
  return scores[0];
@@ -61,6 +62,9 @@ class BeatLeaderService {
61
62
  this.blClient.getPlayerScores(accountId),
62
63
  this.blClient.getPlayerPinnedScores(accountId),
63
64
  ]);
65
+ if (!(userInfo && playerScores)) {
66
+ throw new errors_1.BLIDNotFoundError({ accountId });
67
+ }
64
68
  const filteredScores = playerScores.data.filter((item) => !pinnedScores.some((pinned) => pinned.id === item.id));
65
69
  const scores = pinnedScores.concat(filteredScores).slice(0, 24);
66
70
  return {
@@ -94,11 +98,20 @@ class BeatLeaderService {
94
98
  if (rest > 7) {
95
99
  startIndex = 2;
96
100
  }
97
- const regionUrl = `https://api.beatleader.xyz/leaderboard/${leaderboardId}?leaderboardContext=general&page=1&sortBy=rank&order=desc&countries=${regionCode}`;
98
- const aroundUrl = `https://api.beatleader.xyz/leaderboard/${leaderboardId}?leaderboardContext=general&page=${page}&sortBy=rank&order=desc`;
99
101
  const [regionScore, aroundScore] = await Promise.all([
100
- fetch(regionUrl).then((res) => res.json()),
101
- fetch(aroundUrl).then((res) => res.json()),
102
+ this.blClient.getLeaderboard(leaderboardId, {
103
+ leaderboardContext: 'general',
104
+ page: 1,
105
+ sortBy: 'rank',
106
+ order: 'desc',
107
+ countries: regionCode,
108
+ }),
109
+ this.blClient.getLeaderboard(leaderboardId, {
110
+ leaderboardContext: 'general',
111
+ page: page,
112
+ sortBy: 'rank',
113
+ order: 'desc',
114
+ }),
102
115
  ]);
103
116
  const difficulties = regionScore.song.difficulties;
104
117
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"beatleader.js","sourceRoot":"","sources":["../../../src/api/composed/beatleader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"beatleader.js","sourceRoot":"","sources":["../../../src/api/composed/beatleader.ts"],"names":[],"mappings":"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"}
@@ -2,11 +2,10 @@ import { BeatSaverClient } from '../base';
2
2
  export declare class BeatSaverService {
3
3
  private bsClient;
4
4
  constructor(bsClient: BeatSaverClient);
5
- getUnreadAlertsByPage: (ak: string, page: number) => Promise<import("../interfaces/beatsaver").BeatsaverAlert[]>;
6
- getTokenInfo: (ak: string) => Promise<import("../base").OAuthTokenInfoResponse>;
5
+ getTokenInfo: (ak: string) => Promise<import("../interfaces").OAuthTokenInfoResponse>;
7
6
  searchMapById: (key: string) => Promise<import("../interfaces/beatsaver").BSMap>;
8
7
  searchMapByKeyword: (key: string) => Promise<import("../interfaces/beatsaver").BSMap[]>;
9
8
  getLatestMaps: (pageSize: number) => Promise<import("../interfaces/beatsaver").BSMap[]>;
10
9
  getBSMapperById: (id: string) => Promise<import("../interfaces/beatsaver").BSUserResponse>;
11
- refreshOAuthToken: (rk: string) => Promise<import("../base").OAuthTokenResponse>;
10
+ refreshOAuthToken: (rk: string) => Promise<import("../interfaces").OAuthTokenResponse>;
12
11
  }
@@ -6,7 +6,8 @@ class BeatSaverService {
6
6
  constructor(bsClient) {
7
7
  this.bsClient = bsClient;
8
8
  }
9
- getUnreadAlertsByPage = (ak, page) => this.bsClient.getUnreadAlertsByPage(ak, page);
9
+ // getUnreadAlertsByPage = (ak: string, page: number) =>
10
+ // this.bsClient.getUnreadAlertsByPage(ak, page)
10
11
  getTokenInfo = (ak) => this.bsClient.getTokenInfo(ak);
11
12
  searchMapById = (key) => this.bsClient.searchMapById(key);
12
13
  searchMapByKeyword = (key) => this.bsClient.searchMapByKeyword(key);
@@ -1 +1 @@
1
- {"version":3,"file":"beatsaver.js","sourceRoot":"","sources":["../../../src/api/composed/beatsaver.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IACnB,QAAQ,CAAiB;IACjC,YAAY,QAAyB;QACnC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IACD,qBAAqB,GAAG,CAAC,EAAU,EAAE,IAAY,EAAE,EAAE,CACnD,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAC/C,YAAY,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;IAC7D,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IACjE,kBAAkB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC3E,aAAa,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;IAC3E,eAAe,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;IACnE,iBAAiB,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAA;CACxE;AAbD,4CAaC"}
1
+ {"version":3,"file":"beatsaver.js","sourceRoot":"","sources":["../../../src/api/composed/beatsaver.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IACnB,QAAQ,CAAiB;IACjC,YAAY,QAAyB;QACnC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IACD,wDAAwD;IACxD,kDAAkD;IAClD,YAAY,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;IAC7D,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IACjE,kBAAkB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC3E,aAAa,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;IAC3E,eAAe,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;IACnE,iBAAiB,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAA;CACxE;AAbD,4CAaC"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ScoreSaberService = void 0;
4
4
  const sortScore_1 = require("../sortScore");
5
+ const errors_1 = require("../../errors");
5
6
  class ScoreSaberService {
6
7
  bsClient;
7
8
  scClient;
@@ -44,8 +45,11 @@ class ScoreSaberService {
44
45
  const userInfo = this.getScoreUserById(uid);
45
46
  const scores = await this.scClient
46
47
  .getScoreItemsById(uid, 1, 24)
47
- .then((res) => res.playerScores);
48
+ .then((res) => res?.playerScores);
48
49
  const awaitedUserInfo = await userInfo;
50
+ if (!scores || !awaitedUserInfo) {
51
+ throw new errors_1.SSIDNotFoundError({ accountId: uid });
52
+ }
49
53
  const hashes = scores.map((it) => it.leaderboard.songHash);
50
54
  let hashInfo = await this.bsClient.getMapsByHashes(hashes);
51
55
  if (hashInfo.id) {
@@ -1 +1 @@
1
- {"version":3,"file":"scoresaber.js","sourceRoot":"","sources":["../../../src/api/composed/scoresaber.ts"],"names":[],"mappings":";;;AACA,4CAAwC;AAIxC,MAAa,iBAAiB;IAC5B,QAAQ,CAAiB;IACzB,QAAQ,CAAkB;IAC1B,YAAY,QAAyB,EAAE,QAA0B;QAC/D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IACD,gBAAgB,CAAC,EAAU;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,QAAgB,EAAE,KAAa;QAC9D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;QACpD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,IAAI,CAAA;QACb,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACjC,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC9C,IAAI,EAAE,EAAE,CAAC,UAAU;YACnB,IAAI,EAAE,EAAE,CAAC,cAAc;YACvB,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,QAAQ;YAClB,kBAAkB,EAAE,SAAS;SAC9B,CAAC,CAAC,CAAA;QACH,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3B,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAChB,uCAAuC;YACvC,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,CACH,CAAA;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;QACjD,kBAAkB;QAClB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,IAAI,CAAA;QACb,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAA;QACtB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;IAED,gBAAgB,CAAC,EAAU,EAAE,IAAY;QACvC,OAAO,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAClD,CAAC;IACD,KAAK,CAAC,gCAAgC,CAAC,GAAW;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ;aAC/B,iBAAiB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;aAC7B,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAClC,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAA;QAEtC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;QAE1D,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QAC1D,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,QAAiB,CAAA;YAC7B,QAAQ,GAAG,EAAkB,CAAA;YAC7B,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,CAAA;QACtC,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CACpB,CAAC,EAAE,EAAE,EAAE,CACL,CAAC;YACC,KAAK,EAAG,QAAyB,CAC/B,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,CACtC,EAAE,EAAE;YACL,GAAG,EAAE;SACN,CAAmB,CACvB,CAAA;QACD,OAAO;YACL,MAAM,EAAE,GAAG;YACX,QAAQ,EAAE,eAAe;SAC1B,CAAA;IACH,CAAC;CACF;AAvED,8CAuEC"}
1
+ {"version":3,"file":"scoresaber.js","sourceRoot":"","sources":["../../../src/api/composed/scoresaber.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,19 @@
1
+ import { NetReqResult } from '../api/netResult';
2
+ type Res<Base, T> = Base extends true ? NetReqResult<T> : T;
3
+ export declare class APIHelper<API, Base extends boolean = false> {
4
+ constructor();
5
+ private retryTime;
6
+ private _wrapper;
7
+ private _onRetry;
8
+ withRetry(times?: number, onRetry?: (retryTime: number, e?: any) => void): this;
9
+ onRetry(func: (times: number, e: any) => void): this;
10
+ call<T>(block: () => Promise<T>): Promise<Res<Base, T>>;
11
+ wrapperResult(): ServiceWithAPIHelper<API, true>;
12
+ }
13
+ export type ServiceWithAPIHelper<API, Wrap extends boolean = false> = Wrapped<API, Wrap> & APIHelper<API, Wrap>;
14
+ type Wrapping<T, I extends boolean = false> = T extends (...args: infer Args) => infer R ? <Wrap extends boolean = false>(...args: Args) => R extends Promise<infer R1> ? I extends true ? Promise<NetReqResult<R1>> : Wrap extends true ? Promise<NetReqResult<R1>> : Promise<R1> : R : T;
15
+ type Wrapped<T, Wrap extends boolean = false> = {
16
+ [K in keyof T]: Wrapping<T[K], Wrap>;
17
+ };
18
+ export declare function createProxiedAPIService<T extends object>(instance: T): ServiceWithAPIHelper<T>;
19
+ export {};
@@ -0,0 +1,102 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createProxiedAPIService = exports.APIHelper = void 0;
4
+ const netResult_1 = require("../api/netResult");
5
+ const utils_1 = require("../utils");
6
+ const errors_1 = require("../errors");
7
+ class APIHelper {
8
+ constructor() { }
9
+ retryTime = 1;
10
+ _wrapper = false;
11
+ _onRetry = () => { };
12
+ withRetry(times = 1, onRetry) {
13
+ this.retryTime = times;
14
+ this._onRetry = onRetry;
15
+ return this;
16
+ }
17
+ onRetry(func) {
18
+ this._onRetry = func;
19
+ return this;
20
+ }
21
+ async call(block) {
22
+ let result;
23
+ let times = Math.min(this.retryTime, 3);
24
+ let retryTime = 0;
25
+ const wrap = this._wrapper;
26
+ while (times > 0) {
27
+ try {
28
+ result = await block();
29
+ if (wrap) {
30
+ return netResult_1.NetReqResult.success(result);
31
+ }
32
+ return result;
33
+ }
34
+ catch (e) {
35
+ if (e instanceof errors_1.BizError) {
36
+ throw e;
37
+ }
38
+ retryTime += 1;
39
+ if (times-- > 1) {
40
+ this._onRetry?.(retryTime, e);
41
+ continue;
42
+ }
43
+ await (0, utils_1.sleep)(300);
44
+ if (wrap) {
45
+ return netResult_1.NetReqResult.failed(`retry times reached, ${e}`);
46
+ }
47
+ throw new errors_1.ReachNetworkRetryLimitError();
48
+ }
49
+ }
50
+ if (result) {
51
+ return (wrap ? netResult_1.NetReqResult.success(result) : result);
52
+ }
53
+ if (wrap) {
54
+ return netResult_1.NetReqResult.failed('unknown error');
55
+ }
56
+ throw new errors_1.RequestError();
57
+ }
58
+ wrapperResult() {
59
+ this._wrapper = true;
60
+ return this;
61
+ }
62
+ }
63
+ exports.APIHelper = APIHelper;
64
+ function createProxiedAPIService(instance) {
65
+ ;
66
+ instance.helper = new APIHelper();
67
+ return new Proxy(instance, {
68
+ get(target, prop, receiver) {
69
+ const method = target[prop];
70
+ // target func
71
+ if (typeof method === 'function') {
72
+ return async function (...args) {
73
+ const result = await target.helper.call(() => method.apply(this, args));
74
+ return result;
75
+ };
76
+ }
77
+ if (prop in target) {
78
+ return Reflect.get(target, prop, receiver);
79
+ }
80
+ // helper func
81
+ if (prop in target.helper) {
82
+ const v = Reflect.get(target.helper, prop);
83
+ if (typeof v === 'function') {
84
+ return v;
85
+ }
86
+ return v;
87
+ }
88
+ return undefined;
89
+ },
90
+ set(target, property, value, receiver) {
91
+ if (property in target) {
92
+ return Reflect.set(target, property, value, receiver);
93
+ }
94
+ if (property in target.helper) {
95
+ return Reflect.set(target.helper, property, value);
96
+ }
97
+ return false;
98
+ },
99
+ });
100
+ }
101
+ exports.createProxiedAPIService = createProxiedAPIService;
102
+ //# sourceMappingURL=helper.js.map