@myclaw163/clawclaw-cli 0.6.76 → 0.6.77

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.
Files changed (209) hide show
  1. package/README.md +387 -387
  2. package/bin/clawclaw-cli.mjs +3 -3
  3. package/package.json +48 -48
  4. package/personas//347/220/206/346/231/272/346/270/251/345/222/214.md +23 -23
  5. package/personas//350/200/201/350/260/213/346/267/261/347/256/227.md +22 -22
  6. package/personas//350/257/232/346/201/263/347/233/264/347/216/207.md +22 -22
  7. package/personas//350/275/273/346/235/276/346/264/273/346/263/274.md +22 -22
  8. package/personas//351/207/216/346/200/247/345/217/233/351/200/206.md +23 -23
  9. package/scripts/check-skill-command-surface.mjs +116 -116
  10. package/scripts/find-hide-spots.py +157 -157
  11. package/scripts/postinstall.mjs +20 -20
  12. package/scripts/sync-bundled-skill.mjs +254 -245
  13. package/scripts/sync-bundled-skill.test.mjs +152 -152
  14. package/skills/clawclaw/SKILL.md +248 -248
  15. package/skills/clawclaw/references/CHATTERBOX.md +141 -141
  16. package/skills/clawclaw/references/COMMANDS.md +160 -160
  17. package/skills/clawclaw/references/GAME-MECHANICS.md +188 -188
  18. package/skills/clawclaw/references/HUB.md +48 -48
  19. package/skills/clawclaw/references/KNOWLEDGE.md +42 -42
  20. package/skills/clawclaw/references/STRATEGIES.md +59 -59
  21. package/skills/clawclaw/references/STREAM.md +93 -93
  22. package/skills/clawclaw/references/TACTICS.md +65 -65
  23. package/src/assets/clawclaw-ascii-map.txt +40 -40
  24. package/src/cli.ts +112 -112
  25. package/src/commands/_schema.ts +124 -124
  26. package/src/commands/account.ts +209 -209
  27. package/src/commands/data.test.ts +33 -33
  28. package/src/commands/data.ts +22 -22
  29. package/src/commands/do.test.ts +84 -84
  30. package/src/commands/do.ts +130 -130
  31. package/src/commands/events.test.ts +100 -100
  32. package/src/commands/events.ts +250 -250
  33. package/src/commands/game-map.test.ts +28 -28
  34. package/src/commands/game-start-plan.test.ts +84 -84
  35. package/src/commands/game.ts +1113 -1113
  36. package/src/commands/history-player.test.ts +102 -102
  37. package/src/commands/history.ts +573 -573
  38. package/src/commands/hub.test.ts +96 -96
  39. package/src/commands/hub.ts +234 -234
  40. package/src/commands/knowledge.test.ts +13 -13
  41. package/src/commands/knowledge.ts +139 -139
  42. package/src/commands/load.test.ts +51 -51
  43. package/src/commands/load.ts +13 -13
  44. package/src/commands/meeting-history.test.ts +106 -106
  45. package/src/commands/memory.ts +40 -40
  46. package/src/commands/peek.ts +45 -45
  47. package/src/commands/persona.ts +57 -57
  48. package/src/commands/setup/codex.ts +266 -266
  49. package/src/commands/skill.ts +128 -128
  50. package/src/commands/state.ts +46 -46
  51. package/src/commands/strategy.test.ts +153 -153
  52. package/src/commands/strategy.ts +183 -183
  53. package/src/commands/tts.ts +128 -128
  54. package/src/commands/upgrade.test.ts +82 -82
  55. package/src/commands/upgrade.ts +148 -148
  56. package/src/commands/watch.test.ts +999 -999
  57. package/src/commands/watch.ts +660 -660
  58. package/src/lib/auth.test.ts +86 -86
  59. package/src/lib/auth.ts +223 -223
  60. package/src/lib/command-meta.ts +37 -37
  61. package/src/lib/game-client.ts +403 -403
  62. package/src/lib/game-context.ts +92 -92
  63. package/src/lib/http-keepalive.ts +15 -15
  64. package/src/lib/http-transport.test.ts +42 -42
  65. package/src/lib/http-transport.ts +113 -113
  66. package/src/lib/hub-client.test.ts +56 -56
  67. package/src/lib/hub-client.ts +88 -88
  68. package/src/lib/hub-install.test.ts +98 -98
  69. package/src/lib/hub-install.ts +160 -160
  70. package/src/lib/hub-reminder.ts +78 -78
  71. package/src/lib/hub-unzip.test.ts +69 -69
  72. package/src/lib/hub-unzip.ts +62 -62
  73. package/src/lib/init-command.test.ts +75 -75
  74. package/src/lib/init-command.ts +130 -130
  75. package/src/lib/knowledge-store.test.ts +170 -170
  76. package/src/lib/knowledge-store.ts +369 -369
  77. package/src/lib/load-context.test.ts +52 -52
  78. package/src/lib/load-context.ts +52 -52
  79. package/src/lib/match-state.test.ts +134 -134
  80. package/src/lib/match-state.ts +94 -94
  81. package/src/lib/netease-tts.ts +83 -83
  82. package/src/lib/normalize.ts +42 -42
  83. package/src/lib/persona.test.ts +41 -41
  84. package/src/lib/persona.ts +72 -72
  85. package/src/lib/server-registry.ts +152 -152
  86. package/src/lib/skill-version.test.ts +48 -48
  87. package/src/lib/skill-version.ts +19 -19
  88. package/src/lib/strategy-export.test.ts +240 -240
  89. package/src/lib/strategy-export.ts +247 -247
  90. package/src/lib/tts-keys.ts +7 -7
  91. package/src/lib/tts-speech.test.ts +63 -63
  92. package/src/lib/tts-speech.ts +76 -76
  93. package/src/lib/user-data.test.ts +96 -96
  94. package/src/lib/user-data.ts +400 -400
  95. package/src/lib/workspace-argv.test.ts +49 -49
  96. package/src/lib/workspace-argv.ts +44 -44
  97. package/src/perception/player-history-store.test.ts +87 -87
  98. package/src/perception/player-history-store.ts +194 -194
  99. package/src/pipeline/event-format.test.ts +243 -243
  100. package/src/pipeline/event-format.ts +501 -501
  101. package/src/pipeline/event-hints.ts +195 -195
  102. package/src/pipeline/event-store.test.ts +28 -28
  103. package/src/pipeline/event-store.ts +193 -193
  104. package/src/pipeline/pipeline.ts +35 -35
  105. package/src/pipeline/player-projection.test.ts +168 -168
  106. package/src/pipeline/player-projection.ts +370 -370
  107. package/src/runtime/auto-upgrade.test.ts +66 -66
  108. package/src/runtime/auto-upgrade.ts +31 -31
  109. package/src/runtime/event-daemon.test.ts +209 -209
  110. package/src/runtime/event-daemon.ts +519 -519
  111. package/src/runtime/owner-control.ts +150 -150
  112. package/src/runtime/raw-ws-log.test.ts +33 -33
  113. package/src/runtime/raw-ws-log.ts +32 -32
  114. package/src/runtime/runtime-logger.ts +107 -107
  115. package/src/runtime/ws-client.test.ts +125 -125
  116. package/src/runtime/ws-client.ts +287 -287
  117. package/src/sdk/action.ts +166 -166
  118. package/src/sdk/index.ts +110 -110
  119. package/src/sdk/types.ts +161 -161
  120. package/src/strategies/avoid-lone.ts +12 -12
  121. package/src/strategies/avoid-players.knowledge.md +19 -19
  122. package/src/strategies/avoid-players.ts +16 -16
  123. package/src/strategies/corpse-patrol.ts +23 -23
  124. package/src/strategies/crab-sabotage.ts +22 -22
  125. package/src/strategies/custom-module.test.ts +270 -270
  126. package/src/strategies/find-player.ts +17 -17
  127. package/src/strategies/game-utils.test.ts +242 -242
  128. package/src/strategies/game-utils.ts +846 -846
  129. package/src/strategies/goals/anchor-linger.ts +77 -77
  130. package/src/strategies/goals/avoid-lone-top.ts +168 -168
  131. package/src/strategies/goals/avoid-players-top.test.ts +83 -83
  132. package/src/strategies/goals/avoid-players-top.ts +121 -121
  133. package/src/strategies/goals/conversation-goal.ts +51 -51
  134. package/src/strategies/goals/corpse-patrol-top.ts +113 -113
  135. package/src/strategies/goals/crab-octopus-reflexes.ts +101 -101
  136. package/src/strategies/goals/crab-sabotage-top.ts +197 -197
  137. package/src/strategies/goals/emergency-hunt-goal.ts +28 -28
  138. package/src/strategies/goals/find-player-top.ts +93 -93
  139. package/src/strategies/goals/flee-players-goal.ts +53 -53
  140. package/src/strategies/goals/follow-companion-goal.ts +106 -106
  141. package/src/strategies/goals/goal-manager.ts +41 -41
  142. package/src/strategies/goals/goal-root-strategy.ts +49 -49
  143. package/src/strategies/goals/goal.ts +28 -28
  144. package/src/strategies/goals/hide-top.ts +197 -197
  145. package/src/strategies/goals/keep-away-goal.ts +221 -221
  146. package/src/strategies/goals/kill-frenzy-top.ts +80 -80
  147. package/src/strategies/goals/kill-lone-top.ts +160 -160
  148. package/src/strategies/goals/kill-target-goal.ts +59 -59
  149. package/src/strategies/goals/kill-target-top.ts +109 -109
  150. package/src/strategies/goals/leaf-goal.ts +27 -27
  151. package/src/strategies/goals/linger-corpse-goal.ts +35 -35
  152. package/src/strategies/goals/lone-kill-core.ts +82 -82
  153. package/src/strategies/goals/lone-kill-goal.ts +24 -24
  154. package/src/strategies/goals/lone-kill-task-top.test.ts +85 -85
  155. package/src/strategies/goals/lone-kill-task-top.ts +133 -133
  156. package/src/strategies/goals/move-room-goal.ts +60 -60
  157. package/src/strategies/goals/normal-shrimp-top.test.ts +80 -80
  158. package/src/strategies/goals/normal-shrimp-top.ts +242 -242
  159. package/src/strategies/goals/paradise-fish-top.test.ts +126 -126
  160. package/src/strategies/goals/paradise-fish-top.ts +224 -224
  161. package/src/strategies/goals/patrol-top.ts +57 -57
  162. package/src/strategies/goals/report-patrol-top.ts +80 -80
  163. package/src/strategies/goals/safe-task-goal.ts +102 -102
  164. package/src/strategies/goals/social-task-top.ts +161 -161
  165. package/src/strategies/goals/task-kill-report-top.ts +163 -163
  166. package/src/strategies/goals/task-only-top.ts +57 -57
  167. package/src/strategies/goals/task-or-patrol-goal.ts +41 -41
  168. package/src/strategies/goals/task-report-top.ts +57 -57
  169. package/src/strategies/goals/wander-task-goal.ts +33 -33
  170. package/src/strategies/goals/warrior-shrimp-top.test.ts +87 -87
  171. package/src/strategies/goals/warrior-shrimp-top.ts +267 -267
  172. package/src/strategies/greeting.ts +53 -53
  173. package/src/strategies/hide-spots.ts +59 -59
  174. package/src/strategies/hide.ts +24 -24
  175. package/src/strategies/kill-frenzy.ts +13 -13
  176. package/src/strategies/kill-lone.knowledge.md +17 -17
  177. package/src/strategies/kill-lone.ts +14 -14
  178. package/src/strategies/kill-target.ts +19 -19
  179. package/src/strategies/loader.test.ts +678 -678
  180. package/src/strategies/loader.ts +181 -181
  181. package/src/strategies/lone-kill-task.ts +22 -22
  182. package/src/strategies/meeting-gate.test.ts +59 -59
  183. package/src/strategies/meeting-gate.ts +23 -23
  184. package/src/strategies/move-room.ts +16 -16
  185. package/src/strategies/new-events-backfill.ts +98 -98
  186. package/src/strategies/off-route-points.ts +105 -105
  187. package/src/strategies/paradise-fish.knowledge.md +19 -19
  188. package/src/strategies/paradise-fish.ts +26 -26
  189. package/src/strategies/pathfind/distance-field.ts +150 -150
  190. package/src/strategies/pathfind/escape-planner.test.ts +197 -197
  191. package/src/strategies/pathfind/escape-planner.ts +355 -355
  192. package/src/strategies/pathfind/walkable-grid.ts +117 -117
  193. package/src/strategies/patrol.ts +12 -12
  194. package/src/strategies/player-targets.ts +13 -13
  195. package/src/strategies/report-patrol.ts +12 -12
  196. package/src/strategies/shrimp-memory.knowledge.md +19 -19
  197. package/src/strategies/shrimp-memory.ts +26 -26
  198. package/src/strategies/social-task.test.ts +28 -28
  199. package/src/strategies/social-task.ts +50 -50
  200. package/src/strategies/spawn.ts +82 -82
  201. package/src/strategies/speech-module.ts +123 -123
  202. package/src/strategies/strategy-loop.test.ts +15 -15
  203. package/src/strategies/strategy-loop.ts +776 -776
  204. package/src/strategies/task-kill-report.ts +18 -18
  205. package/src/strategies/task-only.ts +12 -12
  206. package/src/strategies/task-report.ts +23 -23
  207. package/src/strategies/types.ts +109 -109
  208. package/src/strategies/warrior-memory.knowledge.md +21 -21
  209. package/src/strategies/warrior-memory.ts +17 -17
