@sumaris-net/ngx-components 2.4.69 → 2.4.71

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -10497,17 +10497,25 @@ class AudioProvider extends StartableService {
         this._audioType = cordova && Capacitor.isPluginAvailable('NativeAudio') ? 'native' : 'html5';
         console.info(`[audio] Starting audio provider {${this._audioType}}...`);
         // Listen audio mode changed
-        if (this.platform.is('cordova') && this.audioManagement) {
+        if (cordova && this.audioManagement) {
             await this.readAudioMode();
         }
         // Pre-loading system sounds
         console.debug('[audio] Preloading audio sounds...');
+        let errorCount = 0;
         await Promise.all(SYSTEM_SOUNDS.map(s => {
             // Disable vibration in HTML 5 mode
             if (this._audioType === 'html5')
                 s.vibration = undefined;
-            return this.preload(s);
+            return this.preload(s)
+                .catch(_ => errorCount++);
         }));
+        if (errorCount > 0) {
+            console.warn('[audio] Preloading audio sounds [OK] with ${errorCount} errors during preload.');
+        }
+        else {
+            console.debug('[audio] Preloading audio sounds [OK]');
+        }
     }
     playBeepConfirm() {
         return this.play('beep-confirm', {
@@ -10530,10 +10538,14 @@ class AudioProvider extends StartableService {
         return this.play('startup');
     }
     async preload(sound) {
+        if (!sound?.assetId)
+            return; // Skip
+        if (!!this._preloadedSounds[sound.assetId])
+            return; // Already preloaded
         if (isNil(this._audioType))
             await this.ready();
         const assetPath = (this._assetPathPrefix || '') + sound.assetPath;
-        console.info(`[audio] Preloading audio file '${assetPath}'...`);
+        console.info(`[audio] Preloading sound '${sound.assetId}', from file '${assetPath}'...`);
         try {
             if (this._audioType === 'native') {
                 await NativeAudio.preload({
@@ -10548,10 +10560,17 @@ class AudioProvider extends StartableService {
             }
             // Add to map
             this._preloadedSounds[sound.assetId] = sound;
-            console.info(`[audio] Preloading audio file '${assetPath}' [OK]`);
+            console.info(`[audio] Preloading sound '${sound.assetId}' [OK]`);
         }
         catch (err) {
-            console.error(`[audio] Unable to preload audio file '${assetPath}': ${err && err.message || err}\n${err?.originalStack}`);
+            const errorMsg = err?.message || err;
+            if (errorMsg === 'Audio Asset already exists') {
+                console.info(`[audio] Preloading sound '${sound.assetId}': Skipped (${errorMsg})`);
+            }
+            else {
+                console.error(`[audio] Unable to preload sound '${sound.assetId}', from file '${assetPath}': ${errorMsg}\n${err?.originalStack || ''}`);
+                throw err;
+            }
         }
     }
     async play(assetId, opts) {
@@ -10560,7 +10579,7 @@ class AudioProvider extends StartableService {
             await this.ready();
         const sound = this._preloadedSounds[assetId];
         if (!sound) {
-            throw Error(`Unable to find audio with id '${assetId}'. Please call preload() before playing a sound.`);
+            throw Error(`Unable to find sound '${assetId}'. Please call preload() before playing a sound.`);
         }
         // If silent: skip
         if (this._audioMode === AudioManagement.AudioMode.SILENT)