cubing 0.22.0 → 0.24.0-pre2

package/src/cubing/stream/index.ts

@@ -1,12 +0,0 @@
-export type {
-  ProxyEvent,
-  ProxyMoveEvent,
-  ProxyOrientationEvent,
-  ProxyResetEvent,
-} from "./proxy-event";
-export {
-  WebSocketProxyReceiver,
-  WebSocketProxySender,
-} from "./websocket-proxy";
-
-export { TwizzleStreamServer } from "./twizzle/TwizzleStream";

package/src/cubing/stream/process/ReorientedStream.ts

@@ -1,93 +0,0 @@
-import { experimentalIs, Move } from "../../alg";
-import { KPuzzle } from "../../kpuzzle";
-import { experimentalCube3x3x3KPuzzle as cube3x3x3KPuzzle } from "../../kpuzzle";
-
-export interface PuzzleStreamMoveEventDetail {
-  move: Move;
-}
-
-// TODO: CustomEvent<PuzzleStreamMoveEventDetail>
-export interface PuzzleStreamMoveEvent {
-  type: "move";
-  detail: PuzzleStreamMoveEventDetail;
-}
-
-export type PuzzleStreamMoveEventRegisterCompatible =
-  CustomEvent<PuzzleStreamMoveEventDetail>;
-
-function ensurePuzzleStreamMoveEvent(
-  event: CustomEvent,
-): PuzzleStreamMoveEvent {
-  // console.log(event);
-  if (event?.type !== "move") {
-    throw new Error("Received non-move.");
-  }
-  if (!experimentalIs(event?.detail?.move, Move)) {
-    throw new Error("Event detail move was not a `Move`.");
-  }
-  return event as PuzzleStreamMoveEvent; // TODO
-}
-
-const faces = "ULFRBD";
-// TODO: better typ
-const rotationMap: Record<string, [Move, string]> = {
-  U: [new Move("y"), "D"],
-  L: [new Move("x'"), "R"],
-  F: [new Move("z"), "B"],
-  R: [new Move("x"), "L"],
-  B: [new Move("z"), "F"],
-  D: [new Move("y'"), "U"],
-};
-
-class OrientationTracker {
-  kpuzzle = new KPuzzle(cube3x3x3KPuzzle); // TODO: can we do centers only (less data) with little code?
-
-  processMove(move: Move): Move[] {
-    // TODO: validation
-    if ("xyz".includes(move.family)) {
-      this.kpuzzle.applyMove(move);
-      return [move];
-    } else if (move.family.slice(-1) === "w") {
-      const [rotation, family] = rotationMap[move.family.slice(-1)];
-      return this.processMove(rotation).concat(
-        this.processMove(move.modified({ family })),
-      );
-    } else if (move.family === move.family.toLowerCase()) {
-      const [rotation, family] = rotationMap[move.family.toUpperCase()];
-      return this.processMove(rotation).concat(
-        this.processMove(move.modified({ family })),
-      );
-    } else {
-      const faceIdx = faces.indexOf(move.family);
-      const family =
-        faces[this.kpuzzle.state["CENTERS"].permutation.indexOf(faceIdx)];
-      return [move.modified({ family })];
-    }
-  }
-}
-
-export class ReorientedStream extends EventTarget {
-  orientationTracker = new OrientationTracker();
-
-  constructor(target: EventTarget) {
-    super();
-    target.addEventListener("move", (e: CustomEvent) =>
-      this.onMove(ensurePuzzleStreamMoveEvent(e)),
-    );
-  }
-
-  dispatchMove(detail: PuzzleStreamMoveEventDetail): void {
-    this.dispatchEvent(
-      new CustomEvent("move", {
-        detail,
-      }),
-    );
-  }
-
-  onMove(event: PuzzleStreamMoveEvent): void {
-    const moves = this.orientationTracker.processMove(event.detail.move);
-    for (const move of moves) {
-      this.dispatchMove({ move });
-    }
-  }
-}

package/src/cubing/stream/proxy-event.ts

@@ -1,16 +0,0 @@
-import type { MoveEvent, OrientationEvent } from "../bluetooth";
-export interface ProxyMoveEvent {
-  event: "move";
-  data: MoveEvent;
-}
-export interface ProxyOrientationEvent {
-  event: "orientation";
-  data: OrientationEvent;
-}
-export interface ProxyResetEvent {
-  event: "reset";
-}
-export type ProxyEvent =
-  | ProxyMoveEvent
-  | ProxyOrientationEvent
-  | ProxyResetEvent;

