koishi-plugin-bns-fortune 1.0.1 → 1.0.2

package/lib/index.d.ts

@@ -1,6 +1,8 @@
 /**
  * koishi-plugin-bns-fortune
  * 剑灵风格每日好运签 —— Canvas 绘制，每日一签，文字可变
+ *
+ * 直接使用 node-canvas 包绘制，不依赖 Koishi 的 canvas 服务（避免与其他插件的服务名冲突）。
  */
 import { Context, Schema } from 'koishi';
 import { Fortune } from './fortunes';

package/lib/index.js

@@ -5,6 +5,8 @@ exports.apply = apply;
 /**
  * koishi-plugin-bns-fortune
  * 剑灵风格每日好运签 —— Canvas 绘制，每日一签，文字可变
+ *
+ * 直接使用 node-canvas 包绘制，不依赖 Koishi 的 canvas 服务（避免与其他插件的服务名冲突）。
  */
 const koishi_1 = require("koishi");
 const node_path_1 = require("node:path");
@@ -55,18 +57,6 @@ exports.Config = koishi_1.Schema.intersect([
 exports.config = exports.Config;
 exports.name = 'bns-fortune';
 exports.reusable = true;
-/**
- * 获取 canvas 服务。
- * koishi-plugin-canvas（基于 skia-canvas）会注入 ctx.canvas。
- */
-function getCanvas(ctx) {
-    // koishi-plugin-canvas 注入的服务挂载在 ctx.canvas
-    const canvas = ctx.canvas;
-    if (!canvas) {
-        throw new Error('未检测到 canvas 服务。请在 Koishi 中安装并启用 "koishi-plugin-canvas" 插件，本插件依赖它来绘制签图。');
-    }
-    return canvas;
-}
 /** 注册字体目录下的 ttf/otf（若提供） */
 function tryRegisterFonts(dir) {
     if (!dir)
@@ -84,8 +74,6 @@ function tryRegisterFonts(dir) {
         logger.warn('读取字体目录失败：%o', e);
         return;
     }
-    // skia-canvas 提供 Fontlibrary.use；node-canvas 提供 registerFont。
-    // 两者都尝试，命中其一即可。
     for (const f of files) {
         const lower = f.toLowerCase();
         if (!lower.endsWith('.ttf') && !lower.endsWith('.otf'))
@@ -93,19 +81,10 @@ function tryRegisterFonts(dir) {
         const full = (0, node_path_1.resolve)(abs, f);
         const family = f.replace(/\.(ttf|otf)$/i, '');
         try {
-            // skia-canvas
-            const skia = globalThis.FontLibrary;
-            if (skia?.use) {
-                skia.use(family, [full]);
-                continue;
-            }
-        }
-        catch { /* ignore */ }
-        try {
-            // node-canvas
-            const nodeCanvas = require('canvas');
-            if (typeof nodeCanvas.registerFont === 'function') {
-                nodeCanvas.registerFont(full, { family });
+            // @napi-rs/canvas 的 GlobalFonts.register
+            const { GlobalFonts } = require('@napi-rs/canvas');
+            if (GlobalFonts?.register) {
+                GlobalFonts.register(full, { family });
             }
         }
         catch { /* ignore */ }
@@ -123,12 +102,7 @@ function apply(ctx, config) {
         ? config.results
         : fortunes_1.FORTUNES;
     const theme = render_1.THEMES[config.theme] ?? render_1.THEMES.ink;
-    let renderer;
-    function getRenderer() {
-        if (!renderer)
-            renderer = new render_1.FortuneRenderer(getCanvas(ctx));
-        return renderer;
-    }
+    const renderer = new render_1.FortuneRenderer();
     // 每日每用户渲染缓存：key = `${date}|${userId}`
     const renderCache = new Map();
     // 每天换日时清理
@@ -148,7 +122,7 @@ function apply(ctx, config) {
             return koishi_1.h.image(cached, 'image/png');
         try {
             const { fortune } = (0, fortune_1.drawFortune)(date, session.userId, config.masterKey, library);
-            const png = await getRenderer().render({
+            const png = await renderer.render({
                 fortune,
                 date,
                 nickname: session.username || session.author?.nickname,

package/lib/render.d.ts

@@ -6,23 +6,10 @@
  *   支持 customBackground 配置项替换为外部图片。
  * - 动态文字（签等级/签诗/解签/运势/日期/昵称/签号）每次叠加在背景之上。
  * - 配色用剑灵水墨风（墨黑 / 朱砂红 / 赤金 / 米色），装饰加入剑气、符文元素。
+ *
+ * 直接使用 node-canvas 包，不依赖 Koishi 的 canvas 服务（避免服务名冲突）。
  */
 import { Fortune } from './fortunes';
-export interface CanvasLike {
-    width: number;
-    height: number;
-    getContext(type: '2d'): CanvasRenderingContext2D;
-    /** 兼容 skia-canvas / node-canvas：不传参数时两者都默认返回 PNG Buffer */
-    toBuffer(format?: string, config?: unknown): Buffer;
-}
-export interface ImageLike {
-    width: number;
-    height: number;
-}
-export interface CanvasService {
-    createCanvas(width: number, height: number): CanvasLike;
-    loadImage(source: string | Buffer): Promise<ImageLike>;
-}
 export interface Theme {
     /** 主题名 */
     name: string;
@@ -58,14 +45,12 @@ export interface RenderInput {
     customBackground?: string;
 }
 export declare class FortuneRenderer {
-    private canvas;
     /** 背景缓存：key = `${themeName}|${customBg ?? 'builtin'}` */
     private bgCache;
     /** 自定义背景图缓存：key = url */
     private imageCache;
     /** 缓存条数上限 */
     private static MAX_CACHE;
-    constructor(canvas: CanvasService);
     private evict;
     /** 字体声明字符串，含中文回退 */
     private fontStack;

package/lib/render.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FortuneRenderer = exports.H = exports.W = exports.THEMES = void 0;
+const canvas_1 = require("@napi-rs/canvas");
 exports.THEMES = {
     /** 剑灵·水墨：墨黑朱砂赤金 */
     ink: {
@@ -31,8 +32,7 @@ exports.THEMES = {
 exports.W = 600;
 exports.H = 860;
 class FortuneRenderer {
-    constructor(canvas) {
-        this.canvas = canvas;
+    constructor() {
         /** 背景缓存：key = `${themeName}|${customBg ?? 'builtin'}` */
         this.bgCache = new Map();
         /** 自定义背景图缓存：key = url */
@@ -61,11 +61,11 @@ class FortuneRenderer {
             // 自定义背景：加载图片并缩放绘制到画布
             let img = this.imageCache.get(customBg);
             if (!img) {
-                img = await this.canvas.loadImage(customBg);
+                img = await (0, canvas_1.loadImage)(customBg);
                 this.imageCache.set(customBg, img);
                 this.evict(this.imageCache);
             }
-            bg = this.canvas.createCanvas(exports.W, exports.H);
+            bg = (0, canvas_1.createCanvas)(exports.W, exports.H);
             const ctx = bg.getContext('2d');
             // 先填底色，避免透明
             ctx.fillStyle = theme.bg;
@@ -80,7 +80,7 @@ class FortuneRenderer {
             drawBorder(ctx, exports.W, exports.H, theme);
         }
         else {
-            bg = this.canvas.createCanvas(exports.W, exports.H);
+            bg = (0, canvas_1.createCanvas)(exports.W, exports.H);
             const ctx = bg.getContext('2d');
             drawBackground(ctx, exports.W, exports.H, theme);
         }
@@ -92,8 +92,9 @@ class FortuneRenderer {
     async render(input) {
         const { fortune, date, nickname, fontFamily, theme, customBackground } = input;
         const bg = await this.getBackground(theme, customBackground);
-        const canvas = this.canvas.createCanvas(exports.W, exports.H);
+        const canvas = (0, canvas_1.createCanvas)(exports.W, exports.H);
         const ctx = canvas.getContext('2d');
+        // 1. 复制缓存背景
         ctx.drawImage(bg, 0, 0);
         // 2. 顶部绸带 + 签等级标题（动态）
         drawRibbon(ctx, exports.W / 2, 78, theme);
@@ -108,8 +109,8 @@ class FortuneRenderer {
         drawLuckTags(ctx, exports.W / 2, 638, fortune.luck, this.fontStack(fontFamily), theme);
         // 7. 底部：日期 / 昵称 / 签号
         drawFooter(ctx, exports.W, exports.H, date, nickname, fortune.number, this.fontStack(fontFamily), theme);
-        // 不传参数：skia-canvas 与 node-canvas 均默认返回 PNG，兼容性最好
-        return canvas.toBuffer();
+        // @napi-rs/canvas 需要传 mime type
+        return canvas.toBuffer('image/png');
     }
 }
 exports.FortuneRenderer = FortuneRenderer;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bns-fortune",
   "description": "剑灵风格每日好运签：每日一签，Canvas 绘制签图，文字可变，支持自定义背景与主题。",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -10,11 +10,6 @@
   "koishi": {
     "description": {
       "zh": "剑灵好运签（每日一签）"
-    },
-    "manifest": {
-      "services": [
-        "canvas"
-      ]
     }
   },
   "keywords": [
@@ -35,17 +30,15 @@
   },
   "peerDependencies": {
     "koishi": "^4.15.0",
-    "koishi-plugin-canvas": "^0.2.2",
-    "canvas": "^2.0.0"
+    "@napi-rs/canvas": "^0.1.0"
   },
   "peerDependenciesMeta": {
-    "canvas": {
-      "optional": true
+    "@napi-rs/canvas": {
+      "optional": false
     }
   },
   "devDependencies": {
     "koishi": "^4.15.0",
-    "koishi-plugin-canvas": "^0.2.2",
     "rimraf": "^5.0.0",
     "typescript": "^5.4.0"
   }