beatsaber-bot-core 0.2.0-dev.3 → 0.2.0-dev.31

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.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

package/lib/api/helper.js.map

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

package/lib/api/index.d.ts

@@ -3,29 +3,12 @@ import { BeatLeaderService } from './composed/beatleader';
 import { BeatSaverService } from './composed/beatsaver';
 import { ScoreSaberService } from './composed/scoresaber';
 import { AIOSaberService } from './composed/aiosaber';
-import { NetReqResult } from './netResult';
-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>;
-};
+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;
 }
-type Res<Base, T> = Base extends true ? NetReqResult<T> : T;
-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 {};

package/lib/api/index.js

@@ -2,133 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.APIService = void 0;
 const beatleader_1 = require("./composed/beatleader");
-const base_1 = require("./base");
 const beatsaver_1 = require("./composed/beatsaver");
 const scoresaber_1 = require("./composed/scoresaber");
 const aiosaber_1 = require("./composed/aiosaber");
-const netResult_1 = require("./netResult");
-const utils_1 = require("../utils");
-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;
-        },
-    });
-}
+const base_1 = require("../api/base");
 class APIService {
     BeatLeader;
     ScoreSaber;
     BeatSaver;
     AIOSaber;
-    constructor(cfg) {
-        const bsClient = (0, base_1.bsRequest)(cfg);
-        const blClient = (0, base_1.blRequest)(cfg);
-        const scClient = (0, base_1.scRequest)(cfg);
-        const aioClient = (0, base_1.aioRequest)(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) {
-        const ins = new APIService(cfg);
-        const proxied = new Proxy(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;
+    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;
-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) {
-                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 Error('retry times reached', e);
-            }
-        }
-        if (result) {
-            return (wrap ? netResult_1.NetReqResult.success(result) : result);
-        }
-        if (wrap) {
-            return netResult_1.NetReqResult.failed('unknown error');
-        }
-        throw Error('unknown error');
-    }
-    wrapperResult() {
-        this._wrapper = true;
-        return this;
-    }
-}
 //# sourceMappingURL=index.js.map

package/lib/api/index.js.map

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

@@ -53,6 +53,8 @@ export interface BSMap {
             seconds: number;
             maxScore: number;
             paritySummary: any;
+            star?: number;
+            blStar?: number;
             [key: string]: any;
         }[];
     }[];

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/api/interfaces/beatsaver/ws.d.ts

@@ -1,5 +1,11 @@
 import { BSMap } from './bsmap';
-export interface BeatSaverWSEvent {
-    type: 'MAP_UPDATE' | 'MAP_DELETE';
+interface DeleteEvent {
+    type: 'MAP_DELETE';
+    msg: string;
+}
+interface UpdateEvent {
+    type: 'MAP_UPDATE';
     msg: BSMap;
 }
+export type BeatSaverWSEvent = DeleteEvent | UpdateEvent;
+export {};

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

@@ -0,0 +1,12 @@
+export interface OAuthTokenResponse {
+    access_token: string;
+    token_type: string;
+    expires_in: number;
+    refresh_token: string;
+    scope?: string;
+}
+export interface OAuthTokenInfoResponse {
+    scope?: string[];
+    id: string;
+    name: string;
+}

package/lib/{interface/db.js → api/interfaces/index.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=db.js.map
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/interfaces/index.ts"],"names":[],"mappings":""}

package/lib/api/interfaces/scoresaber/item.d.ts

@@ -1,11 +1,11 @@
 export interface ScoreSaberItem {
-    score: BeatScore;
+    score: SSScore;
     leaderboard: LeaderBoard;
     mapId?: string;
 }
-interface BeatScore {
+export interface SSScore {
     id: number;
-    leaderboardPlayerInfo: any;
+    leaderboardPlayerInfo: LeaderboardPlayerInfo;
     rank: number;
     baseScore: number;
     modifiedScore: number;
@@ -24,6 +24,15 @@ interface BeatScore {
     deviceControllerLeft: string;
     deviceControllerRight: string;
 }
+export interface LeaderboardPlayerInfo {
+    id: string;
+    name: string;
+    profilePicture: string;
+    country: string;
+    permissions: number;
+    badges?: string;
+    role?: string;
+}
 interface LeaderBoard {
     id: number;
     songHash: string;

package/lib/api/interfaces/scoresaber/leaderboard.d.ts

@@ -0,0 +1,10 @@
+import { SSScore } from '../../../api/interfaces/scoresaber/item';
+export interface ScoresaberLeaderboardResp {
+    scores: SSScore[];
+    metadata: Metadata;
+}
+export interface Metadata {
+    total: number;
+    page: number;
+    itemsPerPage: number;
+}

package/lib/api/interfaces/scoresaber/leaderboard.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=leaderboard.js.map

package/lib/api/interfaces/scoresaber/leaderboard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"leaderboard.js","sourceRoot":"","sources":["../../../../src/api/interfaces/scoresaber/leaderboard.ts"],"names":[],"mappings":""}

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":";;;AAGO,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":";;;AAGO,MAAM,mBAAmB,GAAG,KAAK,EAAQ,CAAmB,EAAE,EAAE;IACrE,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,aAAa,EAAE;SACnD,SAAS,CAAC,CAAC,CAAC;SACZ,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAC3B,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,SAAS,CAAC,aAAa,EAAE,CAAC,YAAY,CAC3D,KAAK,CAAC,YAAY,CACnB,CAAA;IACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;QACtB,MAAM,YAAY,GAChB,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,iBAAiB,CACrD,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,SAAS,CAAC,aAAa,EAAE;aACzC,SAAS,CAAC,CAAC,CAAC;aACZ,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,WAAW;QACrB,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;QACzB,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;QAC7B,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,CAAC,IAAI;QACpB,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;KACjB,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AA5DY,QAAA,mBAAmB,uBA4D/B"}
+{"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"}