@applicaster/quick-brick-player 13.0.0-alpha.8490438700 → 13.0.0-alpha.8532113155

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "13.0.0-alpha.8490438700",
+  "version": "13.0.0-alpha.8532113155",
   "description": "Quick Brick Player",
   "main": "./src/index.ts",
   "types": "index.d.ts",
@@ -37,10 +37,10 @@
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
     "@applicaster/quick-brick-mobile-transport-controls": "13.0.0-rc.28",
-    "@applicaster/quick-brick-tv-transport-controls": "13.0.0-rc.26",
-    "@applicaster/zapp-react-native-tvos-app": "13.0.0-alpha.8490438700",
-    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.8490438700",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.8490438700",
+    "@applicaster/quick-brick-tv-transport-controls": "13.0.0-rc.31",
+    "@applicaster/zapp-react-native-tvos-app": "13.0.0-alpha.8532113155",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.8532113155",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.8532113155",
     "keymirror": "^0.1.1",
     "query-string": "7.1.3",
     "react-native-web-linear-gradient": "1.1.2",

package/src/Player/AudioLayer/AudioPlayerWrapper.tsx

@@ -328,8 +328,12 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     onSleepSelect,
   ]);
 
+  // This method does not actually cancel the sleep timer
+  // (and should not to avoid race condition),
+  // it just performs the cleanup when timer expires
+  // TODO: rename it in code above
   const cancelSleepTimer = React.useCallback(() => {
-    sleepTimerManager?.cancelSleepTimer();
+    sleepTimerManager?.onTimerExpired();
   }, [sleepTimerManager]);
 
   const onCloseVideoModal = React.useCallback(() => {

package/src/Player/AudioLayer/SleepTimerManager.ts

@@ -40,94 +40,77 @@ export class SleepTimerController {
     return this.sleepTimerStateSubject.asObservable();
   }
 
-  async cancelSleepTimer() {
-    this.player.cancelSleepTimer?.();
+  private async scheduleSleep(sleepDate): Promise<boolean> {
+    log_debug(`Setting sleep interval to ${sleepDate}`);
 
-    await localStorage.removeItem(SLEEP_PREFERENCE_KEY, NAMESPACE);
-
-    this.sleepTimerStateSubject.next(new SleepTimerState(SLEEP_TIMER_OFF, 0));
-  }
-
-  private async startSleepTimer(futureSleepDate: number) {
     try {
-      log_debug(`Starting sleep timer at ${futureSleepDate}`);
       this.player.cancelSleepTimer?.();
-      this.player.startSleepTimer?.(futureSleepDate);
+      this.player.startSleepTimer?.(sleepDate);
 
-      return futureSleepDate;
+      return true;
     } catch (e) {
       log_error("Failed to start sleep timer", { error: e.message });
 
-      return 0;
+      return false;
     }
   }
 
-  private async handleSleep(timerValue: number, currentFutureSleepDate = null) {
-    log_debug("Handling sleep interval", {
-      timerValue,
-      currentFutureSleepDate,
-    });
-
-    if (timerValue === 0) {
-      await this.cancelSleepTimer();
+  async setSleepTimer(item: SleepTimer) {
+    // User has selected Off state
+    if (item.value === 0) {
+      log_debug("Cancelling sleep timer");
+      this.player.cancelSleepTimer?.();
 
-      return timerValue;
+      return this.onTimerExpired();
     }
 
-    // starting a new timer
-    if (currentFutureSleepDate == null) {
-      log_debug(`Starting sleep timer in ${timerValue} minutes`);
-      const futureSleepDate = Date.now() + timerValue * 60000;
+    log_debug(`Starting sleep timer in ${item.value} minutes`);
 
-      return this.startSleepTimer(futureSleepDate);
-    }
+    const futureSleepDate = Date.now() + item.value * 60000;
 
-    // restoring previous timer (leftover time interval)
-    if (hasDatePassed(currentFutureSleepDate)) {
-      log_debug("Sleep date has already passed");
-      await this.cancelSleepTimer();
+    if (await this.scheduleSleep(futureSleepDate)) {
+      await localStorage.setItem(
+        SLEEP_PREFERENCE_KEY,
+        { ...item, futureSleepDate },
+        NAMESPACE
+      );
 
-      return 0;
+      this.sleepTimerStateSubject.next(
+        new SleepTimerState(item, futureSleepDate)
+      );
     }
+  }
 
-    log_debug(`Starting sleep timer at ${timerValue}`);
+  async onTimerExpired() {
+    await localStorage.removeItem(SLEEP_PREFERENCE_KEY, NAMESPACE);
 
-    return this.startSleepTimer(currentFutureSleepDate);
+    this.sleepTimerStateSubject.next(new SleepTimerState(SLEEP_TIMER_OFF, 0));
   }
 
   async loadSleep() {
     const sleep = await localStorage.getItem(SLEEP_PREFERENCE_KEY, NAMESPACE);
 
-    if (sleep) {
-      const { futureSleepDate, ...rest } = sleep;
+    if (!sleep) return;
 
-      const sleepTimerDate = await this.handleSleep(
-        sleep.value,
-        futureSleepDate
-      );
+    const { futureSleepDate, ...rest } = sleep;
 
-      this.sleepTimerStateSubject.next(
-        new SleepTimerState(rest as SleepTimer, sleepTimerDate)
-      );
+    if (!futureSleepDate || hasDatePassed(futureSleepDate)) {
+      log_debug("Sleep date has already passed");
+      await localStorage.removeItem(SLEEP_PREFERENCE_KEY, NAMESPACE);
 
-      log_debug(`Sleep state restored, will go to sleep at ${futureSleepDate}`);
+      return;
     }
-  }
-
-  async setSleepTimer(item: SleepTimer) {
-    const futureSleepDate = await this.handleSleep(item.value);
 
-    await localStorage.setItem(
-      SLEEP_PREFERENCE_KEY,
-      { ...item, futureSleepDate },
-      NAMESPACE
-    );
+    if (await this.scheduleSleep(futureSleepDate)) {
+      log_debug(`Sleep state restored, will go to sleep at ${futureSleepDate}`);
 
-    this.sleepTimerStateSubject.next(
-      new SleepTimerState(item, futureSleepDate)
-    );
+      this.sleepTimerStateSubject.next(
+        new SleepTimerState(rest as SleepTimer, futureSleepDate)
+      );
+    }
   }
 
+  // Will be called if user closed the player explicitly.
   // TODO: check if it will be called on Android when we need.
   //  Probably we will have to handle it on native instead.
   public static async onPlayerDestroy() {

package/src/Player/AudioLayer/SpeedManager.ts

@@ -21,6 +21,7 @@ export const DEFAULT_SPEED: PlaybackSpeed = {
   value: 1.0,
 };
 
+// todo: should not be applied to live streams
 export class SpeedController {
   private playbackSpeedSubject = new BehaviorSubject<PlaybackSpeed>(
     DEFAULT_SPEED