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

package/lib/api/base/aioclient.d.ts

@@ -0,0 +1,11 @@
+import { Config } from '../../config';
+import { AioOauthTokenResponse } from '../../api/interfaces/aiosaber';
+import { Fetch } from '../../utils/fetch/ofetch';
+import { Logger } from '../../interface';
+export declare class AIOSaberClient {
+    cfg: Config;
+    f: Fetch;
+    constructor(cfg: Config, logger: Logger);
+    getBSOAuthToken(key: string): Promise<AioOauthTokenResponse>;
+    getBLOAuthToken(key: string): Promise<AioOauthTokenResponse>;
+}

package/lib/api/base/aioclient.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AIOSaberClient = void 0;
+const fetch_1 = require("../../utils/fetch");
+class AIOSaberClient {
+    cfg;
+    f;
+    constructor(cfg, logger) {
+        this.f = (0, fetch_1.createFetch)(logger).baseUrl('https://abs.ktlab.io');
+        this.cfg = cfg;
+    }
+    async getBSOAuthToken(key) {
+        return this.f.get(`/api/oauth/beatsaver/token/${key}`);
+    }
+    async getBLOAuthToken(key) {
+        return this.f.get(`/api/oauth/beatleader/token/${key}`);
+    }
+}
+exports.AIOSaberClient = AIOSaberClient;
+//# sourceMappingURL=aioclient.js.map

package/lib/api/base/aioclient.js.map

@@ -0,0 +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"}

package/lib/api/base/blclient.d.ts

@@ -0,0 +1,18 @@
+import { OAuthTokenInfoResponse, OAuthTokenResponse } from '../interfaces';
+import { Config } from '../../config';
+import { Fetch } from '../../utils/fetch';
+import { BeadLeaderScoresResponse, BeatLeaderPlayerScoreRequest, BeatLeaderUser, Leaderboard, Score } from '../../api/interfaces/beatleader';
+import { Logger } from '../../interface';
+export declare class BeatLeaderClient {
+    cfg: Config;
+    f: Fetch;
+    constructor(cfg: Config, logger: Logger);
+    getPlayerScore(req: BeatLeaderPlayerScoreRequest): Promise<Leaderboard>;
+    getTokenInfo(accessToken: string): Promise<OAuthTokenInfoResponse>;
+    refreshOAuthToken(refreshToken: string): Promise<OAuthTokenResponse>;
+    getPlayerInfo(accountId: string): Promise<BeatLeaderUser>;
+    getPlayerScores(accountId: string): Promise<BeadLeaderScoresResponse>;
+    getPlayerPinnedScores(accountId: string): Promise<Score[]>;
+    getBeatScore(scoreId: string): Promise<Score>;
+    getLeaderboard(leaderboardId: string, params?: Record<string, any>): Promise<any>;
+}

package/lib/api/base/blclient.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BeatLeaderClient = void 0;
+const fetch_1 = require("../../utils/fetch");
+class BeatLeaderClient {
+    cfg;
+    f;
+    constructor(cfg, logger) {
+        this.f = (0, fetch_1.createFetch)(logger).baseUrl('https://api.beatleader.xyz').extend({
+            ignoreResponseError: false,
+        });
+        this.cfg = cfg;
+    }
+    async getPlayerScore(req) {
+        const res = await this.f.get(`/score/${req.leaderboardContext}/${req.playerID}/${req.hash}/${req.diff}/${req.mode}`);
+        return res;
+    }
+    async getTokenInfo(accessToken) {
+        return this.f.get(`/oauth2/identity`, {
+            headers: {
+                Authorization: `Bearer ${accessToken}`,
+            },
+        });
+    }
+    async refreshOAuthToken(refreshToken) {
+        const form = new URLSearchParams();
+        form.append('client_id', this.cfg.blOauthClientId);
+        form.append('client_secret', this.cfg.blOauthClientSecret);
+        form.append('grant_type', 'refresh_token');
+        form.append('refresh_token', refreshToken);
+        const res = await fetch('https://beatsaver.com/api/oauth2/token', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            body: form,
+        }).then((res) => res.json());
+        if (!res.access_token) {
+            throw new Error('refreshToken failed');
+        }
+        return res;
+    }
+    async getPlayerInfo(accountId) {
+        return this.f.get(`/player/${accountId}`);
+    }
+    async getPlayerScores(accountId) {
+        return this.f.get(`/player/${accountId}/scores?count=24&sortBy=pp`);
+    }
+    async getPlayerPinnedScores(accountId) {
+        return this.f.get(`/player/${accountId}/pinnedScores`);
+    }
+    async getBeatScore(scoreId) {
+        return this.f.get(`/score/${scoreId}`);
+    }
+    async getLeaderboard(leaderboardId, params) {
+        return this.f.get(`/leaderboard/${leaderboardId}`, { query: params });
+    }
+}
+exports.BeatLeaderClient = BeatLeaderClient;
+//# sourceMappingURL=blclient.js.map

