koishi-plugin-echo-cave 1.7.3 → 1.7.5

package/lib/cave-helper.d.ts

@@ -0,0 +1,4 @@
+import { EchoCave } from './index';
+import { Context, Session } from 'koishi';
+export declare function sendCaveMsg(ctx: Context, session: Session, caveMsg: EchoCave): Promise<void>;
+export declare function formatDate(date: Date): string;

package/lib/index.cjs

@@ -36,74 +36,6 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_koishi_plugin_adapter_onebot = require("@pynickle/koishi-plugin-adapter-onebot");
-var import_fs = __toESM(require("fs"), 1);
-var import_koishi = require("koishi");
-var import_node_path2 = __toESM(require("node:path"), 1);
-
-// src/image-helper.ts
-var import_node_fs = require("node:fs");
-var import_node_path = __toESM(require("node:path"), 1);
-async function saveImages(ctx, imgElement) {
-  const imgUrl = imgElement.url;
-  const originalImgName = imgElement.file;
-  const lastDotIndex = originalImgName.lastIndexOf(".");
-  let imgExt = "";
-  if (lastDotIndex === -1) {
-    imgExt = "png";
-  } else {
-    imgExt = originalImgName.substring(lastDotIndex + 1);
-  }
-  const imgPath = import_node_path.default.join(ctx.baseDir, "data", "cave", "images");
-  const imgName = (/* @__PURE__ */ new Date()).getTime().toString();
-  let fullImgPath = import_node_path.default.join(imgPath, `${imgName}.${imgExt}`);
-  ctx.logger.info(
-    `Saving image from URL: ${imgUrl} to path: ${imgName}.${imgExt}`
-  );
-  const buffer = await ctx.http.get(imgUrl);
-  if (buffer.byteLength === 0) throw new Error("Image download failed");
-  await import_node_fs.promises.writeFile(fullImgPath, Buffer.from(buffer));
-  return fullImgPath;
-}
-
-// src/forward-helper.ts
-async function reconstructForwardMsg(ctx, message) {
-  return Promise.all(
-    message.map(async (msg) => {
-      const content = await processMessageContent(ctx, msg);
-      return {
-        type: "node",
-        data: {
-          user_id: msg.sender.user_id,
-          nickname: msg.sender.nickname,
-          content
-        }
-      };
-    })
-  );
-}
-async function processMessageContent(ctx, msg) {
-  if (typeof msg.message === "string") {
-    return msg.message;
-  }
-  const firstElement = msg.message[0];
-  if (firstElement?.type === "forward") {
-    return reconstructForwardMsg(ctx, firstElement.data.content);
-  }
-  return Promise.all(
-    msg.message.map(async (element) => {
-      if (element.type === "image") {
-        return {
-          ...element,
-          data: {
-            ...element.data,
-            url: await saveImages(ctx, element.data)
-          }
-        };
-      }
-      return element;
-    })
-  );
-}
 
 // src/cqcode-helper.ts
 function createTextMsg(content) {
@@ -118,10 +50,7 @@ function createTextMsg(content) {
 // src/onebot-helper.ts
 async function getUserName(ctx, session, userId) {
   try {
-    const memberInfo = await session.onebot.getGroupMemberInfo(
-      session.channelId,
-      userId
-    );
+    const memberInfo = await session.onebot.getGroupMemberInfo(session.channelId, userId);
     return memberInfo.card || memberInfo.nickname || userId;
   } catch (error) {
     ctx.logger.warn(`\u83B7\u53D6\u7FA4\u6210\u5458\u4FE1\u606F\u5931\u8D25\uFF08userId: ${userId}\uFF09\uFF1A`, error);
@@ -129,7 +58,7 @@ async function getUserName(ctx, session, userId) {
   }
 }
 
-// src/msg-helper.ts
+// src/cave-helper.ts
 async function sendCaveMsg(ctx, session, caveMsg) {
   const { channelId } = session;
   const content = JSON.parse(caveMsg.content);
@@ -226,9 +155,7 @@ async function sendCaveMsg(ctx, session, caveMsg) {
   const last = content.at(-1);
   const needsNewline = last?.type === "text";
   content.unshift(createTextMsg(chosen.prefix));
-  content.push(
-    createTextMsg(`${needsNewline ? "\n\n" : ""}${chosen.suffix}`)
-  );
+  content.push(createTextMsg(`${needsNewline ? "\n\n" : ""}${chosen.suffix}`));
   await session.onebot.sendGroupMsg(channelId, content);
 }
 function formatDate(date) {
@@ -239,13 +166,117 @@ function formatDate(date) {
   });
 }
 
+// src/image-helper.ts
+var import_axios = __toESM(require("axios"), 1);
+var import_node_fs = require("node:fs");
+var import_node_path = __toESM(require("node:path"), 1);
+async function saveImages(ctx, imgElement) {
+  const imgUrl = imgElement.url;
+  const originalImgName = imgElement.file;
+  const ext = (() => {
+    const i = originalImgName.lastIndexOf(".");
+    return i === -1 ? "png" : originalImgName.slice(i + 1).toLowerCase();
+  })();
+  const imgDir = import_node_path.default.join(ctx.baseDir, "data", "cave", "images");
+  const imgName = Date.now().toString();
+  const fullImgPath = import_node_path.default.join(imgDir, `${imgName}.${ext}`);
+  ctx.logger.info(`Saving image from ${imgUrl} -> ${fullImgPath}`);
+  try {
+    await import_node_fs.promises.mkdir(imgDir, { recursive: true });
+    const res = await import_axios.default.get(imgUrl, {
+      responseType: "arraybuffer",
+      validateStatus: () => true
+    });
+    if (res.status < 200 || res.status >= 300) {
+      ctx.logger.warn(`Image download failed: HTTP ${res.status}`);
+      return imgUrl;
+    }
+    const type = res.headers["content-type"];
+    if (!type || !type.startsWith("image/")) {
+      ctx.logger.warn(`Invalid image content-type: ${type}`);
+      return imgUrl;
+    }
+    const buffer = Buffer.from(res.data);
+    if (!buffer || buffer.length === 0) {
+      ctx.logger.warn("Downloaded image buffer is empty");
+      return imgUrl;
+    }
+    await import_node_fs.promises.writeFile(fullImgPath, buffer);
+    ctx.logger.info(`Image saved successfully: ${fullImgPath}`);
+    return fullImgPath;
+  } catch (err) {
+    ctx.logger.error(`Failed to save image: ${err}`);
+    return imgUrl;
+  }
+}
+
+// src/forward-helper.ts
+async function reconstructForwardMsg(ctx, message) {
+  return Promise.all(
+    message.map(async (msg) => {
+      const content = await processForwardMessageContent(ctx, msg);
+      return {
+        type: "node",
+        data: {
+          user_id: msg.sender.user_id,
+          nickname: msg.sender.nickname,
+          content
+        }
+      };
+    })
+  );
+}
+async function processForwardMessageContent(ctx, msg) {
+  if (typeof msg.message === "string") {
+    return msg.message;
+  }
+  const firstElement = msg.message[0];
+  if (firstElement?.type === "forward") {
+    return reconstructForwardMsg(ctx, firstElement.data.content);
+  }
+  return Promise.all(
+    msg.message.map(async (element) => {
+      if (element.type === "image") {
+        return {
+          ...element,
+          data: {
+            ...element.data,
+            url: await saveImages(ctx, element.data)
+          }
+        };
+      }
+      return element;
+    })
+  );
+}
+
+// src/msg-helper.ts
+async function processMessageContent(ctx, msg) {
+  return Promise.all(
+    msg.map(async (element) => {
+      if (element.type === "image") {
+        return {
+          ...element,
+          data: {
+            ...element.data,
+            url: await saveImages(ctx, element.data)
+          }
+        };
+      }
+      return element;
+    })
+  );
+}
+
 // src/index.ts
+var import_koishi_plugin_adapter_onebot2 = require("@pynickle/koishi-plugin-adapter-onebot");
+var import_fs = __toESM(require("fs"), 1);
+var import_koishi = require("koishi");
+var import_node_path2 = __toESM(require("node:path"), 1);
 var name = "echo-cave";
 var inject = ["database"];
 var Config = import_koishi.Schema.object({
-  adminMessageProtection: import_koishi.Schema.boolean().description(
-    "\u5F00\u542F\u7BA1\u7406\u5458\u6D88\u606F\u4FDD\u62A4\uFF0C\u5F00\u542F\u540E\u7BA1\u7406\u5458\u53D1\u5E03\u7684\u6D88\u606F\u53EA\u80FD\u7531\u7BA1\u7406\u5458\u5220\u9664"
-  ).default(false)
+  adminMessageProtection: import_koishi.Schema.boolean().description("\u5F00\u542F\u7BA1\u7406\u5458\u6D88\u606F\u4FDD\u62A4\uFF0C\u5F00\u542F\u540E\u7BA1\u7406\u5458\u53D1\u5E03\u7684\u6D88\u606F\u53EA\u80FD\u7531\u7BA1\u7406\u5458\u5220\u9664").default(false)
 });
 function apply(ctx, cfg) {
   const imgPath = import_node_path2.default.join(ctx.baseDir, "data", "cave", "images");
@@ -269,10 +300,9 @@ function apply(ctx, cfg) {
       unique: ["content"]
     }
   );
-  ctx.command(
-    "cave [id:number]",
-    "\u968F\u673A\u83B7\u53D6 / \u83B7\u53D6\u7279\u5B9A id \u7684\u56DE\u58F0\u6D1E\u4FE1\u606F"
-  ).action(async ({ session }, id) => await getCave(ctx, session, id));
+  ctx.command("cave [id:number]", "\u968F\u673A\u83B7\u53D6 / \u83B7\u53D6\u7279\u5B9A id \u7684\u56DE\u58F0\u6D1E\u4FE1\u606F").action(
+    async ({ session }, id) => await getCave(ctx, session, id)
+  );
   ctx.command("cave.echo", "\u5C06\u6D88\u606F\u5B58\u5165\u56DE\u58F0\u6D1E").action(
     async ({ session }) => await addCave(ctx, session)
   );
@@ -369,10 +399,7 @@ async function deleteCave(ctx, session, cfg, id) {
   const userAuthority = user.authority;
   const isCurrentUserAdmin = userAuthority >= 4;
   if (cfg.adminMessageProtection) {
-    const caveUser = await ctx.database.getUser(
-      session.platform,
-      caveMsg.userId
-    );
+    const caveUser = await ctx.database.getUser(session.platform, caveMsg.userId);
     const isCaveUserAdmin = caveUser.authority >= 4;
     if (isCaveUserAdmin && !isCurrentUserAdmin) {
       return "\u26D4 \u8BE5\u6D88\u606F\u7531\u7BA1\u7406\u5458\u53D1\u5E03\uFF0C\u5DF2\u5F00\u542F\u7BA1\u7406\u5458\u6D88\u606F\u4FDD\u62A4\uFF0C\u53EA\u6709\u7BA1\u7406\u5458\u53EF\u4EE5\u5220\u9664\u3002";
@@ -404,9 +431,14 @@ async function addCave(ctx, session) {
     content = JSON.stringify(message);
   } else {
     type = "msg";
-    content = JSON.stringify(
-      (await session.onebot.getMsg(messageId)).message
-    );
+    const message = (await session.onebot.getMsg(messageId)).message;
+    let msgJson;
+    if (typeof message === "string") {
+      msgJson = import_koishi_plugin_adapter_onebot2.CQCode.parse(message);
+    } else {
+      msgJson = message;
+    }
+    content = JSON.stringify(await processMessageContent(ctx, msgJson));
   }
   await ctx.database.get("echo_cave", { content }).then((existing) => {
     if (existing) {

package/lib/msg-helper.d.ts

@@ -1,4 +1,3 @@
-import { Context, Session } from 'koishi';
-import { EchoCave } from './index';
-export declare function sendCaveMsg(ctx: Context, session: Session, caveMsg: EchoCave): Promise<void>;
-export declare function formatDate(date: Date): string;
+import { CQCode } from '@pynickle/koishi-plugin-adapter-onebot';
+import { Context } from 'koishi';
+export declare function processMessageContent(ctx: Context, msg: CQCode[]): Promise<CQCode[]>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",
@@ -11,8 +11,9 @@
   ],
   "license": "MIT",
   "scripts": {
-    "lint": "eslint ./src --ext .ts",
-    "lint:fix": "eslint ./src --ext .ts --fix",
+    "lint": "npx oxlint ./src",
+    "lint:fix": "npx oxlint ./src --fix",
+    "fmt": "npx oxfmt ./src",
     "build": "node esbuild.config.js && tsc --emitDeclarationOnly",
     "release": "semantic-release"
   },
@@ -26,7 +27,8 @@
     "koishi": "^4.18.9"
   },
   "dependencies": {
-    "@pynickle/koishi-plugin-adapter-onebot": "^1.0.0"
+    "@pynickle/koishi-plugin-adapter-onebot": "^1.0.0",
+    "axios": "^1.13.2"
   },
   "devDependencies": {
     "@semantic-release/changelog": "^6.0.3",
@@ -34,17 +36,13 @@
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/npm": "^13.1.2",
     "@semantic-release/release-notes-generator": "^14.1.0",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.0",
     "@types/node": "^24.10.1",
     "conventional-changelog-conventionalcommits": "^9.1.0",
     "esbuild": "^0.27.0",
     "esbuild-plugin-yaml": "^0.0.1",
-    "eslint": "^9.39.1",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.4",
-    "prettier": "^3.7.2",
+    "oxfmt": "^0.16.0",
+    "oxlint": "^1.31.0",
     "semantic-release": "^25.0.2",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.48.0"
+    "typescript": "^5.9.3"
   }
 }