@pretty-chitty/core 1.2.10 → 1.2.16

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 (165) hide show
  1. package/README.md +17 -3
  2. package/dist/components/DemoWrapper.js +1 -1
  3. package/dist/components/DemoWrapper.js.map +1 -1
  4. package/dist/components/FullScreenGalleryDisplay.d.ts.map +1 -1
  5. package/dist/components/FullScreenGalleryDisplay.js +5 -1
  6. package/dist/components/FullScreenGalleryDisplay.js.map +1 -1
  7. package/dist/components/Gallery/AnimationController.d.ts +1 -0
  8. package/dist/components/Gallery/AnimationController.d.ts.map +1 -1
  9. package/dist/components/Gallery/AnimationController.js +9 -0
  10. package/dist/components/Gallery/AnimationController.js.map +1 -1
  11. package/dist/components/Gallery/BuiltItem.d.ts +2 -1
  12. package/dist/components/Gallery/BuiltItem.d.ts.map +1 -1
  13. package/dist/components/Gallery/BuiltItem.js +15 -3
  14. package/dist/components/Gallery/BuiltItem.js.map +1 -1
  15. package/dist/components/Gallery/GalleryController.d.ts +1 -0
  16. package/dist/components/Gallery/GalleryController.d.ts.map +1 -1
  17. package/dist/components/Gallery/GalleryController.js +15 -4
  18. package/dist/components/Gallery/GalleryController.js.map +1 -1
  19. package/dist/components/Gallery/GalleryViewer.d.ts +2 -1
  20. package/dist/components/Gallery/GalleryViewer.d.ts.map +1 -1
  21. package/dist/components/Gallery/GalleryViewer.js +13 -4
  22. package/dist/components/Gallery/GalleryViewer.js.map +1 -1
  23. package/dist/components/InlineGalleryDisplay.d.ts.map +1 -1
  24. package/dist/components/InlineGalleryDisplay.js +5 -1
  25. package/dist/components/InlineGalleryDisplay.js.map +1 -1
  26. package/dist/components/Playground.d.ts.map +1 -1
  27. package/dist/components/Playground.js +59 -21
  28. package/dist/components/Playground.js.map +1 -1
  29. package/dist/components/ServerTrustMatchViewer.d.ts.map +1 -1
  30. package/dist/components/ServerTrustMatchViewer.js +10 -2
  31. package/dist/components/ServerTrustMatchViewer.js.map +1 -1
  32. package/dist/components/SparkLineChart.d.ts.map +1 -1
  33. package/dist/components/SparkLineChart.js +62 -22
  34. package/dist/components/SparkLineChart.js.map +1 -1
  35. package/dist/components/Viewer.d.ts.map +1 -1
  36. package/dist/components/Viewer.js +15 -6
  37. package/dist/components/Viewer.js.map +1 -1
  38. package/dist/game/Chit.d.ts +10 -1
  39. package/dist/game/Chit.d.ts.map +1 -1
  40. package/dist/game/Chit.js +125 -4
  41. package/dist/game/Chit.js.map +1 -1
  42. package/dist/game/Connection.d.ts +1 -0
  43. package/dist/game/Connection.d.ts.map +1 -1
  44. package/dist/game/Connection.js +27 -8
  45. package/dist/game/Connection.js.map +1 -1
  46. package/dist/game/ConnectionTransport.d.ts +5 -0
  47. package/dist/game/ConnectionTransport.d.ts.map +1 -1
  48. package/dist/game/ConnectionTransport.js +32 -0
  49. package/dist/game/ConnectionTransport.js.map +1 -1
  50. package/dist/game/GalleryItemChitChildrenSource.d.ts.map +1 -1
  51. package/dist/game/GalleryItemChitChildrenSource.js +9 -1
  52. package/dist/game/GalleryItemChitChildrenSource.js.map +1 -1
  53. package/dist/game/Game.d.ts +6 -0
  54. package/dist/game/Game.d.ts.map +1 -1
  55. package/dist/game/OrderedOutlet.d.ts +4 -1
  56. package/dist/game/OrderedOutlet.d.ts.map +1 -1
  57. package/dist/game/OrderedOutlet.js +25 -4
  58. package/dist/game/OrderedOutlet.js.map +1 -1
  59. package/dist/game/Pick.d.ts +1 -0
  60. package/dist/game/Pick.d.ts.map +1 -1
  61. package/dist/game/Pick.js +40 -1
  62. package/dist/game/Pick.js.map +1 -1
  63. package/dist/game/Prompt.d.ts +11 -1
  64. package/dist/game/Prompt.d.ts.map +1 -1
  65. package/dist/game/Prompt.js +34 -1
  66. package/dist/game/Prompt.js.map +1 -1
  67. package/dist/game/Turn.d.ts +17 -0
  68. package/dist/game/Turn.d.ts.map +1 -1
  69. package/dist/game/Turn.js +114 -63
  70. package/dist/game/Turn.js.map +1 -1
  71. package/dist/game/badAiTransport/BadAIClientPrompts.d.ts +3 -1
  72. package/dist/game/badAiTransport/BadAIClientPrompts.d.ts.map +1 -1
  73. package/dist/game/badAiTransport/BadAIClientPrompts.js +31 -5
  74. package/dist/game/badAiTransport/BadAIClientPrompts.js.map +1 -1
  75. package/dist/game/clientTransport/ClientPrompts.d.ts +2 -0
  76. package/dist/game/clientTransport/ClientPrompts.d.ts.map +1 -1
  77. package/dist/game/clientTransport/ClientPrompts.js +48 -16
  78. package/dist/game/clientTransport/ClientPrompts.js.map +1 -1
  79. package/dist/game/clientTransport/ClientTime.d.ts.map +1 -1
  80. package/dist/game/clientTransport/ClientTime.js +58 -52
  81. package/dist/game/clientTransport/ClientTime.js.map +1 -1
  82. package/dist/game/serverTransport/ServerPrompts.d.ts +1 -1
  83. package/dist/game/serverTransport/ServerPrompts.d.ts.map +1 -1
  84. package/dist/game/serverTransport/ServerPrompts.js +14 -3
  85. package/dist/game/serverTransport/ServerPrompts.js.map +1 -1
  86. package/dist/game/serverTransport/ServerStatus.d.ts.map +1 -1
  87. package/dist/game/serverTransport/ServerStatus.js +6 -2
  88. package/dist/game/serverTransport/ServerStatus.js.map +1 -1
  89. package/dist/game/serverTransport/ServerTime.d.ts.map +1 -1
  90. package/dist/game/serverTransport/ServerTime.js +6 -2
  91. package/dist/game/serverTransport/ServerTime.js.map +1 -1
  92. package/dist/hooks/useTimeController.d.ts.map +1 -1
  93. package/dist/hooks/useTimeController.js +3 -0
  94. package/dist/hooks/useTimeController.js.map +1 -1
  95. package/dist/hooks/useWebGlRenderer.d.ts +27 -1
  96. package/dist/hooks/useWebGlRenderer.d.ts.map +1 -1
  97. package/dist/hooks/useWebGlRenderer.js +191 -7
  98. package/dist/hooks/useWebGlRenderer.js.map +1 -1
  99. package/dist/index.d.ts +1 -1
  100. package/dist/index.d.ts.map +1 -1
  101. package/dist/index.js +1 -1
  102. package/dist/index.js.map +1 -1
  103. package/dist/rendering/ChitGalleryItemInstance.js +1 -1
  104. package/dist/rendering/ChitGalleryItemInstance.js.map +1 -1
  105. package/dist/rendering/ChitRenderInstance.d.ts.map +1 -1
  106. package/dist/rendering/ChitRenderInstance.js +30 -9
  107. package/dist/rendering/ChitRenderInstance.js.map +1 -1
  108. package/dist/rendering/ChitRenderSpec.js +1 -1
  109. package/dist/rendering/ChitRenderSpec.js.map +1 -1
  110. package/dist/rendering/outline/IDBasedOutlinePass.d.ts.map +1 -1
  111. package/dist/rendering/outline/IDBasedOutlinePass.js +6 -2
  112. package/dist/rendering/outline/IDBasedOutlinePass.js.map +1 -1
  113. package/dist/rendering/outline/passes/InterMeshEdgeDetectionPass.d.ts.map +1 -1
  114. package/dist/rendering/outline/passes/InterMeshEdgeDetectionPass.js +7 -3
  115. package/dist/rendering/outline/passes/InterMeshEdgeDetectionPass.js.map +1 -1
  116. package/dist/utilities/CanvasStack/CanvasOperations.d.ts.map +1 -1
  117. package/dist/utilities/CanvasStack/CanvasOperations.js +34 -13
  118. package/dist/utilities/CanvasStack/CanvasOperations.js.map +1 -1
  119. package/dist/utilities/CanvasStack/CanvasStack.d.ts +9 -0
  120. package/dist/utilities/CanvasStack/CanvasStack.d.ts.map +1 -1
  121. package/dist/utilities/CanvasStack/CanvasStack.js +37 -2
  122. package/dist/utilities/CanvasStack/CanvasStack.js.map +1 -1
  123. package/dist/utilities/CanvasStack/RichTextRenderer.d.ts +2 -0
  124. package/dist/utilities/CanvasStack/RichTextRenderer.d.ts.map +1 -1
  125. package/dist/utilities/CanvasStack/RichTextRenderer.js +47 -4
  126. package/dist/utilities/CanvasStack/RichTextRenderer.js.map +1 -1
  127. package/package.json +1 -1
  128. package/src/library/components/DemoWrapper.tsx +1 -1
  129. package/src/library/components/FullScreenGalleryDisplay.tsx +5 -0
  130. package/src/library/components/Gallery/AnimationController.ts +10 -0
  131. package/src/library/components/Gallery/BuiltItem.ts +16 -3
  132. package/src/library/components/Gallery/GalleryController.ts +15 -4
  133. package/src/library/components/Gallery/GalleryViewer.tsx +17 -3
  134. package/src/library/components/InlineGalleryDisplay.tsx +5 -0
  135. package/src/library/components/Playground.tsx +76 -20
  136. package/src/library/components/ServerTrustMatchViewer.tsx +10 -2
  137. package/src/library/components/SparkLineChart.tsx +85 -24
  138. package/src/library/components/Viewer.tsx +15 -6
  139. package/src/library/game/Chit.test.ts +91 -0
  140. package/src/library/game/Chit.ts +122 -9
  141. package/src/library/game/Connection.ts +27 -8
  142. package/src/library/game/ConnectionTransport.ts +38 -0
  143. package/src/library/game/GalleryItemChitChildrenSource.ts +9 -1
  144. package/src/library/game/Game.ts +7 -0
  145. package/src/library/game/OrderedOutlet.ts +27 -4
  146. package/src/library/game/Pick.ts +46 -4
  147. package/src/library/game/Prompt.ts +43 -3
  148. package/src/library/game/Turn.ts +127 -78
  149. package/src/library/game/badAiTransport/BadAIClientPrompts.ts +33 -4
  150. package/src/library/game/clientTransport/ClientPrompts.ts +50 -16
  151. package/src/library/game/clientTransport/ClientTime.ts +61 -56
  152. package/src/library/game/serverTransport/ServerPrompts.ts +25 -7
  153. package/src/library/game/serverTransport/ServerStatus.ts +6 -2
  154. package/src/library/game/serverTransport/ServerTime.ts +6 -2
  155. package/src/library/hooks/useTimeController.tsx +3 -0
  156. package/src/library/hooks/useWebGlRenderer.tsx +225 -7
  157. package/src/library/index.ts +1 -1
  158. package/src/library/rendering/ChitGalleryItemInstance.ts +1 -1
  159. package/src/library/rendering/ChitRenderInstance.ts +32 -9
  160. package/src/library/rendering/ChitRenderSpec.ts +1 -1
  161. package/src/library/rendering/outline/IDBasedOutlinePass.ts +6 -2
  162. package/src/library/rendering/outline/passes/InterMeshEdgeDetectionPass.ts +7 -3
  163. package/src/library/utilities/CanvasStack/CanvasOperations.tsx +44 -13
  164. package/src/library/utilities/CanvasStack/CanvasStack.ts +38 -1
  165. package/src/library/utilities/CanvasStack/RichTextRenderer.ts +66 -5
