pxt-microbit 6.1.2 → 6.1.4

package/built/sim-strings.json

@@ -1 +1 @@
-{"Sound Level":"Sound Level","Thermometer":"Thermometer","acceleration.pitch":"acceleration.pitch","acceleration.roll":"acceleration.roll","acceleration.strength":"acceleration.strength","acceleration.x":"acceleration.x","acceleration.y":"acceleration.y","acceleration.z":"acceleration.z","heading":"heading","lightLevel":"lightLevel","logo touch (micro:bit v2 needed)":"logo touch (micro:bit v2 needed)","micro:bit v2 needed":"micro:bit v2 needed","microphone (micro:bit v2 needed)":"microphone (micro:bit v2 needed)","sound level":"sound level","temperature":"temperature"}
+{"Sound Level":"Sound Level","Thermometer":"Thermometer","Unmute simulator":"Unmute simulator","acceleration.pitch":"acceleration.pitch","acceleration.roll":"acceleration.roll","acceleration.strength":"acceleration.strength","acceleration.x":"acceleration.x","acceleration.y":"acceleration.y","acceleration.z":"acceleration.z","heading":"heading","lightLevel":"lightLevel","logo touch (micro:bit v2 needed)":"logo touch (micro:bit v2 needed)","micro:bit v2 needed":"micro:bit v2 needed","microphone (micro:bit v2 needed)":"microphone (micro:bit v2 needed)","sound level":"sound level","temperature":"temperature"}

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;
@@ -784,6 +785,15 @@ declare namespace pxsim.visuals {
         private attachAPlusBEvents;
     }
 }
+declare namespace pxsim {
+    function createMuteButton(): HTMLDivElement;
+    function shouldShowMute(): boolean;
+    function hasNavigator(): boolean;
+    function isEdge(): boolean;
+    function isIE(): boolean;
+    function isChrome(): boolean;
+    function isSafari(): boolean;
+}
 declare namespace pxsim.pxtcore {
     function registerWithDal(id: number, evid: number, handler: RefAction, mode?: number): void;
     function deepSleep(): void;

package/built/sim.js

@@ -133,6 +133,11 @@ var pxsim;
             }), opts);
             document.body.innerHTML = ""; // clear children
             document.body.appendChild(this.view = this.viewHost.getView());
+            if (pxsim.shouldShowMute()) {
+                document.body.appendChild(pxsim.createMuteButton());
+                pxsim.AudioContextManager.mute(true);
+                pxsim.setParentMuteState("disabled");
+            }
             if (msg.theme === "mbcodal") {
                 this.ensureHardwareVersion(2);
             }
@@ -2309,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;
@@ -2320,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);
@@ -2348,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) {
@@ -2373,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);
@@ -2394,11 +2415,24 @@ 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 {
+                        const volume = pxsim.AudioContextManager.isMuted() ? 0 : 1;
+                        b.recordingState.recording.volume = volume;
+                        await b.recordingState.recording.play();
+                    }
+                    catch (e) {
+                        if (!(e instanceof DOMException)) {
+                            throw e;
+                        }
+                    }
+                }
+                else {
+                    b.recordingState.audioPlaying = false;
                 }
             }, 10);
         }
@@ -2407,18 +2441,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) {
@@ -4084,6 +4135,65 @@ path.sim-board {
     })(visuals = pxsim.visuals || (pxsim.visuals = {}));
 })(pxsim || (pxsim = {}));
 var pxsim;
+(function (pxsim) {
+    const icon = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M215.03 71.05L126.06 160H24c-13.26 0-24 10.74-24 24v144c0 13.25 10.74 24 24 24h102.06l88.97 88.95c15.03 15.03 40.97 4.47 40.97-16.97V88.02c0-21.46-25.96-31.98-40.97-16.97zM461.64 256l45.64-45.64c6.3-6.3 6.3-16.52 0-22.82l-22.82-22.82c-6.3-6.3-16.52-6.3-22.82 0L416 210.36l-45.64-45.64c-6.3-6.3-16.52-6.3-22.82 0l-22.82 22.82c-6.3 6.3-6.3 16.52 0 22.82L370.36 256l-45.63 45.63c-6.3 6.3-6.3 16.52 0 22.82l22.82 22.82c6.3 6.3 16.52 6.3 22.82 0L416 301.64l45.64 45.64c6.3 6.3 16.52 6.3 22.82 0l22.82-22.82c6.3-6.3 6.3-16.52 0-22.82L461.64 256z"/></svg>`;
+    // We only need to unmute from within the iframe once
+    let hasUnmuted = false;
+    function createMuteButton() {
+        const el = document.createElement("div");
+        el.setAttribute("id", "safari-mute-button-outer");
+        el.innerHTML = `
+            <button class="safari-mute-button">
+                ${icon}
+            </button>
+        `;
+        const button = el.firstElementChild;
+        button.setAttribute("title", pxsim.localization.lf("Unmute simulator"));
+        button.addEventListener("click", () => {
+            pxsim.AudioContextManager.mute(false);
+            pxsim.setParentMuteState("unmuted");
+            button.remove();
+            hasUnmuted = true;
+        });
+        return el;
+    }
+    pxsim.createMuteButton = createMuteButton;
+    function shouldShowMute() {
+        return isSafari() && !hasUnmuted;
+    }
+    pxsim.shouldShowMute = shouldShowMute;
+    // Everything below is taken from browserutils in pxt
+    function hasNavigator() {
+        return typeof navigator !== "undefined";
+    }
+    pxsim.hasNavigator = hasNavigator;
+    //Microsoft Edge lies about its user agent and claims to be Chrome, but Microsoft Edge/Version
+    //is always at the end
+    function isEdge() {
+        return hasNavigator() && /Edge/i.test(navigator.userAgent);
+    }
+    pxsim.isEdge = isEdge;
+    //IE11 also lies about its user agent, but has Trident appear somewhere in
+    //the user agent. Detecting the different between IE11 and Microsoft Edge isn't
+    //super-important because the UI is similar enough
+    function isIE() {
+        return hasNavigator() && /Trident/i.test(navigator.userAgent);
+    }
+    pxsim.isIE = isIE;
+    //Microsoft Edge and IE11 lie about being Chrome. Chromium-based Edge ("Edgeium") will be detected as Chrome, that is ok. If you're looking for Edgeium, use `isChromiumEdge()`.
+    function isChrome() {
+        return !isEdge() && !isIE() && !!navigator && (/Chrome/i.test(navigator.userAgent) || /Chromium/i.test(navigator.userAgent));
+    }
+    pxsim.isChrome = isChrome;
+    //Chrome and Microsoft Edge lie about being Safari
+    function isSafari() {
+        //Could also check isMac but I don't want to risk excluding iOS
+        //Checking for iPhone, iPod or iPad as well as Safari in order to detect home screen browsers on iOS
+        return !isChrome() && !isEdge() && !!navigator && /(Macintosh|Safari|iPod|iPhone|iPad)/i.test(navigator.userAgent);
+    }
+    pxsim.isSafari = isSafari;
+})(pxsim || (pxsim = {}));
+var pxsim;
 (function (pxsim) {
     var pxtcore;
     (function (pxtcore) {