koishi-plugin-vercel-satori-png-service 0.0.2 → 0.0.5

package/lib/index.d.ts

@@ -2,6 +2,7 @@ import { Context, Schema, Service } from "koishi";
 import { ReactElement } from "react";
 import { Readable } from "stream";
 import type { unstable_createNodejsStream } from "@vercel/og";
+import type { Font } from "satori";
 export type ImageOptions = Parameters<typeof unstable_createNodejsStream>[1];
 declare module "koishi" {
     interface Context {
@@ -12,12 +13,17 @@ declare class VercelSatoriPngService extends Service {
     private _ctx;
     private _config;
     private createNodejsStream;
+    private fonts;
     constructor(ctx: Context, config: VercelSatoriPngService.Config);
     start(): Promise<void>;
     jsxToReactElement(jsxCode: string, data?: Record<any, any>): Promise<ReactElement<any, any>>;
-    jsxToPng(jsxCode: string, options: ImageOptions, data?: Record<any, any>): Promise<Readable>;
     htmlToReactElement(htmlCode: string): ReactElement<any, any>;
-    htmlToPng(htmlCode: string, options: ImageOptions): Promise<Readable>;
+    addFont(fonts: Font[]): void;
+    removeFont(fonts: Font[]): void;
+    private buildOptions;
+    jsxToPng(jsxCode: string, options?: ImageOptions, data?: Record<any, any>): Promise<Readable>;
+    htmlToPng(htmlCode: string, options?: ImageOptions): Promise<Readable>;
+    reactElementToPng(reactElement: ReactElement<any, any>, options?: ImageOptions): Promise<Readable>;
 }
 declare namespace VercelSatoriPngService {
     const usage: string;

package/lib/index.js

@@ -46,6 +46,7 @@ var VercelSatoriPngService = class extends import_koishi.Service {
   _ctx;
   _config;
   createNodejsStream;
+  fonts = [];
   constructor(ctx, config) {
     super(ctx, serviceName);
     this._ctx = ctx;
@@ -65,23 +66,55 @@ var VercelSatoriPngService = class extends import_koishi.Service {
       "_args_623601",
       "with (_args_623601) {\nreturn " + hCode.replace(/^\s+/, "") + "\n}"
     );
-    let res = await fn(import_react.default, data || {});
+    let res;
+    try {
+      res = await fn(import_react.default, data || {});
+    } catch (e) {
+      e.message = fn.toString() + "\n" + e.message;
+      throw e;
+    }
     let i = 0;
     while (typeof res === "function" && i++ < 999) {
       res = await res();
     }
     return res;
   }
-  async jsxToPng(jsxCode, options, data) {
-    const reactElement = await this.jsxToReactElement(jsxCode, data);
-    return this.createNodejsStream(reactElement, options);
-  }
   htmlToReactElement(htmlCode) {
     return (0, import_html_react_parser.default)(htmlCode);
   }
+  addFont(fonts) {
+    this.fonts.push(...fonts);
+    this.ctx.on("dispose", () => {
+      this.removeFont(fonts);
+    });
+  }
+  removeFont(fonts) {
+    fonts.forEach((font) => {
+      const index = this.fonts.indexOf(font);
+      if (index === -1) {
+        return;
+      }
+      this.fonts.splice(index, 1);
+    });
+  }
+  buildOptions(options) {
+    options ||= {};
+    if (this.fonts.length > 0) {
+      options.fonts ||= [];
+      options.fonts.push(...this.fonts);
+    }
+    return options;
+  }
+  async jsxToPng(jsxCode, options, data) {
+    const reactElement = await this.jsxToReactElement(jsxCode, data);
+    return this.createNodejsStream(reactElement, this.buildOptions(options));
+  }
   htmlToPng(htmlCode, options) {
     const reactElement = this.htmlToReactElement(htmlCode);
-    return this.createNodejsStream(reactElement, options);
+    return this.createNodejsStream(reactElement, this.buildOptions(options));
+  }
+  async reactElementToPng(reactElement, options) {
+    return this.createNodejsStream(reactElement, this.buildOptions(options));
   }
 };
 ((VercelSatoriPngService2) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-vercel-satori-png-service",
   "description": "Use Vercel Satori and Resvg.js to convert html to png",
-  "version": "0.0.2",
+  "version": "0.0.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
@@ -35,7 +35,7 @@
     "jsx to png"
   ],
   "peerDependencies": {
-    "koishi": "^4.18.3"
+    "koishi": "^4.18.5"
   },
   "dependencies": {
     "@vercel/og": "^0.6.4",
@@ -43,14 +43,14 @@
     "react": "^19.0.0",
     "sucrase": "^3.35.0"
   },
-  "devDependencies": {
-    "@types/react": "^19"
-  },
   "koishi": {
     "service": {
       "implements": [
         "vercelSatoriPngService"
       ]
     }
+  },
+  "devDependencies": {
+    "@types/react": "^19"
   }
 }

package/readme.md

@@ -7,7 +7,11 @@ Use Vercel Satori and Resvg.js to convert html to png
 ---
 
 html to ReactElement [html-react-parser](https://www.npmjs.com/package/html-react-parser)
+
 jsx to ReactElement [sucrase](https://www.npmjs.com/package/sucrase)
+
 ReactElement to png [@vercel/og](https://www.npmjs.com/package/@vercel/og)
+
 [og-playground](https://og-playground.vercel.app/)
+
 [vercel/satori](https://github.com/vercel/satori#overview)