@@ -1,52 +1,52 @@
1
- import { describe, expect, it, beforeEach, afterEach } from 'vitest';
2
- import { mkdtempSync, rmSync, writeFileSync, mkdirSync } from 'fs';
3
- import { tmpdir } from 'os';
4
- import { join } from 'path';
5
- import { AuthStore, type AuthData } from './auth.js';
6
- import { CLAWCLAW_WORKSPACE_DIR } from './init-command.js';
7
- import { loadContext } from './load-context.js';
8
-
9
- describe('loadContext', () => {
10
- let dir: string;
11
- let authFile: string;
12
- let prevWorkspace: string | undefined;
13
-
14
- beforeEach(() => {
15
- prevWorkspace = process.env[CLAWCLAW_WORKSPACE_DIR];
16
- dir = mkdtempSync(join(tmpdir(), 'clawclaw-load-'));
17
- process.env[CLAWCLAW_WORKSPACE_DIR] = dir;
18
- authFile = join(dir, '.auth.json');
19
- const auth: AuthData = {
20
- activeProfile: 'lobster-1',
21
- profiles: {
22
- 'lobster-1': {
23
- agentName: 'lobster-1',
24
- apiKey: 'claw_test_key_12345678',
25
- serverUrl: 'https://example.com',
26
- },
27
- },
28
- };
29
- writeFileSync(authFile, JSON.stringify(auth));
30
- const accountDir = join(dir, 'accounts', 'claw_test_key_12345678');
31
- mkdirSync(accountDir, { recursive: true });
32
- writeFileSync(join(accountDir, 'persona.md'), 'voice');
33
- writeFileSync(join(accountDir, 'memory.md'), 'notes');
34
- });
35
-
36
- afterEach(() => {
37
- rmSync(dir, { recursive: true, force: true });
38
- if (prevWorkspace === undefined) delete process.env[CLAWCLAW_WORKSPACE_DIR];
39
- else process.env[CLAWCLAW_WORKSPACE_DIR] = prevWorkspace;
40
- });
41
-
42
- it('returns persona and memory snapshots for the active account', () => {
43
- const store = new AuthStore();
44
- const snapshot = loadContext(store);
45
- expect(snapshot.persona.content).toBe('voice');
46
- expect(snapshot.persona.exists).toBe(true);
47
- expect(snapshot.memory.content).toBe('notes');
48
- expect(snapshot.memory.exists).toBe(true);
49
- expect(snapshot.persona.path.split('\\').join('/')).toContain('user-data/accounts/');
50
- expect(snapshot.memory.path.split('\\').join('/')).toContain('user-data/accounts/');
51
- });
52
- });
1
+ import { describe, expect, it, beforeEach, afterEach } from 'vitest';
2
+ import { mkdtempSync, rmSync, writeFileSync, mkdirSync } from 'fs';
3
+ import { tmpdir } from 'os';
4
+ import { join } from 'path';
5
+ import { AuthStore, type AuthData } from './auth.js';
6
+ import { CLAWCLAW_WORKSPACE_DIR } from './init-command.js';
7
+ import { loadContext } from './load-context.js';
8
+
9
+ describe('loadContext', () => {
10
+ let dir: string;
11
+ let authFile: string;
12
+ let prevWorkspace: string | undefined;
13
+
14
+ beforeEach(() => {
15
+ prevWorkspace = process.env[CLAWCLAW_WORKSPACE_DIR];
16
+ dir = mkdtempSync(join(tmpdir(), 'clawclaw-load-'));
17
+ process.env[CLAWCLAW_WORKSPACE_DIR] = dir;
18
+ authFile = join(dir, '.auth.json');
19
+ const auth: AuthData = {
20
+ activeProfile: 'lobster-1',
21
+ profiles: {
22
+ 'lobster-1': {
23
+ agentName: 'lobster-1',
24
+ apiKey: 'claw_test_key_12345678',
25
+ serverUrl: 'https://example.com',
26
+ },
27
+ },
28
+ };
29
+ writeFileSync(authFile, JSON.stringify(auth));
30
+ const accountDir = join(dir, 'accounts', 'claw_test_key_12345678');
31
+ mkdirSync(accountDir, { recursive: true });
32
+ writeFileSync(join(accountDir, 'persona.md'), 'voice');
33
+ writeFileSync(join(accountDir, 'memory.md'), 'notes');
34
+ });
35
+
36
+ afterEach(() => {
37
+ rmSync(dir, { recursive: true, force: true });
38
+ if (prevWorkspace === undefined) delete process.env[CLAWCLAW_WORKSPACE_DIR];
39
+ else process.env[CLAWCLAW_WORKSPACE_DIR] = prevWorkspace;
40
+ });
41
+
42
+ it('returns persona and memory snapshots for the active account', () => {
43
+ const store = new AuthStore();
44
+ const snapshot = loadContext(store);
45
+ expect(snapshot.persona.content).toBe('voice');
46
+ expect(snapshot.persona.exists).toBe(true);
47
+ expect(snapshot.memory.content).toBe('notes');
48
+ expect(snapshot.memory.exists).toBe(true);
49
+ expect(snapshot.persona.path.split('\\').join('/')).toContain('user-data/accounts/');
50
+ expect(snapshot.memory.path.split('\\').join('/')).toContain('user-data/accounts/');
51
+ });
52
+ });
@@ -1,52 +1,52 @@
1
- import { existsSync, readFileSync, writeFileSync } from 'fs';
2
- import { AuthStore } from './auth.js';
3
- import { getProfileMemoryFile } from './init-command.js';
4
- import {
5
- getActivePersonaFile,
6
- readPersonaFile,
7
- } from './persona.js';
8
-
9
- export interface LoadedFileSnapshot {
10
- path: string;
11
- exists: boolean;
12
- content: string;
13
- }
14
-
15
- export interface LoadContextSnapshot {
16
- persona: LoadedFileSnapshot;
17
- memory: LoadedFileSnapshot;
18
- }
19
-
20
- function ensureMemoryFile(path: string): void {
21
- if (!existsSync(path)) writeFileSync(path, '');
22
- }
23
-
24
- export function loadPersonaSnapshot(authStore = new AuthStore()): LoadedFileSnapshot {
25
- const path = getActivePersonaFile(authStore);
26
- const exists = existsSync(path);
27
- return {
28
- path,
29
- exists,
30
- content: readPersonaFile(path),
31
- };
32
- }
33
-
34
- export function loadMemorySnapshot(authStore = new AuthStore()): LoadedFileSnapshot {
35
- const profile = authStore.getActive();
36
- if (!profile) throw new Error('Not logged in.');
37
- const path = getProfileMemoryFile(profile);
38
- ensureMemoryFile(path);
39
- const exists = existsSync(path);
40
- return {
41
- path,
42
- exists,
43
- content: exists ? readFileSync(path, 'utf8') : '',
44
- };
45
- }
46
-
47
- export function loadContext(authStore = new AuthStore()): LoadContextSnapshot {
48
- return {
49
- persona: loadPersonaSnapshot(authStore),
50
- memory: loadMemorySnapshot(authStore),
51
- };
52
- }
1
+ import { existsSync, readFileSync, writeFileSync } from 'fs';
2
+ import { AuthStore } from './auth.js';
3
+ import { getProfileMemoryFile } from './init-command.js';
4
+ import {
5
+ getActivePersonaFile,
6
+ readPersonaFile,
7
+ } from './persona.js';
8
+
9
+ export interface LoadedFileSnapshot {
10
+ path: string;
11
+ exists: boolean;
12
+ content: string;
13
+ }
14
+
15
+ export interface LoadContextSnapshot {
16
+ persona: LoadedFileSnapshot;
17
+ memory: LoadedFileSnapshot;
18
+ }
19
+
20
+ function ensureMemoryFile(path: string): void {
21
+ if (!existsSync(path)) writeFileSync(path, '');
22
+ }
23
+
24
+ export function loadPersonaSnapshot(authStore = new AuthStore()): LoadedFileSnapshot {
25
+ const path = getActivePersonaFile(authStore);
26
+ const exists = existsSync(path);
27
+ return {
28
+ path,
29
+ exists,
30
+ content: readPersonaFile(path),
31
+ };
32
+ }
33
+
34
+ export function loadMemorySnapshot(authStore = new AuthStore()): LoadedFileSnapshot {
35
+ const profile = authStore.getActive();
36
+ if (!profile) throw new Error('Not logged in.');
37
+ const path = getProfileMemoryFile(profile);
38
+ ensureMemoryFile(path);
39
+ const exists = existsSync(path);
40
+ return {
41
+ path,
42
+ exists,
43
+ content: exists ? readFileSync(path, 'utf8') : '',
44
+ };
45
+ }
46
+
47
+ export function loadContext(authStore = new AuthStore()): LoadContextSnapshot {
48
+ return {
49
+ persona: loadPersonaSnapshot(authStore),
50
+ memory: loadMemorySnapshot(authStore),
51
+ };
52
+ }
@@ -1,134 +1,134 @@
1
- import { describe, it, expect, beforeEach } from 'vitest';
2
- import { mkdtempSync, existsSync, readFileSync } from 'fs';
3
- import { tmpdir } from 'os';
4
- import { join } from 'path';
5
- import {
6
- startMatch,
7
- endMatch,
8
- readMatchState,
9
- markWaitingEmitted,
10
- shouldEmitWaiting,
11
- getWaitedSecs,
12
- hasMatchTimedOut,
13
- DEFAULT_WAITING_HEARTBEAT_MS,
14
- DEFAULT_MATCH_TIMEOUT_MS,
15
- } from './match-state.js';
16
-
17
- function tmpDir(): string {
18
- return mkdtempSync(join(tmpdir(), 'match-state-'));
19
- }
20
-
21
- describe('match-state — startMatch / readMatchState / endMatch', () => {
22
- it('startMatch persists started_at with last_waiting_emit=0', () => {
23
- const dir = tmpDir();
24
- const now = 1_700_000_000_000;
25
- const state = startMatch(dir, now);
26
- expect(state).toEqual({ started_at: now, last_waiting_emit: 0 });
27
- expect(readMatchState(dir)).toEqual(state);
28
- });
29
-
30
- it('startMatch overwrites an existing state (new queue session)', () => {
31
- const dir = tmpDir();
32
- startMatch(dir, 1_000_000);
33
- markWaitingEmitted(dir, 1_500_000);
34
- const fresh = startMatch(dir, 2_000_000);
35
- expect(fresh).toEqual({ started_at: 2_000_000, last_waiting_emit: 0 });
36
- expect(readMatchState(dir)).toEqual(fresh);
37
- });
38
-
39
- it('readMatchState returns null when no state file exists', () => {
40
- expect(readMatchState(tmpDir())).toBeNull();
41
- });
42
-
43
- it('readMatchState returns null on corrupt JSON (does not throw)', () => {
44
- const dir = tmpDir();
45
- // Simulate a half-written file from a previous crash.
46
- const fs = require('fs');
47
- fs.writeFileSync(join(dir, 'match-state.json'), '{"started_at": 1');
48
- expect(readMatchState(dir)).toBeNull();
49
- });
50
-
51
- it('endMatch removes the file; idempotent on missing', () => {
52
- const dir = tmpDir();
53
- startMatch(dir, 1_000_000);
54
- expect(existsSync(join(dir, 'match-state.json'))).toBe(true);
55
- endMatch(dir);
56
- expect(existsSync(join(dir, 'match-state.json'))).toBe(false);
57
- expect(() => endMatch(dir)).not.toThrow();
58
- });
59
- });
60
-
61
- describe('match-state — atomic write', () => {
62
- it('does not leave a .tmp sibling after a successful write', () => {
63
- const dir = tmpDir();
64
- startMatch(dir, 1_000_000);
65
- markWaitingEmitted(dir, 1_100_000);
66
- expect(existsSync(join(dir, 'match-state.json.tmp'))).toBe(false);
67
- });
68
- });
69
-
70
- describe('match-state — shouldEmitWaiting', () => {
71
- it('returns true when last_waiting_emit is 0 (sentinel: never emitted)', () => {
72
- const state = { started_at: 1_000_000, last_waiting_emit: 0 };
73
- expect(shouldEmitWaiting(state, 1_000_001)).toBe(true);
74
- });
75
-
76
- it('returns true when the elapsed since last emit reaches the heartbeat', () => {
77
- const state = { started_at: 1_000_000, last_waiting_emit: 1_000_000 };
78
- expect(shouldEmitWaiting(state, 1_000_000 + DEFAULT_WAITING_HEARTBEAT_MS)).toBe(true);
79
- });
80
-
81
- it('returns false when below the heartbeat interval', () => {
82
- const state = { started_at: 1_000_000, last_waiting_emit: 1_000_000 };
83
- expect(shouldEmitWaiting(state, 1_000_000 + DEFAULT_WAITING_HEARTBEAT_MS - 1)).toBe(false);
84
- });
85
-
86
- it('honors a custom heartbeatMs', () => {
87
- const state = { started_at: 0, last_waiting_emit: 1_000 };
88
- expect(shouldEmitWaiting(state, 2_000, 1_000)).toBe(true); // elapsed 1000ms == hb
89
- expect(shouldEmitWaiting(state, 2_500, 1_000)).toBe(true); // elapsed 1500ms > hb
90
- expect(shouldEmitWaiting(state, 1_999, 1_000)).toBe(false); // elapsed 999ms < hb
91
- expect(shouldEmitWaiting(state, 5_000, 5_000)).toBe(false); // elapsed 4000ms < hb 5000
92
- });
93
- });
94
-
95
- describe('match-state — markWaitingEmitted', () => {
96
- it('updates last_waiting_emit while preserving started_at', () => {
97
- const dir = tmpDir();
98
- startMatch(dir, 1_000_000);
99
- markWaitingEmitted(dir, 1_200_000);
100
- expect(readMatchState(dir)).toEqual({ started_at: 1_000_000, last_waiting_emit: 1_200_000 });
101
- });
102
-
103
- it('no-ops when state file is missing', () => {
104
- const dir = tmpDir();
105
- expect(() => markWaitingEmitted(dir, 1_000_000)).not.toThrow();
106
- expect(readMatchState(dir)).toBeNull();
107
- });
108
- });
109
-
110
- describe('match-state — getWaitedSecs / hasMatchTimedOut', () => {
111
- it('getWaitedSecs returns floor of seconds since started_at', () => {
112
- const state = { started_at: 1_000_000, last_waiting_emit: 0 };
113
- expect(getWaitedSecs(state, 1_000_999)).toBe(0);
114
- expect(getWaitedSecs(state, 1_001_000)).toBe(1);
115
- expect(getWaitedSecs(state, 1_120_500)).toBe(120);
116
- });
117
-
118
- it('getWaitedSecs clamps to 0 if clock skews backwards', () => {
119
- const state = { started_at: 2_000_000, last_waiting_emit: 0 };
120
- expect(getWaitedSecs(state, 1_000_000)).toBe(0);
121
- });
122
-
123
- it('hasMatchTimedOut flips at the default 10-minute threshold', () => {
124
- const state = { started_at: 0, last_waiting_emit: 0 };
125
- expect(hasMatchTimedOut(state, DEFAULT_MATCH_TIMEOUT_MS - 1)).toBe(false);
126
- expect(hasMatchTimedOut(state, DEFAULT_MATCH_TIMEOUT_MS)).toBe(true);
127
- });
128
-
129
- it('honors a custom timeoutMs', () => {
130
- const state = { started_at: 0, last_waiting_emit: 0 };
131
- expect(hasMatchTimedOut(state, 999, 1_000)).toBe(false);
132
- expect(hasMatchTimedOut(state, 1_000, 1_000)).toBe(true);
133
- });
134
- });
1
+ import { describe, it, expect, beforeEach } from 'vitest';
2
+ import { mkdtempSync, existsSync, readFileSync } from 'fs';
3
+ import { tmpdir } from 'os';
4
+ import { join } from 'path';
5
+ import {
6
+ startMatch,
7
+ endMatch,
8
+ readMatchState,
9
+ markWaitingEmitted,
10
+ shouldEmitWaiting,
11
+ getWaitedSecs,
12
+ hasMatchTimedOut,
13
+ DEFAULT_WAITING_HEARTBEAT_MS,
14
+ DEFAULT_MATCH_TIMEOUT_MS,
15
+ } from './match-state.js';
16
+
17
+ function tmpDir(): string {
18
+ return mkdtempSync(join(tmpdir(), 'match-state-'));
19
+ }
20
+
21
+ describe('match-state — startMatch / readMatchState / endMatch', () => {
22
+ it('startMatch persists started_at with last_waiting_emit=0', () => {
23
+ const dir = tmpDir();
24
+ const now = 1_700_000_000_000;
25
+ const state = startMatch(dir, now);
26
+ expect(state).toEqual({ started_at: now, last_waiting_emit: 0 });
27
+ expect(readMatchState(dir)).toEqual(state);
28
+ });
29
+
30
+ it('startMatch overwrites an existing state (new queue session)', () => {
31
+ const dir = tmpDir();
32
+ startMatch(dir, 1_000_000);
33
+ markWaitingEmitted(dir, 1_500_000);
34
+ const fresh = startMatch(dir, 2_000_000);
35
+ expect(fresh).toEqual({ started_at: 2_000_000, last_waiting_emit: 0 });
36
+ expect(readMatchState(dir)).toEqual(fresh);
37
+ });
38
+
39
+ it('readMatchState returns null when no state file exists', () => {
40
+ expect(readMatchState(tmpDir())).toBeNull();
41
+ });
42
+
43
+ it('readMatchState returns null on corrupt JSON (does not throw)', () => {
44
+ const dir = tmpDir();
45
+ // Simulate a half-written file from a previous crash.
46
+ const fs = require('fs');
47
+ fs.writeFileSync(join(dir, 'match-state.json'), '{"started_at": 1');
48
+ expect(readMatchState(dir)).toBeNull();
49
+ });
50
+
51
+ it('endMatch removes the file; idempotent on missing', () => {
52
+ const dir = tmpDir();
53
+ startMatch(dir, 1_000_000);
54
+ expect(existsSync(join(dir, 'match-state.json'))).toBe(true);
55
+ endMatch(dir);
56
+ expect(existsSync(join(dir, 'match-state.json'))).toBe(false);
57
+ expect(() => endMatch(dir)).not.toThrow();
58
+ });
59
+ });
60
+
61
+ describe('match-state — atomic write', () => {
62
+ it('does not leave a .tmp sibling after a successful write', () => {
63
+ const dir = tmpDir();
64
+ startMatch(dir, 1_000_000);
65
+ markWaitingEmitted(dir, 1_100_000);
66
+ expect(existsSync(join(dir, 'match-state.json.tmp'))).toBe(false);
67
+ });
68
+ });
69
+
70
+ describe('match-state — shouldEmitWaiting', () => {
71
+ it('returns true when last_waiting_emit is 0 (sentinel: never emitted)', () => {
72
+ const state = { started_at: 1_000_000, last_waiting_emit: 0 };
73
+ expect(shouldEmitWaiting(state, 1_000_001)).toBe(true);
74
+ });
75
+
76
+ it('returns true when the elapsed since last emit reaches the heartbeat', () => {
77
+ const state = { started_at: 1_000_000, last_waiting_emit: 1_000_000 };
78
+ expect(shouldEmitWaiting(state, 1_000_000 + DEFAULT_WAITING_HEARTBEAT_MS)).toBe(true);
79
+ });
80
+
81
+ it('returns false when below the heartbeat interval', () => {
82
+ const state = { started_at: 1_000_000, last_waiting_emit: 1_000_000 };
83
+ expect(shouldEmitWaiting(state, 1_000_000 + DEFAULT_WAITING_HEARTBEAT_MS - 1)).toBe(false);
84
+ });
85
+
86
+ it('honors a custom heartbeatMs', () => {
87
+ const state = { started_at: 0, last_waiting_emit: 1_000 };
88
+ expect(shouldEmitWaiting(state, 2_000, 1_000)).toBe(true); // elapsed 1000ms == hb
89
+ expect(shouldEmitWaiting(state, 2_500, 1_000)).toBe(true); // elapsed 1500ms > hb
90
+ expect(shouldEmitWaiting(state, 1_999, 1_000)).toBe(false); // elapsed 999ms < hb
91
+ expect(shouldEmitWaiting(state, 5_000, 5_000)).toBe(false); // elapsed 4000ms < hb 5000
92
+ });
93
+ });
94
+
95
+ describe('match-state — markWaitingEmitted', () => {
96
+ it('updates last_waiting_emit while preserving started_at', () => {
97
+ const dir = tmpDir();
98
+ startMatch(dir, 1_000_000);
99
+ markWaitingEmitted(dir, 1_200_000);
100
+ expect(readMatchState(dir)).toEqual({ started_at: 1_000_000, last_waiting_emit: 1_200_000 });
101
+ });
102
+
103
+ it('no-ops when state file is missing', () => {
104
+ const dir = tmpDir();
105
+ expect(() => markWaitingEmitted(dir, 1_000_000)).not.toThrow();
106
+ expect(readMatchState(dir)).toBeNull();
107
+ });
108
+ });
109
+
110
+ describe('match-state — getWaitedSecs / hasMatchTimedOut', () => {
111
+ it('getWaitedSecs returns floor of seconds since started_at', () => {
112
+ const state = { started_at: 1_000_000, last_waiting_emit: 0 };
113
+ expect(getWaitedSecs(state, 1_000_999)).toBe(0);
114
+ expect(getWaitedSecs(state, 1_001_000)).toBe(1);
115
+ expect(getWaitedSecs(state, 1_120_500)).toBe(120);
116
+ });
117
+
118
+ it('getWaitedSecs clamps to 0 if clock skews backwards', () => {
119
+ const state = { started_at: 2_000_000, last_waiting_emit: 0 };
120
+ expect(getWaitedSecs(state, 1_000_000)).toBe(0);
121
+ });
122
+
123
+ it('hasMatchTimedOut flips at the default 10-minute threshold', () => {
124
+ const state = { started_at: 0, last_waiting_emit: 0 };
125
+ expect(hasMatchTimedOut(state, DEFAULT_MATCH_TIMEOUT_MS - 1)).toBe(false);
126
+ expect(hasMatchTimedOut(state, DEFAULT_MATCH_TIMEOUT_MS)).toBe(true);
127
+ });
128
+
129
+ it('honors a custom timeoutMs', () => {
130
+ const state = { started_at: 0, last_waiting_emit: 0 };
131
+ expect(hasMatchTimedOut(state, 999, 1_000)).toBe(false);
132
+ expect(hasMatchTimedOut(state, 1_000, 1_000)).toBe(true);
133
+ });
134
+ });
@@ -1,94 +1,94 @@
1
- /**
2
- * match-state — 记录单次匹配等待的进度,用于 `ccl game queue` 跨进程协调
3
- * `match_waiting` / `match_timeout` 合成事件的发射节奏。
4
- *
5
- * 每次 `ccl game queue` 是一个新进程,跨进程的"上次心跳时间"必须落盘。
6
- * 持久化在 `${profileStateDir}/match-state.json`,生命周期:
7
- * - `ccl game join` → startMatch() 创建
8
- * - `ccl game queue` 匹配成功 → endMatch() 删除
9
- * - `ccl game queue` 心跳到点 → markWaitingEmitted() 更新 last_waiting_emit
10
- * - 用户主动 leave/quit → endMatch() 删除
11
- */
12
-
13
- import { existsSync, readFileSync, writeFileSync, unlinkSync, renameSync } from 'fs';
14
- import { join } from 'path';
15
-
16
- export interface MatchState {
17
- started_at: number; // ms epoch — 进入队列的时刻
18
- last_waiting_emit: number; // ms epoch — 最近一次 emit match_waiting 的时刻 (0 = 从未)
19
- }
20
-
21
- /** 默认匹配等待心跳间隔:5 分钟 */
22
- export const DEFAULT_WAITING_HEARTBEAT_MS = 300_000;
23
-
24
- /** 默认匹配总超时阈值:600 秒 (10 分钟) */
25
- export const DEFAULT_MATCH_TIMEOUT_MS = 600_000;
26
-
27
- function statePath(stateDir: string): string {
28
- return join(stateDir, 'match-state.json');
29
- }
30
-
31
- /**
32
- * 原子写: 先写到 .tmp 再 rename。
33
- * rename 在 NTFS / ext4 / APFS 上都是原子操作,避免半写文件被 JSON.parse 时
34
- * 误判为"无匹配进行中"而把累计等待计数重置。
35
- */
36
- function atomicWriteJSON(path: string, value: unknown): void {
37
- const tmp = `${path}.tmp`;
38
- writeFileSync(tmp, JSON.stringify(value));
39
- renameSync(tmp, path);
40
- }
41
-
42
- export function readMatchState(stateDir: string): MatchState | null {
43
- const p = statePath(stateDir);
44
- if (!existsSync(p)) return null;
45
- try {
46
- return JSON.parse(readFileSync(p, 'utf8')) as MatchState;
47
- } catch {
48
- return null;
49
- }
50
- }
51
-
52
- /** 开始一轮新匹配。即使旧 state 残留也覆盖。 */
53
- export function startMatch(stateDir: string, now: number = Date.now()): MatchState {
54
- const state: MatchState = { started_at: now, last_waiting_emit: 0 };
55
- atomicWriteJSON(statePath(stateDir), state);
56
- return state;
57
- }
58
-
59
- /** 匹配成功或被取消时清理。幂等。 */
60
- export function endMatch(stateDir: string): void {
61
- const p = statePath(stateDir);
62
- if (!existsSync(p)) return;
63
- try { unlinkSync(p); } catch {}
64
- }
65
-
66
- export function markWaitingEmitted(stateDir: string, now: number = Date.now()): void {
67
- const cur = readMatchState(stateDir);
68
- if (!cur) return;
69
- const next: MatchState = { ...cur, last_waiting_emit: now };
70
- atomicWriteJSON(statePath(stateDir), next);
71
- }
72
-
73
- /** 距离上次 emit match_waiting 是否够久 (或从未 emit)。 */
74
- export function shouldEmitWaiting(
75
- state: MatchState,
76
- now: number = Date.now(),
77
- heartbeatMs: number = DEFAULT_WAITING_HEARTBEAT_MS,
78
- ): boolean {
79
- if (state.last_waiting_emit === 0) return true;
80
- return now - state.last_waiting_emit >= heartbeatMs;
81
- }
82
-
83
- export function getWaitedSecs(state: MatchState, now: number = Date.now()): number {
84
- return Math.max(0, Math.floor((now - state.started_at) / 1000));
85
- }
86
-
87
- /** 累计等待是否已到总超时阈值。 */
88
- export function hasMatchTimedOut(
89
- state: MatchState,
90
- now: number = Date.now(),
91
- timeoutMs: number = DEFAULT_MATCH_TIMEOUT_MS,
92
- ): boolean {
93
- return now - state.started_at >= timeoutMs;
94
- }
1
+ /**
2
+ * match-state — 记录单次匹配等待的进度,用于 `ccl game queue` 跨进程协调
3
+ * `match_waiting` / `match_timeout` 合成事件的发射节奏。
4
+ *
5
+ * 每次 `ccl game queue` 是一个新进程,跨进程的"上次心跳时间"必须落盘。
6
+ * 持久化在 `${profileStateDir}/match-state.json`,生命周期:
7
+ * - `ccl game join` → startMatch() 创建
8
+ * - `ccl game queue` 匹配成功 → endMatch() 删除
9
+ * - `ccl game queue` 心跳到点 → markWaitingEmitted() 更新 last_waiting_emit
10
+ * - 用户主动 leave/quit → endMatch() 删除
11
+ */
12
+
13
+ import { existsSync, readFileSync, writeFileSync, unlinkSync, renameSync } from 'fs';
14
+ import { join } from 'path';
15
+
16
+ export interface MatchState {
17
+ started_at: number; // ms epoch — 进入队列的时刻
18
+ last_waiting_emit: number; // ms epoch — 最近一次 emit match_waiting 的时刻 (0 = 从未)
19
+ }
20
+
21
+ /** 默认匹配等待心跳间隔:5 分钟 */
22
+ export const DEFAULT_WAITING_HEARTBEAT_MS = 300_000;
23
+
24
+ /** 默认匹配总超时阈值:600 秒 (10 分钟) */
25
+ export const DEFAULT_MATCH_TIMEOUT_MS = 600_000;
26
+
27
+ function statePath(stateDir: string): string {
28
+ return join(stateDir, 'match-state.json');
29
+ }
30
+
31
+ /**
32
+ * 原子写: 先写到 .tmp 再 rename。
33
+ * rename 在 NTFS / ext4 / APFS 上都是原子操作,避免半写文件被 JSON.parse 时
34
+ * 误判为"无匹配进行中"而把累计等待计数重置。
35
+ */
36
+ function atomicWriteJSON(path: string, value: unknown): void {
37
+ const tmp = `${path}.tmp`;
38
+ writeFileSync(tmp, JSON.stringify(value));
39
+ renameSync(tmp, path);
40
+ }
41
+
42
+ export function readMatchState(stateDir: string): MatchState | null {
43
+ const p = statePath(stateDir);
44
+ if (!existsSync(p)) return null;
45
+ try {
46
+ return JSON.parse(readFileSync(p, 'utf8')) as MatchState;
47
+ } catch {
48
+ return null;
49
+ }
50
+ }
51
+
52
+ /** 开始一轮新匹配。即使旧 state 残留也覆盖。 */
53
+ export function startMatch(stateDir: string, now: number = Date.now()): MatchState {
54
+ const state: MatchState = { started_at: now, last_waiting_emit: 0 };
55
+ atomicWriteJSON(statePath(stateDir), state);
56
+ return state;
57
+ }
58
+
59
+ /** 匹配成功或被取消时清理。幂等。 */
60
+ export function endMatch(stateDir: string): void {
61
+ const p = statePath(stateDir);
62
+ if (!existsSync(p)) return;
63
+ try { unlinkSync(p); } catch {}
64
+ }
65
+
66
+ export function markWaitingEmitted(stateDir: string, now: number = Date.now()): void {
67
+ const cur = readMatchState(stateDir);
68
+ if (!cur) return;
69
+ const next: MatchState = { ...cur, last_waiting_emit: now };
70
+ atomicWriteJSON(statePath(stateDir), next);
71
+ }
72
+
73
+ /** 距离上次 emit match_waiting 是否够久 (或从未 emit)。 */
74
+ export function shouldEmitWaiting(
75
+ state: MatchState,
76
+ now: number = Date.now(),
77
+ heartbeatMs: number = DEFAULT_WAITING_HEARTBEAT_MS,
78
+ ): boolean {
79
+ if (state.last_waiting_emit === 0) return true;
80
+ return now - state.last_waiting_emit >= heartbeatMs;
81
+ }
82
+
83
+ export function getWaitedSecs(state: MatchState, now: number = Date.now()): number {
84
+ return Math.max(0, Math.floor((now - state.started_at) / 1000));
85
+ }
86
+
87
+ /** 累计等待是否已到总超时阈值。 */
88
+ export function hasMatchTimedOut(
89
+ state: MatchState,
90
+ now: number = Date.now(),
91
+ timeoutMs: number = DEFAULT_MATCH_TIMEOUT_MS,
92
+ ): boolean {
93
+ return now - state.started_at >= timeoutMs;
94
+ }