@applicaster/zapp-react-native-utils 13.0.0-alpha.2635505531 → 13.0.0-alpha.2761483533

package/reactHooks/player/TVSeekControlller/ISeekController.ts

@@ -1,7 +1,32 @@
-import { SEEK_TYPE } from "../const";
+import { MAX_SEEK_TIME, SEEK_TYPE, SKIP_TIME_BASE } from "../const";
+
+export interface ISeekControllerDelegate {
+  handleDelayedSeek(offset: number): void;
+  handleSeek(offset: number): void;
+  handleSeekComplete(): void;
+  handlePlayerPause(): void;
+}
 
 export interface ISeekController {
-  onPressStart(seekType: SEEK_TYPE): void;
-  onPressEnd?(): void;
+  title: string;
+  onStartSeek(seekType: SEEK_TYPE): void;
+  onSeekEnd(): void;
   reset(): void;
 }
+
+export class SeekIncrementalBaseStrategy {
+  private skipMultiplier = 1;
+
+  getSkipTime = () =>
+    Math.min(MAX_SEEK_TIME, SKIP_TIME_BASE * this.skipMultiplier);
+
+  increment = () => {
+    this.skipMultiplier++;
+  };
+
+  getSkipMultiplier = () => this.skipMultiplier;
+
+  reset = () => {
+    this.skipMultiplier = 1;
+  };
+}

package/reactHooks/player/TVSeekControlller/LongPressSeekController.ts

@@ -1,117 +1,64 @@
-// LongPressSeekController.ts
-import { ISeekController } from "./ISeekController";
-import { SEEK_TYPE } from "../const";
 import {
-  log_debug,
-  log_error,
-  log_verbose,
-  TVSeekController,
-} from "./TVSeekController";
-import { timer, interval, Subscription } from "rxjs";
-import { switchMap, tap } from "rxjs/operators";
+  ISeekController,
+  ISeekControllerDelegate,
+  SeekIncrementalBaseStrategy,
+} from "./ISeekController";
+import { SEEK_TYPE } from "../const";
+import { log_debug, log_error, log_verbose } from "./TVSeekController";
+import { interval, Subscription } from "rxjs";
+import { tap } from "rxjs/operators";
 
