@capgo/native-audio 6.1.35 → 6.2.0

package/android/src/main/java/ee/forgr/audio/NativeAudio.java

@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetManager;
 import android.media.AudioManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
@@ -419,13 +420,15 @@ public class NativeAudio
   private void preloadAsset(PluginCall call) {
     double volume = 1.0;
     int audioChannelNum = 1;
+    JSObject status = new JSObject();
+    status.put("STATUS", "OK");
 
     try {
       initSoundPool();
 
       String audioId = call.getString(ASSET_ID);
 
-      boolean isUrl = call.getBoolean("isUrl", false);
+      boolean isLocalUrl = Boolean.TRUE.equals(call.getBoolean("isUrl", false));
 
       if (!isStringValid(audioId)) {
         call.reject(ERROR_AUDIO_ID_MISSING + " - " + audioId);
@@ -457,7 +460,7 @@ public class NativeAudio
         }
 
         AssetFileDescriptor assetFileDescriptor;
-        if (isUrl) {
+        if (isLocalUrl) {
           File f = new File(new URI(fullPath));
           ParcelFileDescriptor p = ParcelFileDescriptor.open(
             f,
@@ -465,13 +468,41 @@ public class NativeAudio
           );
           assetFileDescriptor = new AssetFileDescriptor(p, 0, -1);
         } else {
-          // if fullPath dont start with public/ add it
-          if (!fullPath.startsWith("public/")) {
-            fullPath = "public/".concat(fullPath);
+          try {
+            Uri uri = Uri.parse(fullPath); // Now Uri class should be recognized
+            if (
+              uri.getScheme() != null &&
+              (
+                uri.getScheme().equals("http") ||
+                uri.getScheme().equals("https")
+              )
+            ) {
+              // It's a remote URL
+              RemoteAudioAsset remoteAudioAsset = new RemoteAudioAsset(
+                this,
+                audioId,
+                uri,
+                audioChannelNum,
+                (float) volume
+              );
+              audioAssetList.put(audioId, remoteAudioAsset);
+              call.resolve(status);
+              return;
+            } else {
+              // It's a local file path
+              // Check if fullPath starts with "public/" and prepend if necessary
+              if (!fullPath.startsWith("public/")) {
+                fullPath = "public/".concat(fullPath);
+              }
+              Context ctx = getContext().getApplicationContext(); // Use getContext() directly
+              AssetManager am = ctx.getResources().getAssets();
+              // Remove the redefinition of assetFileDescriptor
+              assetFileDescriptor = am.openFd(fullPath);
+            }
+          } catch (Exception e) {
+            call.reject("Error loading audio", e);
+            return;
           }
-          Context ctx = (Application) this.getContext().getApplicationContext();
-          AssetManager am = ctx.getResources().getAssets();
-          assetFileDescriptor = am.openFd(fullPath);
         }
 
         AudioAsset asset = new AudioAsset(
@@ -483,8 +514,6 @@ public class NativeAudio
         );
         audioAssetList.put(audioId, asset);
 
-        JSObject status = new JSObject();
-        status.put("STATUS", "OK");
         call.resolve(status);
       } else {
         call.reject(ERROR_AUDIO_EXISTS);

package/android/src/main/java/ee/forgr/audio/RemoteAudioAsset.java

@@ -0,0 +1,87 @@
+package ee.forgr.audio;
+
+import android.media.MediaPlayer;
+import android.net.Uri;
+
+public class RemoteAudioAsset extends AudioAsset {
+
+  private MediaPlayer mediaPlayer;
+
+  public RemoteAudioAsset(
+    NativeAudio owner,
+    String assetId,
+    Uri uri,
+    int audioChannelNum,
+    float volume
+  ) throws Exception {
+    super(owner, assetId, null, audioChannelNum, volume);
+    mediaPlayer = new MediaPlayer();
+    mediaPlayer.setDataSource(owner.getContext(), uri);
+    mediaPlayer.setVolume(volume, volume);
+    mediaPlayer.prepareAsync(); // Prepare asynchronously to not block the main thread
+  }
+
+  @Override
+  public void play(Double time) throws Exception {
+    if (mediaPlayer != null) {
+      if (time != null) {
+        mediaPlayer.seekTo((int) (time * 1000));
+      }
+      mediaPlayer.start();
+    } else {
+      throw new Exception("MediaPlayer is null");
+    }
+  }
+
+  @Override
+  public boolean pause() throws Exception {
+    if (mediaPlayer != null && mediaPlayer.isPlaying()) {
+      mediaPlayer.pause();
+      return true; // Return true to indicate that the audio was paused
+    }
+    return false;
+  }
+
+  @Override
+  public void resume() throws Exception {
+    if (mediaPlayer != null && !mediaPlayer.isPlaying()) {
+      mediaPlayer.start();
+    }
+  }
+
+  @Override
+  public void stop() throws Exception {
+    if (mediaPlayer != null) {
+      mediaPlayer.stop();
+      mediaPlayer.prepare(); // Call prepare to reset the MediaPlayer to the Idle state
+    }
+  }
+
+  @Override
+  public void loop() throws Exception {
+    if (mediaPlayer != null) {
+      mediaPlayer.setLooping(true);
+      mediaPlayer.start();
+    }
+  }
+
+  @Override
+  public void unload() throws Exception {
+    if (mediaPlayer != null) {
+      mediaPlayer.release();
+      mediaPlayer = null;
+    }
+  }
+
+  @Override
+  public void setVolume(float volume) throws Exception {
+    if (mediaPlayer != null) {
+      mediaPlayer.setVolume(volume, volume);
+    }
+  }
+
+  @Override
+  public boolean isPlaying() throws Exception {
+    return mediaPlayer != null && mediaPlayer.isPlaying();
+  }
+}

package/ios/Plugin/AudioAsset.swift

@@ -75,7 +75,7 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
             player = channels[playIndex]
             player.currentTime = time
             player.numberOfLoops = 0
-            if (delay > 0) {
+            if delay > 0 {
                 player.play(atTime: player.deviceCurrentTime + delay)
             } else {
                 player.play()

package/ios/Plugin/Plugin.swift

@@ -35,12 +35,9 @@ public class NativeAudio: CAPPlugin {
         }
 
         let focus = call.getBool(Constant.FocusAudio) ?? false
-
         do {
-
             if focus {
-
-                try self.session.setCategory(AVAudioSession.Category.playback)
+                try self.session.setCategory(AVAudioSession.Category.playback, options: .duckOthers)
 
             }
 
@@ -78,7 +75,7 @@ public class NativeAudio: CAPPlugin {
 
                         if focus {
 
-                            try self.session.setCategory(AVAudioSession.Category.ambient)
+                            try self.session.setCategory(AVAudioSession.Category.ambient, options: .duckOthers)
 
                         } else {
 
@@ -263,7 +260,7 @@ public class NativeAudio: CAPPlugin {
         let channels: Int?
         let volume: Float?
         let delay: Float?
-        let isUrl: Bool?
+        var isLocalUrl: Bool = call.getBool("isUrl") ?? false // Existing flag for local URLs
 
         if audioId != "" {
             var assetPath: String = call.getString(Constant.AssetPathKey) ?? ""
@@ -272,12 +269,11 @@ public class NativeAudio: CAPPlugin {
                 volume = call.getFloat("volume") ?? 1.0
                 channels = call.getInt("channels") ?? 1
                 delay = call.getFloat("delay") ?? 1.0
-                isUrl = call.getBool("isUrl") ?? false
             } else {
                 channels = 0
                 volume = 0
                 delay = 0
-                isUrl = false
+                isLocalUrl = false
             }
 
             if audioList.isEmpty {
@@ -289,7 +285,12 @@ public class NativeAudio: CAPPlugin {
             queue.async {
                 if asset == nil {
                     var basePath: String?
-                    if isUrl == false {
+                    if let url = URL(string: assetPath), url.scheme != nil {
+                        // Handle remote URL
+                        let remoteAudioAsset = RemoteAudioAsset(owner: self, withAssetId: audioId, withPath: assetPath, withChannels: channels, withVolume: volume, withFadeDelay: delay)
+                        self.audioList[audioId] = remoteAudioAsset
+                        call.resolve()
+                    } else if isLocalUrl == false {
                         // if assetPath dont start with public/ add it
                         assetPath = assetPath.starts(with: "public/") ? assetPath : "public/" + assetPath
 

package/ios/Plugin/RemoteAudioAsset.swift

@@ -0,0 +1,74 @@
+import AVFoundation
+
+public class RemoteAudioAsset: AudioAsset {
+    var playerItem: AVPlayerItem?
+    var player: AVPlayer?
+
+    override init(owner: NativeAudio, withAssetId assetId: String, withPath path: String!, withChannels channels: Int!, withVolume volume: Float!, withFadeDelay delay: Float!) {
+        super.init(owner: owner, withAssetId: assetId, withPath: path, withChannels: channels, withVolume: volume, withFadeDelay: delay)
+
+        if let url = URL(string: path) {
+            self.playerItem = AVPlayerItem(url: url)
+            self.player = AVPlayer(playerItem: self.playerItem)
+            self.player?.volume = volume
+        }
+    }
+
+    override func play(time: TimeInterval, delay: TimeInterval) {
+        guard let player = self.player else { return }
+        if delay > 0 {
+            // Calculate the future time to play
+            let timeToPlay = CMTimeAdd(CMTimeMakeWithSeconds(player.currentTime().seconds, preferredTimescale: 1), CMTimeMakeWithSeconds(delay, preferredTimescale: 1))
+            player.seek(to: timeToPlay)
+        } else {
+            player.seek(to: CMTimeMakeWithSeconds(time, preferredTimescale: 1))
+        }
+        player.play()
+    }
+
+    override func pause() {
+        player?.pause()
+    }
+
+    override func resume() {
+        player?.play()
+    }
+
+    override func stop() {
+        player?.pause()
+        player?.seek(to: CMTime.zero)
+    }
+
+    override func loop() {
+        player?.actionAtItemEnd = .none
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(playerItemDidReachEnd(notification:)),
+                                               name: .AVPlayerItemDidPlayToEndTime,
+                                               object: player?.currentItem)
+        player?.play()
+    }
+
+    @objc func playerItemDidReachEnd(notification: Notification) {
+        player?.seek(to: CMTime.zero)
+        player?.play()
+    }
+
+    override func unload() {
+        stop()
+        NotificationCenter.default.removeObserver(self)
+        player = nil
+        playerItem = nil
+    }
+
+    override func setVolume(volume: NSNumber!) {
+        player?.volume = volume.floatValue
+    }
+
+    override func setRate(rate: NSNumber!) {
+        player?.rate = rate.floatValue
+    }
+
+    override func isPlaying() -> Bool {
+        return player?.timeControlStatus == .playing
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/native-audio",
-  "version": "6.1.35",
+  "version": "6.2.0",
   "description": "A native plugin for native audio engine",
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",