koishi-plugin-jrys-plus 1.0.1 → 1.0.2

package/lib/index.js

@@ -128,12 +128,14 @@ async function fetchHitokoto() {
 /* ── 主入口 ── */
 function apply(ctx, config) {
     si.initDatabase(ctx);
-    const signin = new si.Signin(ctx, config);
+    const db = ctx.database;
+    const puppeteer = ctx.puppeteer;
+    const signin = new si.Signin(db, config);
     const jrys = new roll_1.Jrys();
     // 合并事件
     const eventJson = [...event_1.defaultEventJson, ...config.event];
     // 注册排行榜
-    (0, ranks_1.registerRanks)(ctx, config, () => config.levelSet);
+    (0, ranks_1.registerRanks)(ctx, db, config, () => config.levelSet);
     /* ── 运势签到命令 ── */
     ctx.command('jrys', '今日运势')
         .userFields(['id', 'name'])
@@ -184,7 +186,7 @@ function apply(ctx, config) {
                 .replace('{{BADDO}}', baddo);
             const outPath = path_1.default.resolve(__dirname, 'templates', '_fortune_render.html');
             fs_1.default.writeFileSync(outPath, html);
-            page = await ctx.puppeteer.page();
+            page = await puppeteer.page();
             await page.setViewport({ width: 600, height: 1080 * 2 });
             await page.goto(`file:///${outPath}`);
             await page.waitForSelector('#body', { timeout: 10000 });

package/lib/ranks.d.ts

@@ -1,3 +1,3 @@
-import { Context } from 'koishi';
+import { Context, Database } from 'koishi';
 import { LevelInfo } from './signin';
-export declare function registerRanks(ctx: Context, config: any, getLevelConfig: () => LevelInfo[]): void;
+export declare function registerRanks(ctx: Context, db: Database<any>, config: any, getLevelConfig: () => LevelInfo[]): void;

package/lib/ranks.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerRanks = registerRanks;
 const koishi_1 = require("koishi");
+const signin_1 = require("./signin");
 const fs_1 = require("fs");
 const path_1 = require("path");
 /* ── 模板路径候选 ── */
@@ -21,14 +22,6 @@ async function resolveTemplatePath() {
     }
     throw new Error('未找到 rank-card.html 模板文件');
 }
-/* ── 等级查询 ── */
-const DEFAULT_LEVEL = { level: 0, levelExp: 0, levelName: '无等级', levelColor: '#666666' };
-function getLevelInfo(exp, levels) {
-    if (!levels?.length)
-        return DEFAULT_LEVEL;
-    const sorted = [...levels].sort((a, b) => b.levelExp - a.levelExp);
-    return sorted.find(l => exp >= l.levelExp) || sorted[sorted.length - 1];
-}
 /* ── 文本渲染 ── */
 function renderSignText(users, levelConfig, config) {
     const divider = '┏' + '—'.repeat(config.borderwidth) + '┓';
@@ -40,7 +33,7 @@ function renderSignText(users, levelConfig, config) {
         let lines = [`┃ ${medal} ${index + 1}. ${user.displayName}`, `┃  📅${user.signCount.toLocaleString()} 天`];
         if (config.pre_next_LevelDisplay && levelConfig.length) {
             const sorted = [...levelConfig].sort((a, b) => a.levelExp - b.levelExp);
-            const cur = getLevelInfo(user.exp, levelConfig);
+            const cur = (0, signin_1.getLevelInfo)(user.exp, levelConfig);
             const idx = sorted.findIndex(l => l.levelExp === cur.levelExp);
             const prev = sorted[idx - 1]?.levelName;
             const next = sorted[idx + 1]?.levelName;
@@ -70,7 +63,7 @@ async function renderRankImage(ctx, users, totalUsers, limit, getLevelConfig) {
             updateTime: new Date().toLocaleString('zh-CN'),
             users: users.map(user => {
                 const sorted = [...levelConfig].sort((a, b) => a.levelExp - b.levelExp);
-                const cur = getLevelInfo(user.exp, levelConfig);
+                const cur = (0, signin_1.getLevelInfo)(user.exp, levelConfig);
                 const idx = sorted.findIndex(l => l.levelExp === cur.levelExp);
                 const prev = sorted[idx - 1]?.levelName;
                 const nextObj = sorted[idx + 1];
@@ -113,13 +106,13 @@ async function renderRankImage(ctx, users, totalUsers, limit, getLevelConfig) {
     }
 }
 /* ── 注册排行命令 ── */
-function registerRanks(ctx, config, getLevelConfig) {
+function registerRanks(ctx, db, config, getLevelConfig) {
     const logger = ctx.logger('jrys-plus');
     function canUseImage() {
         return config.imageMode && !!ctx.puppeteer;
     }
     async function getRankedUsers() {
-        const all = await ctx.database.get('jrys', {}, { sort: { signCount: 'desc' } });
+        const all = await db.get('jrys', {}, { sort: { signCount: 'desc' } });
         if (!all.length)
             return null;
         const users = all.slice(0, config.limit).map(u => ({
@@ -136,7 +129,7 @@ function registerRanks(ctx, config, getLevelConfig) {
         if (!users.length)
             return '当前频道暂无数据';
         if (canUseImage()) {
-            const total = (await ctx.database.get('jrys', {})).length;
+            const total = (await db.get('jrys', {})).length;
             const img = await renderRankImage(ctx, users, total, config.limit, getLevelConfig);
             if (img)
                 return img;

package/lib/signin.d.ts

@@ -1,4 +1,4 @@
-import { Context } from 'koishi';
+import { Context, Database } from 'koishi';
 declare module 'koishi' {
     interface Tables {
         jrys: _UserFortune;
@@ -38,21 +38,22 @@ export interface SigninConfig {
     levelSet: LevelInfo[];
     fortuneSet: FortuneInfo[];
 }
+export declare function getLevelInfo(exp: number, levels: LevelInfo[]): LevelInfo;
 export declare class Signin {
-    private ctx;
+    private db;
     private cfg;
-    constructor(ctx: Context, cfg: SigninConfig);
+    constructor(db: Database<any>, cfg: SigninConfig);
     /** 执行签到。返回 0=成功, 1=已签到 */
     callSignin(uid: number, userid: string, luck: number): Promise<{
-        status: number;
-        allExp: number;
-        signTime: Date;
-        count: number;
-    } | {
         status: number;
         allExp?: undefined;
         signTime?: undefined;
         count?: undefined;
+    } | {
+        status: number;
+        allExp: any;
+        signTime: Date;
+        count: any;
     }>;
     getLevelInfo(exp: number): {
         levelInfo: LevelInfo;

package/lib/signin.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Signin = exports.defaultFortuneInfo = exports.defaultLevelInfo = void 0;
 exports.initDatabase = initDatabase;
+exports.getLevelInfo = getLevelInfo;
 const timeGreetings = [
     { range: [0, 5], message: '晚安' },
     { range: [5, 9], message: '早上好' },
@@ -59,24 +60,27 @@ function initDatabase(ctx) {
         signCount: 'unsigned',
     });
 }
-/* ── 签到逻辑（无 monetary 依赖） ── */
-const roll_1 = require("./roll");
+function getLevelInfo(exp, levels) {
+    if (!levels?.length)
+        return { level: 0, levelExp: 0, levelName: '无等级', levelColor: '#666666' };
+    const sorted = [...levels].sort((a, b) => b.levelExp - a.levelExp);
+    return sorted.find(l => exp >= l.levelExp) || sorted[sorted.length - 1];
+}
 class Signin {
-    constructor(ctx, cfg) {
-        this.ctx = ctx;
+    constructor(db, cfg) {
+        this.db = db;
         this.cfg = cfg;
     }
     /** 执行签到。返回 0=成功, 1=已签到 */
     async callSignin(uid, userid, luck) {
         const date = new Date();
-        const roll = new roll_1.Jrys();
         // 经验值仅用于后端等级/排行计算，不在签到卡上展示
         const exp = Math.round((Math.random() * 0.5 + luck / 200) *
             (this.cfg.signExp[1] - this.cfg.signExp[0])) + this.cfg.signExp[0];
-        const userData = await this.ctx.database.get('jrys', { id: uid });
+        const userData = await this.db.get('jrys', { id: uid });
         if (userData.length === 0) {
             const accExp = exp;
-            await this.ctx.database.create('jrys', {
+            await this.db.create('jrys', {
                 id: uid,
                 name: userid,
                 time: date,
@@ -90,7 +94,7 @@ class Signin {
         }
         const accExp = userData[0].exp + exp;
         const accCount = userData[0].signCount + 1;
-        await this.ctx.database.set('jrys', { id: uid }, {
+        await this.db.set('jrys', { id: uid }, {
             name: userid,
             time: date,
             exp: accExp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-jrys-plus",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "今日运势签到 + 排行榜，精简优化版",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",