koishi-plugin-jryspro-fast 2.2.3 → 2.2.5

package/lib/index.js

@@ -270,23 +270,12 @@ async function apply(ctx, config) {
     }
   });
   async function htmlToImg(html, width, height) {
-    const reactElement = ctx.toImageService.toReactElement.htmlToReactElement(html);
-    const svg = await ctx.toImageService.reactElementToSvg.satori(
-      reactElement,
-      {
-        width,
-        height
-      }
-    );
-    if (config.imgQuality === 100) {
-      return await ctx.toImageService.svgToImage.vips(svg, {
-        format: "png"
-      });
-    }
-    return await ctx.toImageService.svgToImage.vips(svg, {
-      format: "jpeg",
-      options: {
-        Q: config.imgQuality
+    return await ctx.toImageService.htmlToImage(html, {
+      width,
+      height,
+      ...config.imgQuality === 100 ? {} : {
+        format: "jpeg",
+        quality: config.imgQuality
       }
     });
   }
@@ -335,34 +324,33 @@ async function apply(ctx, config) {
       throw "渲染失败，不知道发生了啥";
     }
     const imgType = await fileType.fileTypeFromBuffer(imgData);
-    const vips = ctx.toImageService.toImageBase.getVips();
+    const sharp = await ctx.toImageService.sharpRenderer.getSharp();
     let img;
     let metaData;
     const touchImg = /* @__PURE__ */ __name(() => {
       if (!img) {
-        img = vips.Image.newFromBuffer(imgData);
+        img = sharp(imgData);
       }
     }, "touchImg");
     if (needMetadata) {
       touchImg();
+      const metadata = await img.metadata();
       metaData = {
-        width: img.width,
-        height: img.height
+        width: metadata.width,
+        height: metadata.height
       };
     }
     if (cover) {
-      img = vips.Image.thumbnailBuffer(imgData, cover.width, {
-        height: cover.height,
-        crop: vips.Interesting.centre
-      });
+      touchImg();
+      img.resize(cover.width, cover.height);
       if (imgType.ext !== "webp") {
-        imgData = Buffer.from(img.pngsaveBuffer());
+        imgData = Buffer.from(await img.toBuffer());
       }
     }
     let mime = imgType.mime;
     if (imgType.ext === "webp") {
       touchImg();
-      imgData = Buffer.from(img.pngsaveBuffer());
+      imgData = Buffer.from(await img.png().toBuffer());
       mime = "image/png";
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-jryspro-fast",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://github.com/pgnqukezrdxmhjso/koishi-plugin-jryspro-fast",
@@ -55,6 +55,6 @@
     "file-type": "^21.3.0"
   },
   "devDependencies": {
-    "koishi-plugin-to-image-service": "^0.1.0"
+    "koishi-plugin-to-image-service": "^1.0.1"
   }
 }