speechrecorderng 2.24.0 → 2.25.0

package/fesm2015/speechrecorderng.mjs

@@ -19,6 +19,7 @@ import * as i1$2 from '@angular/material/dialog';
 import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
 import * as i3$2 from '@angular/material/button';
 import { MatButtonModule } from '@angular/material/button';
+import { __decorate, __param } from 'tslib';
 import * as i1$3 from '@angular/material/progress-spinner';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import * as i8 from '@angular/flex-layout/flex';
@@ -1047,17 +1048,45 @@ class AudioCapture {
         this._opened = false;
     }
     audioBuffer() {
-        var frameLen = 0;
-        var ch0Data = this.data[0];
-        for (var ch0Chk of ch0Data) {
+        let frameLen = 0;
+        let ch0Data = this.data[0];
+        for (let ch0Chk of ch0Data) {
             frameLen += ch0Chk.length;
         }
-        var ab = this.context.createBuffer(this.channelCount, frameLen, this.context.sampleRate);
-        for (var ch = 0; ch < this.channelCount; ch++) {
-            var chD = ab.getChannelData(ch);
-            var pos = 0;
-            for (var chChk of this.data[ch]) {
-                var bufLen = chChk.length;
+        let ab;
+        try {
+            ab = this.context.createBuffer(this.channelCount, frameLen, this.context.sampleRate);
+        }
+        catch (err) {
+            if (err instanceof DOMException) {
+                if (err.name === 'NotSupportedError') {
+                    if (frameLen == 0) {
+                        // Empty buffers are not supported by Chromium
+                        // Create dummy buffer with one sample
+                        ab = this.context.createBuffer(this.channelCount, 1, this.context.sampleRate);
+                    }
+                    else {
+                        throw err;
+                    }
+                }
+                else {
+                    throw err;
+                }
+            }
+            else if (err instanceof RangeError) {
+                // Out of memory
+                // TODO What to do ??
+                throw err;
+            }
+            else {
+                throw err;
+            }
+        }
+        for (let ch = 0; ch < this.channelCount; ch++) {
+            let chD = ab.getChannelData(ch);
+            let pos = 0;
+            for (let chChk of this.data[ch]) {
+                let bufLen = chChk.length;
                 chD.set(chChk, pos);
                 pos += bufLen;
             }
@@ -5633,98 +5662,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
                 type: Output
             }] } });
 
-class Float32ArrayChunkerOutStream {
-    constructor(outStream) {
-        this.outStream = outStream;
-        this.bufs = new Array();
-        this._channels = 0;
-        this._chunkSize = 0;
-        this.filled = 0;
-        this.receivedFrames = 0;
-        this.sentFrames = 0;
-    }
-    createBuffers() {
-        this.bufs = new Array(this._channels);
-        for (let ch = 0; ch < this._channels; ch++) {
-            this.bufs[ch] = new Float32Array(this._chunkSize);
-        }
-    }
-    set chunkSize(chunkSize) {
-        this._chunkSize = chunkSize;
-        this.createBuffers();
-    }
-    set channels(channels) {
-        this._channels = channels;
-        this.createBuffers();
-    }
-    write(buffers) {
-        let copied = 0;
-        if (buffers.length > 0) {
-            let buffersLen = buffers[0].length;
-            this.receivedFrames += buffersLen;
-            let avail = buffersLen;
-            // Fill out buffers until all values copied
-            while (avail > 0) {
-                let toFill = this._chunkSize - this.filled;
-                if (toFill > avail) {
-                    toFill = avail;
-                }
-                let sliceEnd = copied + toFill;
-                // Firefox on Android sends only the first channel
-                for (let ch = 0; ch < buffersLen; ch++) {
-                    if (buffers[ch]) {
-                        let cpPrt = buffers[ch].slice(copied, sliceEnd);
-                        let buf = this.bufs[ch];
-                        buf.set(cpPrt, this.filled);
-                    }
-                }
-                copied += toFill;
-                avail -= toFill;
-                this.filled += toFill;
-                if (this.filled == this._chunkSize) {
-                    this.outStream.write(this.bufs);
-                    this.sentFrames += this.filled;
-                    this.filled = 0;
-                }
-            }
-        }
-        return copied;
-    }
-    flush() {
-        if (this.filled > 0) {
-            let restBufs = new Array(this._channels);
-            for (let ch = 0; ch < this._channels; ch++) {
-                restBufs[ch] = this.bufs[ch].slice(0, this.filled);
-            }
-            this.outStream.write(restBufs);
-            this.outStream.flush();
-            this.sentFrames += this.filled;
-            this.filled = 0;
-        }
-    }
-    close() {
-        this.outStream.close();
-    }
-}
-
-class SequenceAudioFloat32ChunkerOutStream extends Float32ArrayChunkerOutStream {
-    constructor(outStream, chunkDurationSeconds) {
-        super(outStream);
-        this.chunkDurationSeconds = chunkDurationSeconds;
-        this.sampleRate = null;
-        this.sequenceAudioFloat32OutStream = outStream;
-    }
-    setFormat(channels, sampleRate) {
-        this.channels = channels;
-        this.sampleRate = sampleRate;
-        this.chunkSize = Math.round(sampleRate * this.chunkDurationSeconds);
-        this.sequenceAudioFloat32OutStream.setFormat(channels, sampleRate);
-    }
-    nextStream() {
-        this.sequenceAudioFloat32OutStream.nextStream();
-    }
-}
-
 class SessionFinishedDialog {
     constructor(dialogRef, data) {
         this.dialogRef = dialogRef;
@@ -7260,23 +7197,209 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
                 type: Input
             }] } });
 
