pxt-microbit 5.1.26 → 5.1.27

package/built/sim.d.ts

@@ -571,6 +571,10 @@ declare namespace pxsim {
         audioURL: string;
         recording: HTMLAudioElement;
         audioPlaying: boolean;
+        recordTimeoutID: any;
+        handleAudioPlaying: () => void;
+        handleAudioStopped: () => void;
+        initListeners: () => void;
     }
 }
 declare namespace pxsim.record {

package/built/sim.js

@@ -2279,6 +2279,18 @@ var pxsim;
         constructor() {
             this.currentlyRecording = false;
             this.audioPlaying = false;
+            this.handleAudioPlaying = () => {
+                this.audioPlaying = true;
+            };
+            this.handleAudioStopped = () => {
+                this.audioPlaying = false;
+            };
+            this.initListeners = () => {
+                if (this.recording) {
+                    this.recording.addEventListener("play", this.handleAudioPlaying, false);
+                    this.recording.addEventListener("ended", this.handleAudioStopped, false);
+                }
+            };
         }
     }
     pxsim.RecordingState = RecordingState;
@@ -2286,53 +2298,102 @@ var pxsim;
 (function (pxsim) {
     var record;
     (function (record_1) {
+        function stopRecorder(b) {
+            b.recordingState.recorder.stop();
+            b.recordingState.currentlyRecording = false;
+            if (b.recordingState.stream.active) {
+                b.recordingState.stream.getAudioTracks().forEach(track => {
+                    track.stop();
+                    track.enabled = false;
+                });
+            }
+        }
+        function populateRecording(b) {
+            const blob = new Blob(b.recordingState.chunks, { type: "audio/ogg; codecs=opus" });
+            b.recordingState.audioURL = window.URL.createObjectURL(blob);
+            b.recordingState.recording = new Audio(b.recordingState.audioURL);
+            b.recordingState.initListeners();
+            b.recordingState.currentlyRecording = false;
+            b.recordingState.recorder = null;
+            b.recordingState.chunks = [];
+        }
         async function record() {
-            //request permission is asynchronous
             let b = pxsim.board();
-            let recordingState = b.recordingState;
-            if (!b.recordingState.currentlyRecording) {
-                b.recordingState.currentlyRecording = true;
-                pxsim.runtime.queueDisplayUpdate();
-                if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
-                    try {
-                        recordingState.stream = await navigator.mediaDevices.getUserMedia({ video: false, audio: true });
-                        recordingState.recorder = new MediaRecorder(recordingState.stream);
-                        recordingState.recorder.start();
-                        setTimeout(() => {
-                            recordingState.recorder.stop();
-                            pxsim.runtime.queueDisplayUpdate();
-                        }, 4000);
-                        recordingState.recorder.ondataavailable = (e) => {
-                            recordingState.chunks.push(e.data);
-                        };
-                        recordingState.recorder.onstop = () => {
-                            const blob = new Blob(recordingState.chunks, { type: "audio/ogg; codecs=opus" });
-                            recordingState.audioURL = window.URL.createObjectURL(blob);
-                            recordingState.recording = new Audio(recordingState.audioURL);
-                            b.recordingState.currentlyRecording = false;
-                            erase();
-                        };
-                    }
-                    catch (error) {
-                        console.log("An error occurred, could not get microphone access");
-                    }
+            if (b.recordingState.recorder) {
+                b.recordingState.recorder.stop();
+                clearTimeout(b.recordingState.recordTimeoutID);
+            }
+            if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
+                try {
+                    b.recordingState.stream = await navigator.mediaDevices.getUserMedia({ video: false, audio: true });
+                    b.recordingState.recorder = new MediaRecorder(b.recordingState.stream);
+                    b.recordingState.recorder.start();
+                    b.recordingState.currentlyRecording = true;
+                    pxsim.runtime.queueDisplayUpdate();
+                    b.recordingState.recordTimeoutID = setTimeout(() => {
+                        stopRecorder(b);
+                        pxsim.runtime.queueDisplayUpdate();
+                    }, 5000);
+                    b.recordingState.recorder.ondataavailable = (e) => {
+                        b.recordingState.chunks.push(e.data);
+                    };
+                    b.recordingState.recorder.onstop = () => {
+                        populateRecording(b);
+                        registerSimStop(b);
+                    };
                 }
-                else {
-                    console.log("getUserMedia not supported on your browser!");
+                catch (error) {
+                    console.log("An error occurred, could not get microphone access");
+                    if (b.recordingState.recorder) {
+                        b.recordingState.recorder.stop();
+                    }
+                    b.recordingState.currentlyRecording = false;
                 }
             }
+            else {
+                console.log("getUserMedia not supported on your browser!");
+                b.recordingState.currentlyRecording = false;
+            }
         }
         record_1.record = record;
+        function stopAudio() {
+            const b = pxsim.board();
+            if (!b)
+                return;
+            if (b.recordingState.currentlyRecording && b.recordingState.recordTimeoutID) {
+                clearTimeout(b.recordingState.recordTimeoutID);
+                stopRecorder(b);
+            }
+            else if (b.recordingState.recording && b.recordingState.audioPlaying) {
+                b.recordingState.handleAudioStopped();
+                b.recordingState.recording.pause();
+                b.recordingState.recording.currentTime = 0;
+            }
+        }
+        function registerSimStop(b) {
+            pxsim.AudioContextManager.onStopAll(() => {
+                if (b.recordingState.recording) {
+                    stopAudio();
+                    b.recordingState.recording.removeEventListener("play", b.recordingState.handleAudioPlaying);
+                    b.recordingState.recording.removeEventListener("ended", b.recordingState.handleAudioStopped);
+                }
+            });
+        }
         function play() {
             const b = pxsim.board();
             if (!b)
                 return;
-            if (b.recordingState.recording) {
-                b.recordingState.recording.play();
-            }
+            stopAudio();
+            b.recordingState.audioPlaying = true;
+            setTimeout(() => {
+                if (b.recordingState.recording) {
+                    b.recordingState.recording.play();
+                }
+            }, 10);
         }
         record_1.play = play;
         function stop() {
+            stopAudio();
         }
         record_1.stop = stop;
         function erase() {
@@ -2340,6 +2401,13 @@ var pxsim;
             if (!b)
                 return;
             b.recordingState.chunks = [];
+            if (b.recordingState.audioPlaying) {
+                b.recordingState.recording.pause();
+                b.recordingState.audioPlaying = false;
+                b.recordingState.recording.currentTime = 0;
+            }
+            window.URL.revokeObjectURL(b.recordingState.audioURL);
+            b.recordingState.recording = null;
         }
         record_1.erase = erase;
         function setMicrophoneGain(gain) {
@@ -2353,14 +2421,6 @@ var pxsim;
             const b = pxsim.board();
             if (!b)
                 return false;
-            if (b.recordingState.recording) {
-                b.recordingState.recording.addEventListener("playing", () => {
-                    b.recordingState.audioPlaying = true;
-                }, { once: true });
-                b.recordingState.recording.addEventListener("ended", () => {
-                    b.recordingState.audioPlaying = false;
-                }, { once: true });
-            }
             return b.recordingState.audioPlaying;
         }
         record_1.audioIsPlaying = audioIsPlaying;
@@ -2368,14 +2428,16 @@ var pxsim;
             const b = pxsim.board();
             if (!b)
                 return false;
-            return b.recordingState.recorder ? b.recordingState.recorder.state == "recording" : false;
+            return b.recordingState.recorder ? b.recordingState.recorder.state === "recording" : false;
         }
         record_1.audioIsRecording = audioIsRecording;
         function audioIsStopped() {
             const b = pxsim.board();
             if (!b)
                 return true;
-            return b.recordingState.recorder ? !b.recordingState.audioPlaying && b.recordingState.recorder.state == "inactive" : true;
+            const isNotPlaying = !audioIsPlaying();
+            const isNotRecording = !audioIsRecording();
+            return b.recordingState.recording ? isNotPlaying && isNotRecording : false;
         }
         record_1.audioIsStopped = audioIsStopped;
         function setInputSampleRate(sampleRate) {