pxt-arcade 1.12.5 → 1.12.7

package/built/common-sim.d.ts

@@ -774,6 +774,7 @@ declare namespace pxsim {
 }
 declare namespace pxsim.multiplayer {
     function postImage(im: pxsim.RefImage): void;
+    function postIcon(iconType: IconType, slot: number, im: pxsim.RefImage): void;
     function getCurrentImage(): pxsim.RefImage;
     function setOrigin(origin: "client" | "server" | undefined): void;
     function getOrigin(): string;
@@ -796,6 +797,17 @@ declare namespace pxsim {
         image: RefBuffer;
         palette: Uint8Array;
     }
+    enum IconType {
+        Player = 0,
+        Reaction = 1
+    }
+    interface MultiplayerIconMessage extends SimulatorMultiplayerMessage {
+        content: "Icon";
+        icon: RefBuffer;
+        slot: number;
+        iconType: IconType;
+        palette: Uint8Array;
+    }
     interface MultiplayerButtonEvent extends SimulatorMultiplayerMessage {
         content: "Button";
         button: number;

package/built/common-sim.js

@@ -2553,6 +2553,25 @@ var pxsim;
             });
         }
         multiplayer.postImage = postImage;
+        function postIcon(iconType, slot, im) {
+            if (pxsim.getMultiplayerState().origin !== "server")
+                return;
+            if (im._width * im._height > 64 * 64) {
+                // setting 64x64 as max size for icon for now
+                return;
+            }
+            const asBuf = pxsim.image.toBuffer(im);
+            const sb = pxsim.board();
+            const screenState = sb && sb.screenState;
+            pxsim.getMultiplayerState().send({
+                content: "Icon",
+                slot: slot,
+                icon: asBuf,
+                iconType: iconType,
+                palette: screenState.paletteToUint8Array(),
+            });
+        }
+        multiplayer.postIcon = postIcon;
         function getCurrentImage() {
             return pxsim.getMultiplayerState().backgroundImage;
         }
@@ -2572,6 +2591,11 @@ var pxsim;
         return pxsim.board().multiplayerState;
     }
     pxsim.getMultiplayerState = getMultiplayerState;
+    let IconType;
+    (function (IconType) {
+        IconType[IconType["Player"] = 0] = "Player";
+        IconType[IconType["Reaction"] = 1] = "Reaction";
+    })(IconType = pxsim.IconType || (pxsim.IconType = {}));
     class MultiplayerState {
         constructor() {
             this.lastMessageId = 0;

package/built/sim.js

@@ -153,6 +153,7 @@ var pxsim;
 var pxsim;
 (function (pxsim) {
     let forcedUpdateLoop;
+    let isFirstRunSafari = true;
     window.addEventListener("DOMContentLoaded", () => {
         const searchParams = new URL(window.location.toString()).searchParams;
         setSimThemeColor("background-color", searchParams.get("background-color"));
@@ -304,7 +305,7 @@ var pxsim;
                 }
             };
             window.addEventListener("message", (ev) => {
-                if (ev.data.button !== undefined) {
+                if (ev.data.button !== undefined && ev.data.type !== "multiplayer") {
                     let key;
                     switch (ev.data.button) {
                         case 0:
@@ -492,7 +493,11 @@ var pxsim;
             // ignore
         }
         resize() { }
-        initAsync(msg) {
+        async initAsync(msg) {
+            var _a;
+            if (msg.options.mpRole) {
+                this.multiplayerState.origin = msg.options.mpRole;
+            }
             this.runOptions = msg;
             this.stats = document.getElementById("debug-stats");
             this.stats.className = "stats no-select";
@@ -510,7 +515,27 @@ var pxsim;
                 }
             }
             this.updateStats();
-            return Promise.resolve();
+            let safariEnablePromise;
+            if (isFirstRunSafari && !safariEnablePromise) {
+                const safariWarning = document.getElementById("safari-enable-game");
+                if (isSafari() && ((_a = msg.options) === null || _a === void 0 ? void 0 : _a.mpRole) === "server") {
+                    safariEnablePromise = new Promise(resolve => {
+                        safariWarning.style.display = "flex";
+                        safariWarning.addEventListener("click", () => {
+                            safariWarning.remove();
+                            isFirstRunSafari = false;
+                            resolve();
+                        });
+                    });
+                }
+                else {
+                    safariWarning.remove();
+                    isFirstRunSafari = false;
+                }
+            }
+            if (isFirstRunSafari) {
+                await safariEnablePromise;
+            }
         }
         updateStats() {
             this.stats.textContent = this.screenState.stats || "";
@@ -573,6 +598,12 @@ function isChrome() {
         (/Chrome/i.test(navigator.userAgent) ||
             /Chromium/i.test(navigator.userAgent)));
 }
+//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);
+}
 (function (pxsim) {
     var pxtcore;
     (function (pxtcore) {
@@ -2767,6 +2798,25 @@ var pxsim;
             });
         }
         multiplayer.postImage = postImage;
+        function postIcon(iconType, slot, im) {
+            if (pxsim.getMultiplayerState().origin !== "server")
+                return;
+            if (im._width * im._height > 64 * 64) {
+                // setting 64x64 as max size for icon for now
+                return;
+            }
+            const asBuf = pxsim.image.toBuffer(im);
+            const sb = pxsim.board();
+            const screenState = sb && sb.screenState;
+            pxsim.getMultiplayerState().send({
+                content: "Icon",
+                slot: slot,
+                icon: asBuf,
+                iconType: iconType,
+                palette: screenState.paletteToUint8Array(),
+            });
+        }
+        multiplayer.postIcon = postIcon;
         function getCurrentImage() {
             return pxsim.getMultiplayerState().backgroundImage;
         }
@@ -2786,6 +2836,11 @@ var pxsim;
         return pxsim.board().multiplayerState;
     }
     pxsim.getMultiplayerState = getMultiplayerState;
+    let IconType;
+    (function (IconType) {
+        IconType[IconType["Player"] = 0] = "Player";
+        IconType[IconType["Reaction"] = 1] = "Reaction";
+    })(IconType = pxsim.IconType || (pxsim.IconType = {}));
     class MultiplayerState {
         constructor() {
             this.lastMessageId = 0;