+class Float32ArrayChunkerOutStream {
+    constructor(outStream) {
+        this.outStream = outStream;
+        this.bufs = new Array();
+        this._channels = 0;
+        this._chunkSize = 0;
+        this.filled = 0;
+        this.receivedFrames = 0;
+        this.sentFrames = 0;
+    }
+    createBuffers() {
+        this.bufs = new Array(this._channels);
+        for (let ch = 0; ch < this._channels; ch++) {
+            this.bufs[ch] = new Float32Array(this._chunkSize);
+        }
+    }
+    set chunkSize(chunkSize) {
+        this._chunkSize = chunkSize;
+        this.createBuffers();
+    }
+    get chunkSize() {
+        return this._chunkSize;
+    }
+    set channels(channels) {
+        this._channels = channels;
+        this.createBuffers();
+    }
+    get channels() {
+        return this._channels;
+    }
+    available() {
+        return this._chunkSize - this.filled;
+    }
+    write(buffers) {
+        let copied = 0;
+        if (buffers.length > 0) {
+            let buffersLen = buffers[0].length;
+            this.receivedFrames += buffersLen;
+            let avail = buffersLen;
+            // Fill out buffers until all values copied
+            while (avail > 0) {
+                let toFill = this._chunkSize - this.filled;
+                if (toFill > avail) {
+                    toFill = avail;
+                }
+                let sliceEnd = copied + toFill;
+                // Firefox on Android sends only the first channel
+                for (let ch = 0; ch < buffersLen; ch++) {
+                    if (buffers[ch]) {
+                        let cpPrt = buffers[ch].slice(copied, sliceEnd);
+                        let buf = this.bufs[ch];
+                        buf.set(cpPrt, this.filled);
+                    }
+                }
+                copied += toFill;
+                avail -= toFill;
+                this.filled += toFill;
+                if (this.filled == this._chunkSize) {
+                    this.outStream.write(this.bufs);
+                    this.sentFrames += this.filled;
+                    this.filled = 0;
+                }
+            }
+        }
+        return copied;
+    }
+    flush() {
+        if (this.filled > 0) {
+            let restBufs = new Array(this._channels);
+            for (let ch = 0; ch < this._channels; ch++) {
+                restBufs[ch] = this.bufs[ch].slice(0, this.filled);
+            }
+            this.outStream.write(restBufs);
+            this.outStream.flush();
+            this.sentFrames += this.filled;
+            this.filled = 0;
+        }
+    }
+    close() {
+        this.outStream.close();
+    }
+}
+
+class SequenceAudioFloat32ChunkerOutStream extends Float32ArrayChunkerOutStream {
+    constructor(outStream, chunkDurationSeconds) {
+        super(outStream);
+        this.chunkDurationSeconds = chunkDurationSeconds;
+        this.sampleRate = null;
+        this.sequenceAudioFloat32OutStream = outStream;
+    }
+    setFormat(channels, sampleRate) {
+        console.debug("SequenceAudioFloat32ChunkerOutStream:setFormat(channels: " + channels + ",sampleRate: " + sampleRate + ")");
+        this.channels = channels;
+        this.sampleRate = sampleRate;
+        this.chunkSize = Math.round(sampleRate * this.chunkDurationSeconds);
+        console.debug("SequenceAudioFloat32ChunkerOutStream: chunkSize: " + this.chunkSize);
+        this.sequenceAudioFloat32OutStream.setFormat(channels, sampleRate);
+    }
+    nextStream() {
+        this.sequenceAudioFloat32OutStream.nextStream();
+    }
+}
+/**
+ * Streams a SequenceAudioFloat32OutStream to multiple streams
+ */
+class SequenceAudioFloat32OutStreamMultiplier {
+    constructor() {
+        this._sequenceAudioFloat32OutStreams = new Array();
+    }
+    get sequenceAudioFloat32OutStreams() {
+        return this._sequenceAudioFloat32OutStreams;
+    }
+    setFormat(channels, sampleRate) {
+        for (let os of this._sequenceAudioFloat32OutStreams) {
+            os.setFormat(channels, sampleRate);
+        }
+    }
+    nextStream() {
+        for (let os of this._sequenceAudioFloat32OutStreams) {
+            os.nextStream();
+        }
+    }
+    close() {
+        for (let os of this._sequenceAudioFloat32OutStreams) {
+            os.close();
+        }
+    }
+    flush() {
+        for (let os of this._sequenceAudioFloat32OutStreams) {
+            os.flush();
+        }
+    }
+    write(buffers) {
+        let toWrite = buffers.length;
+        for (let os of this._sequenceAudioFloat32OutStreams) {
+            os.write(buffers);
+        }
+        return toWrite;
+    }
+}
+
 const FORCE_REQUEST_AUDIO_PERMISSIONS = false;
 const RECFILE_API_CTX = 'recfile';
 const MAX_RECORDING_TIME_MS = 1000 * 60 * 60 * 60; // 1 hour
 const LEVEL_BAR_INTERVALL_SECONDS = 0.1; // 100ms
