koishi-plugin-img-tool 0.0.2 → 1.0.2

package/lib/index.d.ts

@@ -4,12 +4,4 @@ export declare const using: readonly ["canvas"];
 export interface Config {
 }
 export declare const Config: Schema<Config>;
-declare module "koishi" {
-    interface Context {
-        canvas: {
-            createCanvas: (width: number, height: number) => any;
-            loadImage: (data: Buffer) => Promise<any>;
-        };
-    }
-}
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -44,8 +44,8 @@ var using = ["canvas"];
 var Config = import_koishi.Schema.object({});
 function selectFirstImageElement(content) {
   if (!content) return;
-  const nodes = import_koishi.h.parse(content);
-  return import_koishi.h.select(nodes, "img") ?? import_koishi.h.select(nodes, "image");
+  const nodes = import_koishi.h.select(content.elements, "img");
+  return nodes?.[0];
 }
 __name(selectFirstImageElement, "selectFirstImageElement");
 function getImageSrc(el) {
@@ -54,17 +54,16 @@ function getImageSrc(el) {
 }
 __name(getImageSrc, "getImageSrc");
 function findImageSrc(session) {
-  const direct = selectFirstImageElement(session.content);
+  const direct = selectFirstImageElement(session.event.message);
   const directSrc = getImageSrc(direct);
   if (directSrc) return directSrc;
   const quote = session.quote;
-  const quoteContent = quote?.content;
-  const quoteEl = selectFirstImageElement(quoteContent);
+  const quoteEl = selectFirstImageElement(quote);
   const quoteSrc = getImageSrc(quoteEl);
   if (quoteSrc) return quoteSrc;
   const quoteElements = quote?.elements;
   if (quoteElements) {
-    const quoteEl2 = import_koishi.h.select(quoteElements, "img") ?? import_koishi.h.select(quoteElements, "image");
+    const quoteEl2 = import_koishi.h.select(quoteElements, "img")?.[0];
     const quoteSrc2 = getImageSrc(quoteEl2);
     if (quoteSrc2) return quoteSrc2;
   }
@@ -83,107 +82,140 @@ function toArrayBuffer(buffer) {
   );
 }
 __name(toArrayBuffer, "toArrayBuffer");
-function mirrorDraw(out, srcCanvas, mode) {
-  const w = srcCanvas.width;
-  const h2 = srcCanvas.height;
-  out.clearRect(0, 0, w, h2);
-  if (mode === "left") {
-    const rightWidth = Math.floor(w / 2);
-    const leftKeepWidth = w - rightWidth;
-    out.drawImage(srcCanvas, 0, 0, leftKeepWidth, h2, 0, 0, leftKeepWidth, h2);
-    out.save();
-    out.translate(w, 0);
-    out.scale(-1, 1);
-    out.drawImage(srcCanvas, 0, 0, rightWidth, h2, 0, 0, rightWidth, h2);
-    out.restore();
-    return;
-  }
-  if (mode === "right") {
-    const leftWidth = Math.floor(w / 2);
-    const rightKeepWidth = w - leftWidth;
-    out.drawImage(
-      srcCanvas,
-      leftWidth,
-      0,
-      rightKeepWidth,
-      h2,
-      leftWidth,
-      0,
-      rightKeepWidth,
-      h2
-    );
-    out.save();
-    out.translate(w, 0);
-    out.scale(-1, 1);
-    out.drawImage(
-      srcCanvas,
-      w - leftWidth,
-      0,
-      leftWidth,
-      h2,
-      w - leftWidth,
-      0,
-      leftWidth,
-      h2
-    );
-    out.restore();
-    return;
-  }
-  if (mode === "up") {
-    const bottomHeight = Math.floor(h2 / 2);
-    const topKeepHeight = h2 - bottomHeight;
-    out.drawImage(srcCanvas, 0, 0, w, topKeepHeight, 0, 0, w, topKeepHeight);
-    out.save();
-    out.translate(0, h2);
-    out.scale(1, -1);
-    out.drawImage(srcCanvas, 0, 0, w, bottomHeight, 0, 0, w, bottomHeight);
-    out.restore();
-    return;
+function mirrorPixels(src, width, height, mode) {
+  const dst = new Uint8ClampedArray(src.length);
+  const ceilHalfW = Math.ceil(width / 2);
+  const floorHalfW = Math.floor(width / 2);
+  const ceilHalfH = Math.ceil(height / 2);
+  const floorHalfH = Math.floor(height / 2);
+  for (let y = 0; y < height; y++) {
+    for (let x = 0; x < width; x++) {
+      let sx = x;
+      let sy = y;
+      if (mode === "left") {
+        sx = x < ceilHalfW ? x : width - 1 - x;
+      } else if (mode === "right") {
+        sx = x < floorHalfW ? width - 1 - x : x;
+      } else if (mode === "up") {
+        sy = y < ceilHalfH ? y : height - 1 - y;
+      } else {
+        sy = y < floorHalfH ? height - 1 - y : y;
+      }
+      const si = (sy * width + sx) * 4;
+      const di = (y * width + x) * 4;
+      dst[di] = src[si];
+      dst[di + 1] = src[si + 1];
+      dst[di + 2] = src[si + 2];
+      dst[di + 3] = src[si + 3];
+    }
   }
-  const topHeight = Math.floor(h2 / 2);
-  const bottomKeepHeight = h2 - topHeight;
-  out.drawImage(
-    srcCanvas,
-    0,
-    topHeight,
-    w,
-    bottomKeepHeight,
-    0,
-    topHeight,
-    w,
-    bottomKeepHeight
-  );
-  out.save();
-  out.translate(0, h2);
-  out.scale(1, -1);
-  out.drawImage(
-    srcCanvas,
-    0,
-    h2 - topHeight,
-    w,
-    topHeight,
-    0,
-    h2 - topHeight,
-    w,
-    topHeight
-  );
-  out.restore();
+  return dst;
 }
-__name(mirrorDraw, "mirrorDraw");
+__name(mirrorPixels, "mirrorPixels");
 async function mirrorStaticImage(canvas, buffer, mode) {
-  const img = await canvas.loadImage(buffer);
-  const w = img.width;
-  const h2 = img.height;
-  const srcCanvas = canvas.createCanvas(w, h2);
-  const src = srcCanvas.getContext("2d");
-  src.drawImage(img, 0, 0, w, h2);
-  const outCanvas = canvas.createCanvas(w, h2);
-  const out = outCanvas.getContext("2d");
-  mirrorDraw(out, srcCanvas, mode);
-  return {
-    buffer: outCanvas.toBuffer("image/png"),
-    mime: "image/png"
-  };
+  let img;
+  let outCanvas;
+  try {
+    img = await canvas.loadImage(buffer);
+    const w = img.naturalWidth ?? img.width;
+    const h2 = img.naturalHeight ?? img.height;
+    outCanvas = await canvas.createCanvas(w, h2);
+    const out = outCanvas.getContext("2d");
+    out.clearRect(0, 0, w, h2);
+    if (mode === "left") {
+      const rightWidth = Math.floor(w / 2);
+      const leftKeepWidth = w - rightWidth;
+      out.drawImage(
+        img,
+        0,
+        0,
+        leftKeepWidth,
+        h2,
+        0,
+        0,
+        leftKeepWidth,
+        h2
+      );
+      out.save();
+      out.translate(w, 0);
+      out.scale(-1, 1);
+      out.drawImage(img, 0, 0, rightWidth, h2, 0, 0, rightWidth, h2);
+      out.restore();
+    } else if (mode === "right") {
+      const leftWidth = Math.floor(w / 2);
+      const rightKeepWidth = w - leftWidth;
+      out.drawImage(
+        img,
+        w - rightKeepWidth,
+        0,
+        rightKeepWidth,
+        h2,
+        w - rightKeepWidth,
+        0,
+        rightKeepWidth,
+        h2
+      );
+      out.save();
+      out.translate(leftWidth, 0);
+      out.scale(-1, 1);
+      out.drawImage(
+        img,
+        w - leftWidth,
+        0,
+        leftWidth,
+        h2,
+        0,
+        0,
+        leftWidth,
+        h2
+      );
+      out.restore();
+    } else if (mode === "up") {
+      const bottomHeight = Math.floor(h2 / 2);
+      const topKeepHeight = h2 - bottomHeight;
+      out.drawImage(img, 0, 0, w, topKeepHeight, 0, 0, w, topKeepHeight);
+      out.save();
+      out.translate(0, h2);
+      out.scale(1, -1);
+      out.drawImage(img, 0, 0, w, bottomHeight, 0, 0, w, bottomHeight);
+      out.restore();
+    } else {
+      const topHeight = Math.floor(h2 / 2);
+      const bottomKeepHeight = h2 - topHeight;
+      out.drawImage(
+        img,
+        0,
+        h2 - bottomKeepHeight,
+        w,
+        bottomKeepHeight,
+        0,
+        h2 - bottomKeepHeight,
+        w,
+        bottomKeepHeight
+      );
+      out.save();
+      out.translate(0, topHeight);
+      out.scale(1, -1);
+      out.drawImage(
+        img,
+        0,
+        h2 - topHeight,
+        w,
+        topHeight,
+        0,
+        0,
+        w,
+        topHeight
+      );
+      out.restore();
+    }
+    return {
+      buffer: await outCanvas.toBuffer("image/png"),
+      mime: "image/png"
+    };
+  } finally {
+    await Promise.allSettled([img?.dispose?.(), outCanvas?.dispose?.()]);
+  }
 }
 __name(mirrorStaticImage, "mirrorStaticImage");
 async function mirrorGifImage(canvas, buffer, mode) {
@@ -193,30 +225,55 @@ async function mirrorGifImage(canvas, buffer, mode) {
   const width = gif.lsd?.width ?? frames[0].dims?.width;
   const height = gif.lsd?.height ?? frames[0].dims?.height;
   if (!width || !height) throw new Error("Unable to determine GIF size");
-  const srcCanvas = canvas.createCanvas(width, height);
-  const src = srcCanvas.getContext("2d");
-  const outCanvas = canvas.createCanvas(width, height);
+  const screenCanvas = await canvas.createCanvas(width, height);
+  const screen = screenCanvas.getContext("2d");
+  const outCanvas = await canvas.createCanvas(width, height);
   const out = outCanvas.getContext("2d");
-  const encoder = new import_gif_encoder_2.default(width, height);
-  encoder.start();
-  encoder.setRepeat(0);
-  encoder.setQuality?.(10);
-  for (const frame of frames) {
-    const patch = frame.patch;
-    if (!patch || patch.length !== width * height * 4) {
-      throw new Error("Unsupported GIF frame patch format");
+  try {
+    const encoder = new import_gif_encoder_2.default(width, height);
+    encoder.start();
+    encoder.setRepeat(0);
+    encoder.setQuality?.(10);
+    for (const frame of frames) {
+      const patch = frame.patch;
+      const dims = frame.dims || {};
+      const left = dims.left ?? 0;
+      const top = dims.top ?? 0;
+      const pw = dims.width ?? width;
+      const ph = dims.height ?? height;
+      if (!patch || patch.length !== pw * ph * 4) {
+        throw new Error("Unsupported GIF frame patch format");
+      }
+      const disposalType = frame.disposalType ?? 0;
+      const restore = disposalType === 3 ? screen.getImageData(0, 0, width, height) : null;
+      const region = screen.getImageData(left, top, pw, ph);
+      for (let i = 0; i < patch.length; i += 4) {
+        if (patch[i + 3] === 0) continue;
+        region.data[i] = patch[i];
+        region.data[i + 1] = patch[i + 1];
+        region.data[i + 2] = patch[i + 2];
+        region.data[i + 3] = patch[i + 3];
+      }
+      screen.putImageData(region, left, top);
+      const screenData = screen.getImageData(0, 0, width, height);
+      const outData = out.createImageData(width, height);
+      outData.data.set(mirrorPixels(screenData.data, width, height, mode));
+      out.putImageData(outData, 0, 0);
+      const delayMs = typeof frame.delay === "number" ? frame.delay : 100;
+      encoder.setDelay(Math.max(20, delayMs));
+      encoder.addFrame(out);
+      if (disposalType === 2) {
+        screen.clearRect(left, top, pw, ph);
+      } else if (disposalType === 3 && restore) {
+        screen.putImageData(restore, 0, 0);
+      }
     }
-    const imageData = src.createImageData(width, height);
-    imageData.data.set(patch);
-    src.putImageData(imageData, 0, 0);
-    mirrorDraw(out, srcCanvas, mode);
-    const delayCs = typeof frame.delay === "number" ? frame.delay : 0;
-    encoder.setDelay(Math.max(0, delayCs * 10));
-    encoder.addFrame(out);
+    encoder.finish();
+    const outBuffer = Buffer.from(encoder.out.getData());
+    return { buffer: outBuffer, mime: "image/gif" };
+  } finally {
+    await Promise.allSettled([screenCanvas.dispose?.(), outCanvas.dispose?.()]);
   }
-  encoder.finish();
-  const outBuffer = Buffer.from(encoder.out.getData());
-  return { buffer: outBuffer, mime: "image/gif" };
 }
 __name(mirrorGifImage, "mirrorGifImage");
 async function handleMirror(ctx, session, mode) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-img-tool",
   "description": "modify img",
-  "version": "0.0.2",
+  "version": "1.0.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [