pxt-common-packages 10.2.4 → 10.2.6

package/built/common-sim.d.ts

@@ -773,7 +773,7 @@ declare namespace pxsim {
     }
 }
 declare namespace pxsim.multiplayer {
-    function postImage(im: pxsim.RefImage, goal: string): void;
+    function postImage(im: pxsim.RefImage): void;
     function getCurrentImage(): pxsim.RefImage;
     function setOrigin(origin: "client" | "server" | undefined): void;
     function getOrigin(): string;
@@ -793,14 +793,19 @@ declare namespace pxsim {
     }
     interface MultiplayerImageMessage extends SimulatorMultiplayerMessage {
         content: "Image";
-        goal: string;
         image: RefBuffer;
+        palette: Uint8Array;
     }
     interface MultiplayerButtonEvent extends SimulatorMultiplayerMessage {
         content: "Button";
         button: number;
         state: "Pressed" | "Released" | "Held";
     }
+    interface MultiplayerAudioEvent extends SimulatorMultiplayerMessage {
+        content: "Audio";
+        instruction: "playinstructions" | "muteallchannels";
+        soundbuf?: Uint8Array;
+    }
     class MultiplayerState {
         lastMessageId: number;
         origin: string;
@@ -1131,6 +1136,8 @@ declare namespace pxsim {
         onChange: () => void;
         constructor(paletteSrc: string[], w?: number, h?: number);
         setScreenBrightness(b: number): void;
+        paletteToUint8Array(): Uint8Array;
+        setPaletteFromHtmlColors(src: string[]): void;
         setPalette(buf: RefBuffer): void;
         bpp(): 1 | 4;
         didChange(): boolean;

package/built/common-sim.js

@@ -2537,12 +2537,19 @@ var pxsim;
 (function (pxsim) {
     var multiplayer;
     (function (multiplayer) {
-        function postImage(im, goal) {
+        const throttledImgPost = pxsim.U.throttle((msg) => {
+            pxsim.getMultiplayerState().send(msg);
+        }, 50, true);
+        function postImage(im) {
+            if (pxsim.getMultiplayerState().origin !== "server")
+                return;
             const asBuf = pxsim.image.toBuffer(im);
-            pxsim.getMultiplayerState().send({
+            const sb = pxsim.board();
+            const screenState = sb && sb.screenState;
+            throttledImgPost({
                 content: "Image",
                 image: asBuf,
-                goal
+                palette: screenState && screenState.paletteToUint8Array(),
             });
         }
         multiplayer.postImage = postImage;
@@ -2565,7 +2572,6 @@ var pxsim;
         return pxsim.board().multiplayerState;
     }
     pxsim.getMultiplayerState = getMultiplayerState;
-    let postScreenInterval;
     class MultiplayerState {
         constructor() {
             this.lastMessageId = 0;
@@ -2576,17 +2582,18 @@ var pxsim;
         init(origin) {
             this.origin = origin;
             pxsim.runtime.board.addMessageListener(msg => this.messageHandler(msg));
-            if (postScreenInterval) {
-                clearInterval(postScreenInterval);
+            if (this.origin === "server") {
+                pxsim.AudioContextManager.soundEventCallback = (ev, data) => {
+                    this.send({
+                        content: "Audio",
+                        instruction: ev,
+                        soundbuf: data,
+                    });
+                };
+            }
+            else {
+                pxsim.AudioContextManager.soundEventCallback = undefined;
             }
-            postScreenInterval = setInterval(() => {
-                if (this.origin === "server") {
-                    const b = pxsim.board();
-                    const screenState = b && b.screenState;
-                    const lastImage = screenState && screenState.lastImage;
-                    lastImage && pxsim.multiplayer.postImage(lastImage, "broadcast-screen");
-                }
-            }, 50);
         }
         setButton(key, isPressed) {
             if (this.origin === "client") {
@@ -2608,6 +2615,10 @@ var pxsim;
                         msg.image.data = new Uint8Array(msg.image.data);
                     }
                     this.backgroundImage = pxsim.image.ofBuffer(msg.image);
+                    if (msg.palette && msg.palette.length === 48) {
+                        const palBuffer = new pxsim.RefBuffer(msg.palette);
+                        pxsim.pxtcore.setPalette(palBuffer);
+                    }
                 }
             }
             else if (isButtonMessage(msg)) {
@@ -2616,6 +2627,16 @@ var pxsim;
                     msg.state === "Pressed" || msg.state === "Held");
                 }
             }
+            else if (isAudioMessage(msg)) {
+                if (this.origin === "client") {
+                    if (msg.instruction === "playinstructions") {
+                        pxsim.AudioContextManager.playInstructionsAsync(msg.soundbuf);
+                    }
+                    else if (msg.instruction === "muteallchannels") {
+                        pxsim.AudioContextManager.muteAllChannels();
+                    }
+                }
+            }
         }
     }
     pxsim.MultiplayerState = MultiplayerState;
@@ -2628,6 +2649,9 @@ var pxsim;
     function isButtonMessage(msg) {
         return msg && msg.content === "Button";
     }
+    function isAudioMessage(msg) {
+        return msg && msg.content === "Audio";
+    }
 })(pxsim || (pxsim = {}));
 var pxsim;
 (function (pxsim) {
@@ -4426,7 +4450,6 @@ var pxsim;
 (function (pxsim) {
     function htmlColorToUint32(hexColor) {
         const ca = new Uint8ClampedArray(4);
-        const ui = new Uint32Array(ca.buffer);
         const v = parseInt(hexColor.replace(/#/, ""), 16);
         ca[0] = (v >> 16) & 0xff;
         ca[1] = (v >> 8) & 0xff;
@@ -4435,6 +4458,12 @@ var pxsim;
         // convert to uint32 using target endian
         return new Uint32Array(ca.buffer)[0];
     }
+    function UInt32ToRGB(col) {
+        const ui = new Uint32Array(1);
+        ui[0] = col;
+        const ca = new Uint8ClampedArray(ui.buffer);
+        return [ca[0], ca[1], ca[2]];
+    }
     class ScreenState {
         constructor(paletteSrc, w = 0, h = 0) {
             this.width = 0;
@@ -4446,9 +4475,7 @@ var pxsim;
             if (!paletteSrc)
                 paletteSrc = ["#000000", "#ffffff"];
             this.palette = new Uint32Array(paletteSrc.length);
-            for (let i = 0; i < this.palette.length; ++i) {
-                this.palette[i] = htmlColorToUint32(paletteSrc[i]);
-            }
+            this.setPaletteFromHtmlColors(paletteSrc);
             if (w) {
                 this.width = w;
                 this.height = h;
@@ -4459,6 +4486,22 @@ var pxsim;
         setScreenBrightness(b) {
             this.brightness = b | 0;
         }
+        paletteToUint8Array() {
+            const out = new Uint8Array(this.palette.length * 3);
+            for (let i = 0; i < this.palette.length; ++i) {
+                const [r, g, b] = UInt32ToRGB(this.palette[i]);
+                const s = 3 * i;
+                out[s] = r;
+                out[s + 1] = g;
+                out[s + 2] = b;
+            }
+            return out;
+        }
+        setPaletteFromHtmlColors(src) {
+            for (let i = 0; i < this.palette.length; ++i) {
+                this.palette[i] = htmlColorToUint32(src[i]);
+            }
+        }
         setPalette(buf) {
             const ca = new Uint8ClampedArray(4);
             const rd = new Uint32Array(ca.buffer);