@pretty-chitty/core 2.0.0 → 2.1.0
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 +8 -0
- package/dist/components/ActionLogDisplay.d.ts.map +1 -1
- package/dist/components/ActionLogDisplay.js +1 -1
- package/dist/components/ActionLogDisplay.js.map +1 -1
- package/dist/components/BottomBarButton.d.ts +3 -1
- package/dist/components/BottomBarButton.d.ts.map +1 -1
- package/dist/components/BottomBarButton.js +3 -2
- package/dist/components/BottomBarButton.js.map +1 -1
- package/dist/components/ContextGalleryDisplay.d.ts.map +1 -1
- package/dist/components/ContextGalleryDisplay.js +1 -1
- package/dist/components/ContextGalleryDisplay.js.map +1 -1
- package/dist/components/DemoWrapper.d.ts +30 -2
- package/dist/components/DemoWrapper.d.ts.map +1 -1
- package/dist/components/DemoWrapper.js +79 -36
- package/dist/components/DemoWrapper.js.map +1 -1
- package/dist/components/FullScreenGalleryDisplay.d.ts.map +1 -1
- package/dist/components/FullScreenGalleryDisplay.js +2 -2
- package/dist/components/FullScreenGalleryDisplay.js.map +1 -1
- package/dist/components/Gallery/BuiltItem.d.ts +6 -2
- package/dist/components/Gallery/BuiltItem.d.ts.map +1 -1
- package/dist/components/Gallery/BuiltItem.js +28 -9
- package/dist/components/Gallery/BuiltItem.js.map +1 -1
- package/dist/components/Gallery/GalleryController.d.ts +18 -0
- package/dist/components/Gallery/GalleryController.d.ts.map +1 -1
- package/dist/components/Gallery/GalleryController.js +67 -0
- package/dist/components/Gallery/GalleryController.js.map +1 -1
- package/dist/components/Gallery/GalleryViewer.d.ts +6 -1
- package/dist/components/Gallery/GalleryViewer.d.ts.map +1 -1
- package/dist/components/Gallery/GalleryViewer.js +48 -10
- package/dist/components/Gallery/GalleryViewer.js.map +1 -1
- package/dist/components/Gallery/LayoutManager.d.ts +6 -0
- package/dist/components/Gallery/LayoutManager.d.ts.map +1 -1
- package/dist/components/Gallery/LayoutManager.js +23 -3
- package/dist/components/Gallery/LayoutManager.js.map +1 -1
- package/dist/components/Gallery/constants.d.ts +2 -0
- package/dist/components/Gallery/constants.d.ts.map +1 -1
- package/dist/components/Gallery/constants.js +2 -0
- package/dist/components/Gallery/constants.js.map +1 -1
- package/dist/components/Gallery/registry.d.ts +34 -0
- package/dist/components/Gallery/registry.d.ts.map +1 -0
- package/dist/components/Gallery/registry.js +17 -0
- package/dist/components/Gallery/registry.js.map +1 -0
- package/dist/components/GameDesigner.d.ts.map +1 -1
- package/dist/components/GameDesigner.js +42 -10
- package/dist/components/GameDesigner.js.map +1 -1
- package/dist/components/InlineGalleryDisplay.d.ts.map +1 -1
- package/dist/components/InlineGalleryDisplay.js +2 -2
- package/dist/components/InlineGalleryDisplay.js.map +1 -1
- package/dist/components/LiveButton.d.ts.map +1 -1
- package/dist/components/LiveButton.js +5 -2
- package/dist/components/LiveButton.js.map +1 -1
- package/dist/components/MatchViewer.d.ts +6 -1
- package/dist/components/MatchViewer.d.ts.map +1 -1
- package/dist/components/MatchViewer.js +9 -3
- package/dist/components/MatchViewer.js.map +1 -1
- package/dist/components/Panel/MultiPanel.d.ts.map +1 -1
- package/dist/components/Panel/MultiPanel.js +18 -0
- package/dist/components/Panel/MultiPanel.js.map +1 -1
- package/dist/components/Panel/PanelContents.d.ts.map +1 -1
- package/dist/components/Panel/PanelContents.js +92 -23
- package/dist/components/Panel/PanelContents.js.map +1 -1
- package/dist/components/Panel/PanelTabStack.d.ts.map +1 -1
- package/dist/components/Panel/PanelTabStack.js +1 -1
- package/dist/components/Panel/PanelTabStack.js.map +1 -1
- package/dist/components/PanelSpark.d.ts.map +1 -1
- package/dist/components/PanelSpark.js +3 -2
- package/dist/components/PanelSpark.js.map +1 -1
- package/dist/components/Playground.d.ts.map +1 -1
- package/dist/components/Playground.js +10 -4
- package/dist/components/Playground.js.map +1 -1
- package/dist/components/PromptControls.d.ts.map +1 -1
- package/dist/components/PromptControls.js +4 -2
- package/dist/components/PromptControls.js.map +1 -1
- package/dist/components/SparkLineChart.d.ts.map +1 -1
- package/dist/components/SparkLineChart.js +22 -26
- package/dist/components/SparkLineChart.js.map +1 -1
- package/dist/components/TimeControlBar.d.ts.map +1 -1
- package/dist/components/TimeControlBar.js +5 -3
- package/dist/components/TimeControlBar.js.map +1 -1
- package/dist/components/TokenizedMarkdown.d.ts +23 -0
- package/dist/components/TokenizedMarkdown.d.ts.map +1 -0
- package/dist/components/TokenizedMarkdown.js +144 -0
- package/dist/components/TokenizedMarkdown.js.map +1 -0
- package/dist/components/TokenizedMessage.d.ts +6 -0
- package/dist/components/TokenizedMessage.d.ts.map +1 -1
- package/dist/components/TokenizedMessage.js +20 -19
- package/dist/components/TokenizedMessage.js.map +1 -1
- package/dist/components/TopBarPlayers.d.ts.map +1 -1
- package/dist/components/TopBarPlayers.js +1 -1
- package/dist/components/TopBarPlayers.js.map +1 -1
- package/dist/components/Tutorial/BrowserNarration.d.ts +55 -0
- package/dist/components/Tutorial/BrowserNarration.d.ts.map +1 -0
- package/dist/components/Tutorial/BrowserNarration.js +240 -0
- package/dist/components/Tutorial/BrowserNarration.js.map +1 -0
- package/dist/components/Tutorial/TutorialBox.d.ts +26 -0
- package/dist/components/Tutorial/TutorialBox.d.ts.map +1 -0
- package/dist/components/Tutorial/TutorialBox.js +239 -0
- package/dist/components/Tutorial/TutorialBox.js.map +1 -0
- package/dist/components/Tutorial/TutorialDevPanel.d.ts +9 -0
- package/dist/components/Tutorial/TutorialDevPanel.d.ts.map +1 -0
- package/dist/components/Tutorial/TutorialDevPanel.js +92 -0
- package/dist/components/Tutorial/TutorialDevPanel.js.map +1 -0
- package/dist/components/Tutorial/TutorialOverlay.d.ts +7 -0
- package/dist/components/Tutorial/TutorialOverlay.d.ts.map +1 -0
- package/dist/components/Tutorial/TutorialOverlay.js +1132 -0
- package/dist/components/Tutorial/TutorialOverlay.js.map +1 -0
- package/dist/components/Tutorial/targetRects.d.ts +67 -0
- package/dist/components/Tutorial/targetRects.d.ts.map +1 -0
- package/dist/components/Tutorial/targetRects.js +241 -0
- package/dist/components/Tutorial/targetRects.js.map +1 -0
- package/dist/game/Chit.d.ts +7 -0
- package/dist/game/Chit.d.ts.map +1 -1
- package/dist/game/Chit.js +20 -5
- package/dist/game/Chit.js.map +1 -1
- package/dist/game/ClientTimeState.d.ts +14 -0
- package/dist/game/ClientTimeState.d.ts.map +1 -1
- package/dist/game/ClientTimeState.js +17 -0
- package/dist/game/ClientTimeState.js.map +1 -1
- package/dist/game/Game.d.ts +6 -0
- package/dist/game/Game.d.ts.map +1 -1
- package/dist/game/GameTheme.d.ts +3 -0
- package/dist/game/GameTheme.d.ts.map +1 -1
- package/dist/game/GameTheme.js +2 -0
- package/dist/game/GameTheme.js.map +1 -1
- package/dist/game/Match.d.ts +8 -2
- package/dist/game/Match.d.ts.map +1 -1
- package/dist/game/Match.js +4 -1
- package/dist/game/Match.js.map +1 -1
- package/dist/game/Pick.d.ts +2 -0
- package/dist/game/Pick.d.ts.map +1 -1
- package/dist/game/Pick.js +17 -1
- package/dist/game/Pick.js.map +1 -1
- package/dist/game/PlayerPromptStatusChit.d.ts +8 -0
- package/dist/game/PlayerPromptStatusChit.d.ts.map +1 -1
- package/dist/game/PlayerPromptStatusChit.js +5 -1
- package/dist/game/PlayerPromptStatusChit.js.map +1 -1
- package/dist/game/Prompt.d.ts +15 -0
- package/dist/game/Prompt.d.ts.map +1 -1
- package/dist/game/Prompt.js +16 -0
- package/dist/game/Prompt.js.map +1 -1
- package/dist/game/Turn.d.ts +15 -4
- package/dist/game/Turn.d.ts.map +1 -1
- package/dist/game/Turn.js +173 -60
- package/dist/game/Turn.js.map +1 -1
- package/dist/game/TurnState.d.ts +12 -1
- package/dist/game/TurnState.d.ts.map +1 -1
- package/dist/game/TurnState.js +15 -3
- package/dist/game/TurnState.js.map +1 -1
- package/dist/game/ai/AiClientPrompts.d.ts +20 -3
- package/dist/game/ai/AiClientPrompts.d.ts.map +1 -1
- package/dist/game/ai/AiClientPrompts.js +42 -6
- package/dist/game/ai/AiClientPrompts.js.map +1 -1
- package/dist/game/ai/AiPlayerView.js +2 -0
- package/dist/game/ai/AiPlayerView.js.map +1 -1
- package/dist/game/clientTransport/ClientPrompts.d.ts +20 -1
- package/dist/game/clientTransport/ClientPrompts.d.ts.map +1 -1
- package/dist/game/clientTransport/ClientPrompts.js +30 -1
- package/dist/game/clientTransport/ClientPrompts.js.map +1 -1
- package/dist/game/clientTransport/ClientTime.d.ts +13 -0
- package/dist/game/clientTransport/ClientTime.d.ts.map +1 -1
- package/dist/game/clientTransport/ClientTime.js +51 -11
- package/dist/game/clientTransport/ClientTime.js.map +1 -1
- package/dist/game/tutorial/TutorialController.d.ts +300 -0
- package/dist/game/tutorial/TutorialController.d.ts.map +1 -0
- package/dist/game/tutorial/TutorialController.js +1182 -0
- package/dist/game/tutorial/TutorialController.js.map +1 -0
- package/dist/game/tutorial/TutorialRuntime.d.ts +89 -0
- package/dist/game/tutorial/TutorialRuntime.d.ts.map +1 -0
- package/dist/game/tutorial/TutorialRuntime.js +261 -0
- package/dist/game/tutorial/TutorialRuntime.js.map +1 -0
- package/dist/game/tutorial/TutorialTheme.d.ts +28 -0
- package/dist/game/tutorial/TutorialTheme.d.ts.map +1 -0
- package/dist/game/tutorial/TutorialTheme.js +39 -0
- package/dist/game/tutorial/TutorialTheme.js.map +1 -0
- package/dist/game/tutorial/allowed.d.ts +2 -0
- package/dist/game/tutorial/allowed.d.ts.map +1 -0
- package/dist/game/tutorial/allowed.js +119 -0
- package/dist/game/tutorial/allowed.js.map +1 -0
- package/dist/game/tutorial/checks.d.ts +58 -0
- package/dist/game/tutorial/checks.d.ts.map +1 -0
- package/dist/game/tutorial/checks.js +144 -0
- package/dist/game/tutorial/checks.js.map +1 -0
- package/dist/game/tutorial/createDemoMatch.d.ts +47 -0
- package/dist/game/tutorial/createDemoMatch.d.ts.map +1 -0
- package/dist/game/tutorial/createDemoMatch.js +67 -0
- package/dist/game/tutorial/createDemoMatch.js.map +1 -0
- package/dist/game/tutorial/defineTutorial.d.ts +353 -0
- package/dist/game/tutorial/defineTutorial.d.ts.map +1 -0
- package/dist/game/tutorial/defineTutorial.js +86 -0
- package/dist/game/tutorial/defineTutorial.js.map +1 -0
- package/dist/game/tutorial/runTutorial.d.ts +63 -0
- package/dist/game/tutorial/runTutorial.d.ts.map +1 -0
- package/dist/game/tutorial/runTutorial.js +273 -0
- package/dist/game/tutorial/runTutorial.js.map +1 -0
- package/dist/hooks/usePanelNavigation.d.ts +28 -0
- package/dist/hooks/usePanelNavigation.d.ts.map +1 -0
- package/dist/hooks/usePanelNavigation.js +36 -0
- package/dist/hooks/usePanelNavigation.js.map +1 -0
- package/dist/hooks/useTimeController.d.ts +2 -1
- package/dist/hooks/useTimeController.d.ts.map +1 -1
- package/dist/hooks/useTimeController.js +6 -2
- package/dist/hooks/useTimeController.js.map +1 -1
- package/dist/hooks/useTutorial.d.ts +48 -0
- package/dist/hooks/useTutorial.d.ts.map +1 -0
- package/dist/hooks/useTutorial.js +16 -0
- package/dist/hooks/useTutorial.js.map +1 -0
- package/dist/index.d.ts +36 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.html +12 -0
- package/dist/index.js +19 -2
- package/dist/index.js.map +1 -1
- package/dist/main.0792d734cde2c688d5f7.hot-update.js +16991 -0
- package/dist/main.0792d734cde2c688d5f7.hot-update.js.map +1 -0
- package/dist/main.0792d734cde2c688d5f7.hot-update.json +1 -0
- package/dist/pretty-chitty.js +204513 -0
- package/dist/pretty-chitty.js.map +1 -0
- package/dist/rendering/CameraWrapperPerspective.d.ts +5 -0
- package/dist/rendering/CameraWrapperPerspective.d.ts.map +1 -1
- package/dist/rendering/CameraWrapperPerspective.js +16 -0
- package/dist/rendering/CameraWrapperPerspective.js.map +1 -1
- package/dist/rendering/ChitGalleryItemInstance.d.ts +1 -0
- package/dist/rendering/ChitGalleryItemInstance.d.ts.map +1 -1
- package/dist/rendering/ChitGalleryItemInstance.js +12 -0
- package/dist/rendering/ChitGalleryItemInstance.js.map +1 -1
- package/dist/rendering/ChitRenderInstance.d.ts +9 -1
- package/dist/rendering/ChitRenderInstance.d.ts.map +1 -1
- package/dist/rendering/ChitRenderInstance.js +28 -0
- package/dist/rendering/ChitRenderInstance.js.map +1 -1
- package/dist/rendering/RootChitRenderInstance.d.ts +2 -0
- package/dist/rendering/RootChitRenderInstance.d.ts.map +1 -1
- package/dist/rendering/RootChitRenderInstance.js +29 -0
- package/dist/rendering/RootChitRenderInstance.js.map +1 -1
- package/dist/utilities/Annotations.d.ts +15 -0
- package/dist/utilities/Annotations.d.ts.map +1 -1
- package/dist/utilities/Annotations.js +31 -7
- package/dist/utilities/Annotations.js.map +1 -1
- package/dist/utilities/CanvasStack/CanvasStack.d.ts +2 -0
- package/dist/utilities/CanvasStack/CanvasStack.d.ts.map +1 -1
- package/dist/utilities/CanvasStack/CanvasStack.js +4 -0
- package/dist/utilities/CanvasStack/CanvasStack.js.map +1 -1
- package/dist/utilities/TokenizedText.d.ts +6 -0
- package/dist/utilities/TokenizedText.d.ts.map +1 -1
- package/dist/utilities/TokenizedText.js.map +1 -1
- package/dist/utilities/zIndex.d.ts +1 -0
- package/dist/utilities/zIndex.d.ts.map +1 -1
- package/dist/utilities/zIndex.js +1 -0
- package/dist/utilities/zIndex.js.map +1 -1
- package/package.json +3 -2
- package/src/library/components/ActionLogDisplay.tsx +1 -0
- package/src/library/components/BottomBarButton.tsx +5 -0
- package/src/library/components/ContextGalleryDisplay.tsx +2 -0
- package/src/library/components/DemoWrapper.tsx +147 -44
- package/src/library/components/FullScreenGalleryDisplay.tsx +3 -0
- package/src/library/components/Gallery/BuiltItem.ts +30 -9
- package/src/library/components/Gallery/GalleryController.ts +72 -1
- package/src/library/components/Gallery/GalleryViewer.tsx +54 -10
- package/src/library/components/Gallery/LayoutManager.ts +30 -6
- package/src/library/components/Gallery/constants.ts +2 -0
- package/src/library/components/Gallery/registry.ts +44 -0
- package/src/library/components/GameDesigner.tsx +121 -12
- package/src/library/components/InlineGalleryDisplay.tsx +5 -0
- package/src/library/components/LiveButton.tsx +8 -5
- package/src/library/components/MatchViewer.tsx +14 -3
- package/src/library/components/Panel/MultiPanel.tsx +21 -0
- package/src/library/components/Panel/PanelContents.tsx +70 -1
- package/src/library/components/Panel/PanelTabStack.tsx +1 -0
- package/src/library/components/PanelSpark.tsx +9 -4
- package/src/library/components/Playground.tsx +48 -21
- package/src/library/components/PromptControls.tsx +7 -3
- package/src/library/components/SparkLineChart.tsx +23 -27
- package/src/library/components/TimeControlBar.tsx +5 -3
- package/src/library/components/TokenizedMarkdown.tsx +224 -0
- package/src/library/components/TokenizedMessage.tsx +28 -32
- package/src/library/components/TopBarPlayers.tsx +12 -9
- package/src/library/components/Tutorial/BrowserNarration.ts +233 -0
- package/src/library/components/Tutorial/TutorialBox.tsx +506 -0
- package/src/library/components/Tutorial/TutorialDevPanel.tsx +297 -0
- package/src/library/components/Tutorial/TutorialOverlay.tsx +1301 -0
- package/src/library/components/Tutorial/targetRects.ts +273 -0
- package/src/library/game/Chit.ts +21 -5
- package/src/library/game/ClientTimeState.ts +18 -0
- package/src/library/game/Game.ts +7 -0
- package/src/library/game/GameTheme.ts +4 -0
- package/src/library/game/Match.ts +12 -2
- package/src/library/game/Pick.ts +16 -1
- package/src/library/game/PlayerPromptStatusChit.ts +5 -1
- package/src/library/game/Prompt.ts +20 -0
- package/src/library/game/Turn.ts +179 -61
- package/src/library/game/TurnState.ts +26 -3
- package/src/library/game/ai/AI_GUIDE.md +10 -0
- package/src/library/game/ai/AiClientPrompts.ts +60 -11
- package/src/library/game/ai/AiPlayerView.ts +2 -0
- package/src/library/game/clientTransport/ClientPrompts.ts +31 -1
- package/src/library/game/clientTransport/ClientTime.ts +54 -13
- package/src/library/game/serialize.test.ts +275 -0
- package/src/library/game/tutorial/TUTORIAL_GUIDE.md +411 -0
- package/src/library/game/tutorial/TutorialController.test.ts +731 -0
- package/src/library/game/tutorial/TutorialController.ts +1286 -0
- package/src/library/game/tutorial/TutorialRuntime.ts +311 -0
- package/src/library/game/tutorial/TutorialTheme.ts +67 -0
- package/src/library/game/tutorial/allowed.ts +145 -0
- package/src/library/game/tutorial/checks.ts +186 -0
- package/src/library/game/tutorial/createDemoMatch.ts +115 -0
- package/src/library/game/tutorial/defineTutorial.ts +414 -0
- package/src/library/game/tutorial/runTutorial.ts +331 -0
- package/src/library/game/undo.test.ts +282 -0
- package/src/library/hooks/usePanelNavigation.tsx +65 -0
- package/src/library/hooks/useTimeController.tsx +6 -2
- package/src/library/hooks/useTutorial.tsx +76 -0
- package/src/library/index.ts +57 -2
- package/src/library/rendering/CameraWrapperPerspective.ts +17 -0
- package/src/library/rendering/ChitGalleryItemInstance.ts +12 -0
- package/src/library/rendering/ChitRenderInstance.ts +34 -0
- package/src/library/rendering/RootChitRenderInstance.ts +30 -1
- package/src/library/utilities/Annotations.ts +35 -7
- package/src/library/utilities/CanvasStack/CanvasStack.ts +6 -1
- package/src/library/utilities/TokenizedText.ts +6 -0
- package/src/library/utilities/zIndex.ts +1 -0
package/dist/game/Prompt.js
CHANGED
|
@@ -6,6 +6,11 @@ const defaultFindChit = () => {
|
|
|
6
6
|
export class Prompt {
|
|
7
7
|
constructor() {
|
|
8
8
|
this.id = "";
|
|
9
|
+
/**
|
|
10
|
+
* Set on the client (see `ClientPrompts.guard`) to vet a player's answers before they are sent: a
|
|
11
|
+
* tutorial lets through only the moves its current step asks for. Not serialized.
|
|
12
|
+
*/
|
|
13
|
+
this.guard = undefined;
|
|
9
14
|
this.resolved = false;
|
|
10
15
|
this.clock = 0;
|
|
11
16
|
this.response = undefined;
|
|
@@ -49,6 +54,11 @@ export class Prompt {
|
|
|
49
54
|
this.cbs.forEach((cb) => cb(true));
|
|
50
55
|
}
|
|
51
56
|
stepBack(fullReset = false) {
|
|
57
|
+
// The guard goes first: a tutorial turns Undo into its own Back, which works even where the
|
|
58
|
+
// engine could not undo (after a draw)
|
|
59
|
+
if (this.guard && !this.guard({ type: "undo", fullReset })) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
52
62
|
if (!this.canReset) {
|
|
53
63
|
throw new Error("Cannot be stepped back");
|
|
54
64
|
}
|
|
@@ -197,6 +207,12 @@ export class PickPrompt extends Prompt {
|
|
|
197
207
|
this._help = details.help;
|
|
198
208
|
}
|
|
199
209
|
resolvePick(pick, value) {
|
|
210
|
+
if (this.resolved) {
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
if (this.guard && !this.guard({ type: "pick", pick, value })) {
|
|
214
|
+
return;
|
|
215
|
+
}
|
|
200
216
|
const idx = this.picks.indexOf(pick);
|
|
201
217
|
this.resolve({ idx, value, pickType: pick.type });
|
|
202
218
|
}
|
package/dist/game/Prompt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Prompt.js","sourceRoot":"","sources":["../../src/library/game/Prompt.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAc,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAY,MAAM,QAAQ,CAAC;AAa9D,MAAM,eAAe,GAAa,GAAG,EAAE;IACrC,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;AAC7B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Prompt.js","sourceRoot":"","sources":["../../src/library/game/Prompt.ts"],"names":[],"mappings":"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"}
|
package/dist/game/Turn.d.ts
CHANGED
|
@@ -53,14 +53,18 @@ export declare class Turn<T, P extends PlayerChit, R extends RootChit<P>> {
|
|
|
53
53
|
private lockedChitStates;
|
|
54
54
|
private lastChitStates;
|
|
55
55
|
private dirtyChitIds;
|
|
56
|
+
private absorbedRootIds;
|
|
56
57
|
private pendingNewChits;
|
|
57
58
|
private _statePool?;
|
|
58
|
-
private
|
|
59
|
+
private _checkpoints;
|
|
60
|
+
private absorbed;
|
|
61
|
+
/** Drop every checkpoint that includes the step at `index`, which is about to change. */
|
|
62
|
+
private dropCheckpointsFrom;
|
|
59
63
|
/**
|
|
60
|
-
*
|
|
61
|
-
*
|
|
64
|
+
* Checkpoints stay at least `serializeCheckpointInterval` steps apart, except the last one,
|
|
65
|
+
* which marks wherever the latest walk ended and is replaced as walks reach further.
|
|
62
66
|
*/
|
|
63
|
-
private
|
|
67
|
+
private addCheckpoint;
|
|
64
68
|
private get statePool();
|
|
65
69
|
/**
|
|
66
70
|
* Intern a serialized state string. If `hint` is provided (e.g. the last known state),
|
|
@@ -177,6 +181,13 @@ export declare class Turn<T, P extends PlayerChit, R extends RootChit<P>> {
|
|
|
177
181
|
private waitForPromptResolution;
|
|
178
182
|
execute(): Promise<T>;
|
|
179
183
|
private cleanUp;
|
|
184
|
+
/**
|
|
185
|
+
* Takes every chit this turn made (and those a sub-turn still running under it made) off the board,
|
|
186
|
+
* ahead of a parent's restart. The parent never absorbed us, so its own reset knows nothing of them:
|
|
187
|
+
* left alone they would stay on the board, and the next sub-turn would lock them as if they had
|
|
188
|
+
* always been there. Chits we only changed are the parent's to restore.
|
|
189
|
+
*/
|
|
190
|
+
private discardCreatedChits;
|
|
180
191
|
private restartExecution;
|
|
181
192
|
}
|
|
182
193
|
export declare class StepBackError extends Error {
|
package/dist/game/Turn.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Turn.d.ts","sourceRoot":"","sources":["../../src/library/game/Turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAA+B,SAAS,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAW,UAAU,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAuBtC,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,MAAM,GAAG,eAAe,CAAC;AAEnE,KAAK,SAAS,GAAG,SAAS,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,GAAG,UAAU,EAAE,GAAG,UAAU,GAAG,UAAU,EAAE,CAAC;AAC3G,MAAM,MAAM,KAAK,GAAG,SAAS,GAAG,SAAS,EAAE,CAAC;AAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,qBAAa,IAAI,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Turn.d.ts","sourceRoot":"","sources":["../../src/library/game/Turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAA+B,SAAS,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAW,UAAU,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAuBtC,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,MAAM,GAAG,eAAe,CAAC;AAEnE,KAAK,SAAS,GAAG,SAAS,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,GAAG,UAAU,EAAE,GAAG,UAAU,GAAG,UAAU,EAAE,CAAC;AAC3G,MAAM,MAAM,KAAK,GAAG,SAAS,GAAG,SAAS,EAAE,CAAC;AAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,qBAAa,IAAI,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC;IAiIrD,EAAE,EAAE,MAAM;IASV,MAAM,CAAC,EAAE,CAAC;IAzInB,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,aAAa,CAAK;IAiB1B,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,YAAY,CAAqB;IAGzC,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,UAAU,CAAC,CAAsB;IAOzC,OAAO,CAAC,YAAY,CAA6B;IAGjD,OAAO,CAAC,QAAQ,CAAS;IAQzB,yFAAyF;IACzF,OAAO,CAAC,mBAAmB;IAM3B;;;OAGG;IACH,OAAO,CAAC,aAAa;IAarB,OAAO,KAAK,SAAS,GAIpB;IAED;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAqCnB;;OAEG;IACH,IAAW,QAAQ,IAAI,CAAC,CAEvB;IAED,OAAO,CAAC,UAAU,CAAY;gBAGrB,EAAE,EAAE,MAAM;IACjB,gBAAgB;IACT,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IACzB,gBAAgB;IACT,KAAK,EAAE,SAAS;IACvB,gBAAgB;IACT,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC;IAC9C,gBAAgB;IACR,WAAW,EAAE,IAAI,EAAE,EACpB,MAAM,CAAC,EAAE,CAAC,YAAA;IACjB,gBAAgB;IACR,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,YAAA;IAwClC;;;;;;;OAOG;IACG,GAAG,CAAC,OAAO,SAAyB;IAO1C;;;;;OAKG;IACG,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,SAAyB,GAAG,OAAO,CAAC,MAAM,MAAM,CAAC;IAcrF;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAUxB;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,MAAM;IAiBnB;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IAsBzD,cAAc,SAAK;IAEnB;;;;;;;OAOG;IACH,GAAG;IAyBH;;;OAGG;IACH,iBAAiB;IAIjB;;;;OAIG;IACH,KAAK,CAAC,KAAK,UAAQ;IA+FnB;;;;;;;;;;;;;;;;OAgBG;IACU,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAqG5F,gBAAgB,CAAC,CAAC,EAC7B,OAAO,EAAE,CAAC,EAAE,EACZ,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,EACvB,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAChD,OAAO,CAAC,CAAC,EAAE,CAAC;IAWf;;;;;OAKG;IACU,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAczD;;;;;;;OAOG;IACU,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK;IA6EhF,OAAO,CAAC,sBAAsB,CAAS;IAwUvC,OAAO,CAAC,gBAAgB;YAyBV,uBAAuB;IA+D/B,OAAO;IAgGb,OAAO,CAAC,OAAO;IA+Cf;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,gBAAgB;CAoDzB;AAiFD,qBAAa,aAAc,SAAQ,KAAK;CAAG;AAC3C,qBAAa,aAAc,SAAQ,KAAK;CAAG;AAC3C,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAC1C,qBAAa,UAAW,SAAQ,KAAK;IAChB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;gBAAzB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;CAG7C;AACD,qBAAa,aAAc,SAAQ,KAAK;;CAIvC"}
|
package/dist/game/Turn.js
CHANGED
|
@@ -38,13 +38,27 @@ import { Confirm, GameButton } from "./GameButton";
|
|
|
38
38
|
* @group Core Game Elements
|
|
39
39
|
*/
|
|
40
40
|
export class Turn {
|
|
41
|
+
/** Drop every checkpoint that includes the step at `index`, which is about to change. */
|
|
42
|
+
dropCheckpointsFrom(index) {
|
|
43
|
+
if (this._checkpoints.length && this._checkpoints[this._checkpoints.length - 1].nextIndex > index) {
|
|
44
|
+
this._checkpoints = this._checkpoints.filter((c) => c.nextIndex <= index);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
41
47
|
/**
|
|
42
|
-
*
|
|
43
|
-
*
|
|
48
|
+
* Checkpoints stay at least `serializeCheckpointInterval` steps apart, except the last one,
|
|
49
|
+
* which marks wherever the latest walk ended and is replaced as walks reach further.
|
|
44
50
|
*/
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
51
|
+
addCheckpoint(checkpoint) {
|
|
52
|
+
const checkpoints = this._checkpoints;
|
|
53
|
+
const last = checkpoints[checkpoints.length - 1];
|
|
54
|
+
if (last && last.nextIndex >= checkpoint.nextIndex) {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
const previous = checkpoints.length >= 2 ? checkpoints[checkpoints.length - 2].nextIndex : 0;
|
|
58
|
+
if (last && last.nextIndex - previous < Turn.serializeCheckpointInterval) {
|
|
59
|
+
checkpoints.pop();
|
|
60
|
+
}
|
|
61
|
+
checkpoints.push(checkpoint);
|
|
48
62
|
}
|
|
49
63
|
get statePool() {
|
|
50
64
|
if (this.parent)
|
|
@@ -119,9 +133,20 @@ export class Turn {
|
|
|
119
133
|
this.lockedChitStates = {};
|
|
120
134
|
this.lastChitStates = {};
|
|
121
135
|
this.dirtyChitIds = new Set();
|
|
136
|
+
// Locked roots of absorbed sub-turns. A sub-turn never deletes its own locked roots, so the next
|
|
137
|
+
// flush here checks whether any of them lost their parent.
|
|
138
|
+
this.absorbedRootIds = new Set();
|
|
122
139
|
this.pendingNewChits = new Set();
|
|
123
140
|
this._statePool = undefined;
|
|
124
|
-
this.
|
|
141
|
+
// serialize() replays this turn's diffs from its locked snapshot. Checkpoints are that replay
|
|
142
|
+
// captured part-way, so a request walks only the steps after the nearest one. They cover only
|
|
143
|
+
// steps that can no longer change (flushes, and sub-turn steps every turn of which the parent
|
|
144
|
+
// has absorbed) and merge sub-turns in absorption order, so they hold the same chit states for
|
|
145
|
+
// every player and are shared by every connection to the match.
|
|
146
|
+
this._checkpoints = [];
|
|
147
|
+
// Set once the parent has absorbed this turn. From then on we are only walked by the parent, which
|
|
148
|
+
// holds the chit map we started from, so we keep neither our locked snapshot nor checkpoints.
|
|
149
|
+
this.absorbed = false;
|
|
125
150
|
/**
|
|
126
151
|
* Locates a chit by its ID. If not found, will throw.
|
|
127
152
|
* @param id
|
|
@@ -167,12 +192,18 @@ export class Turn {
|
|
|
167
192
|
}
|
|
168
193
|
return p.id;
|
|
169
194
|
});
|
|
170
|
-
// now serialize all chits in their "locked" state
|
|
195
|
+
// now serialize all chits in their "locked" state. createTurn flushes the parent right before
|
|
196
|
+
// building us, so a clean chit's state there is already current and interned.
|
|
197
|
+
const parentStates = this.parent?.lastChitStates;
|
|
171
198
|
Object.values(this.chitLookup).forEach((c) => {
|
|
172
199
|
if (!c.id) {
|
|
173
200
|
throw new Error("Cannot serialize a chit without an id");
|
|
174
201
|
}
|
|
175
|
-
|
|
202
|
+
const parentState = parentStates?.[c.id];
|
|
203
|
+
this.lastChitStates[c.id] = this.lockedChitStates[c.id] =
|
|
204
|
+
parentState !== undefined && parentState !== Chit.deletedIfSerialized() && !c._dirty
|
|
205
|
+
? parentState
|
|
206
|
+
: this.internState(c.serialize(this._playerIds));
|
|
176
207
|
});
|
|
177
208
|
}
|
|
178
209
|
/**
|
|
@@ -236,6 +267,7 @@ export class Turn {
|
|
|
236
267
|
}
|
|
237
268
|
const flushStep = step;
|
|
238
269
|
flushStep.log = message;
|
|
270
|
+
this.dropCheckpointsFrom(this.clockSteps.length - 1);
|
|
239
271
|
}
|
|
240
272
|
/**
|
|
241
273
|
* Append a game log message to the last flush step that has a game log message
|
|
@@ -257,6 +289,7 @@ export class Turn {
|
|
|
257
289
|
message = message(step.log);
|
|
258
290
|
}
|
|
259
291
|
step.log = message;
|
|
292
|
+
this.dropCheckpointsFrom(lastIndex);
|
|
260
293
|
}
|
|
261
294
|
/**
|
|
262
295
|
* Compress the history in the timeline such that a user with maybe many moves (and changing their minds) won't
|
|
@@ -280,8 +313,8 @@ export class Turn {
|
|
|
280
313
|
hasChange = true;
|
|
281
314
|
}
|
|
282
315
|
if (hasChange) {
|
|
283
|
-
//
|
|
284
|
-
this.
|
|
316
|
+
// The merged step changed in place: checkpoints that include it are stale.
|
|
317
|
+
this.dropCheckpointsFrom(this.clockSteps.length - 1);
|
|
285
318
|
this.pass++;
|
|
286
319
|
// No trailing force-flush: it would only push an empty FlushClockStep (no chit
|
|
287
320
|
// diff, no log) that the client has to walk through for no visual change. The
|
|
@@ -348,17 +381,22 @@ export class Turn {
|
|
|
348
381
|
sawChange = true;
|
|
349
382
|
}
|
|
350
383
|
}
|
|
351
|
-
|
|
352
|
-
//
|
|
353
|
-
const deletedRoots =
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
384
|
+
// 3. Detect deleted chits — orphans in lastChitStates. Losing a parent marks a chit dirty, so
|
|
385
|
+
// only this flush's dirty chits and the roots of absorbed sub-turns can have become orphans.
|
|
386
|
+
const deletedRoots = new Set();
|
|
387
|
+
const checkOrphan = (id) => {
|
|
388
|
+
const lastState = this.lastChitStates[id];
|
|
389
|
+
if (lastState === undefined || lastState === Chit.deletedIfSerialized())
|
|
390
|
+
return;
|
|
357
391
|
const chit = this.chitLookup[id];
|
|
358
392
|
if (chit && !chit.parent && !this.chitsToLock.includes(chit)) {
|
|
359
|
-
deletedRoots.
|
|
393
|
+
deletedRoots.add(chit);
|
|
360
394
|
}
|
|
361
|
-
}
|
|
395
|
+
};
|
|
396
|
+
this.dirtyChitIds.forEach(checkOrphan);
|
|
397
|
+
this.absorbedRootIds.forEach(checkOrphan);
|
|
398
|
+
this.dirtyChitIds.clear();
|
|
399
|
+
this.absorbedRootIds.clear();
|
|
362
400
|
for (const chit of deletedRoots) {
|
|
363
401
|
if (chit.id) {
|
|
364
402
|
sawChange = true;
|
|
@@ -380,9 +418,9 @@ export class Turn {
|
|
|
380
418
|
if (this.activeSubTurns.length) {
|
|
381
419
|
throw new Error("Cannot flush while subturns are active");
|
|
382
420
|
}
|
|
421
|
+
// Appending leaves every checkpoint valid, ours and our ancestors': theirs stop before the
|
|
422
|
+
// step that holds us until we have been absorbed.
|
|
383
423
|
this.clockSteps.push(new FlushClockStep(this.clock, newStates));
|
|
384
|
-
// Ancestors' caches included our prior contribution; the new step makes them stale.
|
|
385
|
-
this.parent?.invalidateSerializeCache();
|
|
386
424
|
}
|
|
387
425
|
}
|
|
388
426
|
/**
|
|
@@ -428,8 +466,10 @@ export class Turn {
|
|
|
428
466
|
Chit.walk(chits, (chit) => chit.unlock(this));
|
|
429
467
|
const turn = new Turn(id, this.match, s, cb, chits, player, this);
|
|
430
468
|
this.decisionIndex++;
|
|
469
|
+
let step;
|
|
431
470
|
if (this.activeSubTurns.length === 0) {
|
|
432
|
-
|
|
471
|
+
step = new SubTurnsClockStep(this.clock, [turn]);
|
|
472
|
+
this.clockSteps.push(step);
|
|
433
473
|
}
|
|
434
474
|
else {
|
|
435
475
|
const lastStep = this.clockSteps[this.clockSteps.length - 1];
|
|
@@ -437,9 +477,9 @@ export class Turn {
|
|
|
437
477
|
throw new Error("Unexpected clocksteps stage");
|
|
438
478
|
}
|
|
439
479
|
lastStep.turns.push(turn);
|
|
480
|
+
step = lastStep;
|
|
440
481
|
}
|
|
441
|
-
//
|
|
442
|
-
this.invalidateSerializeCache();
|
|
482
|
+
// Neither case touches a checkpoint: none reaches a step with a turn still to absorb.
|
|
443
483
|
this.activeSubTurns.push(turn);
|
|
444
484
|
//make sure flow goes to next tick
|
|
445
485
|
await new Promise((resolve) => queueMicrotask(() => resolve(true)));
|
|
@@ -454,14 +494,18 @@ export class Turn {
|
|
|
454
494
|
}
|
|
455
495
|
});
|
|
456
496
|
this.lastChitStates = { ...this.lastChitStates, ...turn.lastChitStates };
|
|
497
|
+
turn.chitsToLock.forEach((chit) => chit.id && this.absorbedRootIds.add(chit.id));
|
|
498
|
+
// serialize() merges the step's turns in this order, so a chit written by several parallel
|
|
499
|
+
// turns serializes as the engine now holds it.
|
|
500
|
+
step.absorbed.push(turn);
|
|
457
501
|
turn.releasePostAbsorptionRefs();
|
|
458
502
|
return result;
|
|
459
503
|
}
|
|
460
504
|
/**
|
|
461
505
|
* Called by the parent right after it has absorbed our `chitLookup` and `lastChitStates`.
|
|
462
506
|
* After this we will only ever be walked via `serialize` / `chitsHistory` / `gameLog`,
|
|
463
|
-
*
|
|
464
|
-
* bookkeeping to keep finished sub-turns from pinning hundreds of chit references.
|
|
507
|
+
* and only by the parent, which needs nothing of ours but `clockSteps` — so drop the heavy
|
|
508
|
+
* per-chit bookkeeping to keep finished sub-turns from pinning hundreds of chit references.
|
|
465
509
|
* @internal
|
|
466
510
|
*/
|
|
467
511
|
releasePostAbsorptionRefs() {
|
|
@@ -470,7 +514,15 @@ export class Turn {
|
|
|
470
514
|
this.lastChitStates = {};
|
|
471
515
|
this.pendingNewChits.clear();
|
|
472
516
|
this.dirtyChitIds.clear();
|
|
473
|
-
this.
|
|
517
|
+
this.absorbedRootIds.clear();
|
|
518
|
+
if (!Turn.releaseAbsorbedTurns)
|
|
519
|
+
return;
|
|
520
|
+
// The locked snapshot and every checkpoint are full copies of the chit map, and a long game
|
|
521
|
+
// has hundreds of finished turns. The parent walks into us with its own map, which at our
|
|
522
|
+
// step holds exactly what the snapshot held, so a finished turn keeps neither.
|
|
523
|
+
this.absorbed = true;
|
|
524
|
+
this.lockedChitStates = {};
|
|
525
|
+
this._checkpoints = [];
|
|
474
526
|
}
|
|
475
527
|
async runParallelTurns(players, chits, action) {
|
|
476
528
|
// the whole point of this function is so we can mark all players as having a prompt waiting for them
|
|
@@ -698,7 +750,8 @@ export class Turn {
|
|
|
698
750
|
}
|
|
699
751
|
};
|
|
700
752
|
// Seed with the initial locked state so chits that never diff in this turn still
|
|
701
|
-
// surface their starting form (flush steps now hold diffs only).
|
|
753
|
+
// surface their starting form (flush steps now hold diffs only). A finished turn has no
|
|
754
|
+
// snapshot; the parent already logged that state before walking into it.
|
|
702
755
|
ids.forEach((id) => {
|
|
703
756
|
const initial = this.lockedChitStates[id];
|
|
704
757
|
if (initial !== undefined) {
|
|
@@ -722,32 +775,53 @@ export class Turn {
|
|
|
722
775
|
});
|
|
723
776
|
return result;
|
|
724
777
|
}
|
|
725
|
-
/**
|
|
726
|
-
|
|
778
|
+
/**
|
|
779
|
+
* `into` is the parent's working chit map while it walks this turn. A finished turn has no
|
|
780
|
+
* snapshot of its own and writes its diffs straight into it; the parent then needs no merge.
|
|
781
|
+
* @internal
|
|
782
|
+
*/
|
|
783
|
+
serialize(playerId, clock, into) {
|
|
727
784
|
clock = Math.max(0, Math.min(clock, this.playerVisibleClockTime(playerId)));
|
|
728
785
|
let chits;
|
|
729
786
|
let subTurns;
|
|
730
787
|
let log;
|
|
731
788
|
let resultingClock;
|
|
732
789
|
let index;
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
|
|
736
|
-
|
|
737
|
-
|
|
738
|
-
|
|
739
|
-
|
|
790
|
+
// Resume from the furthest checkpoint that ends at or before the target clock
|
|
791
|
+
let checkpoint;
|
|
792
|
+
for (let i = this._checkpoints.length - 1; i >= 0; i--) {
|
|
793
|
+
if (this._checkpoints[i].resultingClock <= clock) {
|
|
794
|
+
checkpoint = this._checkpoints[i];
|
|
795
|
+
break;
|
|
796
|
+
}
|
|
797
|
+
}
|
|
798
|
+
if (checkpoint) {
|
|
799
|
+
chits = { ...checkpoint.chits };
|
|
800
|
+
subTurns = checkpoint.subTurns ? { ...checkpoint.subTurns } : undefined;
|
|
801
|
+
log = checkpoint.log ? { ...checkpoint.log } : undefined;
|
|
802
|
+
resultingClock = checkpoint.resultingClock;
|
|
803
|
+
index = checkpoint.nextIndex;
|
|
740
804
|
}
|
|
741
805
|
else {
|
|
742
806
|
// Diff-replay: seed with the initial locked snapshot and merge every flush diff
|
|
743
|
-
// up to (but not including) the target clock.
|
|
744
|
-
|
|
807
|
+
// up to (but not including) the target clock. A finished turn's snapshot was the parent's
|
|
808
|
+
// map at this step, which is what the parent hands us.
|
|
809
|
+
chits = this.absorbed ? (into ?? {}) : { ...this.lockedChitStates };
|
|
745
810
|
subTurns = undefined;
|
|
746
811
|
log = undefined;
|
|
747
812
|
resultingClock = -1;
|
|
748
813
|
index = 0;
|
|
749
814
|
}
|
|
750
|
-
|
|
815
|
+
const snapshot = () => ({
|
|
816
|
+
nextIndex: index,
|
|
817
|
+
chits: { ...chits },
|
|
818
|
+
subTurns: subTurns ? { ...subTurns } : undefined,
|
|
819
|
+
log: log ? { ...log } : undefined,
|
|
820
|
+
resultingClock: resultingClock === -1 ? clock : resultingClock,
|
|
821
|
+
});
|
|
822
|
+
// True while every step walked is final and was consumed whole, so the walk may be checkpointed
|
|
823
|
+
let checkpointable = Turn.serializeCheckpoints && !this.absorbed;
|
|
824
|
+
let lastCheckpointIndex = index;
|
|
751
825
|
while (index < this.clockSteps.length) {
|
|
752
826
|
const clockStep = this.clockSteps[index];
|
|
753
827
|
if (clockStep.startClock >= clock)
|
|
@@ -765,13 +839,21 @@ export class Turn {
|
|
|
765
839
|
subTurns = {};
|
|
766
840
|
resultingClock = clockStep.startClock;
|
|
767
841
|
let remainingClocksToSpend = clock - clockStep.startClock;
|
|
768
|
-
|
|
842
|
+
// A step every turn of which has been absorbed is final, and asked for in full it reads the
|
|
843
|
+
// same for every player: its turns merge in absorption order, the order their changes
|
|
844
|
+
// landed in `lastChitStates`, so a chit written by two parallel turns serializes as the
|
|
845
|
+
// engine holds it. A step still in motion, or asked for part-way, is walked as this player
|
|
846
|
+
// may see it, and the walk stops there: a later request has to re-walk it.
|
|
847
|
+
const final = clockStep.fullyAbsorbed && clock >= clockStep.endClock();
|
|
848
|
+
for (const turn of final ? clockStep.absorbed : clockStep.visibleTurns(playerId)) {
|
|
769
849
|
const time = Math.max(remainingClocksToSpend, 0);
|
|
770
850
|
if (time <= 0)
|
|
771
851
|
break;
|
|
772
852
|
// we are going forward so we never want to have a turn go backwards. ever.
|
|
773
|
-
const serialized = turn.serialize(playerId, time);
|
|
774
|
-
|
|
853
|
+
const serialized = turn.serialize(playerId, time, chits);
|
|
854
|
+
if (serialized.chits !== chits) {
|
|
855
|
+
Object.assign(chits, serialized.chits);
|
|
856
|
+
}
|
|
775
857
|
resultingClock += serialized.clockDetails.clock;
|
|
776
858
|
remainingClocksToSpend -= serialized.clockDetails.clock;
|
|
777
859
|
subTurns[turn.id] = serialized.clockDetails;
|
|
@@ -779,13 +861,8 @@ export class Turn {
|
|
|
779
861
|
log = { message: serialized.log.message, clock: serialized.log.clock + clockStep.startClock };
|
|
780
862
|
}
|
|
781
863
|
}
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
// sub-turn was asked for at least its full clock time. Otherwise a future
|
|
785
|
-
// request at a higher `clock` needs to re-ask the sub-turn for more time,
|
|
786
|
-
// which means re-processing this same step.
|
|
787
|
-
if (clock < clockStep.endClock(playerId)) {
|
|
788
|
-
cacheable = false;
|
|
864
|
+
if (!final) {
|
|
865
|
+
checkpointable = false;
|
|
789
866
|
break;
|
|
790
867
|
}
|
|
791
868
|
index++;
|
|
@@ -793,16 +870,14 @@ export class Turn {
|
|
|
793
870
|
else {
|
|
794
871
|
index++;
|
|
795
872
|
}
|
|
873
|
+
if (checkpointable && index - lastCheckpointIndex >= Turn.serializeCheckpointInterval) {
|
|
874
|
+
this.addCheckpoint(snapshot());
|
|
875
|
+
lastCheckpointIndex = index;
|
|
876
|
+
}
|
|
796
877
|
}
|
|
797
|
-
|
|
798
|
-
|
|
799
|
-
|
|
800
|
-
nextIndex: index,
|
|
801
|
-
chits: { ...chits },
|
|
802
|
-
subTurns: subTurns ? { ...subTurns } : undefined,
|
|
803
|
-
log: log ? { ...log } : undefined,
|
|
804
|
-
resultingClock: resultingClock === -1 ? clock : resultingClock,
|
|
805
|
-
};
|
|
878
|
+
// Remember where this walk ended, so a request for a later clock continues from here
|
|
879
|
+
if (checkpointable && index > lastCheckpointIndex) {
|
|
880
|
+
this.addCheckpoint(snapshot());
|
|
806
881
|
}
|
|
807
882
|
return {
|
|
808
883
|
log,
|
|
@@ -1038,8 +1113,33 @@ export class Turn {
|
|
|
1038
1113
|
}
|
|
1039
1114
|
return result;
|
|
1040
1115
|
}
|
|
1116
|
+
/**
|
|
1117
|
+
* Takes every chit this turn made (and those a sub-turn still running under it made) off the board,
|
|
1118
|
+
* ahead of a parent's restart. The parent never absorbed us, so its own reset knows nothing of them:
|
|
1119
|
+
* left alone they would stay on the board, and the next sub-turn would lock them as if they had
|
|
1120
|
+
* always been there. Chits we only changed are the parent's to restore.
|
|
1121
|
+
*/
|
|
1122
|
+
discardCreatedChits() {
|
|
1123
|
+
this.activeSubTurns.forEach((t) => t.discardCreatedChits());
|
|
1124
|
+
for (const chit of Object.values(this.chitLookup)) {
|
|
1125
|
+
if (chit.id && this.lockedChitStates[chit.id] === undefined) {
|
|
1126
|
+
chit.forgetFallbackUnlessHidden();
|
|
1127
|
+
chit.removeFromParent();
|
|
1128
|
+
}
|
|
1129
|
+
}
|
|
1130
|
+
for (const chit of this.pendingNewChits) {
|
|
1131
|
+
if (!chit.id) {
|
|
1132
|
+
chit.forgetFallbackUnlessHidden();
|
|
1133
|
+
chit.removeFromParent();
|
|
1134
|
+
}
|
|
1135
|
+
}
|
|
1136
|
+
this.pendingNewChits.clear();
|
|
1137
|
+
}
|
|
1041
1138
|
restartExecution() {
|
|
1042
|
-
this.activeSubTurns.forEach((t) =>
|
|
1139
|
+
this.activeSubTurns.forEach((t) => {
|
|
1140
|
+
t.discardCreatedChits();
|
|
1141
|
+
t.destroy();
|
|
1142
|
+
});
|
|
1043
1143
|
const chits = Object.values(this.chitLookup).filter((chit) => chit.id);
|
|
1044
1144
|
chits.forEach((chit) => chit.beginDeserializing());
|
|
1045
1145
|
chits.forEach((chit) => {
|
|
@@ -1049,6 +1149,7 @@ export class Turn {
|
|
|
1049
1149
|
chit.deserialize(lockedState, this.findChit);
|
|
1050
1150
|
}
|
|
1051
1151
|
else {
|
|
1152
|
+
chit.forgetFallbackUnlessHidden(); // a chit made to come from another piece must not linger beside it
|
|
1052
1153
|
chit.removeFromParent(); // effectively "deletes" it. In practice, the `fn` will recreate a new chit which will have the new ID, which replaces this one.
|
|
1053
1154
|
}
|
|
1054
1155
|
});
|
|
@@ -1064,6 +1165,7 @@ export class Turn {
|
|
|
1064
1165
|
});
|
|
1065
1166
|
this.lastChitStates = { ...this.lockedChitStates }; // reset our known chit states
|
|
1066
1167
|
this.dirtyChitIds.clear();
|
|
1168
|
+
this.absorbedRootIds.clear();
|
|
1067
1169
|
this.pendingNewChits.clear();
|
|
1068
1170
|
// chits were deserialized back to locked state — mark them clean so future
|
|
1069
1171
|
// modifications correctly trigger markDirty() → notifyChitDirty()
|
|
@@ -1076,12 +1178,21 @@ export class Turn {
|
|
|
1076
1178
|
this.unresolvedPrompt = undefined;
|
|
1077
1179
|
this.activeSubTurns = [];
|
|
1078
1180
|
this.pass++;
|
|
1079
|
-
this.
|
|
1181
|
+
this._checkpoints = [];
|
|
1080
1182
|
}
|
|
1081
1183
|
}
|
|
1184
|
+
/** Tests only: false keeps every finished turn's snapshot and checkpoints. @internal */
|
|
1185
|
+
Turn.releaseAbsorbedTurns = true;
|
|
1186
|
+
/** Steps between checkpoints: the most a request walks before it reaches the live step. @internal */
|
|
1187
|
+
Turn.serializeCheckpointInterval = 32;
|
|
1188
|
+
/** Tests only: false makes every serialize() replay from the locked snapshot. @internal */
|
|
1189
|
+
Turn.serializeCheckpoints = true;
|
|
1082
1190
|
class ClockStep {
|
|
1083
1191
|
}
|
|
1084
1192
|
class SubTurnsClockStep extends ClockStep {
|
|
1193
|
+
get fullyAbsorbed() {
|
|
1194
|
+
return this.absorbed.length === this.turns.length;
|
|
1195
|
+
}
|
|
1085
1196
|
visibleTurns(playerId) {
|
|
1086
1197
|
if (this.turns.length === 1 || playerId === undefined) {
|
|
1087
1198
|
return this.turns;
|
|
@@ -1107,6 +1218,8 @@ class SubTurnsClockStep extends ClockStep {
|
|
|
1107
1218
|
super();
|
|
1108
1219
|
this.startClock = startClock;
|
|
1109
1220
|
this.turns = turns;
|
|
1221
|
+
/** The turns the parent has absorbed, in that order: the order their changes landed in its state */
|
|
1222
|
+
this.absorbed = [];
|
|
1110
1223
|
}
|
|
1111
1224
|
}
|
|
1112
1225
|
class FlushClockStep extends ClockStep {
|