fix(web): handle infinite value on getDuration for live streams (#1287)

* fix(web): handle infinite value on getDuration * feat: improve web code * feat: improve web code docs * fix(web): currentTime
bluefireteam · Sep 29, 2022 · 15f2c78 · 15f2c78
1 parent 21d64d0
commit 15f2c78
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/packages/audioplayers_web/lib/audioplayers_web.dart b/packages/audioplayers_web/lib/audioplayers_web.dart
@@ -6,6 +6,7 @@ import 'package:audioplayers_platform_interface/api/player_mode.dart';
 import 'package:audioplayers_platform_interface/api/release_mode.dart';
 import 'package:audioplayers_platform_interface/audioplayers_platform_interface.dart';
 import 'package:audioplayers_platform_interface/streams_interface.dart';
+import 'package:audioplayers_web/num_extension.dart';
 import 'package:audioplayers_web/wrapped_player.dart';
 import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 
@@ -33,11 +34,11 @@ class AudioplayersPlugin extends AudioplayersPlatform with StreamsInterface {
 
   @override
   Future<int?> getDuration(String playerId) async {
-    final duration = getOrCreatePlayer(playerId).player?.duration;
-    if (duration == null) {
+    final jsDuration = getOrCreatePlayer(playerId).player?.duration;
+    if (jsDuration == null) {
       return null;
     }
-    return (duration * 1000).toInt();
+    return jsDuration.fromSecondsToDuration().inMilliseconds;
   }
 
   @override

diff --git a/packages/audioplayers_web/lib/num_extension.dart b/packages/audioplayers_web/lib/num_extension.dart
@@ -0,0 +1,6 @@
+extension NumExtension on num {
+  /// Converts [num] (expected in seconds) to the duration.
+  Duration fromSecondsToDuration() => Duration(
+        seconds: (isNaN || isInfinite ? 0 : this).round(),
+      );
+}
diff --git a/packages/audioplayers_web/lib/wrapped_player.dart b/packages/audioplayers_web/lib/wrapped_player.dart
@@ -3,6 +3,7 @@ import 'dart:html';
 
 import 'package:audioplayers_platform_interface/api/release_mode.dart';
 import 'package:audioplayers_platform_interface/streams_interface.dart';
+import 'package:audioplayers_web/num_extension.dart';
 
 class WrappedPlayer {
   final String playerId;
@@ -55,23 +56,28 @@ class WrappedPlayer {
     if (currentUrl == null) {
       return;
     }
-    Duration toDuration(num jsNum) => Duration(
-          milliseconds:
-              (1000 * (jsNum.isNaN || jsNum.isInfinite ? 0 : jsNum)).round(),
-        );
 
     final p = player = AudioElement(currentUrl);
     p.loop = shouldLoop();
     p.volume = currentVolume;
     p.playbackRate = currentPlaybackRate;
     playerPlaySubscription = p.onPlay.listen((_) {
-      streamsInterface.emitDuration(playerId, toDuration(p.duration));
+      streamsInterface.emitDuration(
+        playerId,
+        p.duration.fromSecondsToDuration(),
+      );
     });
     playerLoadedDataSubscription = p.onLoadedData.listen((_) {
-      streamsInterface.emitDuration(playerId, toDuration(p.duration));
+      streamsInterface.emitDuration(
+        playerId,
+        p.duration.fromSecondsToDuration(),
+      );
     });
     playerTimeUpdateSubscription = p.onTimeUpdate.listen((_) {
-      streamsInterface.emitPosition(playerId, toDuration(p.currentTime));
+      streamsInterface.emitPosition(
+        playerId,
+        p.currentTime.fromSecondsToDuration(),
+      );
     });
     playerSeekedSubscription = p.onSeeked.listen((_) {
       streamsInterface.emitSeekComplete(playerId);