koishi-plugin-jryspro-fast 2.2.1 → 2.2.2

package/CHANGELOG.md

@@ -226,3 +226,9 @@
 ### 修改
 
 * 修改必备插件为vercelSatoriPngService。没有vercelSatoriPngService渲染不了图片。
+
+## v2.2.2
+
+### 优化
+
+* 图片处理库sharp替换为更好的wasm-vips

package/lib/index.d.ts

@@ -46,4 +46,4 @@ export interface JrysItem {
     signText: string;
     unsignText: string;
 }
-export declare function apply(ctx: Context, config: Config): void;
+export declare function apply(ctx: Context, config: Config): Promise<void>;

package/lib/index.js

@@ -40,7 +40,7 @@ module.exports = __toCommonJS(src_exports);
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = __toESM(require("node:path"));
 var import_node_crypto = __toESM(require("node:crypto"));
-var import_sharp = __toESM(require("sharp"));
+var import_wasm_vips = __toESM(require("wasm-vips"));
 var import_koishi = require("koishi");
 var name = "jryspro-fast";
 var logger = new import_koishi.Logger(name);
@@ -89,13 +89,14 @@ var schema = import_koishi.Schema.object({
   avatarUrl: import_koishi.Schema.string().role("link").description("默认头像URL(https?://或者file:///)")
 });
 var inject = ["vercelSatoriPngService", "database"];
-function apply(ctx, config) {
-  let fileType;
+async function apply(ctx, config) {
+  let fileType = await import("file-type");
+  const vips = await (0, import_wasm_vips.default)();
   const template = import_node_fs.default.readFileSync(import_node_path.default.join(__dirname, "../assets/template.html"), "utf8").replace(/[\s\S]*<body[^>]*>([\s\S]*)<\/body>[\s\S]*/, "$1").trim();
   const template2 = import_node_fs.default.readFileSync(import_node_path.default.join(__dirname, "../assets/template2.html"), "utf8").replace(/[\s\S]*<body[^>]*>([\s\S]*)<\/body>[\s\S]*/, "$1").trim();
-  const defaultAvatar = `data:image/png;base64,` + Buffer.from(import_node_fs.default.readFileSync(import_node_path.default.join(__dirname, "../assets/avatar.png"))).toString(
-    "base64"
-  );
+  const defaultAvatar = `data:image/png;base64,` + Buffer.from(
+    import_node_fs.default.readFileSync(import_node_path.default.join(__dirname, "../assets/avatar.png"))
+  ).toString("base64");
   const jrysJson = JSON.parse(
     import_node_fs.default.readFileSync(import_node_path.default.join(__dirname, "../assets/jrys.json"), "utf8")
   );
@@ -218,7 +219,7 @@ function apply(ctx, config) {
           needMetadata: true
         });
         width += Math.round(
-          (height - 14) / background.metadata.height * background.metadata.width
+          (height - 14) / background.metaData.height * background.metaData.width
         );
         const replacedContent = template2.replace(
           /rgba\(255, 255, 255, 0\.6\)/g,
@@ -278,13 +279,6 @@ function apply(ctx, config) {
       }
     }
   });
-  async function loadFileType() {
-    if (!fileType) {
-      fileType = await import("file-type");
-    }
-    return fileType;
-  }
-  __name(loadFileType, "loadFileType");
   function getUserKey(session) {
     let etime = (/* @__PURE__ */ new Date()).setHours(0, 0, 0, 0);
     let userId;
@@ -311,8 +305,11 @@ function apply(ctx, config) {
     return jrysJson[getUserKey(session).key];
   }
   __name(getJrys, "getJrys");
-  async function downloadUrl(args) {
-    const { url, cover, needMetadata } = args;
+  async function downloadUrl({
+    url,
+    cover,
+    needMetadata
+  }) {
     if (/^data:/i.test(url)) {
       return { base64: url };
     }
@@ -325,57 +322,39 @@ function apply(ctx, config) {
       logger.error("未知url类型");
       throw "渲染失败，不知道发生了啥";
     }
-    await loadFileType();
     const imgType = await fileType.fileTypeFromBuffer(imgData);
-    let imgSharp;
-    let metadata;
-    const touchImgSharp = /* @__PURE__ */ __name(() => {
-      if (!imgSharp) {
-        imgSharp = (0, import_sharp.default)(imgData);
+    let img;
+    let metaData;
+    const touchImg = /* @__PURE__ */ __name(() => {
+      if (!img) {
+        img = vips.Image.newFromBuffer(imgData);
       }
-    }, "touchImgSharp");
+    }, "touchImg");
     if (needMetadata) {
-      touchImgSharp();
-      metadata = await imgSharp.metadata();
+      touchImg();
+      metaData = {
+        width: img.width,
+        height: img.height
+      };
     }
     if (cover) {
-      touchImgSharp();
-      if (!metadata) {
-        metadata = await imgSharp.metadata();
-      }
-      const newWh = {
-        width: cover.width,
-        height: cover.height
-      };
-      if (metadata.height * (cover.width / metadata.width) < cover.height) {
-        newWh.width = Math.round(
-          metadata.width * (cover.height / metadata.height)
-        );
-      } else {
-        newWh.height = Math.round(
-          metadata.height * (cover.width / metadata.width)
-        );
-      }
-      imgSharp.resize(newWh);
-      imgSharp.extract({
-        left: Math.round((newWh.width - cover.width) / 2),
-        width: cover.width,
-        top: Math.round((newWh.height - cover.height) / 2),
-        height: cover.height
+      img = vips.Image.thumbnailBuffer(imgData, cover.width, {
+        height: cover.height,
+        crop: vips.Interesting.centre
       });
       if (imgType.ext !== "webp") {
-        imgData = await imgSharp.toBuffer();
+        imgData = Buffer.from(img.pngsaveBuffer());
       }
     }
     let mime = imgType.mime;
     if (imgType.ext === "webp") {
-      touchImgSharp();
-      imgData = await imgSharp.png({}).toBuffer();
+      touchImg();
+      imgData = Buffer.from(img.pngsaveBuffer());
       mime = "image/png";
     }
     return {
       base64: `data:${mime};base64,` + imgData.toString("base64"),
-      metadata
+      metaData
     };
   }
   __name(downloadUrl, "downloadUrl");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-jryspro-fast",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://github.com/pgnqukezrdxmhjso/koishi-plugin-jryspro-fast",
@@ -52,10 +52,10 @@
     "koishi": "^4.16.0"
   },
   "devDependencies": {
-    "koishi-plugin-vercel-satori-png-service": "^0.1.5"
+    "koishi-plugin-vercel-satori-png-service": "^0.1.7"
   },
   "dependencies": {
     "file-type": "^21.0.0",
-    "sharp": "^0.34.3"
+    "wasm-vips": "^0.0.16"
   }
 }