-class BasicRecorder {
-    constructor(dialog, sessionService) {
+class ChunkManager {
+    constructor(chunkAudioBufferReceiver) {
+        this.chunkAudioBufferReceiver = chunkAudioBufferReceiver;
+        this.channels = 0;
+        this.sampleRate = -1;
+        this.chunkIdx = 0;
+    }
+    set recordingFile(value) {
+        this._rf = value;
+    }
+    close() {
+        // Nothing to do
+    }
+    flush() {
+        this.chunkAudioBufferReceiver.postAudioStreamEnd(this.chunkIdx);
+    }
+    nextStream() {
+        // reset chunk counter
+        this.chunkIdx = 0;
+        this.chunkAudioBufferReceiver.postAudioStreamStart();
+    }
+    setFormat(channels, sampleRate) {
+        this.channels = channels;
+        this.sampleRate = sampleRate;
+    }
+    write(buffers) {
+        let aCtx = AudioContextProvider.audioContextInstance();
+        let bChs = buffers.length;
+        let frameLen = 0;
+        if (aCtx && bChs > 0) {
+            frameLen = buffers[0].length;
+            let ad = aCtx.createBuffer(this.channels, frameLen, this.sampleRate);
+            for (let ch = 0; ch < this.channels; ch++) {
+                ad.copyToChannel(buffers[ch], ch);
+            }
+            this.chunkAudioBufferReceiver.postChunkAudioBuffer(ad, this.chunkIdx);
+            this.chunkIdx++;
+        }
+        return frameLen;
+    }
+}
+let BasicRecorder = class BasicRecorder {
+    constructor(dialog, sessionService, uploader, config) {
         this.dialog = dialog;
         this.sessionService = sessionService;
+        this.uploader = uploader;
+        this.config = config;
         this.statusMsg = '';
         this.statusWaiting = false;
         this.readonly = false;
+        this.rfUuid = null;
         this.processingRecording = false;
         this.ac = null;
         this._wakeLock = false;
         this._selectedDeviceId = undefined;
         this._channelCount = 2;
         this._session = null;
+        this.startedDate = null;
         this.uploadProgress = 100;
         this.uploadStatus = 'ok';
         this.audioSignalCollapsed = true;
@@ -7286,7 +7409,10 @@ class BasicRecorder {
         this.audioFetchSubscription = null;
         this.destroyed = false;
         this.navigationDisabled = true;
+        // Default: Do not try to keep the device awake
         this.noSleep = null;
+        // Default: Disabled chunked upload
+        this._uploadChunkSizeSeconds = null;
         this.userAgent = UserAgentBuilder.userAgent();
         console.debug("Detected platform: " + this.userAgent.detectedPlatform);
         console.debug("Detected browser: " + this.userAgent.detectedBrowser);
@@ -7296,6 +7422,16 @@ class BasicRecorder {
         this.streamLevelMeasure = new StreamLevelMeasure();
         this.selCaptureDeviceId = null;
     }
+    get uploadChunkSizeSeconds() {
+        return this._uploadChunkSizeSeconds;
+    }
+    set uploadChunkSizeSeconds(value) {
+        let oldValue = this.uploadChunkSizeSeconds;
+        this._uploadChunkSizeSeconds = value;
+        if (value !== oldValue) {
+            this.configureStreamCaptureStream();
+        }
+    }
     get wakeLock() {
         return this._wakeLock;
     }
@@ -7309,12 +7445,14 @@ class BasicRecorder {
             }
             if (!this.noSleep.isEnabled) {
                 this.noSleep.enable();
+                console.debug("Enabled wake lock.");
             }
         }
     }
     disableWakeLockCond() {
         if (this.noSleep && this.noSleep.isEnabled) {
             this.noSleep.disable();
+            console.debug("Disabled wake lock.");
         }
     }
     set audioDevices(audioDevices) {
@@ -7336,6 +7474,27 @@ class BasicRecorder {
         this.statusAlertType = 'info';
         this.statusMsg = 'Ready.';
     }
+    configureStreamCaptureStream() {
+        let outStream;
+        if (this.uploadChunkSizeSeconds) {
+            // Multiply the capture stream to...
+            let sasm = new SequenceAudioFloat32OutStreamMultiplier();
+            // ...upload audio data in chunks...
+            let chMng = new ChunkManager(this); // The chunk manager connects the chunked audio stream to this class to upload the chunks
+            let chOsUpload = new SequenceAudioFloat32ChunkerOutStream(chMng, this.uploadChunkSizeSeconds); // The audio stream chunker itself
+            sasm.sequenceAudioFloat32OutStreams.push(chOsUpload);
+            // ...and to measure the level
+            let chOsLvlMeas = new SequenceAudioFloat32ChunkerOutStream(this.streamLevelMeasure, LEVEL_BAR_INTERVALL_SECONDS);
+            sasm.sequenceAudioFloat32OutStreams.push(chOsLvlMeas);
+            outStream = sasm;
+        }
+        else {
+            outStream = new SequenceAudioFloat32ChunkerOutStream(this.streamLevelMeasure, LEVEL_BAR_INTERVALL_SECONDS);
+        }
+        if (this.ac) {
+            this.ac.audioOutStream = outStream;
+        }
+    }
     start() {
         this.statusAlertType = 'info';
         this.statusMsg = 'Starting session...';
@@ -7542,6 +7701,75 @@ class BasicRecorder {
             });
         }
     }
+    startItem() {
+        this.startedDate = null;
+        this.enableWakeLockCond();
+        this.rfUuid = UUID.generate();
+        this.transportActions.startAction.disabled = true;
+        this.transportActions.pauseAction.disabled = true;
+        if (this.readonly) {
+            return;
+        }
+    }
+    started() {
+        if (!this.startedDate) {
+            this.startedDate = new Date();
+        }
+        this.transportActions.startAction.disabled = true;
+    }
+    postRecording(wavFile, recUrl) {
+        let wavBlob = new Blob([wavFile], { type: 'audio/wav' });
+        let ul = new Upload(wavBlob, recUrl);
+        this.uploader.queueUpload(ul);
+    }
+    postAudioStreamStart() {
+        var _a;
+        if (this.rfUuid) {
+            let apiEndPoint = '';
+            if (this.config && this.config.apiEndPoint) {
+                apiEndPoint = this.config.apiEndPoint;
+            }
+            if (apiEndPoint !== '') {
+                apiEndPoint = apiEndPoint + '/';
+            }
+            let sessionsUrl = apiEndPoint + SessionService.SESSION_API_CTX;
+            let recUrl = sessionsUrl + '/' + ((_a = this.session) === null || _a === void 0 ? void 0 : _a.sessionId) + '/' + RECFILE_API_CTX + '/' + this.rfUuid + '/prepareChunksRequest';
+            let fd = new FormData();
+            // Note: At least one parameter must be set
+            fd.set('uuid', this.rfUuid);
+            if (!this.startedDate) {
+                this.startedDate = new Date();
+            }
+            fd.set('startedDate', this.startedDate.toJSON());
+            let ul = new Upload(fd, recUrl);
+            this.uploader.queueUpload(ul);
+        }
+        else {
+            console.error("Recording file UUID not set!");
+        }
+    }
+    postAudioStreamEnd(chunkCount) {
+        var _a;
+        if (this.rfUuid) {
+            let apiEndPoint = '';
+            if (this.config && this.config.apiEndPoint) {
+                apiEndPoint = this.config.apiEndPoint;
+            }
+            if (apiEndPoint !== '') {
+                apiEndPoint = apiEndPoint + '/';
+            }
+            let sessionsUrl = apiEndPoint + SessionService.SESSION_API_CTX;
+            let recUrl = sessionsUrl + '/' + ((_a = this.session) === null || _a === void 0 ? void 0 : _a.sessionId) + '/' + RECFILE_API_CTX + '/' + this.rfUuid + '/concatChunksRequest';
+            let fd = new FormData();
+            fd.set('uuid', this.rfUuid);
+            fd.set('chunkCount', chunkCount.toString());
+            let ul = new Upload(fd, recUrl);
+            this.uploader.queueUpload(ul);
+        }
+        else {
+            console.error("Recording file UUID not set!");
+        }
+    }
     closed() {
         this.statusAlertType = 'info';
         this.statusMsg = 'Session closed.';
@@ -7558,7 +7786,11 @@ class BasicRecorder {
             }
         });
     }
-}
+};
+BasicRecorder.DEFAULT_CHUNK_SIZE_SECONDS = 30;
+BasicRecorder = __decorate([
+    __param(3, Inject(SPEECHRECORDER_CONFIG))
+], BasicRecorder);
 
 /**
  * Created by klausj on 17.06.2017.
@@ -7872,7 +8104,7 @@ const DEFAULT_PRE_REC_DELAY = 1000;
 const DEFAULT_POST_REC_DELAY = 500;
 class SessionManager extends BasicRecorder {
     constructor(changeDetectorRef, renderer, dialog, sessionService, recFileService, uploader, config) {
-        super(dialog, sessionService);
+        super(dialog, sessionService, uploader, config);
         this.changeDetectorRef = changeDetectorRef;
         this.renderer = renderer;
         this.dialog = dialog;
@@ -7975,7 +8207,7 @@ class SessionManager extends BasicRecorder {
             if (this.ac) {
                 this.transportActions.startAction.onAction = () => this.startItem();
                 this.ac.listener = this;
-                this.ac.audioOutStream = new SequenceAudioFloat32ChunkerOutStream(this.streamLevelMeasure, LEVEL_BAR_INTERVALL_SECONDS);
+                this.configureStreamCaptureStream();
                 // Don't list the devices here. If we do not have audio permissions we only get anonymized devices without labels.
                 //this.ac.listDevices();
             }
@@ -8121,12 +8353,7 @@ class SessionManager extends BasicRecorder {
         }
     }
     startItem() {
-        this.enableWakeLockCond();
-        this.transportActions.startAction.disabled = true;
-        this.transportActions.pauseAction.disabled = true;
-        if (this.readonly) {
-            return;
-        }
+        super.startItem();
         this.transportActions.fwdAction.disabled = true;
         this.transportActions.fwdNextAction.disabled = true;
         this.transportActions.bwdAction.disabled = true;
@@ -8425,8 +8652,8 @@ class SessionManager extends BasicRecorder {
         }
     }
     started() {
+        super.started();
         this.status = 2 /* PRE_RECORDING */;