@@ -17,6 +17,45 @@ export const ORDERED_CHILDREN = "orderedChildren";
17
17
  const EXTRA_SERIALIZATION_PROPS_ARRAY = ["id", "_parent", "_parentOutlet", "_parentOutletIndex", "_parentFallback"];
18
18
  const EXTRA_SERIALIZATION_PROPS_SET = new Set(EXTRA_SERIALIZATION_PROPS_ARRAY);
19
19
 
20
+ const dirtyProxyCache = new WeakMap<object, object>();
21
+
22
+ function wrapWithDirtyProxy(value: any, chit: Chit): any {
23
+ if (value === null || value === undefined) return value;
24
+ if (typeof value !== "object") return value;
25
+ if (value instanceof Chit || value instanceof OrderedOutlet) return value;
26
+
27
+ const existing = dirtyProxyCache.get(value);
28
+ if (existing) return existing;
29
+
30
+ const proxy = new Proxy(value, {
31
+ set(target, prop, newValue) {
32
+ if (typeof newValue === "object" && newValue !== null && !(newValue instanceof Chit) && !(newValue instanceof OrderedOutlet)) {
33
+ target[prop] = newValue;
34
+ } else {
35
+ target[prop] = newValue;
36
+ }
37
+ chit.markDirty();
38
+ return true;
39
+ },
40
+ deleteProperty(target, prop) {
41
+ delete target[prop];
42
+ chit.markDirty();
43
+ return true;
44
+ },
45
+ get(target, prop) {
46
+ const val = target[prop];
47
+ if (typeof val === "function") return val.bind(target);
48
+ if (typeof val === "object" && val !== null && !(val instanceof Chit) && !(val instanceof OrderedOutlet)) {
49
+ return wrapWithDirtyProxy(val, chit);
50
+ }
51
+ return val;
52
+ },
53
+ });
54
+
55
+ dirtyProxyCache.set(value, proxy);
56
+ return proxy;
57
+ }
58
+
20
59
  export type ChitClick = () => void;
