beatsaber-bot-core 0.2.0-dev.30 → 0.2.0-dev.32

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

@@ -1,10 +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);
+    constructor(cfg: Config, logger: Logger);
     getBSOAuthToken(key: string): Promise<AioOauthTokenResponse>;
     getBLOAuthToken(key: string): Promise<AioOauthTokenResponse>;
 }

package/lib/api/base/aioclient.js

@@ -5,12 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AIOSaberClient = void 0;
 const fetch_1 = __importDefault(require("../../utils/fetch"));
+const errors_1 = require("../../errors");
 class AIOSaberClient {
     cfg;
     f;
-    constructor(cfg) {
+    constructor(cfg, logger) {
         this.f = fetch_1.default.extend({
             baseURL: 'https://abs.ktlab.io',
+            retry: 3,
+            onRequestError: ({ error, request, response }) => {
+                if (response.status === 404) {
+                    return null;
+                }
+                logger.error(`external request ${request} fail: ${error}`);
+                throw new errors_1.RequestError(error);
+            },
         });
         this.cfg = cfg;
     }

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

@@ -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"}
+{"version":3,"file":"aioclient.js","sourceRoot":"","sources":["../../../src/api/base/aioclient.ts"],"names":[],"mappings":";;;;;;AAGA,0DAAkC;AAElC,qCAAuC;AAEvC,MAAa,cAAc;IACzB,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW,EAAE,MAAc;QACrC,IAAI,CAAC,CAAC,GAAG,eAAM,CAAC,MAAM,CAAC;YACrB,OAAO,EAAE,sBAAsB;YAC/B,KAAK,EAAE,CAAC;YACR,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC/C,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC5B,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,oBAAoB,OAAO,UAAU,KAAK,EAAE,CAAC,CAAA;gBAC1D,MAAM,IAAI,qBAAY,CAAC,KAAK,CAAC,CAAA;YAC/B,CAAC;SACF,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;AA3BD,wCA2BC"}

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

@@ -2,10 +2,11 @@ import { OAuthTokenInfoResponse, OAuthTokenResponse } from '../interfaces';
 import { Config } from '../../config';
 import { Fetch } from '../../utils/fetch/ofetch';
 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);
+    constructor(cfg: Config, logger: Logger);
     getPlayerScore(req: BeatLeaderPlayerScoreRequest): Promise<Leaderboard>;
     getTokenInfo(accessToken: string): Promise<OAuthTokenInfoResponse>;
     refreshOAuthToken(refreshToken: string): Promise<OAuthTokenResponse>;

package/lib/api/base/blclient.js

@@ -5,12 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BeatLeaderClient = void 0;
 const fetch_1 = __importDefault(require("../../utils/fetch"));
+const errors_1 = require("../../errors");
 class BeatLeaderClient {
     cfg;
     f;
-    constructor(cfg) {
+    constructor(cfg, logger) {
         this.f = fetch_1.default.extend({
             baseURL: 'https://api.beatleader.xyz',
+            retry: 3,
+            onRequestError: ({ error, request, response }) => {
+                if (response.status === 404) {
+                    return null;
+                }
+                logger.error(`external request ${request} fail: ${error}`);
+                throw new errors_1.RequestError(error);
+            },
         });
         this.cfg = cfg;
     }

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

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

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

@@ -2,10 +2,11 @@ import { OAuthTokenInfoResponse, OAuthTokenResponse } from '../interfaces';
 import { Config } from '../../config';
 import { Fetch } from '../../utils/fetch/ofetch';
 import { BSMap, BSUserResponse, HashReqResponse } from '../../api/interfaces/beatsaver';
+import { Logger } from '../../interface';
 export declare class BeatSaverClient {
     cfg: Config;
     f: Fetch;
-    constructor(cfg: Config);
+    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[]>;

package/lib/api/base/bsclient.js

@@ -5,12 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BeatSaverClient = void 0;
 const fetch_1 = __importDefault(require("../../utils/fetch"));
+const errors_1 = require("../../errors");
 class BeatSaverClient {
     cfg;
     f;
-    constructor(cfg) {
+    constructor(cfg, logger) {
         this.f = fetch_1.default.extend({
             baseURL: cfg.beatSaverHost ?? 'https://api.beatsaver.com',
+            retry: 3,
+            onRequestError: ({ error, request, response }) => {
+                if (response.status === 404) {
+                    return null;
+                }
+                logger.error(`external request ${request} fail: ${error}`);
+                throw new errors_1.RequestError(error);
+            },
         });
         this.cfg = cfg;
     }

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

@@ -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,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;AAtED,0CAsEC"}
+{"version":3,"file":"bsclient.js","sourceRoot":"","sources":["../../../src/api/base/bsclient.ts"],"names":[],"mappings":";;;;;;AAEA,0DAAkC;AASlC,qCAAuC;AAEvC,MAAa,eAAe;IAC1B,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW,EAAE,MAAc;QACrC,IAAI,CAAC,CAAC,GAAG,eAAM,CAAC,MAAM,CAAC;YACrB,OAAO,EAAE,GAAG,CAAC,aAAa,IAAI,2BAA2B;YACzD,KAAK,EAAE,CAAC;YACR,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC/C,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC5B,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,oBAAoB,OAAO,UAAU,KAAK,EAAE,CAAC,CAAA;gBAC1D,MAAM,IAAI,qBAAY,CAAC,KAAK,CAAC,CAAA;YAC/B,CAAC;SACF,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,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;AA9ED,0CA8EC"}

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

@@ -2,10 +2,11 @@ import { Config } from '../../config';
 import { Fetch } from '../../utils/fetch/ofetch';
 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);
+    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

@@ -5,12 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScoreSaberClient = void 0;
 const fetch_1 = __importDefault(require("../../utils/fetch"));
+const errors_1 = require("../../errors");
 class ScoreSaberClient {
     cfg;
     f;
-    constructor(cfg) {
+    constructor(cfg, logger) {
         this.f = fetch_1.default.extend({
             baseURL: 'https://scoresaber.com',
+            retry: 3,
+            onRequestError: ({ error, request, response }) => {
+                if (response.status === 404) {
+                    return null;
+                }
+                logger.error(`external request ${request} fail: ${error}`);
+                throw new errors_1.RequestError(error);
+            },
         });
         this.cfg = cfg;
     }

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

@@ -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,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;AArCD,4CAqCC;AAED,MAAM,sBAAsB,GAAG,CAAC,KAAa,EAAE,IAAY,EAAE,IAAY,EAAE,EAAE;IAC3E,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"ssclient.js","sourceRoot":"","sources":["../../../src/api/base/ssclient.ts"],"names":[],"mappings":";;;;;;AAEA,0DAAkC;AAOlC,qCAAuC;AAEvC,MAAa,gBAAgB;IAC3B,GAAG,CAAQ;IACX,CAAC,CAAO;IACR,YAAY,GAAW,EAAE,MAAc;QACrC,IAAI,CAAC,CAAC,GAAG,eAAM,CAAC,MAAM,CAAC;YACrB,OAAO,EAAE,wBAAwB;YACjC,KAAK,EAAE,CAAC;YACR,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC/C,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC5B,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,oBAAoB,OAAO,UAAU,KAAK,EAAE,CAAC,CAAA;gBAC1D,MAAM,IAAI,qBAAY,CAAC,KAAK,CAAC,CAAA;YAC/B,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;AA7CD,4CA6CC;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,7 +8,7 @@ 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("../interfaces").OAuthTokenInfoResponse>;

package/lib/api/index.d.ts

@@ -3,12 +3,12 @@ import { BeatLeaderService } from './composed/beatleader';
 import { BeatSaverService } from './composed/beatsaver';
 import { ScoreSaberService } from './composed/scoresaber';
 import { AIOSaberService } from './composed/aiosaber';
-import { ServiceWithAPIHelper } from '../api/helper';
+import { Logger } from '../interface';
 export declare class APIService {
-    BeatLeader: ServiceWithAPIHelper<BeatLeaderService>;
-    ScoreSaber: ServiceWithAPIHelper<ScoreSaberService>;
-    BeatSaver: ServiceWithAPIHelper<BeatSaverService>;
-    AIOSaber: ServiceWithAPIHelper<AIOSaberService>;
+    BeatLeader: BeatLeaderService;
+    ScoreSaber: ScoreSaberService;
+    BeatSaver: BeatSaverService;
+    AIOSaber: AIOSaberService;
     private constructor();
-    static create(cfg: Config): APIService;
+    static create(cfg: Config, logger: Logger): APIService;
 }

package/lib/api/index.js

@@ -6,38 +6,37 @@ const beatsaver_1 = require("./composed/beatsaver");
 const scoresaber_1 = require("./composed/scoresaber");
 const aiosaber_1 = require("./composed/aiosaber");
 const base_1 = require("../api/base");
-const helper_1 = require("../api/helper");
 class APIService {
     BeatLeader;
     ScoreSaber;
     BeatSaver;
     AIOSaber;
-    constructor(cfg) {
-        const bsClient = new base_1.BeatSaverClient(cfg);
-        const blClient = new base_1.BeatLeaderClient(cfg);
-        const scClient = new base_1.ScoreSaberClient(cfg);
-        const aioClient = new base_1.AIOSaberClient(cfg);
+    constructor(cfg, logger) {
+        const bsClient = new base_1.BeatSaverClient(cfg, logger);
+        const blClient = new base_1.BeatLeaderClient(cfg, logger);
+        const scClient = new base_1.ScoreSaberClient(cfg, logger);
+        const aioClient = new base_1.AIOSaberClient(cfg, logger);
         this.BeatLeader = new beatleader_1.BeatLeaderService(bsClient, blClient);
         this.BeatSaver = new beatsaver_1.BeatSaverService(bsClient);
         this.ScoreSaber = new scoresaber_1.ScoreSaberService(bsClient, scClient);
         this.AIOSaber = new aiosaber_1.AIOSaberService(aioClient);
     }
-    static create(cfg) {
-        // return new APIService(cfg)
-        const ins = new APIService(cfg);
-        const proxied = new Proxy(ins, {
-            get(target, prop, receiver) {
-                const member = target[prop];
-                if (member) {
-                    return (0, helper_1.createProxiedAPIService)(member);
-                }
-                return undefined;
-            },
-            set(target, property, value, receiver) {
-                return false;
-            },
-        });
-        return proxied;
+    static create(cfg, logger) {
+        return new APIService(cfg, logger);
+        // const ins = new APIService(cfg)
+        // const proxied = new Proxy<APIService>(ins, {
+        //   get(target, prop, receiver) {
+        //     const member = target[prop]
+        //     if (member) {
+        //       return createProxiedAPIService(member)
+        //     }
+        //     return undefined
+        //   },
+        //   set(target, property, value, receiver) {
+        //     return false
+        //   },
+        // })
+        // return proxied
     }
 }
 exports.APIService = APIService;

package/lib/api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;AACA,sDAAyD;AACzD,oDAAuD;AACvD,sDAAyD;AACzD,kDAAqD;AACrD,qCAKmB;AACnB,yCAA4E;AAE5E,MAAa,UAAU;IACrB,UAAU,CAAyC;IACnD,UAAU,CAAyC;IACnD,SAAS,CAAwC;IACjD,QAAQ,CAAuC;IAC/C,YAAoB,GAAW;QAC7B,MAAM,QAAQ,GAAG,IAAI,sBAAe,CAAC,GAAG,CAAC,CAAA;QACzC,MAAM,QAAQ,GAAG,IAAI,uBAAgB,CAAC,GAAG,CAAC,CAAA;QAC1C,MAAM,QAAQ,GAAG,IAAI,uBAAgB,CAAC,GAAG,CAAC,CAAA;QAC1C,MAAM,SAAS,GAAG,IAAI,qBAAc,CAAC,GAAG,CAAC,CAAA;QACzC,IAAI,CAAC,UAAU,GAAG,IAAI,8BAAiB,CACrC,QAAQ,EACR,QAAQ,CAC6C,CAAA;QACvD,IAAI,CAAC,SAAS,GAAG,IAAI,4BAAgB,CACnC,QAAQ,CAC4C,CAAA;QACtD,IAAI,CAAC,UAAU,GAAG,IAAI,8BAAiB,CACrC,QAAQ,EACR,QAAQ,CAC6C,CAAA;QACvD,IAAI,CAAC,QAAQ,GAAG,IAAI,0BAAe,CACjC,SAAS,CAC0C,CAAA;IACvD,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,GAAW;QACvB,6BAA6B;QAC7B,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;QAC/B,MAAM,OAAO,GAAG,IAAI,KAAK,CAAa,GAAG,EAAE;YACzC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ;gBACxB,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;gBAC3B,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,IAAA,gCAAuB,EAAC,MAAM,CAAC,CAAA;gBACxC,CAAC;gBACD,OAAO,SAAS,CAAA;YAClB,CAAC;YACD,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ;gBACnC,OAAO,KAAK,CAAA;YACd,CAAC;SACF,CAAC,CAAA;QACF,OAAO,OAAO,CAAA;IAChB,CAAC;CACF;AA3CD,gCA2CC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;AACA,sDAAyD;AACzD,oDAAuD;AACvD,sDAAyD;AACzD,kDAAqD;AACrD,qCAKmB;AAGnB,MAAa,UAAU;IACrB,UAAU,CAAmB;IAC7B,UAAU,CAAmB;IAC7B,SAAS,CAAkB;IAC3B,QAAQ,CAAiB;IACzB,YAAoB,GAAW,EAAE,MAAc;QAC7C,MAAM,QAAQ,GAAG,IAAI,sBAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QACjD,MAAM,QAAQ,GAAG,IAAI,uBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAClD,MAAM,QAAQ,GAAG,IAAI,uBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAClD,MAAM,SAAS,GAAG,IAAI,qBAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QACjD,IAAI,CAAC,UAAU,GAAG,IAAI,8BAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC3D,IAAI,CAAC,SAAS,GAAG,IAAI,4BAAgB,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI,CAAC,UAAU,GAAG,IAAI,8BAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC3D,IAAI,CAAC,QAAQ,GAAG,IAAI,0BAAe,CAAC,SAAS,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,GAAW,EAAE,MAAc;QACvC,OAAO,IAAI,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAClC,kCAAkC;QAClC,+CAA+C;QAC/C,kCAAkC;QAClC,kCAAkC;QAClC,oBAAoB;QACpB,+CAA+C;QAC/C,QAAQ;QACR,uBAAuB;QACvB,OAAO;QACP,6CAA6C;QAC7C,mBAAmB;QACnB,OAAO;QACP,KAAK;QACL,iBAAiB;IACnB,CAAC;CACF;AAjCD,gCAiCC"}

package/lib/api/interfaces/beatsaver/index.d.ts

@@ -6,5 +6,6 @@ export * from './alert';
 import { BSUserResponse } from './user';
 export type BSUserResp = BSUserResponse | BSErrorResponse;
 export interface BSErrorResponse {
-    error?: string;
+    success?: boolean;
+    errors?: string;
 }

package/lib/cmd/bind/bind-beatleader.js

@@ -2,24 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBeatLeaderBind = void 0;
 const handleBeatLeaderBind = async (c) => {
-    const tokenInfo = await c.api.AIOSaber.wrapperResult().getBLOAuthToken(c.input);
-    if (!tokenInfo.isSuccess()) {
+    const tokenInfo = await c.api.AIOSaber.getBLOAuthToken(c.input);
+    if (!tokenInfo) {
         c.session.sendQuote(c.session.text('commands.bsbot.bind.bl.not-found'));
         return;
     }
-    let token = tokenInfo.data;
-    let self = await c.api.BeatLeader.wrapperResult().getTokenInfo(token.access_token);
-    if (!self.isSuccess()) {
-        const refreshToken = await c.api.BeatLeader.wrapperResult().refreshOAuthToken(token.refresh_token);
-        if (!refreshToken.isSuccess()) {
+    let token = tokenInfo;
+    let self = await c.api.BeatLeader.getTokenInfo(token.access_token);
+    if (!self) {
+        const refreshToken = await c.api.BeatLeader.refreshOAuthToken(token.refresh_token);
+        if (!refreshToken) {
             c.session.sendQuote(c.session.text('commands.bsbot.bind.bl.invalid-token'));
             return;
         }
-        token = refreshToken.data;
-        self = await c.api.BeatLeader.withRetry(3)
-            .wrapperResult()
-            .getTokenInfo(token.access_token);
-        if (!self.isSuccess()) {
+        token = refreshToken;
+        self = await c.api.BeatLeader.getTokenInfo(token.access_token);
+        if (!self) {
             c.session.sendQuote(c.session.text('commands.bsbot.bind.bl.unknown-error'));
             return;
         }
@@ -30,8 +28,8 @@ const handleBeatLeaderBind = async (c) => {
         uid: c.session.u.id,
         platform: 'beatleader',
         platformScope: 'profile clan offline_access',
-        platformUid: self.data.id,
-        platformUname: self.data.name,
+        platformUid: self.id,
+        platformUname: self.name,
         otherPlatformInfo: {},
         accessToken: token.access_token,
         refreshToken: token.refresh_token,
@@ -45,8 +43,8 @@ const handleBeatLeaderBind = async (c) => {
     }
     await c.db.addUserBindingInfo(account);
     c.session.sendQuote(c.session.text('commands.bsbot.bind.bl.success', {
-        name: self.data.name,
-        id: self.data.id,
+        name: self.name,
+        id: self.id,
     }));
 };
 exports.handleBeatLeaderBind = handleBeatLeaderBind;

package/lib/cmd/bind/bind-beatleader.js.map

@@ -1 +1 @@
-{"version":3,"file":"bind-beatleader.js","sourceRoot":"","sources":["../../../src/cmd/bind/bind-beatleader.ts"],"names":[],"mappings":";;;AAEO,MAAM,oBAAoB,GAAG,KAAK,EAAQ,CAAmB,EAAE,EAAE;IACtE,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,eAAe,CACpE,CAAC,CAAC,KAAK,CACR,CAAA;IACD,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC;QAC3B,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC,CAAA;QACvE,OAAM;IACR,CAAC;IACD,IAAI,KAAK,GAAG,SAAS,CAAC,IAAI,CAAA;IAC1B,IAAI,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,YAAY,CAC5D,KAAK,CAAC,YAAY,CACnB,CAAA;IACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;QACtB,MAAM,YAAY,GAChB,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,iBAAiB,CACtD,KAAK,CAAC,aAAa,CACpB,CAAA;QACH,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CACvD,CAAA;YACD,OAAM;QACR,CAAC;QACD,KAAK,GAAG,YAAY,CAAC,IAAI,CAAA;QACzB,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;aACvC,aAAa,EAAE;aACf,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QACnC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACtB,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CACvD,CAAA;YACD,OAAM;QACR,CAAC;IACH,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IACrE,MAAM,OAAO,GAA2B;QACtC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACnB,QAAQ,EAAE,YAAY;QACtB,aAAa,EAAE,6BAA6B;QAC5C,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;QACzB,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;QAC7B,iBAAiB,EAAE,EAAE;QACrB,WAAW,EAAE,KAAK,CAAC,YAAY;QAC/B,YAAY,EAAE,KAAK,CAAC,aAAa;QACjC,cAAc,EAAE,GAAG;QACnB,aAAa,EAAE,GAAG;QAClB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;KACb,CAAA;IACD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;QACpB,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;KACjB,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AA7DY,QAAA,oBAAoB,wBA6DhC"}
+{"version":3,"file":"bind-beatleader.js","sourceRoot":"","sources":["../../../src/cmd/bind/bind-beatleader.ts"],"names":[],"mappings":";;;AAEO,MAAM,oBAAoB,GAAG,KAAK,EAAQ,CAAmB,EAAE,EAAE;IACtE,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC,CAAA;QACvE,OAAM;IACR,CAAC;IACD,IAAI,KAAK,GAAG,SAAS,CAAA;IACrB,IAAI,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IAClE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,iBAAiB,CAC3D,KAAK,CAAC,aAAa,CACpB,CAAA;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CACvD,CAAA;YACD,OAAM;QACR,CAAC;QACD,KAAK,GAAG,YAAY,CAAA;QACpB,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CACvD,CAAA;YACD,OAAM;QACR,CAAC;IACH,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IACrE,MAAM,OAAO,GAA2B;QACtC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACnB,QAAQ,EAAE,YAAY;QACtB,aAAa,EAAE,6BAA6B;QAC5C,WAAW,EAAE,IAAI,CAAC,EAAE;QACpB,aAAa,EAAE,IAAI,CAAC,IAAI;QACxB,iBAAiB,EAAE,EAAE;QACrB,WAAW,EAAE,KAAK,CAAC,YAAY;QAC/B,YAAY,EAAE,KAAK,CAAC,aAAa;QACjC,cAAc,EAAE,GAAG;QACnB,aAAa,EAAE,GAAG;QAClB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;KACb,CAAA;IACD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,EAAE,EAAE,IAAI,CAAC,EAAE;KACZ,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AAtDY,QAAA,oBAAoB,wBAsDhC"}

package/lib/cmd/bind/bind-beatsaver.js

@@ -2,37 +2,43 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBeatSaverBind = void 0;
 const handleBeatSaverBind = async (c) => {
-    const tokenInfo = await c.api.AIOSaber.wrapperResult()
-        .withRetry(3)
-        .getBSOAuthToken(c.input);
-    if (!tokenInfo.isSuccess()) {
+    const tokenInfo = await c.api.AIOSaber.getBSOAuthToken(c.input);
+    if (!tokenInfo) {
         c.session.sendQuote(c.session.text('commands.bsbot.bind.bs.not-found'));
         return;
     }
-    let token = tokenInfo.data;
-    let self = await c.api.BeatSaver.wrapperResult().getTokenInfo(token.access_token);
-    if (!self.isSuccess()) {
-        const refreshToken = await c.api.BeatSaver.wrapperResult().refreshOAuthToken(token.refresh_token);
-        if (!refreshToken.isSuccess()) {
+    let token = tokenInfo;
+    let self = await c.api.BeatSaver.getTokenInfo(token.access_token);
+    // .catch((e) => {
+    //   return c.api.BeatSaver.refreshOAuthToken(token.refresh_token)
+    // })
+    // .catch((e) =>
+    //   c.session.sendQuote(
+    //     c.session.text('commands.bsbot.bind.bs.invalid-token')
+    //   )
+    // )
+    if (!self) {
+        const refreshToken = await c.api.BeatSaver.refreshOAuthToken(token.refresh_token);
+        if (!refreshToken) {
             c.session.sendQuote(c.session.text('commands.bsbot.bind.bs.invalid-token'));
             return;
         }
-        token = refreshToken.data;
-        self = await c.api.BeatSaver.wrapperResult()
-            .withRetry(3)
-            .getTokenInfo(token.access_token);
-        if (!self.isSuccess()) {
-            c.session.sendQuote(c.session.text('commands.bsbot.bind.bs.unknown-error'));
-            return;
-        }
+        token = refreshToken;
+        self = await c.api.BeatSaver.getTokenInfo(token.access_token);
+        // if (!self.isSuccess()) {
+        //   c.session.sendQuote(
+        //     c.session.text('commands.bsbot.bind.bs.unknown-error')
+        //   )
+        //   return
+        // }
     }
     const now = new Date();
     const { bsAccount } = await c.db.getUserAccountsByUid(c.session.u.id);
     const account = {
         uid: c.session.u.id,
         platform: 'beatsaver',
-        platformUid: self.data.id,
-        platformUname: self.data.name,
+        platformUid: self.id,
+        platformUname: self.name,
         otherPlatformInfo: {},
         platformScope: 'identity,alerts',
         accessToken: token.access_token,
@@ -47,8 +53,8 @@ const handleBeatSaverBind = async (c) => {
     }
     await c.db.addUserBindingInfo(account);
     c.session.sendQuote(c.session.text('commands.bsbot.bind.bs.success', {
-        name: self.data.name,
-        id: self.data.id,
+        name: self.name,
+        id: self.id,
     }));
 };
 exports.handleBeatSaverBind = handleBeatSaverBind;

package/lib/cmd/bind/bind-beatsaver.js.map

@@ -1 +1 @@
-{"version":3,"file":"bind-beatsaver.js","sourceRoot":"","sources":["../../../src/cmd/bind/bind-beatsaver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bind-beatsaver.js","sourceRoot":"","sources":["../../../src/cmd/bind/bind-beatsaver.ts"],"names":[],"mappings":";;;AAEO,MAAM,mBAAmB,GAAG,KAAK,EAAQ,CAAmB,EAAE,EAAE;IACrE,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC,CAAA;QACvE,OAAM;IACR,CAAC;IACD,IAAI,KAAK,GAAG,SAAS,CAAA;IACrB,IAAI,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IACjE,kBAAkB;IAClB,kEAAkE;IAClE,KAAK;IACL,gBAAgB;IAChB,yBAAyB;IACzB,6DAA6D;IAC7D,MAAM;IACN,IAAI;IACJ,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAC1D,KAAK,CAAC,aAAa,CACpB,CAAA;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CACvD,CAAA;YACD,OAAM;QACR,CAAC;QACD,KAAK,GAAG,YAAY,CAAA;QACpB,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC7D,2BAA2B;QAC3B,yBAAyB;QACzB,6DAA6D;QAC7D,MAAM;QACN,WAAW;QACX,IAAI;IACN,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IACrE,MAAM,OAAO,GAA2B;QACtC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACnB,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,IAAI,CAAC,EAAE;QACpB,aAAa,EAAE,IAAI,CAAC,IAAI;QACxB,iBAAiB,EAAE,EAAE;QACrB,aAAa,EAAE,iBAAiB;QAChC,WAAW,EAAE,KAAK,CAAC,YAAY;QAC/B,YAAY,EAAE,KAAK,CAAC,aAAa;QACjC,cAAc,EAAE,GAAG;QACnB,aAAa,EAAE,GAAG;QAClB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;KACb,CAAA;IACD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAA;IAC3B,CAAC;IACD,MAAM,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,EAAE,EAAE,IAAI,CAAC,EAAE;KACZ,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AA7DY,QAAA,mBAAmB,uBA6D/B"}

package/lib/cmd/bind/bind-id-beatleader.js

@@ -3,17 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBeatLeaderIDBind = void 0;
 const errors_1 = require("../../errors");
 const handleBeatLeaderIDBind = async (c) => {
-    const player = await c.api.BeatLeader.wrapperResult()
-        .withRetry(3)
-        .getPlayerInfoById(c.input);
-    if (!player.isSuccess()) {
+    const player = await c.api.BeatLeader.getPlayerInfoById(c.input);
+    if (!player) {
         throw new errors_1.AccountBindingNotFoundError();
     }
     // 如果当前bind 是 oauth？改为 id？
     const now = new Date();
     const { blAccount } = await c.db.getUserAccountsByUid(c.session.u.id);
     const text = c.session.text('commands.bsbot.bind.ack-prompt', {
-        user: `${player.data.name}(${player.data.id})`,
+        user: `${player.name}(${player.id})`,
     }) +
         (blAccount
             ? ',' +
@@ -34,8 +32,8 @@ const handleBeatLeaderIDBind = async (c) => {
     const account = {
         uid: c.session.u.id,
         platform: 'beatleader',
-        platformUid: player.data.id.toString(),
-        platformUname: player.data.name,
+        platformUid: player.id.toString(),
+        platformUname: player.name,
         otherPlatformInfo: {},
         lastModifiedAt: now,
         lastRefreshAt: now,
@@ -47,8 +45,8 @@ const handleBeatLeaderIDBind = async (c) => {
     }
     await c.db.addUserBindingInfo(account);
     c.session.sendQuote(c.session.text('commands.bsbot.bind.bl.success', {
-        name: player.data.name,
-        id: player.data.id,
+        name: player.name,
+        id: player.id,
     }));
 };
 exports.handleBeatLeaderIDBind = handleBeatLeaderIDBind;

package/lib/cmd/bind/bind-id-beatleader.js.map

@@ -1 +1 @@
-{"version":3,"file":"bind-id-beatleader.js","sourceRoot":"","sources":["../../../src/cmd/bind/bind-id-beatleader.ts"],"names":[],"mappings":";;;AACA,qCAIiB;AAEV,MAAM,sBAAsB,GAAG,KAAK,EAAQ,CAAmB,EAAE,EAAE;IACxE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,EAAE;SAClD,SAAS,CAAC,CAAC,CAAC;SACZ,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAC7B,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,oCAA2B,EAAE,CAAA;IACzC,CAAC;IACD,0BAA0B;IAC1B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAErE,MAAM,IAAI,GACR,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG;KAC/C,CAAC;QACF,CAAC,SAAS;YACR,CAAC,CAAC,GAAG;gBACH,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE;oBAC1C,EAAE,EAAE,SAAS,CAAC,WAAW;iBAC1B,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC,CAAA;IAET,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE/B,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5C,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,MAAM;YACV,CAAC,CAAC,IAAI,oCAA2B,EAAE;YACnC,CAAC,CAAC,IAAI,qCAA4B,EAAE,CAAA;IACxC,CAAC;IAED,mDAAmD;IACnD,wBAAwB;IACxB,sBAAsB;IACtB,MAAM,OAAO,GAA2B;QACtC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACnB,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;QACtC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;QAC/B,iBAAiB,EAAE,EAAE;QACrB,cAAc,EAAE,GAAG;QACnB,aAAa,EAAE,GAAG;QAClB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;KACb,CAAA;IACD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAA;IAC3B,CAAC;IACD,MAAM,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;QACtB,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE;KACnB,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AAvDY,QAAA,sBAAsB,0BAuDlC"}
+{"version":3,"file":"bind-id-beatleader.js","sourceRoot":"","sources":["../../../src/cmd/bind/bind-id-beatleader.ts"],"names":[],"mappings":";;;AACA,qCAIiB;AAEV,MAAM,sBAAsB,GAAG,KAAK,EAAQ,CAAmB,EAAE,EAAE;IACxE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAChE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,oCAA2B,EAAE,CAAA;IACzC,CAAC;IACD,0BAA0B;IAC1B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAErE,MAAM,IAAI,GACR,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,GAAG;KACrC,CAAC;QACF,CAAC,SAAS;YACR,CAAC,CAAC,GAAG;gBACH,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE;oBAC1C,EAAE,EAAE,SAAS,CAAC,WAAW;iBAC1B,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC,CAAA;IAET,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE/B,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5C,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,MAAM;YACV,CAAC,CAAC,IAAI,oCAA2B,EAAE;YACnC,CAAC,CAAC,IAAI,qCAA4B,EAAE,CAAA;IACxC,CAAC;IAED,mDAAmD;IACnD,wBAAwB;IACxB,sBAAsB;IACtB,MAAM,OAAO,GAA2B;QACtC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACnB,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE;QACjC,aAAa,EAAE,MAAM,CAAC,IAAI;QAC1B,iBAAiB,EAAE,EAAE;QACrB,cAAc,EAAE,GAAG;QACnB,aAAa,EAAE,GAAG;QAClB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;KACb,CAAA;IACD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAA;IAC3B,CAAC;IACD,MAAM,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,EAAE,EAAE,MAAM,CAAC,EAAE;KACd,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AArDY,QAAA,sBAAsB,0BAqDlC"}

package/lib/cmd/bind/bind-id-beatsaver.js

@@ -3,17 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBeatSaverIDBind = void 0;
 const errors_1 = require("../../errors");
 const handleBeatSaverIDBind = async (c) => {
-    const mapper = await c.api.BeatSaver.wrapperResult()
-        .withRetry(3)
-        .getBSMapperById(c.input);
-    if (!mapper.isSuccess()) {
+    const mapper = await c.api.BeatSaver.getBSMapperById(c.input);
+    if (!mapper) {
         throw new errors_1.AccountBindingNotFoundError();
     }
     // 如果当前bind 是 oauth？改为 id？
     const now = new Date();
     const { bsAccount } = await c.db.getUserAccountsByUid(c.session.u.id);
     const text = c.session.text('commands.bsbot.bind.ack-prompt', {
-        user: `${mapper.data.name}(${mapper.data.id})`,
+        user: `${mapper.name}(${mapper.id})`,
     }) +
         (bsAccount
             ? ',' +
@@ -34,8 +32,8 @@ const handleBeatSaverIDBind = async (c) => {
     const account = {
         uid: c.session.u.id,
         platform: 'beatsaver',
-        platformUid: mapper.data.id.toString(),
-        platformUname: mapper.data.name,
+        platformUid: mapper.id.toString(),
+        platformUname: mapper.name,
         otherPlatformInfo: {},
         lastModifiedAt: now,
         lastRefreshAt: now,
@@ -47,8 +45,8 @@ const handleBeatSaverIDBind = async (c) => {
     }
     await c.db.addUserBindingInfo(account);
     c.session.sendQuote(c.session.text('commands.bsbot.bind.bs.success', {
-        name: mapper.data.name,
-        id: mapper.data.id,
+        name: mapper.name,
+        id: mapper.id,
     }));
 };
 exports.handleBeatSaverIDBind = handleBeatSaverIDBind;

package/lib/cmd/bind/bind-id-beatsaver.js.map

@@ -1 +1 @@
-{"version":3,"file":"bind-id-beatsaver.js","sourceRoot":"","sources":["../../../src/cmd/bind/bind-id-beatsaver.ts"],"names":[],"mappings":";;;AAEA,qCAIiB;AAEV,MAAM,qBAAqB,GAAG,KAAK,EAAQ,CAAmB,EAAE,EAAE;IACvE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE;SACjD,SAAS,CAAC,CAAC,CAAC;SACZ,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,oCAA2B,EAAE,CAAA;IACzC,CAAC;IACD,0BAA0B;IAC1B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAErE,MAAM,IAAI,GACR,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG;KAC/C,CAAC;QACF,CAAC,SAAS;YACR,CAAC,CAAC,GAAG;gBACH,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE;oBAC1C,EAAE,EAAE,SAAS,CAAC,WAAW;iBAC1B,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC,CAAA;IAET,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE/B,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5C,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,MAAM;YACV,CAAC,CAAC,IAAI,oCAA2B,EAAE;YACnC,CAAC,CAAC,IAAI,qCAA4B,EAAE,CAAA;IACxC,CAAC;IAED,mDAAmD;IACnD,wBAAwB;IACxB,sBAAsB;IACtB,MAAM,OAAO,GAA2B;QACtC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACnB,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;QACtC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;QAC/B,iBAAiB,EAAE,EAAE;QACrB,cAAc,EAAE,GAAG;QACnB,aAAa,EAAE,GAAG;QAClB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;KACb,CAAA;IACD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAA;IAC3B,CAAC;IACD,MAAM,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;QACtB,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE;KACnB,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AAvDY,QAAA,qBAAqB,yBAuDjC"}
+{"version":3,"file":"bind-id-beatsaver.js","sourceRoot":"","sources":["../../../src/cmd/bind/bind-id-beatsaver.ts"],"names":[],"mappings":";;;AAEA,qCAIiB;AAEV,MAAM,qBAAqB,GAAG,KAAK,EAAQ,CAAmB,EAAE,EAAE;IACvE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAC7D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,oCAA2B,EAAE,CAAA;IACzC,CAAC;IACD,0BAA0B;IAC1B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAErE,MAAM,IAAI,GACR,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,GAAG;KACrC,CAAC;QACF,CAAC,SAAS;YACR,CAAC,CAAC,GAAG;gBACH,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE;oBAC1C,EAAE,EAAE,SAAS,CAAC,WAAW;iBAC1B,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC,CAAA;IAET,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE/B,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5C,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,MAAM;YACV,CAAC,CAAC,IAAI,oCAA2B,EAAE;YACnC,CAAC,CAAC,IAAI,qCAA4B,EAAE,CAAA;IACxC,CAAC;IAED,mDAAmD;IACnD,wBAAwB;IACxB,sBAAsB;IACtB,MAAM,OAAO,GAA2B;QACtC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACnB,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE;QACjC,aAAa,EAAE,MAAM,CAAC,IAAI;QAC1B,iBAAiB,EAAE,EAAE;QACrB,cAAc,EAAE,GAAG;QACnB,aAAa,EAAE,GAAG;QAClB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;KACb,CAAA;IACD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAA;IAC3B,CAAC;IACD,MAAM,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,EAAE,EAAE,MAAM,CAAC,EAAE;KACd,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AArDY,QAAA,qBAAqB,yBAqDjC"}

package/lib/cmd/bind/bind-scoresaber.js

@@ -3,15 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleScoreSaberBind = void 0;
 const errors_1 = require("../../errors");
 const handleScoreSaberBind = async (c) => {
-    const scoreSaberUser = await c.api.ScoreSaber.wrapperResult()
-        .withRetry(3)
-        .getScoreUserById(c.input);
-    if (!scoreSaberUser.isSuccess()) {
+    const scoreSaberUser = await c.api.ScoreSaber.getScoreUserById(c.input);
+    if (!scoreSaberUser) {
         throw new errors_1.ScoreSaberIDNotFoundError(c.input);
     }
     const { ssAccount, blAccount } = await c.db.getUserAccountsByUid(c.session.u.id);
     const text = c.session.text('commands.bsbot.bind.ack-prompt', {
-        user: `${scoreSaberUser.data.name}(${scoreSaberUser.data.id})`,
+        user: `${scoreSaberUser.name}(${scoreSaberUser.id})`,
     }) +
         (ssAccount
             ? ',' +
@@ -30,10 +28,10 @@ const handleScoreSaberBind = async (c) => {
     const account = {
         uid: c.session.u.id,
         platform: 'scoresaber',
-        platformUid: scoreSaberUser.data.id,
+        platformUid: scoreSaberUser.id,
         lastModifiedAt: now,
         lastRefreshAt: now,
-        platformUname: scoreSaberUser.data.name,
+        platformUname: scoreSaberUser.name,
         type: 'id',
         status: 'ok',
     };
@@ -54,7 +52,7 @@ const handleScoreSaberBind = async (c) => {
     }
     await c.db.addUserBindingInfo(account);
     c.session.sendQuote(c.session.text('commands.bsbot.bind.success', {
-        user: `${scoreSaberUser.data.name}(${scoreSaberUser.data.id})`,
+        user: `${scoreSaberUser.name}(${scoreSaberUser.id})`,
     }));
 };
 exports.handleScoreSaberBind = handleScoreSaberBind;

package/lib/cmd/bind/bind-scoresaber.js.map

@@ -1 +1 @@
-{"version":3,"file":"bind-scoresaber.js","sourceRoot":"","sources":["../../../src/cmd/bind/bind-scoresaber.ts"],"names":[],"mappings":";;;AACA,qCAIiB;AAEV,MAAM,oBAAoB,GAAG,KAAK,EAAQ,CAAmB,EAAE,EAAE;IACtE,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,EAAE;SAC1D,SAAS,CAAC,CAAC,CAAC;SACZ,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAE5B,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,kCAAyB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAC9D,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACf,CAAA;IACD,MAAM,IAAI,GACR,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,GAAG;KAC/D,CAAC;QACF,CAAC,SAAS;YACR,CAAC,CAAC,GAAG;gBACH,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE;oBAC1C,EAAE,EAAE,SAAS,CAAC,WAAW;iBAC1B,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC,CAAA;IAET,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE/B,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5C,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,MAAM;YACV,CAAC,CAAC,IAAI,oCAA2B,EAAE;YACnC,CAAC,CAAC,IAAI,qCAA4B,EAAE,CAAA;IACxC,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,OAAO,GAA2B;QACtC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACnB,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE;QACnC,cAAc,EAAE,GAAG;QACnB,aAAa,EAAE,GAAG;QAClB,aAAa,EAAE,cAAc,CAAC,IAAI,CAAC,IAAI;QACvC,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;KACb,CAAA;IACD,oBAAoB;IACpB,8CAA8C;IAC9C,2BAA2B;IAC3B,8BAA8B;IAC9B,2CAA2C;IAC3C,2BAA2B;IAC3B,0BAA0B;IAC1B,+CAA+C;IAC/C,kBAAkB;IAClB,MAAM;IACN,2CAA2C;IAC3C,IAAI;IACJ,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAA;IAC3B,CAAC;IACD,MAAM,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,6BAA6B,EAAE;QAC5C,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,GAAG;KAC/D,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AA/DY,QAAA,oBAAoB,wBA+DhC"}
+{"version":3,"file":"bind-scoresaber.js","sourceRoot":"","sources":["../../../src/cmd/bind/bind-scoresaber.ts"],"names":[],"mappings":";;;AACA,qCAIiB;AAEV,MAAM,oBAAoB,GAAG,KAAK,EAAQ,CAAmB,EAAE,EAAE;IACtE,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAEvE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAI,kCAAyB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAC9D,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACf,CAAA;IACD,MAAM,IAAI,GACR,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC/C,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,EAAE,GAAG;KACrD,CAAC;QACF,CAAC,SAAS;YACR,CAAC,CAAC,GAAG;gBACH,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE;oBAC1C,EAAE,EAAE,SAAS,CAAC,WAAW;iBAC1B,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC,CAAA;IAET,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE/B,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5C,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,MAAM;YACV,CAAC,CAAC,IAAI,oCAA2B,EAAE;YACnC,CAAC,CAAC,IAAI,qCAA4B,EAAE,CAAA;IACxC,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,OAAO,GAA2B;QACtC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACnB,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,cAAc,CAAC,EAAE;QAC9B,cAAc,EAAE,GAAG;QACnB,aAAa,EAAE,GAAG;QAClB,aAAa,EAAE,cAAc,CAAC,IAAI;QAClC,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;KACb,CAAA;IACD,oBAAoB;IACpB,8CAA8C;IAC9C,2BAA2B;IAC3B,8BAA8B;IAC9B,2CAA2C;IAC3C,2BAA2B;IAC3B,0BAA0B;IAC1B,+CAA+C;IAC/C,kBAAkB;IAClB,MAAM;IACN,2CAA2C;IAC3C,IAAI;IACJ,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAA;IAC3B,CAAC;IACD,MAAM,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,6BAA6B,EAAE;QAC5C,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,EAAE,GAAG;KACrD,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AA7DY,QAAA,oBAAoB,wBA6DhC"}

package/lib/cmd/bsmap/id-search.js

@@ -18,8 +18,8 @@ exports.default = () => new builder_1.CommandBuilder()
     if (!mapIdReg.test(c.input)) {
         throw new errors_1.InvalidMapIdError({ input: c.input });
     }
-    const res = await c.api.BeatSaver.wrapperResult().searchMapById(c.input);
-    if (!res.isSuccess() || res.data.success === false) {
+    const res = await c.api.BeatSaver.searchMapById(c.input);
+    if (!res) {
         throw new errors_1.MapIdNotFoundError({ input: c.input });
     }
     const onStartRender = () => {
@@ -27,9 +27,9 @@ exports.default = () => new builder_1.CommandBuilder()
             sec: c.config.rankWaitTimeout / 1000,
         }));
     };
-    const image = await c.render.renderMap(res.data, c.userPreference, onStartRender);
+    const image = await c.render.renderMap(res, c.userPreference, onStartRender);
     // upload to s3?
     await c.session.sendImgBuffer(image);
-    await c.session.sendAudioByUrl(res.data.versions[0].previewURL);
+    await c.session.sendAudioByUrl(res.versions[0].previewURL);
 });
 //# sourceMappingURL=id-search.js.map

package/lib/cmd/bsmap/id-search.js.map

@@ -1 +1 @@
-{"version":3,"file":"id-search.js","sourceRoot":"","sources":["../../../src/cmd/bsmap/id-search.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAC9C,qCAAgE;AAEhE,MAAM,QAAQ,GAAG,oBAAoB,CAAA;AACrC,kBAAe,GAAG,EAAE,CAClB,IAAI,wBAAc,EAAE;KACjB,OAAO,CAAC,IAAI,CAAC,CAAC,iBAAiB;KAC/B,QAAQ,CAAC,KAAK,CAAC;KACf,QAAQ,CAAC,MAAM,CAAC;KAChB,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,MAAM,CAAC;IACjB,sDAAsD;KACrD,cAAc,CAAC,mCAAmC,CAAC;KACnD,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;IACvB,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;QAChD,OAAM;IACR,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,0BAAiB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IACjD,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAExE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QACnD,MAAM,IAAI,2BAAkB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,CAAC,CAAC,OAAO,CAAC,IAAI,CACZ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE;YACnC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe,GAAG,IAAI;SACrC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CACpC,GAAG,CAAC,IAAI,EACR,CAAC,CAAC,cAAc,EAChB,aAAa,CACd,CAAA;IACD,gBAAgB;IAChB,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IACpC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;AACjE,CAAC,CAAC,CAAA"}
+{"version":3,"file":"id-search.js","sourceRoot":"","sources":["../../../src/cmd/bsmap/id-search.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAC9C,qCAAgE;AAEhE,MAAM,QAAQ,GAAG,oBAAoB,CAAA;AAErC,kBAAe,GAAG,EAAE,CAClB,IAAI,wBAAc,EAAE;KACjB,OAAO,CAAC,IAAI,CAAC,CAAC,iBAAiB;KAC/B,QAAQ,CAAC,KAAK,CAAC;KACf,QAAQ,CAAC,MAAM,CAAC;KAChB,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,MAAM,CAAC;IACjB,sDAAsD;KACrD,cAAc,CAAC,mCAAmC,CAAC;KACnD,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;IACvB,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;QAChD,OAAM;IACR,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,0BAAiB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IACjD,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAExD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,2BAAkB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,CAAC,CAAC,OAAO,CAAC,IAAI,CACZ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE;YACnC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe,GAAG,IAAI;SACrC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CACpC,GAAG,EACH,CAAC,CAAC,cAAc,EAChB,aAAa,CACd,CAAA;IACD,gBAAgB;IAChB,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IACpC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;AAC5D,CAAC,CAAC,CAAA"}

package/lib/cmd/bsmap/key-search.js

@@ -13,9 +13,9 @@ exports.default = () => new builder_1.CommandBuilder()
         key = key.slice(0, 15);
         c.session.sendQuote(c.session.text('commands.bsbot.search.too-long-key', { key }));
     }
-    const res = await c.api.BeatSaver.wrapperResult().searchMapByKeyword(key);
-    if (!res.isSuccess()) {
-        c.session.sendQuote(c.session.text('commands.bsbot.search.not-found', { key }));
+    const res = await c.api.BeatSaver.searchMapByKeyword(key);
+    if (res && res.length == 0) {
+        await c.session.sendQuote(c.session.text('commands.bsbot.search.not-found', { key }));
         return;
     }
     const onStartRender = () => {
@@ -23,7 +23,7 @@ exports.default = () => new builder_1.CommandBuilder()
             sec: c.config.rankWaitTimeout / 1000,
         }));
     };
-    const toBeSend = res.data.slice(0, 3).map((it) => ({
+    const toBeSend = res.slice(0, 3).map((it) => ({
         img: c.render.renderMap(it, c.userPreference, onStartRender),
         bsmap: it,
     }));

package/lib/cmd/bsmap/key-search.js.map

@@ -1 +1 @@
-{"version":3,"file":"key-search.js","sourceRoot":"","sources":["../../../src/cmd/bsmap/key-search.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAgB9C,kBAAe,GAAG,EAAE,CAClB,IAAI,wBAAc,EAAE;KACjB,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa;KAC/B,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,UAAU,CAAC;KACpB,QAAQ,CAAC,OAAO,CAAC;KACjB,cAAc,CAAC,mCAAmC,CAAC;KACnD,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;IACvB,IAAI,GAAG,GAAG,CAAC,CAAC,KAAK,CAAA;IACjB,IAAI,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QACpB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QACtB,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,oCAAoC,EAAE,EAAE,GAAG,EAAE,CAAC,CAC9D,CAAA;IACH,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAA;IACzE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC;QACrB,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAE,GAAG,EAAE,CAAC,CAC3D,CAAA;QACD,OAAM;IACR,CAAC;IACD,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,CAAC,CAAC,OAAO,CAAC,IAAI,CACZ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE;YACnC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe,GAAG,IAAI;SACrC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;IACD,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACjD,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC;QAC5D,KAAK,EAAE,EAAE;KACV,CAAC,CAAC,CAAA;IACH,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,+BAA+B,EAAE;QAC3D,GAAG,EAAE,GAAG;QACR,MAAM,EAAE,QAAQ,CAAC,MAAM;KACxB,CAAC,CAAA;IACF,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE/B,4BAA4B;IAC5B,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAA;QAC7C,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IACnE,CAAC;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"key-search.js","sourceRoot":"","sources":["../../../src/cmd/bsmap/key-search.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAgB9C,kBAAe,GAAG,EAAE,CAClB,IAAI,wBAAc,EAAE;KACjB,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa;KAC/B,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,UAAU,CAAC;KACpB,QAAQ,CAAC,OAAO,CAAC;KACjB,cAAc,CAAC,mCAAmC,CAAC;KACnD,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;IACvB,IAAI,GAAG,GAAG,CAAC,CAAC,KAAK,CAAA;IACjB,IAAI,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QACpB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QACtB,CAAC,CAAC,OAAO,CAAC,SAAS,CACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,oCAAoC,EAAE,EAAE,GAAG,EAAE,CAAC,CAC9D,CAAA;IACH,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAA;IACzD,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QAC3B,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CACvB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAE,GAAG,EAAE,CAAC,CAC3D,CAAA;QACD,OAAM;IACR,CAAC;IACD,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,CAAC,CAAC,OAAO,CAAC,IAAI,CACZ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE;YACnC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe,GAAG,IAAI;SACrC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;IACD,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5C,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC;QAC5D,KAAK,EAAE,EAAE;KACV,CAAC,CAAC,CAAA;IACH,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,+BAA+B,EAAE;QAC3D,GAAG,EAAE,GAAG;QACR,MAAM,EAAE,QAAQ,CAAC,MAAM;KACxB,CAAC,CAAA;IACF,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAE/B,4BAA4B;IAC5B,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAA;QAC7C,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IACnE,CAAC;AACH,CAAC,CAAC,CAAA"}

package/lib/cmd/bsmap/latest.js

@@ -15,24 +15,10 @@ exports.default = () => new builder_1.CommandBuilder()
     .addAlias('/bsnew')
     .setDescription('clear an auth account relate info')
     .setExecutor(async (c) => {
-    const res = await c.api.BeatSaver.wrapperResult()
-        .withRetry(3)
-        .getLatestMaps(3);
-    if (!res.isSuccess()) {
-        c.logger.info(`fetch new failed, msg: ${res.msg}`);
-        c.session.sendQueued(c.session.text('commands.bsbot.latest.unknown-error'));
-        return;
-    }
+    const res = await c.api.BeatSaver.getLatestMaps(3);
     const text = c.session.text('commands.bsbot.latest.info');
-    // const onStartRender = () => {
-    //   c.session.send(
-    //     c.session.text('common.render.wait', {
-    //       sec: c.config.rankWaitTimeout / 1000,
-    //     })
-    //   )
-    // }
     await c.session.sendQuote(text);
-    const msgs = res.data.map((item) => ({
+    const msgs = res.map((item) => ({
         audio: item.versions[0].previewURL,
         image: c.render.renderMap(item, c.userPreference),
     }));

package/lib/cmd/bsmap/latest.js.map

@@ -1 +1 @@
-{"version":3,"file":"latest.js","sourceRoot":"","sources":["../../../src/cmd/bsmap/latest.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAE9C,kBAAe,GAAG,EAAE,CAClB,IAAI,wBAAc,EAAE;KACjB,OAAO,CAAC,QAAQ,CAAC;KACjB,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,UAAU,CAAC;KACpB,QAAQ,CAAC,UAAU,CAAC;KACpB,QAAQ,CAAC,UAAU,CAAC;KACpB,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,QAAQ,CAAC;KAClB,QAAQ,CAAC,QAAQ,CAAC;KAClB,QAAQ,CAAC,QAAQ,CAAC;KAClB,cAAc,CAAC,mCAAmC,CAAC;KACnD,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;IACvB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE;SAC9C,SAAS,CAAC,CAAC,CAAC;SACZ,aAAa,CAAC,CAAC,CAAC,CAAA;IAEnB,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC;QACrB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA;QAClD,CAAC,CAAC,OAAO,CAAC,UAAU,CAClB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CACtD,CAAA;QACD,OAAM;IACR,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;IACzD,gCAAgC;IAChC,oBAAoB;IACpB,6CAA6C;IAC7C,8CAA8C;IAC9C,SAAS;IACT,MAAM;IACN,IAAI;IACJ,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC/B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU;QAClC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,CAAC;KAClD,CAAC,CAAC,CAAA;IACH,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAA;QAC9C,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC3C,CAAC;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"latest.js","sourceRoot":"","sources":["../../../src/cmd/bsmap/latest.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAE9C,kBAAe,GAAG,EAAE,CAClB,IAAI,wBAAc,EAAE;KACjB,OAAO,CAAC,QAAQ,CAAC;KACjB,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,UAAU,CAAC;KACpB,QAAQ,CAAC,UAAU,CAAC;KACpB,QAAQ,CAAC,UAAU,CAAC;KACpB,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,OAAO,CAAC;KACjB,QAAQ,CAAC,QAAQ,CAAC;KAClB,QAAQ,CAAC,QAAQ,CAAC;KAClB,QAAQ,CAAC,QAAQ,CAAC;KAClB,cAAc,CAAC,mCAAmC,CAAC;KACnD,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;IACvB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IAClD,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;IACzD,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC/B,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9B,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU;QAClC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,CAAC;KAClD,CAAC,CAAC,CAAA;IACH,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAA;QAC9C,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC3C,CAAC;AACH,CAAC,CAAC,CAAA"}

package/lib/img-render/index.js

@@ -74,19 +74,14 @@ class RenderService {
     _renderScore = async (scoreId, platform, api, renderOpts) => {
         const bg = (await renderOpts.userPreference.get(utils_1.preferenceKey.blScoreImg.key)) ?? 'https://www.loliapi.com/acg/pc/';
         try {
-            const { score, statistic, bsor, bsMap } = await api.BeatLeader.withRetry(3)
-                .onRetry((times, e) => {
-                console.log(` fetch beatleader score ${scoreId} failed: retrying ${times} due to ${e}`);
-            })
-                .getScoreAndBSMapByScoreId(scoreId)
-                .catch((e) => {
-                console.error(e);
-                throw new errors_1.ImageRenderError();
-            });
-            const { aroundScores, regionTopScores, difficulties } = await api.BeatLeader.withRetry(3).getAroundScoreAndRegionScoreByRankAndPage(score.leaderboardId, score.rank, score.player.country);
+            const { score, statistic, bsor, bsMap } = await api.BeatLeader.getScoreAndBSMapByScoreId(scoreId);
+            const { aroundScores, regionTopScores, difficulties } = await api.BeatLeader.getAroundScoreAndRegionScoreByRankAndPage(score.leaderboardId, score.rank, score.player.country);
             return this.htmlToImgBufferConverter((0, render_1.getHtml)((0, result_1.getBLRankScoreComp)(score, aroundScores, regionTopScores, difficulties, bsMap, statistic, bsor, bg)), renderOpts.onRenderStart, renderOpts.onRenderError);
         }
         catch (e) {
+            if (e instanceof errors_1.RequestError) {
+                throw e;
+            }
             throw new errors_1.ImageRenderError();
         }
     };

package/lib/img-render/index.js.map

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

package/lib/schedules/oauthTokenRefreshTask.js

@@ -14,8 +14,8 @@ const tokenRefreshTask = async (c) => {
         c.logger.info(`try to refresh ${account.platform} ${account.platformUid}'s token`);
         const now = new Date();
         if (account.platform === 'beatleader') {
-            const token = await c.api.BeatLeader.wrapperResult().refreshOAuthToken(account.refreshToken);
-            if (!token.isSuccess()) {
+            const token = await c.api.BeatLeader.refreshOAuthToken(account.refreshToken);
+            if (!token) {
                 c.logger.info(`failed to refresh ${account.platform} token, invalid this account, ${JSON.stringify(account)}`);
                 account.valid = 'invalid';
                 account.lastModifiedAt = now;
@@ -24,12 +24,12 @@ const tokenRefreshTask = async (c) => {
                 // bot.sendMessage(item.sub.channelId, '似乎 BeatSaver 通知的 token 已经失效了，通过 bbbind 重新绑定吧')
                 continue;
             }
-            account.accessToken = token.data.access_token;
-            account.refreshToken = token.data.refresh_token;
+            account.accessToken = token.access_token;
+            account.refreshToken = token.refresh_token;
         }
         else if (account.platform === 'beatsaver') {
-            const token = await c.api.BeatSaver.wrapperResult().refreshOAuthToken(account.refreshToken);
-            if (!token.isSuccess()) {
+            const token = await c.api.BeatSaver.refreshOAuthToken(account.refreshToken);
+            if (!token) {
                 c.logger.info(`failed to refresh ${account.platform} token, invalid this account, ${JSON.stringify(account)}`);
                 account.valid = 'invalid';
                 account.lastModifiedAt = now;
@@ -38,8 +38,8 @@ const tokenRefreshTask = async (c) => {
                 // bot.sendMessage(item.sub.channelId, '似乎 BeatSaver 通知的 token 已经失效了，通过 bbbind 重新绑定吧')
                 continue;
             }
-            account.accessToken = token.data.access_token;
-            account.refreshToken = token.data.refresh_token;
+            account.accessToken = token.access_token;
+            account.refreshToken = token.refresh_token;
         }
         account.lastRefreshAt = now;
         account.lastModifiedAt = now;

package/lib/schedules/oauthTokenRefreshTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauthTokenRefreshTask.js","sourceRoot":"","sources":["../../src/schedules/oauthTokenRefreshTask.ts"],"names":[],"mappings":";;;AAEO,MAAM,gBAAgB,GAAG,KAAK,EAAK,CAAqB,EAAE,EAAE;IACjE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;IACzC,mBAAmB;IACnB,MAAM,QAAQ,GAAG,EAAE,CAAA;IACnB,yCAAyC;IACzC,oEAAoE;IACpE,oBAAoB;IACpB,mBAAmB;IACnB,KAAK;IACL,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,CAAC,CAAC,MAAM,CAAC,IAAI,CACX,kBAAkB,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,UAAU,CACpE,CAAA;QACD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QACtB,IAAI,OAAO,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,iBAAiB,CACpE,OAAO,CAAC,YAAY,CACrB,CAAA;YACD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;gBACvB,CAAC,CAAC,MAAM,CAAC,IAAI,CACX,qBAAqB,OAAO,CAAC,QAAQ,iCAAiC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAChG,CAAA;gBACD,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;gBACzB,OAAO,CAAC,cAAc,GAAG,GAAG,CAAA;gBAC5B,+DAA+D;gBAC/D,sCAAsC;gBACtC,sFAAsF;gBACtF,SAAQ;YACV,CAAC;YACD,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAA;YAC7C,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAA;QACjD,CAAC;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,iBAAiB,CACnE,OAAO,CAAC,YAAY,CACrB,CAAA;YACD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;gBACvB,CAAC,CAAC,MAAM,CAAC,IAAI,CACX,qBAAqB,OAAO,CAAC,QAAQ,iCAAiC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAChG,CAAA;gBACD,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;gBACzB,OAAO,CAAC,cAAc,GAAG,GAAG,CAAA;gBAC5B,+DAA+D;gBAC/D,sCAAsC;gBACtC,sFAAsF;gBACtF,SAAQ;YACV,CAAC;YACD,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAA;YAC7C,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAA;QACjD,CAAC;QACD,OAAO,CAAC,aAAa,GAAG,GAAG,CAAA;QAC3B,OAAO,CAAC,cAAc,GAAG,GAAG,CAAA;QAC5B,EAAE;QACF,+DAA+D;QAC/D,CAAC,CAAC,MAAM,CAAC,IAAI,CACX,WAAW,OAAO,CAAC,QAAQ,uBAAuB,OAAO,CAAC,WAAW,EAAE,CACxE,CAAA;IACH,CAAC;IACD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAA;AAC9C,CAAC,CAAA;AA1DY,QAAA,gBAAgB,oBA0D5B"}
+{"version":3,"file":"oauthTokenRefreshTask.js","sourceRoot":"","sources":["../../src/schedules/oauthTokenRefreshTask.ts"],"names":[],"mappings":";;;AAEO,MAAM,gBAAgB,GAAG,KAAK,EAAK,CAAqB,EAAE,EAAE;IACjE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;IACzC,mBAAmB;IACnB,MAAM,QAAQ,GAAG,EAAE,CAAA;IACnB,yCAAyC;IACzC,oEAAoE;IACpE,oBAAoB;IACpB,mBAAmB;IACnB,KAAK;IACL,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,CAAC,CAAC,MAAM,CAAC,IAAI,CACX,kBAAkB,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,UAAU,CACpE,CAAA;QACD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QACtB,IAAI,OAAO,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,iBAAiB,CACpD,OAAO,CAAC,YAAY,CACrB,CAAA;YACD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,CAAC,CAAC,MAAM,CAAC,IAAI,CACX,qBAAqB,OAAO,CAAC,QAAQ,iCAAiC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAChG,CAAA;gBACD,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;gBACzB,OAAO,CAAC,cAAc,GAAG,GAAG,CAAA;gBAC5B,+DAA+D;gBAC/D,sCAAsC;gBACtC,sFAAsF;gBACtF,SAAQ;YACV,CAAC;YACD,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,YAAY,CAAA;YACxC,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,aAAa,CAAA;QAC5C,CAAC;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CACnD,OAAO,CAAC,YAAY,CACrB,CAAA;YACD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,CAAC,CAAC,MAAM,CAAC,IAAI,CACX,qBAAqB,OAAO,CAAC,QAAQ,iCAAiC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAChG,CAAA;gBACD,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;gBACzB,OAAO,CAAC,cAAc,GAAG,GAAG,CAAA;gBAC5B,+DAA+D;gBAC/D,sCAAsC;gBACtC,sFAAsF;gBACtF,SAAQ;YACV,CAAC;YACD,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,YAAY,CAAA;YACxC,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,aAAa,CAAA;QAC5C,CAAC;QACD,OAAO,CAAC,aAAa,GAAG,GAAG,CAAA;QAC3B,OAAO,CAAC,cAAc,GAAG,GAAG,CAAA;QAC5B,EAAE;QACF,+DAA+D;QAC/D,CAAC,CAAC,MAAM,CAAC,IAAI,CACX,WAAW,OAAO,CAAC,QAAQ,uBAAuB,OAAO,CAAC,WAAW,EAAE,CACxE,CAAA;IACH,CAAC;IACD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAA;AAC9C,CAAC,CAAA;AA1DY,QAAA,gBAAgB,oBA0D5B"}

package/lib/utils/cache.d.ts

@@ -1,3 +1,3 @@
 import { LRUCache } from 'lru-cache';
 export declare const cache: LRUCache<any, any, unknown>;
-export declare const createCache: (opt: any) => LRUCache<{}, {}, unknown>;
+export declare const createCache: <K extends {}, V extends {}, FC = unknown>(opt: any) => LRUCache<K, V, FC>;

package/lib/utils/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/utils/cache.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AAEpC,MAAM,OAAO,GAAG;IACd,GAAG,EAAE,GAAG;IAER,6CAA6C;IAC7C,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAElC,2DAA2D;IAC3D,6BAA6B;IAC7B,+BAA+B;IAE/B,yBAAyB;IACzB,GAAG,EAAE,IAAI,GAAG,EAAE,GAAG,CAAC;IAElB,iDAAiD;IAEjD,UAAU,EAAE,KAAK;IAEjB,cAAc,EAAE,IAAI;IACpB,cAAc,EAAE,IAAI;IAEpB,gDAAgD;IAChD,6CAA6C;IAC7C,uBAAuB;IACvB,SAAS;IACT,gBAAgB;IAChB,iCAAiC;IACjC,WAAW;CACZ,CAAA;AAEY,QAAA,KAAK,GAAG,IAAI,oBAAQ,CAAC,OAAO,CAAC,CAAA;AAEnC,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,oBAAQ,CAAC,GAAG,CAAC,CAAA;AAAxC,QAAA,WAAW,eAA6B"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/utils/cache.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AAEpC,MAAM,OAAO,GAAG;IACd,GAAG,EAAE,GAAG;IAER,6CAA6C;IAC7C,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAElC,2DAA2D;IAC3D,6BAA6B;IAC7B,+BAA+B;IAE/B,yBAAyB;IACzB,GAAG,EAAE,IAAI,GAAG,EAAE,GAAG,CAAC;IAElB,iDAAiD;IAEjD,UAAU,EAAE,KAAK;IAEjB,cAAc,EAAE,IAAI;IACpB,cAAc,EAAE,IAAI;IAEpB,gDAAgD;IAChD,6CAA6C;IAC7C,uBAAuB;IACvB,SAAS;IACT,gBAAgB;IAChB,iCAAiC;IACjC,WAAW;CACZ,CAAA;AAEY,QAAA,KAAK,GAAG,IAAI,oBAAQ,CAAC,OAAO,CAAC,CAAA;AAEnC,MAAM,WAAW,GAAG,CAA2C,GAAG,EAAE,EAAE,CAC3E,IAAI,oBAAQ,CAAW,GAAG,CAAC,CAAA;AADhB,QAAA,WAAW,eACK"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "beatsaber-bot-core",
   "description": "一个用于新版 Steam 家庭的库存监控 Bot 插件",
-  "version": "0.2.0-dev.30",
+  "version": "0.2.0-dev.32",
   "types": "lib/index.d.ts",
   "files": [
     "lib"