koishi-plugin-rocom 1.0.18 → 1.0.24

package/lib/share-code-service.js

@@ -0,0 +1,257 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SHARE_CODE_MAX_LENGTH = void 0;
+exports.extractShareCode = extractShareCode;
+exports.parsedRecord = parsedRecord;
+exports.buildShareCodeView = buildShareCodeView;
+exports.buildShareCodeText = buildShareCodeText;
+exports.parseNaturePair = parseNaturePair;
+exports.buildShareCodeClassicView = buildShareCodeClassicView;
+const client_1 = require("./client");
+const player_service_1 = require("./player-service");
+const element_colors_1 = require("./element-colors");
+exports.SHARE_CODE_MAX_LENGTH = 16 * 1024;
+function extractShareCode(input) {
+    const raw = String(input ?? '').trim().replace(/^[`"']+|[`"']+$/g, '');
+    if (!raw)
+        return '';
+    if (raw.length > exports.SHARE_CODE_MAX_LENGTH)
+        throw new Error('分享码内容过长');
+    const match = /(?:[?&#]|^)share(?:Data|_data|_code)=([^&#\s]+)/i.exec(raw);
+    if (!match) {
+        if (/^https?:\/\//i.test(raw))
+            throw new Error('链接中没有分享码参数');
+        return raw;
+    }
+    let value = match[1];
+    for (let i = 0; i < 2; i++) {
+        let decoded;
+        try {
+            decoded = decodeURIComponent(value);
+        }
+        catch {
+            throw new Error('分享码链接的编码不完整');
+        }
+        if (decoded === value)
+            break;
+        value = decoded;
+    }
+    return value.trim().replace(/^[`"']+|[`"']+$/g, '');
+}
+// 避免对已存解析对象重复发 POST。
+function parsedRecord(record) {
+    for (const candidate of [record?.share_code, record?.parsed, record]) {
+        if (candidate && typeof candidate === 'object' && Array.isArray(candidate.teams)) {
+            return candidate;
+        }
+    }
+    return null;
+}
+function toInt(value, fallback = 0) {
+    const n = Number(value);
+    return Number.isFinite(n) ? Math.trunc(n) : fallback;
+}
+function text(value, fallback = '') {
+    if (value === null || value === undefined)
+        return fallback;
+    const s = String(value).trim();
+    return s || fallback;
+}
+function formatTime(value) {
+    const raw = text(value);
+    if (!raw)
+        return '';
+    const normalized = /^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}/.test(raw) && !/(Z|[+-]\d{2}:?\d{2})$/.test(raw)
+        ? `${raw.replace(' ', 'T')}+08:00`
+        : raw.replace('Z', '+00:00');
+    const date = new Date(normalized);
+    if (Number.isNaN(date.getTime()))
+        return raw;
+    const shifted = new Date(date.getTime() + 8 * 3600_000);
+    const pad = (v) => String(v).padStart(2, '0');
+    return `${shifted.getUTCFullYear()}-${pad(shifted.getUTCMonth() + 1)}-${pad(shifted.getUTCDate())} ${pad(shifted.getUTCHours())}:${pad(shifted.getUTCMinutes())}`;
+}
+function normalizeUrl(value, baseUrl) {
+    return (0, player_service_1.resourceUrl)(value, baseUrl);
+}
+function wikiAssetUrl(baseUrl, path) {
+    if (!baseUrl)
+        return path;
+    return `${String(baseUrl).replace(/\/$/, '')}${path}`;
+}
+function normalizeNamedIcon(value, emptyName, baseUrl) {
+    const item = (0, client_1.isObject)(value) ? value : {};
+    const id = toInt(item.id);
+    return {
+        id,
+        name: text(item.name, emptyName),
+        icon: normalizeUrl(item.icon, baseUrl),
+        configured: Boolean(id || text(item.name) || text(item.icon)),
+    };
+}
+function normalizeTeam(value, index, baseUrl) {
+    const team = (0, client_1.isObject)(value) ? value : {};
+    const pet = normalizeNamedIcon(team.pet, '未配置精灵', baseUrl);
+    if (pet.id)
+        pet.icon = wikiAssetUrl(baseUrl, `/api/v1/resources/wiki/assets/pets/${pet.id}/icon.png`);
+    const bloodline = normalizeNamedIcon(team.bloodline, '未配置血脉', baseUrl);
+    const personality = normalizeNamedIcon(team.personality, '未配置性格', baseUrl);
+    const ivs = [];
+    for (const raw of Array.isArray(team.ivs_detail) ? team.ivs_detail : []) {
+        ivs.push(normalizeNamedIcon(raw, '未配置', baseUrl));
+    }
+    while (ivs.length < 3)
+        ivs.push(normalizeNamedIcon(null, '未配置', baseUrl));
+    const skills = [];
+    for (const raw of Array.isArray(team.skills) ? team.skills : []) {
+        const skill = normalizeNamedIcon(raw, '未配置技能', baseUrl);
+        if (skill.id)
+            skill.icon = wikiAssetUrl(baseUrl, `/api/v1/resources/wiki/assets/skills/${skill.id}.png`);
+        skills.push(skill);
+    }
+    while (skills.length < 4)
+        skills.push(normalizeNamedIcon(null, '未配置技能', baseUrl));
+    return {
+        slot: toInt(team.slot, index + 1),
+        pet,
+        // 精灵属性名列表，供信笺风模板显示属性图标。
+        typeNames: (Array.isArray(team.pet?.type_names) ? team.pet.type_names : [])
+            .map((item) => String(item ?? '').trim())
+            .filter(Boolean),
+        bloodline,
+        personality,
+        ivs: ivs.slice(0, 3),
+        skills: skills.slice(0, 4),
+        empty: !pet.configured,
+    };
+}
+function unwrapRecord(record) {
+    if (!(0, client_1.isObject)(record))
+        return { payload: {}, meta: {} };
+    if ((0, client_1.isObject)(record.share_code))
+        return { payload: record.share_code, meta: record };
+    if ((0, client_1.isObject)(record.parsed))
+        return { payload: record.parsed, meta: record };
+    return { payload: record, meta: {} };
+}
+function shareCodePreview(code) {
+    if (code.length <= 36)
+        return code;
+    return `${code.slice(0, 20)}...${code.slice(-12)}`;
+}
+function buildShareCodeView(payload, source, record, baseUrl = '') {
+    let data = (0, client_1.isObject)(payload) ? payload : {};
+    let recordMeta = {};
+    if (record) {
+        const unwrapped = unwrapRecord(record);
+        if (!data.teams)
+            data = unwrapped.payload;
+        recordMeta = unwrapped.meta;
+    }
+    const teams = (Array.isArray(data.teams) ? data.teams : [])
+        .map((item, index) => normalizeTeam(item, index, baseUrl))
+        .sort((a, b) => a.slot - b.slot);
+    const shareCode = text(data.share_code);
+    const mode = normalizeNamedIcon(data.mode, '未知编队模式', baseUrl);
+    const magic = normalizeNamedIcon(data.magic, '未配置魔法', baseUrl);
+    if (magic.configured && magic.name === '未配置魔法')
+        magic.name = `魔法 ${magic.id}`;
+    const spriteCount = toInt(data.sprite_count, teams.length);
+    return {
+        source,
+        sourceLabel: source === 'record' ? '历史记录' : '即时解析',
+        shareCode,
+        shareCodePreview: shareCodePreview(shareCode),
+        version: toInt(data.version, 1),
+        spriteCount,
+        mode,
+        magic,
+        teams,
+        parseCount: toInt(recordMeta.parse_count),
+        firstSeen: formatTime(recordMeta.first_seen_at),
+        lastSeen: formatTime(recordMeta.last_seen_at),
+        shareCodeHash: text(recordMeta.share_code_hash),
+        commandHint: '阵容码 解析 <分享码或链接> · 阵容码 查询 <分享码>',
+        copyright: 'Koishi & WeGame 洛克王国插件',
+    };
+}
+function buildShareCodeText(data) {
+    const lines = [
+        `阵容码${data.sourceLabel || '解析'}：${data.mode?.name || '未知模式'}，共 ${data.spriteCount || 0} 只精灵`,
+    ];
+    for (const team of data.teams || []) {
+        const talents = (team.ivs || []).filter((item) => item.configured).map((item) => item.name);
+        const skillNames = (team.skills || []).filter((item) => item.configured).map((item) => item.name);
+        lines.push(`${team.slot}. ${team.pet.name} | ${team.bloodline.name} | ${team.personality.name} | 天赋：${talents.join('、') || '未配置'} | 技能：${skillNames.join('、') || '未配置'}`);
+    }
+    if (data.parseCount) {
+        lines.push(`解析次数：${data.parseCount}，最近记录：${data.lastSeen || '未知'}`);
+    }
+    return lines.join('\n');
+}
+// 性格摘要解析：兼容「+攻击 -特攻」「攻击↑ 特攻↓」「加攻击/减特攻」等写法。
+function parseNaturePair(summary) {
+    const text = String(summary ?? '');
+    const upMatch = text.match(/([一-龥A-Za-z]{1,4})\s*(?:↑|▲)|(?:\+|加|▲)\s*([一-龥A-Za-z]{1,4})/);
+    const downMatch = text.match(/([一-龥A-Za-z]{1,4})\s*(?:↓|▼)|(?:-|－|减|▼)\s*([一-龥A-Za-z]{1,4})/);
+    return {
+        up: (upMatch && (upMatch[1] || upMatch[2])) || '',
+        down: (downMatch && (downMatch[1] || downMatch[2])) || '',
+    };
+}
+function buildShareCodeClassicView(view, assets, natureLookup = () => ({})) {
+    const teams = (view?.teams || []).map((team) => {
+        const element = (0, element_colors_1.bloodlineElement)(team?.bloodline?.name || '');
+        const nature = natureLookup(String(team?.personality?.id ?? '')) || {};
+        const naturePair = { up: String(nature.up || '').trim(), down: String(nature.down || '').trim() };
+        if (!naturePair.up && !naturePair.down) {
+            const parsed = parseNaturePair(nature.summary);
+            naturePair.up = parsed.up;
+            naturePair.down = parsed.down;
+        }
+        const typeNames = Array.isArray(team?.typeNames) ? team.typeNames : [];
+        return {
+            slotText: String(team?.slot ?? 0).padStart(2, '0'),
+            color: (0, element_colors_1.elementColor)(element),
+            pet: {
+                name: team?.pet?.name || '未配置精灵',
+                icon: team?.pet?.icon || '',
+            },
+            typeIcons: typeNames.map((name) => ({ name, icon: assets.typeIcon(name) })),
+            bloodline: {
+                name: team?.bloodline?.name || `${element}系血脉`,
+                icon: team?.bloodline?.icon || assets.bloodIcon(element),
+            },
+            personality: {
+                name: team?.personality?.name || nature.name || '未知',
+                up: naturePair.up,
+                down: naturePair.down,
+            },
+            ivs_detail: (team?.ivs || [])
+                .filter((item) => item?.configured)
+                .map((item) => ({ name: item.name })),
+            skills: (team?.skills || []).map((skill) => ({
+                name: skill?.name || '未配置技能',
+                icon: skill?.icon || '',
+            })),
+        };
+    });
+    const spriteCount = view?.spriteCount || teams.length;
+    return {
+        team: {
+            mode_name: view?.mode?.name || '未知编队模式',
+            share_code: view?.shareCodePreview || view?.shareCode || '',
+            sprite_count: spriteCount,
+            count_label: `/ ${spriteCount} 精灵`,
+            magic_icon: view?.magic?.icon || assets.rocoIcon,
+            teams,
+        },
+        shareAssets: {
+            frame: assets.frame,
+            logo: assets.logo,
+            rocoIcon: assets.rocoIcon,
+            star: assets.star,
+            wax: assets.wax,
+        },
+    };
+}

package/lib/subscription-runner.d.ts

@@ -0,0 +1,6 @@
+import { Context } from 'koishi';
+export interface Runner {
+    <T>(job: (signal: AbortSignal) => Promise<T>): Promise<T | undefined>;
+    aborted: () => boolean;
+}
+export declare function createRunner(ctx: Context): Runner;

package/lib/subscription-runner.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRunner = createRunner;
+// 每个插件实例的互斥与停止标记：取消在途任务、阻止重叠检查。
+function createRunner(ctx) {
+    const controller = new AbortController();
+    let running = false;
+    ctx.on('dispose', () => controller.abort());
+    const runner = Object.assign(async (job) => {
+        if (running || controller.signal.aborted)
+            return;
+        running = true;
+        try {
+            return await job(controller.signal);
+        }
+        finally {
+            running = false;
+        }
+    }, { aborted: () => controller.signal.aborted });
+    return runner;
+}

package/lib/subscription-send.d.ts

@@ -4,6 +4,8 @@ export interface SubscriptionTarget {
     channelId?: string;
     guildId?: string;
     userId?: string;
+    selfId?: string;
 }
-export declare function sendScheduledMessage(ctx: Context, target: SubscriptionTarget, message: any): Promise<boolean>;
-export declare function sendScheduledImageWithFallback(ctx: Context, target: SubscriptionTarget, image: Buffer | null, fallbackText: string, mentionAll?: boolean): Promise<boolean>;
+export declare function sentMessageIds(value: unknown): boolean;
+export declare function sendScheduledMessage(ctx: Context, target: SubscriptionTarget, message: any, signal?: AbortSignal): Promise<boolean>;
+export declare function sendScheduledImageWithFallback(ctx: Context, target: SubscriptionTarget, image: Buffer | Buffer[] | null, fallbackText: string, mentionAll?: boolean, signal?: AbortSignal): Promise<boolean>;

package/lib/subscription-send.js

@@ -1,22 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.sentMessageIds = sentMessageIds;
 exports.sendScheduledMessage = sendScheduledMessage;
 exports.sendScheduledImageWithFallback = sendScheduledImageWithFallback;
 const koishi_1 = require("koishi");
 const send_image_1 = require("./send-image");
 const logger = new koishi_1.Logger('rocom-subscription-send');
-function findBot(ctx, platform = '') {
+function findBot(ctx, platform = '', selfId = '') {
     if (!ctx.bots?.length)
         return null;
-    if (!platform)
-        return ctx.bots[0];
-    return ctx.bots.find((bot) => bot.platform === platform) || ctx.bots[0];
+    if (selfId) {
+        const exact = ctx.bots.find((bot) => String(bot.selfId) === String(selfId)
+            && (!platform || bot.platform === platform));
+        return exact || null;
+    }
+    const candidates = platform ? ctx.bots.filter((bot) => bot.platform === platform) : ctx.bots;
+    if (!candidates.length)
+        return null;
+    // 缺少 self_id 的旧订阅只在对应平台恰有一个 Bot 时兼容，避免误发其他 Bot。
+    if (candidates.length > 1) {
+        logger.warn(`平台 ${platform || '(unknown)'} 存在多个 Bot 且订阅缺少 self_id，跳过发送`);
+        return null;
+    }
+    return candidates[0];
+}
+function sentMessageIds(value) {
+    return Array.isArray(value) && value.some(id => typeof id === 'string' && id.trim().length > 0);
 }
-async function sendScheduledMessage(ctx, target, message) {
+async function sendScheduledMessage(ctx, target, message, signal) {
+    if (signal?.aborted)
+        return false;
     const platform = target.platform || '';
     const channelId = target.channelId || target.guildId || '';
     const userId = target.userId || '';
-    const bot = findBot(ctx, platform);
+    const bot = findBot(ctx, platform, target.selfId);
     if (!bot) {
         logger.warn('no available bot, skip scheduled push');
         return false;
@@ -24,21 +41,14 @@ async function sendScheduledMessage(ctx, target, message) {
     try {
         if (userId && !target.guildId) {
             if (typeof bot.sendPrivateMessage === 'function') {
-                await bot.sendPrivateMessage(userId, message);
-                return true;
+                return sentMessageIds(await bot.sendPrivateMessage(userId, message)) && !signal?.aborted;
             }
             if (typeof bot.sendMessage === 'function') {
-                await bot.sendMessage(userId, message);
-                return true;
+                return sentMessageIds(await bot.sendMessage(userId, message)) && !signal?.aborted;
             }
         }
-        if (platform && channelId) {
-            await ctx.broadcast([`${platform}:${channelId}`], message);
-            return true;
-        }
         if (channelId && typeof bot.sendMessage === 'function') {
-            await bot.sendMessage(channelId, message, target.guildId);
-            return true;
+            return sentMessageIds(await bot.sendMessage(channelId, message, target.guildId || undefined)) && !signal?.aborted;
         }
     }
     catch (err) {
@@ -48,14 +58,29 @@ async function sendScheduledMessage(ctx, target, message) {
     logger.warn(`scheduled push target is incomplete: ${JSON.stringify(target)}`);
     return false;
 }
-async function sendScheduledImageWithFallback(ctx, target, image, fallbackText, mentionAll = false) {
+async function sendScheduledImageWithFallback(ctx, target, image, fallbackText, mentionAll = false, signal) {
+    if (signal?.aborted)
+        return false;
+    if (Array.isArray(image)) {
+        if (!image.length)
+            return sendScheduledImageWithFallback(ctx, target, null, fallbackText, mentionAll, signal);
+        for (let i = 0; i < image.length; i++) {
+            const segment = koishi_1.h.image(image[i], (0, send_image_1.detectImageMime)(image[i]));
+            const content = mentionAll && i === 0 ? (0, koishi_1.h)('message', {}, (0, koishi_1.h)('at', { type: 'all' }), segment) : segment;
+            if (!await sendScheduledMessage(ctx, target, content, signal)) {
+                // One complete text fallback replaces the remaining image pages.
+                return sendScheduledMessage(ctx, target, koishi_1.h.text(fallbackText), signal);
+            }
+        }
+        return true;
+    }
     const buildContent = (body) => mentionAll ? (0, koishi_1.h)('message', {}, (0, koishi_1.h)('at', { type: 'all' }), koishi_1.h.text('\n'), body) : body;
     if (!image) {
-        return sendScheduledMessage(ctx, target, buildContent(koishi_1.h.text(fallbackText)));
+        return sendScheduledMessage(ctx, target, buildContent(koishi_1.h.text(fallbackText)), signal);
     }
     const imageSegment = koishi_1.h.image(image, (0, send_image_1.detectImageMime)(image));
-    const sent = await sendScheduledMessage(ctx, target, buildContent(imageSegment));
+    const sent = await sendScheduledMessage(ctx, target, buildContent(imageSegment), signal);
     if (sent)
         return true;
-    return sendScheduledMessage(ctx, target, buildContent(koishi_1.h.text(fallbackText)));
+    return sendScheduledMessage(ctx, target, buildContent(koishi_1.h.text(fallbackText)), signal);
 }

package/lib/types.d.ts

@@ -2,9 +2,11 @@ import { Context } from 'koishi';
 import { RocomClient } from './client';
 import { UserManager, MerchantSubscriptionManager, HomeSubscriptionManager, AnnouncementSubscriptionManager } from './user';
 import { EggService } from './egg-service';
-import { Renderer } from './render';
+import { Renderer, ImageFormat } from './render';
 import { WikiService } from './wiki-service';
 import { AtlasService } from './atlas-service';
+import { MerchantCatalogService } from './merchant-catalog';
+import { MerchantPriceLog } from './merchant-price-log';
 export interface PluginConfig {
     apiBaseUrl: string;
     wegameApiKey: string;
@@ -15,10 +17,17 @@ export interface PluginConfig {
     merchantSubscriptionEnabled: boolean;
     merchantSubscriptionItems: string[];
     merchantUiStyle: 'new' | 'old';
+    shareCodeUiStyle: 'panel' | 'classic';
+    homeDetailUiStyle: 'panel' | 'classic';
     merchantPrivateSubscriptionEnabled: boolean;
     merchantCheckMode: 'interval' | 'times';
     merchantCheckInterval: number;
     merchantCheckTimes: string[];
+    merchantTimezone: string;
+    merchantAllDayOnceEnabled: boolean;
+    subscriptionGroupAdminEnabled: boolean;
+    subscriptionBotAdminEnabled: boolean;
+    subscriptionBotAdminAuthority: number;
     homeSubscriptionEnabled: boolean;
     homeSubscriptionIntervalMinutes: number;
     announcementSubscriptionEnabled: boolean;
@@ -27,6 +36,8 @@ export interface PluginConfig {
     homeQueryPollIntervalMs: number;
     homeQueryTimeoutMs: number;
     lowBandwidthMode: boolean;
+    renderTimeout: number;
+    imageFormat: ImageFormat;
     imageCompressionEnabled: boolean;
     imageCompressionMinBytes: number;
     imageCompressionLevel: number;
@@ -43,4 +54,6 @@ export interface PluginDeps {
     renderer: Renderer;
     wikiService: WikiService;
     atlasService: AtlasService;
+    merchantCatalog: MerchantCatalogService;
+    merchantPriceLog: MerchantPriceLog;
 }

package/lib/user.d.ts

@@ -10,6 +10,7 @@ export interface MerchantSubscription {
     group_id: string;
     channel_id?: string;
     platform?: string;
+    self_id?: string;
     user_id?: string;
     type?: string;
     mention_all: boolean;
@@ -17,6 +18,10 @@ export interface MerchantSubscription {
     items: string[];
     last_push_round: string | null;
     last_matched_items: string[];
+    allday_pushed?: {
+        date: string;
+        names: string[];
+    };
     updated_by: string;
 }
 export interface HomeSubscription {
@@ -25,15 +30,20 @@ export interface HomeSubscription {
     uid: string;
     channel_id?: string;
     platform?: string;
+    self_id?: string;
+    notify_user_id?: string;
+    nickname?: string;
     guild_id?: string;
     user_id?: string;
     updated_by: string;
+    mention_all?: boolean;
     notify_state: {
         first?: boolean;
         all?: boolean;
     };
     updated_at: number;
     last_push_time?: number;
+    last_check_time?: number;
 }
 export declare class UserManager {
     private store;
@@ -69,6 +79,7 @@ export declare class HomeSubscriptionManager {
 export interface AnnouncementSubscription {
     key: string;
     platform?: string;
+    self_id?: string;
     channel_id?: string;
     guild_id?: string;
     user_id?: string;

package/lib/wiki-catalog.js

@@ -1,5 +1,5 @@
 "use strict";
-// 新版 RoCom Wiki 目录路由表（移植自上游 astrbot v3.6.0 core/wiki_catalog.py）。
+// 新版 RoCom Wiki 目录路由表。
 // list_path 由后端 /wiki/catalogs 实时下发；这里只维护详情路径、ID 字段与别名。
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WIKI_CATALOG_ROUTES_BY_ALIAS = exports.WIKI_CATALOG_ROUTES_BY_KEY = exports.WIKI_CATALOG_ROUTES = void 0;

package/lib/wiki-service.js

@@ -59,7 +59,7 @@ function wikiRangeLabel(data, keyMin, keyMax, unit) {
         return `${low}${unit}`;
     return `${low}-${high}${unit}`;
 }
-// 与上游 SequenceMatcher.ratio 近似：基于编辑距离的相似度。
+// 基于编辑距离的字符串相似度。
 function similarityRatio(a, b) {
     if (!a || !b)
         return 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-rocom",
   "description": "洛克王国查询与订阅插件",
-  "version": "1.0.18",
+  "version": "1.0.24",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://github.com/staytomorrow/koishi-plugin-rocom",
@@ -19,6 +19,10 @@
     "build": "tsc -p tsconfig.json --emitDeclarationOnly false --module commonjs --moduleResolution node",
     "postbuild": "node -e \"const fs=require('fs');for (const dir of ['render-templates','img','ttf']) { fs.rmSync('lib/'+dir,{recursive:true,force:true}); fs.cpSync('src/'+dir,'lib/'+dir,{recursive:true}); }\"",
     "check": "tsc -p tsconfig.json --noEmit --pretty false",
+    "test:alignment": "node tests/alignment-review.cjs",
+    "test:player-response": "node tests/player-response-review.cjs",
+    "test:render": "node tests/render-smoke.cjs",
+    "test:commands": "node tests/command-review.cjs",
     "pack:dry": "npm pack --dry-run",
     "prepack": "npm run build"
   },