koishi-plugin-starfx-bot 0.26.7 → 0.26.8

package/lib/index.js

@@ -63,7 +63,7 @@ var package_default = {
   contributors: [
     "StarFreedomX <starfreedomx@outlook.com>"
   ],
-  version: "0.26.5",
+  version: "0.26.7",
   main: "lib/index.js",
   typings: "lib/index.d.ts",
   files: [
@@ -99,7 +99,7 @@ var package_default = {
     koishi: "^4.18.7"
   },
   dependencies: {
-    axios: "^1.9.0",
+    axios: "^1.15.0",
     "chart.js": "^4.5.1",
     "chartjs-adapter-dayjs-3": "^1.2.3",
     cheerio: "^1.0.0",
@@ -630,7 +630,7 @@ async function getImageSrc(session, param, option) {
 __name(getImageSrc, "getImageSrc");
 async function getImageFromUrl(ctx, url) {
   if (!url) throw new Error("URL must be provided");
-  const sharp = ctx.QhzySharp.Sharp;
+  const sharp = getSharpConstructor(ctx);
   try {
     let input;
     if (/^https?:\/\//i.test(url)) {
@@ -856,6 +856,16 @@ function ready(session, cfg, param, readyMap) {
   return returnMessage;
 }
 __name(ready, "ready");
+function getSharpConstructor(ctx) {
+  const raw = ctx.QhzySharp?.Sharp;
+  if (!raw) throw new Error("Sharp Service 尚未就绪");
+  const sharpConstructor = typeof raw === "function" ? raw : raw.default;
+  if (typeof sharpConstructor !== "function") {
+    throw new Error("无法获取 Sharp 构造函数，请尝试重启 Koishi 或检查 w-node 状态");
+  }
+  return sharpConstructor;
+}
+__name(getSharpConstructor, "getSharpConstructor");
 
 // src/plugins/drawHead.ts
 async function handleBanGDreamConfig(options) {
@@ -997,7 +1007,7 @@ async function drawLock(ctx, baseImage) {
       console.error(error.message);
     }
   }
-  const sharp = ctx.QhzySharp.Sharp;
+  const sharp = getSharpConstructor(ctx);
   const imageMetadata = await image.metadata();
   const lockUrl = `${baseDir}/data/starfx-bot/assets/lock.png`;
   const size1 = Math.min(imageMetadata.width, imageMetadata.height);
@@ -1021,7 +1031,7 @@ async function drawSold(ctx, baseImage) {
       console.error(error.message);
     }
   }
-  const sharp = ctx.QhzySharp.Sharp;
+  const sharp = getSharpConstructor(ctx);
   const imageMetadata = await image.metadata();
   const size1 = Math.min(imageMetadata.width, imageMetadata.height);
   image.resize({ width: size1, height: size1, fit: "cover" });
@@ -1082,7 +1092,7 @@ async function drawBanGDream(ctx, avatar, inputOptions) {
         import_node_path3.default.join(assetsDir, "bangborder", `${options.border}.png`)
       )
     ]);
-    const sharp = ctx.QhzySharp.Sharp;
+    const sharp = getSharpConstructor(ctx);
     let image = avatarSharp.resize(500 * zoom, 500 * zoom, { fit: "cover" });
     const borderImage = await sharp(borderBuffer).resize(500 * zoom, 500 * zoom, { fit: "cover" }).toBuffer();
     const colorImage = await sharp(colorBuffer).resize(130 * zoom, 130 * zoom, { fit: "cover" }).toBuffer();

package/lib/utils.d.ts

@@ -108,4 +108,8 @@ export declare function safeQuote(str: string, useQuote: boolean): string;
 export declare function writeMap<K, V>(map: Map<K, V>, dest: string): void;
 export declare function readMap<K, V>(url: string): Map<K, V>;
 export declare function ready(session: Session, cfg: Config, param: string, readyMap: Map<string, string[]>): string;
+/**
+ * 安全地从上下文中获取 Sharp 构造函数
+ */
+export declare function getSharpConstructor(ctx: Context): any;
 export {};

package/package.json

@@ -4,7 +4,7 @@
   "contributors": [
     "StarFreedomX <starfreedomx@outlook.com>"
   ],
-  "version": "0.26.7",
+  "version": "0.26.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -128,4 +128,4 @@ StarFreedomX机器人的小功能，自用
 | `0.25.0`  | 优化功能控制模块                          |
 | `0.25.1`  | 修正功能控制模块功能名相关bug                  |
 | `0.26.6`  | 修正roll扔骰子的判断错误                    |
-| `0.26.7`  | 修复sharp库传回参数改为对象的错误               |
+| `0.26.8`  | 修复sharp库传回参数改为对象的错误               |