koishi-plugin-rocom 1.0.18 → 1.0.24

package/lib/announcement-service.d.ts

@@ -0,0 +1,21 @@
+export type AnnouncementBlock = {
+    text: string;
+    image: string;
+};
+export declare function plainAnnouncementText(value: unknown): string;
+export declare function buildAnnouncementView(data: any, baseUrl: string): {
+    title: string;
+    id: string;
+    publishedAt: string;
+    blocks: AnnouncementBlock[];
+    commandHint: string;
+    copyright: string;
+};
+export declare function announcementViewText(view: ReturnType<typeof buildAnnouncementView>): string;
+export declare function buildAnnouncementListView(data: any, page: number): {
+    title: string;
+    page: number;
+    items: any;
+    commandHint: string;
+    copyright: string;
+};

package/lib/announcement-service.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.plainAnnouncementText = plainAnnouncementText;
+exports.buildAnnouncementView = buildAnnouncementView;
+exports.announcementViewText = announcementViewText;
+exports.buildAnnouncementListView = buildAnnouncementListView;
+const player_service_1 = require("./player-service");
+function plainAnnouncementText(value) {
+    return String(value ?? '').replace(/<(script|style)\b[^>]*>[\s\S]*?<\/\1\s*>/gi, '')
+        .replace(/<br\s*\/?>|<\/(?:p|div|h[1-6]|li)>/gi, '\n')
+        .replace(/<[^>]*>/g, '').replace(/&nbsp;/g, ' ').replace(/&amp;/g, '&')
+        .replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"')
+        .replace(/\n{3,}/g, '\n\n').trim();
+}
+function buildAnnouncementView(data, baseUrl) {
+    const item = data?.detail || data?.announcement || data || {};
+    const content = typeof item.content === 'object' ? item.content?.text : item.content;
+    const html = String(content || item.text || item.summary || '')
+        .replace(/<(script|style)\b[^>]*>[\s\S]*?<\/\1\s*>/gi, '');
+    const blocks = [];
+    const images = new Set();
+    const addText = (value) => {
+        const text = plainAnnouncementText(value);
+        if (text)
+            blocks.push({ text, image: '' });
+    };
+    const addImage = (value) => {
+        const url = (0, player_service_1.resourceUrl)(value, baseUrl);
+        if (!/^https?:\/\//i.test(url) || images.has(url))
+            return;
+        images.add(url);
+        blocks.push({ text: '', image: url });
+    };
+    let offset = 0;
+    for (const match of html.matchAll(/<img\b[^>]*\bsrc\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))[^>]*>/gi)) {
+        addText(html.slice(offset, match.index));
+        addImage(match[1] || match[2] || match[3]);
+        offset = match.index + match[0].length;
+    }
+    addText(html.slice(offset));
+    for (const index of Array.isArray(item.content?.indexes) ? item.content.indexes : []) {
+        for (const image of Array.isArray(index?.imageUrl) ? index.imageUrl : [])
+            addImage(image);
+    }
+    return {
+        title: String(item.title || '洛克公告'), id: String(item.thread_id || item.id || ''),
+        publishedAt: String(item.publishAt || item.published_at || item.createdAt || ''),
+        blocks, commandHint: '洛克.公告详情 <公告ID>', copyright: 'Koishi · 洛克王国',
+    };
+}
+function announcementViewText(view) {
+    return [view.title, view.publishedAt, ...view.blocks.map(block => block.text || block.image)].filter(Boolean).join('\n');
+}
+function buildAnnouncementListView(data, page) {
+    const items = Array.isArray(data?.items) ? data.items : Array.isArray(data?.list) ? data.list : [];
+    return {
+        title: '洛克公告', page,
+        items: items.map((item) => ({ id: String(item.thread_id || item.id || ''),
+            title: String(item.title || '未命名公告'), summary: plainAnnouncementText(item.summary),
+            publishedAt: String(item.publishAt || item.published_at || item.createdAt || '') })),
+        commandHint: '洛克.公告 [页码] · 洛克.公告详情 <公告ID>', copyright: 'Koishi · 洛克王国',
+    };
+}

package/lib/async-control.d.ts

@@ -0,0 +1,3 @@
+/** A deadline cancels the underlying operation as well as the caller's wait. */
+export declare function withDeadline<T>(timeoutMs: number, parent: AbortSignal | undefined, task: (signal: AbortSignal) => Promise<T>, onAbort?: () => void): Promise<T>;
+export declare function delay(ms: number, signal?: AbortSignal): Promise<void>;

