@wodzik/cubecore 0.1.12 → 0.1.13

package/bluetooth/clock.d.ts

@@ -9,9 +9,21 @@
  */
 export declare class ClockSync {
     private readonly window;
+    private readonly jump;
     private samples;
-    /** @param window how many recent samples the offset is estimated from (the cube clock drifts slowly). */
-    constructor(window?: number);
+    /**
+     * @param window how many recent samples the offset is estimated from (the cube clock drifts slowly).
+     * @param jump a cube clock that lost time (GAN gen2's 16-bit move intervals roll over after
+     *   ~65 s idle): this many samples in a row that agree with each other (within `agree` ms)
+     *   and are all over `jumpMs` later than the offset — the cube clock jumped, start again
+     *   from them. A burst of late notifications (a backgrounded tab) doesn't agree: its
+     *   samples spread over the moves' real intervals.
+     */
+    constructor(window?: number, jump?: {
+        samples: number;
+        jumpMs: number;
+        agree: number;
+    });
     /** Offset (local − cube) estimated so far, or null before the first sample. */
     get offset(): number | null;
     /** Feed one event: its cube time and, if it has one, the local time it arrived. */

package/bluetooth/clock.js

@@ -9,10 +9,19 @@
  */
 export class ClockSync {
     window;
+    jump;
     samples = [];
-    /** @param window how many recent samples the offset is estimated from (the cube clock drifts slowly). */
-    constructor(window = 64) {
+    /**
+     * @param window how many recent samples the offset is estimated from (the cube clock drifts slowly).
+     * @param jump a cube clock that lost time (GAN gen2's 16-bit move intervals roll over after
+     *   ~65 s idle): this many samples in a row that agree with each other (within `agree` ms)
+     *   and are all over `jumpMs` later than the offset — the cube clock jumped, start again
+     *   from them. A burst of late notifications (a backgrounded tab) doesn't agree: its
+     *   samples spread over the moves' real intervals.
+     */
+    constructor(window = 64, jump = { samples: 5, jumpMs: 1000, agree: 200 }) {
         this.window = window;
+        this.jump = jump;
     }
     /** Offset (local − cube) estimated so far, or null before the first sample. */
     get offset() {
@@ -25,6 +34,14 @@ export class ClockSync {
         this.samples.push(localTime - cubeTime);
         if (this.samples.length > this.window)
             this.samples.shift();
+        const { samples: n, jumpMs, agree } = this.jump;
+        if (this.samples.length <= n)
+            return;
+        const recent = this.samples.slice(-n);
+        const best = Math.min(...this.samples.slice(0, -n));
+        const lo = Math.min(...recent);
+        if (lo - best > jumpMs && Math.max(...recent) - lo <= agree)
+            this.samples = recent;
     }
     /** The cube time on the page's clock (null until an offset is known). */
     toLocal(cubeTime) {

package/bluetooth/vendor/smartcube-web-bluetooth/gan-cube-protocol.d.ts

@@ -202,6 +202,7 @@ declare class GanCubeClassicConnection implements GanCubeConnection, GanCubeRawC
 declare class GanGen2ProtocolDriver implements GanProtocolDriver {
     private lastSerial;
     private lastMoveTimestamp;
+    private hadMove;
     private cubeTimestamp;
     createCommandMessage(command: GanCubeCommand): Uint8Array | undefined;
     handleStateEvent(conn: GanCubeRawConnection, eventMessage: Uint8Array): Promise<GanCubeEvent[]>;

package/bluetooth/vendor/smartcube-web-bluetooth/gan-cube-protocol.js

@@ -124,6 +124,7 @@ class GanProtocolMessageView {
 class GanGen2ProtocolDriver {
     lastSerial = -1;
     lastMoveTimestamp = 0;
+    hadMove = false;
     cubeTimestamp = 0;
     createCommandMessage(command) {
         var msg = new Uint8Array(20).fill(0);
@@ -190,6 +191,14 @@ class GanGen2ProtocolDriver {
                         if (elapsed == 0) { // In case of 16-bit cube timestamp register overflow
                             elapsed = timestamp - this.lastMoveTimestamp;
                         }
+                        // After more than the 16-bit register holds (~65 s idle), the interval
+                        // before the first of these moves rolls over: the local one is right.
+                        // (cubecore: GAN i3 times ran a minute or more off after the cube lay idle)
+                        if (i == diff - 1 && this.hadMove) {
+                            const local = timestamp - this.lastMoveTimestamp;
+                            if (local > 0xFFFF && elapsed < local)
+                                elapsed = local;
+                        }
                         this.cubeTimestamp += elapsed;
                         cubeEvents.push({
                             type: "MOVE",
@@ -203,6 +212,7 @@ class GanGen2ProtocolDriver {
                         });
                     }
                     this.lastMoveTimestamp = timestamp;
+                    this.hadMove = true;
                 }
             }
         }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "A 3×3×3 cube library for the web, built around smart (Bluetooth) cubes: state, notation, methods, solvers and scrambles, a three.js renderer with skins, pictures, web components, React bindings.",
   "license": "MPL-2.0",
   "author": "Tomasz Wodzikowski <wodziszczakow@gmail.com>",