pxt-microbit 6.0.10 → 6.0.12

package/built/sim.d.ts

@@ -573,6 +573,7 @@ declare namespace pxsim {
         recording: HTMLAudioElement;
         audioPlaying: boolean;
         recordTimeoutID: any;
+        currentlyErasing: boolean;
         handleAudioPlaying: () => void;
         handleAudioStopped: () => void;
         initListeners: () => void;

package/built/sim.js

@@ -2314,6 +2314,13 @@ var pxsim;
 (function (pxsim) {
     var record;
     (function (record_1) {
+        let _initialized = false;
+        function init() {
+            if (!_initialized) {
+                registerSimStop();
+                _initialized = true;
+            }
+        }
         function stopRecorder(b) {
             b.recordingState.recorder.stop();
             b.recordingState.currentlyRecording = false;
@@ -2325,17 +2332,25 @@ var pxsim;
                 });
             }
         }
-        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();
+        async function populateRecording(b) {
+            if (b.recordingState.currentlyErasing) {
+                await erasingAsync(b);
+            }
+            if (b.recordingState.chunks[0].size > 0) {
+                b.recordingState.audioURL = null;
+                const recordingType = pxsim.isSafari() ? "audio/mp4" : "audio/ogg; codecs=opus";
+                const blob = new Blob(b.recordingState.chunks, { type: recordingType });
+                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() {
             let b = pxsim.board();
+            init();
             if (b.recordingState.recorder) {
                 b.recordingState.recorder.stop();
                 clearTimeout(b.recordingState.recordTimeoutID);
@@ -2353,9 +2368,8 @@ var pxsim;
                     b.recordingState.recorder.ondataavailable = (e) => {
                         b.recordingState.chunks.push(e.data);
                     };
-                    b.recordingState.recorder.onstop = () => {
-                        populateRecording(b);
-                        registerSimStop(b);
+                    b.recordingState.recorder.onstop = async () => {
+                        await populateRecording(b);
                     };
                 }
                 catch (error) {
@@ -2378,17 +2392,19 @@ var pxsim;
                 return;
             if (b.recordingState.currentlyRecording && b.recordingState.recordTimeoutID) {
                 clearTimeout(b.recordingState.recordTimeoutID);
-                stopRecorder(b);
+                if (b.recordingState.recorder) {
+                    stopRecorder(b);
+                }
             }
             else if (b.recordingState.recording && b.recordingState.audioPlaying) {
                 b.recordingState.handleAudioStopped();
-                b.recordingState.recording.pause();
-                b.recordingState.recording.currentTime = 0;
+                stopPlayback();
             }
         }
-        function registerSimStop(b) {
+        function registerSimStop() {
             pxsim.AudioContextManager.onStopAll(() => {
-                if (b.recordingState.recording) {
+                const b = pxsim.board();
+                if (b && b.recordingState && b.recordingState.recording) {
                     stopAudio();
                     b.recordingState.recording.removeEventListener("play", b.recordingState.handleAudioPlaying);
                     b.recordingState.recording.removeEventListener("ended", b.recordingState.handleAudioStopped);
@@ -2399,11 +2415,22 @@ var pxsim;
             const b = pxsim.board();
             if (!b)
                 return;
+            init();
             stopAudio();
             b.recordingState.audioPlaying = true;
-            setTimeout(() => {
-                if (b.recordingState.recording) {
-                    b.recordingState.recording.play();
+            setTimeout(async () => {
+                if (!b.recordingState.currentlyErasing && b.recordingState.recording) {
+                    try {
+                        await b.recordingState.recording.play();
+                    }
+                    catch (e) {
+                        if (!(e instanceof DOMException)) {
+                            throw e;
+                        }
+                    }
+                }
+                else {
+                    b.recordingState.audioPlaying = false;
                 }
             }, 10);
         }
@@ -2412,18 +2439,35 @@ var pxsim;
             stopAudio();
         }
         record_1.stop = stop;
+        function stopPlayback() {
+            const b = pxsim.board();
+            if (!b)
+                return;
+            b.recordingState.recording.pause();
+            b.recordingState.recording.currentTime = 0;
+            b.recordingState.recording.removeEventListener("play", b.recordingState.handleAudioPlaying);
+            b.recordingState.recording.removeEventListener("ended", b.recordingState.handleAudioStopped);
+        }
+        function erasingAsync(b) {
+            return new Promise((resolve, reject) => {
+                if (b.recordingState.recording && b.recordingState.audioPlaying) {
+                    stopPlayback();
+                }
+                if (b.recordingState.audioURL) {
+                    window.URL.revokeObjectURL(b.recordingState.audioURL);
+                    b.recordingState.recording = null;
+                }
+                b.recordingState.audioPlaying = false;
+                resolve(null);
+                b.recordingState.currentlyErasing = false;
+            });
+        }
         function erase() {
             const b = pxsim.board();
             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;
+            b.recordingState.currentlyErasing = true;
         }
         record_1.erase = erase;
         function setMicrophoneGain(gain) {