package/lib/async-control.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withDeadline = withDeadline;
+exports.delay = delay;
+/** A deadline cancels the underlying operation as well as the caller's wait. */
+async function withDeadline(timeoutMs, parent, task, onAbort) {
+    const controller = new AbortController();
+    const forward = () => controller.abort(parent?.reason ?? new Error('操作已取消'));
+    if (parent?.aborted)
+        forward();
+    else
+        parent?.addEventListener('abort', forward, { once: true });
+    const timer = setTimeout(() => controller.abort(new Error('操作超时')), Math.max(1, timeoutMs));
+    let stop = () => { };
+    const cancelled = new Promise((_, reject) => {
+        stop = () => {
+            onAbort?.();
+            reject(controller.signal.reason);
+        };
+        if (controller.signal.aborted)
+            stop();
+        else
+            controller.signal.addEventListener('abort', stop, { once: true });
+    });
+    try {
+        return await Promise.race([cancelled, Promise.resolve().then(() => {
+                controller.signal.throwIfAborted();
+                return task(controller.signal);
+            })]);
+    }
+    finally {
+        clearTimeout(timer);
+        parent?.removeEventListener('abort', forward);
+        controller.signal.removeEventListener('abort', stop);
+    }
+}
+function delay(ms, signal) {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted)
+            return reject(signal.reason);
+        const cancel = () => { clearTimeout(timer); reject(signal?.reason); };
+        const timer = setTimeout(() => {
+            signal?.removeEventListener('abort', cancel);
+            resolve();
+        }, Math.max(0, ms));
+        signal?.addEventListener('abort', cancel, { once: true });
+    });
+}

package/lib/atlas-service.js

@@ -149,7 +149,7 @@ class AtlasService {
         }
         return text;
     }
