beatsaber-bot-core 0.2.0-dev.20 → 0.2.0-dev.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/base/aioclient.d.ts +10 -0
- package/lib/api/base/aioclient.js +25 -0
- package/lib/api/base/aioclient.js.map +1 -0
- package/lib/api/base/blclient.d.ts +16 -0
- package/lib/api/base/blclient.js +60 -0
- package/lib/api/base/blclient.js.map +1 -0
- package/lib/api/base/bsclient.d.ts +16 -0
- package/lib/api/base/bsclient.js +69 -0
- package/lib/api/base/bsclient.js.map +1 -0
- package/lib/api/base/index.d.ts +4 -12
- package/lib/api/base/index.js +4 -4
- package/lib/api/base/index.js.map +1 -1
- package/lib/api/base/scRequest.d.ts +2 -0
- package/lib/api/base/scRequest.js +28 -13
- package/lib/api/base/scRequest.js.map +1 -1
- package/lib/api/base/ssclient.d.ts +12 -0
- package/lib/api/base/ssclient.js +43 -0
- package/lib/api/base/ssclient.js.map +1 -0
- package/lib/api/composed/beatleader.d.ts +2 -2
- package/lib/api/composed/beatleader.js +4 -4
- package/lib/api/composed/beatleader.js.map +1 -1
- package/lib/api/composed/beatsaver.d.ts +2 -3
- package/lib/api/composed/beatsaver.js +2 -1
- package/lib/api/composed/beatsaver.js.map +1 -1
- package/lib/api/composed/scoresaber.js.map +1 -1
- package/lib/api/helper.d.ts +19 -0
- package/lib/api/helper.js +99 -0
- package/lib/api/helper.js.map +1 -0
- package/lib/api/index.d.ts +1 -18
- package/lib/api/index.js +8 -98
- package/lib/api/index.js.map +1 -1
- package/lib/api/interfaces/beatsaver/bsmap.d.ts +2 -0
- package/lib/api/interfaces/index.d.ts +12 -0
- package/lib/api/interfaces/index.js +3 -0
- package/lib/api/interfaces/index.js.map +1 -0
- package/lib/api/interfaces/scoresaber/item.d.ts +12 -3
- package/lib/api/interfaces/scoresaber/leaderboard.d.ts +10 -0
- package/lib/api/interfaces/scoresaber/leaderboard.js +3 -0
- package/lib/api/interfaces/scoresaber/leaderboard.js.map +1 -0
- package/lib/cmd/bind/index.js +4 -0
- package/lib/cmd/bind/index.js.map +1 -1
- package/lib/cmd/bsmap/id-search.js +1 -1
- package/lib/cmd/bsmap/id-search.js.map +1 -1
- package/lib/cmd/bsmap/key-search.js +1 -1
- package/lib/cmd/bsmap/key-search.js.map +1 -1
- package/lib/cmd/bsmap/latest.js +10 -2
- package/lib/cmd/bsmap/latest.js.map +1 -1
- package/lib/cmd/config/index.d.ts +12 -0
- package/lib/cmd/config/index.js +70 -0
- package/lib/cmd/config/index.js.map +1 -0
- package/lib/cmd/deprecated/me.js +4 -4
- package/lib/cmd/deprecated/me.js.map +1 -1
- package/lib/cmd/deprecated/whois.js +1 -1
- package/lib/cmd/deprecated/whois.js.map +1 -1
- package/lib/cmd/index.js +2 -1
- package/lib/cmd/index.js.map +1 -1
- package/lib/cmd/rank.js +1 -1
- package/lib/cmd/rank.js.map +1 -1
- package/lib/cmd/score.js +6 -6
- package/lib/cmd/score.js.map +1 -1
- package/lib/errors/index.d.ts +15 -0
- package/lib/errors/index.js +46 -1
- package/lib/errors/index.js.map +1 -1
- package/lib/i18n/zh-cn.json +1 -1
- package/lib/img-render/components/RankDifficulty.d.ts +3 -2
- package/lib/img-render/components/RankDifficulty.js +8 -2
- package/lib/img-render/components/RankDifficulty.js.map +1 -1
- package/lib/img-render/components/bl-rank-score-item.d.ts +18 -0
- package/lib/img-render/components/bl-rank-score-item.js +42 -0
- package/lib/img-render/components/bl-rank-score-item.js.map +1 -0
- package/lib/img-render/components/bl-score-item.d.ts +6 -0
- package/lib/img-render/components/bl-score-item.js +14 -0
- package/lib/img-render/components/bl-score-item.js.map +1 -0
- package/lib/img-render/components/ss-rank-score-item.d.ts +18 -0
- package/lib/img-render/components/ss-rank-score-item.js +42 -0
- package/lib/img-render/components/ss-rank-score-item.js.map +1 -0
- package/lib/img-render/components/ss-score-item.d.ts +4 -0
- package/lib/img-render/components/ss-score-item.js +14 -0
- package/lib/img-render/components/ss-score-item.js.map +1 -0
- package/lib/img-render/index.d.ts +5 -4
- package/lib/img-render/index.js +33 -25
- package/lib/img-render/index.js.map +1 -1
- package/lib/img-render/interfaces.d.ts +2 -0
- package/lib/img-render/result/bl-player.d.ts +2 -1
- package/lib/img-render/result/bl-player.js +3 -4
- package/lib/img-render/result/bl-player.js.map +1 -1
- package/lib/img-render/result/bl-score-with-rank.d.ts +14 -0
- package/lib/img-render/result/bl-score-with-rank.js +33 -0
- package/lib/img-render/result/bl-score-with-rank.js.map +1 -0
- package/lib/img-render/result/index.d.ts +3 -3
- package/lib/img-render/result/index.js +7 -7
- package/lib/img-render/result/index.js.map +1 -1
- package/lib/img-render/result/ss-player.d.ts +2 -1
- package/lib/img-render/result/ss-player.js +3 -4
- package/lib/img-render/result/ss-player.js.map +1 -1
- package/lib/img-render/result/ss-score-with-rank.d.ts +0 -0
- package/lib/img-render/result/ss-score-with-rank.js +277 -0
- package/lib/img-render/result/ss-score-with-rank.js.map +1 -0
- package/lib/interface/cmd.d.ts +3 -0
- package/lib/interface/db/index.d.ts +2 -0
- package/lib/interface/db/models.d.ts +5 -0
- package/lib/interface/render.d.ts +5 -4
- package/lib/utils/cache.d.ts +1 -0
- package/lib/utils/cache.js +3 -1
- package/lib/utils/cache.js.map +1 -1
- package/lib/utils/fetch/index.d.ts +3 -0
- package/lib/utils/fetch/index.js +21 -0
- package/lib/utils/fetch/index.js.map +1 -0
- package/lib/utils/fetch/ofetch.d.ts +22 -0
- package/lib/utils/fetch/ofetch.js +87 -0
- package/lib/utils/fetch/ofetch.js.map +1 -0
- package/lib/utils/index.d.ts +1 -0
- package/lib/utils/index.js +1 -0
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/preference.d.ts +34 -0
- package/lib/utils/preference.js +112 -0
- package/lib/utils/preference.js.map +1 -0
- package/lib/utils/s3.d.ts +1 -0
- package/lib/utils/s3.js +15 -0
- package/lib/utils/s3.js.map +1 -1
- package/package.json +2 -1
@@ -0,0 +1,10 @@
|
|
1
|
+
import { Config } from '../../config';
|
2
|
+
import { AioOauthTokenResponse } from '../../api/interfaces/aiosaber';
|
3
|
+
import { Fetch } from '../../utils/fetch/ofetch';
|
4
|
+
export declare class AIOSaberClient {
|
5
|
+
cfg: Config;
|
6
|
+
f: Fetch;
|
7
|
+
constructor(cfg: Config);
|
8
|
+
getBSOAuthToken(key: string): Promise<AioOauthTokenResponse>;
|
9
|
+
getBLOAuthToken(key: string): Promise<AioOauthTokenResponse>;
|
10
|
+
}
|
@@ -0,0 +1,25 @@
|
|
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.AIOSaberClient = void 0;
|
7
|
+
const fetch_1 = __importDefault(require("../../utils/fetch"));
|
8
|
+
class AIOSaberClient {
|
9
|
+
cfg;
|
10
|
+
f;
|
11
|
+
constructor(cfg) {
|
12
|
+
this.f = fetch_1.default.extend({
|
13
|
+
baseURL: 'https://abs.ktlab.io',
|
14
|
+
});
|
15
|
+
this.cfg = cfg;
|
16
|
+
}
|
17
|
+
async getBSOAuthToken(key) {
|
18
|
+
return this.f.get(`/api/oauth/beatsaver/token/${key}`);
|
19
|
+
}
|
20
|
+
async getBLOAuthToken(key) {
|
21
|
+
return this.f.get(`/api/oauth/beatleader/token/${key}`);
|
22
|
+
}
|
23
|
+
}
|
24
|
+
exports.AIOSaberClient = AIOSaberClient;
|
25
|
+
//# sourceMappingURL=aioclient.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"aioclient.js","sourceRoot":"","sources":["../../../src/api/base/aioclient.ts"],"names":[],"mappings":";;;;;;AAGA,0DAAkC;AAElC,MAAa,cAAc;IACzB,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW;QACrB,IAAI,CAAC,CAAC,GAAG,eAAM,CAAC,MAAM,CAAC;YACrB,OAAO,EAAE,sBAAsB;SAChC,CAAC,CAAA;QACF,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;AAnBD,wCAmBC"}
|
@@ -0,0 +1,16 @@
|
|
1
|
+
import { OAuthTokenInfoResponse, OAuthTokenResponse } from '../interfaces';
|
2
|
+
import { Config } from '../../config';
|
3
|
+
import { Fetch } from '../../utils/fetch/ofetch';
|
4
|
+
import { BeadLeaderScoresResponse, BeatLeaderPlayerScoreRequest, BeatLeaderUser, Leaderboard, Score } from '../../api/interfaces/beatleader';
|
5
|
+
export declare class BeatLeaderClient {
|
6
|
+
cfg: Config;
|
7
|
+
f: Fetch;
|
8
|
+
constructor(cfg: Config);
|
9
|
+
getPlayerScore(req: BeatLeaderPlayerScoreRequest): Promise<Leaderboard>;
|
10
|
+
getTokenInfo(accessToken: string): Promise<OAuthTokenInfoResponse>;
|
11
|
+
refreshOAuthToken(refreshToken: string): Promise<OAuthTokenResponse>;
|
12
|
+
getPlayerInfo(accountId: string): Promise<BeatLeaderUser>;
|
13
|
+
getPlayerScores(accountId: string): Promise<BeadLeaderScoresResponse>;
|
14
|
+
getPlayerPinnedScores(accountId: string): Promise<Score[]>;
|
15
|
+
getBeatScore(scoreId: string): Promise<Score>;
|
16
|
+
}
|
@@ -0,0 +1,60 @@
|
|
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.BeatLeaderClient = void 0;
|
7
|
+
const fetch_1 = __importDefault(require("../../utils/fetch"));
|
8
|
+
class BeatLeaderClient {
|
9
|
+
cfg;
|
10
|
+
f;
|
11
|
+
constructor(cfg) {
|
12
|
+
this.f = fetch_1.default.extend({
|
13
|
+
baseURL: 'https://api.beatleader.xyz',
|
14
|
+
});
|
15
|
+
this.cfg = cfg;
|
16
|
+
}
|
17
|
+
async getPlayerScore(req) {
|
18
|
+
const res = await this.f.get(`/score/${req.leaderboardContext}/${req.playerID}/${req.hash}/${req.diff}/${req.mode}`);
|
19
|
+
return res;
|
20
|
+
}
|
21
|
+
async getTokenInfo(accessToken) {
|
22
|
+
return this.f.get(`/oauth2/identity`, {
|
23
|
+
headers: {
|
24
|
+
Authorization: `Bearer ${accessToken}`,
|
25
|
+
},
|
26
|
+
});
|
27
|
+
}
|
28
|
+
async refreshOAuthToken(refreshToken) {
|
29
|
+
const form = new URLSearchParams();
|
30
|
+
form.append('client_id', this.cfg.blOauthClientId);
|
31
|
+
form.append('client_secret', this.cfg.blOauthClientSecret);
|
32
|
+
form.append('grant_type', 'refresh_token');
|
33
|
+
form.append('refresh_token', refreshToken);
|
34
|
+
const res = await fetch('https://beatsaver.com/api/oauth2/token', {
|
35
|
+
method: 'POST',
|
36
|
+
headers: {
|
37
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
38
|
+
},
|
39
|
+
body: form,
|
40
|
+
}).then((res) => res.json());
|
41
|
+
if (!res.access_token) {
|
42
|
+
throw new Error('refreshToken failed');
|
43
|
+
}
|
44
|
+
return res;
|
45
|
+
}
|
46
|
+
async getPlayerInfo(accountId) {
|
47
|
+
return this.f.get(`/player/${accountId}`);
|
48
|
+
}
|
49
|
+
async getPlayerScores(accountId) {
|
50
|
+
return this.f.get(`/player/${accountId}/scores?count=24&sortBy=pp`);
|
51
|
+
}
|
52
|
+
async getPlayerPinnedScores(accountId) {
|
53
|
+
return this.f.get(`/player/${accountId}/pinnedScores`);
|
54
|
+
}
|
55
|
+
async getBeatScore(scoreId) {
|
56
|
+
return this.f.get(`/score/${scoreId}`);
|
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,0DAAkC;AAUlC,MAAa,gBAAgB;IAC3B,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW;QACrB,IAAI,CAAC,CAAC,GAAG,eAAM,CAAC,MAAM,CAAC;YACrB,OAAO,EAAE,4BAA4B;SACtC,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;CACF;AA3DD,4CA2DC"}
|
@@ -0,0 +1,16 @@
|
|
1
|
+
import { OAuthTokenInfoResponse, OAuthTokenResponse } from '../interfaces';
|
2
|
+
import { Config } from '../../config';
|
3
|
+
import { Fetch } from '../../utils/fetch/ofetch';
|
4
|
+
import { BSMap, BSUserResponse, HashReqResponse } from '../../api/interfaces/beatsaver';
|
5
|
+
export declare class BeatSaverClient {
|
6
|
+
cfg: Config;
|
7
|
+
f: Fetch;
|
8
|
+
constructor(cfg: Config);
|
9
|
+
getBSMapperById(userId: string): Promise<BSUserResponse>;
|
10
|
+
getLatestMaps(pageSize?: number): Promise<BSMap[]>;
|
11
|
+
searchMapByKeyword(key: string, params?: Record<string, boolean | number | string>): Promise<BSMap[]>;
|
12
|
+
searchMapById(id: string): Promise<BSMap>;
|
13
|
+
getTokenInfo(ak: string): Promise<OAuthTokenInfoResponse>;
|
14
|
+
getMapsByHashes(hashes: string[]): Promise<HashReqResponse>;
|
15
|
+
refreshOAuthToken(rk: string): Promise<OAuthTokenResponse>;
|
16
|
+
}
|
@@ -0,0 +1,69 @@
|
|
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.BeatSaverClient = void 0;
|
7
|
+
const fetch_1 = __importDefault(require("../../utils/fetch"));
|
8
|
+
class BeatSaverClient {
|
9
|
+
cfg;
|
10
|
+
f;
|
11
|
+
constructor(cfg) {
|
12
|
+
this.f = fetch_1.default.extend({
|
13
|
+
baseURL: cfg.beatSaverHost ?? 'https://api.beatsaver.com',
|
14
|
+
});
|
15
|
+
this.cfg = cfg;
|
16
|
+
}
|
17
|
+
async getBSMapperById(userId) {
|
18
|
+
return this.f.get(`/users/id/${userId}`);
|
19
|
+
}
|
20
|
+
async getLatestMaps(pageSize = 5) {
|
21
|
+
return this.f
|
22
|
+
.get(`/maps/latest`, {
|
23
|
+
params: {
|
24
|
+
sort: 'FIRST_PUBLISHED',
|
25
|
+
pageSize,
|
26
|
+
},
|
27
|
+
})
|
28
|
+
.then((res) => res.docs);
|
29
|
+
}
|
30
|
+
async searchMapByKeyword(key, params) {
|
31
|
+
return this.f
|
32
|
+
.get(`/search/text/0`, {
|
33
|
+
params: {
|
34
|
+
q: key,
|
35
|
+
...params,
|
36
|
+
},
|
37
|
+
})
|
38
|
+
.then((res) => res.docs);
|
39
|
+
}
|
40
|
+
async searchMapById(id) {
|
41
|
+
return this.f.get(`/maps/id/${id}`);
|
42
|
+
}
|
43
|
+
async getTokenInfo(ak) {
|
44
|
+
return this.f.get(`/oauth2/identity`, {
|
45
|
+
headers: {
|
46
|
+
Authorization: `Bearer ${ak}`,
|
47
|
+
},
|
48
|
+
});
|
49
|
+
}
|
50
|
+
async getMapsByHashes(hashes) {
|
51
|
+
return this.f.get(`/maps/hash/${hashes.join(',')}`);
|
52
|
+
}
|
53
|
+
async refreshOAuthToken(rk) {
|
54
|
+
const res = await this.f.post('https://beatsaver.com/api/oauth2/token', {
|
55
|
+
form: {
|
56
|
+
client_id: this.cfg.bsOauthClientId,
|
57
|
+
client_secret: this.cfg.bsOauthClientSecret,
|
58
|
+
grant_type: 'refresh_token',
|
59
|
+
refresh_token: rk,
|
60
|
+
},
|
61
|
+
});
|
62
|
+
if (!res.access_token) {
|
63
|
+
throw new Error('refreshToken failed');
|
64
|
+
}
|
65
|
+
return res;
|
66
|
+
}
|
67
|
+
}
|
68
|
+
exports.BeatSaverClient = BeatSaverClient;
|
69
|
+
//# sourceMappingURL=bsclient.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"bsclient.js","sourceRoot":"","sources":["../../../src/api/base/bsclient.ts"],"names":[],"mappings":";;;;;;AAEA,0DAAkC;AASlC,MAAa,eAAe;IAC1B,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW;QACrB,IAAI,CAAC,CAAC,GAAG,eAAM,CAAC,MAAM,CAAC;YACrB,OAAO,EAAE,GAAG,CAAC,aAAa,IAAI,2BAA2B;SAC1D,CAAC,CAAA;QACF,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,MAAM,EAAE;gBACN,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,MAAM,EAAE;gBACN,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;AAtED,0CAsEC"}
|
package/lib/api/base/index.d.ts
CHANGED
@@ -1,12 +1,4 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
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';
|
package/lib/api/base/index.js
CHANGED
@@ -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("./
|
18
|
-
__exportStar(require("./
|
19
|
-
__exportStar(require("./
|
20
|
-
__exportStar(require("./
|
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":";;;;;;;;;;;;;;;;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAE1B,6CAA0B;AAE1B,8CAA2B;AAE3B,6CAA0B"}
|
@@ -1,6 +1,8 @@
|
|
1
1
|
import { Config } from '../../config';
|
2
2
|
import { ScoreSaberUser, ScoreSaberUserResponse } from '../interfaces/scoresaber';
|
3
|
+
import { ScoresaberLeaderboardResp } from '../../api/interfaces/scoresaber/leaderboard';
|
3
4
|
export declare const scRequest: (cfg: Config) => {
|
4
5
|
getScoreUserById: (userId: string) => Promise<ScoreSaberUser>;
|
5
6
|
getScoreItemsById: (userId: string, page: number, pageSize?: number) => Promise<ScoreSaberUserResponse>;
|
7
|
+
getScoreItemsByMapId: (mapId: string, diff: string, mode: string, page: number, pageSize?: number) => Promise<ScoresaberLeaderboardResp>;
|
6
8
|
};
|
@@ -1,27 +1,42 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
6
|
exports.scRequest = void 0;
|
4
|
-
const
|
7
|
+
const fetch_1 = __importDefault(require("../../utils/fetch"));
|
8
|
+
const convertToLeaderboardId = (mapid, diff, mode) => {
|
9
|
+
return mapid;
|
10
|
+
};
|
5
11
|
const scRequest = (cfg) => {
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
}
|
10
|
-
const url = (path) => {
|
11
|
-
if (!path.startsWith('/')) {
|
12
|
-
path = '/' + path;
|
13
|
-
}
|
14
|
-
return host + path;
|
15
|
-
};
|
12
|
+
const f = fetch_1.default.extend({
|
13
|
+
baseURL: 'https://scoresaber.com',
|
14
|
+
});
|
16
15
|
const getScoreUserById = async (userId) => {
|
17
|
-
return get(
|
16
|
+
return f.get(`/api/player/${userId}/full`);
|
18
17
|
};
|
19
18
|
const getScoreItemsById = (userId, page, pageSize = 8) => {
|
20
|
-
return get(
|
19
|
+
return f.get(`/api/player/${userId}/scores`, {
|
20
|
+
params: {
|
21
|
+
sort: 'top',
|
22
|
+
page: page,
|
23
|
+
pageSize: pageSize,
|
24
|
+
},
|
25
|
+
});
|
26
|
+
};
|
27
|
+
const getScoreItemsByMapId = (mapId, diff, mode, page, pageSize = 8) => {
|
28
|
+
const id = convertToLeaderboardId(mapId, diff, mode);
|
29
|
+
return f.get(`/api/leaderboard/by-id/${id}/scores`, {
|
30
|
+
params: {
|
31
|
+
page: page,
|
32
|
+
pageSize: pageSize,
|
33
|
+
},
|
34
|
+
});
|
21
35
|
};
|
22
36
|
return {
|
23
37
|
getScoreUserById,
|
24
38
|
getScoreItemsById,
|
39
|
+
getScoreItemsByMapId,
|
25
40
|
};
|
26
41
|
};
|
27
42
|
exports.scRequest = scRequest;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"scRequest.js","sourceRoot":"","sources":["../../../src/api/base/scRequest.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"scRequest.js","sourceRoot":"","sources":["../../../src/api/base/scRequest.ts"],"names":[],"mappings":";;;;;;AAMA,0DAAkC;AAElC,MAAM,sBAAsB,GAAG,CAAC,KAAa,EAAE,IAAY,EAAE,IAAY,EAAE,EAAE;IAC3E,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAEM,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE;IACvC,MAAM,CAAC,GAAG,eAAM,CAAC,MAAM,CAAC;QACtB,OAAO,EAAE,wBAAwB;KAClC,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;QAChD,OAAO,CAAC,CAAC,GAAG,CAAiB,eAAe,MAAM,OAAO,CAAC,CAAA;IAC5D,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CACxB,MAAc,EACd,IAAY,EACZ,WAAmB,CAAC,EACpB,EAAE;QACF,OAAO,CAAC,CAAC,GAAG,CAAyB,eAAe,MAAM,SAAS,EAAE;YACnE,MAAM,EAAE;gBACN,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,QAAQ;aACnB;SACF,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,MAAM,oBAAoB,GAAG,CAC3B,KAAa,EACb,IAAY,EACZ,IAAY,EACZ,IAAY,EACZ,WAAmB,CAAC,EACgB,EAAE;QACtC,MAAM,EAAE,GAAG,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QACpD,OAAO,CAAC,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,EAAE;YAClD,MAAM,EAAE;gBACN,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,QAAQ;aACnB;SACF,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,OAAO;QACL,gBAAgB;QAChB,iBAAiB;QACjB,oBAAoB;KACrB,CAAA;AACH,CAAC,CAAA;AA1CY,QAAA,SAAS,aA0CrB"}
|
@@ -0,0 +1,12 @@
|
|
1
|
+
import { Config } from '../../config';
|
2
|
+
import { Fetch } from '../../utils/fetch/ofetch';
|
3
|
+
import { ScoreSaberUser, ScoreSaberUserResponse } from '../../api/interfaces/scoresaber';
|
4
|
+
import { ScoresaberLeaderboardResp } from '../../api/interfaces/scoresaber/leaderboard';
|
5
|
+
export declare class ScoreSaberClient {
|
6
|
+
cfg: Config;
|
7
|
+
f: Fetch;
|
8
|
+
constructor(cfg: Config);
|
9
|
+
getScoreUserById(userId: string): Promise<ScoreSaberUser>;
|
10
|
+
getScoreItemsById(userId: string, page: number, pageSize?: number): Promise<ScoreSaberUserResponse>;
|
11
|
+
getScoreItemsByMapId(mapId: string, diff: string, mode: string, page: number, pageSize?: number): Promise<ScoresaberLeaderboardResp>;
|
12
|
+
}
|
@@ -0,0 +1,43 @@
|
|
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.ScoreSaberClient = void 0;
|
7
|
+
const fetch_1 = __importDefault(require("../../utils/fetch"));
|
8
|
+
class ScoreSaberClient {
|
9
|
+
cfg;
|
10
|
+
f;
|
11
|
+
constructor(cfg) {
|
12
|
+
this.f = fetch_1.default.extend({
|
13
|
+
baseURL: 'https://scoresaber.com',
|
14
|
+
});
|
15
|
+
this.cfg = cfg;
|
16
|
+
}
|
17
|
+
async getScoreUserById(userId) {
|
18
|
+
return this.f.get(`/api/player/${userId}/full`);
|
19
|
+
}
|
20
|
+
async getScoreItemsById(userId, page, pageSize = 8) {
|
21
|
+
return this.f.get(`/api/player/${userId}/scores`, {
|
22
|
+
params: {
|
23
|
+
sort: 'top',
|
24
|
+
page: page,
|
25
|
+
pageSize: pageSize,
|
26
|
+
},
|
27
|
+
});
|
28
|
+
}
|
29
|
+
async getScoreItemsByMapId(mapId, diff, mode, page, pageSize = 8) {
|
30
|
+
const id = convertToLeaderboardId(mapId, diff, mode);
|
31
|
+
return this.f.get(`/api/leaderboard/by-id/${id}/scores`, {
|
32
|
+
params: {
|
33
|
+
page: page,
|
34
|
+
pageSize: pageSize,
|
35
|
+
},
|
36
|
+
});
|
37
|
+
}
|
38
|
+
}
|
39
|
+
exports.ScoreSaberClient = ScoreSaberClient;
|
40
|
+
const convertToLeaderboardId = (mapid, diff, mode) => {
|
41
|
+
return mapid;
|
42
|
+
};
|
43
|
+
//# sourceMappingURL=ssclient.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"ssclient.js","sourceRoot":"","sources":["../../../src/api/base/ssclient.ts"],"names":[],"mappings":";;;;;;AAEA,0DAAkC;AAOlC,MAAa,gBAAgB;IAC3B,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW;QACrB,IAAI,CAAC,CAAC,GAAG,eAAM,CAAC,MAAM,CAAC;YACrB,OAAO,EAAE,wBAAwB;SAClC,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,MAAM,EAAE;gBACN,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,QAAQ;aACnB;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,MAAM,EAAE;gBACN,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,QAAQ;aACnB;SACF,CAAC,CAAA;IACJ,CAAC;CACF;AArCD,4CAqCC;AAED,MAAM,sBAAsB,GAAG,CAAC,KAAa,EAAE,IAAY,EAAE,IAAY,EAAE,EAAE;IAC3E,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
|
@@ -11,8 +11,8 @@ export declare class BeatLeaderService {
|
|
11
11
|
getPlayerInfoById(id: string): Promise<any>;
|
12
12
|
getScore(item: any): Promise<any>;
|
13
13
|
getScoreByPlayerIdAndMapId(playerId: string, mapId: string, option?: MapDiffOption): Promise<Leaderboard>;
|
14
|
-
getTokenInfo(ak: string): Promise<import("../
|
15
|
-
refreshOAuthToken: (rk: string) => Promise<import("../
|
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,7 @@ 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");
|
6
7
|
class BeatLeaderService {
|
7
8
|
bsClient;
|
8
9
|
blClient;
|
@@ -26,7 +27,7 @@ class BeatLeaderService {
|
|
26
27
|
async getScoreByPlayerIdAndMapId(playerId, mapId, option) {
|
27
28
|
const map = await this.bsClient.searchMapById(mapId);
|
28
29
|
if (!map) {
|
29
|
-
throw
|
30
|
+
throw new errors_1.MapIdNotFoundError();
|
30
31
|
}
|
31
32
|
const hash = map.versions[0].hash;
|
32
33
|
let reqs = map.versions[0].diffs.map((it) => ({
|
@@ -43,10 +44,9 @@ class BeatLeaderService {
|
|
43
44
|
reqs = reqs.filter((item) => item.mode == option.mode);
|
44
45
|
}
|
45
46
|
const res = await Promise.all(reqs.map((it) => this.getScore(it)));
|
46
|
-
const scores = res.
|
47
|
-
// todo sort score
|
47
|
+
const scores = res.filter((item) => item != null);
|
48
48
|
if (scores.length < 1) {
|
49
|
-
throw
|
49
|
+
throw new errors_1.ScoreNotFoundError();
|
50
50
|
}
|
51
51
|
scores.sort(sortScore_1.sortScore);
|
52
52
|
return scores[0];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"beatleader.js","sourceRoot":"","sources":["../../../src/api/composed/beatleader.ts"],"names":[],"mappings":";;;AACA,4CAAwC;AAExC,mEAA0D;
|
1
|
+
{"version":3,"file":"beatleader.js","sourceRoot":"","sources":["../../../src/api/composed/beatleader.ts"],"names":[],"mappings":";;;AACA,4CAAwC;AAExC,mEAA0D;AAC1D,qCAAiE;AAOjE,MAAa,iBAAiB;IACpB,QAAQ,CAAiB;IACzB,QAAQ,CAAkB;IAClC,YAAY,QAAyB,EAAE,QAA0B;QAC/D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,EAAU;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAI;QACjB,IAAI,CAAC,GAAG,IAAI,CAAA;QACZ,IAAI,CAAC;YACH,CAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QAC9C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,CAAA;QACV,CAAC;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IACD,KAAK,CAAC,0BAA0B,CAC9B,QAAgB,EAChB,KAAa,EACb,MAAsB;QAEtB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;QACpD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,2BAAkB,EAAE,CAAA;QAChC,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACjC,IAAI,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC5C,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,IAAI,MAAM,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YAChC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,UAAU,CAAC,CAAA;QAC9D,CAAC;QACD,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,CAAA;QACxD,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAClE,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;QACjD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,2BAAkB,EAAE,CAAA;QAChC,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAA;QACtB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;IAED,YAAY,CAAC,EAAU;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;IACvC,CAAC;IACD,iBAAiB,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAA;IAEvE,KAAK,CAAC,2BAA2B,CAAC,SAAiB,EAAE,WAAiB;QACpE,MAAM,CAAC,QAAQ,EAAE,YAAY,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/D,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC;YACxC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,SAAS,CAAC;SAC/C,CAAC,CAAA;QACF,MAAM,cAAc,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAC7C,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,CAChE,CAAA;QACD,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAC/D,OAAO;YACL,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,QAAQ;SACnB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,OAAe;QAC7C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QACrD,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAA;QAC3B,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAA;QACzC,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjD,WAAW,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,oBAAM,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;YAC7D,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,CAAA;QAClD,CAAC,CAAC,CAAA;QACF,MAAM,SAAS,GAAG,MAAM,KAAK,CAC3B,yCAAyC,OAAO,OAAO,CACxD,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;QAC3B,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACtC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QACnD,OAAO;YACL,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,IAAI;SACX,CAAA;IACH,CAAC;IAED,KAAK,CAAC,yCAAyC,CAC7C,aAAqB,EACrB,IAAY,EACZ,UAAkB;QAElB,mCAAmC;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,CAAA;QACjC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAE,CAAA;QACtB,IAAI,UAAU,GAAG,CAAC,CAAA;QAClB,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;YACb,UAAU,GAAG,CAAC,CAAA;QAChB,CAAC;QACD,MAAM,SAAS,GAAG,0CAA0C,aAAa,uEAAuE,UAAU,EAAE,CAAA;QAC5J,MAAM,SAAS,GAAG,0CAA0C,aAAa,oCAAoC,IAAI,yBAAyB,CAAA;QAC1I,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnD,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAC1C,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;SAC3C,CAAC,CAAA;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,YAAY,CAAA;QAClD,OAAO;YACL,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,GAAG,CAAC,CAAC;YAClE,eAAe,EAAE,WAAW,CAAC,MAAM;SACpC,CAAA;IACH,CAAC;CACF;AAzHD,8CAyHC"}
|
@@ -2,11 +2,10 @@ import { BeatSaverClient } from '../base';
|
|
2
2
|
export declare class BeatSaverService {
|
3
3
|
private bsClient;
|
4
4
|
constructor(bsClient: BeatSaverClient);
|
5
|
-
|
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("../
|
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) =>
|
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,
|
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"}
|
@@ -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;
|
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,99 @@
|
|
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
|
+
retryTime += 1;
|
36
|
+
if (times-- > 1) {
|
37
|
+
this._onRetry?.(retryTime, e);
|
38
|
+
continue;
|
39
|
+
}
|
40
|
+
await (0, utils_1.sleep)(300);
|
41
|
+
if (wrap) {
|
42
|
+
return netResult_1.NetReqResult.failed(`retry times reached, ${e}`);
|
43
|
+
}
|
44
|
+
throw new errors_1.ReachNetworkRetryLimitError();
|
45
|
+
}
|
46
|
+
}
|
47
|
+
if (result) {
|
48
|
+
return (wrap ? netResult_1.NetReqResult.success(result) : result);
|
49
|
+
}
|
50
|
+
if (wrap) {
|
51
|
+
return netResult_1.NetReqResult.failed('unknown error');
|
52
|
+
}
|
53
|
+
throw new errors_1.RequestError();
|
54
|
+
}
|
55
|
+
wrapperResult() {
|
56
|
+
this._wrapper = true;
|
57
|
+
return this;
|
58
|
+
}
|
59
|
+
}
|
60
|
+
exports.APIHelper = APIHelper;
|
61
|
+
function createProxiedAPIService(instance) {
|
62
|
+
;
|
63
|
+
instance.helper = new APIHelper();
|
64
|
+
return new Proxy(instance, {
|
65
|
+
get(target, prop, receiver) {
|
66
|
+
const method = target[prop];
|
67
|
+
// target func
|
68
|
+
if (typeof method === 'function') {
|
69
|
+
return async function (...args) {
|
70
|
+
const result = await target.helper.call(() => method.apply(this, args));
|
71
|
+
return result;
|
72
|
+
};
|
73
|
+
}
|
74
|
+
if (prop in target) {
|
75
|
+
return Reflect.get(target, prop, receiver);
|
76
|
+
}
|
77
|
+
// helper func
|
78
|
+
if (prop in target.helper) {
|
79
|
+
const v = Reflect.get(target.helper, prop);
|
80
|
+
if (typeof v === 'function') {
|
81
|
+
return v;
|
82
|
+
}
|
83
|
+
return v;
|
84
|
+
}
|
85
|
+
return undefined;
|
86
|
+
},
|
87
|
+
set(target, property, value, receiver) {
|
88
|
+
if (property in target) {
|
89
|
+
return Reflect.set(target, property, value, receiver);
|
90
|
+
}
|
91
|
+
if (property in target.helper) {
|
92
|
+
return Reflect.set(target.helper, property, value);
|
93
|
+
}
|
94
|
+
return false;
|
95
|
+
},
|
96
|
+
});
|
97
|
+
}
|
98
|
+
exports.createProxiedAPIService = createProxiedAPIService;
|
99
|
+
//# sourceMappingURL=helper.js.map
|