@applicaster/zapp-react-native-utils 13.0.0-alpha.7210171818 → 13.0.0-alpha.9270615060

package/appUtils/keyInputHandler/KeyInputHandler.ts

@@ -1,9 +1,9 @@
 
 export type SeekKeyHandlerListener = {
   onRewindPress: () => boolean;
-  // onRewindLongPress: () => boolean;
+  onRewindLongPress: () => boolean;
   onForwardPress: () => boolean;
-  // onForwardLongPress: () => boolean;
+  onForwardLongPress: () => boolean;
   onRewindPressOut: () => void;
   onForwardPressOut: () => void;
 }
@@ -44,13 +44,13 @@ export class KeyInputHandler {
     }
   }
 
-  // onRewindLongPress = () => {
-  //   for (const element of this.listeners) {
-  //     if (element.onRewindLongPress()) {
-  //       break;
-  //     }
-  //   }
-  // }
+  onRewindLongPress = () => {
+    for (const element of this.listeners) {
+      if (element.onRewindLongPress()) {
+        break;
+      }
+    }
+  }
 
   onForwardPress = () => {
     for (const element of this.listeners) {
@@ -60,13 +60,13 @@ export class KeyInputHandler {
     }
   }
 
-  // onForwardLongPress = () => {
-  //   for (const element of this.listeners) {
-  //     if (element.onForwardLongPress()) {
-  //       break;
-  //     }
-  //   }
-  // }
+  onForwardLongPress = () => {
+    for (const element of this.listeners) {
+      if (element.onForwardLongPress()) {
+        break;
+      }
+    }
+  }
 
   // TODO: Event should be send to listeners who handled down event
   onRewindPressOut = () => {
@@ -81,8 +81,8 @@ export class KeyInputHandler {
     return {
       onForwardPress: this.onForwardPress,
       onRewindPress: this.onRewindPress,
-      // onForwardLongPress: this.onForwardLongPress,
-      // onRewindLongPress: this.onRewindLongPress,
+      onForwardLongPress: this.onForwardLongPress,
+      onRewindLongPress: this.onRewindLongPress,
       onForwardPressOut: this.onForwardPressOut,
       onRewindPressOut: this.onRewindPressOut
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "13.0.0-alpha.7210171818",
+  "version": "13.0.0-alpha.9270615060",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-alpha.7210171818",
+    "@applicaster/applicaster-types": "13.0.0-alpha.9270615060",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "create-react-context": "^0.2.3",

package/reactHooks/player/TVSeekControlller/ISeekController.ts

@@ -1,7 +1,7 @@
 import { SEEK_TYPE } from "../const";
 
 export interface ISeekController {
-  onStartSeek(seekType: SEEK_TYPE): void;
-  onSeekEnd?(): void;
+  onPressStart(seekType: SEEK_TYPE): void;
+  onPressEnd?(): void;
   reset(): void;
 }

package/reactHooks/player/TVSeekControlller/LongPressSeekController.ts

@@ -6,8 +6,8 @@ import {
   log_verbose,
   TVSeekController,
 } from "./TVSeekController";
-import { interval, Subscription } from "rxjs";
-import { tap } from "rxjs/operators";
+import { timer, interval, Subscription } from "rxjs";
+import { switchMap, tap } from "rxjs/operators";
 
 /**
  * Example interface for the configuration needed for long-press seeking.
@@ -31,7 +31,7 @@ export class LongPressSeekController implements ISeekController {
     private config: LongPressConfig
   ) {}
 
-  onStartSeek(seekType: SEEK_TYPE) {
+  onPressStart(seekType: SEEK_TYPE) {
     this.cleanUpSubscription();
 
     log_debug(
@@ -45,32 +45,49 @@ export class LongPressSeekController implements ISeekController {
     this.isLongPressActive = true;
     this.currentSkipAmount = this.config.INITIAL_SKIP_AMOUNT;
 
-    // Start the interval immediately without waiting for a threshold.
-    this.subscription = 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
+    /**
+     * 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
+            );
+          })
         );
       })
-    ).subscribe({
+    );
+
+    this.subscription = threshold$.subscribe({
       complete: () =>
-        log_verbose("LongPressSeekController: Long press subscription complete"),
+        log_verbose(
+          "LongPressSeekController: Long press subscription complete"
+        ),
       error: (err) =>
-        log_error("LongPressSeekController: Long press subscription error", err),
+        log_error(
+          "LongPressSeekController: Long press subscription error",
+          err
+        ),
     });
   }
 
-  onSeekEnd() {
+  onPressEnd() {
     const pressDuration = Date.now() - this.pressStartTime;
 
     if (

package/reactHooks/player/TVSeekControlller/TVSeekController.ts

@@ -6,7 +6,6 @@ import { SEEK_TYPE } from "../const";
 import { createLogger } from "../../../logger";
 import { Player } from "../../../appUtils/playerManager/player";
 import { SeekKeyHandlerListener } from "../../../appUtils/keyInputHandler/KeyInputHandler";
-import { ISeekController } from "./ISeekController";
 
 export const { log_warning, log_debug, log_info, log_error, log_verbose } =
   createLogger({
@@ -14,11 +13,6 @@ export const { log_warning, log_debug, log_info, log_error, log_verbose } =
     subsystem: "TVSeekController",
   });
 
-export enum SEEK_STRATEGY {
-  TAP_SEEK = "TAP_SEEK",
-  AUTO_SEEK = "AUTO_SEEK",
-}
-
 export class TVSeekController implements SeekKeyHandlerListener {
   // -- SHARED STATE ACROSS STRATEGIES --
   public currentSeekType: SEEK_TYPE | null = null;
@@ -26,12 +20,9 @@ export class TVSeekController implements SeekKeyHandlerListener {
   private controller: Player;
   private delayedSeekProgressSubject = new BehaviorSubject<number | null>(null);
 
-  private currentSeekController: ISeekController;
-
   // -- STRATEGY INSTANCES --
   private tapSeekController: TapSeekController;
   private longPressSeekController: LongPressSeekController;
-  private longPressThresholdTimeout: any | null = null;
 
   // Example config for long press
   private config = {
@@ -52,68 +43,48 @@ export class TVSeekController implements SeekKeyHandlerListener {
     );
   }
 
-  getDelayedSeekProgressObservable = () => {
+  getDelayedSeekProgressObservable() {
     return this.delayedSeekProgressSubject;
   }
 
-  setStrategy = (seekStrategy: SEEK_STRATEGY) => {
-    switch (seekStrategy) {
-      case SEEK_STRATEGY.TAP_SEEK:
-        clearTimeout(this.longPressThresholdTimeout);
-        this.longPressThresholdTimeout = null;
-        this.currentSeekController = this.tapSeekController;
-
-        break;
-      case SEEK_STRATEGY.AUTO_SEEK:
-        this.currentSeekController.reset();
-        this.currentSeekController = this.longPressSeekController;
-        break;
-      default:
-    }
-  }
-
-  handleStartSeek = (seekType: SEEK_TYPE) => {
-    this.setStrategy(SEEK_STRATEGY.TAP_SEEK);
-    this.currentSeekController.onStartSeek(seekType);
-    log_verbose(`handleStartSeek: TAP seekType: ${seekType}`);
-
-    this.longPressThresholdTimeout = setTimeout(() => {
-      log_verbose(`handleStartSeek: longPressThresholdTimeout:  TIMEOUT, START AUTO_SEEK seekType: ${seekType}`);
-     this.setStrategy(SEEK_STRATEGY.AUTO_SEEK);
-      this.currentSeekController.onStartSeek(seekType);
-    }, this.config.LONG_PRESS_THRESHOLD);
-  }
-
   onForwardPress = (): boolean => {
-    this.handleStartSeek(SEEK_TYPE.FORWARD);
+    this.tapSeekController.onPressStart(SEEK_TYPE.FORWARD);
 
     return true;
   };
 
   onRewindPress = (): boolean => {
-    this.handleStartSeek(SEEK_TYPE.REWIND);
+    this.tapSeekController.onPressStart(SEEK_TYPE.REWIND);
 
     return true;
   };
 
-  onSeekEnd = () => {
-    this.currentSeekController.onSeekEnd();
-    this.setStrategy(SEEK_STRATEGY.TAP_SEEK);
-  }
-
-  onRewindPressOut = () => {
-    const isAutoSeek = this.currentSeekController === this.longPressSeekController;
+  onForwardLongPress = (): boolean => {
+    this.longPressSeekController.onPressStart(SEEK_TYPE.FORWARD);
+    this.tapSeekController.reset();
 
-    log_verbose(`handleStartSeek: onRewindPressOut, isAutoSeek: ${isAutoSeek}`);
+    return true;
+  };
 
-    this.onSeekEnd();
-  }
+  onRewindLongPress = (): boolean => {
+    this.longPressSeekController.onPressStart(SEEK_TYPE.REWIND);
+    this.tapSeekController.reset();
 
-  onForwardPressOut = () => {
-    const isAutoSeek = this.currentSeekController === this.longPressSeekController;
+    return true;
+  };
 
-    log_verbose(`handleStartSeek: onForwardPressOut, isAutoSeek: ${isAutoSeek}`);
-    this.onSeekEnd();
+  onForwardPressOut = () => this.longPressSeekController.onPressEnd();
+  onRewindPressOut = () => this.longPressSeekController.onPressEnd();
+
+  getSeekMethods() {
+    return {
+      onForwardPress: this.onForwardPress,
+      onRewindPress: this.onRewindPress,
+      onForwardLongPress: this.onForwardLongPress,
+      onRewindLongPress: this.onRewindLongPress,
+      onForwardPressOut: this.onForwardPressOut,
+      onRewindPressOut: this.onRewindPressOut,
+    };
   }
 
   // ---------------------------
@@ -183,8 +154,6 @@ export class TVSeekController implements SeekKeyHandlerListener {
 
     this.tapSeekController.reset();
     this.longPressSeekController.reset();
-
-    this.setStrategy(SEEK_STRATEGY.TAP_SEEK);
   }
 
   private getPlayer() {

package/reactHooks/player/TVSeekControlller/TapSeekController.ts

@@ -12,7 +12,7 @@ export class TapSeekController implements ISeekController {
 
   constructor(private parent: TVSeekController) {}
 
-  onStartSeek = (seekType: SEEK_TYPE) => {
+  onPressStart(seekType: SEEK_TYPE) {
     log_debug(`TapSeekController: start tap seek type: ${seekType}.`);
 
     const prevSeekType = this.parent.currentSeekType;
@@ -28,7 +28,19 @@ export class TapSeekController implements ISeekController {
       this.tapSequenceTimeout = null;
     }
 
-    const clicksBeforePause = 0;
+    this.tapSequenceTimeout = setTimeout(() => {
+      if (this.parent.delayedSeekOffset !== null) {
+        this.parent.seekPlayer(this.parent.delayedSeekOffset);
+      }
+
+      log_debug(
+        `TapSeekController: Tap sequence timeout fired, delayedSeekOffset: ${this.parent.delayedSeekOffset}.`
+      );
+
+      this.parent.resetAll();
+    }, this.ON_PRESS_RESET_DURATION);
+
+    const clicksBeforePause = 3;
     const skipTime = getSkipTime(this.seekMultiplier);
 
     if (this.seekMultiplier > clicksBeforePause) {
@@ -48,21 +60,7 @@ export class TapSeekController implements ISeekController {
     this.seekMultiplier++;
   }
 
-  onSeekEnd = () => {
-    this.tapSequenceTimeout = setTimeout(() => {
-      if (this.parent.delayedSeekOffset !== null) {
-        this.parent.seekPlayer(this.parent.delayedSeekOffset);
-      }
-
-      log_debug(
-        `TapSeekController: Tap sequence timeout fired, delayedSeekOffset: ${this.parent.delayedSeekOffset}.`
-      );
-
-      this.parent.resetAll();
-    }, this.ON_PRESS_RESET_DURATION);
-  };
-
-  reset = () => {
+  reset() {
     log_debug("TapSeekController: Reset states");
 
     this.seekMultiplier = 1;