-        this.transportActions.startAction.disabled = true;
         this.startStopSignalState = 1 /* PRERECORDING */;
         if (this._session) {
             if (this._session.status === "LOADED") {
@@ -8595,7 +8822,7 @@ class SessionManager extends BasicRecorder {
                 rf = new SprRecordingFile(sessId, ic, it.recs.length, ad);
                 it.recs.push(rf);
             }
-            if (this.enableUploadRecordings) {
+            if (this.enableUploadRecordings && !this.uploadChunkSizeSeconds) {
                 // TODO use SpeechRecorderconfig resp. RecfileService
                 // convert asynchronously to 16-bit integer PCM
                 // TODO could we avoid conversion to save CPU resources and transfer float PCM directly?
@@ -8674,6 +8901,25 @@ class SessionManager extends BasicRecorder {
         }
         this.changeDetectorRef.detectChanges();
     }
+    postChunkAudioBuffer(audioBuffer, chunkIdx) {
+        var _a;
+        this.processingRecording = true;
+        let ww = new WavWriter();
+        //new REST API URL
+        let apiEndPoint = '';
+        if (this.config && this.config.apiEndPoint) {
+            apiEndPoint = this.config.apiEndPoint;
+        }
+        if (apiEndPoint !== '') {
+            apiEndPoint = apiEndPoint + '/';
+        }
+        let sessionsUrl = apiEndPoint + SessionService.SESSION_API_CTX;
+        let recUrl = sessionsUrl + '/' + ((_a = this.session) === null || _a === void 0 ? void 0 : _a.sessionId) + '/' + RECFILE_API_CTX + '/' + this.promptItem.itemcode + '/' + this.rfUuid + '/' + chunkIdx;
+        ww.writeAsync(audioBuffer, (wavFile) => {
+            this.postRecording(wavFile, recUrl);
+            this.processingRecording = false;
+        });
+    }
     postRecording(wavFile, recUrl) {
         let wavBlob = new Blob([wavFile], { type: 'audio/wav' });
         let ul = new Upload(wavBlob, recUrl);
@@ -8853,6 +9099,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
             }] } });
 
 class RecorderComponent {
+    constructor(uploader) {
+        this.uploader = uploader;
+        this.dataSaved = true;
+    }
 }
 
 /**
@@ -8905,7 +9155,7 @@ var Mode;
 })(Mode || (Mode = {}));
 class SpeechrecorderngComponent extends RecorderComponent {
     constructor(route, router, changeDetectorRef, sessionsService, projectService, scriptService, recFilesService, uploader) {
-        super();
+        super(uploader);
         this.route = route;
         this.router = router;
         this.changeDetectorRef = changeDetectorRef;
@@ -8915,7 +9165,6 @@ class SpeechrecorderngComponent extends RecorderComponent {
         this.recFilesService = recFilesService;
         this.uploader = uploader;
         this._project = null;
-        this.dataSaved = true;
     }
     ngOnInit() {
         try {
@@ -8958,39 +9207,39 @@ class SpeechrecorderngComponent extends RecorderComponent {
         }
     }
     fetchSession(sessionId) {
-        //Error: ExpressionChangedAfterItHasBeenCheckedError: Expression has changed after it was checked. Previous value: 'statusMsg: Player initialized.'. Current value: 'statusMsg: Fetching session info...'.
-        // params.subscribe seems not to be asynchronous
-        // this.sm.statusAlertType='info';
-        // this.sm.statusMsg = 'Fetching session info...';
-        // this.sm.statusWaiting=true;
         let sessObs = this.sessionsService.sessionObserver(sessionId);
         if (sessObs) {
-            sessObs.subscribe(sess => {
-                this.setSession(sess);
-                this.sm.statusAlertType = 'info';
-                this.sm.statusMsg = 'Received session info.';
-                this.sm.statusWaiting = false;
-                if (sess.project) {
-                    //console.debug("Session associated project: "+sess.project)
-                    this.projectService.projectObservable(sess.project).subscribe(project => {
-                        this.project = project;
+            sessObs.subscribe({
+                next: sess => {
+                    this.setSession(sess);
+                    this.sm.statusAlertType = 'info';
+                    this.sm.statusMsg = 'Received session info.';
+                    this.sm.statusWaiting = false;
+                    if (sess.project) {
+                        //console.debug("Session associated project: "+sess.project)
+                        this.projectService.projectObservable(sess.project).subscribe({
+                            next: (project) => {
+                                this.project = project;
+                                this.fetchScript(sess);
+                            }, error: (reason) => {
+                                this.sm.statusMsg = reason;
+                                this.sm.statusAlertType = 'error';
+                                this.sm.statusWaiting = false;
+                                console.error("Error fetching project config: " + reason);
+                            }
+                        });
+                    }
+                    else {
+                        console.info("Session has no associated project. Using default configuration.");
                         this.fetchScript(sess);
-                    }, reason => {
-                        this.sm.statusMsg = reason;
-                        this.sm.statusAlertType = 'error';
-                        this.sm.statusWaiting = false;
-                        console.error("Error fetching project config: " + reason);
-                    });
+                    }
+                },
+                error: (reason) => {
+                    this.sm.statusMsg = reason;
+                    this.sm.statusAlertType = 'error';
+                    this.sm.statusWaiting = false;
+                    console.error("Error fetching session " + reason);
                 }
-                else {
-                    console.info("Session has no associated project. Using default configuration.");
-                    this.fetchScript(sess);
-                }
-            }, (reason) => {
-                this.sm.statusMsg = reason;
-                this.sm.statusAlertType = 'error';
-                this.sm.statusWaiting = false;
-                console.error("Error fetching session " + reason);
             });
         }
     }
@@ -8999,19 +9248,21 @@ class SpeechrecorderngComponent extends RecorderComponent {
             this.sm.statusAlertType = 'info';
             this.sm.statusMsg = 'Fetching recording script...';
             this.sm.statusWaiting = true;
-            this.scriptService.scriptObservable(sess.script).subscribe(script => {
-                this.sm.statusAlertType = 'info';
-                this.sm.statusMsg = 'Received recording script.';
-                this.sm.statusWaiting = false;
-                this.setScript(script);
-                this.sm.session = sess;
-                this.fetchRecordings(sess, this.script);
-            }, reason => {
-                let errMsg = "Error fetching recording script: " + reason;
-                console.error(errMsg);
-                this.sm.statusMsg = errMsg;
-                this.sm.statusAlertType = 'error';
-                this.sm.statusWaiting = false;
+            this.scriptService.scriptObservable(sess.script).subscribe({
+                next: (script) => {
+                    this.sm.statusAlertType = 'info';
+                    this.sm.statusMsg = 'Received recording script.';
+                    this.sm.statusWaiting = false;
+                    this.setScript(script);
+                    this.sm.session = sess;
+                    this.fetchRecordings(sess, this.script);
+                }, error: (reason) => {
+                    let errMsg = "Error fetching recording script: " + reason;
+                    console.error(errMsg);
+                    this.sm.statusMsg = errMsg;
+                    this.sm.statusAlertType = 'error';
+                    this.sm.statusWaiting = false;
+                }
             });
         }
         else {
@@ -9028,29 +9279,31 @@ class SpeechrecorderngComponent extends RecorderComponent {
         let prNm = null;
         if (this.project) {
             let rfsObs = this.recFilesService.recordingFileDescrList(this.project.name, sess.sessionId);
-            rfsObs.subscribe((rfs) => {
-                this.sm.statusAlertType = 'info';
-                this.sm.statusMsg = 'Received infos of recordings.';
-                this.sm.statusWaiting = false;
-                if (rfs) {
-                    if (rfs instanceof Array) {
-                        rfs.forEach((rf) => {
-                            //console.debug("Already recorded: " + rf+ " "+rf.recording.itemcode);
-                            this.sm.addRecordingFileByDescriptor(rf);
-                        });
+            rfsObs.subscribe({
+                next: (rfs) => {
+                    this.sm.statusAlertType = 'info';
+                    this.sm.statusMsg = 'Received infos of recordings.';
+                    this.sm.statusWaiting = false;
+                    if (rfs) {
+                        if (rfs instanceof Array) {
+                            rfs.forEach((rf) => {
+                                //console.debug("Already recorded: " + rf+ " "+rf.recording.itemcode);
+                                this.sm.addRecordingFileByDescriptor(rf);
+                            });
+                        }
+                        else {
+                            console.error('Expected type array for list of already recorded files ');
+                        }
                     }
                     else {
-                        console.error('Expected type array for list of already recorded files ');
+                        //console.debug("Recording file list: " + rfs);
                     }
+                }, error: (err) => {
+                    // we start the session anyway
+                    this.startSession();
+                }, complete: () => {
+                    this.startSession();
                 }
-                else {
-                    //console.debug("Recording file list: " + rfs);
-                }
-            }, () => {
-                // we start the session anyway
-                this.startSession();
-            }, () => {
-                this.startSession();
             });
         }
         else {
@@ -9073,36 +9326,10 @@ class SpeechrecorderngComponent extends RecorderComponent {
         return this.dataSaved && !this.sm.isActive();
     }
     init() {
-        var n = navigator;
-        //var getUserMediaFnct= n.getUserMedia || n.webkitGetUserMedia ||
-        //	n.mozGetUserMedia || n.msGetUserMedia;
-        var w = window;
-        // TODO test onyl !!
-        // let debugFail=true;
-        // 	AudioContext = w.AudioContext || w.webkitAudioContext;
-        // 	if (typeof AudioContext !== 'function' || debugFail) {
-        //           this.sm.statusAlertType='error';
-        // 		this.sm.statusMsg = 'ERROR: Browser does not support Web Audio API!';
-        // 		return false;
-        // 	} else {
-        // 		var context = new AudioContext();
-        //
-        // 		if (typeof navigator.mediaDevices.getUserMedia !== 'function') {
-        //               this.sm.statusAlertType='error';
-        // 			this.sm.statusMsg= 'ERROR: Browser does not support Media streams!';
-        //     return false;
-        // 		} else {
-        //
-        //this.sm = new SessionManager(new SimpleTrafficLight(), this.uploader);
-        //this.sm.init();
-        //this.ap = new AudioPlayer(context,this);
-        //this.sm.listener=this;
-        //	}
-        //	}
+        //TODO Duplicate code in AudioRecorderComponent
         this.uploader.listener = (ue) => {
             this.uploadUpdate(ue);
         };
-        //TODO Duplicate code in AudioRecorderComponent
         window.addEventListener('beforeunload', (e) => {
             console.debug("Before page unload event");
             if (this.ready()) {
@@ -9191,6 +9418,13 @@ class SpeechrecorderngComponent extends RecorderComponent {
             chCnt = ProjectUtil.audioChannelCount(project);
             console.info("Project requested recording channel count: " + chCnt);
             this.sm.autoGainControlConfigs = project.autoGainControlConfigs;
+            if (project.chunkedRecording === true) {
+                console.debug("Enable chunked upload: chunkSize: " + BasicRecorder.DEFAULT_CHUNK_SIZE_SECONDS);
+                this.sm.uploadChunkSizeSeconds = BasicRecorder.DEFAULT_CHUNK_SIZE_SECONDS;
+            }
+            else {
+                this.sm.uploadChunkSizeSeconds = null;
+            }
         }
         else {
             console.error("Empty project configuration!");
@@ -9227,50 +9461,7 @@ class SpeechrecorderngComponent extends RecorderComponent {
             pLoader.send();
         }
     }
-    // loadScript(callback: ()=>any){
-    //   var scrLoader = new XMLHttpRequest();
-    //   let hn:string =window.location.hostname;
-    //   let pn:string =window.location.pathname;
-    //   let pr:string =window.location.protocol;
-    //   let po:string =window.location.port;
-    //
-    //   let sessionId:string=this.session.sessionId;
-    //
-    //     let scrUrl:string | null = null;
-    //
-    //     if (hn === 'localhost'  || this.mode===Mode.DEMO) {
-    //         // local debug mode
-    //         // FF caches
-    //         scrUrl = 'test/' + this.session.script.toString() + '.json?' + new Date().getTime();
-    //
-    //     } else {
-    //         let scrPath:string = '/wikispeech/session/scripts/servlet';
-    //         let scrQu:string = 'sessionId=' + sessionId;
-    //         scrUrl = pr + '//' + hn + ':' + po + scrPath;
-    //         if (scrQu) {
-    //             scrUrl = scrUrl + '?' + scrQu;
-    //         }
-    //     }
-    //
-    //   scrLoader.open("GET",scrUrl , true);
-    //   scrLoader.setRequestHeader('Accept','application/json');
-    //   scrLoader.responseType = "json";
-    //   scrLoader.onload = (e) => {
-    //
-    //     this.script = scrLoader.response;
-    //
-    //
-    //     this.sm.script = this.script;
-    //
-    //     callback();
-    //   }
-    //   scrLoader.onerror = (e) => {
-    //     console.log("Error downloading recording script data ...");
-    //   }
-    //   scrLoader.send();
-    // }
     start() {
-        //this.configure();
     }
     audioPlayerUpdate(e) {
         if (EventType.STARTED === e.type) {
@@ -10957,13 +11148,12 @@ class Item {
     }
 }
 class AudioRecorder extends BasicRecorder {
-    constructor(changeDetectorRef, renderer, route, dialog, projectService, sessionService, recFileService, uploader, config) {
-        super(dialog, sessionService);
+    constructor(changeDetectorRef, renderer, route, dialog, sessionService, recFileService, uploader, config) {
+        super(dialog, sessionService, uploader, config);
         this.changeDetectorRef = changeDetectorRef;
         this.renderer = renderer;
         this.route = route;
         this.dialog = dialog;
-        this.projectService = projectService;
         this.sessionService = sessionService;
         this.recFileService = recFileService;
         this.uploader = uploader;
@@ -10974,7 +11164,6 @@ class AudioRecorder extends BasicRecorder {
         this.enableDownloadRecordings = false;
         this.status = 0 /* BLOCKED */;
         this.dataSaved = true;
