npm - koishi-plugin-jryspro-fast - Versions diffs - 2.2.1 → 2.2.3 - Mend

koishi-plugin-jryspro-fast 2.2.1 → 2.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -226,3 +226,21 @@
 ### 修改
 * 修改必备插件为vercelSatoriPngService。没有vercelSatoriPngService渲染不了图片。
+## v2.2.2
+### 优化
+* 图片处理库sharp替换为更好的wasm-vips
+## v2.2.3
+### 修改
+* 修改必备插件为to-image-service。没有to-image-service渲染不了图片。
+### 优化
+* 样式
+* 支持图片质量

package/README.md CHANGED Viewed

@@ -18,10 +18,10 @@ jrys plugin for bella
 * -i 渲染图模式输出，这个是默认的
 > 如果你无法使用此插件，请检查
-> - 1. (使用命令时无反应，报错等)请检查指令是否有冲突或者是否正确安装vercelSatoriPngService
+> - 1. (使用命令时无反应，报错等)请检查指令是否有冲突或者是否正确安装to-image-service
 > - 2. 提示“发生未知错误”可能是没有获取到群友的uid，需要在数据库内刷新一下
 > - 3. “数据出错”之类的提示不是本插件的提示，可能你装了其他插件
-> - 4. 启用不了插件。请检查koishi版本，vercelSatoriPngService版本等是否再兼容范围内，或重启koishi，删除此插件依赖再尝试重装
+> - 4. 启用不了插件。请检查koishi版本，to-image-service版本等是否再兼容范围内，或重启koishi，删除此插件依赖再尝试重装
 随机文件夹内图片时请注意路径\`C:user/path/to/\`不要把后面的/忘了
@@ -35,7 +35,7 @@ jrys plugin for bella
 | `imgApi`      |(v1.3.0可用本地文件夹绝对路径)| 图片api地址，仅支持返回图片的api，不支持json等。由于我只制作了竖屏图片适配，建议使用竖屏的图片。在填写时不要把`http(s)://`忘了哦。                            |
 | `waitting`    |     | 是否开启等待提示，默认开启                                                                                           |
 | `defaultMode` |     | 默认输出模式，非以下参数默认为`0`                                                                                      |
-|               | `0` | 渲染输出-vercelSatoriPngService渲染输出                                                                                  |
+|               | `0` | 渲染输出to-image-service渲染输出                                                                                  |
 |               | `1` | 纯文本输出，仅输出文本                                                                                             |
 |               | `2` | (默认)新版竖屏模式输出                                                                               |
 |               | `3` | 图文输出，文字+图片的输出方式                                                                               |
@@ -56,6 +56,6 @@ jrys plugin for bella
 imgApi与subimgApi支持本地文件夹绝对路径和http(s)等网络api
 # TIP
-如果没有图片输出可以看看log时不时vercelSatoriPngService有问题
-确定vercelSatoriPngService没问题那就是api寄了或者本地路径没填对，别把最后面的/省了
+如果没有图片输出可以看看log时不时to-image-service有问题
+确定to-image-service没问题那就是api寄了或者本地路径没填对，别把最后面的/省了
 有问题就github开issues吧

package/assets/template.html CHANGED Viewed

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <title>114514</title>
-    <style lang="css">
+    <style>
       * {
         box-sizing: border-box;
       }
@@ -96,6 +96,7 @@
         <div
           style="
             display: flex;
+            flex-direction: column;
             font-size: 32px;
             background-color: rgba(206, 168, 134, 0.5);
             border: 1px solid #161616;
@@ -103,7 +104,12 @@
             padding: 16px;
           "
         >
-          你是一个一个签名啊啊啊啊啊啊啊啊啊啊啊啊
+          <div>
+            你是半个签名啊啊啊啊啊啊啊啊啊啊啊啊
+          </div>
+          <div>
+            你是另外半个签名啊啊啊啊啊啊啊啊啊啊啊啊
+          </div>
         </div>
         <div
           style="

package/assets/template2.html CHANGED Viewed

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <title>114514</title>
-    <style lang="css">
+    <style>
       * {
         box-sizing: border-box;
       }
@@ -22,7 +22,7 @@
     >
       <div
         style="
-          width: 350px;
+          width: 370px;
           height: 100%;
           padding: 0 20px;
           display: flex;

package/lib/index.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { Context, Schema } from "koishi";
 export declare const name = "jryspro-fast";