-/**
- * Example interface for the configuration needed for long-press seeking.
- */
 interface LongPressConfig {
-  LONG_PRESS_THRESHOLD: number; // ms
-  TIMER_INTERVAL_MS: number; // ms
-  SKIP_INCREMENT_STEP: number; // seconds
-  MAX_SKIP_PER_TICK: number; // seconds
-  INITIAL_SKIP_AMOUNT: number; // e.g., 10s to start
+  TIMER_INTERVAL_MS: number;
 }
 
 export class LongPressSeekController implements ISeekController {
-  private pressStartTime = 0;
-  private isLongPressActive = false;
-  private currentSkipAmount = 0;
   private subscription: Subscription | null = null;
-
+  readonly title = "LongPressSeek";
   constructor(
-    private parent: TVSeekController,
+    private seekControllerDelegate: ISeekControllerDelegate,
+    private seekIncrementalStrategy: SeekIncrementalBaseStrategy,
     private config: LongPressConfig
   ) {}
 
-  onPressStart(seekType: SEEK_TYPE) {
+  onStartSeek(seekType: SEEK_TYPE) {
     this.cleanUpSubscription();
 
-    log_debug(
-      `LongPressSeekController: start long press seek type:${seekType}.`
-    );
-
-    this.parent.currentSeekType = seekType;
-    this.parent.pausePlayer();
-
-    this.pressStartTime = Date.now();
-    this.isLongPressActive = true;
-    this.currentSkipAmount = this.config.INITIAL_SKIP_AMOUNT;
-
-    /**
-     * We wait LONG_PRESS_THRESHOLD ms to confirm it's a long press.
-     * If it still active, we switch to an interval that emits every TIMER_INTERVAL_MS.
-     */
-    const threshold$ = timer(this.config.LONG_PRESS_THRESHOLD).pipe(
-      tap(() =>
-        log_verbose("LongPressSeekController: Crossed long-press threshold")
-      ),
-      switchMap(() => {
-        return interval(this.config.TIMER_INTERVAL_MS).pipe(
-          tap(() => {
-            this.parent.handleDelayedSeek(
-              this.parent.currentSeekType,
-              this.currentSkipAmount
-            );
-
-            log_debug(
-              `LongPressSeekController: handle delayed seek type: ${seekType} - currentSkipAmount: ${this.currentSkipAmount}.`
-            );
-
-            this.currentSkipAmount = Math.min(
-              this.currentSkipAmount + this.config.SKIP_INCREMENT_STEP,
-              this.config.MAX_SKIP_PER_TICK
-            );
-          })
-        );
-      })
-    );
-
-    this.subscription = threshold$.subscribe({
-      complete: () =>
-        log_verbose(
-          "LongPressSeekController: Long press subscription complete"
-        ),
-      error: (err) =>
-        log_error(
-          "LongPressSeekController: Long press subscription error",
-          err
-        ),
-    });
+    log_debug(`${this.title}: start long press seek type: ${seekType}.`);
+
+    this.seekControllerDelegate.handlePlayerPause();
+
+    this.subscription = interval(this.config.TIMER_INTERVAL_MS)
+      .pipe(
+        tap(() => {
+          this.seekControllerDelegate.handleDelayedSeek(
+            this.seekIncrementalStrategy.getSkipTime()
+          );
+
+          log_debug(
+            `${
+              this.title
+            }: handle delayed seek type: ${seekType} - multiplier: ${this.seekIncrementalStrategy.getSkipMultiplier()}, currentSkipAmount: ${this.seekIncrementalStrategy.getSkipTime()}.`
+          );
+
+          this.seekIncrementalStrategy.increment();
+        })
+      )
+      .subscribe({
+        complete: () =>
+          log_verbose(`${this.title}: Long press subscription complete`),
+        error: (err) =>
+          log_error(`${this.title}: Long press subscription error`, err),
+      });
   }
 
-  onPressEnd() {
-    const pressDuration = Date.now() - this.pressStartTime;
-
-    if (
-      this.isLongPressActive &&
-      pressDuration > this.config.LONG_PRESS_THRESHOLD
-    ) {
-      const offset = this.parent.delayedSeekOffset;
-
-      if (offset) {
-        log_debug(
-          `LongPressSeekController: onPressEnd for LongPressSeekController, seek offset: ${offset}`
-        );
-
-        this.parent.seekPlayer(offset);
-      }
-    }
-
-    this.parent.resetAll();
+  onSeekEnd() {
+    this.cleanUpSubscription();
+    this.seekControllerDelegate.handleSeekComplete();
   }
 
   reset() {
-    this.isLongPressActive = false;
-    this.currentSkipAmount = 0;
+    this.seekIncrementalStrategy.reset();
     this.cleanUpSubscription();
   }
 

package/reactHooks/player/TVSeekControlller/TVSeekController.ts

@@ -1,9 +1,15 @@
 import { BehaviorSubject } from "rxjs";
 import { TapSeekController } from "./TapSeekController";
 import { LongPressSeekController } from "./LongPressSeekController";
-import { playerManager } from "../../../appUtils";
 import { SEEK_TYPE } from "../const";
 import { createLogger } from "../../../logger";
+import { Player } from "../../../appUtils/playerManager/player";
+import { SeekKeyHandlerListener } from "../../../appUtils/keyInputHandler/KeyInputHandler";
+import {
+  ISeekController,
+  ISeekControllerDelegate,
+  SeekIncrementalBaseStrategy,
+} from "./ISeekController";
 
 export const { log_warning, log_debug, log_info, log_error, log_verbose } =
   createLogger({
@@ -11,142 +17,242 @@ export const { log_warning, log_debug, log_info, log_error, log_verbose } =
     subsystem: "TVSeekController",
   });
 
-export class TVSeekController {
-  private static instance: TVSeekController;
-  public static getInstance() {
-    if (!TVSeekController.instance) {
-      TVSeekController.instance = new TVSeekController();
-    }
+export enum SEEK_STRATEGY {
+  TAP_SEEK = "TAP_SEEK",
+  AUTO_SEEK = "AUTO_SEEK",
+}
 
-    return TVSeekController.instance;
-  }
+const CONFIG_TAP_SEEK = {
+  CLICKS_BEFORE_PAUSE: 0,
+};
+
+const CONFIG_LONG_PRESS = {
+  TIMER_INTERVAL_MS: 200,
+};
+
+const LONG_PRESS_THRESHOLD = 500;
+const SEEK_END_TIMEOUT_DURATION = 700;
+// prettier-ignore
 
-  // -- SHARED STATE ACROSS STRATEGIES --
-  public currentSeekType: SEEK_TYPE | null = null;
-  public delayedSeekOffset: number | null = null;
+export class TVSeekController
+  implements SeekKeyHandlerListener, ISeekControllerDelegate {
+  public delayedSeekPosition: number | null = null;
+  private readonly playerController: Player;
   private delayedSeekProgressSubject = new BehaviorSubject<number | null>(null);
+  isPlayerInitiallyPaused: null | boolean = null;
+  currentSeekType: SEEK_TYPE | null = null;
 
-  // -- STRATEGY INSTANCES --
-  private tapSeekController: TapSeekController;
-  private longPressSeekController: LongPressSeekController;
+  private currentSeekController: ISeekController;
+  private readonly tapSeekController: TapSeekController;
+  private readonly longPressSeekController: LongPressSeekController;
+  private longPressThresholdTimeout: any | null = null;
+  private seekEndTimeout: any | null = null;
 
-  // Example config for long press
-  private config = {
-    LONG_PRESS_THRESHOLD: 500,
-    TIMER_INTERVAL_MS: 300,
-    SKIP_INCREMENT_STEP: 5,
-    MAX_SKIP_PER_TICK: 300,
-    INITIAL_SKIP_AMOUNT: 10,
-  };
+  constructor(playerController: Player) {
+    this.playerController = playerController;
 
-  private constructor() {
-    this.tapSeekController = new TapSeekController(this);
+    this.tapSeekController = new TapSeekController(
+      this,
+      new SeekIncrementalBaseStrategy(),
+      CONFIG_TAP_SEEK
+    );
 
     this.longPressSeekController = new LongPressSeekController(
       this,
-      this.config
+      new SeekIncrementalBaseStrategy(),
+      CONFIG_LONG_PRESS
     );
+
+    this.currentSeekController = this.tapSeekController;
   }
 
-  getDelayedSeekProgressObservable() {
+  getDelayedSeekProgressObservable = () => {
     return this.delayedSeekProgressSubject;
-  }
+  };
 
-  getSeekMethods() {
-    return {
-      onForwardPress: () =>
-        this.tapSeekController.onPressStart(SEEK_TYPE.FORWARD),
-      onRewindPress: () =>
-        this.tapSeekController.onPressStart(SEEK_TYPE.REWIND),
-
-      onForwardLongPress: () => {
-        this.longPressSeekController.onPressStart(SEEK_TYPE.FORWARD);
-        this.tapSeekController.reset();
-      },
-      onRewindLongPress: () => {
-        this.longPressSeekController.onPressStart(SEEK_TYPE.REWIND);
-        this.tapSeekController.reset();
-      },
-      onForwardPressOut: () => this.longPressSeekController.onPressEnd(),
-      onRewindPressOut: () => this.longPressSeekController.onPressEnd(),
-    };
-  }
+  setStrategy = (seekStrategy: SEEK_STRATEGY) => {
+    switch (seekStrategy) {
+      case SEEK_STRATEGY.TAP_SEEK:
+        this.currentSeekController = this.tapSeekController;
+        log_debug("TVSeekController: setStrategy - TAP_SEEK");
+
+        break;
+      case SEEK_STRATEGY.AUTO_SEEK:
+        this.currentSeekController = this.longPressSeekController;
+        log_debug("TVSeekController: setStrategy - AUTO_SEEK");
 
-  // ---------------------------
-  // SHARED METHODS
-  // ---------------------------
+        break;
+      default:
+    }
+  };
 
-  /** Called by either strategy to accumulate offset while paused. */
-  handleDelayedSeek(eventType: SEEK_TYPE, skipTime: number) {
-    const player = this.getPlayer();
-    if (!player) return;
+  handleStartSeek = (seekType: SEEK_TYPE) => {
+    this.currentSeekType = seekType;
 
-    // If not previously delayed, we pause the first time
-    if (this.delayedSeekOffset === null) {
-      this.pausePlayer();
+    if (this.isPlayerInitiallyPaused === null) {
+      this.isPlayerInitiallyPaused = this.playerController.isPaused();
     }
 
-    const newOffset = (this.delayedSeekOffset || 0) + skipTime;
-    const currentPos = player.getPosition();
+    this.clearLongPressThresholdTimeout();
+    this.clearSeekCompleteTimeout();
+    this.setStrategy(SEEK_STRATEGY.TAP_SEEK);
+    this.currentSeekController.onStartSeek(seekType);
+
+    this.longPressThresholdTimeout = setTimeout(() => {
+      this.setStrategy(SEEK_STRATEGY.AUTO_SEEK);
+      this.currentSeekController.onStartSeek(seekType);
+    }, LONG_PRESS_THRESHOLD);
+  };
+
+  onForwardPress = (): boolean => {
+    this.handleStartSeek(SEEK_TYPE.FORWARD);
+
+    return true;
+  };
+
+  onRewindPress = (): boolean => {
+    this.handleStartSeek(SEEK_TYPE.REWIND);
+
+    return true;
+  };
+
+  onSeekEnd = () => {
+    this.clearLongPressThresholdTimeout();
+    this.currentSeekController.onSeekEnd();
+  };
+
+  onRewindPressOut = () => {
+    this.onSeekEnd();
+  };
+
+  onForwardPressOut = () => {
+    this.onSeekEnd();
+  };
+
+  onVideoProgress = (position: number) => {
+    if (this.delayedSeekPosition !== null) {
+      return;
+    }
+
+    this.delayedSeekProgressSubject.next(position);
+  };
+
+  handleDelayedSeek = (offset: number = 0) => {
+    this.handlePlayerPause();
+
+    const currentPos =
+      this.delayedSeekPosition === null
+        ? this.playerController.getPosition()
+        : this.delayedSeekPosition;
+
     let targetPos = currentPos;
 
-    if (eventType === SEEK_TYPE.FORWARD) {
-      targetPos = Math.min(currentPos + newOffset, player.getDuration());
+    if (this.currentSeekType === SEEK_TYPE.FORWARD) {
+      targetPos = Math.min(
+        currentPos + offset,
+        this.playerController.getSeekableDuration()
+      );
+    } else if (this.currentSeekType === SEEK_TYPE.REWIND) {
+      targetPos = Math.max(0, currentPos - offset);
     } else {
-      targetPos = Math.max(0, currentPos - newOffset);
+      log_warning(
+        `TVSeekController: handleDelayedSeek - invalid seek type: ${this.currentSeekType}`
+      );
     }
 
-    this.delayedSeekOffset = newOffset;
-
     log_debug(
-      `TVSeekController: handleDelayedSeek - targetPos: ${targetPos}, offset: ${newOffset}, skipTime: ${skipTime}`
+      `TVSeekController: handleDelayedSeek - targetPos: ${targetPos}, skipTime: ${offset}`
     );
 
+    const prevValue = this.delayedSeekProgressSubject.getValue();
+
+    if (prevValue !== null) {
+      const delta = Math.abs(prevValue - targetPos);
+
+      if (delta < 1) {
+        return;
+      }
+    }
+
+    this.delayedSeekPosition = targetPos;
     this.delayedSeekProgressSubject.next(targetPos);
-  }
+  };
 
-  seekPlayer(offset: number) {
-    const player = this.getPlayer();
-    if (!player || !this.currentSeekType) return;
-    player[this.currentSeekType](offset);
-    this.playerPlay();
-  }
+  handleSeekTo = (newPosition: number) => {
+    this.playerController.seekTo(newPosition);
+
+    if (!this.isPlayerInitiallyPaused) {
+      this.playerController.play();
+    }
+  };
 
-  playerPlay() {
-    const player = this.getPlayer();
-    if (!player) return;
+  handleSeek = (offset: number) => {
+    this.playerController[this.currentSeekType](offset);
 
-    if (player.isPaused()) {
-      player.play();
+    if (!this.isPlayerInitiallyPaused) {
+      this.playerController.play();
     }
-  }
+  };
 
-  pausePlayer() {
-    const player = this.getPlayer();
-    if (!player) return;
-    player.pause();
-  }
+  handleSeekComplete = () => {
+    this.clearSeekCompleteTimeout();
+
+    this.seekEndTimeout = setTimeout(() => {
+      if (this.delayedSeekPosition !== null) {
+        this.handleSeekTo(this.delayedSeekPosition);
+      }
+
+      log_debug(
+        `handleSeekComplete: Seek finished, type: ${this.currentSeekController.title}, seekPosition: ${this.delayedSeekPosition}. Reset all states and seek position.`
+      );
+
+      this.resetAll();
+    }, SEEK_END_TIMEOUT_DURATION);
+  };
+
+  isSeeking = (): boolean => {
+    return this.delayedSeekPosition !== null;
+  };
+
+  handlePlayerPause = () => {
+    if (this.playerController.isPaused()) {
+      return;
+    }
+
+    this.playerController.pause();
+  };
+
+  clearSeekCompleteTimeout = () => {
+    if (this.seekEndTimeout === null) {
+      return;
+    }
+
+    clearTimeout(this.seekEndTimeout);
+    this.seekEndTimeout = null;
+  };
+
+  clearLongPressThresholdTimeout = () => {
+    if (this.longPressThresholdTimeout === null) {
+      return;
+    }
+
+    clearTimeout(this.longPressThresholdTimeout);
+    this.longPressThresholdTimeout = null;
+  };
 
-  /**
-   * Reset *all* relevant state and strategy controllers
-   */
   resetAll() {
     log_debug("TVSeekController: Reset all states");
     this.currentSeekType = null;
-    this.delayedSeekOffset = null;
-    this.delayedSeekProgressSubject.next(null);
 
-    this.tapSeekController.reset();
-    this.longPressSeekController.reset();
-  }
+    this.delayedSeekPosition = null;
+    this.isPlayerInitiallyPaused = null;
 
-  private getPlayer() {
-    const player = playerManager.getInstanceController();
+    this.clearSeekCompleteTimeout();
+    this.clearLongPressThresholdTimeout();
 
-    if (!player) {
-      log_warning("TVSeekController: No valid player controller found");
-    }
+    this.tapSeekController.reset();
+    this.longPressSeekController.reset();
 
-    return player;
+    this.setStrategy(SEEK_STRATEGY.TAP_SEEK);
   }
 }

package/reactHooks/player/TVSeekControlller/TapSeekController.ts

@@ -1,73 +1,53 @@
-import { ISeekController } from "./ISeekController";
-import { SEEK_TYPE, MAX_SEEK_TIME, SKIP_TIME_BASE } from "../const";
-import { log_debug, TVSeekController } from "./TVSeekController";
-
-const getSkipTime = (multiplier: number) =>
-  Math.min(MAX_SEEK_TIME, SKIP_TIME_BASE * multiplier);
+import {
+  ISeekController,
+  ISeekControllerDelegate,
+  SeekIncrementalBaseStrategy,
+} from "./ISeekController";
+import { SEEK_TYPE } from "../const";
+import { log_debug } from "./TVSeekController";
+
+interface TapPressConfig {
+  CLICKS_BEFORE_PAUSE: number;
+}
 
 export class TapSeekController implements ISeekController {
-  private tapSequenceTimeout: NodeJS.Timeout | null = null;
-  private seekMultiplier = 1;
-  private readonly ON_PRESS_RESET_DURATION = 500; // ms
-
-  constructor(private parent: TVSeekController) {}
-
-  onPressStart(seekType: SEEK_TYPE) {
-    log_debug(`TapSeekController: start tap seek type: ${seekType}.`);
+  readonly title = "TapSeek";
+  constructor(
+    private seekControllerDelegate: ISeekControllerDelegate,
+    private seekIncrementalStrategy: SeekIncrementalBaseStrategy,
+    private config: TapPressConfig
+  ) {}
 
-    const prevSeekType = this.parent.currentSeekType;
+  onStartSeek = (seekType: SEEK_TYPE) => {
+    log_debug(`${this.title}: start tap seek type: ${seekType}.`);
 
-    if (prevSeekType !== seekType) {
-      this.reset();
-    }
-
-    this.parent.currentSeekType = seekType;
-
-    if (this.tapSequenceTimeout) {
-      clearTimeout(this.tapSequenceTimeout);
-      this.tapSequenceTimeout = null;
-    }
-
-    this.tapSequenceTimeout = setTimeout(() => {
-      if (this.parent.delayedSeekOffset !== null) {
-        this.parent.seekPlayer(this.parent.delayedSeekOffset);
-      }
+    const skipTime = this.seekIncrementalStrategy.getSkipTime();
+    const seekMultiplier = this.seekIncrementalStrategy.getSkipMultiplier();
 
+    if (seekMultiplier > this.config.CLICKS_BEFORE_PAUSE) {
       log_debug(
-        `TapSeekController: Tap sequence timeout fired, delayedSeekOffset: ${this.parent.delayedSeekOffset}.`
+        `${this.title}: handle delayed seek type:${seekType} - skipTime: ${skipTime}, seekMultiplier: ${seekMultiplier}.`
       );
 
-      this.parent.resetAll();
-    }, this.ON_PRESS_RESET_DURATION);
-
-    const clicksBeforePause = 3;
-    const skipTime = getSkipTime(this.seekMultiplier);
-
-    if (this.seekMultiplier > clicksBeforePause) {
-      log_debug(
-        `TapSeekController: handle delayed seek type:${seekType} - skipTime: ${skipTime}.`
-      );
-
-      this.parent.handleDelayedSeek(seekType, skipTime);
+      this.seekControllerDelegate.handleDelayedSeek(skipTime);
     } else {
       log_debug(
-        `TapSeekController: handle seek type:${seekType} - skipTime: ${skipTime}.`
+        `${this.title}: handle seek type:${seekType} - skipTime: ${skipTime}.`
       );
 
-      this.parent.seekPlayer(skipTime);
+      this.seekControllerDelegate.handleSeek(skipTime);
     }
 
-    this.seekMultiplier++;
-  }
+    this.seekIncrementalStrategy.increment();
+  };
 
-  reset() {
-    log_debug("TapSeekController: Reset states");
+  onSeekEnd = () => {
+    this.seekControllerDelegate.handleSeekComplete();
+  };
 
-    this.seekMultiplier = 1;
+  reset = () => {
+    log_debug("{this.title}: Reset states");
 
-    if (this.tapSequenceTimeout) {
-      clearTimeout(this.tapSequenceTimeout);
-      this.tapSequenceTimeout = null;
-    }
-  }
+    this.seekIncrementalStrategy.reset();
+  };
 }

package/reactHooks/player/__tests__/{useAutoSeek.test.tsx → useAutoSeek._test.tsx}

@@ -5,22 +5,14 @@ import { ON_HOLD_INTERVAL, SEEK_TYPE, SKIP_TIME_BASE } from "../const";
 
 import { useAutoSeek } from "../useAutoSeek";
 
-jest.useFakeTimers();
+jest.useFakeTimers({ legacyFakeTimers: true });
 
 const rewind = jest.fn();
 const forward = jest.fn();
-const exitDelayedSeek = jest.fn();
-const enterDelayedSeek = jest.fn();
 
 jest
   .spyOn(playerManager, "getInstanceController")
-  // @ts-ignore
-  .mockImplementation(() => ({
-    rewind,
-    forward,
-    exitDelayedSeek,
-    enterDelayedSeek,
-  }));
+  .mockReturnValue({ rewind, forward });
 
 describe("useAutoSeek", () => {
   beforeEach(() => {