speechrecorderng 3.0.0 → 3.0.1

package/fesm2020/speechrecorderng.mjs

@@ -2291,6 +2291,17 @@ class SprRecordingFile extends RecordingFile {
     }
 }
 class RecordingFileUtils {
+    static equals(recordinFile, otherRecordingFile) {
+        if (recordinFile && otherRecordingFile) {
+            if (otherRecordingFile === recordinFile) {
+                return true;
+            }
+            if (otherRecordingFile.uuid === recordinFile.uuid) {
+                return true;
+            }
+        }
+        return false;
+    }
     static setAudioData(rf, audioDataHolder) {
         rf.audioDataHolder = audioDataHolder;
         if (audioDataHolder) {
@@ -9163,8 +9174,15 @@ class BasicRecFilesCache {
     constructor() {
         //public static readonly DEFAULT_MAX_SAMPLES=30*48000;  // TEST 30 seconds
         this._sampleCount = 0;
-        this.maxSampleCount = SprItemsCache.DEFAULT_MAX_SAMPLES;
-        this.currentRecordingFile = null;
+        this.maxSampleCount = BasicRecFilesCache.DEFAULT_MAX_SAMPLES;
+        this._currentRecordingFile = null;
+    }
+    get currentRecordingFile() {
+        return this._currentRecordingFile;
+    }
+    set currentRecordingFile(value) {
+        this._currentRecordingFile = value;
+        this.expire();
     }
 }
 BasicRecFilesCache.DEBUG = false;
@@ -9189,7 +9207,7 @@ class SprItemsCache extends BasicRecFilesCache {
     tryExpire(toBeExpiredRf) {
         if (BasicRecFilesCache.DEBUG)
             console.debug("Rec. files cache: " + toBeExpiredRf.toString() + " try expire:");
-        if (!toBeExpiredRf.equals(this.currentRecordingFile)) {
+        if (!RecordingFileUtils.equals(toBeExpiredRf, this.currentRecordingFile)) {
             if (BasicRecFilesCache.DEBUG)
                 console.debug("Rec. files cache: " + toBeExpiredRf.toString() + " not current file...");
             if (toBeExpiredRf.serverPersisted) {
@@ -9308,12 +9326,18 @@ class RecFilesCache extends BasicRecFilesCache {
                 }
                 let toBeExpiredRf = this._recFiles[rfI];
                 if (toBeExpiredRf.serverPersisted) {
-                    // expire recording files first stored to the cache
-                    let expiredAudio = RecordingFileUtils.expireAudioData(toBeExpiredRf);
-                    if (expiredAudio) {
-                        this._sampleCount -= expiredAudio.sampleCounts();
+                    if (!RecordingFileUtils.equals(toBeExpiredRf, this.currentRecordingFile)) {
+                        // expire recording files first stored to the cache
+                        let expiredAudio = RecordingFileUtils.expireAudioData(toBeExpiredRf);
+                        if (expiredAudio) {
+                            this._sampleCount -= expiredAudio.sampleCounts();
+                            if (BasicRecFilesCache.DEBUG)
+                                console.debug("Rec. files cache: Expired #" + rfI + ". Cache samples: " + this._sampleCount);
+                        }
+                    }
+                    else {
                         if (BasicRecFilesCache.DEBUG)
-                            console.debug("Rec. files cache: Expired #" + rfI + ". Cache samples: " + this._sampleCount);
+                            console.debug("Rec. files cache: #" + rfI + " is current file. (not expiring)");
                     }
                 }
                 else {
@@ -9439,33 +9463,30 @@ class RecordingService {
             }
             if (recordingFile.session && recFileId) {
                 let obs = this.fetchAudiofile(projectName, recordingFile.session, recFileId);
-                obs.subscribe({
-                    next: resp => {
-                        // Do not use Promise version, which does not work with Safari 13 (13.0.5)
-                        if (resp.body) {
-                            aCtx.decodeAudioData(resp.body, ab => {
-                                observer.next(ab);
-                                observer.complete();
-                            }, error => {
-                                observer.error(error);
-                                observer.complete();
-                            });
-                        }
-                        else {
-                            observer.error('Fetching audio file: response has no body');
-                        }
-                    },
-                    error: (error) => {
-                        if (error.status == 404) {
-                            // Interpret not as an error, the file ist not recorded yet
-                            observer.next(null);
+                obs.subscribe(resp => {
+                    // Do not use Promise version, which does not work with Safari 13 (13.0.5)
+                    if (resp.body) {
+                        aCtx.decodeAudioData(resp.body, ab => {
+                            observer.next(ab);
                             observer.complete();
-                        }
-                        else {
-                            // all other states are errors
+                        }, error => {
                             observer.error(error);
                             observer.complete();
-                        }
+                        });
+                    }
+                    else {
+                        observer.error('Fetching audio file: response has no body');
+                    }
+                }, (error) => {
+                    if (error.status == 404) {
+                        // Interpret not as an error, the file ist not recorded yet
+                        observer.next(null);
+                        observer.complete();
+                    }
+                    else {
+                        // all other states are errors
+                        observer.error(error);
+                        observer.complete();
                     }
                 });
             }
@@ -13886,7 +13907,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
                 }]
         }] });
 
-const VERSION = '3.0.0';
+const VERSION = '3.0.1';
 
 /*
  * Public API Surface of speechrecorderng