-export declare const usage = "\n## \u66F4\u65B0\u63D2\u4EF6\u524D\u8BF7\u505C\u6B62\u8FD0\u884C\u63D2\u4EF6\n\u63D2\u4EF6\u914D\u7F6E\u9879\u53EF\u80FD\u4F1A\u6709\u6539\u52A8\uFF0C\u4E0D\u505C\u6B62\u63D2\u4EF6\u76F4\u63A5\u66F4\u65B0\u53EF\u80FD\u4F1A\u5BFC\u81F4koishi\u70B8\u6389\n\n## \u4F7F\u7528\u8BF4\u660E\n\n> \u5982\u679C\u4F60\u65E0\u6CD5\u4F7F\u7528\u6B64\u63D2\u4EF6\uFF0C\u8BF7\u68C0\u67E5\n> - 1. (\u4F7F\u7528\u547D\u4EE4\u65F6\u65E0\u53CD\u5E94\uFF0C\u62A5\u9519\u7B49)\u8BF7\u68C0\u67E5\u6307\u4EE4\u662F\u5426\u6709\u51B2\u7A81\u6216\u8005\u662F\u5426\u6B63\u786E\u5B89\u88C5vercelSatoriPngService\n> - 2. \u63D0\u793A\u201C\u53D1\u751F\u672A\u77E5\u9519\u8BEF\u201D\u53EF\u80FD\u662F\u6CA1\u6709\u83B7\u53D6\u5230\u7FA4\u53CB\u7684uid\uFF0C\u9700\u8981\u5728\u6570\u636E\u5E93\u5185\u5237\u65B0\u4E00\u4E0B\n> - 3. \u201C\u6570\u636E\u51FA\u9519\u201D\u4E4B\u7C7B\u7684\u63D0\u793A\u4E0D\u662F\u672C\u63D2\u4EF6\u7684\u63D0\u793A\uFF0C\u53EF\u80FD\u4F60\u88C5\u4E86\u5176\u4ED6\u63D2\u4EF6\n> - 4. \u542F\u7528\u4E0D\u4E86\u63D2\u4EF6\u3002\u8BF7\u68C0\u67E5koishi\u7248\u672C\uFF0CvercelSatoriPngService\u7248\u672C\u7B49\u662F\u5426\u518D\u517C\u5BB9\u8303\u56F4\u5185\uFF0C\u6216\u91CD\u542Fkoishi\uFF0C\u5220\u9664\u6B64\u63D2\u4EF6\u4F9D\u8D56\u518D\u5C1D\u8BD5\u91CD\u88C5\n\n\u968F\u673A\u6587\u4EF6\u5939\u5185\u56FE\u7247\u65F6\u8BF7\u6CE8\u610F\u8DEF\u5F84`C:/user/path/to/`\u4E0D\u8981\u628A\u540E\u9762\u7684/\u5FD8\u4E86\n\n## api\u8BF4\u660E\n* api url\u4EE5 #e# \u7ED3\u5C3E\u53EF\u4EE5\u5728\u672B\u5C3E\u6DFB\u52A0\u66F4\u65B0\u65F6\u95F4\u6233(\u4F8B\u5B50\u540E\u9762\u7B49\u4EF7\u7684\u6570\u5B57\u4E3A\u5F53\u524D\u65F6\u95F4\u6233)\n* \u4F8B: https://api.example.com/img?#e#  ==\u7B49\u4EF7\u4E8E== https://api.example.com/img?271878\n* \u4F8B: https://api.example.com/img?type=acc&v=#e#  ==\u7B49\u4EF7\u4E8E== https://api.example.com/img?type=acc&v=271878\n\nimgApi\u4E0EsubimgApi\u652F\u6301\u672C\u5730\u6587\u4EF6\u5939\u7EDD\u5BF9\u8DEF\u5F84\u548Chttp(s)\u7B49\u7F51\u7EDCapi\n";
+export declare const usage = "\n## \u66F4\u65B0\u63D2\u4EF6\u524D\u8BF7\u505C\u6B62\u8FD0\u884C\u63D2\u4EF6\n\u63D2\u4EF6\u914D\u7F6E\u9879\u53EF\u80FD\u4F1A\u6709\u6539\u52A8\uFF0C\u4E0D\u505C\u6B62\u63D2\u4EF6\u76F4\u63A5\u66F4\u65B0\u53EF\u80FD\u4F1A\u5BFC\u81F4koishi\u70B8\u6389\n\n## \u4F7F\u7528\u8BF4\u660E\n\n> \u5982\u679C\u4F60\u65E0\u6CD5\u4F7F\u7528\u6B64\u63D2\u4EF6\uFF0C\u8BF7\u68C0\u67E5\n> - 1. (\u4F7F\u7528\u547D\u4EE4\u65F6\u65E0\u53CD\u5E94\uFF0C\u62A5\u9519\u7B49)\u8BF7\u68C0\u67E5\u6307\u4EE4\u662F\u5426\u6709\u51B2\u7A81\u6216\u8005\u662F\u5426\u6B63\u786E\u5B89\u88C5to-image-service\n> - 2. \u63D0\u793A\u201C\u53D1\u751F\u672A\u77E5\u9519\u8BEF\u201D\u53EF\u80FD\u662F\u6CA1\u6709\u83B7\u53D6\u5230\u7FA4\u53CB\u7684uid\uFF0C\u9700\u8981\u5728\u6570\u636E\u5E93\u5185\u5237\u65B0\u4E00\u4E0B\n> - 3. \u201C\u6570\u636E\u51FA\u9519\u201D\u4E4B\u7C7B\u7684\u63D0\u793A\u4E0D\u662F\u672C\u63D2\u4EF6\u7684\u63D0\u793A\uFF0C\u53EF\u80FD\u4F60\u88C5\u4E86\u5176\u4ED6\u63D2\u4EF6\n> - 4. \u542F\u7528\u4E0D\u4E86\u63D2\u4EF6\u3002\u8BF7\u68C0\u67E5koishi\u7248\u672C\uFF0Cto-image-service\u7248\u672C\u7B49\u662F\u5426\u518D\u517C\u5BB9\u8303\u56F4\u5185\uFF0C\u6216\u91CD\u542Fkoishi\uFF0C\u5220\u9664\u6B64\u63D2\u4EF6\u4F9D\u8D56\u518D\u5C1D\u8BD5\u91CD\u88C5\n\n\u968F\u673A\u6587\u4EF6\u5939\u5185\u56FE\u7247\u65F6\u8BF7\u6CE8\u610F\u8DEF\u5F84`C:/user/path/to/`\u4E0D\u8981\u628A\u540E\u9762\u7684/\u5FD8\u4E86\n\n## api\u8BF4\u660E\n* api url\u4EE5 #e# \u7ED3\u5C3E\u53EF\u4EE5\u5728\u672B\u5C3E\u6DFB\u52A0\u66F4\u65B0\u65F6\u95F4\u6233(\u4F8B\u5B50\u540E\u9762\u7B49\u4EF7\u7684\u6570\u5B57\u4E3A\u5F53\u524D\u65F6\u95F4\u6233)\n* \u4F8B: https://api.example.com/img?#e#  ==\u7B49\u4EF7\u4E8E== https://api.example.com/img?271878\n* \u4F8B: https://api.example.com/img?type=acc&v=#e#  ==\u7B49\u4EF7\u4E8E== https://api.example.com/img?type=acc&v=271878\n\nimgApi\u4E0EsubimgApi\u652F\u6301\u672C\u5730\u6587\u4EF6\u5939\u7EDD\u5BF9\u8DEF\u5F84\u548Chttp(s)\u7B49\u7F51\u7EDCapi\n";
 export interface Config {
     interval: number;
     nightauto: boolean;
@@ -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 CHANGED Viewed

@@ -40,7 +40,6 @@ 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_koishi = require("koishi");
 var name = "jryspro-fast";
 var logger = new import_koishi.Logger(name);
@@ -51,10 +50,10 @@ var usage = `
 ## 使用说明
 > 如果你无法使用此插件，请检查
-> - 1. (使用命令时无反应，报错等)请检查指令是否有冲突或者是否正确安装vercelSatoriPngService
+> - 1. (使用命令时无反应，报错等)请检查指令是否有冲突或者是否正确安装to-image-service
 > - 2. 提示“发生未知错误”可能是没有获取到群友的uid，需要在数据库内刷新一下
 > - 3. “数据出错”之类的提示不是本插件的提示，可能你装了其他插件
-> - 4. 启用不了插件。请检查koishi版本，vercelSatoriPngService版本等是否再兼容范围内，或重启koishi，删除此插件依赖再尝试重装
+> - 4. 启用不了插件。请检查koishi版本，to-image-service版本等是否再兼容范围内，或重启koishi，删除此插件依赖再尝试重装
 随机文件夹内图片时请注意路径\`C:/user/path/to/\`不要把后面的/忘了
@@ -77,7 +76,7 @@ var schema = import_koishi.Schema.object({
   imgApi: import_koishi.Schema.string().role("link").required().description(
     "[必填]渲染模式美图的api或文件夹(推荐纯竖屏),仅支持返回图片的api,不要忘记http(s)://"
   ),
-  imgQuality: import_koishi.Schema.percent().default(0.4).description("渲染图输出质量"),
+  imgQuality: import_koishi.Schema.number().role("slider").min(1).max(100).step(1).default(75).description("渲染图输出质量"),
   waiting: import_koishi.Schema.boolean().default(true).description("是否开启发送消息等待提示"),
   callme: import_koishi.Schema.boolean().default(false).description("是否开启callme功能"),
   defaultMode: import_koishi.Schema.union([0, 1, 2, 3]).default(2).description(
@@ -88,14 +87,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;
+var inject = ["toImageService", "database"];
+async function apply(ctx, config) {
+  let fileType = await import("file-type");
   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")
   );
@@ -180,6 +179,7 @@ function apply(ctx, config) {
         const avatar = await downloadUrl({
           url: avatarUrl
         });
+        const signTexts = dJson.signText.split("，");
         const replacedContent = template.replace(
           "https://dummyimage.com/389x399/6e2d6e/c2c5ed.png",
           background.base64
@@ -193,17 +193,14 @@ function apply(ctx, config) {
           "你是一个一个幸运星啊啊啊啊啊啊啊啊啊啊啊啊",
           `${dJson.fortuneSummary.toString().length > 8 ? dJson.fortuneSummary.toString().substring(0, 8) : dJson.fortuneSummary}&nbsp;&nbsp;${dJson.luckyStar}`
         ).replace(
-          "你是一个一个签名啊啊啊啊啊啊啊啊啊啊啊啊",
-          `${dJson.signText.split("，")[0]}，${dJson.signText.split("，")[1]}<br/>${dJson.signText.split("，")[2]}，${dJson.signText.split("，")[3]}`
-        );
-        const png = await ctx.vercelSatoriPngService.htmlToPng(
-          replacedContent,
-          {
-            width,
-            height
-          }
+          "你是半个签名啊啊啊啊啊啊啊啊啊啊啊啊",
+          `${signTexts[0]}，${signTexts[1]}`
+        ).replace(
+          "你是另外半个签名啊啊啊啊啊啊啊啊啊啊啊啊",
+          `${signTexts[1]}，${signTexts[2]}`
         );
-        return [import_koishi.h.image((await png.toArray())[0], "image/png")];
+        const png = await htmlToImg(replacedContent, width, height);
+        return [import_koishi.h.image(png, "image/png")];
       } catch (err) {
         logger.error(err);
         return "渲染失败，不知道发生了啥";
@@ -211,14 +208,14 @@ function apply(ctx, config) {
     } else if (options.img || config.defaultMode === 0 && !options.out && !options.txtimg && !options.new) {
       if (config.waiting) session.send("请稍等,正在查询……").then();
       try {
-        let width = 357;
+        let width = 370 + 7;
         const height = 1040;
         const background = await downloadUrl({
           url: backgroundUrl,
           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,
@@ -242,14 +239,8 @@ function apply(ctx, config) {
           /<!--解签开始-->[\s\S]*<!--解签结束-->/,
           dJson.unsignText.split("").map((s) => `<div>${s}</div>`).join("")
         );
-        const png = await ctx.vercelSatoriPngService.htmlToPng(
-          replacedContent,
-          {
-            width,
-            height
-          }
-        );
-        return [import_koishi.h.image((await png.toArray())[0], "image/png")];
+        const png = await htmlToImg(replacedContent, width, height);
+        return [import_koishi.h.image(png, "image/png")];
       } catch (err) {
         logger.error(err);
         return "渲染失败，不知道发生了啥";
@@ -278,13 +269,28 @@ function apply(ctx, config) {
       }
     }
   });
-  async function loadFileType() {
-    if (!fileType) {
-      fileType = await import("file-type");
+  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 fileType;
+    return await ctx.toImageService.svgToImage.vips(svg, {
+      format: "jpeg",
+      options: {
+        Q: config.imgQuality
+      }
+    });
   }
-  __name(loadFileType, "loadFileType");
+  __name(htmlToImg, "htmlToImg");
   function getUserKey(session) {
     let etime = (/* @__PURE__ */ new Date()).setHours(0, 0, 0, 0);
     let userId;
@@ -311,8 +317,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 +334,40 @@ 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);
+    const vips = ctx.toImageService.toImageBase.getVips();
+    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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-jryspro-fast",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://github.com/pgnqukezrdxmhjso/koishi-plugin-jryspro-fast",
@@ -33,7 +33,7 @@
     "service": {
       "required": [
         "http",
-        "vercelSatoriPngService"
+        "toImageService"
       ],
       "optional": [
         "database"
@@ -49,13 +49,12 @@
     "今日运势"
   ],
   "peerDependencies": {
-    "koishi": "^4.16.0"
-  },
-  "devDependencies": {
-    "koishi-plugin-vercel-satori-png-service": "^0.1.5"
+    "koishi": "^4.18.10"
   },
   "dependencies": {
-    "file-type": "^21.0.0",
-    "sharp": "^0.34.3"
+    "file-type": "^21.3.0"
+  },
+  "devDependencies": {
+    "koishi-plugin-to-image-service": "^0.1.0"
   }
 }