@capgo/native-audio 4.2.2 → 4.2.3

package/ios/Plugin/AudioAsset.swift

@@ -9,31 +9,31 @@
 import AVFoundation
 
 public class AudioAsset: NSObject, AVAudioPlayerDelegate {
-    
+
     var channels: NSMutableArray = NSMutableArray()
     var playIndex: Int = 0
     var assetId: String = ""
     var initialVolume: NSNumber = 1.0
     var fadeDelay: NSNumber = 1.0
     var owner: NativeAudio
-    
+
     let FADE_STEP: Float = 0.05
     let FADE_DELAY: Float = 0.08
-    
-    init(owner:NativeAudio, withAssetId assetId:String, withPath path: String!, withChannels channels: NSNumber!, withVolume volume: NSNumber!, withFadeDelay delay: NSNumber!) {
+
+    init(owner: NativeAudio, withAssetId assetId: String, withPath path: String!, withChannels channels: NSNumber!, withVolume volume: NSNumber!, withFadeDelay delay: NSNumber!) {
 
         self.owner = owner
         self.assetId = assetId
         self.channels = NSMutableArray.init(capacity: channels as! Int)
-        
+
         super.init()
-        
+
         let pathUrl: NSURL! = NSURL.fileURL(withPath: path) as NSURL
-        
+
         for _ in 0..<channels.intValue {
             do {
                 let player: AVAudioPlayer! = try AVAudioPlayer(contentsOf: pathUrl as URL)
-                
+
                 if player != nil {
                     player.volume = volume.floatValue
                     player.prepareToPlay()
@@ -43,11 +43,11 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
                     }
                 }
             } catch {
-                
+
             }
         }
     }
-    
+
     func getCurrentTime() -> TimeInterval {
         if channels.count != 1 {
             return 0
@@ -57,7 +57,7 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
 
         return player.currentTime
     }
-    
+
     func getDuration() -> TimeInterval {
         if channels.count != 1 {
             return 0
@@ -76,11 +76,11 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
         playIndex = Int(truncating: NSNumber(value: playIndex + 1))
         playIndex = Int(truncating: NSNumber(value: playIndex % channels.count))
     }
-    
+
     func playWithFade(time: TimeInterval) {
         let player: AVAudioPlayer! = channels.object(at: playIndex) as? AVAudioPlayer
         player.currentTime = time
-        
+
         if !player.isPlaying {
             player.numberOfLoops = 0
             player.volume = 0
@@ -92,7 +92,7 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
                 player.volume = player.volume + self.FADE_STEP
             }
         }
-        
+
     }
 
     func pause() {
@@ -106,17 +106,17 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
         let timeOffset = player.deviceCurrentTime + 0.01
         player.play(atTime: timeOffset)
     }
-    
+
     func stop() {
         for i in 0..<channels.count {
             let player: AVAudioPlayer! = channels.object(at: i) as? AVAudioPlayer
             player.stop()
         }
     }
-    
+
     func stopWithFade() {
         let player: AVAudioPlayer! = channels.object(at: playIndex) as? AVAudioPlayer
-        
+
         if !player.isPlaying {
             player.currentTime = 0.0
             player.numberOfLoops = 0
@@ -125,51 +125,50 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
             playIndex = Int(truncating: NSNumber(value: playIndex + 1))
             playIndex = Int(truncating: NSNumber(value: playIndex % channels.count))
         } else {
-            if player.volume < initialVolume.floatValue
-            {
+            if player.volume < initialVolume.floatValue {
                 player.volume = player.volume + self.FADE_STEP
             }
         }
     }
-    
+
     func loop() {
         self.stop()
-        
+
         let player: AVAudioPlayer! = channels.object(at: Int(playIndex)) as? AVAudioPlayer
         player.numberOfLoops = -1
         player.play()
         playIndex = Int(truncating: NSNumber(value: playIndex + 1))
         playIndex = Int(truncating: NSNumber(value: playIndex % channels.count))
     }
-    
+
     func unload() {
         self.stop()
-        
-//        for i in 0..<channels.count {
-//            var player: AVAudioPlayer! = channels.object(at: i) as? AVAudioPlayer
-//
-//            player = nil
-//        }
-        
+
+        //        for i in 0..<channels.count {
+        //            var player: AVAudioPlayer! = channels.object(at: i) as? AVAudioPlayer
+        //
+        //            player = nil
+        //        }
+
         channels = NSMutableArray()
     }
-    
+
     func setVolume(volume: NSNumber!) {
         for i in 0..<channels.count {
             let player: AVAudioPlayer! = channels.object(at: i) as? AVAudioPlayer
             player.volume = volume.floatValue
         }
     }
-    
+
     public func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
         NSLog("playerDidFinish")
         self.owner.notifyListeners("complete", data: [
             "assetId": self.assetId
         ])
     }
-    
+
     func playerDecodeError(player: AVAudioPlayer!, error: NSError!) {
-        
+
     }
 
     func isPlaying() -> Bool {

package/ios/Plugin/Plugin.swift

@@ -14,11 +14,11 @@ enum MyError: Error {
 @objc(NativeAudio)
 public class NativeAudio: CAPPlugin {
 
-    var audioList: [String : Any] = [:]
+    var audioList: [String: Any] = [:]
     var fadeMusic = false
     var session = AVAudioSession.sharedInstance()
 
-    public override func load() {
+    override public func load() {
         super.load()
 
         self.fadeMusic = false
@@ -72,7 +72,7 @@ public class NativeAudio: CAPPlugin {
                                 audioAsset?.play(time: time)
                             }
                             call.resolve()
-                        } else if (asset is Int32) {
+                        } else if asset is Int32 {
                             let audioAsset = asset as? NSNumber ?? 0
                             AudioServicesPlaySystemSound(SystemSoundID(audioAsset.intValue ))
                             call.resolve()
@@ -101,7 +101,6 @@ public class NativeAudio: CAPPlugin {
         return nil
     }
 
-
     @objc func getDuration(_ call: CAPPluginCall) {
         guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
             return
@@ -165,7 +164,7 @@ public class NativeAudio: CAPPlugin {
             let asset = self.audioList[audioId]
             if asset != nil && asset is AudioAsset {
                 let audioAsset = asset as! AudioAsset
-                audioAsset.unload();
+                audioAsset.unload()
                 self.audioList[audioId] = nil
             }
         }
@@ -182,7 +181,7 @@ public class NativeAudio: CAPPlugin {
         audioAsset.setVolume(volume: volume as NSNumber)
         call.resolve()
     }
-  
+
     @objc func isPlaying(_ call: CAPPluginCall) {
         guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
             return
@@ -192,7 +191,7 @@ public class NativeAudio: CAPPlugin {
             "isPlaying": audioAsset.isPlaying()
         ])
     }
-  
+
     private func preloadAsset(_ call: CAPPluginCall, isComplex complex: Bool) {
         let audioId = call.getString(Constant.AssetIdKey) ?? ""
         let channels: NSNumber?
@@ -203,7 +202,7 @@ public class NativeAudio: CAPPlugin {
         if audioId != "" {
             let assetPath: String = call.getString(Constant.AssetPathKey) ?? ""
 
-            if (complex) {
+            if complex {
                 volume = call.getFloat("volume") ?? 1.0
                 channels = NSNumber(value: call.getInt("channels") ?? 1)
                 delay = NSNumber(value: call.getInt("delay") ?? 1)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/native-audio",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "A native plugin for native audio engine",
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
@@ -26,13 +26,13 @@
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- autocorrect --format",
+    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --autocorrect --format",
     "eslint": "eslint . --ext ts",
     "prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api NativeAudio --output-readme README.md --output-json dist/docs.json",
     "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
-    "clean": "rimraf ./dist",
+    "clean": "rimraf ./dist && cd android && ./gradlew clean && cd ..",
     "watch": "tsc --watch",
     "prepublishOnly": "npm run build",
     "prepare": "husky install"