koishi-plugin-rocom 1.0.10 → 1.0.12

package/lib/commands/query.js

@@ -258,16 +258,28 @@ function normalizeDurationSeconds(value) {
 function formatHomeRemaining(targetTs, nowTs = Math.floor(Date.now() / 1000)) {
     if (!targetTs)
         return '未开始';
-    const remain = Math.max(0, targetTs - nowTs);
-    if (remain <= 0)
+    if (nowTs >= targetTs)
         return '已完成';
-    const hours = Math.floor(remain / 3600);
+    const remain = Math.max(0, targetTs - nowTs);
+    const days = Math.floor(remain / 86400);
+    const hours = Math.floor((remain % 86400) / 3600);
     const minutes = Math.floor((remain % 3600) / 60);
-    if (hours >= 24)
-        return `${Math.floor(hours / 24)}天${hours % 24}小时`;
+    const seconds = remain % 60;
+    if (days > 0)
+        return hours > 0 ? `${days}天${hours}小时` : `${days}天`;
     if (hours > 0)
         return `${hours}小时${minutes}分钟`;
-    return `${minutes}分钟`;
+    if (minutes > 0)
+        return `${minutes}分${seconds}秒`;
+    return `${seconds}秒`;
+}
+function formatEggRemaining(targetTs, nowTs = Math.floor(Date.now() / 1000)) {
+    if (!targetTs || nowTs >= targetTs)
+        return '0分钟';
+    const remain = Math.max(0, targetTs - nowTs);
+    const totalHours = Math.floor(remain / 3600);
+    const minutes = Math.floor((remain % 3600) / 60);
+    return `${totalHours}小时${minutes}分钟`;
 }
 function homeInfoPayload(res) {
     const payload = res || {};
@@ -856,31 +868,59 @@ function extractHomePet(raw, index, guard = false) {
     const petId = homePet.pet_cfg_id || homePet.pet_id || homePet.pet_base_id || raw.pet_cfg_id || raw.pet_id || raw.id;
     if (['', '0'].includes(String(petId || '0')) && !guard)
         return null;
-    const feedInfo = homePet.feed_info && typeof homePet.feed_info === 'object' ? homePet.feed_info : {};
-    const beginTime = normalizeEpochSeconds(feedInfo.begin_time);
-    const timeCost = normalizeDurationSeconds(feedInfo.time_cost);
-    let readyAt = normalizeEpochSeconds(homePet.pet_rip_time || raw.pet_rip_time || raw.rip_time);
-    if (!readyAt && beginTime && timeCost)
-        readyAt = beginTime + timeCost;
     const nowTs = Math.floor(Date.now() / 1000);
-    const hasInspiration = Boolean(readyAt);
-    const inspireReady = hasInspiration && nowTs >= readyAt;
-    const isGuard = guard || Boolean(raw.is_guard || raw.guard) || ['2', 'guard', '守卫'].includes(String(raw.status).toLowerCase());
-    const statusText = isGuard && !hasInspiration ? '守卫中' : inspireReady ? '灵感已完成' : hasInspiration ? '灵感收集中' : '未喂食';
-    const statusClass = isGuard && !hasInspiration ? 'guard' : inspireReady ? 'ready' : hasInspiration ? 'progress' : 'idle';
+    const hasEgg = Boolean(raw.have_egg);
+    const predictedEggTime = normalizeEpochSeconds(raw.predicted_egg_time);
+    const eggReady = hasEgg || (predictedEggTime > 0 && nowTs >= predictedEggTime);
+    const feedRound = Number(homePet.feed_round || raw.feed_round || 0) || 0;
+    const gender = Number(display.gender || raw.gender || 0) || 0;
+    const isMale = gender === 1;
+    const status = homePet.status ?? raw.status;
+    const isGuard = guard || Boolean(raw.is_guard || raw.guard) || ['2', 'guard', '守卫'].includes(String(status).toLowerCase());
+    const hasInspiration = feedRound > 0;
+    const inspireReady = hasInspiration;
+    const statusText = isGuard && !hasInspiration ? '守卫中'
+        : (inspireReady ? '可收取灵感'
+            : (hasInspiration ? '灵感收集中'
+                : '未喂食'));
+    const statusClass = isGuard && !hasInspiration ? 'guard'
+        : (eggReady ? 'ready'
+            : (inspireReady ? 'progress'
+                : (hasInspiration ? 'progress'
+                    : 'idle')));
+    let note;
+    if (isGuard && String(petId) === '0') {
+        note = '家园守卫位';
+    }
+    else if (eggReady) {
+        note = '可收取';
+    }
+    else if (predictedEggTime > 0) {
+        note = `${formatEggRemaining(predictedEggTime, nowTs)}后生蛋`;
+    }
+    else if (feedRound > 0) {
+        note = isMale ? '' : '等待生蛋';
+    }
+    else if (isGuard) {
+        note = '家园守卫位';
+    }
+    else {
+        note = '未喂食';
+    }
     return {
         id: String(petId || ''),
         pos: raw.pos || raw.position || index + 1,
         name: String(homePet.name || homePet.pet_name || raw.name || raw.pet_name || `精灵 ${petId || ''}`),
         level: display.level || raw.level || homePet.level || '--',
         iconUrl: homePetIcon(petId, raw.icon_url || raw.pet_img_url || raw.petIcon || ''),
-        badge: isGuard ? '守' : '',
+        badge: isGuard ? '守' : (hasEgg ? '蛋' : ''),
         isGuard,
         statusText,
         statusClass,
-        note: hasInspiration ? formatHomeRemaining(readyAt, nowTs) : (isGuard ? '家园守卫位' : '暂无灵感倒计时'),
-        inspireReady,
-        readyAt,
+        note,
+        inspireReady: eggReady,
+        readyAt: predictedEggTime || 0,
+        gender,
     };
 }
 function homePetSources(homeInfo) {
@@ -1011,6 +1051,18 @@ function buildHomeRenderData(deps, res, uid) {
         if (item)
             guardPets.push(item);
     });
+    indoorPets.sort((a, b) => {
+        if (a.gender === 2 && b.gender !== 2)
+            return -1;
+        if (a.gender !== 2 && b.gender === 2)
+            return 1;
+        if (a.gender === 2) {
+            const ta = a.readyAt || Number.MAX_SAFE_INTEGER;
+            const tb = b.readyAt || Number.MAX_SAFE_INTEGER;
+            return ta - tb;
+        }
+        return 0;
+    });
     const gardenPlots = extractHomePlants(deps, homeInfo);
     const createdAt = normalizeEpochSeconds(res?.meta?.created_at);
     return {
@@ -1153,6 +1205,45 @@ function buildFriendshipRenderData(payload, userIds) {
         copyright: 'Koishi & WeGame Locke Kingdom Plugin',
     };
 }
+function buildStudentRenderData(statePayload, perksPayload, area, accountType) {
+    const school = statePayload?.school || statePayload?.school_name || '未返回';
+    const certified = String(statePayload?.certified) === '1';
+    const cards = perksPayload?.cards || [];
+    return {
+        title: '洛克学生',
+        subtitle: `大区：${area}  账号类型：${accountTypeText(accountType)}`,
+        heroTitle: '学生信息总览',
+        heroValue: certified ? '已通过' : '未认证',
+        heroSubvalue: school,
+        summaryCards: [
+            { label: '认证状态', value: certified ? '已认证' : '未认证' },
+            { label: '学校', value: school },
+            { label: '奖励数量', value: String(cards.length) },
+        ],
+        stateItems: [
+            { label: '学生认证', value: certified ? '是' : '否' },
+            { label: '游戏内认证', value: String(statePayload?.game_certified) === '1' ? '是' : '否' },
+            { label: '学校', value: school },
+            { label: '上游状态', value: statePayload?.result?.error_message || 'WG_COMM_SUCC' },
+            { label: '上游错误码', value: stringifyInspectValue(statePayload?.result?.error_code || 0) },
+        ],
+        perkCards: cards.map((card) => ({
+            name: card.name || `奖励 #${card.id || '-'}`,
+            count: card.count || 0,
+            desc: card.desc || '暂无说明',
+            icon: card.icon || '',
+            id: stringifyInspectValue(card.id),
+            stateText: `状态码 ${stringifyInspectValue(card.state)}`,
+        })),
+        detailItems: Object.entries(perksPayload || {})
+            .filter(([key, value]) => !['cards', 'result'].includes(key) && (value === null || typeof value !== 'object'))
+            .map(([key, value]) => ({ label: key.replace(/_/g, ' '), value: stringifyInspectValue(value) })),
+        stateResult: statePayload?.result?.error_message || 'WG_COMM_SUCC',
+        perksResult: perksPayload?.result?.error_message || 'WG_COMM_SUCC',
+        commandHint: '洛克.学生 [area] [account_type]',
+        copyright: 'Koishi & WeGame Locke Kingdom Plugin',
+    };
+}
 function sessionTarget(session) {
     return {
         platform: session?.platform || session?.bot?.platform || '',

package/lib/commands/tools.d.ts

@@ -0,0 +1,2 @@
+import { PluginDeps } from '../types';
+export declare function register(deps: PluginDeps): void;

package/lib/commands/tools.js

@@ -0,0 +1,164 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.register = register;
+const koishi_1 = require("koishi");
+const activities_service_1 = require("../activities-service");
+const send_image_1 = require("../send-image");
+const logger = new koishi_1.Logger('rocom-tools');
+const activitiesService = new activities_service_1.ActivitiesService();
+function trimText(value) {
+    return String(value ?? '').trim();
+}
+function stripHtml(value) {
+    return trimText(value)
+        .replace(/<br\s*\/?>/gi, '\n')
+        .replace(/<\/p>/gi, '\n')
+        .replace(/<[^>]+>/g, '')
+        .replace(/&nbsp;/g, ' ')
+        .replace(/&amp;/g, '&')
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/\n{3,}/g, '\n\n')
+        .trim();
+}
+function formatDate(value) {
+    const text = trimText(value);
+    if (!text)
+        return '未知时间';
+    const numeric = Number(text);
+    const date = Number.isFinite(numeric)
+        ? new Date(numeric > 10000000000 ? numeric : numeric * 1000)
+        : new Date(text);
+    if (Number.isNaN(date.getTime()))
+        return text;
+    const pad = (num) => String(num).padStart(2, '0');
+    return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
+}
+function pageNumber(value, defaultValue = 1) {
+    const num = Number(value);
+    if (!Number.isFinite(num) || num < 1)
+        return defaultValue;
+    return Math.min(50, Math.floor(num));
+}
+function firstArray(payload, keys) {
+    if (!payload || typeof payload !== 'object')
+        return [];
+    for (const key of keys) {
+        if (Array.isArray(payload[key]))
+            return payload[key];
+    }
+    if (payload.data && typeof payload.data === 'object')
+        return firstArray(payload.data, keys);
+    return [];
+}
+function announcementId(item) {
+    return trimText(item?.thread_id || item?.id);
+}
+function buildAnnouncementListText(data, page) {
+    const list = firstArray(data, ['list', 'items']);
+    if (!list.length)
+        return page > 1 ? '该页没有更多公告。' : '当前没有公告数据。';
+    const lines = ['洛克公告'];
+    for (const [index, item] of list.entries()) {
+        const title = trimText(item?.title) || '未命名公告';
+        const summary = trimText(item?.summary);
+        const id = announcementId(item);
+        const stick = Number(item?.isStick) === 1 ? '[置顶]' : '';
+        lines.push(`${index + 1}. ${stick}${title}${id ? ` #${id}` : ''}`);
+        if (summary)
+            lines.push(`   ${summary.length > 70 ? `${summary.slice(0, 67)}...` : summary}`);
+        lines.push(`   ${formatDate(item?.publishAt || item?.published_at || item?.createdAt)}`);
+    }
+    const current = Number(data?.page) || page;
+    if (data?.has_more || data?.next_page) {
+        lines.push(`当前第 ${current} 页，下一页：洛克.公告 ${data.next_page || current + 1}`);
+    }
+    lines.push('详情：洛克.公告详情 <公告ID>');
+    return lines.join('\n');
+}
+function buildAnnouncementDetailText(data) {
+    const item = data?.detail || data?.announcement || data;
+    if (!item || typeof item !== 'object')
+        return '公告详情为空。';
+    const title = trimText(item?.title) || '未命名公告';
+    const id = announcementId(item);
+    const summary = trimText(item?.summary);
+    const content = stripHtml(item?.content?.text || item?.text || item?.content);
+    const lines = [
+        `公告详情${id ? ` #${id}` : ''}`,
+        title,
+        `发布时间：${formatDate(item?.publishAt || item?.published_at || item?.createdAt)}`,
+    ];
+    if (summary)
+        lines.push(`摘要：${summary}`);
+    if (content) {
+        lines.push('');
+        lines.push(content.length > 900 ? `${content.slice(0, 900)}...` : content);
+    }
+    const images = Array.isArray(item?.content?.indexes)
+        ? item.content.indexes.flatMap((entry) => Array.isArray(entry?.imageUrl) ? entry.imageUrl : [])
+        : [];
+    if (images.length) {
+        lines.push('');
+        lines.push(`图片资源：${images.slice(0, 3).join('\n')}`);
+    }
+    return lines.join('\n');
+}
+function register(deps) {
+    const { ctx, client, config, renderer } = deps;
+    ctx.command('洛克').subcommand('.日历 [mode:string]', '查看洛克活动日历')
+        .alias('洛克日历')
+        .action(async ({ session }, mode = '') => {
+        const refresh = ['刷新', 'refresh', 'true', '1'].includes(String(mode || '').toLowerCase());
+        const data = await client.getActivitiesInfo(ctx, refresh, session?.userId || '');
+        if (!data)
+            return `活动日历查询失败：${client.getLastErrorBrief()}`;
+        const fallback = activitiesService.buildFallbackText(data);
+        if (!session?.send)
+            return fallback;
+        const image = await renderer.renderHtml(ctx, 'activities', activitiesService.buildRenderData(data));
+        await (0, send_image_1.sendImageWithFallback)(session, image, fallback, 'activities:calendar', config);
+    });
+    ctx.command('洛克').subcommand('.公告 [page:number]', '查看洛克公告列表')
+        .alias('洛克公告')
+        .action(async ({ session }, page = 1) => {
+        const currentPage = pageNumber(page);
+        const data = await client.getAnnouncementList(ctx, { category_id: 99, page: currentPage, limit: 10 }, session?.userId || '');
+        if (!data)
+            return `公告列表查询失败：${client.getLastErrorBrief()}`;
+        return buildAnnouncementListText(data, currentPage);
+    });
+    ctx.command('洛克').subcommand('.最新公告', '查看最新洛克公告')
+        .alias('洛克最新公告')
+        .action(async ({ session }) => {
+        const data = await client.getLatestAnnouncement(ctx, { category_id: 99 }, session?.userId || '');
+        if (!data)
+            return `最新公告查询失败：${client.getLastErrorBrief()}`;
+        return buildAnnouncementDetailText(data);
+    });
+    ctx.command('洛克').subcommand('.公告详情 <threadId:string>', '查看公告详情')
+        .alias('洛克公告详情')
+        .action(async ({ session }, threadId) => {
+        const id = trimText(threadId);
+        if (!/^\d+$/.test(id))
+            return '请提供公告 ID。用法：洛克.公告详情 <公告ID>';
+        const data = await client.getAnnouncementDetail(ctx, id, session?.userId || '');
+        if (!data)
+            return `公告详情查询失败：${client.getLastErrorBrief()}`;
+        return buildAnnouncementDetailText(data);
+    });
+    ctx.command('洛克').subcommand('.同步配置', '手动同步 RoCom 远端配置')
+        .alias('洛克同步配置')
+        .action(async ({ session }) => {
+        if (!config.adminUserIds.includes(session?.userId || ''))
+            return '此指令仅限管理员使用。';
+        const data = await client.syncConfig(ctx, session?.userId || '');
+        if (!data)
+            return `同步配置失败：${client.getLastErrorBrief()}`;
+        logger.info(`manual config sync requested by ${session?.userId || 'unknown'}`);
+        const skipped = Array.isArray(data?.skipped_resources) ? data.skipped_resources.length : 0;
+        return skipped
+            ? `配置同步完成，但有 ${skipped} 个资源跳过。`
+            : '配置同步完成。';
+    });
+}

package/lib/egg-service.d.ts

@@ -27,6 +27,8 @@ export declare class EggService {
     private rangeMatchScore;
     private formatPetCard;
     private formatSizeApiCard;
+    private formatEggSearchCard;
+    private formatEggSearchTextLine;
     private mergeCardsByName;
     private mergeSizeCard;
     private minValue;
@@ -47,6 +49,7 @@ export declare class EggService {
         range: any[];
     }, heightDisplay?: string): string;
     buildSizeSearchTextFromApi(height?: number, weight?: number, results?: any, heightDisplay?: string): string;
+    buildEggSearchText(heightMeters?: number, weight?: number, results?: any, heightDisplay?: string): string;
     buildSearchText(pet: any): string;
     buildCandidatesText(keyword: string, candidates: any[]): string;
     buildWantPetText(pet: any): string;
@@ -225,5 +228,14 @@ export declare class EggService {
         commandHint: string;
         copyright: string;
     };
+    buildEggSearchData(heightMeters?: number, weight?: number, results?: any, heightDisplay?: string): {
+        query_label: string;
+        perfect_matches: any;
+        range_matches: any[];
+        total_count: any;
+        has_results: boolean;
+        commandHint: string;
+        copyright: string;
+    };
     private buildEggDetails;
 }

package/lib/egg-service.js

@@ -306,6 +306,42 @@ class EggService {
             match_info_label: this.formatMatchSummary(probability, matchCount),
         };
     }
+    formatEggSearchCard(item) {
+        const eggGroups = Array.isArray(item?.egg_groups)
+            ? item.egg_groups
+                .map((group) => group?.official_name || group?.display_name || `蛋组${group?.group_id}`)
+                .filter(Boolean)
+            : [];
+        const heightRange = Array.isArray(item?.height_range_m) ? item.height_range_m : [];
+        const weightRange = Array.isArray(item?.weight_range_kg) ? item.weight_range_kg : [];
+        const typeLabel = Array.isArray(item?.unit_type) && item.unit_type.length
+            ? item.unit_type.join(' / ')
+            : '未知';
+        return {
+            id: item?.id || '-',
+            name: item?.name || '未知精灵',
+            icon: item?.pet_icon_url || petIconUrl(item?.id),
+            image: item?.pet_img_url || petImageUrl(item?.id),
+            type_label: typeLabel,
+            egg_group_ids: Array.isArray(item?.egg_groups)
+                ? item.egg_groups.map((group) => Number(group?.group_id)).filter((value) => Number.isFinite(value))
+                : [],
+            egg_groups_label: eggGroups.length ? eggGroups.join(' / ') : '暂无蛋组数据',
+            height_min: num(heightRange[0]),
+            height_max: num(heightRange[1]),
+            height_label: fmtRange(num(heightRange[0]), num(heightRange[1]), 'm'),
+            weight_min: num(weightRange[0]),
+            weight_max: num(weightRange[1]),
+            weight_label: fmtRange(num(weightRange[0]), num(weightRange[1]), 'kg'),
+            probability: null,
+            match_count: null,
+            match_info_label: '',
+        };
+    }
+    formatEggSearchTextLine(item) {
+        const card = this.formatEggSearchCard(item);
+        return `${card.name} (#${card.id}) — ${card.height_label} / ${card.weight_label} · ${card.egg_groups_label}`;
+    }
     mergeCardsByName(perfect, ranged) {
         const perfectMap = new Map();
         const rangedMap = new Map();
@@ -482,6 +518,26 @@ class EggService {
         }
         return lines.join('\n');
     }
+    buildEggSearchText(heightMeters, weight, results, heightDisplay) {
+        const cond = [];
+        if (heightMeters != null)
+            cond.push(`身高=${heightDisplay || `${formatNumber(heightMeters)}m`}`);
+        if (weight != null)
+            cond.push(`体重=${weight}kg`);
+        const condStr = cond.join(' + ') || '当前条件';
+        const items = Array.isArray(results?.items) ? results.items : [];
+        if (!items.length)
+            return `❌ 未找到符合 ${condStr} 的精灵。`;
+        const total = results?.total ?? items.length;
+        const lines = [`✅ 符合 ${condStr} 的精灵（共 ${total} 只）：`];
+        items.slice(0, 10).forEach((item, index) => {
+            lines.push(`  ${index + 1}. ${this.formatEggSearchTextLine(item)}`);
+        });
+        if (results?.has_more) {
+            lines.push(`  ... 还有更多结果，可尝试更精确的尺寸或等待后续分页支持。`);
+        }
+        return lines.join('\n');
+    }
     buildSearchText(pet) {
         const egs = this.getEggGroups(pet);
         const compat = this.getCompatiblePets(pet);
@@ -669,6 +725,26 @@ class EggService {
             copyright: 'Koishi & WeGame 洛克王国插件',
         };
     }
+    buildEggSearchData(heightMeters, weight, results, heightDisplay) {
+        const conditions = [];
+        if (heightMeters != null)
+            conditions.push(`身高 ${heightDisplay || `${formatNumber(heightMeters)} m`}`);
+        if (weight != null)
+            conditions.push(`体重 ${weight} kg`);
+        const cards = (Array.isArray(results?.items) ? results.items : []).map((item) => this.formatEggSearchCard(item));
+        const pageNo = num(results?.page_no);
+        const totalPages = num(results?.total_pages);
+        const pageLabel = pageNo && totalPages ? ` · 第 ${pageNo}/${totalPages} 页` : '';
+        return {
+            query_label: `${conditions.join(' / ') || '孵蛋反查'}${pageLabel}`,
+            perfect_matches: cards,
+            range_matches: [],
+            total_count: results?.total ?? cards.length,
+            has_results: cards.length > 0,
+            commandHint: '洛克查蛋 <精灵名> | 洛克查蛋 0.18m 1.5kg | 洛克配种 <父体> <母体>',
+            copyright: 'Koishi & WeGame 洛克王国插件',
+        };
+    }
     buildEggDetails(breeding) {
         if (!breeding)
             return { has_data: false };

package/lib/index.d.ts

@@ -13,7 +13,9 @@ export interface Config {
     merchantSubscriptionEnabled: boolean;
     merchantSubscriptionItems: string[];
     merchantPrivateSubscriptionEnabled: boolean;
+    merchantCheckMode: 'interval' | 'times';
     merchantCheckInterval: number;
+    merchantCheckTimes: string[];
     homeSubscriptionEnabled: boolean;
     homeSubscriptionIntervalMinutes: number;
     imageCompressionEnabled: boolean;