21
60
  export type ChitDrag = (dropOn: Chit) => void;
22
61
 
@@ -102,6 +141,7 @@ export class Chit extends ObjectWithProps {
102
141
  }
103
142
  public set parentFallback(newValue: Chit | undefined) {
104
143
  this._parentFallback = newValue;
144
+ this.markDirty();
105
145
  }
106
146
 
107
147
  @NonEditable private _lastParent?: Chit;
@@ -151,6 +191,24 @@ export class Chit extends ObjectWithProps {
151
191
  @NonEditable private _version = 0;
152
192
  @NonEditable private _createdOrder = ++CHIT_CREATED_ORDER;
153
193
 
194
+ /** @internal */
195
+ @NonEditable public _dirty = true;
196
+ @NonEditable private _lastSerialized?: string;
197
+ @NonEditable private _instrumented = false;
198
+
199
+ /** @internal */
200
+ public markDirty() {
201
+ const wasDirty = this._dirty;
202
+ this._dirty = true;
203
+ if (!wasDirty || !this.id) {
204
+ try {
205
+ this.currentTurn.notifyChitDirty(this);
206
+ } catch {
207
+ // no current turn yet — chit will be discovered when parented
208
+ }
209
+ }
210
+ }
211
+
154
212
  /** @internal */
155
213
  public get version() {
156
214
  return this._version;
@@ -345,7 +403,10 @@ export class Chit extends ObjectWithProps {
345
403
 
346
404
  public setParent(newValue?: Chit, parentOutlet?: string, parentOutletIndex?: number) {
347
405
  if (this._parent === newValue && this._parentOutlet === parentOutlet) {
348
- this._parentOutletIndex = parentOutletIndex;
406
+ if (this._parentOutletIndex !== parentOutletIndex) {
407
+ this._parentOutletIndex = parentOutletIndex;
408
+ this.markDirty();
409
+ }
349
410
  return;
350
411
  }
351
412
 
@@ -353,23 +414,24 @@ export class Chit extends ObjectWithProps {
353
414
  this._lastParent = this._parent;
354
415
  }
355
416
 
417
+ const oldParent = this._parent;
418
+
356
419
  if (this._parent) {
357
420
  if (!this._parentOutlet) {
358
421
  throw new Error("Cannot have a parent without a parent outlet");
359
422
  }
360
423
 
361
- const oldParent = this._parent as unknown as any,
362
- oldOutlet = this._parentOutlet;
424
+ const oldOutlet = this._parentOutlet;
363
425
 
364
426
  this._parent = undefined;
365
427
  this._parentOutlet = undefined;
366
428
  this._parentOutletIndex = undefined;
367
429
 
368
- oldParent.children = oldParent.children.filter((c: Chit) => c !== this);
430
+ (oldParent as any).children = (oldParent as any).children.filter((c: Chit) => c !== this);
369
431
 
370
- const existingParentOutletValue = oldParent[oldOutlet];
432
+ const existingParentOutletValue = (oldParent as any)[oldOutlet];
371
433
  if (existingParentOutletValue === this) {
372
- oldParent[oldOutlet] = undefined;
434
+ (oldParent as any)[oldOutlet] = undefined;
373
435
  } else if (existingParentOutletValue instanceof OrderedOutlet) {
374
436
  existingParentOutletValue.remove(this);
375
437
  }
@@ -388,6 +450,10 @@ export class Chit extends ObjectWithProps {
388
450
  }
389
451
  }
390
452
 
453
+ this.markDirty();
454
+ if (oldParent) oldParent.markDirty();
455
+ if (newValue) newValue.markDirty();
456
+
391
457
  this.notifyChange("parent");
392
458
  }
393
459
 
@@ -490,6 +556,9 @@ export class Chit extends ObjectWithProps {
490
556
 
491
557
  this.setParent(inflateValue(j._parent), j._parentOutlet, j._parentOutletIndex);
492
558
  }
559
+
560
+ this.markDirty();
561
+ this._lastSerialized = undefined;
493
562
  }
494
563
 
495
564
  /**
@@ -501,9 +570,43 @@ export class Chit extends ObjectWithProps {
501
570
  return undefined;
502
571
  }
503
572
 
573
+ private instrumentForDirtyTracking() {
574
+ if (this._instrumented) return;
575
+ this._instrumented = true;
576
+
577
+ for (const key of this.serializationProps) {
578
+ const descriptor = Object.getOwnPropertyDescriptor(this, key);
579
+ if (descriptor && (descriptor.get || descriptor.set)) continue;
580
+
581
+ let value = (this as any)[key];
582
+ Object.defineProperty(this, key, {
583
+ enumerable: true,
584
+ configurable: true,
585
+ get: () => {
586
+ if (typeof value === "object" && value !== null && !(value instanceof Chit) && !(value instanceof OrderedOutlet)) {
587
+ return wrapWithDirtyProxy(value, this);
588
+ }
589
+ return value;
590
+ },
591
+ set: (newValue: any) => {
592
+ if (newValue !== value) {
593
+ value = newValue;
594
+ this.markDirty();
595
+ }
596
+ },
597
+ });
598
+ }
599
+ }
600
+
504
601
  /** @internal */
505
602
  public serialize(playerIds?: string[]): string {
506
- return JSON.stringify(
603
+ this.instrumentForDirtyTracking();
604
+
605
+ if (!this._dirty && this._lastSerialized !== undefined) {
606
+ return this._lastSerialized;
607
+ }
608
+
609
+ const result = JSON.stringify(
507
610
  this.serializationProps.reduce(
508
611
  (acc, key) => {
509
612
  const value = (this as any)[key];
@@ -516,6 +619,10 @@ export class Chit extends ObjectWithProps {
516
619
  } as { [key: string]: any },
517
620
  ),
518
621
  );
622
+
623
+ this._dirty = false;
624
+ this._lastSerialized = result;
625
+ return result;
519
626
  }
520
627
 
521
628
  //
@@ -601,14 +708,20 @@ export class Chit extends ObjectWithProps {
601
708
  return result;
602
709
  }
603
710
 
711
+ /**
712
+ * Creates a DragPick options for the chit(s). Create an array of DragTargets that these chits can be dropped on.
713
+ * @param chit A single chit, an array of chits (that can be empty-ish or nullish and ignored), or an OrderedOutlet of chits
714
+ * @param targets An array of DragTargets that the chits can be dropped on
715
+ * @returns A DragPick instance configured with the specified chits and targets
716
+ */
604
717
  public static dragPick<T extends Chit>(
605
718
  chit: T | (T | undefined | null | false)[] | OrderedOutlet<T>,
606
- targets: DragTarget<any, T>[],
719
+ targets: DragTarget<any, T> | DragTarget<any, T>[],
607
720
  ) {
608
721
  const result = new DragPick<T>();
609
722
  result.chits =
610
723
  chit instanceof OrderedOutlet ? chit.copy() : Array.isArray(chit) ? (chit.filter((c) => c) as T[]) : [chit];
611
- result.dropTargets = targets;
724
+ result.dropTargets = Array.isArray(targets) ? targets : [targets];
612
725
  return result;
613
726
  }
614
727
 
@@ -12,6 +12,7 @@ type Message = {
12
12
  };
13
13
 
14
14
  export class Connection {
15
+ private disposed = false;
15
16
  private requestCounter = 0;
16
17
  private actualConnectionObjects: ConnectionObject[] = [];
17
18
  private registry: { [name: string]: object } = {};
@@ -19,7 +20,12 @@ export class Connection {
19
20
  private unprocessableMessages: Message[] = [];
20
21
 
21
22
  constructor(public transport: ConnectionTransport) {
22
- this.transport.onReceiveMessage((message) => this.handleMessage(message));
23
+ this.transport.onReceiveMessage((message) => {
24
+ if (this.disposed) {
25
+ return;
26
+ }
27
+ this.handleMessage(message);
28
+ });
23
29
  }
24
30
 
25
31
  handleMessage(message: Message) {
@@ -30,6 +36,7 @@ export class Connection {
30
36
  if (!resolve) {
31
37
  throw new Error("Cannot find requestId");
32
38
  }
39
+ delete this.requestRegistry[requestId];
33
40
 
34
41
  if (errorMessage) {
35
42
  reject(errorMessage);
@@ -68,6 +75,9 @@ export class Connection {
68
75
  }
69
76
 
70
77
  dispose() {
78
+ this.disposed = true;
79
+ Object.values(this.requestRegistry).forEach(({ reject }) => reject("Connection disposed"));
80
+ this.requestRegistry = {};
71
81
  this.actualConnectionObjects.forEach((conn) => conn.dispose());
72
82
  }
73
83
 
@@ -97,19 +107,28 @@ export class Connection {
97
107
  {
98
108
  get: (target, prop) => {
99
109
  return (...args: any) => {
110
+ if (this.disposed) {
111
+ return Promise.reject("Connection disposed");
112
+ }
113
+
100
114
  const fnName = prop;
101
115
  const requestId = this.requestCounter++;
102
116
  const result = new Promise((resolve, reject) => {
103
117
  this.requestRegistry[requestId] = { resolve, reject };
104
118
  });
105
119
 
106
- this.transport.sendMessage({
107
- name,
108
- fnName,
109
- requestId,
110
- args,
111
- isResponse: false,
112
- });
120
+ try {
121
+ this.transport.sendMessage({
122
+ name,
123
+ fnName,
124
+ requestId,
125
+ args,
126
+ isResponse: false,
127
+ });
128
+ } catch (e) {
129
+ delete this.requestRegistry[requestId];
130
+ return Promise.reject(e);
131
+ }
113
132
 
114
133
  return result;
115
134
  };
@@ -3,18 +3,28 @@ import { EventChannel } from "../utilities/EventChannel";
3
3
  export interface ConnectionTransport {
4
4
  sendMessage(message: any): void;
5
5
  onReceiveMessage(cb: (message: any) => void): () => void;
6
+ onReconnect(cb: (transport: ConnectionTransport) => void): () => void;
6
7
  connected: EventChannel<boolean>;
7
8
  }
8
9
 
9
10
  const LOCAL_LATENCY_SIMULATION = 50;
10
11
 
11
12
  export class LocalConnectionTransport implements ConnectionTransport {
13
+ disposed = false;
12
14
  public connected = new EventChannel(false);
13
15
  private cbs: ((message: any) => void)[] = [];
14
16
  private connectedTransport?: LocalConnectionTransport;
15
17
 
16
18
  private queue: (() => void)[] = [];
17
19
 
20
+ private reconnectCallbacks: Set<(transport: ConnectionTransport) => void> = new Set();
21
+ onReconnect(cb: (transport: ConnectionTransport) => void): () => void {
22
+ this.reconnectCallbacks.add(cb);
23
+ return () => {
24
+ this.reconnectCallbacks.delete(cb);
25
+ };
26
+ }
27
+
18
28
  connect(transport: LocalConnectionTransport) {
19
29
  this.connectedTransport = transport;
20
30
  transport.connectedTransport = this;
@@ -22,6 +32,9 @@ export class LocalConnectionTransport implements ConnectionTransport {
22
32
  }
23
33
 
24
34
  sendMessage(message: any): void {
35
+ if (this.disposed) {
36
+ throw new Error("Connection closed?");
37
+ }
25
38
  if (!this.connectedTransport) {
26
39
  throw new Error("Not connected");
27
40
  }
@@ -37,13 +50,38 @@ export class LocalConnectionTransport implements ConnectionTransport {
37
50
  }
38
51
 
39
52
  processMessageOnQueue() {
53
+ if (this.disposed) {
54
+ return;
55
+ }
40
56
  const cb = this.queue.shift();
41
57
  if (cb) {
42
58
  cb();
43
59
  }
44
60
  }
45
61
 
62
+ simulateDisconnect(durationMs: number = 2000) {
63
+ this.disposed = true;
64
+ const peer = this.connectedTransport;
65
+ this.connected.value = false;
66
+
67
+ setTimeout(() => {
68
+ // Create fresh transport pair
69
+ const newClient = new LocalConnectionTransport();
70
+ const newServer = new LocalConnectionTransport();
71
+ newClient.connect(newServer);
72
+
73
+ // Notify client listeners with new client transport
74
+ this.reconnectCallbacks.forEach((cb) => cb(newClient));
75
+ // Notify server listeners with new server transport so match can reconnect
76
+ peer?.reconnectCallbacks.forEach((cb) => cb(newServer));
77
+ }, durationMs);
78
+ }
79
+
46
80
  onReceiveMessage(cb: (message: any) => void): () => void {
81
+ if (this.disposed) {
82
+ return () => {};
83
+ }
84
+
47
85
  this.cbs.push(cb);
48
86
  return () => {
49
87
  this.cbs = this.cbs.filter((c) => c !== cb);
@@ -19,7 +19,15 @@ export class GalleryItemChitChildrenSource implements GalleryItemSource {
19
19
 
20
20
  get items(): GalleryItem[] {
21
21
  const children = this.backingObject.children.concat();
22
- children.sort((a, b) => a.createdOrder - b.createdOrder);
22
+ children.sort((a, b) => {
23
+ if (a.parentOutlet !== b.parentOutlet) {
24
+ return (a.parentOutlet ?? "").localeCompare(b.parentOutlet ?? "");
25
+ }
26
+ if (a.parentOutletIndex !== b.parentOutletIndex) {
27
+ return (a.parentOutletIndex ?? 0) - (b.parentOutletIndex ?? 0);
28
+ }
29
+ return a.createdOrder - b.createdOrder;
30
+ });
23
31
  return chitsToGalleryItems(children);
24
32
  }
25
33
 
@@ -54,4 +54,11 @@ export interface Game<P extends PlayerChit, R extends RootChit<P>> {
54
54
  * @param spec
55
55
  */
56
56
  renderDefaultRootChit?(spec: ChitRenderSpec): void;
57
+
58
+ /**
59
+ * Useful to help the bad AI demo pick more interesting picks. This function should return a multiplier for the weight of a given pick, where the weight is determined by the type of pick (e.g. ButtonPick is 1, ChitPick is the number of chits that can be picked, DragPick is the number of targets that can be dragged to). The picks parameter is the full list of picks available, and the pick parameter is the specific pick we are calculating the weight for.
60
+ * @param picks The list of available pickes
61
+ * @param pick the pick we are looking at
62
+ */
63
+ demoPickWeight?(picks: any[], pick: any): number;
57
64
  }
@@ -41,12 +41,23 @@ export class OrderedOutlet<C extends Chit> {
41
41
  /** @internal */
42
42
  public deserialize(chits: C[]) {
43
43
  this.chits = chits;
44
+ if (this.parent) this.parent.markDirty();
44
45
  }
45
46
 
46
47
  public last(): C | undefined {
47
48
  return this.chits[this.chits.length - 1];
48
49
  }
49
50
 
51
+ public insert(c: C, i: number) {
52
+ if (this.parent?.isDeserializing) {
53
+ return;
54
+ }
55
+ c.setParent();
56
+
57
+ this.chits.splice(i, 0, c);
58
+ this.fixOrder();
59
+ }
60
+
50
61
  public add(c: C) {
51
62
  if (this.parent?.isDeserializing) {
52
63
  return;
@@ -54,7 +65,6 @@ export class OrderedOutlet<C extends Chit> {
54
65
  c.setParent();
55
66
 
56
67
  this.chits.push(c);
57
- this.fixSort();
58
68
  this.fixOrder();
59
69
  }
60
70
 
@@ -71,7 +81,6 @@ export class OrderedOutlet<C extends Chit> {
71
81
  c.forEach((c) => c.setParent());
72
82
  c.forEach((c) => this.chits.push(c));
73
83
  }
74
- this.fixSort();
75
84
  this.fixOrder();
76
85
  }
77
86
 
@@ -97,6 +106,18 @@ export class OrderedOutlet<C extends Chit> {
97
106
  return this.chits.find(cb);
98
107
  }
99
108
 
109
+ public findLastIndex(cb: (c: C) => boolean): number {
110
+ return this.chits.findLastIndex(cb);
111
+ }
112
+
113
+ public findLast(cb: (c: C) => boolean): C | undefined {
114
+ const index = this.chits.findLastIndex(cb);
115
+ if (index === -1) {
116
+ return undefined;
117
+ }
118
+ return this.chits[index];
119
+ }
120
+
100
121
  public map<D>(cb: (c: C) => D): D[] {
101
122
  return this.chits.map(cb);
102
123
  }
@@ -187,12 +208,14 @@ export class OrderedOutlet<C extends Chit> {
187
208
  }
188
209
 
189
210
  private fixOrder() {
211
+ if (this.parent) this.parent.markDirty();
190
212
  this.chits.forEach((c, i) => {
191
213
  c.setParent(this.parent, this.outletName, i);
192
214
  });
193
215
  }
194
216
 
195
- private fixSort() {
196
- // do nothing by default?
217
+ public sort(compareFn?: (a: C, b: C) => number) {
218
+ this.chits.sort(compareFn);
219
+ this.fixOrder();
197
220
  }
198
221
  }
@@ -36,6 +36,8 @@ export abstract class Pick {
36
36
  // do nothing
37
37
  }
38
38
 
39
+ /** @internal */
40
+ abstract canResolveResponse(value: any): boolean;
39
41
  /** @internal */
40
42
  abstract serializeDetails(): any;
41
43
  /** @internal */
@@ -50,6 +52,13 @@ export abstract class Pick {
50
52
  abstract autoResolve(): Promise<void | undefined>;
51
53
  /** @internal */
52
54
  abstract numberOfChoices(): number;
55
+ /** @internal */
56
+ public canStageInEarly = 0;
57
+
58
+ stageInEarly(steps: number): this {
59
+ this.canStageInEarly = steps;
60
+ return this;
61
+ }
53
62
 
54
63
  /** @internal */
55
64
  canAutoResolve() {
@@ -196,6 +205,11 @@ export class ChitPick<T extends Chit> extends Pick {
196
205
  }
197
206
  }
198
207
 
208
+ /** @internal */
209
+ canResolveResponse(chitId: string): boolean {
210
+ return this.chits.some((chit) => chit.id === chitId);
211
+ }
212
+
199
213
  /** @internal */
200
214
  resolveDetails(chitId: string) {
201
215
  const selectedChit = this.chits.find((chit) => chit.id === chitId);
@@ -205,6 +219,9 @@ export class ChitPick<T extends Chit> extends Pick {
205
219
  return Promise.resolve(this.cb(selectedChit));
206
220
  }
207
221
 
222
+ /** @internal */
223
+ _unsub?: () => void;
224
+
208
225
  /** @internal */
209
226
  stageIn(prompt: PickPrompt) {
210
227
  this.chits.forEach((c) => (c.onClick = () => prompt.resolvePick(this, c.id)));
@@ -212,10 +229,22 @@ export class ChitPick<T extends Chit> extends Pick {
212
229
  this.button?.computeItemSource(this);
213
230
  if (this.button?.autoShow && this.button?.galleryItemSource) {
214
231
  const inline = localStorage.galleryFullScreen !== `"modal"`; // hacky but maybe okay
215
- this.closeGallery = this.chits[0]?.renderInstance?.rootRenderInstance.showGallery(
216
- this.button.galleryItemSource,
217
- inline,
218
- );
232
+ if (this.chits[0]) {
233
+ const chit = this.chits[0];
234
+
235
+ const source = this.button.galleryItemSource;
236
+ if (chit.renderInstance) {
237
+ this.closeGallery = chit.renderInstance.rootRenderInstance.showGallery(source, inline);
238
+ } else {
239
+ this._unsub = chit.onChange("renderInstance", () => {
240
+ if (chit.renderInstance) {
241
+ this.closeGallery = chit.renderInstance.rootRenderInstance.showGallery(source, inline);
242
+ }
243
+ this._unsub?.();
244
+ this._unsub = undefined;
245
+ });
246
+ }
247
+ }
219
248
  }
220
249
  }
221
250
 
@@ -228,6 +257,8 @@ export class ChitPick<T extends Chit> extends Pick {
228
257
  if (this.button instanceof ToggleGalleryButton && this.button?.galleryItemSource) {
229
258
  this.chits[0]?.renderInstance?.rootRenderInstance.hideGallery(this.button.galleryItemSource);
230
259
  }
260
+ this._unsub?.();
261
+ this._unsub = undefined;
231
262
  }
232
263
 
233
264
  /** @internal */
@@ -294,6 +325,12 @@ export class DragPick<C extends Chit> extends Pick {
294
325
  });
295
326
  }
296
327
 
328
+ /** @internal */
329
+ canResolveResponse(value: { chitId: string; targetChitId: string }): boolean {
330
+ if (!value || !this.chits.some((chit) => chit.id === value.chitId)) return false;
331
+ return this.dropTargets.some((dt) => dt.chits.some((chit) => chit.id === value.targetChitId));
332
+ }
333
+
297
334
  /** @internal */
298
335
  resolveDetails({ chitId, targetChitId }: { chitId: string; targetChitId: string }): Promise<void> {
299
336
  const selectedChit = this.chits.find((chit) => chit.id === chitId);
@@ -384,6 +421,11 @@ export class ButtonPick extends Pick {
384
421
  this.button.deserialize(state, findChit);
385
422
  }
386
423
 
424
+ /** @internal */
425
+ canResolveResponse(): boolean {
426
+ return !!this.button;
427
+ }
428
+
387
429
  /** @internal */
388
430
  resolveDetails() {
389
431
  if (!this.button) {
@@ -1,15 +1,17 @@
1
1
  import { Chit } from "./Chit";
2
2
  import { IButtonLibrary } from "./Game";
3
3
  import { Confirm, GameButton } from "./GameButton";
4
- import { ButtonPick, ChitPick, Pick } from "./Pick";
4
+ import { ButtonPick, ChitPick, Pick, PickType } from "./Pick";
5
5
  import { MismatchError, Turn } from "./Turn";
6
6
 
7
7
  type PromptType = "PickPrompt" | "NoValidMovesPrompt";
8
8
 
9
9
  export type PromptSerialization = {
10
+ id: string;
10
11
  type: PromptType;
11
12
  canReset: boolean;
12
13
  details: any;
14
+ canStageInEarly: number;
13
15
  };
14
16
 
15
17
  const defaultFindChit: FindChit = () => {
@@ -35,13 +37,22 @@ export abstract class Prompt {
35
37
 
36
38
  serialize(): PromptSerialization {
37
39
  return {
40
+ id: this.id,
38
41
  type: this.type,
39
42
  canReset: this.canReset,
43
+ canStageInEarly: this.canStageInEarly,
40
44
  details: this.serializeDetails(),
41
45
  };
42
46
  }
43
47
 
48
+ private serializationThatCreatedThisPrompt?: PromptSerialization;
49
+ isSameSerialization(promptSpec: PromptSerialization) {
50
+ return this.serializationThatCreatedThisPrompt === promptSpec;
51
+ }
52
+
44
53
  deserialize(prompt: PromptSerialization) {
54
+ this.serializationThatCreatedThisPrompt = prompt;
55
+ this.id = prompt.id;
45
56
  this.canReset = prompt.canReset;
46
57
  this.deserializeDetails(prompt.details);
47
58
  }
@@ -71,7 +82,11 @@ export abstract class Prompt {
71
82
  this.cbs.forEach((cb) => cb(false));
72
83
  }
73
84
 
85
+ get canStageInEarly() {
86
+ return 0;
87
+ }
74
88
  abstract get type(): PromptType;
89
+ abstract canResolveResponse(response: any): boolean;
75
90
  abstract serializeDetails(): any;
76
91
  abstract deserializeDetails(state: any): void;
77
92
  abstract resolveDetails(details: any): void;
@@ -137,6 +152,10 @@ export class NoValidMovesPrompt extends Prompt {
137
152
  this._help = newHelp;
138
153
  }
139
154
 
155
+ canResolveResponse(): boolean {
156
+ return false;
157
+ }
158
+
140
159
  serializeDetails(): any {
141
160
  return {
142
161
  message: this._message,
@@ -158,7 +177,7 @@ export class NoValidMovesPrompt extends Prompt {
158
177
  stageOut(): void {}
159
178
  }
160
179
 
161
- type PickResolution = { idx: number; value: any };
180
+ type PickResolution = { idx: number; value: any; pickType?: PickType };
162
181
 
163
182
  export class PickPrompt extends Prompt {
164
183
  type: PromptType = "PickPrompt";
@@ -169,6 +188,10 @@ export class PickPrompt extends Prompt {
169
188
  public picks: Pick[] = [];
170
189
  public finished: () => void | Promise<void> = () => {};
171
190
 
191
+ override get canStageInEarly() {
192
+ return Math.max(0, ...this.picks.map((p) => p.canStageInEarly));
193
+ }
194
+
172
195
  override get message() {
173
196
  if (this._message) {
174
197
  return this._message;
@@ -191,6 +214,23 @@ export class PickPrompt extends Prompt {
191
214
  .join("\n\nor\n\n");
192
215
  }
193
216
 
217
+ canResolveResponse(response: any): boolean {
218
+ if (this.resolved) {
219
+ return false;
220
+ }
221
+ if (response?.idx === undefined) {
222
+ return false;
223
+ }
224
+ const pick = this.picks[response.idx];
225
+ if (!pick) {
226
+ return false;
227
+ }
228
+ if (response.pickType && response.pickType !== pick.type) {
229
+ return false;
230
+ }
231
+ return pick.canResolveResponse(response.value);
232
+ }
233
+
194
234
  async autoResolve(): Promise<boolean> {
195
235
  if (this.picks.length === 1 && this.picks[0].canAutoResolve()) {
196
236
  await this.picks[0].autoResolve();
@@ -215,7 +255,7 @@ export class PickPrompt extends Prompt {
215
255
 
216
256
  resolvePick(pick: Pick, value: any) {
217
257
  const idx = this.picks.indexOf(pick);
218
- this.resolve({ idx, value });
258
+ this.resolve({ idx, value, pickType: pick.type });
219
259
  }
220
260
 
221
261
  resolveDetails(resolution: PickResolution) {