@zhin.js/plugin-word-riddle 1.0.0 → 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commands.d.ts.map +1 -1
- package/lib/commands.js +30 -29
- package/lib/commands.js.map +1 -1
- package/lib/game-flow.d.ts +1 -1
- package/lib/game-flow.d.ts.map +1 -1
- package/lib/game-flow.js +1 -1
- package/lib/game-flow.js.map +1 -1
- package/lib/hub-register.js +2 -2
- package/lib/hub-register.js.map +1 -1
- package/lib/index.js +6 -6
- package/lib/index.js.map +1 -1
- package/lib/riddle-command.js +1 -1
- package/lib/riddle-command.js.map +1 -1
- package/lib/riddle-provider.d.ts.map +1 -1
- package/lib/riddle-provider.js +2 -1
- package/lib/riddle-provider.js.map +1 -1
- package/lib/riddles-catalog.d.ts +3 -0
- package/lib/riddles-catalog.d.ts.map +1 -0
- package/lib/riddles-catalog.js +2 -0
- package/lib/riddles-catalog.js.map +1 -0
- package/lib/session-service.d.ts +1 -1
- package/lib/session-service.d.ts.map +1 -1
- package/lib/session-service.js +4 -7
- package/lib/session-service.js.map +1 -1
- package/lib/view.d.ts +1 -1
- package/lib/view.d.ts.map +1 -1
- package/lib/view.js +5 -3
- package/lib/view.js.map +1 -1
- package/package.json +13 -4
- package/src/commands.ts +32 -28
- package/src/game-flow.ts +2 -2
- package/src/hub-register.ts +2 -2
- package/src/index.ts +6 -8
- package/src/riddle-command.ts +2 -2
- package/src/riddle-provider.ts +2 -1
- package/src/riddles-catalog.ts +8 -0
- package/src/session-service.ts +4 -6
- package/src/view.ts +5 -2
- package/lib/data/riddles.d.ts +0 -3
- package/lib/data/riddles.d.ts.map +0 -1
- package/lib/data/riddles.js +0 -2
- package/lib/data/riddles.js.map +0 -1
- package/src/data/riddles.ts +0 -8
package/lib/commands.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAYrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAsB3D,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,GAAG,IAAI,GAAG,IAAI,CAG/F;AAgBD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,GAAG,IAAI,GAAG,IAAI,CAUlG;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,GAAG,IAAI,GAAG,IAAI,CAkDrG"}
|
package/lib/commands.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { MessageCommand, getActionFromMessage } from 'zhin.js';
|
|
2
|
-
import { buildChoiceFallbackMap, channelKey, normalizeRiddleAction, parseChoicePayload, registerGameTextMiddleware, } from '@zhin.js/game-shared';
|
|
2
|
+
import { buildChoiceFallbackMap, channelKey, normalizeRiddleAction, parseChoicePayload, registerGameTextMiddleware, resolveGameChoice, resolveGameTextPayload, } from '@zhin.js/game-shared';
|
|
3
3
|
import { handleChoice, processAnswerText, RIDDLE_PREFIX } from './game-flow.js';
|
|
4
4
|
import { runRiddleCommand } from './riddle-command.js';
|
|
5
|
+
const VALID_CHOICES = ['hint', 'skip', 'quit', 'restart_char', 'restart_idiom'];
|
|
5
6
|
function registerPattern(plugin, pattern, desc, getServices) {
|
|
6
7
|
plugin.addCommand(new MessageCommand(pattern)
|
|
7
8
|
.desc(desc)
|
|
@@ -14,30 +15,18 @@ function registerPattern(plugin, pattern, desc, getServices) {
|
|
|
14
15
|
}));
|
|
15
16
|
}
|
|
16
17
|
export function registerCommands(plugin, getServices) {
|
|
17
|
-
registerPattern(plugin, 'riddle [action:word]', '猜谜（riddle）', getServices);
|
|
18
|
-
registerPattern(plugin, '
|
|
18
|
+
registerPattern(plugin, '/riddle [action:word]', '猜谜（riddle）', getServices);
|
|
19
|
+
registerPattern(plugin, '/猜谜 [action:word]', '猜谜（中文）', getServices);
|
|
19
20
|
}
|
|
20
21
|
async function resolveChoice(message, services) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
return null;
|
|
30
|
-
const ch = channelKey(message);
|
|
31
|
-
const session = await services.getActiveForUser(ch, message.$sender.id)
|
|
32
|
-
?? (action.sourceMessageId
|
|
33
|
-
? await services.getActiveByBoardMessageId(action.sourceMessageId)
|
|
34
|
-
: null);
|
|
35
|
-
if (!session || session.channel_key !== ch)
|
|
36
|
-
return null;
|
|
37
|
-
const valid = ['hint', 'skip', 'quit', 'restart_char', 'restart_idiom'];
|
|
38
|
-
if (!valid.includes(choiceId))
|
|
39
|
-
return null;
|
|
40
|
-
return { sessionId: session.id, choiceId };
|
|
22
|
+
return resolveGameChoice({
|
|
23
|
+
message,
|
|
24
|
+
gamePrefix: RIDDLE_PREFIX,
|
|
25
|
+
validChoiceIds: VALID_CHOICES,
|
|
26
|
+
getById: (id) => services.getById(id),
|
|
27
|
+
getActiveForUser: (ch, uid) => services.getActiveForUser(ch, uid),
|
|
28
|
+
getByBoardMessageId: (mid) => services.getActiveByBoardMessageId(mid),
|
|
29
|
+
});
|
|
41
30
|
}
|
|
42
31
|
export function registerInteractive(plugin, getServices) {
|
|
43
32
|
plugin.registerInteractiveHandler(`${RIDDLE_PREFIX}:`, async (message) => {
|
|
@@ -62,20 +51,32 @@ export function registerTextMiddleware(plugin, getServices) {
|
|
|
62
51
|
if (action?.payload.startsWith(`${RIDDLE_PREFIX}:`))
|
|
63
52
|
return next();
|
|
64
53
|
const ch = channelKey(message);
|
|
65
|
-
const session = await services.getActiveForUser(ch, message.$sender.id);
|
|
66
|
-
if (!session)
|
|
67
|
-
return next();
|
|
68
54
|
const raw = message.$raw?.trim() ?? '';
|
|
69
55
|
if (!raw)
|
|
70
56
|
return next();
|
|
71
|
-
const
|
|
72
|
-
if (
|
|
57
|
+
const payloadFromText = resolveGameTextPayload(raw);
|
|
58
|
+
if (payloadFromText?.startsWith(`${RIDDLE_PREFIX}:`)) {
|
|
59
|
+
const parsed = parseChoicePayload(payloadFromText, RIDDLE_PREFIX);
|
|
60
|
+
if (parsed) {
|
|
61
|
+
const session = await services.getById(parsed.sessionId);
|
|
62
|
+
if (session?.channel_key === ch) {
|
|
63
|
+
const err = await handleChoice(plugin, services, message, parsed.sessionId, parsed.choiceId);
|
|
64
|
+
if (typeof err === 'string')
|
|
65
|
+
await message.$reply?.(err);
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
const session = await services.getActiveForUser(ch, message.$sender.id);
|
|
71
|
+
if (!session)
|
|
72
|
+
return next();
|
|
73
|
+
if (session.status === 'active') {
|
|
73
74
|
const map = buildChoiceFallbackMap(RIDDLE_PREFIX, session.id, [
|
|
74
75
|
{ id: 'hint', label: '提示' },
|
|
75
76
|
{ id: 'skip', label: '跳过' },
|
|
76
77
|
{ id: 'quit', label: '结束' },
|
|
77
78
|
]);
|
|
78
|
-
const payload = map
|
|
79
|
+
const payload = resolveGameTextPayload(raw, map);
|
|
79
80
|
const parsed = payload ? parseChoicePayload(payload, RIDDLE_PREFIX) : null;
|
|
80
81
|
if (parsed?.sessionId === session.id) {
|
|
81
82
|
const err = await handleChoice(plugin, services, message, session.id, parsed.choiceId);
|
package/lib/commands.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,cAAc,EAAE,oBAAoB,EAAe,MAAM,SAAS,CAAC;AACrF,OAAO,EACL,sBAAsB,EACtB,UAAU,EACV,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B,
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"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"}
|
package/lib/game-flow.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Message, Plugin } from 'zhin.js';
|
|
2
2
|
import { RIDDLE_PREFIX } from './engine.js';
|
|
3
3
|
import type { RiddleSessionRow } from './models.js';
|
|
4
|
-
import type { RiddleType } from './
|
|
4
|
+
import type { RiddleType } from './riddles-catalog.js';
|
|
5
5
|
import { type SessionService } from './session-service.js';
|
|
6
6
|
export declare function sendOrEditView(plugin: Plugin, services: SessionService, message: Message<any>, session: RiddleSessionRow, eventLines?: string[]): Promise<void>;
|
|
7
7
|
export declare function startGame(plugin: Plugin, services: SessionService, message: Message<any>, mode: RiddleType): Promise<string | undefined>;
|
package/lib/game-flow.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"game-flow.d.ts","sourceRoot":"","sources":["../src/game-flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAGL,aAAa,EAEd,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"game-flow.d.ts","sourceRoot":"","sources":["../src/game-flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAGL,aAAa,EAEd,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAC;AAG9B,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EACrB,OAAO,EAAE,gBAAgB,EACzB,UAAU,GAAE,MAAM,EAAO,GACxB,OAAO,CAAC,IAAI,CAAC,CAyBf;AAgBD,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EACrB,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAa7B;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GACpB,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EACrB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA0CxB;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyCxB;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
package/lib/game-flow.js
CHANGED
|
@@ -2,7 +2,7 @@ import { checkAnswer, getRiddleById, RIDDLE_PREFIX, typeLabel, } from './engine.
|
|
|
2
2
|
import { currentRiddleId, parseQueue, } from './session-service.js';
|
|
3
3
|
import { buildRiddleView, MAX_WRONG } from './view.js';
|
|
4
4
|
export async function sendOrEditView(plugin, services, message, session, eventLines = []) {
|
|
5
|
-
const content = buildRiddleView(session, eventLines);
|
|
5
|
+
const content = buildRiddleView(session, eventLines, message.$channel.type);
|
|
6
6
|
if (typeof content === 'string') {
|
|
7
7
|
await message.$reply?.(content);
|
|
8
8
|
return;
|
package/lib/game-flow.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"game-flow.js","sourceRoot":"","sources":["../src/game-flow.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,aAAa,EACb,aAAa,EACb,SAAS,GACV,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,eAAe,EACf,UAAU,GAEX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,QAAwB,EACxB,OAAqB,EACrB,OAAyB,EACzB,aAAuB,EAAE;IAEzB,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"game-flow.js","sourceRoot":"","sources":["../src/game-flow.ts"],"names":[],"mappings":"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"}
|
package/lib/hub-register.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getPlugin } from 'zhin.js';
|
|
2
2
|
import { ensureGameHubService } from '@zhin.js/game-shared';
|
|
3
|
-
import { riddleCount } from './
|
|
3
|
+
import { riddleCount } from './riddles-catalog.js';
|
|
4
4
|
import { runRiddleCommand, RIDDLE_HELP } from './riddle-command.js';
|
|
5
5
|
const counts = riddleCount();
|
|
6
6
|
export function registerRiddleHub(getServices) {
|
|
@@ -11,7 +11,7 @@ export function registerRiddleHub(getServices) {
|
|
|
11
11
|
title: '猜谜',
|
|
12
12
|
icon: '🧩',
|
|
13
13
|
description: `字谜 ${counts.char.toLocaleString('zh-CN')} 题 + 成语 ${counts.idiom.toLocaleString('zh-CN')} 题`,
|
|
14
|
-
commandPrefix: '
|
|
14
|
+
commandPrefix: '/猜谜',
|
|
15
15
|
quickStart: '开始',
|
|
16
16
|
aliases: ['riddle'],
|
|
17
17
|
menus: [
|
package/lib/hub-register.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub-register.js","sourceRoot":"","sources":["../src/hub-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"hub-register.js","sourceRoot":"","sources":["../src/hub-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGpE,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;AAE7B,MAAM,UAAU,iBAAiB,CAAC,WAAwC;IACxE,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC,YAAY,CAAC;QACzB,EAAE,EAAE,QAAQ;QACZ,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,MAAM,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI;QACzG,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,CAAC,QAAQ,CAAC;QACnB,KAAK,EAAE;YACL,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE;YAClD,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE;YACjC,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE;YAClC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE;SACjC;QACD,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,QAAQ;gBAAE,OAAO,qBAAqB,CAAC;YAC5C,OAAO,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvG,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { formatCompact, usePlugin } from 'zhin.js';
|
|
2
2
|
import { registerModels } from './models.js';
|
|
3
3
|
import { createServices, resolveGameDatabase } from './session-service.js';
|
|
4
4
|
import { registerCommands, registerInteractive, registerTextMiddleware } from './commands.js';
|
|
5
5
|
import { registerRiddleHub } from './hub-register.js';
|
|
6
6
|
const plugin = usePlugin();
|
|
7
|
-
const { logger, useContext,
|
|
7
|
+
const { logger, useContext, addSchedule } = plugin;
|
|
8
8
|
registerModels(plugin);
|
|
9
9
|
let services = null;
|
|
10
10
|
useContext('database', (dbFeature) => {
|
|
11
11
|
services = createServices(resolveGameDatabase(dbFeature));
|
|
12
|
-
logger.
|
|
12
|
+
logger.debug(formatCompact({ 模块: '猜谜', 数据模型: '已就绪' }));
|
|
13
13
|
});
|
|
14
14
|
registerRiddleHub(() => services);
|
|
15
15
|
registerCommands(plugin, () => services);
|
|
16
16
|
registerInteractive(plugin, () => services);
|
|
17
17
|
registerTextMiddleware(plugin, () => services);
|
|
18
|
-
|
|
18
|
+
addSchedule({ kind: 'solar', cron: '0 */15 * * * *' }, async () => {
|
|
19
19
|
if (!services)
|
|
20
20
|
return;
|
|
21
21
|
const n = await services.abortStale(45 * 60 * 1000);
|
|
22
22
|
if (n > 0)
|
|
23
23
|
logger.debug(formatCompact({ 猜谜: '清理超时局', count: n }));
|
|
24
|
-
})
|
|
25
|
-
logger.
|
|
24
|
+
});
|
|
25
|
+
logger.debug(formatCompact({ 模块: '猜谜', 状态: '已加载' }));
|
|
26
26
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAwB,MAAM,SAAS,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAuB,MAAM,sBAAsB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;AAC3B,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;AAEnD,cAAc,CAAC,MAAM,CAAC,CAAC;AAEvB,IAAI,QAAQ,GAA0B,IAAI,CAAC;AAE3C,UAAU,CAAC,UAAU,EAAE,CAAC,SAA0B,EAAE,EAAE;IACpD,QAAQ,GAAG,cAAc,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1D,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC;AAEH,iBAAiB,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;AAClC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;AACzC,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;AAC5C,sBAAsB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;AAE/C,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,KAAK,IAAI,EAAE;IAC9D,IAAI,CAAC,QAAQ;QAAE,OAAO;IACtB,MAAM,CAAC,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACpD,IAAI,CAAC,GAAG,CAAC;QAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACpE,CAAC,CAAC,CAAC;AAEL,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC"}
|
package/lib/riddle-command.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { channelKey } from '@zhin.js/game-shared';
|
|
2
2
|
import { continueGame, startGame } from './game-flow.js';
|
|
3
|
-
import { riddleCount } from './
|
|
3
|
+
import { riddleCount } from './riddles-catalog.js';
|
|
4
4
|
import { typeLabel } from './engine.js';
|
|
5
5
|
const counts = riddleCount();
|
|
6
6
|
export const RIDDLE_HELP = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"riddle-command.js","sourceRoot":"","sources":["../src/riddle-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"riddle-command.js","sourceRoot":"","sources":["../src/riddle-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAmB,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;AAE7B,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,iBAAiB;IACjB,MAAM,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI;IAC5F,kBAAkB;IAClB,cAAc;IACd,cAAc;IACd,eAAe;IACf,cAAc;IACd,YAAY;IACZ,EAAE;IACF,4BAA4B;CAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,SAAS,SAAS,CAAC,MAAc;IAC/B,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IACxD,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,OAAO,CAAC;IAC1D,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IACzD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,QAAwB,EACxB,OAAqB,EACrB,MAAc;IAEd,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;IAElC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAChC,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,CAAC,IAAI,CAAC,OAAO,SAAS,CAAC,MAAM,CAAC,IAAkB,CAAC,SAAS,MAAM,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACvG,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAE5D,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAC7C,OAAO,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG;YAAE,OAAO,YAAY,CAAC;QAC9B,MAAM,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5D,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,SAAS,MAAM,OAAO,WAAW,EAAE,CAAC;AAC7C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"riddle-provider.d.ts","sourceRoot":"","sources":["../src/riddle-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"riddle-provider.d.ts","sourceRoot":"","sources":["../src/riddle-provider.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC;AAE1C,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAuDD,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,WAAW,EAAE,CAE7D;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAIjE;AAED,wBAAgB,WAAW,IAAI;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAI5E;AAED,sCAAsC;AACtC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAEtC,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,SAAsB,GAAG,WAAW,EAAE,CAU3F"}
|
package/lib/riddle-provider.js
CHANGED
|
@@ -7,6 +7,7 @@ import { readFileSync } from 'node:fs';
|
|
|
7
7
|
import { dirname, join } from 'node:path';
|
|
8
8
|
import { fileURLToPath } from 'node:url';
|
|
9
9
|
import { createRequire } from 'node:module';
|
|
10
|
+
import { secureRandomInt } from '@zhin.js/game-shared';
|
|
10
11
|
const require = createRequire(import.meta.url);
|
|
11
12
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
12
13
|
const charRiddles = JSON.parse(readFileSync(join(__dirname, 'data/char-riddles.json'), 'utf8'));
|
|
@@ -72,7 +73,7 @@ export function pickRoundQueue(type, count = QUESTIONS_PER_ROUND) {
|
|
|
72
73
|
const k = Math.min(count, n);
|
|
73
74
|
const indices = Array.from({ length: n }, (_, i) => i);
|
|
74
75
|
for (let i = 0; i < k; i++) {
|
|
75
|
-
const j = i +
|
|
76
|
+
const j = i + secureRandomInt(n - i);
|
|
76
77
|
[indices[i], indices[j]] = [indices[j], indices[i]];
|
|
77
78
|
}
|
|
78
79
|
return indices.slice(0, k).map((i) => pool[i]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"riddle-provider.js","sourceRoot":"","sources":["../src/riddle-provider.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"riddle-provider.js","sourceRoot":"","sources":["../src/riddle-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"riddles-catalog.d.ts","sourceRoot":"","sources":["../src/riddles-catalog.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EACL,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,WAAW,EACX,aAAa,GACd,MAAM,sBAAsB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"riddles-catalog.js","sourceRoot":"","sources":["../src/riddles-catalog.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,WAAW,EACX,aAAa,GACd,MAAM,sBAAsB,CAAC"}
|
package/lib/session-service.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Database, DatabaseFeature, Message, Models } from 'zhin.js';
|
|
2
|
-
import { type RiddleType } from './
|
|
2
|
+
import { type RiddleType } from './riddles-catalog.js';
|
|
3
3
|
import type { RiddleSessionRow } from './models.js';
|
|
4
4
|
export type RiddleDatabase = Database<unknown, Models, string>;
|
|
5
5
|
export declare function parseQueue(value: string | string[] | unknown): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-service.d.ts","sourceRoot":"","sources":["../src/session-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAgB,MAAM,SAAS,CAAC;AAExF,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"session-service.d.ts","sourceRoot":"","sources":["../src/session-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAgB,MAAM,SAAS,CAAC;AAExF,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAQ/D,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,GAAG,MAAM,EAAE,CASvE;AAED,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,cAAc;IAEzC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAKrE,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAMnF,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAIrD,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAS9E,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA6BjF,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1E,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAalD;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,cAAc,GAAG,cAAc,CAEjE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,eAAe,GAAG,cAAc,CAE5E;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAGxE"}
|
package/lib/session-service.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { channelKey, generateSessionId } from '@zhin.js/game-shared';
|
|
2
|
-
import { pickRoundQueue } from './
|
|
1
|
+
import { channelKey, generateSessionId, boardMessageMatches } from '@zhin.js/game-shared';
|
|
2
|
+
import { pickRoundQueue } from './riddles-catalog.js';
|
|
3
3
|
function getModel(db) {
|
|
4
4
|
const model = db.models.get('word_riddle_sessions');
|
|
5
5
|
if (!model)
|
|
@@ -40,12 +40,9 @@ export class SessionService {
|
|
|
40
40
|
async getActiveByBoardMessageId(messageId) {
|
|
41
41
|
if (!messageId)
|
|
42
42
|
return null;
|
|
43
|
-
const rows = await getModel(this.db).findAll({
|
|
43
|
+
const rows = await getModel(this.db).findAll({});
|
|
44
44
|
for (const row of rows) {
|
|
45
|
-
|
|
46
|
-
if (!stored)
|
|
47
|
-
continue;
|
|
48
|
-
if (stored === messageId || stored.endsWith(`:${messageId}`))
|
|
45
|
+
if (boardMessageMatches(row.board_message_id ?? '', messageId))
|
|
49
46
|
return row;
|
|
50
47
|
}
|
|
51
48
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-service.js","sourceRoot":"","sources":["../src/session-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"session-service.js","sourceRoot":"","sources":["../src/session-service.ts"],"names":[],"mappings":"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"}
|
package/lib/view.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { SendContent } from 'zhin.js';
|
|
2
2
|
import type { RiddleSessionRow } from './models.js';
|
|
3
3
|
declare const MAX_WRONG = 3;
|
|
4
|
-
export declare function buildRiddleView(session: RiddleSessionRow, eventLines?: string[]): SendContent | string;
|
|
4
|
+
export declare function buildRiddleView(session: RiddleSessionRow, eventLines?: string[], channelType?: string): SendContent | string;
|
|
5
5
|
export { MAX_WRONG };
|
|
6
6
|
//# sourceMappingURL=view.d.ts.map
|
package/lib/view.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../src/view.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpD,QAAA,MAAM,SAAS,IAAI,CAAC;AAEpB,wBAAgB,eAAe,CAC7B,OAAO,EAAE,gBAAgB,EACzB,UAAU,GAAE,MAAM,EAAO,
|
|
1
|
+
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../src/view.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpD,QAAA,MAAM,SAAS,IAAI,CAAC;AAEpB,wBAAgB,eAAe,CAC7B,OAAO,EAAE,gBAAgB,EACzB,UAAU,GAAE,MAAM,EAAO,EACzB,WAAW,CAAC,EAAE,MAAM,GACnB,WAAW,GAAG,MAAM,CAgDtB;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
package/lib/view.js
CHANGED
|
@@ -2,7 +2,7 @@ import { buildChoiceKeyboard } from '@zhin.js/game-shared';
|
|
|
2
2
|
import { getRiddleById, RIDDLE_PREFIX, typeLabel } from './engine.js';
|
|
3
3
|
import { currentRiddleId, parseQueue } from './session-service.js';
|
|
4
4
|
const MAX_WRONG = 3;
|
|
5
|
-
export function buildRiddleView(session, eventLines = []) {
|
|
5
|
+
export function buildRiddleView(session, eventLines = [], channelType) {
|
|
6
6
|
const queue = parseQueue(session.queue);
|
|
7
7
|
const terminal = session.status !== 'active';
|
|
8
8
|
const riddleId = currentRiddleId(session);
|
|
@@ -28,8 +28,8 @@ export function buildRiddleView(session, eventLines = []) {
|
|
|
28
28
|
return '题目加载失败，请重新开始。';
|
|
29
29
|
const choices = terminal
|
|
30
30
|
? [
|
|
31
|
-
{ id: 'restart_char', label: '🔤 再来字谜', style: 'primary' },
|
|
32
|
-
{ id: 'restart_idiom', label: '📜 再来成语', style: 'primary' },
|
|
31
|
+
{ id: 'restart_char', label: '🔤 再来字谜', style: 'primary', keepEnabledWhenTerminal: true },
|
|
32
|
+
{ id: 'restart_idiom', label: '📜 再来成语', style: 'primary', keepEnabledWhenTerminal: true },
|
|
33
33
|
]
|
|
34
34
|
: [
|
|
35
35
|
{ id: 'hint', label: '💡 提示', style: 'secondary' },
|
|
@@ -44,6 +44,8 @@ export function buildRiddleView(session, eventLines = []) {
|
|
|
44
44
|
terminal,
|
|
45
45
|
buttonsPerRow: terminal ? 2 : 3,
|
|
46
46
|
fallbackHint: '回复答案，或 1提示 2跳过 3结束',
|
|
47
|
+
interactionProfile: terminal ? 'terminal' : 'gameplay',
|
|
48
|
+
channelType,
|
|
47
49
|
});
|
|
48
50
|
}
|
|
49
51
|
export { MAX_WRONG };
|
package/lib/view.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.js","sourceRoot":"","sources":["../src/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEnE,MAAM,SAAS,GAAG,CAAC,CAAC;AAEpB,MAAM,UAAU,eAAe,CAC7B,OAAyB,EACzB,aAAuB,EAAE;
|
|
1
|
+
{"version":3,"file":"view.js","sourceRoot":"","sources":["../src/view.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zhin.js/plugin-word-riddle",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.1",
|
|
4
4
|
"description": "Zhin.js 猜谜 — 字谜与猜成语",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -21,15 +21,24 @@
|
|
|
21
21
|
],
|
|
22
22
|
"license": "MIT",
|
|
23
23
|
"peerDependencies": {
|
|
24
|
-
"zhin.js": "4.1.
|
|
24
|
+
"zhin.js": "4.1.2"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"chinese-idiom-chengyu": "^1.1.0",
|
|
28
|
-
"@zhin.js/game-shared": "1.0.
|
|
28
|
+
"@zhin.js/game-shared": "1.0.1"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"typescript": "^6.0.3",
|
|
32
|
-
"zhin.js": "4.1.
|
|
32
|
+
"zhin.js": "4.1.2"
|
|
33
|
+
},
|
|
34
|
+
"repository": {
|
|
35
|
+
"type": "git",
|
|
36
|
+
"url": "git+https://github.com/zhinjs/zhin.git",
|
|
37
|
+
"directory": "plugins/games/word-riddle"
|
|
38
|
+
},
|
|
39
|
+
"publishConfig": {
|
|
40
|
+
"access": "public",
|
|
41
|
+
"registry": "https://registry.npmjs.org"
|
|
33
42
|
},
|
|
34
43
|
"scripts": {
|
|
35
44
|
"build:data": "node scripts/build-char-riddles.mjs",
|
package/src/commands.ts
CHANGED
|
@@ -5,11 +5,15 @@ import {
|
|
|
5
5
|
normalizeRiddleAction,
|
|
6
6
|
parseChoicePayload,
|
|
7
7
|
registerGameTextMiddleware,
|
|
8
|
+
resolveGameChoice,
|
|
9
|
+
resolveGameTextPayload,
|
|
8
10
|
} from '@zhin.js/game-shared';
|
|
9
11
|
import { handleChoice, processAnswerText, RIDDLE_PREFIX } from './game-flow.js';
|
|
10
12
|
import { runRiddleCommand } from './riddle-command.js';
|
|
11
13
|
import type { SessionService } from './session-service.js';
|
|
12
14
|
|
|
15
|
+
const VALID_CHOICES = ['hint', 'skip', 'quit', 'restart_char', 'restart_idiom'] as const;
|
|
16
|
+
|
|
13
17
|
function registerPattern(
|
|
14
18
|
plugin: Plugin,
|
|
15
19
|
pattern: string,
|
|
@@ -29,34 +33,22 @@ function registerPattern(
|
|
|
29
33
|
}
|
|
30
34
|
|
|
31
35
|
export function registerCommands(plugin: Plugin, getServices: () => SessionService | null): void {
|
|
32
|
-
registerPattern(plugin, 'riddle [action:word]', '猜谜（riddle）', getServices);
|
|
33
|
-
registerPattern(plugin, '
|
|
36
|
+
registerPattern(plugin, '/riddle [action:word]', '猜谜（riddle）', getServices);
|
|
37
|
+
registerPattern(plugin, '/猜谜 [action:word]', '猜谜（中文）', getServices);
|
|
34
38
|
}
|
|
35
39
|
|
|
36
40
|
async function resolveChoice(
|
|
37
41
|
message: Message<any>,
|
|
38
42
|
services: SessionService,
|
|
39
43
|
): Promise<{ sessionId: string; choiceId: string } | null> {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
const ch = channelKey(message);
|
|
50
|
-
const session =
|
|
51
|
-
await services.getActiveForUser(ch, message.$sender.id)
|
|
52
|
-
?? (action.sourceMessageId
|
|
53
|
-
? await services.getActiveByBoardMessageId(action.sourceMessageId)
|
|
54
|
-
: null);
|
|
55
|
-
if (!session || session.channel_key !== ch) return null;
|
|
56
|
-
|
|
57
|
-
const valid = ['hint', 'skip', 'quit', 'restart_char', 'restart_idiom'];
|
|
58
|
-
if (!valid.includes(choiceId)) return null;
|
|
59
|
-
return { sessionId: session.id, choiceId };
|
|
44
|
+
return resolveGameChoice({
|
|
45
|
+
message,
|
|
46
|
+
gamePrefix: RIDDLE_PREFIX,
|
|
47
|
+
validChoiceIds: VALID_CHOICES,
|
|
48
|
+
getById: (id) => services.getById(id),
|
|
49
|
+
getActiveForUser: (ch, uid) => services.getActiveForUser(ch, uid),
|
|
50
|
+
getByBoardMessageId: (mid) => services.getActiveByBoardMessageId(mid),
|
|
51
|
+
});
|
|
60
52
|
}
|
|
61
53
|
|
|
62
54
|
export function registerInteractive(plugin: Plugin, getServices: () => SessionService | null): void {
|
|
@@ -80,20 +72,32 @@ export function registerTextMiddleware(plugin: Plugin, getServices: () => Sessio
|
|
|
80
72
|
if (action?.payload.startsWith(`${RIDDLE_PREFIX}:`)) return next();
|
|
81
73
|
|
|
82
74
|
const ch = channelKey(message);
|
|
83
|
-
const session = await services.getActiveForUser(ch, message.$sender.id);
|
|
84
|
-
if (!session) return next();
|
|
85
|
-
|
|
86
75
|
const raw = message.$raw?.trim() ?? '';
|
|
87
76
|
if (!raw) return next();
|
|
88
77
|
|
|
89
|
-
const
|
|
90
|
-
if (
|
|
78
|
+
const payloadFromText = resolveGameTextPayload(raw);
|
|
79
|
+
if (payloadFromText?.startsWith(`${RIDDLE_PREFIX}:`)) {
|
|
80
|
+
const parsed = parseChoicePayload(payloadFromText, RIDDLE_PREFIX);
|
|
81
|
+
if (parsed) {
|
|
82
|
+
const session = await services.getById(parsed.sessionId);
|
|
83
|
+
if (session?.channel_key === ch) {
|
|
84
|
+
const err = await handleChoice(plugin, services, message, parsed.sessionId, parsed.choiceId);
|
|
85
|
+
if (typeof err === 'string') await message.$reply?.(err);
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
const session = await services.getActiveForUser(ch, message.$sender.id);
|
|
92
|
+
if (!session) return next();
|
|
93
|
+
|
|
94
|
+
if (session.status === 'active') {
|
|
91
95
|
const map = buildChoiceFallbackMap(RIDDLE_PREFIX, session.id, [
|
|
92
96
|
{ id: 'hint', label: '提示' },
|
|
93
97
|
{ id: 'skip', label: '跳过' },
|
|
94
98
|
{ id: 'quit', label: '结束' },
|
|
95
99
|
]);
|
|
96
|
-
const payload = map
|
|
100
|
+
const payload = resolveGameTextPayload(raw, map);
|
|
97
101
|
const parsed = payload ? parseChoicePayload(payload, RIDDLE_PREFIX) : null;
|
|
98
102
|
if (parsed?.sessionId === session.id) {
|
|
99
103
|
const err = await handleChoice(plugin, services, message, session.id, parsed.choiceId);
|
package/src/game-flow.ts
CHANGED
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
typeLabel,
|
|
7
7
|
} from './engine.js';
|
|
8
8
|
import type { RiddleSessionRow } from './models.js';
|
|
9
|
-
import type { RiddleType } from './
|
|
9
|
+
import type { RiddleType } from './riddles-catalog.js';
|
|
10
10
|
import {
|
|
11
11
|
currentRiddleId,
|
|
12
12
|
parseQueue,
|
|
@@ -21,7 +21,7 @@ export async function sendOrEditView(
|
|
|
21
21
|
session: RiddleSessionRow,
|
|
22
22
|
eventLines: string[] = [],
|
|
23
23
|
): Promise<void> {
|
|
24
|
-
const content = buildRiddleView(session, eventLines);
|
|
24
|
+
const content = buildRiddleView(session, eventLines, message.$channel.type);
|
|
25
25
|
if (typeof content === 'string') {
|
|
26
26
|
await message.$reply?.(content);
|
|
27
27
|
return;
|
package/src/hub-register.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getPlugin } from 'zhin.js';
|
|
2
2
|
import { ensureGameHubService } from '@zhin.js/game-shared';
|
|
3
|
-
import { riddleCount } from './
|
|
3
|
+
import { riddleCount } from './riddles-catalog.js';
|
|
4
4
|
import { runRiddleCommand, RIDDLE_HELP } from './riddle-command.js';
|
|
5
5
|
import type { SessionService } from './session-service.js';
|
|
6
6
|
|
|
@@ -14,7 +14,7 @@ export function registerRiddleHub(getServices: () => SessionService | null): ()
|
|
|
14
14
|
title: '猜谜',
|
|
15
15
|
icon: '🧩',
|
|
16
16
|
description: `字谜 ${counts.char.toLocaleString('zh-CN')} 题 + 成语 ${counts.idiom.toLocaleString('zh-CN')} 题`,
|
|
17
|
-
commandPrefix: '
|
|
17
|
+
commandPrefix: '/猜谜',
|
|
18
18
|
quickStart: '开始',
|
|
19
19
|
aliases: ['riddle'],
|
|
20
20
|
menus: [
|
package/src/index.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { formatCompact, usePlugin, type DatabaseFeature } from 'zhin.js';
|
|
2
2
|
import { registerModels } from './models.js';
|
|
3
3
|
import { createServices, resolveGameDatabase, type SessionService } from './session-service.js';
|
|
4
4
|
import { registerCommands, registerInteractive, registerTextMiddleware } from './commands.js';
|
|
5
5
|
import { registerRiddleHub } from './hub-register.js';
|
|
6
6
|
|
|
7
7
|
const plugin = usePlugin();
|
|
8
|
-
const { logger, useContext,
|
|
8
|
+
const { logger, useContext, addSchedule } = plugin;
|
|
9
9
|
|
|
10
10
|
registerModels(plugin);
|
|
11
11
|
|
|
@@ -13,7 +13,7 @@ let services: SessionService | null = null;
|
|
|
13
13
|
|
|
14
14
|
useContext('database', (dbFeature: DatabaseFeature) => {
|
|
15
15
|
services = createServices(resolveGameDatabase(dbFeature));
|
|
16
|
-
logger.
|
|
16
|
+
logger.debug(formatCompact({ 模块: '猜谜', 数据模型: '已就绪' }));
|
|
17
17
|
});
|
|
18
18
|
|
|
19
19
|
registerRiddleHub(() => services);
|
|
@@ -21,12 +21,10 @@ registerCommands(plugin, () => services);
|
|
|
21
21
|
registerInteractive(plugin, () => services);
|
|
22
22
|
registerTextMiddleware(plugin, () => services);
|
|
23
23
|
|
|
24
|
-
|
|
25
|
-
new Cron('0 */15 * * * *', async () => {
|
|
24
|
+
addSchedule({ kind: 'solar', cron: '0 */15 * * * *' }, async () => {
|
|
26
25
|
if (!services) return;
|
|
27
26
|
const n = await services.abortStale(45 * 60 * 1000);
|
|
28
27
|
if (n > 0) logger.debug(formatCompact({ 猜谜: '清理超时局', count: n }));
|
|
29
|
-
})
|
|
30
|
-
);
|
|
28
|
+
});
|
|
31
29
|
|
|
32
|
-
logger.
|
|
30
|
+
logger.debug(formatCompact({ 模块: '猜谜', 状态: '已加载' }));
|
package/src/riddle-command.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { Message, Plugin } from 'zhin.js';
|
|
2
2
|
import { channelKey } from '@zhin.js/game-shared';
|
|
3
3
|
import { continueGame, startGame } from './game-flow.js';
|
|
4
|
-
import { riddleCount } from './
|
|
5
|
-
|
|
4
|
+
import { riddleCount, type RiddleType } from './riddles-catalog.js';
|
|
5
|
+
|
|
6
6
|
import { typeLabel } from './engine.js';
|
|
7
7
|
import type { SessionService } from './session-service.js';
|
|
8
8
|
|
package/src/riddle-provider.ts
CHANGED
|
@@ -7,6 +7,7 @@ import { readFileSync } from 'node:fs';
|
|
|
7
7
|
import { dirname, join } from 'node:path';
|
|
8
8
|
import { fileURLToPath } from 'node:url';
|
|
9
9
|
import { createRequire } from 'node:module';
|
|
10
|
+
import { secureRandomInt } from '@zhin.js/game-shared';
|
|
10
11
|
|
|
11
12
|
export type RiddleType = 'char' | 'idiom';
|
|
12
13
|
|
|
@@ -98,7 +99,7 @@ export function pickRoundQueue(type: RiddleType, count = QUESTIONS_PER_ROUND): R
|
|
|
98
99
|
const k = Math.min(count, n);
|
|
99
100
|
const indices = Array.from({ length: n }, (_, i) => i);
|
|
100
101
|
for (let i = 0; i < k; i++) {
|
|
101
|
-
const j = i +
|
|
102
|
+
const j = i + secureRandomInt(n - i);
|
|
102
103
|
[indices[i], indices[j]] = [indices[j]!, indices[i]!];
|
|
103
104
|
}
|
|
104
105
|
return indices.slice(0, k).map((i) => pool[i]!);
|
package/src/session-service.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Database, DatabaseFeature, Message, Models, RelatedModel } from 'zhin.js';
|
|
2
|
-
import { channelKey, generateSessionId } from '@zhin.js/game-shared';
|
|
3
|
-
import { pickRoundQueue, type RiddleType } from './
|
|
2
|
+
import { channelKey, generateSessionId, boardMessageMatches } from '@zhin.js/game-shared';
|
|
3
|
+
import { pickRoundQueue, type RiddleType } from './riddles-catalog.js';
|
|
4
4
|
import type { RiddleSessionRow } from './models.js';
|
|
5
5
|
|
|
6
6
|
export type RiddleDatabase = Database<unknown, Models, string>;
|
|
@@ -42,11 +42,9 @@ export class SessionService {
|
|
|
42
42
|
|
|
43
43
|
async getActiveByBoardMessageId(messageId: string): Promise<RiddleSessionRow | null> {
|
|
44
44
|
if (!messageId) return null;
|
|
45
|
-
const rows = await getModel(this.db).findAll({
|
|
45
|
+
const rows = await getModel(this.db).findAll({});
|
|
46
46
|
for (const row of rows) {
|
|
47
|
-
|
|
48
|
-
if (!stored) continue;
|
|
49
|
-
if (stored === messageId || stored.endsWith(`:${messageId}`)) return row;
|
|
47
|
+
if (boardMessageMatches(row.board_message_id ?? '', messageId)) return row;
|
|
50
48
|
}
|
|
51
49
|
return null;
|
|
52
50
|
}
|
package/src/view.ts
CHANGED
|
@@ -9,6 +9,7 @@ const MAX_WRONG = 3;
|
|
|
9
9
|
export function buildRiddleView(
|
|
10
10
|
session: RiddleSessionRow,
|
|
11
11
|
eventLines: string[] = [],
|
|
12
|
+
channelType?: string,
|
|
12
13
|
): SendContent | string {
|
|
13
14
|
const queue = parseQueue(session.queue);
|
|
14
15
|
const terminal = session.status !== 'active';
|
|
@@ -37,8 +38,8 @@ export function buildRiddleView(
|
|
|
37
38
|
|
|
38
39
|
const choices = terminal
|
|
39
40
|
? [
|
|
40
|
-
{ id: 'restart_char', label: '🔤 再来字谜', style: 'primary' as const },
|
|
41
|
-
{ id: 'restart_idiom', label: '📜 再来成语', style: 'primary' as const },
|
|
41
|
+
{ id: 'restart_char', label: '🔤 再来字谜', style: 'primary' as const, keepEnabledWhenTerminal: true },
|
|
42
|
+
{ id: 'restart_idiom', label: '📜 再来成语', style: 'primary' as const, keepEnabledWhenTerminal: true },
|
|
42
43
|
]
|
|
43
44
|
: [
|
|
44
45
|
{ id: 'hint', label: '💡 提示', style: 'secondary' as const },
|
|
@@ -54,6 +55,8 @@ export function buildRiddleView(
|
|
|
54
55
|
terminal,
|
|
55
56
|
buttonsPerRow: terminal ? 2 : 3,
|
|
56
57
|
fallbackHint: '回复答案，或 1提示 2跳过 3结束',
|
|
58
|
+
interactionProfile: terminal ? 'terminal' : 'gameplay',
|
|
59
|
+
channelType,
|
|
57
60
|
});
|
|
58
61
|
}
|
|
59
62
|
|
package/lib/data/riddles.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"riddles.d.ts","sourceRoot":"","sources":["../../src/data/riddles.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EACL,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,WAAW,EACX,aAAa,GACd,MAAM,uBAAuB,CAAC"}
|
package/lib/data/riddles.js
DELETED
package/lib/data/riddles.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"riddles.js","sourceRoot":"","sources":["../../src/data/riddles.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,WAAW,EACX,aAAa,GACd,MAAM,uBAAuB,CAAC"}
|