package/lib/api/base/blclient.js.map

@@ -0,0 +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"}

package/lib/api/base/bsclient.d.ts

@@ -0,0 +1,17 @@
+import { OAuthTokenInfoResponse, OAuthTokenResponse } from '../interfaces';
+import { Config } from '../../config';
+import { Fetch } from '../../utils/fetch';
+import { BSMap, BSUserResponse, HashReqResponse } from '../../api/interfaces/beatsaver';
+import { Logger } from '../../interface';
+export declare class BeatSaverClient {
+    cfg: Config;
+    f: Fetch;
+    constructor(cfg: Config, logger: Logger);
+    getBSMapperById(userId: string): Promise<BSUserResponse>;
+    getLatestMaps(pageSize?: number): Promise<BSMap[]>;
+    searchMapByKeyword(key: string, params?: Record<string, boolean | number | string>): Promise<BSMap[]>;
+    searchMapById(id: string): Promise<BSMap>;
+    getTokenInfo(ak: string): Promise<OAuthTokenInfoResponse>;
+    getMapsByHashes(hashes: string[]): Promise<HashReqResponse>;
+    refreshOAuthToken(rk: string): Promise<OAuthTokenResponse>;
+}

package/lib/api/base/bsclient.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BeatSaverClient = void 0;
+const fetch_1 = require("../../utils/fetch");
+const error_1 = require("../../utils/fetch/error");
+class BeatSaverClient {
+    cfg;
+    f;
+    constructor(cfg, logger) {
+        this.f = (0, fetch_1.createFetch)(logger)
+            .baseUrl(cfg.beatSaverHost ?? 'https://api.beatsaver.com')
+            .extend({
+            ignoreResponseError: false,
+            onResponseError: (context) => {
+                if (context.response.status === 404 ||
+                    context.response.status === 400) {
+                    throw new error_1.NotFoundError();
+                }
+            },
+        });
+        this.cfg = cfg;
+    }
+    async getBSMapperById(userId) {
+        return this.f.get(`/users/id/${userId}`);
+    }
+    async getLatestMaps(pageSize = 5) {
+        return this.f
+            .get(`/maps/latest`, {
+            query: {
+                sort: 'FIRST_PUBLISHED',
+                pageSize,
+            },
+        })
+            .then((res) => res.docs);
+    }
+    async searchMapByKeyword(key, params) {
+        return this.f
+            .get(`/search/text/0`, {
+            query: {
+                q: key,
+                ...params,
+            },
+        })
+            .then((res) => res.docs);
+    }
+    async searchMapById(id) {
+        return this.f.get(`/maps/id/${id}`);
+    }
+    async getTokenInfo(ak) {
+        return this.f.get(`/oauth2/identity`, {
+            headers: {
+                Authorization: `Bearer ${ak}`,
+            },
+        });
+    }
+    async getMapsByHashes(hashes) {
+        return this.f.get(`/maps/hash/${hashes.join(',')}`);
+    }
+    async refreshOAuthToken(rk) {
+        const res = await this.f.post('https://beatsaver.com/api/oauth2/token', {
+            form: {
+                client_id: this.cfg.bsOauthClientId,
+                client_secret: this.cfg.bsOauthClientSecret,
+                grant_type: 'refresh_token',
+                refresh_token: rk,
+            },
+        });
+        if (!res.access_token) {
+            throw new Error('refreshToken failed');
+        }
+        return res;
+    }
+}
+exports.BeatSaverClient = BeatSaverClient;
+//# sourceMappingURL=bsclient.js.map

