koishi-plugin-cfmrmod 1.0.1 → 1.0.2

package/dist/cfmr/index.js

@@ -3,11 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = exports.name = void 0;
 exports.apply = apply;
 const { Schema, h } = require('koishi');
-// 【修复】这里添加了 Path2D 的引入
-const { createCanvas, loadImage, Path2D, GlobalFonts } = require('@napi-rs/canvas');
 const fetch = require('node-fetch');
 const cheerio = require('cheerio');
 const { marked } = require('marked');
+let createCanvas;
+let loadImage;
+let Path2DRef;
+let registerFont;
+async function toImageSrc(input) {
+    const value = (input && typeof input.then === 'function') ? await input : input;
+    if (!value)
+        return '';
+    if (typeof value === 'string')
+        return value;
+    const buf = Buffer.isBuffer(value) ? value : (value instanceof Uint8Array ? Buffer.from(value) : null);
+    if (buf)
+        return `data:image/png;base64,${buf.toString('base64')}`;
+    return String(value);
+}
 const CF_LOADER_MAP = {
     1: 'Forge',
     2: 'Cauldron',
@@ -560,6 +573,8 @@ async function drawProjectCard(data) {
     // Stats & Tags Row
     // Downloads Icon
     const drawIcon = (path, x, y) => {
+        if (!Path2DRef)
+            return;
         ctx.save();
         ctx.translate(x, y);
         ctx.scale(0.8, 0.8);
@@ -567,8 +582,7 @@ async function drawProjectCard(data) {
         ctx.lineWidth = 2;
         ctx.lineCap = 'round';
         ctx.lineJoin = 'round';
-        // Path2D 需要引入
-        const p = new Path2D(path);
+        const p = new Path2DRef(path);
         ctx.stroke(p);
         ctx.restore();
     };
@@ -1488,18 +1502,25 @@ async function searchCurseForge(query, type, apiKey, timeout, gameId = 432) {
 function apply(ctx, config) {
     var _a, _b;
     const logger = ctx.logger('mc-search');
-    if (config.fontPath) {
-        try {
-            const ok = GlobalFonts.registerFromPath(config.fontPath, 'KoishiFont');
-            if (ok)
-                GLOBAL_FONT_FAMILY = 'KoishiFont';
-            else
-                logger.warn('字体加载失败: registerFromPath 返回 false');
-        }
-        catch (e) {
-            logger.warn('字体加载失败: ' + e.message);
-        }
+    const skia = ctx.skia;
+    if (!(skia === null || skia === void 0 ? void 0 : skia.Canvas) || !(skia === null || skia === void 0 ? void 0 : skia.loadImage)) {
+        throw new Error('缺少 skia 服务，请先启用 @ltxhhz/koishi-plugin-skia-canvas');
     }
+    createCanvas = (w, h) => {
+        const c = new skia.Canvas(w || 0, h || 0);
+        if (!c || typeof c.getContext !== 'function') {
+            throw new Error('skia 服务异常：Canvas 无效，请确认使用 @ltxhhz/koishi-plugin-skia-canvas');
+        }
+        return c;
+    };
+    loadImage = skia.loadImage;
+    registerFont = (path, options) => {
+        var _a;
+        if ((_a = skia.FontLibrary) === null || _a === void 0 ? void 0 : _a.use)
+            skia.FontLibrary.use(path, options === null || options === void 0 ? void 0 : options.family);
+    };
+    Path2DRef = skia.Path2D || globalThis.Path2D;
+    // 取消自定义字体配置，使用 skia 默认字体
     const states = new Map();
     const normalizeMessageIds = (res) => {
         if (!res)
@@ -1564,7 +1585,7 @@ function apply(ctx, config) {
                         maxCanvasHeight: config.maxCanvasHeight || 8000
                     });
                 for (const buf of imgBufs) {
-                    await session.send(h.image(buf, 'image/png'));
+                    await session.send(h.image(await toImageSrc(buf)));
                 }
                 if (config.sendLink)
                     await session.send(`链接: ${detailData.url}`);
@@ -1625,7 +1646,7 @@ function apply(ctx, config) {
                             maxCanvasHeight: config.maxCanvasHeight || 8000
                         });
                     for (const buf of imgBufs) {
-                        await session.send(h.image(buf, 'image/png'));
+                        await session.send(h.image(await toImageSrc(buf)));
                     }
                     if (config.sendLink)
                         await session.send(`链接: ${detailData.url}`);

package/dist/index.js

@@ -33,19 +33,19 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Config = exports.name = void 0;
+exports.Config = exports.inject = exports.name = void 0;
 exports.apply = apply;
 const koishi_1 = require("koishi");
 const cfmr = __importStar(require("./plugins/cfmr"));
 const mcmod = __importStar(require("./plugins/mcmod"));
 exports.name = 'minecraft-search';
+exports.inject = ['skia'];
 exports.Config = koishi_1.Schema.object({
     prefixes: koishi_1.Schema.object({
         cf: koishi_1.Schema.string().default('cf'),
         mr: koishi_1.Schema.string().default('mr'),
         cnmc: koishi_1.Schema.string().default('cnmc'),
     }).description('指令前缀设置'),
-    fontPath: koishi_1.Schema.string().role('path').description('中文字体路径 (建议使用含中文和Emoji的字体)'),
     timeouts: koishi_1.Schema.number().default(60000).description('搜索会话超时时间(ms)'),
     debug: koishi_1.Schema.boolean().default(false).description('开启调试日志'),
     cfmr: cfmr.Config.description('CurseForge/Modrinth 搜索与图片卡片'),
@@ -55,7 +55,6 @@ function apply(ctx, config) {
     const prefixes = (config === null || config === void 0 ? void 0 : config.prefixes) || {};
     const shared = {
         prefixes,
-        fontPath: config === null || config === void 0 ? void 0 : config.fontPath,
         timeouts: config === null || config === void 0 ? void 0 : config.timeouts,
         debug: config === null || config === void 0 ? void 0 : config.debug,
     };

package/dist/mcmod/index.js

@@ -6,8 +6,21 @@ const fetch = require('node-fetch');
 const cheerio = require('cheerio');
 const fs = require('fs');
 const path = require('path');
-const { createCanvas, loadImage, registerFont, GlobalFonts } = require('@napi-rs/canvas');
 const { h, Schema } = require('koishi');
+let createCanvas;
+let loadImage;
+let registerFont;
+async function toImageSrc(input) {
+    const value = (input && typeof input.then === 'function') ? await input : input;
+    if (!value)
+        return '';
+    if (typeof value === 'string')
+        return value;
+    const buf = Buffer.isBuffer(value) ? value : (value instanceof Uint8Array ? Buffer.from(value) : null);
+    if (buf)
+        return `data:image/png;base64,${buf.toString('base64')}`;
+    return String(value);
+}
 // Cookie 管理器
 let cookieManager = null;
 try {
@@ -139,13 +152,14 @@ function wrapText(ctx, text, x, y, maxWidth, lineHeight, maxLines = 1000, draw =
     return currentY + lineHeight;
 }
 // ================= 字体注册 =================
-function initFont(preferredPath, logger) {
+function initFont(preferredPath, logger, registerFontFn) {
     const fontName = 'MCModFont';
     const tryRegister = (filePath, source) => {
         if (!fs.existsSync(filePath))
             return false;
         try {
-            if (GlobalFonts.registerFromPath(filePath, fontName)) {
+            if (registerFontFn) {
+                registerFontFn(filePath, { family: fontName });
                 GLOBAL_FONT_FAMILY = fontName;
                 logger.info(`[Font] 成功加载${source}: ${filePath}`);
                 return true;
@@ -2433,7 +2447,24 @@ exports.Config = Schema.object({
 function apply(ctx, config) {
     var _a;
     const logger = ctx.logger('mcmod');
-    if (!initFont(config.fontPath, logger)) { }
+    const skia = ctx.skia;
+    if (!(skia === null || skia === void 0 ? void 0 : skia.Canvas) || !(skia === null || skia === void 0 ? void 0 : skia.loadImage)) {
+        throw new Error('缺少 skia 服务，请先启用 @ltxhhz/koishi-plugin-skia-canvas');
+    }
+    createCanvas = (w, h) => {
+        const c = new skia.Canvas(w || 0, h || 0);
+        if (!c || typeof c.getContext !== 'function') {
+            throw new Error('skia 服务异常：Canvas 无效，请确认使用 @ltxhhz/koishi-plugin-skia-canvas');
+        }
+        return c;
+    };
+    loadImage = skia.loadImage;
+    registerFont = (path, options) => {
+        var _a;
+        if ((_a = skia.FontLibrary) === null || _a === void 0 ? void 0 : _a.use)
+            skia.FontLibrary.use(path, options === null || options === void 0 ? void 0 : options.family);
+    };
+    // 取消自定义字体配置，使用 skia 默认字体
     // 初始化 Cookie
     if (config.cookie) {
         globalCookie = config.cookie;
@@ -2563,7 +2594,7 @@ function apply(ctx, config) {
                             img = await drawTutorialCard(item.link);
                         else
                             img = await createInfoCard(item.link, type);
-                        await session.send(h.image(img, 'image/png'));
+                        await session.send(h.image(await toImageSrc(img)));
                         if (config.sendLink)
                             await session.send(`链接: ${item.link}`);
                         return;
@@ -2612,7 +2643,7 @@ function apply(ctx, config) {
                     const item = results[0];
                     await ensureValidCookie();
                     const img = await drawModCard(item.link);
-                    await session.send(h.image(img, 'image/png'));
+                    await session.send(h.image(await toImageSrc(img)));
                     if (config.sendLink)
                         await session.send(`链接: ${item.link}`);
                     return;
@@ -2716,7 +2747,7 @@ function apply(ctx, config) {
                             img = await drawTutorialCard(item.link);
                         else
                             img = await createInfoCard(item.link, currentState.type);
-                        await session.send(h.image(img, 'image/png'));
+                        await session.send(h.image(await toImageSrc(img)));
                         if (config.sendLink)
                             await session.send(`链接: ${item.link}`);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-cfmrmod",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Koishi 插件：搜索 CurseForge/Modrinth/MCMod 并渲染图片卡片",
   "main": "dist/index.js",
   "files": [
@@ -39,10 +39,10 @@
     "pub": "npm run build && npm publish --access public"
   },
   "peerDependencies": {
-    "koishi": "^4.0.0"
+    "koishi": "^4.0.0",
+    "@ltxhhz/koishi-plugin-skia-canvas": "^0.0.10"
   },
   "dependencies": {
-    "@napi-rs/canvas": "^0.1.55",
     "cheerio": "^1.0.0-rc.12",
     "marked": "^9.1.5",
     "node-fetch": "^2.6.12"
@@ -53,6 +53,9 @@
   "koishi": {
     "description": {
       "zh": "从 CurseForge/Modrinth/MCMod 搜索模组/整合包/光影等内容，并生成图片卡片。"
+    },
+    "service": {
+      "required": ["skia"]
     }
   }
 }