koishi-plugin-eula-regen 1.0.3 → 1.0.5

package/lib/index.js

@@ -1,20 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// 动态导入 ES Module - 使用 Promise 缓存
 let jsx_runtime_1_promise = import("@satorijs/element/jsx-runtime");
 let jsx_runtime_1;
-// 立即开始加载，并在加载完成后缓存
-// ES Module 可能使用 default 导出或命名导出
 jsx_runtime_1_promise.then(mod => {
-    // 处理可能的 default 导出
     jsx_runtime_1 = mod.default || mod;
 });
+
+
 const koishi_1 = require("koishi");
-const module_1 = require("module");
+const fs_1 = require("fs");
 const path_1 = require("path");
-// 在 CommonJS 环境中，使用 __filename 或 __dirname
+// 获取当前文件所在目录
 // @ts-ignore - __filename 和 __dirname 在运行时可用
-const localRequire = (0, module_1.createRequire)(typeof __filename !== 'undefined' ? __filename : (0, path_1.join)(typeof __dirname !== 'undefined' ? __dirname : '.', 'index.js'));
+const getDirname = () => {
+    if (typeof __dirname !== 'undefined') {
+        return __dirname;
+    }
+    else if (typeof __filename !== 'undefined') {
+        return (0, path_1.dirname)(__filename);
+    }
+    else {
+        // 回退到当前工作目录
+        return process.cwd();
+    }
+};
+const localesDir = (0, path_1.join)(getDirname(), 'locales');
 class Eula extends koishi_1.Service {
     constructor(ctx, configs) {
         super(ctx, 'eula', true);
@@ -22,10 +32,22 @@ class Eula extends koishi_1.Service {
         this.filter = false;
         this.usage = Eula.usage;
         this.log = ctx.logger('eula');
-        // 使用 createRequire 加载 YAML 本地化文件
+        // 加载 YAML 本地化文件
         try {
-            ctx.i18n.define('zh', localRequire('./locales/zh'));
-            ctx.i18n.define('en', localRequire('./locales/en'));
+            const yaml = require('js-yaml');
+            // 使用 js-yaml 解析 YAML 文件
+            const zhContent = (0, fs_1.readFileSync)((0, path_1.join)(localesDir, 'zh.yaml'), 'utf8');
+            const enContent = (0, fs_1.readFileSync)((0, path_1.join)(localesDir, 'en.yaml'), 'utf8');
+            const zhData = yaml.load(zhContent);
+            const enData = yaml.load(enContent);
+            // 注册基础语言
+            ctx.i18n.define('zh', zhData);
+            ctx.i18n.define('en', enData);
+            // 注册语言变体（zh-CN, zh-TW 等映射到 zh）
+            ctx.i18n.define('zh-CN', zhData);
+            ctx.i18n.define('zh-TW', zhData);
+            ctx.i18n.define('zh-Hans', zhData);
+            ctx.i18n.define('zh-Hant', zhData);
         }
         catch (err) {
             this.log.error('Failed to load locales:', err);
@@ -54,35 +76,47 @@ class Eula extends koishi_1.Service {
             .action((_) => this.eula(_));
     }
     async eula(argv) {
-        // 确保 jsx_runtime 已加载
         if (!jsx_runtime_1) {
             const mod = await jsx_runtime_1_promise;
             jsx_runtime_1 = mod.default || mod;
         }
         const session = argv.session;
-        const userLocale = session.user.locale || session.user.locales[0] || 'zh';
+        // 获取用户语言，处理语言变体（zh-CN -> zh）
+        let userLocale = session.user.locale || session.user.locales[0] || 'zh';
+        if (userLocale.startsWith('zh')) {
+            // 将 zh-CN, zh-TW 等映射到 zh
+            userLocale = 'zh';
+        }
+        else if (userLocale.startsWith('en')) {
+            userLocale = 'en';
+        }
         const accept = koishi_1.Random.pick(this.configs.accept) ?? session.text('eula.defaultAccept');
-        // 确保 jsx 和 jsxs 函数存在
-        const jsx = jsx_runtime_1.jsx;
-        const jsxs = jsx_runtime_1.jsxs;
-        const Fragment = jsx_runtime_1.Fragment;
-        if (!jsx || !jsxs || !Fragment) {
-            throw new Error("jsx-runtime functions not available. Module keys: " + Object.keys(jsx_runtime_1).join(', '));
+        try {
+            await session.send((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("message", { id: "{0}", children: (0, jsx_runtime_1.jsx)("i18n", { path: "eula.eulaMessage.title", children: [this.configs.alias] }) }), (0, jsx_runtime_1.jsxs)("message", { forward: this.configs.forwardMessgae, children: [(0, jsx_runtime_1.jsx)("message", { id: "{0}", children: this.configs.content[userLocale] ?? this.configs.content['zh'] }), (0, jsx_runtime_1.jsx)("message", { id: "{0}", children: (0, jsx_runtime_1.jsx)("i18n", { path: "eula.eulaMessage.confirm", children: [accept] }) })] })] }));
+        }
+        catch (err) {
+            this.log.error('Failed to send eula message:', err);
+            return '发送协议内容时出错，请稍后重试';
         }
-        await session.send((0, jsxs)(Fragment, { children: [(0, jsx)("message", { id: "{0}", children: (0, jsx)("i18n", { path: "eula.eulaMessage.title", children: [this.configs.alias] }) }), (0, jsxs)("message", { forward: this.configs.forwardMessgae, children: [(0, jsx)("message", { id: "{0}", children: this.configs.content[userLocale] ?? this.configs.content['zh'] }), (0, jsx)("message", { id: "{0}", children: (0, jsx)("i18n", { path: "eula.eulaMessage.confirm", children: [accept] }) })] })] }));
         const prompt = await session.prompt(this.configs.waitTime * 1000);
-        this.log.info(`[platfrom: ${session.platform}]user ${session.userId} reply to (${prompt}) eula`);
+        this.log.info(`[platform: ${session.platform}] user ${session.userId} reply to (${prompt}) eula`);
         if (prompt) {
             const promptEle = koishi_1.h.parse(prompt);
-            if (promptEle[0].type === 'at' && promptEle[0].attrs.id === session.bot.selfId)
+            if (promptEle.length > 0 && promptEle[0].type === 'at' && promptEle[0].attrs.id === session.bot.selfId) {
                 promptEle.shift(); // remove `at` element
-            const accredit = promptEle[0].attrs.content.replace(/^\//g, '').trim() === accept;
+            }
+            if (promptEle.length === 0) {
+                return session.text('eula.timeout');
+            }
+            const promptText = (promptEle[0].attrs?.content || prompt).replace(/^\//g, '').trim();
+            const accredit = promptText === accept || promptText === '同意';
             session.user.eula = accredit;
             this.ctx.emit('eula/update', session, accredit);
             return session.text(`${accredit ? 'eula.acceptedMessage' : 'eula.rejectMessage'}`, [this.configs.alias]);
         }
-        else
+        else {
             return session.text('eula.timeout');
+        }
     }
     /**
      *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-eula-regen",
   "description": "EULA(End-user licence agreement) for your koishi bot.",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "repository": "https://github.com/Lipraty/koishi-plugin-eula",
   "author": "Lipraty <i@lonay.me>",
   "main": "lib/index.js",
@@ -42,5 +42,8 @@
   ],
   "peerDependencies": {
     "koishi": "^4.12.0"
+  },
+  "dependencies": {
+    "js-yaml": "^4.1.1"
   }
 }