package/lib/api/base/bsclient.js.map

@@ -0,0 +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"}

package/lib/api/base/index.d.ts

@@ -1,12 +1,4 @@
-import { blRequest } from './blRequset';
-import { bsRequest } from './bsRequest';
-import { scRequest } from './scRequest';
-import { aioRequest } from './aioRequest';
-export type BeatLeaderClient = ReturnType<typeof blRequest>;
-export type BeatSaverClient = ReturnType<typeof bsRequest>;
-export type ScoreSaberClient = ReturnType<typeof scRequest>;
-export type AIOSaberClient = ReturnType<typeof aioRequest>;
-export * from './scRequest';
-export * from './blRequset';
-export * from './aioRequest';
-export * from './bsRequest';
+export * from './ssclient';
+export * from './blclient';
+export * from './aioclient';
+export * from './bsclient';

package/lib/api/base/index.js

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./scRequest"), exports);
-__exportStar(require("./blRequset"), exports);
-__exportStar(require("./aioRequest"), exports);
-__exportStar(require("./bsRequest"), exports);
+__exportStar(require("./ssclient"), exports);
+__exportStar(require("./blclient"), exports);
+__exportStar(require("./aioclient"), exports);
+__exportStar(require("./bsclient"), exports);
 //# sourceMappingURL=index.js.map

package/lib/api/base/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAUA,8CAA2B;AAE3B,8CAA2B;AAE3B,+CAA4B;AAE5B,8CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAE1B,6CAA0B;AAE1B,8CAA2B;AAE3B,6CAA0B"}

package/lib/api/base/ssclient.d.ts

@@ -0,0 +1,13 @@
+import { Config } from '../../config';
+import { Fetch } from '../../utils/fetch';
+import { ScoreSaberUser, ScoreSaberUserResponse } from '../../api/interfaces/scoresaber';
+import { ScoresaberLeaderboardResp } from '../../api/interfaces/scoresaber/leaderboard';
+import { Logger } from '../../interface';
+export declare class ScoreSaberClient {
+    cfg: Config;
+    f: Fetch;
+    constructor(cfg: Config, logger: Logger);
+    getScoreUserById(userId: string): Promise<ScoreSaberUser>;
+    getScoreItemsById(userId: string, page: number, pageSize?: number): Promise<ScoreSaberUserResponse>;
+    getScoreItemsByMapId(mapId: string, diff: string, mode: string, page: number, pageSize?: number): Promise<ScoresaberLeaderboardResp>;
+}

package/lib/api/base/ssclient.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScoreSaberClient = void 0;
+const fetch_1 = require("../../utils/fetch");
+const error_1 = require("../../utils/fetch/error");
+class ScoreSaberClient {
+    cfg;
+    f;
+    constructor(cfg, logger) {
+        this.f = (0, fetch_1.createFetch)(logger).extend({
+            baseURL: 'https://scoresaber.com',
+            ignoreResponseError: false,
+            onResponseError: (context) => {
+                if (context.response.status === 500 ||
+                    context.response.status === 404) {
+                    throw new error_1.NotFoundError();
+                }
+            },
+        });
+        this.cfg = cfg;
+    }
+    async getScoreUserById(userId) {
+        return this.f.get(`/api/player/${userId}/full`);
+    }
+    async getScoreItemsById(userId, page, pageSize = 8) {
+        return this.f.get(`/api/player/${userId}/scores`, {
+            query: {
+                sort: 'top',
+                page: page,
+                limit: pageSize,
+            },
+        });
+    }
+    async getScoreItemsByMapId(mapId, diff, mode, page, pageSize = 8) {
+        const id = convertToLeaderboardId(mapId, diff, mode);
+        return this.f.get(`/api/leaderboard/by-id/${id}/scores`, {
+            query: {
+                page: page,
+                limit: pageSize,
+            },
+        });
+    }
+}
+exports.ScoreSaberClient = ScoreSaberClient;
+const convertToLeaderboardId = (mapid, diff, mode) => {
+    return mapid;
+};
+//# sourceMappingURL=ssclient.js.map

