koishi-plugin-eula-regen 1.0.2 → 1.0.3

package/lib/index.js

@@ -4,8 +4,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 let jsx_runtime_1_promise = import("@satorijs/element/jsx-runtime");
 let jsx_runtime_1;
 // 立即开始加载，并在加载完成后缓存
+// ES Module 可能使用 default 导出或命名导出
 jsx_runtime_1_promise.then(mod => {
-    jsx_runtime_1 = mod;
+    // 处理可能的 default 导出
+    jsx_runtime_1 = mod.default || mod;
 });
 const koishi_1 = require("koishi");
 const module_1 = require("module");
@@ -54,12 +56,20 @@ class Eula extends koishi_1.Service {
     async eula(argv) {
         // 确保 jsx_runtime 已加载
         if (!jsx_runtime_1) {
-            jsx_runtime_1 = await jsx_runtime_1_promise;
+            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';
         const accept = koishi_1.Random.pick(this.configs.accept) ?? session.text('eula.defaultAccept');
-        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] }) })] })] }));
+        // 确保 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(', '));
+        }
+        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`);
         if (prompt) {

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.2",
+  "version": "1.0.3",
   "repository": "https://github.com/Lipraty/koishi-plugin-eula",
   "author": "Lipraty <i@lonay.me>",
   "main": "lib/index.js",
@@ -13,7 +13,7 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc && cp -r src/locales lib/ || true",
-    "postbuild": "node -e \"const fs=require('fs');const p='lib/index.js';let c=fs.readFileSync(p,'utf8');if(c.includes('require(\\\"@satorijs/element/jsx-runtime\\\")')){c=c.replace(/const jsx_runtime_1 = require\\(\"@satorijs\\\\/element\\\\/jsx-runtime\"\\);?/,'');c=c.replace(/('use strict';\\\\nObject\\\\.defineProperty\\(exports, '__esModule', \\\\{ value: true \\\\}\\);)/,'$1\\\\nlet jsx_runtime_1_promise = import(\\\"@satorijs/element/jsx-runtime\\\");\\\\nlet jsx_runtime_1;\\\\njsx_runtime_1_promise.then(mod=>{jsx_runtime_1=mod;});\\\\n');c=c.replace(/(async eula\\(argv\\) \\{)/,'$1\\\\nif(!jsx_runtime_1){jsx_runtime_1=await jsx_runtime_1_promise;}\\\\n');fs.writeFileSync(p,c);}\""
+    "postbuild": "node fix-jsx.mjs"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",