cubing 0.41.0 → 0.41.1

package/dist/esm/bluetooth/index.js

@@ -1,17 +1,17 @@
 import {
   binaryComponentsToReid3x3x3,
   twizzleBinaryToBinaryComponents
-} from "../chunk-2MAPPPWG.js";
+} from "../chunk-3B5ND2Z3.js";
 import {
   cube3x3x3,
   puzzles
-} from "../chunk-BTVDGT5H.js";
+} from "../chunk-Q7UVEISQ.js";
 import {
   experimental3x3x3KPuzzle
-} from "../chunk-SNYTAYI2.js";
+} from "../chunk-H66X47MG.js";
 import {
   KPattern
-} from "../chunk-F72PPD54.js";
+} from "../chunk-V4YTFIKT.js";
 import {
   Alg,
   Move,
@@ -95,8 +95,8 @@ var BluetoothPuzzle = class extends EventTarget {
   }
   // TODO: Can we make this reutrn (async) on success?
   // TODO: require subclasses to implement this?
-  async getState() {
-    throw new Error("cannot get state");
+  async getPattern() {
+    throw new Error("cannot get pattern");
   }
   addAlgLeafListener(listener) {
     this.listeners.push(listener);
@@ -139,7 +139,7 @@ var KeyboardPuzzle = class extends BluetoothPuzzle {
     super();
     this.target = target;
     this.puzzle = puzzles["3x3x3"].kpuzzle();
-    this.state = (async () => (await this.puzzle).startState())();
+    this.pattern = (async () => (await this.puzzle).defaultPattern())();
     this.listener = this.onKeyDown.bind(this);
     target.addEventListener("keydown", this.listener);
   }
@@ -149,8 +149,8 @@ var KeyboardPuzzle = class extends BluetoothPuzzle {
   disconnect() {
     this.target.removeEventListener("keydown", this.listener);
   }
-  async getState() {
-    return this.state;
+  async getPattern() {
+    return this.pattern;
   }
   async onKeyDown(e) {
     if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
@@ -158,12 +158,12 @@ var KeyboardPuzzle = class extends BluetoothPuzzle {
     }
     const algLeaf = keyToMove(e);
     if (algLeaf) {
-      const newState = (await this.state).applyAlg(new Alg([algLeaf]));
-      this.state = Promise.resolve(newState);
+      const newPattern = (await this.pattern).applyAlg(new Alg([algLeaf]));
+      this.pattern = Promise.resolve(newPattern);
       this.dispatchAlgLeaf({
         latestAlgLeaf: algLeaf,
         timeStamp: e.timeStamp,
-        state: newState
+        pattern: newPattern
       });
       e.preventDefault();
     }
@@ -335,7 +335,7 @@ var key11 = new Uint8Array([
   1,
   241
 ]);
-async function decryptState(data, aesKey) {
+async function decryptPattern(data, aesKey) {
   if (aesKey === null) {
     return data;
   }
@@ -348,7 +348,7 @@ async function decryptState(data, aesKey) {
   if (probablyDecodedCorrectly(copy)) {
     return copy;
   }
-  throw new Error("Invalid Gan cube state");
+  throw new Error("Invalid Gan cube pattern");
 }
 var PhysicalState = class _PhysicalState {
   constructor(dataView, timeStamp) {
@@ -361,7 +361,7 @@ var PhysicalState = class _PhysicalState {
     }
   }
   static async read(characteristic, aesKey) {
-    const value = await decryptState(
+    const value = await decryptPattern(
       new Uint8Array((await characteristic.readValue()).buffer),
       aesKey
     );
@@ -520,7 +520,7 @@ var GanCube = class _GanCube extends BluetoothPuzzle {
     this.aesKey = aesKey;
     this.INTERVAL_MS = DEFAULT_INTERVAL_MS;
     this.intervalHandle = null;
-    this.state = kpuzzle.startState();
+    this.pattern = kpuzzle.defaultPattern();
     this.startTrackingMoves();
   }
   // We have to perform async operations before we call the constructor.
@@ -577,12 +577,12 @@ var GanCube = class _GanCube extends BluetoothPuzzle {
       numInterveningMoves = MAX_LATEST_MOVES;
     }
     for (const move of physicalState.latestMoves(numInterveningMoves)) {
-      this.state = this.state.applyMove(move);
+      this.pattern = this.pattern.applyMove(move);
       this.dispatchAlgLeaf({
         latestAlgLeaf: move,
         timeStamp: physicalState.timeStamp,
         debug: physicalState.debugInfo(),
-        state: this.state
+        pattern: this.pattern
         // quaternion: physicalState.rotQuat(),
       });
     }
@@ -597,8 +597,8 @@ var GanCube = class _GanCube extends BluetoothPuzzle {
       await this.readActualAngleAndBatteryCharacteristic()
     )[7];
   }
-  async getState() {
-    const arr = await decryptState(
+  async getPattern() {
+    const arr = await decryptPattern(
       new Uint8Array(await this.readFaceletStatus1Characteristic()),
       this.aesKey
     );
@@ -610,7 +610,7 @@ var GanCube = class _GanCube extends BluetoothPuzzle {
         v >>= 3;
       }
     }
-    const stateData = {
+    const patternData = {
       CORNERS: {
         pieces: [],
         orientation: []
@@ -628,15 +628,15 @@ var GanCube = class _GanCube extends BluetoothPuzzle {
     };
     for (const cornerMapping of gan356iCornerMappings) {
       const pieceInfo = pieceMap[cornerMapping.map((i) => faceOrder[stickers[i]]).join("")];
-      stateData.CORNERS.pieces.push(pieceInfo.piece);
-      stateData.CORNERS.orientation.push(pieceInfo.orientation);
+      patternData.CORNERS.pieces.push(pieceInfo.piece);
+      patternData.CORNERS.orientation.push(pieceInfo.orientation);
     }
     for (const edgeMapping of gan356iEdgeMappings) {
       const pieceInfo = pieceMap[edgeMapping.map((i) => faceOrder[stickers[i]]).join("")];
-      stateData.EDGES.pieces.push(pieceInfo.piece);
-      stateData.EDGES.orientation.push(pieceInfo.orientation);
+      patternData.EDGES.pieces.push(pieceInfo.piece);
+      patternData.EDGES.orientation.push(pieceInfo.orientation);
     }
-    return new KPattern(this.kpuzzle, stateData);
+    return new KPattern(this.kpuzzle, patternData);
   }
   async faceletStatus1Characteristic() {
     this.cachedFaceletStatus1Characteristic = this.cachedFaceletStatus1Characteristic || this.service.getCharacteristic(UUIDs.faceletStatus1Characteristic);
@@ -775,7 +775,7 @@ var lookup = [
   171,
   41
 ];
-function decryptState2(data) {
+function decryptState(data) {
   const offset1 = getNibble(data, 38);
   const offset2 = getNibble(data, 39);
   const output = new Uint8Array(MESSAGE_LENGTH);
@@ -788,7 +788,7 @@ async function decodeState(data) {
   if (!probablyEncrypted(data)) {
     return data;
   }
-  return decryptState2(data);
+  return decryptState(data);
 }
 var GiiKERCube = class _GiiKERCube extends BluetoothPuzzle {
   constructor(server, cubeCharacteristic, originalValue) {
@@ -822,7 +822,7 @@ var GiiKERCube = class _GiiKERCube extends BluetoothPuzzle {
   disconnect() {
     this.server.disconnect();
   }
-  async getState() {
+  async getPattern() {
     return this.toReid333(
       new Uint8Array((await this.cubeCharacteristic.readValue()).buffer)
     );
@@ -833,7 +833,7 @@ var GiiKERCube = class _GiiKERCube extends BluetoothPuzzle {
     return val[n] >> shift & 1;
   }
   toReid333(val) {
-    const state = {
+    const patternData = {
       EDGES: {
         pieces: new Array(12),
         orientation: new Array(12)
@@ -846,15 +846,15 @@ var GiiKERCube = class _GiiKERCube extends BluetoothPuzzle {
     };
     for (let i = 0; i < 12; i++) {
       const gi = epReid333toGiiKER[i];
-      state.EDGES.pieces[i] = epGiiKERtoReid333[getNibble(val, gi + 16) - 1];
-      state.EDGES.orientation[i] = this.getBit(val, gi + 112) ^ preEO[state.EDGES.pieces[i]] ^ postEO[i];
+      patternData.EDGES.pieces[i] = epGiiKERtoReid333[getNibble(val, gi + 16) - 1];
+      patternData.EDGES.orientation[i] = this.getBit(val, gi + 112) ^ preEO[patternData.EDGES.pieces[i]] ^ postEO[i];
     }
     for (let i = 0; i < 8; i++) {
       const gi = cpReid333toGiiKER[i];
-      state.CORNERS.pieces[i] = cpGiiKERtoReid333[getNibble(val, gi) - 1];
-      state.CORNERS.orientation[i] = (getNibble(val, gi + 8) * coFlip[gi] + preCO[state.CORNERS.pieces[i]] + postCO[i]) % 3;
+      patternData.CORNERS.pieces[i] = cpGiiKERtoReid333[getNibble(val, gi) - 1];
+      patternData.CORNERS.orientation[i] = (getNibble(val, gi + 8) * coFlip[gi] + preCO[patternData.CORNERS.pieces[i]] + postCO[i]) % 3;
     }
-    return new KPattern(experimental3x3x3KPuzzle, state);
+    return new KPattern(experimental3x3x3KPuzzle, patternData);
   }
   async onCubeCharacteristicChanged(event) {
     const val = await decodeState(new Uint8Array(event.target.value.buffer));
@@ -878,7 +878,7 @@ var GiiKERCube = class _GiiKERCube extends BluetoothPuzzle {
       debug: {
         stateStr: str
       },
-      state: this.toReid333(val)
+      pattern: this.toReid333(val)
     });
   }
   isRepeatedInitialValue(val) {
@@ -1124,7 +1124,7 @@ var HeykubeCube = class _HeykubeCube extends BluetoothPuzzle {
     this.dispatchAlgLeaf({
       latestAlgLeaf: state.latestMove,
       timeStamp: event.timeStamp,
-      state: state.state
+      pattern: state.pattern
     });
   }
   decodeState(dv) {
@@ -1165,13 +1165,13 @@ var HeykubeCube = class _HeykubeCube extends BluetoothPuzzle {
       moMask: 0
     };
     return {
-      state: binaryComponentsToReid3x3x3(components2),
+      pattern: binaryComponentsToReid3x3x3(components2),
       latestMove: moves[b2[20] & 15]
     };
   }
-  async getState() {
+  async getPattern() {
     const b1 = await this.stateCharacteristic.readValue();
-    return this.decodeState(b1).state;
+    return this.decodeState(b1).pattern;
   }
 };
 var heykubeConfig = {