package/lib/api/base/ssclient.js.map

@@ -0,0 +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"}

package/lib/api/composed/beatleader.d.ts

@@ -8,11 +8,11 @@ export declare class BeatLeaderService {
     private bsClient;
     private blClient;
     constructor(bsClient: BeatSaverClient, blClient: BeatLeaderClient);
-    getPlayerInfoById(id: string): Promise<any>;
+    getPlayerInfoById(id: string): Promise<import("../interfaces/beatleader").BeatLeaderUser>;
     getScore(item: any): Promise<any>;
     getScoreByPlayerIdAndMapId(playerId: string, mapId: string, option?: MapDiffOption): Promise<Leaderboard>;
-    getTokenInfo(ak: string): Promise<import("../base").OAuthTokenInfoResponse>;
-    refreshOAuthToken: (rk: string) => Promise<import("../base").OAuthTokenResponse>;
+    getTokenInfo(ak: string): Promise<import("../interfaces").OAuthTokenInfoResponse>;
+    refreshOAuthToken: (rk: string) => Promise<import("../interfaces").OAuthTokenResponse>;
     getPlayerScoresWithUserInfo(accountId: string, queryParams?: any): Promise<{
         scores: import("../interfaces/beatleader").Score[];
         userInfo: import("../interfaces/beatleader").BeatLeaderUser;

package/lib/api/composed/beatleader.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BeatLeaderService = void 0;
 const sortScore_1 = require("../sortScore");
 const bsorDecoder_1 = require("../../img-render/utils/bl/bsorDecoder");
+const errors_1 = require("../../errors");
+const error_1 = require("../../utils/fetch/error");
 class BeatLeaderService {
     bsClient;
     blClient;
@@ -24,9 +26,9 @@ class BeatLeaderService {
         return r;
     }
     async getScoreByPlayerIdAndMapId(playerId, mapId, option) {
-        const [map] = await Promise.all([this.bsClient.searchMapById(mapId)]);
+        const map = await this.bsClient.searchMapById(mapId);
         if (!map) {
-            throw Error('error.not.found');
+            throw new errors_1.MapIdNotFoundError();
         }
         const hash = map.versions[0].hash;
         let reqs = map.versions[0].diffs.map((it) => ({
@@ -43,10 +45,9 @@ class BeatLeaderService {
             reqs = reqs.filter((item) => item.mode == option.mode);
         }
         const res = await Promise.all(reqs.map((it) => this.getScore(it)));
-        const scores = res.map((it) => it.data).filter((item) => item != null);
-        // todo sort score
+        const scores = res.filter((item) => item != null);
         if (scores.length < 1) {
-            throw Error('error.not.found');
+            throw new error_1.NotFoundError();
         }
         scores.sort(sortScore_1.sortScore);
         return scores[0];
@@ -61,6 +62,9 @@ class BeatLeaderService {
             this.blClient.getPlayerScores(accountId),
             this.blClient.getPlayerPinnedScores(accountId),
         ]);
+        if (!(userInfo && playerScores)) {
+            throw new errors_1.BLIDNotFoundError({ accountId });
+        }
         const filteredScores = playerScores.data.filter((item) => !pinnedScores.some((pinned) => pinned.id === item.id));
         const scores = pinnedScores.concat(filteredScores).slice(0, 24);
         return {
@@ -94,11 +98,20 @@ class BeatLeaderService {
         if (rest > 7) {
             startIndex = 2;
         }
-        const regionUrl = `https://api.beatleader.xyz/leaderboard/${leaderboardId}?leaderboardContext=general&page=1&sortBy=rank&order=desc&countries=${regionCode}`;
-        const aroundUrl = `https://api.beatleader.xyz/leaderboard/${leaderboardId}?leaderboardContext=general&page=${page}&sortBy=rank&order=desc`;
         const [regionScore, aroundScore] = await Promise.all([
-            fetch(regionUrl).then((res) => res.json()),
-            fetch(aroundUrl).then((res) => res.json()),
+            this.blClient.getLeaderboard(leaderboardId, {
+                leaderboardContext: 'general',
+                page: 1,
+                sortBy: 'rank',
+                order: 'desc',
+                countries: regionCode,
+            }),
+            this.blClient.getLeaderboard(leaderboardId, {
+                leaderboardContext: 'general',
+                page: page,
+                sortBy: 'rank',
+                order: 'desc',
+            }),
         ]);
         const difficulties = regionScore.song.difficulties;
         return {

package/lib/api/composed/beatleader.js.map

@@ -1 +1 @@
-{"version":3,"file":"beatleader.js","sourceRoot":"","sources":["../../../src/api/composed/beatleader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"beatleader.js","sourceRoot":"","sources":["../../../src/api/composed/beatleader.ts"],"names":[],"mappings":"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"}

package/lib/api/composed/beatsaver.d.ts

@@ -2,11 +2,10 @@ import { BeatSaverClient } from '../base';
 export declare class BeatSaverService {
     private bsClient;
     constructor(bsClient: BeatSaverClient);
-    getUnreadAlertsByPage: (ak: string, page: number) => Promise<import("../interfaces/beatsaver").BeatsaverAlert[]>;
-    getTokenInfo: (ak: string) => Promise<import("../base").OAuthTokenInfoResponse>;
+    getTokenInfo: (ak: string) => Promise<import("../interfaces").OAuthTokenInfoResponse>;
     searchMapById: (key: string) => Promise<import("../interfaces/beatsaver").BSMap>;
     searchMapByKeyword: (key: string) => Promise<import("../interfaces/beatsaver").BSMap[]>;
     getLatestMaps: (pageSize: number) => Promise<import("../interfaces/beatsaver").BSMap[]>;
     getBSMapperById: (id: string) => Promise<import("../interfaces/beatsaver").BSUserResponse>;
-    refreshOAuthToken: (rk: string) => Promise<import("../base").OAuthTokenResponse>;
+    refreshOAuthToken: (rk: string) => Promise<import("../interfaces").OAuthTokenResponse>;
 }

package/lib/api/composed/beatsaver.js

@@ -6,7 +6,8 @@ class BeatSaverService {
     constructor(bsClient) {
         this.bsClient = bsClient;
     }
-    getUnreadAlertsByPage = (ak, page) => this.bsClient.getUnreadAlertsByPage(ak, page);
+    // getUnreadAlertsByPage = (ak: string, page: number) =>
+    //   this.bsClient.getUnreadAlertsByPage(ak, page)
     getTokenInfo = (ak) => this.bsClient.getTokenInfo(ak);
     searchMapById = (key) => this.bsClient.searchMapById(key);
     searchMapByKeyword = (key) => this.bsClient.searchMapByKeyword(key);

package/lib/api/composed/beatsaver.js.map

@@ -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"}
+{"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"}

package/lib/api/composed/scoresaber.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScoreSaberService = void 0;
 const sortScore_1 = require("../sortScore");
+const errors_1 = require("../../errors");
 class ScoreSaberService {
     bsClient;
     scClient;
@@ -44,8 +45,11 @@ class ScoreSaberService {
         const userInfo = this.getScoreUserById(uid);
         const scores = await this.scClient
             .getScoreItemsById(uid, 1, 24)
-            .then((res) => res.playerScores);
+            .then((res) => res?.playerScores);
         const awaitedUserInfo = await userInfo;
+        if (!scores || !awaitedUserInfo) {
+            throw new errors_1.SSIDNotFoundError({ accountId: uid });
+        }
         const hashes = scores.map((it) => it.leaderboard.songHash);
         let hashInfo = await this.bsClient.getMapsByHashes(hashes);
         if (hashInfo.id) {

package/lib/api/composed/scoresaber.js.map

@@ -1 +1 @@
-{"version":3,"file":"scoresaber.js","sourceRoot":"","sources":["../../../src/api/composed/scoresaber.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scoresaber.js","sourceRoot":"","sources":["../../../src/api/composed/scoresaber.ts"],"names":[],"mappings":"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"}

package/lib/api/helper.d.ts

@@ -0,0 +1,19 @@
+import { NetReqResult } from '../api/netResult';
+type Res<Base, T> = Base extends true ? NetReqResult<T> : T;
+export declare class APIHelper<API, Base extends boolean = false> {
+    constructor();
+    private retryTime;
+    private _wrapper;
+    private _onRetry;
+    withRetry(times?: number, onRetry?: (retryTime: number, e?: any) => void): this;
+    onRetry(func: (times: number, e: any) => void): this;
+    call<T>(block: () => Promise<T>): Promise<Res<Base, T>>;
+    wrapperResult(): ServiceWithAPIHelper<API, true>;
+}
+export type ServiceWithAPIHelper<API, Wrap extends boolean = false> = Wrapped<API, Wrap> & APIHelper<API, Wrap>;
+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;
+type Wrapped<T, Wrap extends boolean = false> = {
+    [K in keyof T]: Wrapping<T[K], Wrap>;
+};
+export declare function createProxiedAPIService<T extends object>(instance: T): ServiceWithAPIHelper<T>;
+export {};

package/lib/api/helper.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createProxiedAPIService = exports.APIHelper = void 0;
+const netResult_1 = require("../api/netResult");
+const utils_1 = require("../utils");
+const errors_1 = require("../errors");
+class APIHelper {
+    constructor() { }
+    retryTime = 1;
+    _wrapper = false;
+    _onRetry = () => { };
+    withRetry(times = 1, onRetry) {
+        this.retryTime = times;
+        this._onRetry = onRetry;
+        return this;
+    }
+    onRetry(func) {
+        this._onRetry = func;
+        return this;
+    }
+    async call(block) {
+        let result;
+        let times = Math.min(this.retryTime, 3);
+        let retryTime = 0;
+        const wrap = this._wrapper;
+        while (times > 0) {
+            try {
+                result = await block();
+                if (wrap) {
+                    return netResult_1.NetReqResult.success(result);
+                }
+                return result;
+            }
+            catch (e) {
+                if (e instanceof errors_1.BizError) {
+                    throw e;
+                }
+                retryTime += 1;
+                if (times-- > 1) {
+                    this._onRetry?.(retryTime, e);
+                    continue;
+                }
+                await (0, utils_1.sleep)(300);
+                if (wrap) {
+                    return netResult_1.NetReqResult.failed(`retry times reached, ${e}`);
+                }
+                throw new errors_1.ReachNetworkRetryLimitError();
+            }
+        }
+        if (result) {
+            return (wrap ? netResult_1.NetReqResult.success(result) : result);
+        }
+        if (wrap) {
+            return netResult_1.NetReqResult.failed('unknown error');
+        }
+        throw new errors_1.RequestError();
+    }
+    wrapperResult() {
+        this._wrapper = true;
+        return this;
+    }
+}
+exports.APIHelper = APIHelper;
+function createProxiedAPIService(instance) {
+    ;
+    instance.helper = new APIHelper();
+    return new Proxy(instance, {
+        get(target, prop, receiver) {
+            const method = target[prop];
+            // target func
+            if (typeof method === 'function') {
+                return async function (...args) {
+                    const result = await target.helper.call(() => method.apply(this, args));
+                    return result;
+                };
+            }
+            if (prop in target) {
+                return Reflect.get(target, prop, receiver);
+            }
+            // helper func
+            if (prop in target.helper) {
+                const v = Reflect.get(target.helper, prop);
+                if (typeof v === 'function') {
+                    return v;
+                }
+                return v;
+            }
+            return undefined;
+        },
+        set(target, property, value, receiver) {
+            if (property in target) {
+                return Reflect.set(target, property, value, receiver);
+            }
+            if (property in target.helper) {
+                return Reflect.set(target.helper, property, value);
+            }
+            return false;
+        },
+    });
+}
+exports.createProxiedAPIService = createProxiedAPIService;
+//# sourceMappingURL=helper.js.map