koishi-plugin-wordle-game 2.1.5 → 2.1.7

package/lib/index.js

@@ -24,7 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apply = exports.Config = exports.usage = exports.name = exports.inject = void 0;
+exports.Config = exports.usage = exports.name = exports.inject = void 0;
+exports.apply = apply;
 const koishi_1 = require("koishi");
 // import {} from 'koishi-plugin-rr-gpt'
 const cheerio_1 = require("cheerio");
@@ -960,7 +961,6 @@ async function apply(ctx, config) {
                 // 玩家记录输
                 await updatePlayerRecordsLose(channelId, gameInfo);
                 await endGame(channelId);
-                await setGuessRunningStatus(channelId, false);
                 return await sendMessage(session, `【@${username}】\n作答时间超过【${config.wordGuessTimeLimitInSeconds}】秒！\n很遗憾，你们输了!\n下次猜快点吧~`);
                 // return await sendMessage(session, `【@${username}】\n作答时间超过【${config.wordGuessTimeLimitInSeconds}】秒！\n很遗憾，你们输了!\n下次猜快点吧~\n${h.image(imageBuffer, `image/${config.imageType}`)}`)
             }
@@ -985,12 +985,15 @@ async function apply(ctx, config) {
             return await sendMessage(session, `【@${username}】\n输入包含非字母字符，请重新输入！`);
         }
         if (!isFourCharacterIdiom(inputWord) && gameMode === '汉兜' || !isFourCharacterIdiom(inputWord) && gameMode === '词影') {
+            await setGuessRunningStatus(channelId, false);
             return await sendMessage(session, `【@${username}】\n您确定您输入的是四字词语吗？`);
         }
         if (gameMode === 'Numberle' && !isNumericString(inputWord)) {
+            await setGuessRunningStatus(channelId, false);
             return await sendMessage(session, `【@${username}】\n您确定您输入的是 ${guessWordLength} 长度的数字吗？`);
         }
         if (gameMode === 'Math' && !isMathEquationValid(inputWord)) {
+            await setGuessRunningStatus(channelId, false);
             return await sendMessage(session, `【@${username}】\n请使用+-*/=运算符和0-9之间的数字！\n并组成正确的数学方程式！`);
         }
         if (inputWord.length !== gameInfo.guessWordLength && gameMode !== '汉兜' && gameMode !== '词影' && gameMode !== 'Numberle' && gameMode !== 'Math') {
@@ -1825,7 +1828,9 @@ ${rankType3.map((type, index) => `${index + 1}. ${type}`).join('\n')}
     });
     // ch*
     async function generateHandlePinyinsImage(pinyinsHtml) {
-        const page = await ctx.puppeteer.page();
+        const browser = ctx.puppeteer.browser;
+        const context = await browser.createBrowserContext();
+        const page = await context.newPage();
         await page.setViewport({ width: 420, height: 570, deviceScaleFactor: 1 });
         const filePath = path.join(__dirname, 'emptyHtml.html').replace(/\\/g, '/');
         await page.goto('file://' + filePath);
@@ -1904,7 +1909,9 @@ ${rankType3.map((type, index) => `${index + 1}. ${type}`).join('\n')}
         return resultStrings.join('\n');
     }
     async function generateWordlesImage(htmlImgString) {
-        const page = await ctx.puppeteer.page();
+        const browser = ctx.puppeteer.browser;
+        const context = await browser.createBrowserContext();
+        const page = await context.newPage();
         await page.setViewport({
             width: config.compositeImagePageWidth,
             height: config.compositeImagePageHeight,
@@ -2477,7 +2484,9 @@ ${rankType3.map((type, index) => `${index + 1}. ${type}`).join('\n')}
         }
     }
     async function generateImage(styledHtml, gridHtml) {
-        const page = await ctx.puppeteer.page();
+        const browser = ctx.puppeteer.browser;
+        const context = await browser.createBrowserContext();
+        const page = await context.newPage();
         await page.setViewport({ width: 611, height: 731, deviceScaleFactor: 1 });
         const filePath = path.join(__dirname, 'emptyHtml.html').replace(/\\/g, '/');
         await page.goto('file://' + filePath);
@@ -2494,7 +2503,9 @@ ${rankType3.map((type, index) => `${index + 1}. ${type}`).join('\n')}
         return imageBuffer;
     }
     async function generateImageForCiying(gridHtml, rowNum) {
-        const page = await ctx.puppeteer.page();
+        const browser = ctx.puppeteer.browser;
+        const context = await browser.createBrowserContext();
+        const page = await context.newPage();
         await page.setViewport({ width: 611, height: 140 * rowNum, deviceScaleFactor: 1 });
         const filePath = path.join(__dirname, 'emptyHtml.html').replace(/\\/g, '/');
         await page.goto('file://' + filePath);
@@ -2536,7 +2547,9 @@ ${gridHtml}
         return imageBuffer;
     }
     async function generateImageForHandle(gridHtml) {
-        const page = await ctx.puppeteer.page();
+        const browser = ctx.puppeteer.browser;
+        const context = await browser.createBrowserContext();
+        const page = await context.newPage();
         await page.setViewport({ width: 611, height: 731, deviceScaleFactor: 1 });
         const filePath = path.join(__dirname, 'emptyHtml.html').replace(/\\/g, '/');
         await page.goto('file://' + filePath);
@@ -4482,4 +4495,3 @@ ${content}
                     </div>`;
     // apply
 }
-exports.apply = apply;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-wordle-game",
   "description": "欢迎来到 [Wordle](https://www.nytimes.com/games/wordle/index.html) | [汉兜](https://handle.antfu.me/) | [词影](https://cy.surprising.studio/) |... 猜单词|猜成语|猜数字|猜数学方程式|... 的小游戏，包含多种词库、多种主题、多种游戏设置和排行榜系统。",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [