@ybgnb/bili-api 0.0.1 → 0.0.2

package/dist/service/space/page/search.js

@@ -0,0 +1,33 @@
+import { BasePageStrategy } from '../../../api/page/strategies/base.js';
+import { isEmptyArr } from '../../../utils/arr.js';
+/**
+ * 空间稿件搜索的分页策略（基于游标）
+ */
+export class SpaceVPageStrategy extends BasePageStrategy {
+    constructor(options) {
+        super({ pageSize: 40, ...options });
+    }
+    hasNextPage(nextPageNum, list, lastResponse) {
+        if (lastResponse !== null) {
+            // 前一次的请求数据为空
+            if (lastResponse.data == null) {
+                return false;
+            }
+            const data = lastResponse.data;
+            const page = data.page;
+            if (isEmptyArr(data.list.vlist) || page.count <= list.length || page.count <= page.pn * page.ps) {
+                // 前一次的分页数据为空
+                return false;
+            }
+        }
+        return true;
+    }
+    updateNextPageParams(nextPageNum, queryParams, _list, _lastResponse) {
+        queryParams['ps'] = this.options.pageSize;
+        queryParams['pn'] = nextPageNum;
+    }
+    getList(response) {
+        return response.data.list.vlist;
+    }
+}
+//# sourceMappingURL=search.js.map

package/dist/service/space/page/search.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/service/space/page/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAKvE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGlD;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,gBAAgB;IACtD,YAAY,OAA8B;QACxC,KAAK,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAA;IACrC,CAAC;IAED,WAAW,CACT,WAAmB,EACnB,IAAS,EACT,YAAoC;QAEpC,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,aAAa;YACb,IAAI,YAAY,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;gBAC9B,OAAO,KAAK,CAAA;YACd,CAAC;YAED,MAAM,IAAI,GAAG,YAAY,CAAC,IAAqC,CAAA;YAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;YACtB,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;gBAChG,aAAa;gBACb,OAAO,KAAK,CAAA;YACd,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,oBAAoB,CAClB,WAAmB,EACnB,WAA0B,EAC1B,KAAU,EACV,aAAqC;QAErC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAA;QACzC,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,CAAA;IACjC,CAAC;IAED,OAAO,CACL,QAAyB;QAEzB,OAAQ,QAAQ,CAAC,IAAsC,CAAC,IAAI,CAAC,KAAY,CAAA;IAC3E,CAAC;CACF"}

package/dist/service/toview/page.d.ts

@@ -0,0 +1,15 @@
+import type { ToViewItem, ToViewListResult } from '../../types/modules/toview/toview.js';
+import { BasePageStrategy } from '../../api/page/strategies/base.js';
+import type { ApiResponse, ApiResponseData } from '../../types/core/response.js';
+import type { RequestParams } from '../../types/core/request.js';
+import type { PageOptions } from '../../types/core/page.js';
+/**
+ * 稍后再看的分页策略（基于游标）
+ */
+export declare class ToViewPageStrategy extends BasePageStrategy {
+    constructor(options?: Partial<PageOptions>);
+    hasNextPage<D extends ApiResponseData = ToViewItem, RD extends ApiResponseData = ToViewListResult>(nextPageNum: number, list: D[], lastResponse: ApiResponse<RD> | null): boolean;
+    updateNextPageParams<D extends ApiResponseData = ToViewItem, RD extends ApiResponseData = ToViewListResult>(nextPageNum: number, queryParams: RequestParams, _list: D[], _lastResponse: ApiResponse<RD> | null): void;
+    getList<D extends ApiResponseData = ToViewItem, RD extends ApiResponseData = ToViewListResult>(response: ApiResponse<RD>): D[];
+}
+//# sourceMappingURL=page.d.ts.map

package/dist/service/toview/page.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../src/service/toview/page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAChF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,gBAAgB;gBAC1C,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC;IAI1C,WAAW,CAAC,CAAC,SAAS,eAAe,GAAG,UAAU,EAAE,EAAE,SAAS,eAAe,GAAG,gBAAgB,EAC/F,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,CAAC,EAAE,EACT,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC,GAAG,IAAI;IAkBtC,oBAAoB,CAAC,CAAC,SAAS,eAAe,GAAG,UAAU,EAAE,EAAE,SAAS,eAAe,GAAG,gBAAgB,EACxG,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,aAAa,EAC1B,KAAK,EAAE,CAAC,EAAE,EACV,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC,GAAG,IAAI,GACpC,IAAI;IAKP,OAAO,CAAC,CAAC,SAAS,eAAe,GAAG,UAAU,EAAE,EAAE,SAAS,eAAe,GAAG,gBAAgB,EAC3F,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC,GACxB,CAAC,EAAE;CAGP"}