package/src/cubing/stream/twizzle/TwizzleStream.ts

@@ -1,53 +0,0 @@
-import { Move, QuantumMove } from "../../alg";
-import type { StreamMessageEvent } from "./stream-types";
-
-class TwizzleStream extends EventTarget {
-  socket: WebSocket;
-  constructor(url: string) {
-    super();
-    this.socket = new WebSocket(url);
-    this.socket.onmessage = this.onMessage.bind(this); // TODO: Can we "add a listener instead"?
-  }
-
-  onMessage(msg: MessageEvent): void {
-    try {
-      const json: StreamMessageEvent = JSON.parse(msg.data);
-      if (json.event === "move") {
-        const move = json.data.latestMove;
-        if (move.type !== "blockMove") {
-          throw new Error("Invalid move!");
-        }
-        this.dispatchEvent(
-          new CustomEvent("move", {
-            detail: {
-              move: new Move(new QuantumMove(move.family), move.amount),
-            },
-          }),
-        );
-      }
-    } catch (e) {
-      console.error("Could not handle message:", e);
-    }
-  }
-}
-
-type StreamsField = {
-  streamID: string;
-  senders: { name: string; twizzleUserID: string; wcaID: string | null }[];
-}[];
-
-export class TwizzleStreamServer {
-  async streams(): Promise<StreamsField> {
-    return (
-      (await (await fetch("https://api.twizzle.net/v0/streams")).json()) as {
-        streams: StreamsField;
-      }
-    ).streams;
-  }
-
-  connect(streamID: string): TwizzleStream {
-    return new TwizzleStream(
-      `wss://api.twizzle.net/v0/streams/${streamID}/socket`,
-    );
-  }
-}

package/src/cubing/stream/twizzle/stream-types.ts

@@ -1,45 +0,0 @@
-// From api.twizzle.net
-
-// TOOD: Reuse https://github.com/cubing/cubing.js/blob/ec71ca736f29bae8ed6104f887a5cbe5fc962e8c/src/cubing/bluetooth/bluetooth-puzzle.ts#L12-L18
-export interface MoveEvent {
-  // deno-lint-ignore no-explicit-any
-  latestMove: any;
-  timeStamp: number;
-  // deno-lint-ignore no-explicit-any
-  state: any; // string
-}
-
-export interface BinaryMoveEvent {
-  // deno-lint-ignore no-explicit-any
-  latestMove: any;
-  timeStamp: number;
-  binaryState: string; // string
-}
-
-// TODO: Reuse https://github.com/cubing/cubing.js/blob/ec71ca736f29bae8ed6104f887a5cbe5fc962e8c/src/cubing/bluetooth/bluetooth-puzzle.ts#L21:L30
-export interface OrientationEvent {
-  quaternion: {
-    x: number;
-    y: number;
-    z: number;
-    w: number;
-  };
-  timeStamp: number;
-  // debug?: Record<string, unknown>;
-}
-
-// TODO: Reuse https://github.com/cubing/cubing.js/blob/ec71ca736f29bae8ed6104f887a5cbe5fc962e8c/src/cubing/bluetooth/bluetooth-puzzle.ts#L21:L30
-export interface ResetEvent {
-  trackingOrientation: boolean;
-}
-
-export type StreamMessageEvent =
-  | { event: "move"; data: MoveEvent }
-  | {
-      event: "orientation";
-      data: OrientationEvent;
-    }
-  | {
-      event: "reset";
-      data: ResetEvent;
-    };

package/src/cubing/stream/websocket-proxy.ts

