pxt-common-packages 10.2.4 → 10.2.6

package/libs/game/sim/multiplayer.ts

@@ -1,19 +1,29 @@
 namespace pxsim.multiplayer {
-    export function postImage(im: pxsim.RefImage, goal: string) {
+    const throttledImgPost = pxsim.U.throttle((msg: MultiplayerImageMessage) =>{
+        getMultiplayerState().send(msg);
+    }, 50, true);
+
+    export function postImage(im: pxsim.RefImage) {
+        if (getMultiplayerState().origin !== "server")
+            return;
         const asBuf = pxsim.image.toBuffer(im);
-        getMultiplayerState().send(<MultiplayerImageMessage>{
+        const sb = board() as ScreenBoard;
+        const screenState = sb && sb.screenState;
+        throttledImgPost({
             content: "Image",
             image: asBuf,
-            goal
-        });
+            palette: screenState && screenState.paletteToUint8Array(),
+        } as pxsim.MultiplayerImageMessage);
     }
 
+
     export function getCurrentImage(): pxsim.RefImage {
         return getMultiplayerState().backgroundImage;
     }
 
     export function setOrigin(origin: "client" | "server" | undefined) {
         getMultiplayerState().origin = origin;
+
     }
 
     export function getOrigin(): string {
@@ -41,8 +51,9 @@ namespace pxsim {
 
     export interface MultiplayerImageMessage extends SimulatorMultiplayerMessage {
         content: "Image";
-        goal: string; // goal of message; e.g. "broadcast-screen"
         image: RefBuffer;
+        // 48bytes, [r0,g0,b0,r1,g1,b1,...]
+        palette: Uint8Array;
     }
 
     export interface MultiplayerButtonEvent extends SimulatorMultiplayerMessage {
@@ -51,51 +62,55 @@ namespace pxsim {
         state: "Pressed" | "Released" | "Held";
     }
 
-    let postScreenInterval: any;
+    export interface MultiplayerAudioEvent extends SimulatorMultiplayerMessage {
+        content: "Audio";
+        instruction: "playinstructions" | "muteallchannels";
+        soundbuf?: Uint8Array;
+    }
+
     export class MultiplayerState {
         lastMessageId: number;
         origin: string;
         backgroundImage: RefImage;
 
-
         constructor() {
             this.lastMessageId = 0;
         }
 
         send(msg: SimulatorMultiplayerMessage) {
-            Runtime.postMessage(<SimulatorMultiplayerMessage>{
+            Runtime.postMessage({
                 ...msg,
                 broadcast: true,
                 toParentIFrameOnly: true,
                 type: "multiplayer",
                 origin: this.origin,
                 id: this.lastMessageId++
-            });
+            } as SimulatorMultiplayerMessage);
         }
 
         init(origin: string) {
             this.origin = origin;
             runtime.board.addMessageListener(msg => this.messageHandler(msg));
-            if (postScreenInterval) {
-                clearInterval(postScreenInterval)
-            }
-            postScreenInterval = setInterval(() => {
-                if (this.origin === "server") {
-                    const b = board() as ScreenBoard;
-                    const screenState = b && b.screenState;
-                    const lastImage = screenState && screenState.lastImage;
-                    lastImage && pxsim.multiplayer.postImage(lastImage, "broadcast-screen");
+            if (this.origin === "server") {
+                pxsim.AudioContextManager.soundEventCallback = (ev: "playinstructions" | "muteallchannels", data?: Uint8Array) => {
+                    this.send({
+                        content: "Audio",
+                        instruction: ev,
+                        soundbuf: data,
+                    } as pxsim.MultiplayerAudioEvent)
                 }
-            }, 50);
+            } else {
+                pxsim.AudioContextManager.soundEventCallback = undefined;
+            }
         }
 
         setButton(key: number, isPressed: boolean) {
             if (this.origin === "client") {
-                this.send(<pxsim.MultiplayerButtonEvent>{
+                this.send({
                     content: "Button",
                     button: key,
                     state: isPressed ? "Pressed" : "Released"
-                })
+                } as pxsim.MultiplayerButtonEvent)
             }
         }
 
@@ -111,6 +126,10 @@ namespace 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)) {
                 if (this.origin === "server") {
@@ -119,6 +138,14 @@ namespace 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();
+                    }
+                }
             }
         }
     }
@@ -134,4 +161,8 @@ namespace pxsim {
     function isButtonMessage(msg: SimulatorMultiplayerMessage): msg is MultiplayerButtonEvent {
         return msg && msg.content === "Button";
     }
+
+    function isAudioMessage(msg: SimulatorMultiplayerMessage): msg is MultiplayerAudioEvent {
+        return msg && msg.content === "Audio";
+    }
 }

package/libs/lcd/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48480(s) {
+function _main___P48517(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___48723 = (undefined);
-    globals._pollEventQueue___48736 = (undefined);
+    globals._intervals___48760 = (undefined);
+    globals._pollEventQueue___48773 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48480.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48480.continuations = [  ]
+_main___P48517.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48517.continuations = [  ]
 
-function _main___P48480_mk(s) {
+function _main___P48517_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48480, depth: s.depth + 1,
+        parent: s, fn: _main___P48517, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48480_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48480
+return _main___P48517
 })

package/libs/light-spectrum-sensor/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P97772(s) {
+function _main___P97883(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___98015 = (undefined);
-    globals._pollEventQueue___98028 = (undefined);
+    globals._intervals___98126 = (undefined);
+    globals._pollEventQueue___98139 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P97772.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P97772.continuations = [  ]
+_main___P97883.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P97883.continuations = [  ]
 
-function _main___P97772_mk(s) {
+function _main___P97883_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P97772, depth: s.depth + 1,
+        parent: s, fn: _main___P97883, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P97772_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P97772
+return _main___P97883
 })

package/libs/lora/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P59782(s) {
+function _main___P59819(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___60025 = (undefined);
-    globals._pollEventQueue___60038 = (undefined);
+    globals._intervals___60062 = (undefined);
+    globals._pollEventQueue___60075 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P59782.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P59782.continuations = [  ]
+_main___P59819.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P59819.continuations = [  ]
 
-function _main___P59782_mk(s) {
+function _main___P59819_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P59782, depth: s.depth + 1,
+        parent: s, fn: _main___P59819, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P59782_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P59782
+return _main___P59819
 })

package/libs/matrix-keypad/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P189880(s) {
+function _main___P190139(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___190123 = (undefined);
-    globals._pollEventQueue___190136 = (undefined);
+    globals._intervals___190382 = (undefined);
+    globals._pollEventQueue___190395 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P189880.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P189880.continuations = [  ]
+_main___P190139.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P190139.continuations = [  ]
 
-function _main___P189880_mk(s) {
+function _main___P190139_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P189880, depth: s.depth + 1,
+        parent: s, fn: _main___P190139, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P189880_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P189880
+return _main___P190139
 })