@zhin.js/plugin-dice-duel 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/README.md +31 -0
- package/lib/commands.d.ts.map +1 -1
- package/lib/commands.js +29 -28
- package/lib/commands.js.map +1 -1
- package/lib/engine.d.ts.map +1 -1
- package/lib/engine.js +2 -1
- package/lib/engine.js.map +1 -1
- package/lib/game-flow.d.ts.map +1 -1
- package/lib/game-flow.js +8 -12
- package/lib/game-flow.js.map +1 -1
- package/lib/hub-register.d.ts.map +1 -1
- package/lib/hub-register.js +6 -3
- package/lib/hub-register.js.map +1 -1
- package/lib/index.js +6 -6
- package/lib/index.js.map +1 -1
- package/lib/session-service.d.ts.map +1 -1
- package/lib/session-service.js +3 -6
- 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 +4 -2
- package/lib/view.js.map +1 -1
- package/package.json +13 -4
- package/src/commands.ts +30 -25
- package/src/engine.ts +3 -1
- package/src/game-flow.ts +6 -12
- package/src/hub-register.ts +1 -1
- package/src/index.ts +6 -8
- package/src/session-service.ts +3 -5
- package/src/view.ts +4 -1
package/README.md
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
# @zhin.js/plugin-dice-duel
|
|
2
|
+
|
|
3
|
+
骰子对决插件：双方掷骰比大小，三局两胜。
|
|
4
|
+
|
|
5
|
+
## 安装
|
|
6
|
+
|
|
7
|
+
```yaml
|
|
8
|
+
plugins:
|
|
9
|
+
- "@zhin.js/plugin-dice-duel"
|
|
10
|
+
database:
|
|
11
|
+
dialect: sqlite
|
|
12
|
+
storage: ./data/zhin.db
|
|
13
|
+
```
|
|
14
|
+
|
|
15
|
+
## 命令
|
|
16
|
+
|
|
17
|
+
| 命令 | 说明 |
|
|
18
|
+
|------|------|
|
|
19
|
+
| `/骰子` | 帮助与频道状态 |
|
|
20
|
+
| `/骰子 开始` | 开始对局 |
|
|
21
|
+
| `/骰子 继续` | 继续当前局 |
|
|
22
|
+
| `/dice` | 英文别名 |
|
|
23
|
+
|
|
24
|
+
也可通过 `/游戏` 大厅按钮进入。
|
|
25
|
+
|
|
26
|
+
## 开发
|
|
27
|
+
|
|
28
|
+
```bash
|
|
29
|
+
pnpm --filter @zhin.js/plugin-dice-duel build
|
|
30
|
+
pnpm vitest run plugins/games/dice-duel/tests
|
|
31
|
+
```
|
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,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,GAAG,IAAI,GAAG,IAAI,CAqCnG"}
|
package/lib/commands.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { MessageCommand, getActionFromMessage } from 'zhin.js';
|
|
2
|
-
import { buildChoiceFallbackMap, channelKey, normalizeDiceAction, parseChoicePayload, } from '@zhin.js/game-shared';
|
|
2
|
+
import { buildChoiceFallbackMap, channelKey, normalizeDiceAction, parseChoicePayload, registerGameTextMiddleware, resolveGameChoice, resolveGameTextPayload, } from '@zhin.js/game-shared';
|
|
3
3
|
import { DICE_PREFIX, handleChoice } from './game-flow.js';
|
|
4
4
|
import { runDiceCommand } from './dice-command.js';
|
|
5
|
+
const VALID_CHOICES = ['roll', 'restart'];
|
|
5
6
|
function registerPattern(plugin, pattern, desc, getServices) {
|
|
6
7
|
plugin.addCommand(new MessageCommand(pattern)
|
|
7
8
|
.desc(desc)
|
|
@@ -14,29 +15,18 @@ function registerPattern(plugin, pattern, desc, getServices) {
|
|
|
14
15
|
}));
|
|
15
16
|
}
|
|
16
17
|
export function registerCommands(plugin, getServices) {
|
|
17
|
-
registerPattern(plugin, 'dice [action:word]', '骰子对决（dice）', getServices);
|
|
18
|
-
registerPattern(plugin, '
|
|
18
|
+
registerPattern(plugin, '/dice [action:word]', '骰子对决（dice）', 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
|
-
if (!['roll', 'restart'].includes(choiceId))
|
|
38
|
-
return null;
|
|
39
|
-
return { sessionId: session.id, choiceId };
|
|
22
|
+
return resolveGameChoice({
|
|
23
|
+
message,
|
|
24
|
+
gamePrefix: DICE_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
|
+
});
|
|
40
30
|
}
|
|
41
31
|
export function registerInteractive(plugin, getServices) {
|
|
42
32
|
plugin.registerInteractiveHandler(`${DICE_PREFIX}:`, async (message) => {
|
|
@@ -53,30 +43,41 @@ export function registerInteractive(plugin, getServices) {
|
|
|
53
43
|
});
|
|
54
44
|
}
|
|
55
45
|
export function registerTextFallback(plugin, getServices) {
|
|
56
|
-
plugin
|
|
46
|
+
registerGameTextMiddleware(plugin, async (message, next) => {
|
|
57
47
|
const services = getServices();
|
|
58
48
|
if (!services)
|
|
59
49
|
return next();
|
|
60
50
|
const action = getActionFromMessage(message);
|
|
61
51
|
if (action?.payload.startsWith(`${DICE_PREFIX}:`))
|
|
62
52
|
return next();
|
|
53
|
+
const raw = message.$raw?.trim() ?? '';
|
|
63
54
|
const ch = channelKey(message);
|
|
55
|
+
const payloadFromText = resolveGameTextPayload(raw);
|
|
56
|
+
if (payloadFromText?.startsWith(`${DICE_PREFIX}:`)) {
|
|
57
|
+
const parsed = parseChoicePayload(payloadFromText, DICE_PREFIX);
|
|
58
|
+
if (parsed) {
|
|
59
|
+
const session = await services.getById(parsed.sessionId);
|
|
60
|
+
if (session?.channel_key === ch) {
|
|
61
|
+
const err = await handleChoice(plugin, services, message, parsed.sessionId, parsed.choiceId);
|
|
62
|
+
if (err)
|
|
63
|
+
await message.$reply?.(err);
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
64
68
|
const session = await services.getActiveForUser(ch, message.$sender.id);
|
|
65
69
|
if (!session || session.status !== 'active')
|
|
66
70
|
return next();
|
|
67
|
-
const raw = message.$raw?.trim() ?? '';
|
|
68
|
-
if (raw !== '1')
|
|
69
|
-
return next();
|
|
70
71
|
const map = buildChoiceFallbackMap(DICE_PREFIX, session.id, [
|
|
71
72
|
{ id: 'roll', label: '掷骰' },
|
|
72
73
|
]);
|
|
73
|
-
const payload = map
|
|
74
|
+
const payload = resolveGameTextPayload(raw, map);
|
|
74
75
|
const parsed = payload ? parseChoicePayload(payload, DICE_PREFIX) : null;
|
|
75
76
|
if (!parsed || parsed.sessionId !== session.id)
|
|
76
77
|
return next();
|
|
77
78
|
const err = await handleChoice(plugin, services, message, session.id, 'roll');
|
|
78
79
|
if (err)
|
|
79
80
|
await message.$reply?.(err);
|
|
80
|
-
});
|
|
81
|
+
}, 'dice:text');
|
|
81
82
|
}
|
|
82
83
|
//# sourceMappingURL=commands.js.map
|
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,mBAAmB,EACnB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"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"}
|
package/lib/engine.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,SAAS,CAAC;AAClC,eAAO,MAAM,UAAU,IAAI,CAAC;AAE5B,wBAAgB,MAAM,IAAI,MAAM,CAE/B;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAG3C;AAED,wBAAwB;AACxB,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAGnE"}
|
package/lib/engine.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { secureRandomIntInclusive } from '@zhin.js/game-shared';
|
|
1
2
|
export const DICE_PREFIX = 'dice';
|
|
2
3
|
export const WIN_TARGET = 2; // best of 3 -> first to 2
|
|
3
4
|
export function rollD6() {
|
|
4
|
-
return 1
|
|
5
|
+
return secureRandomIntInclusive(1, 6);
|
|
5
6
|
}
|
|
6
7
|
export function diceEmoji(n) {
|
|
7
8
|
const faces = ['⚀', '⚁', '⚂', '⚃', '⚄', '⚅'];
|
package/lib/engine.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC;AAClC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,0BAA0B;AAEvD,MAAM,UAAU,MAAM;IACpB,OAAO,
|
|
1
|
+
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC;AAClC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,0BAA0B;AAEvD,MAAM,UAAU,MAAM;IACpB,OAAO,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAS;IACjC,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,wBAAwB;AACxB,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,GAAW;IACtD,IAAI,MAAM,KAAK,GAAG;QAAE,OAAO,CAAC,CAAC;IAC7B,OAAO,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9B,CAAC"}
|
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;
|
|
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;AAExD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAgB,WAAW,EAAsB,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EACrB,OAAO,EAAE,cAAc,EACvB,SAAS,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,GAC7D,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAY7B;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,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,CA4CxB;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}
|
package/lib/game-flow.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { recordGameOutcome } from '@zhin.js/game-shared';
|
|
1
2
|
import { compareRolls, DICE_PREFIX, rollD6, WIN_TARGET } from './engine.js';
|
|
2
3
|
import { buildDiceView } from './view.js';
|
|
3
4
|
export async function sendOrEditView(plugin, services, message, session, lastRound) {
|
|
4
|
-
const content = buildDiceView(session, lastRound);
|
|
5
|
+
const content = buildDiceView(session, lastRound, message.$channel.type);
|
|
5
6
|
const adapter = plugin.root.inject(message.$adapter);
|
|
6
7
|
if (session.board_message_id) {
|
|
7
8
|
const msgId = await adapter.editMessage({
|
|
@@ -51,17 +52,8 @@ export async function handleChoice(plugin, services, message, sessionId, choiceI
|
|
|
51
52
|
return '对局已结束，请点击再来一局。';
|
|
52
53
|
}
|
|
53
54
|
if (choiceId === 'restart') {
|
|
54
|
-
await services.updateSession(session.id, {
|
|
55
|
-
|
|
56
|
-
bot_wins: 0,
|
|
57
|
-
round: 0,
|
|
58
|
-
last_player_roll: 0,
|
|
59
|
-
last_bot_roll: 0,
|
|
60
|
-
status: 'active',
|
|
61
|
-
board_message_id: '',
|
|
62
|
-
});
|
|
63
|
-
const updated = (await services.getById(session.id));
|
|
64
|
-
await sendOrEditView(plugin, services, message, updated);
|
|
55
|
+
await services.updateSession(session.id, { status: 'aborted' });
|
|
56
|
+
await startGame(plugin, services, message);
|
|
65
57
|
return null;
|
|
66
58
|
}
|
|
67
59
|
if (choiceId !== 'roll')
|
|
@@ -89,6 +81,10 @@ export async function handleChoice(plugin, services, message, sessionId, choiceI
|
|
|
89
81
|
status,
|
|
90
82
|
});
|
|
91
83
|
const updated = (await services.getById(session.id));
|
|
84
|
+
if (status === 'won')
|
|
85
|
+
void recordGameOutcome(message, 'dice', 'won', playerWins * 10);
|
|
86
|
+
else if (status === 'lost')
|
|
87
|
+
void recordGameOutcome(message, 'dice', 'lost');
|
|
92
88
|
await sendOrEditView(plugin, services, message, updated, { player, bot, result });
|
|
93
89
|
return null;
|
|
94
90
|
}
|
package/lib/game-flow.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"game-flow.js","sourceRoot":"","sources":["../src/game-flow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"game-flow.js","sourceRoot":"","sources":["../src/game-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub-register.d.ts","sourceRoot":"","sources":["../src/hub-register.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,cAAc,GAAG,IAAI,GAAG,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"hub-register.d.ts","sourceRoot":"","sources":["../src/hub-register.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,cAAc,GAAG,IAAI,GAAG,MAAM,IAAI,CAsBpF;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
package/lib/hub-register.js
CHANGED
|
@@ -1,12 +1,15 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getPlugin } from 'zhin.js';
|
|
2
|
+
import { ensureGameHubService } from '@zhin.js/game-shared';
|
|
2
3
|
import { runDiceCommand, DICE_HELP } from './dice-command.js';
|
|
3
4
|
export function registerDiceHub(getServices) {
|
|
4
|
-
|
|
5
|
+
const plugin = getPlugin();
|
|
6
|
+
ensureGameHubService(plugin);
|
|
7
|
+
return plugin.registerGame({
|
|
5
8
|
id: 'dice',
|
|
6
9
|
title: '骰子对决',
|
|
7
10
|
icon: '🎲',
|
|
8
11
|
description: '掷骰比大小，三局两胜',
|
|
9
|
-
commandPrefix: '
|
|
12
|
+
commandPrefix: '/骰子',
|
|
10
13
|
quickStart: '开始',
|
|
11
14
|
aliases: ['dice'],
|
|
12
15
|
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":"
|
|
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,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAG9D,MAAM,UAAU,eAAe,CAAC,WAAwC;IACtE,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC,YAAY,CAAC;QACzB,EAAE,EAAE,MAAM;QACV,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,YAAY;QACzB,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,CAAC,MAAM,CAAC;QACjB,KAAK,EAAE;YACL,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE;YACnD,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,uBAAuB,CAAC;YAC9C,OAAO,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrE,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,OAAO,EAAE,SAAS,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, registerTextFallback } from './commands.js';
|
|
5
5
|
import { registerDiceHub } 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
|
registerDiceHub(() => services);
|
|
15
15
|
registerCommands(plugin, () => services);
|
|
16
16
|
registerInteractive(plugin, () => services);
|
|
17
17
|
registerTextFallback(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(30 * 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,EACL,cAAc,EACd,mBAAmB,GAEpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,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,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC;AAEH,eAAe,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;AAChC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;AACzC,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;AAC5C,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;AAE7C,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,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEL,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC"}
|
|
@@ -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,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAQ7D,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY;IAEvC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAKnE,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAMjF,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAInD,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;
|
|
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,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAQ7D,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY;IAEvC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAKnE,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAMjF,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAInD,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAS5E,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAyB7D,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxE,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAalD;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,YAAY,GAAG,cAAc,CAE/D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,eAAe,GAAG,YAAY,CAE1E"}
|
package/lib/session-service.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { channelKey, generateSessionId } from '@zhin.js/game-shared';
|
|
1
|
+
import { channelKey, generateSessionId, boardMessageMatches } from '@zhin.js/game-shared';
|
|
2
2
|
function getModel(db) {
|
|
3
3
|
const model = db.models.get('dice_sessions');
|
|
4
4
|
if (!model)
|
|
@@ -26,12 +26,9 @@ export class SessionService {
|
|
|
26
26
|
async getActiveByBoardMessageId(messageId) {
|
|
27
27
|
if (!messageId)
|
|
28
28
|
return null;
|
|
29
|
-
const rows = await getModel(this.db).findAll({
|
|
29
|
+
const rows = await getModel(this.db).findAll({});
|
|
30
30
|
for (const row of rows) {
|
|
31
|
-
|
|
32
|
-
if (!stored)
|
|
33
|
-
continue;
|
|
34
|
-
if (stored === messageId || stored.endsWith(`:${messageId}`))
|
|
31
|
+
if (boardMessageMatches(row.board_message_id ?? '', messageId))
|
|
35
32
|
return row;
|
|
36
33
|
}
|
|
37
34
|
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
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;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,SAAS,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../src/view.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,SAAS,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,EAC9D,WAAW,CAAC,EAAE,MAAM,GACnB,WAAW,CA0Cb"}
|
package/lib/view.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { buildChoiceKeyboard } from '@zhin.js/game-shared';
|
|
2
2
|
import { DICE_PREFIX, diceEmoji } from './engine.js';
|
|
3
|
-
export function buildDiceView(session, lastRound) {
|
|
3
|
+
export function buildDiceView(session, lastRound, channelType) {
|
|
4
4
|
const terminal = session.status !== 'active';
|
|
5
5
|
const lines = [
|
|
6
6
|
'🎲 **骰子对决**',
|
|
@@ -27,7 +27,7 @@ export function buildDiceView(session, lastRound) {
|
|
|
27
27
|
lines.push('', lastRound ? '点击继续掷骰：' : '点击掷骰开始！');
|
|
28
28
|
}
|
|
29
29
|
const choices = terminal
|
|
30
|
-
? [{ id: 'restart', label: '🔄 再来一局', style: 'primary' }]
|
|
30
|
+
? [{ id: 'restart', label: '🔄 再来一局', style: 'primary', keepEnabledWhenTerminal: true }]
|
|
31
31
|
: [{ id: 'roll', label: '🎲 掷骰', style: 'primary' }];
|
|
32
32
|
return buildChoiceKeyboard({
|
|
33
33
|
gamePrefix: DICE_PREFIX,
|
|
@@ -36,6 +36,8 @@ export function buildDiceView(session, lastRound) {
|
|
|
36
36
|
choices,
|
|
37
37
|
terminal,
|
|
38
38
|
fallbackHint: '回复 1 掷骰',
|
|
39
|
+
interactionProfile: terminal ? 'terminal' : 'gameplay',
|
|
40
|
+
channelType,
|
|
39
41
|
});
|
|
40
42
|
}
|
|
41
43
|
//# sourceMappingURL=view.js.map
|
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;AAG3D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAc,MAAM,aAAa,CAAC;AAEjE,MAAM,UAAU,aAAa,CAC3B,OAAuB,EACvB,SAA8D;
|
|
1
|
+
{"version":3,"file":"view.js","sourceRoot":"","sources":["../src/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG3D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAc,MAAM,aAAa,CAAC;AAEjE,MAAM,UAAU,aAAa,CAC3B,OAAuB,EACvB,SAA8D,EAC9D,WAAoB;IAEpB,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC;IAC7C,MAAM,KAAK,GAAG;QACZ,aAAa;QACb,EAAE;QACF,YAAY,OAAO,CAAC,WAAW,UAAU,OAAO,CAAC,QAAQ,cAAc;KACxE,CAAC;IAEF,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,MAAM,cAAc,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC;QAC3H,KAAK,CAAC,IAAI,CACR,SAAS,CAAC,MAAM,KAAK,CAAC;YACpB,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;gBACtB,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,YAAY,CACnB,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK;YAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aACrD,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM;YAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACpE,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,OAAO,GAAG,QAAQ;QACtB,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAkB,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC;QACjG,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAkB,EAAE,CAAC,CAAC;IAEhE,OAAO,mBAAmB,CAAC;QACzB,UAAU,EAAE,WAAW;QACvB,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;QAC3B,OAAO;QACP,QAAQ;QACR,YAAY,EAAE,SAAS;QACvB,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU;QACtD,WAAW;KACZ,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zhin.js/plugin-dice-duel",
|
|
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,14 +21,23 @@
|
|
|
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
|
-
"@zhin.js/game-shared": "1.0.
|
|
27
|
+
"@zhin.js/game-shared": "1.0.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"typescript": "^6.0.3",
|
|
31
|
-
"zhin.js": "4.1.
|
|
31
|
+
"zhin.js": "4.1.2"
|
|
32
|
+
},
|
|
33
|
+
"repository": {
|
|
34
|
+
"type": "git",
|
|
35
|
+
"url": "git+https://github.com/zhinjs/zhin.git",
|
|
36
|
+
"directory": "plugins/games/dice-duel"
|
|
37
|
+
},
|
|
38
|
+
"publishConfig": {
|
|
39
|
+
"access": "public",
|
|
40
|
+
"registry": "https://registry.npmjs.org"
|
|
32
41
|
},
|
|
33
42
|
"scripts": {
|
|
34
43
|
"build": "tsc --build",
|
package/src/commands.ts
CHANGED
|
@@ -5,11 +5,15 @@ import {
|
|
|
5
5
|
normalizeDiceAction,
|
|
6
6
|
parseChoicePayload,
|
|
7
7
|
registerGameTextMiddleware,
|
|
8
|
+
resolveGameChoice,
|
|
9
|
+
resolveGameTextPayload,
|
|
8
10
|
} from '@zhin.js/game-shared';
|
|
9
11
|
import { DICE_PREFIX, handleChoice } from './game-flow.js';
|
|
10
12
|
import { runDiceCommand } from './dice-command.js';
|
|
11
13
|
import type { SessionService } from './session-service.js';
|
|
12
14
|
|
|
15
|
+
const VALID_CHOICES = ['roll', 'restart'] as const;
|
|
16
|
+
|
|
13
17
|
function registerPattern(
|
|
14
18
|
plugin: Plugin,
|
|
15
19
|
pattern: string,
|
|
@@ -29,33 +33,22 @@ function registerPattern(
|
|
|
29
33
|
}
|
|
30
34
|
|
|
31
35
|
export function registerCommands(plugin: Plugin, getServices: () => SessionService | null): void {
|
|
32
|
-
registerPattern(plugin, 'dice [action:word]', '骰子对决（dice）', getServices);
|
|
33
|
-
registerPattern(plugin, '
|
|
36
|
+
registerPattern(plugin, '/dice [action:word]', '骰子对决（dice）', 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
|
-
if (!['roll', 'restart'].includes(choiceId)) return null;
|
|
58
|
-
return { sessionId: session.id, choiceId };
|
|
44
|
+
return resolveGameChoice({
|
|
45
|
+
message,
|
|
46
|
+
gamePrefix: DICE_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
|
+
});
|
|
59
52
|
}
|
|
60
53
|
|
|
61
54
|
export function registerInteractive(plugin: Plugin, getServices: () => SessionService | null): void {
|
|
@@ -78,17 +71,29 @@ export function registerTextFallback(plugin: Plugin, getServices: () => SessionS
|
|
|
78
71
|
const action = getActionFromMessage(message);
|
|
79
72
|
if (action?.payload.startsWith(`${DICE_PREFIX}:`)) return next();
|
|
80
73
|
|
|
74
|
+
const raw = message.$raw?.trim() ?? '';
|
|
81
75
|
const ch = channelKey(message);
|
|
76
|
+
|
|
77
|
+
const payloadFromText = resolveGameTextPayload(raw);
|
|
78
|
+
if (payloadFromText?.startsWith(`${DICE_PREFIX}:`)) {
|
|
79
|
+
const parsed = parseChoicePayload(payloadFromText, DICE_PREFIX);
|
|
80
|
+
if (parsed) {
|
|
81
|
+
const session = await services.getById(parsed.sessionId);
|
|
82
|
+
if (session?.channel_key === ch) {
|
|
83
|
+
const err = await handleChoice(plugin, services, message, parsed.sessionId, parsed.choiceId);
|
|
84
|
+
if (err) await message.$reply?.(err);
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
82
90
|
const session = await services.getActiveForUser(ch, message.$sender.id);
|
|
83
91
|
if (!session || session.status !== 'active') return next();
|
|
84
92
|
|
|
85
|
-
const raw = message.$raw?.trim() ?? '';
|
|
86
|
-
if (raw !== '1') return next();
|
|
87
|
-
|
|
88
93
|
const map = buildChoiceFallbackMap(DICE_PREFIX, session.id, [
|
|
89
94
|
{ id: 'roll', label: '掷骰' },
|
|
90
95
|
]);
|
|
91
|
-
const payload = map
|
|
96
|
+
const payload = resolveGameTextPayload(raw, map);
|
|
92
97
|
const parsed = payload ? parseChoicePayload(payload, DICE_PREFIX) : null;
|
|
93
98
|
if (!parsed || parsed.sessionId !== session.id) return next();
|
|
94
99
|
|
package/src/engine.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { secureRandomIntInclusive } from '@zhin.js/game-shared';
|
|
2
|
+
|
|
1
3
|
export const DICE_PREFIX = 'dice';
|
|
2
4
|
export const WIN_TARGET = 2; // best of 3 -> first to 2
|
|
3
5
|
|
|
4
6
|
export function rollD6(): number {
|
|
5
|
-
return 1
|
|
7
|
+
return secureRandomIntInclusive(1, 6);
|
|
6
8
|
}
|
|
7
9
|
|
|
8
10
|
export function diceEmoji(n: number): string {
|
package/src/game-flow.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Adapter, Message, Plugin } from 'zhin.js';
|
|
2
|
+
import { recordGameOutcome } from '@zhin.js/game-shared';
|
|
2
3
|
import type { DiceSessionRow } from './models.js';
|
|
3
4
|
import { compareRolls, DICE_PREFIX, rollD6, WIN_TARGET } from './engine.js';
|
|
4
5
|
import type { SessionService } from './session-service.js';
|
|
@@ -11,7 +12,7 @@ export async function sendOrEditView(
|
|
|
11
12
|
session: DiceSessionRow,
|
|
12
13
|
lastRound?: { player: number; bot: number; result: 0 | 1 | 2 },
|
|
13
14
|
): Promise<void> {
|
|
14
|
-
const content = buildDiceView(session, lastRound);
|
|
15
|
+
const content = buildDiceView(session, lastRound, message.$channel.type);
|
|
15
16
|
const adapter = plugin.root.inject(message.$adapter) as Adapter;
|
|
16
17
|
|
|
17
18
|
if (session.board_message_id) {
|
|
@@ -81,17 +82,8 @@ export async function handleChoice(
|
|
|
81
82
|
}
|
|
82
83
|
|
|
83
84
|
if (choiceId === 'restart') {
|
|
84
|
-
await services.updateSession(session.id, {
|
|
85
|
-
|
|
86
|
-
bot_wins: 0,
|
|
87
|
-
round: 0,
|
|
88
|
-
last_player_roll: 0,
|
|
89
|
-
last_bot_roll: 0,
|
|
90
|
-
status: 'active',
|
|
91
|
-
board_message_id: '',
|
|
92
|
-
});
|
|
93
|
-
const updated = (await services.getById(session.id))!;
|
|
94
|
-
await sendOrEditView(plugin, services, message, updated);
|
|
85
|
+
await services.updateSession(session.id, { status: 'aborted' });
|
|
86
|
+
await startGame(plugin, services, message);
|
|
95
87
|
return null;
|
|
96
88
|
}
|
|
97
89
|
|
|
@@ -120,6 +112,8 @@ export async function handleChoice(
|
|
|
120
112
|
});
|
|
121
113
|
|
|
122
114
|
const updated = (await services.getById(session.id))!;
|
|
115
|
+
if (status === 'won') void recordGameOutcome(message, 'dice', 'won', playerWins * 10);
|
|
116
|
+
else if (status === 'lost') void recordGameOutcome(message, 'dice', 'lost');
|
|
123
117
|
await sendOrEditView(plugin, services, message, updated, { player, bot, result });
|
|
124
118
|
return null;
|
|
125
119
|
}
|
package/src/hub-register.ts
CHANGED
package/src/index.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { formatCompact, usePlugin, type DatabaseFeature } from 'zhin.js';
|
|
2
2
|
import { registerModels } from './models.js';
|
|
3
3
|
import {
|
|
4
4
|
createServices,
|
|
@@ -9,7 +9,7 @@ import { registerCommands, registerInteractive, registerTextFallback } from './c
|
|
|
9
9
|
import { registerDiceHub } from './hub-register.js';
|
|
10
10
|
|
|
11
11
|
const plugin = usePlugin();
|
|
12
|
-
const { logger, useContext,
|
|
12
|
+
const { logger, useContext, addSchedule } = plugin;
|
|
13
13
|
|
|
14
14
|
registerModels(plugin);
|
|
15
15
|
|
|
@@ -17,7 +17,7 @@ let services: SessionService | null = null;
|
|
|
17
17
|
|
|
18
18
|
useContext('database', (dbFeature: DatabaseFeature) => {
|
|
19
19
|
services = createServices(resolveGameDatabase(dbFeature));
|
|
20
|
-
logger.
|
|
20
|
+
logger.debug(formatCompact({ 模块: '骰子对决', 数据模型: '已就绪' }));
|
|
21
21
|
});
|
|
22
22
|
|
|
23
23
|
registerDiceHub(() => services);
|
|
@@ -25,12 +25,10 @@ registerCommands(plugin, () => services);
|
|
|
25
25
|
registerInteractive(plugin, () => services);
|
|
26
26
|
registerTextFallback(plugin, () => services);
|
|
27
27
|
|
|
28
|
-
|
|
29
|
-
new Cron('0 */15 * * * *', async () => {
|
|
28
|
+
addSchedule({ kind: 'solar', cron: '0 */15 * * * *' }, async () => {
|
|
30
29
|
if (!services) return;
|
|
31
30
|
const n = await services.abortStale(30 * 60 * 1000);
|
|
32
31
|
if (n > 0) logger.debug(formatCompact({ 骰子对决: '清理超时局', count: n }));
|
|
33
|
-
})
|
|
34
|
-
);
|
|
32
|
+
});
|
|
35
33
|
|
|
36
|
-
logger.
|
|
34
|
+
logger.debug(formatCompact({ 模块: '骰子对决', 状态: '已加载' }));
|
package/src/session-service.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Database, DatabaseFeature, Message, Models, RelatedModel } from 'zhin.js';
|
|
2
|
-
import { channelKey, generateSessionId } from '@zhin.js/game-shared';
|
|
2
|
+
import { channelKey, generateSessionId, boardMessageMatches } from '@zhin.js/game-shared';
|
|
3
3
|
import type { DiceSessionRow } from './models.js';
|
|
4
4
|
|
|
5
5
|
export type DiceDatabase = Database<unknown, Models, string>;
|
|
@@ -30,11 +30,9 @@ export class SessionService {
|
|
|
30
30
|
|
|
31
31
|
async getActiveByBoardMessageId(messageId: string): Promise<DiceSessionRow | null> {
|
|
32
32
|
if (!messageId) return null;
|
|
33
|
-
const rows = await getModel(this.db).findAll({
|
|
33
|
+
const rows = await getModel(this.db).findAll({});
|
|
34
34
|
for (const row of rows) {
|
|
35
|
-
|
|
36
|
-
if (!stored) continue;
|
|
37
|
-
if (stored === messageId || stored.endsWith(`:${messageId}`)) return row;
|
|
35
|
+
if (boardMessageMatches(row.board_message_id ?? '', messageId)) return row;
|
|
38
36
|
}
|
|
39
37
|
return null;
|
|
40
38
|
}
|
package/src/view.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { DICE_PREFIX, diceEmoji, WIN_TARGET } from './engine.js';
|
|
|
6
6
|
export function buildDiceView(
|
|
7
7
|
session: DiceSessionRow,
|
|
8
8
|
lastRound?: { player: number; bot: number; result: 0 | 1 | 2 },
|
|
9
|
+
channelType?: string,
|
|
9
10
|
): SendContent {
|
|
10
11
|
const terminal = session.status !== 'active';
|
|
11
12
|
const lines = [
|
|
@@ -35,7 +36,7 @@ export function buildDiceView(
|
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
const choices = terminal
|
|
38
|
-
? [{ id: 'restart', label: '🔄 再来一局', style: 'primary' as const }]
|
|
39
|
+
? [{ id: 'restart', label: '🔄 再来一局', style: 'primary' as const, keepEnabledWhenTerminal: true }]
|
|
39
40
|
: [{ id: 'roll', label: '🎲 掷骰', style: 'primary' as const }];
|
|
40
41
|
|
|
41
42
|
return buildChoiceKeyboard({
|
|
@@ -45,5 +46,7 @@ export function buildDiceView(
|
|
|
45
46
|
choices,
|
|
46
47
|
terminal,
|
|
47
48
|
fallbackHint: '回复 1 掷骰',
|
|
49
|
+
interactionProfile: terminal ? 'terminal' : 'gameplay',
|
|
50
|
+
channelType,
|
|
48
51
|
});
|
|
49
52
|
}
|