@@ -1,73 +0,0 @@
-import type { MoveEvent, OrientationEvent } from "../bluetooth";
-import type { ProxyEvent } from "./proxy-event";
-
-export class WebSocketProxySender {
-  protected websocket: WebSocket;
-  constructor(url: string) {
-    this.websocket = new WebSocket(url);
-    this.websocket.onopen = this.onopen.bind(this);
-    this.websocket.onerror = this.onerror.bind(this);
-    this.websocket.onmessage = this.onmessage.bind(this);
-  }
-
-  public sendMoveEvent(e: MoveEvent): void {
-    this.sendProxyEvent({
-      event: "move",
-      data: e,
-    });
-  }
-
-  public sendOrientationEvent(e: OrientationEvent): void {
-    this.sendProxyEvent({
-      event: "orientation",
-      data: e,
-    });
-  }
-
-  public sendResetEvent(): void {
-    this.sendProxyEvent({ event: "reset" });
-  }
-
-  protected sendProxyEvent(proxyEvent: ProxyEvent): void {
-    this.websocket.send(JSON.stringify(proxyEvent));
-  }
-
-  protected onopen(): void {
-    console.log("Sending socket is open!");
-  }
-
-  protected onerror(error: Error): void {
-    console.error("WebSocket sender error:", error);
-  }
-
-  protected onmessage(_e: MessageEvent): void {}
-}
-
-export abstract class WebSocketProxyReceiver {
-  protected websocket: WebSocket;
-  constructor(url: string, socketOrigin?: string) {
-    if (!socketOrigin) {
-      console.log("No socket origin specified. Will not attempt to connect.");
-      return;
-    }
-    this.websocket = new WebSocket(url);
-    console.log(this.websocket);
-    this.websocket.onopen = this.onopen.bind(this);
-    this.websocket.onerror = this.onerror.bind(this);
-    this.websocket.onmessage = this.onmessage.bind(this);
-  }
-
-  protected onopen(): void {
-    console.log("Receiving socket is open!");
-  }
-
-  protected onerror(error: Error): void {
-    console.error("WebSocket receiver error:", error);
-  }
-
-  protected onmessage(e: MessageEvent): void {
-    this.onProxyEvent(JSON.parse(e.data));
-  }
-
-  abstract onProxyEvent(e: ProxyEvent): void;
-}

package/src/cubing/twisty/controllers/AnimationTypes.ts

@@ -1,50 +0,0 @@
-import type { Move } from "../../alg";
-import type { Transformation as KPuzzleState } from "../../kpuzzle";
-
-export type MillisecondTimestamp = number;
-
-// TODO: unify duration/timstamp types
-export type Duration = MillisecondTimestamp; // Duration in milliseconds
-// TODO: Extend `number`, introduce MoveSequenceTimestamp vs. EpochTimestamp,
-// force Duration to be a difference.
-export type Timestamp = MillisecondTimestamp; // Duration since a particular epoch.
-
-export type Fraction = number; // Value from 0 to 1.
-
-// 1, 0, -1 are used as scalars for `directionScalar` below.
-export enum Direction {
-  Forwards = 1,
-  Paused = 0,
-  Backwards = -1,
-}
-
-export function directionScalar(direction: Direction): MillisecondTimestamp {
-  return direction;
-}
-
-export interface MoveInProgress {
-  move: Move;
-  direction: Direction;
-  fraction: number;
-}
-
-export type PuzzlePosition = {
-  state: KPuzzleState;
-  movesInProgress: MoveInProgress[];
-};
-
-export enum BoundaryType {
-  Move = "move",
-  EntireTimeline = "entire-timeline",
-}
-
-export interface TimeRange {
-  start: MillisecondTimestamp;
-  end: MillisecondTimestamp;
-}
-
-// export type DurationForAmount = (amount: number) => Duration;
-
-export interface PositionListener {
-  onPositionChange(position: PuzzlePosition): void;
-}

package/src/cubing/twisty/controllers/RenderScheduler.ts

@@ -1,28 +0,0 @@
-// Debounces `requestAnimationFrame()`.
-export class RenderScheduler {
-  private animFrameID: number | null = null;
-  private animFrame = this.animFrameWrapper.bind(this);
-  constructor(private callback: (timestamp: DOMHighResTimeStamp) => void) {}
-  requestAnimFrame(): void {
-    if (!this.animFrameID) {
-      this.animFrameID = requestAnimationFrame(this.animFrame);
-    }
-  }
-
-  cancelAnimFrame(): void {
-    if (this.animFrameID) {
-      cancelAnimationFrame(this.animFrameID);
-      this.animFrameID = 0;
-    }
-  }
-
-  private animFrameWrapper(timestamp: DOMHighResTimeStamp): void {
-    this.animFrameID = 0;
-    this.callback(timestamp);
-  }
-}
-
-// An interface for classes to use to expose their scheduling.
-export interface Schedulable {
-  scheduleRender(): void;
-}