@azimiao/koishi-plugin-cafe-bot-exp 0.0.12 → 0.0.16

package/lib/draw/config.d.ts

@@ -7,6 +7,7 @@ export interface CafeBotDrawConfig {
     forceUpdateDataWhenLoad: boolean;
     ImageServer: string;
     ImageServerAuth: string;
+    ImageNoCache: boolean;
     MinCount: number;
     MaxCount: number;
     Star1Name: string;

package/lib/index.js

@@ -37,6 +37,9 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
+// package.json
+var version = "0.0.16";
+
 // src/draw/index.ts
 var draw_exports = {};
 __export(draw_exports, {
@@ -260,6 +263,7 @@ var CafeBotDrawConfig = import_koishi.Schema.object({
   forceUpdateDataWhenLoad: import_koishi.Schema.boolean().description("插件加载时强制刷新数据").default(false),
   ImageServer: import_koishi.Schema.string().description("图像生成服务器").default("http://127.0.0.1:3000/screenshot"),
   ImageServerAuth: import_koishi.Schema.string().description("图像生成服务器密码").default(""),
+  ImageNoCache: import_koishi.Schema.boolean().description("每次都重新生成图片(一般仅用于Debug)").default(false),
   MinCount: import_koishi.Schema.number().description("最小抽取次数").default(0),
   MaxCount: import_koishi.Schema.number().description("最大抽取次数").default(8),
   Star1Name: import_koishi.Schema.string().description("1星名称").default("N"),
@@ -307,11 +311,12 @@ var downloadTool_default = downloadFileIfNotExist;
 
 // src/draw/index.ts
 var name = "cafe-bot-exp.draw";
-var inject = ["http"];
+var inject = ["http", "logger"];
 var Config = CafeBotDrawConfig;
 var animals = ["瑟蕾奴", "可鲁贝洛斯", "捷欧", "基库", "蔡特", "柯贝", "古利亚诺斯", "小星", "影良", "fio", "xeros"];
 var starEnum = [5, 4, 3, 2, 1];
 var cafebotCardData = [];
+var logger = null;
 function shuffleWithCustomRandom(array, rand) {
   for (let i = array.length - 1; i > 0; i--) {
     const a = rand();
@@ -395,16 +400,17 @@ async function getCards(seed, ctx, config) {
 }
 __name(getCards, "getCards");
 async function apply(ctx, config) {
+  logger = ctx.logger(name);
   await downloadCardDataIfNotExist(ctx, config, config.forceUpdateDataWhenLoad);
   ctx.command("轨迹抽卡", `抽取你的每日轨迹人物卡吧~`);
   ctx.command("轨迹抽卡/给我抽", "进行每日抽卡").action(async (argv, _) => {
     let seed = DailySeededName(argv.session.userId);
-    console.log(`getcard for ${seed}`);
+    logger?.info(`getcard for ${seed}`);
     let randomer = new PseudoRandom_default(seed);
     let result = await getCards(seed, ctx, config);
     if (result.length <= 0) {
       let msg2 = "你并不是本群限定非酋, 只不过抽到的卡牌被" + animals[randomer.nextInt(0, animals.length - 1)] + "叼走了~\n";
-      console.log(`getcard for ${seed} is empty,send it`);
+      logger?.info(`getcard for ${seed} is empty,send it`);
       await argv.session?.send(`${At(argv)}${msg2}`);
       return;
     }
@@ -428,36 +434,37 @@ async function apply(ctx, config) {
       }
     });
     await argv.session?.send(msg);
-    console.log(`getcard for ${seed} send ok`);
+    logger?.info(`getcard for ${seed} send ok`);
     return;
   });
   const requestWebCache = {};
   ctx.command("轨迹抽卡/给我抽图", "进行抽卡并显示卡牌图片").action(async (argv, _) => {
     let seed = DailySeededName(argv.session.userId);
-    console.log(`getcard img for ${seed}`);
+    logger?.info(`getcard img for ${seed}`);
     let randomer = new PseudoRandom_default(seed);
     let result = await getCards(seed, ctx, config);
     if (result.length <= 0) {
       let msg = "你并不是本群限定非酋, 只不过抽到的卡牌被" + animals[randomer.nextInt(0, animals.length - 1)] + "叼走了~\n";
       await argv.session?.send(`${At(argv)} ${msg}`);
-      console.log(`getcard img for ${seed} is empty`);
+      logger?.info(`getcard img for ${seed} is empty`);
       return;
     }
     if (requestWebCache[seed]) {
       await argv.session?.send(`${At(argv)} 请等待上次抽取完成哦~`);
-      console.log(`getcard img for ${seed}, another request is processing, send please wait`);
+      logger?.info(`getcard img for ${seed}, another request is processing, send please wait`);
       return;
     }
     requestWebCache[seed] = "waiting";
     await argv.session?.sendQueued(`${At(argv)} 抽取中,请稍候...`);
-    console.log(`getcard img for ${seed} is processing, send please wait`);
+    logger?.info(`getcard img for ${seed} is processing, send please wait`);
     var a = html_default(result);
     await ctx.http.post(
       config.ImageServer,
       {
         html: a,
         auth: config.ImageServerAuth,
-        filename: seed
+        filename: seed,
+        nocache: config.ImageNoCache
       },
       {
         responseType: "json"
@@ -466,13 +473,13 @@ async function apply(ctx, config) {
       delete requestWebCache[seed];
       await argv.session?.sendQueued(`${At(argv)}<img src="${res.data}"/>`);
       await argv.session?.cancelQueued();
-      console.log(`getcard img for ${seed} send ok~`);
+      logger?.info(`getcard img for ${seed} send ok~`);
     }).catch(async (e) => {
-      console.log(e);
+      logger?.error(`getcard img for ${seed} is failed, send create failed`);
+      logger?.error(e);
       delete requestWebCache[seed];
-      await argv.session?.sendQueued(`${At(argv)}图片生成失败`);
+      await argv.session?.sendQueued(`${At(argv)}超级计算机『卡佩尔』发生核心故障😵(A...D...)`);
       await argv.session?.cancelQueued();
-      console.log(`getcard img for ${seed} is failed, send create failed`);
     });
     return;
   });
@@ -592,7 +599,7 @@ var CafeTimeTools_default = CafeTimeTools;
 
 // src/quiz/index.ts
 var name3 = "cafe-bot-exp.quiz";
-var inject2 = ["http", "cache"];
+var inject2 = ["http", "cache", "logger"];
 var Config3 = CafeBotQuizConfig;
 var validOptions = {
   "A": 0,
@@ -608,6 +615,7 @@ var validOptions = {
   "3": 2,
   "4": 3
 };
+var logger2 = null;
 var quizDataIds = [];
 var quizDataSet = {};
 async function downloadQuitDataIfNotExist(ctx, config, forceUpdate) {
@@ -627,6 +635,8 @@ async function downloadQuitDataIfNotExist(ctx, config, forceUpdate) {
       quizDataSet[element.question.id] = element;
     });
   } catch (error) {
+    logger2?.error("get quiz data failed");
+    logger2?.error(error);
     throw new Error("quiz read error");
   }
   return;
@@ -643,28 +653,52 @@ async function answerHandler(ctx, config, argv, answer) {
   if (answer in validOptions) {
     selectNumber = validOptions[answer];
   } else {
-    await argv.session?.send(`${At(argv)}选项无效，请重新输入~`);
+    await argv.session?.send(`${At(argv)}输入选项无效哦，请重新输入~`);
     return;
   }
   await ctx.cache.delete("question", argv.session.userId);
   if (quizDataIds == null || quizDataIds.length <= 0) {
-    await argv.session?.send(`${At(argv)}超级计算机『卡佩尔』发生核心故障😵`);
+    await argv.session?.send(`${At(argv)}超级计算机『卡佩尔』发生核心故障😵(导力网络异常波动)`);
     return;
   }
+  const userQuiz = await ctx.database.get("cafeQuiz", { userId: argv.session.userId });
+  let userQuizA = null;
+  if (userQuiz.length === 0) {
+    userQuizA = await ctx.database.create("cafeQuiz", {
+      userId: argv.session.userId,
+      right: 0,
+      wrong: 0
+    });
+  } else {
+    userQuizA = userQuiz[0];
+  }
   var qItem = quizDataSet[lastQuestion.question];
-  console.log(`${argv.session.userId} try answer quiz(id:${lastQuestion.question}), input answer:${selectNumber}`);
+  logger2?.info(`${argv.session.userId} try answer quiz(id:${lastQuestion.question}): right answer:${lastQuestion.answer}, input answer:${selectNumber}`);
   if (qItem && lastQuestion.answer == selectNumber) {
-    await argv.session?.send(`${At(argv)}回答正确😊${qItem.explain.length > 0 ? "," + qItem.explain : ""}`);
+    await argv.session?.send(`${At(argv)}回答正确😊${qItem.explain.length > 0 ? "，" + qItem.explain : ""}`);
+    await ctx.database.set("cafeQuiz", userQuizA.id, {
+      right: userQuizA.right + 1
+    });
     return;
   } else {
-    await argv.session?.send(`${At(argv)}回答错误😟${qItem.explain2.length > 0 ? "," + qItem.explain2 : ""}`);
+    await argv.session?.send(`${At(argv)}回答错误😟${qItem.explain2.length > 0 ? "，" + qItem.explain2 : ""}`);
+    await ctx.database.set("cafeQuiz", userQuizA.id, {
+      wrong: userQuizA.wrong + 1
+    });
     return;
   }
 }
 __name(answerHandler, "answerHandler");
 async function apply3(ctx, config) {
+  logger2 = ctx.logger(name3);
+  ctx.model.extend("cafeQuiz", {
+    id: "unsigned",
+    userId: "string",
+    right: "integer",
+    wrong: "integer"
+  }, { primary: "id", autoInc: true });
   await downloadQuitDataIfNotExist(ctx, config, config.forceUpdateWhenLoad);
-  ctx.command("轨迹答题/出题").action(async (argv, _) => {
+  ctx.command("轨迹答题/出题", "随机抽一道题目").action(async (argv, _) => {
     await downloadQuitDataIfNotExist(ctx, config, false);
     var lastQuestion = await ctx.cache.get("question", argv.session.userId);
     if (lastQuestion) {
@@ -672,8 +706,9 @@ async function apply3(ctx, config) {
       return;
     }
     var dailyNameKey = DailySeededName(argv.session.userId);
+    argv.session.user;
     if (quizDataIds == null || quizDataIds.length <= 0) {
-      await argv.session?.send(`${At(argv)}超级计算机『卡佩尔』发生核心故障😵`);
+      await argv.session?.send(`${At(argv)}超级计算机『卡佩尔』发生核心故障😵(导力网络异常波动)`);
       return;
     }
     var todayCount = await ctx.cache.get("todayCache", dailyNameKey);
@@ -686,12 +721,13 @@ async function apply3(ctx, config) {
     }
     todayCount++;
     var cacheTimeoutTime = CafeTimeTools_default.getRemainingSecondsToBeijingMidnight();
+    logger2?.debug(`try set cache ${dailyNameKey}, ${todayCount}`);
     await ctx.cache.set("todayCache", dailyNameKey, todayCount, cacheTimeoutTime * 1e3);
     var randomId = import_koishi6.Random.pick(quizDataIds);
     var qItem = quizDataSet[randomId];
     var qOptions = import_koishi6.Random.shuffle(qItem.options);
     var answerIndex = -1;
-    console.log(`${argv.session.userId} get a new quiz(id:${randomId})`);
+    logger2?.info(`${argv.session.userId} get a new quiz(id:${randomId})`);
     for (var i = 0; i < qOptions.length; i++) {
       if (qOptions[i].oid === qItem.a) {
         answerIndex = i;
@@ -708,7 +744,7 @@ D. ${qOptions[3].s}`;
     return;
   });
   ctx.command("轨迹答题").usage("通过趣味答题看看你是不是合格的桂皮吧~");
-  ctx.command("轨迹答题/回答 <answer:text>", `使用"回答+空格+选项"回答问题哦，如"回答 A"`).action(async (argv, answer) => {
+  ctx.command("轨迹答题/回答 <answer:text>", `使用"回答+空格+选项"回答问题，另外你也可以直接@我说出选项(ABCD)哦`).action(async (argv, answer) => {
     await answerHandler(ctx, config, argv, answer);
     return;
   });
@@ -728,9 +764,19 @@ D. ${qOptions[3].s}`;
     await answerHandler(ctx, config, argv, "D");
     return;
   });
-  ctx.command("轨迹答题/答题分数").action(async (argv, _) => {
-    await argv.session?.send(`${At(argv)}正在开发中哦~`);
-    return;
+  ctx.command("轨迹答题/答题分", "查看答题总分数").action(async (argv, _) => {
+    const userQuiz = await ctx.database.get("cafeQuiz", { userId: argv.session.userId });
+    if (userQuiz.length === 0) {
+      await argv.session?.send(`${At(argv)}你还没有答过题哦，快来答题吧~`);
+      return;
+    } else {
+      let userQuizA = userQuiz[0];
+      let total = userQuizA.right + userQuizA.wrong;
+      await argv.session?.send(`${At(argv)}答题总数: ${total}
+正确回答: ${userQuizA.right}
+正确率: ${Math.round(userQuizA.right * 1 / total * 100)}`);
+      return;
+    }
   });
 }
 __name(apply3, "apply");
@@ -745,13 +791,18 @@ var Config4 = import_koishi7.Schema.intersect([
 
 // src/index.ts
 var name4 = "cafe-bot-exp";
-var inject3 = ["http", "cache"];
+var inject3 = ["http", "cache", "logger", "database"];
 async function apply4(ctx, config) {
   ctx.plugin(draw_exports, config);
   ctx.plugin(quiz_exports, config);
   ctx.plugin(cat_exports, config);
   ctx.command("关于", "about").action(async (argv, _) => {
-    argv.session?.send(`我是轨迹Cafe群聊机器人概念版~`);
+    argv.session?.send(
+      `我是运行在超级计算机『卡佩尔』上的轨迹CafeBot概念版v${version}🎉~
+- 我提供轨迹抽卡🎴和轨迹问答🙋‍功能
+- 另外我还有一些隐藏功能待你探索哦🎁
+多多与我聊天吧~`
+    );
   });
 }
 __name(apply4, "apply");

package/lib/quiz/index.d.ts

@@ -18,5 +18,16 @@ declare module '@koishijs/cache' {
         todayCache: number;
     }
 }
+declare module 'koishi' {
+    interface Tables {
+        'cafeQuiz': CafeQuiz;
+    }
+}
+export interface CafeQuiz {
+    id: number;
+    userId: string;
+    right: number;
+    wrong: number;
+}
 export declare function apply(ctx: Context, config: Config): Promise<void>;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@azimiao/koishi-plugin-cafe-bot-exp",
     "description": "cafe bot experiment",
-    "version": "0.0.12",
+    "version": "0.0.16",
     "main": "lib/index.js",
     "typings": "lib/index.d.ts",
     "repository": {