-    // 解析上游简单结构的 pets.yaml：`正式名:` + 缩进 `- 别名` 列表。
+    // 解析简单结构的 pets.yaml：`正式名:` + 缩进 `- 别名` 列表。
     loadPetAliases() {
         const filePath = this.aliasPath();
         if (!node_fs_1.default.existsSync(filePath))

package/lib/client.d.ts

@@ -1,4 +1,14 @@
 import { Context } from 'koishi';
+export type JsonObject = Record<string, unknown>;
+export declare const isObject: (v: unknown) => v is JsonObject;
+export declare function inheritGoodsMapping<T extends JsonObject>(parent: JsonObject, child: T): T & {
+    _goods_mapping?: unknown;
+};
+/** 传给 ingame 请求的可选授权上下文：指定 UID 查询时透传凭证，不自动替换为主账号。 */
+export interface IngameAuthContext {
+    fwToken?: string;
+    userIdentifier?: string;
+}
 export interface IngameTaskPollOptions {
     /** 服务端同步等待毫秒（long-poll），这段时间内服务端会尽量直接返回结果而不入队 */
     waitMs?: number;
@@ -8,6 +18,8 @@ export interface IngameTaskPollOptions {
     timeoutMs?: number;
     /** 任务进入排队（拿到 task_id）时回调一次，可用于向用户发送“排队中”提示 */
     onQueued?: (taskId: string) => void | Promise<void>;
+    /** 取消信号；插件卸载或调用方放弃时用于中止在途请求与轮询 */
+    signal?: AbortSignal;
 }
 export declare class RocomClient {
     private baseUrl;
@@ -17,6 +29,7 @@ export declare class RocomClient {
     private lastErrorBrief;
     constructor(baseUrl: string, apiKey: string, timeout?: number);
     private sanitizeUid;
+    private attachGoodsMapping;
     private wegameHeaders;
     private rocomHeaders;
     private formatHttpError;
@@ -38,9 +51,10 @@ export declare class RocomClient {
     private static normalizeTaskStatus;
     private static extractTaskId;
     private static isCompletedGatewayPayload;
-    private static extractCompletedIngamePayload;
+    private static inspectIngamePayload;
     private static taskErrorMessage;
     private pollIngameTask;
+    private queuedQuery;
     qqQrLogin(ctx: Context, userIdentifier: string): Promise<any>;
     qqQrStatus(ctx: Context, fwToken: string, userIdentifier: string): Promise<any>;
     wechatQrLogin(ctx: Context, userIdentifier: string): Promise<any>;
@@ -61,12 +75,37 @@ export declare class RocomClient {
     getBattleOverview(ctx: Context, fwToken: string, userIdentifier?: string): Promise<any>;
     getBattleList(ctx: Context, fwToken: string, pageSize?: number, afterTime?: string, userIdentifier?: string): Promise<any>;
     private isIngamePlayerPayload;
-    ingamePlayerSearch(ctx: Context, uid: string): Promise<any>;
+    ingamePlayerSearch(ctx: Context, uid: string, options?: IngameTaskPollOptions & {
+        auth?: IngameAuthContext;
+    }): Promise<any>;
+    ingamePlayerCard(ctx: Context, uid: string, options?: IngameTaskPollOptions & {
+        auth?: IngameAuthContext;
+        source?: string;
+    }): Promise<any>;
     getPets(ctx: Context, fwToken: string, petSubset?: number, pageNo?: number, pageSize?: number, userIdentifier?: string): Promise<any>;
     getLineupList(ctx: Context, fwToken: string, pageNo?: number, category?: string, userIdentifier?: string): Promise<any>;
     getExchangePosters(ctx: Context, fwToken: string, pageNo?: number, userIdentifier?: string): Promise<any>;
-    getMerchantInfo(ctx: Context, refresh?: boolean): Promise<any>;
+    getMerchantInfo(ctx: Context, refresh?: boolean, options?: IngameTaskPollOptions & {
+        auth?: IngameAuthContext;
+    }): Promise<any>;
+    getLegacyMerchantInfo(ctx: Context, refresh?: boolean, options?: {
+        signal?: AbortSignal;
+        auth?: IngameAuthContext;
+    }): Promise<any>;
     queryPetSize(ctx: Context, diameter: number, weight: number, pool?: string, pageNo?: number, pageSize?: number, userIdentifier?: string): Promise<any>;
+    searchEggBySize(ctx: Context, heightMeters: number, weightKg: number, pageNo?: number, pageSize?: number, userIdentifier?: string): Promise<any>;
+    getPetCollectionRanking(ctx: Context, rankType: 'shining' | 'glass', limit?: number, uid?: string, options?: {
+        userIdentifier?: string;
+    }): Promise<any>;
+    parseShareCode(ctx: Context, shareCode: string, userIdentifier?: string): Promise<any>;
+    getShareCodeRecords(ctx: Context, options?: {
+        shareCode?: string;
+        hash?: string;
+        pageNo?: number;
+        pageSize?: number;
+        modeId?: number;
+        magicId?: number;
+    }, userIdentifier?: string): Promise<any>;
     getActivitiesInfo(ctx: Context, refresh?: boolean, userIdentifier?: string): Promise<any>;
     syncConfig(ctx: Context, userIdentifier?: string): Promise<any>;
     getAnnouncementList(ctx: Context, params?: {
@@ -78,7 +117,7 @@ export declare class RocomClient {
     getLatestAnnouncement(ctx: Context, params?: {
         category_id?: number | string;
         order?: string;
-    }, userIdentifier?: string): Promise<any>;
+    }, userIdentifier?: string, signal?: AbortSignal): Promise<any>;
     getAnnouncementDetail(ctx: Context, threadId: number | string, userIdentifier?: string): Promise<any>;
     getEggGroups(ctx: Context, userIdentifier?: string): Promise<any>;
     getEggGroupPets(ctx: Context, groupIds: string | number[], matchMode?: 'any' | 'all', pageNo?: number, pageSize?: number, userIdentifier?: string): Promise<any>;
@@ -92,12 +131,24 @@ export declare class RocomClient {
     getEggExchangeSubscriptions(ctx: Context, userIdentifier?: string): Promise<any>;
     deleteEggExchangeSubscription(ctx: Context, subscriptionId: string | number, userIdentifier?: string): Promise<any>;
     getEggExchangeEvents(ctx: Context, subscriptionId: string | number, afterEventId?: string, limit?: number, userIdentifier?: string): Promise<any>;
-    ingameHomeInfo(ctx: Context, uid: string, options?: IngameTaskPollOptions): Promise<any>;
-    ingameMerchantInfo(ctx: Context, shopId: string | number): Promise<any>;
+    ingameHomeInfo(ctx: Context, uid: string, options?: IngameTaskPollOptions & {
+        auth?: IngameAuthContext;
+    }): Promise<any>;
+    ingameMerchantInfo(ctx: Context, shopId?: string | number | null, options?: IngameTaskPollOptions & {
+        auth?: IngameAuthContext;
+    }): Promise<any>;
+    ingameHomeEggs(ctx: Context, uid: string, options?: IngameTaskPollOptions & {
+        auth?: IngameAuthContext;
+    }): Promise<any>;
+    ingameHomePetData(ctx: Context, uid: string, options?: IngameTaskPollOptions & {
+        auth?: IngameAuthContext;
+    }): Promise<any>;
     ingamePetData(ctx: Context, uid: string, extras?: {
         petGid?: string | number;
         npcId?: string | number;
-    }, options?: IngameTaskPollOptions): Promise<any>;
+    }, options?: IngameTaskPollOptions & {
+        auth?: IngameAuthContext;
+    }): Promise<any>;
     getFriendship(ctx: Context, fwToken: string, userIds: string, userIdentifier?: string): Promise<any>;
     getStudentState(ctx: Context, fwToken: string, accountType?: number, userIdentifier?: string): Promise<any>;
     getStudentPerks(ctx: Context, fwToken: string, area?: number, accountType?: number, userIdentifier?: string): Promise<any>;