package/dist/service/toview/page.js

@@ -0,0 +1,31 @@
+import { BasePageStrategy } from '../../api/page/strategies/base.js';
+/**
+ * 稍后再看的分页策略（基于游标）
+ */
+export class ToViewPageStrategy extends BasePageStrategy {
+    constructor(options) {
+        super({ pageSize: 20, ...options });
+    }
+    hasNextPage(nextPageNum, list, lastResponse) {
+        if (lastResponse !== null) {
+            // 前一次的请求数据为空
+            if (lastResponse.data == null) {
+                return false;
+            }
+            // 前一次的分页数据为空
+            const data = lastResponse.data;
+            if (data.count <= list.length || data.list.length === 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+    updateNextPageParams(nextPageNum, queryParams, _list, _lastResponse) {
+        queryParams['ps'] = this.options.pageSize;
+        queryParams['pn'] = nextPageNum;
+    }
+    getList(response) {
+        return response.data.list;
+    }
+}
+//# sourceMappingURL=page.js.map

package/dist/service/toview/page.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../src/service/toview/page.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AAKpE;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,gBAAgB;IACtD,YAAY,OAA8B;QACxC,KAAK,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAA;IACrC,CAAC;IAED,WAAW,CACT,WAAmB,EACnB,IAAS,EACT,YAAoC;QAEpC,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,aAAa;YACb,IAAI,YAAY,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;gBAC9B,OAAO,KAAK,CAAA;YACd,CAAC;YAED,aAAa;YACb,MAAM,IAAI,GAAG,YAAY,CAAC,IAAmC,CAAA;YAC7D,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxD,OAAO,KAAK,CAAA;YACd,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,oBAAoB,CAClB,WAAmB,EACnB,WAA0B,EAC1B,KAAU,EACV,aAAqC;QAErC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAA;QACzC,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,CAAA;IACjC,CAAC;IAED,OAAO,CACL,QAAyB;QAEzB,OAAQ,QAAQ,CAAC,IAAoC,CAAC,IAAW,CAAA;IACnE,CAAC;CACF"}

package/dist/service/toview/toview.d.ts

@@ -0,0 +1,56 @@
+import { BaseService } from '../base.js';
+import type { BizRequestOptions } from '../../types/core/request.js';
+import type { ToViewItem } from '../../types/modules/toview/toview.js';
+import type { OnPageFetched, PageOptions } from '../../types/core/page.js';
+/**
+ * 稍后再看服务
+ */
+export declare class ToViewService extends BaseService {
+    /**
+     * 构建分页器（公共逻辑）
+     * @param pageOptions  分页选项
+     * @param bizOptions   业务请求选项
+     * @protected
+     */
+    protected buildPager(pageOptions?: PageOptions, bizOptions?: BizRequestOptions): import("../../index.js").PageApi<ToViewItem, ToViewItem[]>;
+    /**
+     * 获取稍后再看列表（单个分页数据）
+     * @param pageOptions  分页选项
+     * @param bizOptions   业务请求选项
+     */
+    fetchPage(pageOptions?: PageOptions, bizOptions?: BizRequestOptions): Promise<ToViewItem[] | null>;
+    /**
+     * 获取稍后再看列表（循环获取所有分页数据）
+     * @param pageOptions    分页选项
+     * @param onPageFetched  分页数据获取后的回调函数
+     * @param bizOptions     业务请求选项
+     */
+    fetchAll(pageOptions?: PageOptions, onPageFetched?: OnPageFetched, bizOptions?: BizRequestOptions): Promise<ToViewItem[]>;
+    /**
+     * 添加视频到稍后再看
+     */
+    addToView(aid: number, options?: BizRequestOptions): Promise<void>;
+    /**
+     * 添加频道中所有视频到稍后再看
+     */
+    addAllToView(aidOrBvid: number | string, options?: BizRequestOptions): Promise<void>;
+    /**
+     * 删除稍后再看视频
+     * @param aid   目标记录的avid
+     * @param options
+     */
+    delToView(aid: number[], options?: BizRequestOptions): Promise<void>;
+    /**
+     * 清空稍后再看视频
+     * @param clean_type   清理类型  0：删除所有   2：删除已观看
+     * @param options
+     */
+    clearToView(clean_type: 0 | 2, options?: BizRequestOptions): Promise<void>;
+    /**
+     * 批量移动到收藏夹
+     * @param mediaIds  视频稿件：视频稿件avid<br />音频：音频auid<br />视频合集：视频合集id
+     * @param favId  收藏夹id
+     */
+    moveFavFolder(mediaIds: number[], favId: number): Promise<void>;
+}
+//# sourceMappingURL=toview.d.ts.map

package/dist/service/toview/toview.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toview.d.ts","sourceRoot":"","sources":["../../../src/service/toview/toview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAA;AACtE,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAG1E;;GAEG;AACH,qBAAa,aAAc,SAAQ,WAAW;IAC5C;;;;;OAKG;IACH,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,iBAAiB;IAmB9E;;;;OAIG;IAEG,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,iBAAiB;IAIzE;;;;;OAKG;IAEG,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,aAAa,CAAC,EAAE,aAAa,EAAE,UAAU,CAAC,EAAE,iBAAiB;IAIvG;;OAEG;IAEG,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB;IASxD;;OAEG;IAEG,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAS1E;;;;OAIG;IAEG,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAS1D;;;;OAIG;IAEG,WAAW,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAShE;;;;OAIG;IAEG,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM;CAQtD"}

package/dist/service/toview/toview.js

@@ -0,0 +1,177 @@
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+import { BaseService } from '../base.js';
+import { CatchError } from '../../error/handle-error.js';
+import { ToViewPageStrategy } from './page.js';
+/**
+ * 稍后再看服务
+ */
+let ToViewService = (() => {
+    var _a;
+    let _classSuper = BaseService;
+    let _instanceExtraInitializers = [];
+    let _fetchPage_decorators;
+    let _fetchAll_decorators;
+    let _addToView_decorators;
+    let _addAllToView_decorators;
+    let _delToView_decorators;
+    let _clearToView_decorators;
+    let _moveFavFolder_decorators;
+    return _a = class ToViewService extends _classSuper {
+            /**
+             * 构建分页器（公共逻辑）
+             * @param pageOptions  分页选项
+             * @param bizOptions   业务请求选项
+             * @protected
+             */
+            buildPager(pageOptions, bizOptions) {
+                return this.createPager('https://api.bilibili.com/x/v2/history/toview/web', new ToViewPageStrategy(pageOptions), {
+                    query: {
+                        viewed: 0,
+                        asc: false,
+                        key: '',
+                        need_split: true,
+                        build: 0,
+                        platform: 'web',
+                        mobi_app: 'web',
+                    },
+                    ...bizOptions,
+                });
+            }
+            /**
+             * 获取稍后再看列表（单个分页数据）
+             * @param pageOptions  分页选项
+             * @param bizOptions   业务请求选项
+             */
+            async fetchPage(pageOptions, bizOptions) {
+                return await this.buildPager(pageOptions, bizOptions).fetchNext();
+            }
+            /**
+             * 获取稍后再看列表（循环获取所有分页数据）
+             * @param pageOptions    分页选项
+             * @param onPageFetched  分页数据获取后的回调函数
+             * @param bizOptions     业务请求选项
+             */
+            async fetchAll(pageOptions, onPageFetched, bizOptions) {
+                return await this.buildPager(pageOptions, bizOptions).fetchAllPage(onPageFetched);
+            }
+            /**
+             * 添加视频到稍后再看
+             */
+            async addToView(aid, options) {
+                await this.save('https://api.bilibili.com/x/v2/history/toview/add', {
+                    data: {
+                        aid: aid,
+                    },
+                    ...options,
+                });
+            }
+            /**
+             * 添加频道中所有视频到稍后再看
+             */
+            async addAllToView(aidOrBvid, options) {
+                await this.save('https://space.bilibili.com/ajax/channel/addAllToView', {
+                    data: {
+                        ...(typeof aidOrBvid === 'string' ? { bvid: aidOrBvid } : { aid: aidOrBvid }),
+                    },
+                    ...options,
+                });
+            }
+            /**
+             * 删除稍后再看视频
+             * @param aid   目标记录的avid
+             * @param options
+             */
+            async delToView(aid, options) {
+                await this.save('https://api.bilibili.com/x/v2/history/toview/v2/dels', {
+                    data: {
+                        resources: aid.join(','),
+                    },
+                    ...options,
+                });
+            }
+            /**
+             * 清空稍后再看视频
+             * @param clean_type   清理类型  0：删除所有   2：删除已观看
+             * @param options
+             */
+            async clearToView(clean_type, options) {
+                await this.save('https://api.bilibili.com/x/v2/history/toview/clear', {
+                    data: {
+                        clean_type: clean_type,
+                    },
+                    ...options,
+                });
+            }
+            /**
+             * 批量移动到收藏夹
+             * @param mediaIds  视频稿件：视频稿件avid<br />音频：音频auid<br />视频合集：视频合集id
+             * @param favId  收藏夹id
+             */
+            async moveFavFolder(mediaIds, favId) {
+                await this.save('https://api.bilibili.com/x/v2/history/toview/move', {
+                    data: {
+                        resources: mediaIds.join(','),
+                        tar_media_id: favId,
+                    },
+                });
+            }
+            constructor() {
+                super(...arguments);
+                __runInitializers(this, _instanceExtraInitializers);
+            }
+        },
+        (() => {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _fetchPage_decorators = [CatchError()];
+            _fetchAll_decorators = [CatchError()];
+            _addToView_decorators = [CatchError()];
+            _addAllToView_decorators = [CatchError()];
+            _delToView_decorators = [CatchError()];
+            _clearToView_decorators = [CatchError()];
+            _moveFavFolder_decorators = [CatchError()];
+            __esDecorate(_a, null, _fetchPage_decorators, { kind: "method", name: "fetchPage", static: false, private: false, access: { has: obj => "fetchPage" in obj, get: obj => obj.fetchPage }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _fetchAll_decorators, { kind: "method", name: "fetchAll", static: false, private: false, access: { has: obj => "fetchAll" in obj, get: obj => obj.fetchAll }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _addToView_decorators, { kind: "method", name: "addToView", static: false, private: false, access: { has: obj => "addToView" in obj, get: obj => obj.addToView }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _addAllToView_decorators, { kind: "method", name: "addAllToView", static: false, private: false, access: { has: obj => "addAllToView" in obj, get: obj => obj.addAllToView }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _delToView_decorators, { kind: "method", name: "delToView", static: false, private: false, access: { has: obj => "delToView" in obj, get: obj => obj.delToView }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _clearToView_decorators, { kind: "method", name: "clearToView", static: false, private: false, access: { has: obj => "clearToView" in obj, get: obj => obj.clearToView }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _moveFavFolder_decorators, { kind: "method", name: "moveFavFolder", static: false, private: false, access: { has: obj => "moveFavFolder" in obj, get: obj => obj.moveFavFolder }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        })(),
+        _a;
+})();
+export { ToViewService };
+//# sourceMappingURL=toview.js.map

package/dist/service/toview/toview.js.map

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

package/dist/service/user/qrcode-login.d.ts

@@ -1,5 +1,5 @@
-import type { UserService } from './index.js';
-import type { QRCodeLoginCallback, QRCodeLoginOptions } from '../../types/business/login.js';
+import type { UserService } from './user.js';
+import type { QRCodeLoginCallback, QRCodeLoginOptions } from '../../types/modules/user/login.js';
 import type { RequestContext } from '../../types/core/request.js';
 /**
  * 通过二维码登录

package/dist/service/user/qrcode-login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qrcode-login.d.ts","sourceRoot":"","sources":["../../../src/service/user/qrcode-login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAGjE;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,mBAAmB,EAC7B,YAAY,CAAC,EAAE,kBAAkB,GAChC,OAAO,CAAC,cAAc,CAAC,CAsFzB"}
+{"version":3,"file":"qrcode-login.d.ts","sourceRoot":"","sources":["../../../src/service/user/qrcode-login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAChG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAGjE;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,mBAAmB,EAC7B,YAAY,CAAC,EAAE,kBAAkB,GAChC,OAAO,CAAC,cAAc,CAAC,CAsFzB"}

package/dist/service/user/qrcode-login.js

@@ -1,4 +1,4 @@
-import { BiliAbortError, BiliError } from '../../error/index.js';
+import { BiliAbortError, BiliError } from '../../error/error.js';
 /**
  * 通过二维码登录
  *
@@ -39,7 +39,7 @@ export async function loginUserWithQRCode(userService, callback, loginOptions) {
     try {
         while (!signal.aborted) {
             safeStatusChange('正在获取登录二维码...');
-            const qrCode = await userService.getLoginQRCode(signal);
+            const qrCode = await userService.getLoginQRCode(loginOptions);
             if (!qrCode?.url || !qrCode?.qrcode_key) {
                 throw new Error('未能获取有效的二维码数据');
             }
@@ -48,12 +48,12 @@ export async function loginUserWithQRCode(userService, callback, loginOptions) {
             // 二维码是否过期
             let isQRCodeExpired = false;
             while (!signal.aborted && !isQRCodeExpired) {
-                const result = await userService.getQRCodeLoginResult(qrCode.qrcode_key, signal);
+                const result = await userService.getQRCodeLoginResult(qrCode.qrcode_key, loginOptions);
                 safeStatusChange(result.message);
                 switch (result.code) {
                     case 0: // 登录成功
                         safeStatusChange('扫码成功，正在同步用户信息...');
-                        return await userService.initLoginSession(result.setCookie, options.updateRequestContext, signal);
+                        return await userService.initLoginSession(result.setCookie, options.updateRequestContext, loginOptions);
                     case 86038: // 二维码失效
                         if (options.autoRefresh) {
                             safeStatusChange('二维码已失效，正在自动刷新...');

package/dist/service/user/qrcode-login.js.map

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

package/dist/service/user/user.d.ts

@@ -0,0 +1,34 @@
+import type { LoginQRCode, QRCodeLoginCallback, QRCodeLoginOptions, QRCodeLoginResult } from '../../types/modules/user/login.js';
+import type { BizRequestOptions, RequestContext } from '../../types/core/request.js';
+import type { Buvids, UserCookie } from '../../types/modules/user/auth.js';
+import type { UpStat, UserCard, UserInfo } from '../../types/modules/user/user.js';
+import { BaseService } from '../base.js';
+/**
+ * 用户服务
+ */
+export declare class UserService extends BaseService {
+    /**
+     * 获取登录二维码
+     */
+    getLoginQRCode(options?: BizRequestOptions): Promise<LoginQRCode>;
+    /**
+     * 获取二维码登录结果
+     */
+    getQRCodeLoginResult(qrcode_key: string, options?: BizRequestOptions): Promise<QRCodeLoginResult>;
+    loginWithQRCode(callback: QRCodeLoginCallback, loginOptions?: QRCodeLoginOptions): Promise<RequestContext>;
+    getBuvids(options?: BizRequestOptions): Promise<Buvids>;
+    getMyInfo(cookie?: UserCookie, options?: BizRequestOptions): Promise<UserInfo>;
+    /**
+     * 登录后初始化（cookie / 用户信息等）
+     */
+    initLoginSession(setCookie: string[], updateRequestContext?: boolean, options?: BizRequestOptions): Promise<RequestContext>;
+    /**
+     * 批量获取用户基础信息（最多50个）
+     */
+    getUserCards(uids: number[], options?: BizRequestOptions): Promise<(UserCard | null)[]>;
+    /**
+     * 获取UP主状态数
+     */
+    getUpStat(mid: number, options?: BizRequestOptions): Promise<UpStat>;
+}
+//# sourceMappingURL=user.d.ts.map

package/dist/service/user/user.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/service/user/user.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,mCAAmC,CAAA;AAE1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACpF,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAE1E,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAElF,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC;;GAEG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAC1C;;OAEG;IAEH,cAAc,CAAC,OAAO,CAAC,EAAE,iBAAiB;IAI1C;;OAEG;IAEG,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAiBjG,eAAe,CAAC,QAAQ,EAAE,mBAAmB,EAAE,YAAY,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC;IAKhH,SAAS,CAAC,OAAO,CAAC,EAAE,iBAAiB;IAKrC,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAO1D;;OAEG;IAEG,gBAAgB,CACpB,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,GAAE,OAAc,EACpC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,cAAc,CAAC;IAwB1B;;OAEG;IAEG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAW9D;;OAEG;IAEG,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB;CAQzD"}

package/dist/service/user/{index.js → user.js}

@@ -32,10 +32,13 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-import { BaseService } from '../base.js';
 import { CatchError } from '../../error/handle-error.js';
 import { loginUserWithQRCode } from './qrcode-login.js';
 import { parseUserCookie } from '../../utils/cookies.js';
+import { BaseService } from '../base.js';
+/**
+ * 用户服务
+ */
 let UserService = (() => {
     var _a;
     let _classSuper = BaseService;
@@ -44,29 +47,28 @@ let UserService = (() => {
     let _getQRCodeLoginResult_decorators;
     let _loginWithQRCode_decorators;
     let _getBuvids_decorators;
-    let _getUserInfo_decorators;
+    let _getMyInfo_decorators;
     let _initLoginSession_decorators;
     let _getUserCards_decorators;
+    let _getUpStat_decorators;
     return _a = class UserService extends _classSuper {
             /**
              * 获取登录二维码
              */
-            getLoginQRCode(signal) {
-                return this.api.request(`https://passport.bilibili.com/x/passport-login/web/qrcode/generate`, {
-                    signal,
-                });
+            getLoginQRCode(options) {
+                return this.get(`https://passport.bilibili.com/x/passport-login/web/qrcode/generate`, options);
             }
             /**
              * 获取二维码登录结果
              */
-            async getQRCodeLoginResult(qrcode_key, signal) {
-                const response = await this.api.request('https://passport.bilibili.com/x/passport-login/web/qrcode/poll', {
+            async getQRCodeLoginResult(qrcode_key, options) {
+                const response = await this.get('https://passport.bilibili.com/x/passport-login/web/qrcode/poll', {
                     query: {
                         qrcode_key,
                     },
                     skipWbiSign: true,
                     returnFormat: 'RawResponse',
-                    signal: signal,
+                    ...options,
                 });
                 const apiResponse = await response.json();
                 return {
@@ -77,25 +79,25 @@ let UserService = (() => {
             async loginWithQRCode(callback, loginOptions) {
                 return loginUserWithQRCode(this, callback, loginOptions);
             }
-            getBuvids(signal) {
-                return this.api.request('https://api.bilibili.com/x/frontend/finger/spi', { signal });
+            getBuvids(options) {
+                return this.get('https://api.bilibili.com/x/frontend/finger/spi', options);
             }
-            getUserInfo(cookie, signal) {
-                return this.api.request('https://api.bilibili.com/x/space/myinfo', {
+            getMyInfo(cookie, options) {
+                return this.get('https://api.bilibili.com/x/space/myinfo', {
                     cookie,
-                    signal,
+                    ...options,
                 });
             }
             /**
              * 登录后初始化（cookie / 用户信息等）
              */
-            async initLoginSession(setCookie, updateRequestContext = true, signal) {
+            async initLoginSession(setCookie, updateRequestContext = true, options) {
                 this.logging.info(`初始化用户数据...`);
                 const userCookie = parseUserCookie(setCookie);
                 // 完善cookie
-                const { b_3, b_4 } = await this.getBuvids(signal);
+                const { b_3, b_4 } = await this.getBuvids(options);
                 userCookie.cookie = `${userCookie.cookie} buvid3=${b_3}; buvid4=${b_4}; `;
-                const userInfo = await this.getUserInfo(userCookie, signal);
+                const userInfo = await this.getMyInfo(userCookie, options);
                 const context = {
                     userCookie: userCookie,
                     userInfo: userInfo,
@@ -108,17 +110,28 @@ let UserService = (() => {
             }
             /**
              * 批量获取用户基础信息（最多50个）
-             * @param uids
              */
-            async getUserCards(uids) {
-                const users = await this.api.request('https://api.vc.bilibili.com/account/v1/user/cards', {
+            async getUserCards(uids, options) {
+                const users = await this.get('https://api.vc.bilibili.com/account/v1/user/cards', {
                     query: {
                         uids: uids.join(','),
                     },
+                    ...options,
                 });
                 // 返回的是乱序的，这里重新按照刷入的id排序
                 return uids.map((id) => users.find((item) => item.mid === id) ?? null);
             }
+            /**
+             * 获取UP主状态数
+             */
+            async getUpStat(mid, options) {
+                return await this.get('https://api.bilibili.com/x/space/upstat', {
+                    query: {
+                        mid: mid,
+                    },
+                    ...options,
+                });
+            }
             constructor() {
                 super(...arguments);
                 __runInitializers(this, _instanceExtraInitializers);
@@ -130,19 +143,21 @@ let UserService = (() => {
             _getQRCodeLoginResult_decorators = [CatchError()];
             _loginWithQRCode_decorators = [CatchError()];
             _getBuvids_decorators = [CatchError()];
-            _getUserInfo_decorators = [CatchError()];
+            _getMyInfo_decorators = [CatchError()];
             _initLoginSession_decorators = [CatchError()];
             _getUserCards_decorators = [CatchError()];
+            _getUpStat_decorators = [CatchError()];
             __esDecorate(_a, null, _getLoginQRCode_decorators, { kind: "method", name: "getLoginQRCode", static: false, private: false, access: { has: obj => "getLoginQRCode" in obj, get: obj => obj.getLoginQRCode }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _getQRCodeLoginResult_decorators, { kind: "method", name: "getQRCodeLoginResult", static: false, private: false, access: { has: obj => "getQRCodeLoginResult" in obj, get: obj => obj.getQRCodeLoginResult }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _loginWithQRCode_decorators, { kind: "method", name: "loginWithQRCode", static: false, private: false, access: { has: obj => "loginWithQRCode" in obj, get: obj => obj.loginWithQRCode }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _getBuvids_decorators, { kind: "method", name: "getBuvids", static: false, private: false, access: { has: obj => "getBuvids" in obj, get: obj => obj.getBuvids }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _getUserInfo_decorators, { kind: "method", name: "getUserInfo", static: false, private: false, access: { has: obj => "getUserInfo" in obj, get: obj => obj.getUserInfo }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _getMyInfo_decorators, { kind: "method", name: "getMyInfo", static: false, private: false, access: { has: obj => "getMyInfo" in obj, get: obj => obj.getMyInfo }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _initLoginSession_decorators, { kind: "method", name: "initLoginSession", static: false, private: false, access: { has: obj => "initLoginSession" in obj, get: obj => obj.initLoginSession }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _getUserCards_decorators, { kind: "method", name: "getUserCards", static: false, private: false, access: { has: obj => "getUserCards" in obj, get: obj => obj.getUserCards }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _getUpStat_decorators, { kind: "method", name: "getUpStat", static: false, private: false, access: { has: obj => "getUpStat" in obj, get: obj => obj.getUpStat }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         _a;
 })();
 export { UserService };
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=user.js.map

package/dist/service/user/user.js.map

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

package/dist/stores/mixinkey.d.ts

@@ -5,4 +5,5 @@ export declare const mixinKeyStore: {
     get: () => Promise<string>;
     setAutoRefresh(isAutoRefresh: boolean): void;
 };
+export declare const generateMixinKey: (imgKey: string, subKey: string) => string;
 //# sourceMappingURL=mixinkey.d.ts.map

package/dist/stores/mixinkey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mixinkey.d.ts","sourceRoot":"","sources":["../../src/stores/mixinkey.ts"],"names":[],"mappings":"AAcA;;GAEG;AACH,eAAO,MAAM,aAAa;;kCAaM,OAAO;CAGtC,CAAA"}
+{"version":3,"file":"mixinkey.d.ts","sourceRoot":"","sources":["../../src/stores/mixinkey.ts"],"names":[],"mappings":"AAcA;;GAEG;AACH,eAAO,MAAM,aAAa;;kCAaM,OAAO;CAGtC,CAAA;AAeD,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,WAM9D,CAAA"}

package/dist/stores/mixinkey.js

@@ -40,7 +40,7 @@ const mixinKeyEncTab = [
     44, 52,
 ];
 // 生成 MixinKey
-const generateMixinKey = (imgKey, subKey) => {
+export const generateMixinKey = (imgKey, subKey) => {
     const raw_wbi_key = imgKey + subKey;
     return mixinKeyEncTab
         .map((n) => raw_wbi_key[n])
@@ -75,7 +75,7 @@ const updateMixinKey = async () => {
         const imgKey = getKey(nav.wbi_img.img_url);
         const subKey = getKey(nav.wbi_img.sub_url);
         mixinKey = generateMixinKey(imgKey, subKey);
-        getCommonBiliClient().logging.info(`初始化 MixinKey：${mixinKey}`);
+        getCommonBiliClient().logging.info(`初始化 imgKey=${imgKey} subKey=${subKey} mixinKey=${mixinKey}`);
         wbiKeyLastUpdatedAt = now;
     }
     catch (err) {