-        this.startedDate = null;
         this.maxRecTimerId = null;
         this.maxRecTimerRunning = false;
         this._promptIndex = null;
@@ -11065,7 +11254,7 @@ class AudioRecorder extends BasicRecorder {
             if (this.ac) {
                 this.transportActions.startAction.onAction = () => this.startItem();
                 this.ac.listener = this;
-                this.ac.audioOutStream = new SequenceAudioFloat32ChunkerOutStream(this.streamLevelMeasure, LEVEL_BAR_INTERVALL_SECONDS);
+                this.configureStreamCaptureStream();
                 // Don't list the devices here. If we do not have audio permissions we only get anonymized devices without labels.
                 //this.ac.listDevices();
             }
@@ -11092,23 +11281,6 @@ class AudioRecorder extends BasicRecorder {
         this.uploader.listener = (ue) => {
             this.uploadUpdate(ue);
         };
-        let wakeLockSupp = ('wakeLock' in navigator);
-        // if(wakeLockSupp) {
-        //   let wakeLock = null;
-        //   try {
-        //     //@ts-ignore
-        //     wakeLock = navigator.wakeLock.request('screen');
-        //
-        //     //statusElem.textContent = 'Wake Lock is active!';
-        //   } catch (err) {
-        //     // The Wake Lock request has failed - usually system related, such as battery.
-        //     console.error('Wakelock failed'+err)
-        //   }
-        // }else{
-        //   let noSleep=new NoSleep();
-        //   noSleep.enable();
-        //
-        // }
     }
     onKeyPress(ke) {
         if (ke.key == ' ') {
@@ -11161,36 +11333,36 @@ class AudioRecorder extends BasicRecorder {
         let prNm = null;
         if (this.project) {
             let rfsObs = this.recFileService.recordingFileList(this.project.name, sess.sessionId);
-            rfsObs.subscribe((rfs) => {
-                this.statusAlertType = 'info';
-                this.statusMsg = 'Received infos of recordings.';
-                this.statusWaiting = false;
-                if (rfs) {
-                    if (rfs instanceof Array) {
-                        rfs.forEach((rf) => {
-                            if (rf.startedDate) {
-                                rf._startedAsDateObj = new Date(rf.startedDate);
-                            }
-                            if (rf.date) {
-                                rf._dateAsDateObj = new Date(rf.date);
-                            }
-                            this.recorderCombiPane.push(rf);
-                        });
+            rfsObs.subscribe({ next: (rfs) => {
+                    this.statusAlertType = 'info';
+                    this.statusMsg = 'Received infos of recordings.';
+                    this.statusWaiting = false;
+                    if (rfs) {
+                        if (rfs instanceof Array) {
+                            rfs.forEach((rf) => {
+                                if (rf.startedDate) {
+                                    rf._startedAsDateObj = new Date(rf.startedDate);
+                                }
+                                if (rf.date) {
+                                    rf._dateAsDateObj = new Date(rf.date);
+                                }
+                                this.recorderCombiPane.push(rf);
+                            });
+                        }
+                        else {
+                            console.error('Expected type array for list of already recorded files ');
+                        }
                     }
                     else {
-                        console.error('Expected type array for list of already recorded files ');
+                        //console.debug("Recording file list: " + rfs);
                     }
-                }
-                else {
-                    //console.debug("Recording file list: " + rfs);
-                }
-            }, () => {
-                // Failed fetching existing, but we start the session anyway
-                this.start();
-            }, () => {
-                // Normal start
-                this.start();
-            });
+                }, error: (err) => {
+                    // Failed fetching existing, but we start the session anyway
+                    this.start();
+                }, complete: () => {
+                    // Normal start
+                    this.start();
+                } });
         }
         else {
             // No project def -> error
@@ -11212,6 +11384,12 @@ class AudioRecorder extends BasicRecorder {
             chCnt = ProjectUtil.audioChannelCount(project);
             console.info("Project requested recording channel count: " + chCnt);
             this.autoGainControlConfigs = project.autoGainControlConfigs;
+            if (project.chunkedRecording === true) {
+                this.uploadChunkSizeSeconds = BasicRecorder.DEFAULT_CHUNK_SIZE_SECONDS;
+            }
+            else {
+                this.uploadChunkSizeSeconds = null;
+            }
         }
         else {
             console.error("Empty project configuration!");
@@ -11311,12 +11489,7 @@ class AudioRecorder extends BasicRecorder {
         }
     }
     startItem() {
-        this.enableWakeLockCond();
-        this.transportActions.startAction.disabled = true;
-        this.transportActions.pauseAction.disabled = true;
-        if (this.readonly) {
-            return;
-        }
+        super.startItem();
         this.transportActions.fwdAction.disabled = true;
         this.transportActions.fwdNextAction.disabled = true;
         this.transportActions.bwdAction.disabled = true;
@@ -11468,8 +11641,7 @@ class AudioRecorder extends BasicRecorder {
         }
     }
     started() {
-        this.startedDate = new Date();
-        this.transportActions.startAction.disabled = true;
+        super.started();
         this.statusAlertType = 'info';
         this.statusMsg = 'Recording...';
         let maxRecordingTimeMs = MAX_RECORDING_TIME_MS;
@@ -11502,24 +11674,6 @@ class AudioRecorder extends BasicRecorder {
             this.ac.stop();
         }
     }
-    // addRecordingFileByDescriptor(rfd:RecordingFileDescriptorImpl){
-    //    let prIdx=0;
-    //    if(this.items) {
-    //      let it = this.items[prIdx];
-    //      if (it) {
-    //        if (!it.recs) {
-    //          it.recs = new Array<SprRecordingFile>();
-    //        }
-    //
-    //      } else {
-    //        //console.debug("WARN: No recording item with code: \"" +rfd.recording.itemcode+ "\" found.");
-    //      }
-    //    }
-    // }
-    //
-    // addRecordingFileByPromptIndex(promptIndex:number, rf:SprRecordingFile){
-    //
-    // }
     stopped() {
         this.updateStartActionDisableState();
         this.transportActions.stopAction.disabled = true;
@@ -11534,41 +11688,39 @@ class AudioRecorder extends BasicRecorder {
             if (this._session) {
                 sessId = this._session.sessionId;
             }
-            let rf = new RecordingFile(UUID.generate(), sessId, ad);
+            if (!this.rfUuid) {
+                this.rfUuid = UUID.generate();
+            }
+            let rf = new RecordingFile(this.rfUuid, sessId, ad);
             rf._startedAsDateObj = this.startedDate;
             if (rf._startedAsDateObj) {
                 rf.startedDate = rf._startedAsDateObj.toString();
             }
-            let apiEndPoint = '';
-            if (this.config && this.config.apiEndPoint) {
-                apiEndPoint = this.config.apiEndPoint;
-            }
-            if (apiEndPoint !== '') {
-                apiEndPoint = apiEndPoint + '/';
+            rf.frames = ad.length;
+            this.displayRecFile = rf;
+            this.recorderCombiPane.push(rf);
+            // Upload if upload enabled and not in chunked upload mode
+            if (this.enableUploadRecordings && !this.uploadChunkSizeSeconds) {
+                let apiEndPoint = '';
+                if (this.config && this.config.apiEndPoint) {
+                    apiEndPoint = this.config.apiEndPoint;
+                }
+                if (apiEndPoint !== '') {
+                    apiEndPoint = apiEndPoint + '/';
+                }
+                let sessionsUrl = apiEndPoint + SessionService.SESSION_API_CTX;
+                let recUrl = sessionsUrl + '/' + rf.session + '/' + RECFILE_API_CTX + '/' + rf.uuid;
+                // convert asynchronously to 16-bit integer PCM
+                // TODO could we avoid conversion to save CPU resources and transfer float PCM directly?
+                // TODO duplicate conversion for manual download
+                this.processingRecording = true;
+                let ww = new WavWriter();
+                ww.writeAsync(ad, (wavFile) => {
+                    this.postRecordingMultipart(wavFile, rf.uuid, rf.session, rf._startedAsDateObj, recUrl);
+                    this.processingRecording = false;
+                    this.changeDetectorRef.detectChanges();
+                });
             }
-            let sessionsUrl = apiEndPoint + SessionService.SESSION_API_CTX;
-            let recUrl = sessionsUrl + '/' + rf.session + '/' + RECFILE_API_CTX + '/' + rf.uuid;
-            //
-            //
-            //
-            //     // convert asynchronously to 16-bit integer PCM
-            //     // TODO could we avoid conversion to save CPU resources and transfer float PCM directly?
-            //     // TODO duplicate conversion for manual download
-            //     //console.log("Build wav writer...");
-            this.processingRecording = true;
-            let ww = new WavWriter();
-            ww.writeAsync(ad, (wavFile) => {
-                //this.postRecording(wavFile, recUrl);
-                //rf._dateAsDateObj=new Date();
-                rf.frames = ad.length;
-                this.displayRecFile = rf;
-                //this.recordingListComp.recordingList.push(rf);
-                this.recorderCombiPane.push(rf);
-                this.postRecordingMultipart(wavFile, rf.uuid, rf.session, rf._startedAsDateObj, recUrl);
-                this.processingRecording = false;
-                this.changeDetectorRef.detectChanges();
-            });
-            // }
         }
         // check complete session
         let complete = true;
@@ -11579,11 +11731,6 @@ class AudioRecorder extends BasicRecorder {
         this.updateNavigationActions();
         this.changeDetectorRef.detectChanges();
     }
-    postRecording(wavFile, recUrl) {
-        let wavBlob = new Blob([wavFile], { type: 'audio/wav' });
-        let ul = new Upload(wavBlob, recUrl);
-        this.uploader.queueUpload(ul);
-    }
     postRecordingMultipart(wavFile, uuid, sessionId, startedDate, recUrl) {
         let wavBlob = new Blob([wavFile], { type: 'audio/wav' });
         let fd = new FormData();
@@ -11600,6 +11747,25 @@ class AudioRecorder extends BasicRecorder {
         let ul = new Upload(fd, recUrl);
         this.uploader.queueUpload(ul);
     }
+    postChunkAudioBuffer(audioBuffer, chunkIdx) {
+        var _a;
+        this.processingRecording = true;
+        let ww = new WavWriter();
+        //new REST API URL
+        let apiEndPoint = '';
+        if (this.config && this.config.apiEndPoint) {
+            apiEndPoint = this.config.apiEndPoint;
+        }
+        if (apiEndPoint !== '') {
+            apiEndPoint = apiEndPoint + '/';
+        }
+        let sessionsUrl = apiEndPoint + SessionService.SESSION_API_CTX;
+        let recUrl = sessionsUrl + '/' + ((_a = this.session) === null || _a === void 0 ? void 0 : _a.sessionId) + '/' + RECFILE_API_CTX + '/' + this.rfUuid + '/' + chunkIdx;
+        ww.writeAsync(audioBuffer, (wavFile) => {
+            this.postRecording(wavFile, recUrl);
+            this.processingRecording = false;
+        });
+    }
     stop() {
         if (this.ac) {
             this.ac.close();
@@ -11627,8 +11793,8 @@ class AudioRecorder extends BasicRecorder {
         }
     }
 }
-AudioRecorder.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: AudioRecorder, deps: [{ token: i0.ChangeDetectorRef }, { token: i0.Renderer2 }, { token: i1$1.ActivatedRoute }, { token: i1$2.MatDialog }, { token: ProjectService }, { token: SessionService }, { token: RecordingService }, { token: SpeechRecorderUploader }, { token: SPEECHRECORDER_CONFIG }], target: i0.ɵɵFactoryTarget.Component });
-AudioRecorder.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: AudioRecorder, selector: "app-audiorecorder", inputs: { _project: "_project", projectName: "projectName", dataSaved: "dataSaved" }, host: { listeners: { "window:keypress": "onKeyPress($event)", "window:keydown": "onKeyDown($event)" } }, providers: [SessionService], viewQueries: [{ propertyName: "recorderCombiPane", first: true, predicate: RecorderCombiPane, descendants: true, static: true }, { propertyName: "liveLevelDisplay", first: true, predicate: LevelBar, descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: `
+AudioRecorder.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: AudioRecorder, deps: [{ token: i0.ChangeDetectorRef }, { token: i0.Renderer2 }, { token: i1$1.ActivatedRoute }, { token: i1$2.MatDialog }, { token: SessionService }, { token: RecordingService }, { token: SpeechRecorderUploader }, { token: SPEECHRECORDER_CONFIG }], target: i0.ɵɵFactoryTarget.Component });
+AudioRecorder.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: AudioRecorder, selector: "app-audiorecorder", inputs: { projectName: "projectName", dataSaved: "dataSaved" }, host: { listeners: { "window:keypress": "onKeyPress($event)", "window:keydown": "onKeyDown($event)" } }, providers: [SessionService], viewQueries: [{ propertyName: "recorderCombiPane", first: true, predicate: RecorderCombiPane, descendants: true, static: true }, { propertyName: "liveLevelDisplay", first: true, predicate: LevelBar, descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: `
     <app-warningbar [show]="isTestSession()" warningText="Test recording only!"></app-warningbar>
     <app-warningbar [show]="isDefaultAudioTestSession()"
                     warningText="This test uses default audio device! Regular sessions may require a particular audio device (microphone)!"></app-warningbar>
@@ -11784,13 +11950,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
                     ]
                 }]
         }], ctorParameters: function () {
-        return [{ type: i0.ChangeDetectorRef }, { type: i0.Renderer2 }, { type: i1$1.ActivatedRoute }, { type: i1$2.MatDialog }, { type: ProjectService }, { type: SessionService }, { type: RecordingService }, { type: SpeechRecorderUploader }, { type: SpeechRecorderConfig, decorators: [{
+        return [{ type: i0.ChangeDetectorRef }, { type: i0.Renderer2 }, { type: i1$1.ActivatedRoute }, { type: i1$2.MatDialog }, { type: SessionService }, { type: RecordingService }, { type: SpeechRecorderUploader }, { type: SpeechRecorderConfig, decorators: [{
                         type: Inject,
                         args: [SPEECHRECORDER_CONFIG]
                     }] }];
-    }, propDecorators: { _project: [{
-                type: Input
-            }], projectName: [{
+    }, propDecorators: { projectName: [{
                 type: Input
             }], recorderCombiPane: [{
                 type: ViewChild,
@@ -11808,16 +11972,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
                 args: ['window:keydown', ['$event']]
             }] } });
 class AudioRecorderComponent extends RecorderComponent {
-    constructor(injector, route, router, changeDetectorRef, sessionService, projectService, recFilesService) {
-        super();
+    constructor(injector, route, router, changeDetectorRef, sessionService, projectService, uploader) {
+        super(uploader);
         this.injector = injector;
         this.route = route;
         this.router = router;
         this.changeDetectorRef = changeDetectorRef;
         this.sessionService = sessionService;
         this.projectService = projectService;
-        this.recFilesService = recFilesService;
-        this.dataSaved = true;
+        this.uploader = uploader;
     }
     ngOnInit() {
         //super.ngOnInit();
@@ -11852,6 +12015,9 @@ class AudioRecorderComponent extends RecorderComponent {
         });
     }
     ngAfterViewInit() {
+        this.uploader.listener = (ue) => {
+            this.uploadUpdate(ue);
+        };
         this.route.queryParams.subscribe((params) => {
             if (params['sessionId']) {
                 this.fetchSession(params['sessionId']);
@@ -11868,50 +12034,68 @@ class AudioRecorderComponent extends RecorderComponent {
         //super.ngOnDestroy();
     }
     fetchSession(sessionId) {
-        //Error: ExpressionChangedAfterItHasBeenCheckedError: Expression has changed after it was checked. Previous value: 'statusMsg: Player initialized.'. Current value: 'statusMsg: Fetching session info...'.
-        // params.subscribe seems not to be asynchronous
-        // this.sm.statusAlertType='info';
-        // this.sm.statusMsg = 'Fetching session info...';
-        // this.sm.statusWaiting=true;
         let sessObs = this.sessionService.sessionObserver(sessionId);
         if (sessObs) {
-            sessObs.subscribe(sess => {
-                this.ar.statusAlertType = 'info';
-                this.ar.statusMsg = 'Received session info.';
-                this.ar.statusWaiting = false;
-                this.session = sess;
-                this.ar.session = sess;
-                if (sess.project) {
-                    //console.debug("Session associated project: "+sess.project)
-                    this.projectService.projectObservable(sess.project).subscribe(project => {
-                        this.ar.project = project;
-                        this.ar.fetchRecordings(sess);
-                    }, reason => {
-                        this.ar.statusMsg = reason;
-                        this.ar.statusAlertType = 'error';
-                        this.ar.statusWaiting = false;
-                        console.error("Error fetching project config: " + reason);
-                    });
-                }
-                else {
-                    console.info("Session has no associated project. Using default configuration.");
+            sessObs.subscribe({
+                next: (sess) => {
+                    this.ar.statusAlertType = 'info';
+                    this.ar.statusMsg = 'Received session info.';
+                    this.ar.statusWaiting = false;
+                    this.session = sess;
+                    this.ar.session = sess;
+                    if (sess.project) {
+                        //console.debug("Session associated project: "+sess.project)
+                        this.projectService.projectObservable(sess.project).subscribe({
+                            next: (project) => {
+                                this.ar.project = project;
+                                this.ar.fetchRecordings(sess);
+                            }, error: (reason) => {
+                                this.ar.statusMsg = reason;
+                                this.ar.statusAlertType = 'error';
+                                this.ar.statusWaiting = false;
+                                console.error("Error fetching project config: " + reason);
+                            }
+                        });
+                    }
+                    else {
+                        console.info("Session has no associated project. Using default configuration.");
+                    }
+                },
+                error: (reason) => {
+                    this.ar.statusMsg = reason;
+                    this.ar.statusAlertType = 'error';
+                    this.ar.statusWaiting = false;
+                    console.error("Error fetching session " + reason);
                 }
-            }, (reason) => {
-                this.ar.statusMsg = reason;
-                this.ar.statusAlertType = 'error';
-                this.ar.statusWaiting = false;
-                console.error("Error fetching session " + reason);
             });
         }
     }
+    uploadUpdate(ue) {
+        let upStatus = ue.status;
+        this.dataSaved = (UploaderStatus.DONE === upStatus);
+        let percentUpl = ue.percentDone();
+        if (UploaderStatus.ERR === upStatus) {
+            this.ar.uploadStatus = 'warn';
+        }
+        else {
+            if (percentUpl < 50) {
+                this.ar.uploadStatus = 'accent';
+            }
+            else {
+                this.ar.uploadStatus = 'success';
+            }
+            this.ar.uploadProgress = percentUpl;
+        }
+        this.changeDetectorRef.detectChanges();
+    }
     ready() {
         return this.dataSaved && !this.ar.isActive();
     }
 }
-AudioRecorderComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: AudioRecorderComponent, deps: [{ token: i0.Injector }, { token: i1$1.ActivatedRoute }, { token: i1$1.Router }, { token: i0.ChangeDetectorRef }, { token: SessionService }, { token: ProjectService }, { token: RecordingService }], target: i0.ɵɵFactoryTarget.Component });
+AudioRecorderComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: AudioRecorderComponent, deps: [{ token: i0.Injector }, { token: i1$1.ActivatedRoute }, { token: i1$1.Router }, { token: i0.ChangeDetectorRef }, { token: SessionService }, { token: ProjectService }, { token: SpeechRecorderUploader }], target: i0.ɵɵFactoryTarget.Component });
 AudioRecorderComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: AudioRecorderComponent, selector: "app-audiorecorder-comp", providers: [SessionService], viewQueries: [{ propertyName: "ar", first: true, predicate: AudioRecorder, descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: `
     <app-audiorecorder [projectName]="_project?.name" [dataSaved]="dataSaved"></app-audiorecorder>
-  `, isInline: true, styles: [":host{flex:2;display:flex;height:100%;flex-direction:column;min-height:0}\n"], components: [{ type: AudioRecorder, selector: "app-audiorecorder", inputs: ["_project", "projectName", "dataSaved"] }] });
+  `, isInline: true, styles: [":host{flex:2;display:flex;height:100%;flex-direction:column;min-height:0}\n"], components: [{ type: AudioRecorder, selector: "app-audiorecorder", inputs: ["projectName", "dataSaved"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: AudioRecorderComponent, decorators: [{
             type: Component,
             args: [{
@@ -11929,7 +12113,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
 
   }`]
                 }]
-        }], ctorParameters: function () { return [{ type: i0.Injector }, { type: i1$1.ActivatedRoute }, { type: i1$1.Router }, { type: i0.ChangeDetectorRef }, { type: SessionService }, { type: ProjectService }, { type: RecordingService }]; }, propDecorators: { ar: [{
+        }], ctorParameters: function () { return [{ type: i0.Injector }, { type: i1$1.ActivatedRoute }, { type: i1$1.Router }, { type: i0.ChangeDetectorRef }, { type: SessionService }, { type: ProjectService }, { type: SpeechRecorderUploader }]; }, propDecorators: { ar: [{
                 type: ViewChild,
                 args: [AudioRecorder, { static: true }]
             }] } });
@@ -11978,7 +12162,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
                 }]
         }] });
 
-const VERSION = '2.24.0';
+const VERSION = '2.25.0';
 
 /*
  * Public API Surface of speechrecorderng