pxt-core 8.5.6 → 8.5.7

package/built/pxt.js

@@ -97704,10 +97704,14 @@ var pxt;
             });
         }
         analytics.addDefaultProperties = addDefaultProperties;
-        function enable() {
+        function enable(lang) {
             if (!pxt.aiTrackException || !pxt.aiTrackEvent || enabled)
                 return;
             enabled = true;
+            if (typeof lang != "string" || lang.length == 0) {
+                lang = "en"; //Always have a default language.
+            }
+            addDefaultProperties({ lang: lang });
             pxt.debug('setting up app insights');
             const te = pxt.tickEvent;
             pxt.tickEvent = function (id, data, opts) {
@@ -97859,13 +97863,6 @@ var pxt;
         const AUTH_LOGIN_STATE_KEY = "login-state"; // stored in local storage.
         const AUTH_USER_STATE_KEY = "user-state"; // stored in local storage.
         const X_PXT_TARGET = "x-pxt-target"; // header passed in auth rest calls.
-        const DEV_BACKEND_DEFAULT = "";
-        const DEV_BACKEND_PROD = "https://www.makecode.com";
-        const DEV_BACKEND_STAGING = "https://staging.pxt.io";
-        // Localhost endpoints. Ensure matching port number in pxt-backend/node/.vscode/launch.json
-        const DEV_BACKEND_LOCALHOST_5500 = "http://localhost:5500"; // if running in Docker container
-        const DEV_BACKEND_LOCALHOST_8080 = "http://localhost:8080"; // if not running in Docker
-        const DEV_BACKEND = DEV_BACKEND_STAGING;
         let authDisabled = false;
         auth.DEFAULT_USER_PREFERENCES = () => ({
             highContrast: false,
@@ -97927,7 +97924,7 @@ var pxt;
                 }
                 const currIdp = (_a = state.profile) === null || _a === void 0 ? void 0 : _a.idp;
                 // Check if we're already signed into this identity provider.
-                if (currIdp === idp) {
+                if ((currIdp === null || currIdp === void 0 ? void 0 : currIdp.provider) === idp) {
                     pxt.debug(`loginAsync: Already signed into ${idp}.`);
                     return;
                 }
@@ -98277,7 +98274,7 @@ var pxt;
                     headers["authorization"] = `mkcd ${csrfToken}`;
                 }
                 headers[X_PXT_TARGET] = (_a = pxt.appTarget) === null || _a === void 0 ? void 0 : _a.id;
-                url = pxt.BrowserUtils.isLocalHostDev() ? `${DEV_BACKEND}${url}` : url;
+                url = pxt.BrowserUtils.isLocalHostDev() ? `${pxt.cloud.DEV_BACKEND}${url}` : url;
                 return pxt.Util.requestAsync({
                     url,
                     headers,
@@ -98388,6 +98385,11 @@ var pxt;
             return (_d = (_b = (_a = user === null || user === void 0 ? void 0 : user.idp) === null || _a === void 0 ? void 0 : _a.displayName) !== null && _b !== void 0 ? _b : (_c = user === null || user === void 0 ? void 0 : user.idp) === null || _c === void 0 ? void 0 : _c.username) !== null && _d !== void 0 ? _d : EMPTY_USERNAME;
         }
         auth.userName = userName;
+        function identityProviderId() {
+            var _a, _b, _c, _d;
+            return (_d = (_c = (_b = (_a = client()) === null || _a === void 0 ? void 0 : _a.getState()) === null || _b === void 0 ? void 0 : _b.profile) === null || _c === void 0 ? void 0 : _c.idp) === null || _d === void 0 ? void 0 : _d.provider;
+        }
+        auth.identityProviderId = identityProviderId;
         function firstName(user) {
             const userName = pxt.auth.userName(user);
             return (userName === null || userName === void 0 ? void 0 : userName.split(" ").shift()) || userName;
@@ -99993,8 +99995,10 @@ var ts;
                 const liveUpdateStrings = pxt.Util.liveLocalizationEnabled();
                 return downloadTranslationsAsync(targetId, baseUrl, code, pxtBranch, targetBranch, liveUpdateStrings, ts.pxtc.Util.TranslationsKind.Editor)
                     .then((translations) => {
+                    var _a;
                     if (translations) {
                         Util.setUserLanguage(code);
+                        (_a = pxt.analytics) === null || _a === void 0 ? void 0 : _a.addDefaultProperties({ lang: code }); //set the new language in analytics.
                         Util.setLocalizedStrings(translations);
                     }
                     // Download api translations
@@ -101422,6 +101426,7 @@ var pxt;
     pxt.TUTORIAL_INFO_FILE = "tutorial-info-cache.json";
     pxt.TUTORIAL_CUSTOM_TS = "tutorial.custom.ts";
     pxt.BREAKPOINT_TABLET = 991; // TODO (shakao) revisit when tutorial stuff is more settled
+    pxt.PALETTES_FILE = "_palettes.json";
     function outputName(trg = null) {
         if (!trg)
             trg = pxt.appTarget.compile;
@@ -103483,6 +103488,20 @@ var pxt;
 (function (pxt) {
     var cloud;
     (function (cloud) {
+        const DEV_BACKEND_PROD = "https://www.makecode.com";
+        const DEV_BACKEND_STAGING = "https://staging.pxt.io";
+        const DEV_BACKEND_LOCALHOST = "http://localhost:8080";
+        cloud.DEV_BACKEND = DEV_BACKEND_PROD;
+        function devBackendType() {
+            if (cloud.DEV_BACKEND === DEV_BACKEND_PROD)
+                return "prod";
+            if (cloud.DEV_BACKEND === DEV_BACKEND_STAGING)
+                return "staging";
+            if (cloud.DEV_BACKEND === DEV_BACKEND_LOCALHOST)
+                return "localhost";
+            return "prod";
+        }
+        cloud.devBackendType = devBackendType;
         cloud.cloudStatus = {
             "none": {
                 value: "none",
@@ -109557,16 +109576,7 @@ var pxt;
                 return [(v >> 0) & 0xff, (v >> 8) & 0xff, (v >> 16) & 0xff, 0xff];
             }
             if (!this.palette) {
-                let arrs = pxt.appTarget.runtime.palette.map(htmlColorToBytes);
-                // Set the alpha for transparency at index 0
-                arrs[0][3] = 0;
-                this.palette = new Uint8Array(arrs.length * 4);
-                for (let i = 0; i < arrs.length; ++i) {
-                    this.palette[i * 4 + 0] = arrs[i][0];
-                    this.palette[i * 4 + 1] = arrs[i][1];
-                    this.palette[i * 4 + 2] = arrs[i][2];
-                    this.palette[i * 4 + 3] = arrs[i][3];
-                }
+                this.setPalette(pxt.appTarget.runtime.palette.map(htmlColorToBytes));
             }
             if (magic == 0xe1) {
                 return this.genMonochrome(data, w, h);
@@ -109574,6 +109584,18 @@ var pxt;
             const scaleFactor = ((pxt.BrowserUtils.isEdge() || pxt.BrowserUtils.isIE()) && w < 100 && h < 100) ? 3 : 1;
             return this.genColor(data, w, h, scaleFactor);
         }
+        // p: [[r,g,b,a?], [r,g,b,a?], ...]
+        setPalette(paletteArrays) {
+            // Set the alpha for transparency at index 0
+            paletteArrays[0][3] = 0;
+            this.palette = new Uint8Array(paletteArrays.length * 4);
+            for (let i = 0; i < paletteArrays.length; ++i) {
+                this.palette[i * 4 + 0] = paletteArrays[i][0];
+                this.palette[i * 4 + 1] = paletteArrays[i][1];
+                this.palette[i * 4 + 2] = paletteArrays[i][2];
+                this.palette[i * 4 + 3] = paletteArrays[i][3];
+            }
+        }
         genMonochrome(data, w, h) {
             let outByteW = (w + 3) & ~3;
             let bmpHeaderSize = 14 + 40 + this.palette.length;
@@ -111379,6 +111401,53 @@ var pxt;
     })(storage = pxt.storage || (pxt.storage = {}));
 })(pxt || (pxt = {}));
 var pxt;
+(function (pxt) {
+    var multiplayer;
+    (function (multiplayer) {
+        multiplayer.SHORT_LINKS = {
+            PROD: "https://aka.ms/a9",
+            PROD_BETA: "https://aka.ms/a9b",
+            STAGING: "https://aka.ms/a9s",
+            STAGING_BETA: "https://aka.ms/a9sb",
+            LOCAL: "http://localhost:3000"
+        };
+        multiplayer.SHORT_LINK = () => {
+            if (pxt.BrowserUtils.isLocalHostDev()) {
+                switch (pxt.cloud.devBackendType()) {
+                    case "prod":
+                        return multiplayer.SHORT_LINKS.PROD_BETA;
+                    case "staging":
+                        return multiplayer.SHORT_LINKS.STAGING_BETA;
+                    case "localhost":
+                        return multiplayer.SHORT_LINKS.LOCAL;
+                }
+            }
+            if (window.location.host.endsWith(".staging.pxt.io")) {
+                if (window.location.pathname.startsWith("/beta")) {
+                    return multiplayer.SHORT_LINKS.STAGING_BETA;
+                }
+                else {
+                    return multiplayer.SHORT_LINKS.STAGING;
+                }
+            }
+            if (window.location.pathname.startsWith("/beta")) {
+                return multiplayer.SHORT_LINKS.PROD_BETA;
+            }
+            else {
+                return multiplayer.SHORT_LINKS.PROD;
+            }
+        };
+        function makeHostLink(shareUrlOrCode) {
+            return `${multiplayer.SHORT_LINK()}?host=${encodeURIComponent(shareUrlOrCode)}`;
+        }
+        multiplayer.makeHostLink = makeHostLink;
+        function makeJoinLink(joinCode) {
+            return `${multiplayer.SHORT_LINK()}?join=${encodeURIComponent(joinCode)}`;
+        }
+        multiplayer.makeJoinLink = makeJoinLink;
+    })(multiplayer = pxt.multiplayer || (pxt.multiplayer = {}));
+})(pxt || (pxt = {}));
+var pxt;
 (function (pxt) {
     var assets;
     (function (assets) {
@@ -111918,6 +111987,15 @@ var pxt;
                 });
             }
             music.inflateSong = inflateSong;
+            function getSongInfo(song) {
+                return {
+                    ticksPerBeat: song.ticksPerBeat,
+                    beatsPerMeasure: song.beatsPerMeasure,
+                    beatsPerMinute: song.beatsPerMinute,
+                    measures: song.measures
+                };
+            }
+            music.getSongInfo = getSongInfo;
             function getEmptySong(measures) {
                 return {
                     ticksPerBeat: 8,
@@ -112059,7 +112137,7 @@ var pxt;
                             iconURI: "/static/music-editor/computer.png",
                             instrument: {
                                 waveform: 15,
-                                octave: 1,
+                                octave: 2,
                                 ampEnvelope: {
                                     attack: 10,
                                     decay: 100,
@@ -112076,7 +112154,7 @@ var pxt;
                             iconURI: "/static/music-editor/burger.png",
                             instrument: {
                                 waveform: 1,
-                                octave: 1,
+                                octave: 2,
                                 ampEnvelope: {
                                     attack: 10,
                                     decay: 100,
@@ -112122,7 +112200,7 @@ var pxt;
                         },
                         {
                             id: 9,
-                            name: lf("Explosion"),
+                            name: lf("Drums"),
                             notes: [],
                             iconURI: "/static/music-editor/explosion.png",
                             instrument: {

package/built/pxtblockly.js

@@ -14755,9 +14755,6 @@ var pxtblockly;
         parseFieldOptions(opts) {
             return {};
         }
-        isFullscreen() {
-            return false;
-        }
         redrawPreview() {
             var _a;
             if (!this.fieldGroup_)

package/built/pxtblocks.d.ts

@@ -999,7 +999,6 @@ declare namespace pxtblockly {
         render_(): void;
         protected getValueText(): string;
         protected parseFieldOptions(opts: FieldMusicEditorOptions): ParsedFieldMusicEditorOptions;
-        protected isFullscreen(): boolean;
         protected redrawPreview(): void;
         protected previewWidth(): number;
     }

package/built/pxtblocks.js

@@ -11193,9 +11193,6 @@ var pxtblockly;
         parseFieldOptions(opts) {
             return {};
         }
-        isFullscreen() {
-            return false;
-        }
         redrawPreview() {
             var _a;
             if (!this.fieldGroup_)

package/built/pxteditor.d.ts

@@ -89,6 +89,7 @@ declare namespace pxt.editor {
         errorListState?: ErrorListState;
         screenshoting?: boolean;
         extensionsVisible?: boolean;
+        isMultiplayerGame?: boolean;
     }
     interface EditorState {
         filters?: pxt.editor.ProjectFilters;
@@ -317,7 +318,7 @@ declare namespace pxt.editor {
         toggleKeymap(): void;
         showReportAbuse(): void;
         showLanguagePicker(): void;
-        showShareDialog(title?: string): void;
+        showShareDialog(title?: string, forMultiplayer?: boolean): void;
         showAboutDialog(): void;
         showLoginDialog(continuationHash?: string): void;
         showProfileDialog(location?: string): void;

package/built/pxtlib.d.ts

@@ -14,7 +14,7 @@ declare namespace pxt {
 }
 declare namespace pxt.analytics {
     function addDefaultProperties(props: Map<string | number>): void;
-    function enable(): void;
+    function enable(lang: string): void;
 }
 declare namespace pxt {
     let appTarget: TargetBundle;
@@ -178,6 +178,7 @@ declare namespace pxt.auth {
     function hasIdentity(): boolean;
     function enableAuth(enabled?: boolean): void;
     function userName(user: pxt.auth.UserProfile): string;
+    function identityProviderId(): pxt.IdentityProviderId | undefined;
     function firstName(user: pxt.auth.UserProfile): string;
     function userInitials(user: pxt.auth.UserProfile): string;
     function generateUserProfilePicDataUrl(profile: pxt.auth.UserProfile): void;
@@ -617,6 +618,7 @@ declare namespace pxt {
     const TUTORIAL_INFO_FILE = "tutorial-info-cache.json";
     const TUTORIAL_CUSTOM_TS = "tutorial.custom.ts";
     const BREAKPOINT_TABLET = 991;
+    const PALETTES_FILE = "_palettes.json";
     function outputName(trg?: pxtc.CompileTarget): "binary.uf2" | "binary.bin" | "binary.pxt64" | "binary.elf" | "binary.hex";
     function isOutputText(trg?: pxtc.CompileTarget): boolean;
 }
@@ -867,8 +869,15 @@ declare namespace pxt.BrowserUtils {
     export {};
 }
 declare namespace pxt.cloud {
-    type CloudStatus = "none" | "synced" | "justSynced" | "offline" | "syncing" | "conflict" | "localEdits";
-    type CloudStatusInfo = {
+    export type DevBackendType = "default" | "prod" | "staging" | "localhost";
+    const DEV_BACKEND_PROD = "https://www.makecode.com";
+    const DEV_BACKEND_STAGING = "https://staging.pxt.io";
+    const DEV_BACKEND_LOCALHOST = "http://localhost:8080";
+    type BackendUrls = typeof DEV_BACKEND_PROD | typeof DEV_BACKEND_STAGING | typeof DEV_BACKEND_LOCALHOST;
+    export const DEV_BACKEND: BackendUrls;
+    export function devBackendType(): DevBackendType;
+    export type CloudStatus = "none" | "synced" | "justSynced" | "offline" | "syncing" | "conflict" | "localEdits";
+    export type CloudStatusInfo = {
         value: pxt.cloud.CloudStatus;
         icon?: string;
         tooltip?: string;
@@ -876,9 +885,10 @@ declare namespace pxt.cloud {
         longStatus?: string;
         indicator?: string;
     };
-    const cloudStatus: {
+    export const cloudStatus: {
         [index in pxt.cloud.CloudStatus]: CloudStatusInfo;
     };
+    export {};
 }
 declare namespace pxt.commands {
     interface RecompileOptions {
@@ -1527,6 +1537,7 @@ declare namespace pxt {
         private start;
         logTime(): void;
         convert(jresURL: string): string;
+        setPalette(paletteArrays: number[][]): void;
         genMonochrome(data: string, w: number, h: number): string;
         genColor(data: string, width: number, height: number, intScale: number): string;
     }
@@ -1768,6 +1779,18 @@ declare namespace pxt.storage.shared {
     function setAsync(container: string, key: string, val: any): Promise<void>;
     function delAsync(container: string, key: string): Promise<void>;
 }
+declare namespace pxt.multiplayer {
+    const SHORT_LINKS: {
+        PROD: string;
+        PROD_BETA: string;
+        STAGING: string;
+        STAGING_BETA: string;
+        LOCAL: string;
+    };
+    const SHORT_LINK: () => string;
+    function makeHostLink(shareUrlOrCode: string): string;
+    function makeJoinLink(joinCode: string): string;
+}
 declare namespace pxt.assets.music {
     interface Instrument {
         waveform: number;
@@ -1788,11 +1811,13 @@ declare namespace pxt.assets.music {
         frequency: number;
         amplitude: number;
     }
-    interface Song {
+    interface SongInfo {
         measures: number;
         beatsPerMeasure: number;
         beatsPerMinute: number;
         ticksPerBeat: number;
+    }
+    interface Song extends SongInfo {
         tracks: Track[];
     }
     interface Track {
@@ -1826,6 +1851,7 @@ declare namespace pxt.assets.music {
     function cloneSong(song: Song): Song;
     function songEquals(a: Song, b: Song): boolean;
     function inflateSong(song: pxt.assets.music.Song): void;
+    function getSongInfo(song: pxt.assets.music.Song): SongInfo;
     function getEmptySong(measures: number): pxt.assets.music.Song;
 }
 declare namespace pxt {

package/built/pxtlib.js

@@ -18,10 +18,14 @@ var pxt;
             });
         }
         analytics.addDefaultProperties = addDefaultProperties;
-        function enable() {
+        function enable(lang) {
             if (!pxt.aiTrackException || !pxt.aiTrackEvent || enabled)
                 return;
             enabled = true;
+            if (typeof lang != "string" || lang.length == 0) {
+                lang = "en"; //Always have a default language.
+            }
+            addDefaultProperties({ lang: lang });
             pxt.debug('setting up app insights');
             const te = pxt.tickEvent;
             pxt.tickEvent = function (id, data, opts) {
@@ -173,13 +177,6 @@ var pxt;
         const AUTH_LOGIN_STATE_KEY = "login-state"; // stored in local storage.
         const AUTH_USER_STATE_KEY = "user-state"; // stored in local storage.
         const X_PXT_TARGET = "x-pxt-target"; // header passed in auth rest calls.
-        const DEV_BACKEND_DEFAULT = "";
-        const DEV_BACKEND_PROD = "https://www.makecode.com";
-        const DEV_BACKEND_STAGING = "https://staging.pxt.io";
-        // Localhost endpoints. Ensure matching port number in pxt-backend/node/.vscode/launch.json
-        const DEV_BACKEND_LOCALHOST_5500 = "http://localhost:5500"; // if running in Docker container
-        const DEV_BACKEND_LOCALHOST_8080 = "http://localhost:8080"; // if not running in Docker
-        const DEV_BACKEND = DEV_BACKEND_STAGING;
         let authDisabled = false;
         auth.DEFAULT_USER_PREFERENCES = () => ({
             highContrast: false,
@@ -241,7 +238,7 @@ var pxt;
                 }
                 const currIdp = (_a = state.profile) === null || _a === void 0 ? void 0 : _a.idp;
                 // Check if we're already signed into this identity provider.
-                if (currIdp === idp) {
+                if ((currIdp === null || currIdp === void 0 ? void 0 : currIdp.provider) === idp) {
                     pxt.debug(`loginAsync: Already signed into ${idp}.`);
                     return;
                 }
@@ -591,7 +588,7 @@ var pxt;
                     headers["authorization"] = `mkcd ${csrfToken}`;
                 }
                 headers[X_PXT_TARGET] = (_a = pxt.appTarget) === null || _a === void 0 ? void 0 : _a.id;
-                url = pxt.BrowserUtils.isLocalHostDev() ? `${DEV_BACKEND}${url}` : url;
+                url = pxt.BrowserUtils.isLocalHostDev() ? `${pxt.cloud.DEV_BACKEND}${url}` : url;
                 return pxt.Util.requestAsync({
                     url,
                     headers,
@@ -702,6 +699,11 @@ var pxt;
             return (_d = (_b = (_a = user === null || user === void 0 ? void 0 : user.idp) === null || _a === void 0 ? void 0 : _a.displayName) !== null && _b !== void 0 ? _b : (_c = user === null || user === void 0 ? void 0 : user.idp) === null || _c === void 0 ? void 0 : _c.username) !== null && _d !== void 0 ? _d : EMPTY_USERNAME;
         }
         auth.userName = userName;
+        function identityProviderId() {
+            var _a, _b, _c, _d;
+            return (_d = (_c = (_b = (_a = client()) === null || _a === void 0 ? void 0 : _a.getState()) === null || _b === void 0 ? void 0 : _b.profile) === null || _c === void 0 ? void 0 : _c.idp) === null || _d === void 0 ? void 0 : _d.provider;
+        }
+        auth.identityProviderId = identityProviderId;
         function firstName(user) {
             const userName = pxt.auth.userName(user);
             return (userName === null || userName === void 0 ? void 0 : userName.split(" ").shift()) || userName;
@@ -2307,8 +2309,10 @@ var ts;
                 const liveUpdateStrings = pxt.Util.liveLocalizationEnabled();
                 return downloadTranslationsAsync(targetId, baseUrl, code, pxtBranch, targetBranch, liveUpdateStrings, ts.pxtc.Util.TranslationsKind.Editor)
                     .then((translations) => {
+                    var _a;
                     if (translations) {
                         Util.setUserLanguage(code);
+                        (_a = pxt.analytics) === null || _a === void 0 ? void 0 : _a.addDefaultProperties({ lang: code }); //set the new language in analytics.
                         Util.setLocalizedStrings(translations);
                     }
                     // Download api translations
@@ -3736,6 +3740,7 @@ var pxt;
     pxt.TUTORIAL_INFO_FILE = "tutorial-info-cache.json";
     pxt.TUTORIAL_CUSTOM_TS = "tutorial.custom.ts";
     pxt.BREAKPOINT_TABLET = 991; // TODO (shakao) revisit when tutorial stuff is more settled
+    pxt.PALETTES_FILE = "_palettes.json";
     function outputName(trg = null) {
         if (!trg)
             trg = pxt.appTarget.compile;
@@ -5797,6 +5802,20 @@ var pxt;
 (function (pxt) {
     var cloud;
     (function (cloud) {
+        const DEV_BACKEND_PROD = "https://www.makecode.com";
+        const DEV_BACKEND_STAGING = "https://staging.pxt.io";
+        const DEV_BACKEND_LOCALHOST = "http://localhost:8080";
+        cloud.DEV_BACKEND = DEV_BACKEND_PROD;
+        function devBackendType() {
+            if (cloud.DEV_BACKEND === DEV_BACKEND_PROD)
+                return "prod";
+            if (cloud.DEV_BACKEND === DEV_BACKEND_STAGING)
+                return "staging";
+            if (cloud.DEV_BACKEND === DEV_BACKEND_LOCALHOST)
+                return "localhost";
+            return "prod";
+        }
+        cloud.devBackendType = devBackendType;
         cloud.cloudStatus = {
             "none": {
                 value: "none",
@@ -11871,16 +11890,7 @@ var pxt;
                 return [(v >> 0) & 0xff, (v >> 8) & 0xff, (v >> 16) & 0xff, 0xff];
             }
             if (!this.palette) {
-                let arrs = pxt.appTarget.runtime.palette.map(htmlColorToBytes);
-                // Set the alpha for transparency at index 0
-                arrs[0][3] = 0;
-                this.palette = new Uint8Array(arrs.length * 4);
-                for (let i = 0; i < arrs.length; ++i) {
-                    this.palette[i * 4 + 0] = arrs[i][0];
-                    this.palette[i * 4 + 1] = arrs[i][1];
-                    this.palette[i * 4 + 2] = arrs[i][2];
-                    this.palette[i * 4 + 3] = arrs[i][3];
-                }
+                this.setPalette(pxt.appTarget.runtime.palette.map(htmlColorToBytes));
             }
             if (magic == 0xe1) {
                 return this.genMonochrome(data, w, h);
@@ -11888,6 +11898,18 @@ var pxt;
             const scaleFactor = ((pxt.BrowserUtils.isEdge() || pxt.BrowserUtils.isIE()) && w < 100 && h < 100) ? 3 : 1;
             return this.genColor(data, w, h, scaleFactor);
         }
+        // p: [[r,g,b,a?], [r,g,b,a?], ...]
+        setPalette(paletteArrays) {
+            // Set the alpha for transparency at index 0
+            paletteArrays[0][3] = 0;
+            this.palette = new Uint8Array(paletteArrays.length * 4);
+            for (let i = 0; i < paletteArrays.length; ++i) {
+                this.palette[i * 4 + 0] = paletteArrays[i][0];
+                this.palette[i * 4 + 1] = paletteArrays[i][1];
+                this.palette[i * 4 + 2] = paletteArrays[i][2];
+                this.palette[i * 4 + 3] = paletteArrays[i][3];
+            }
+        }
         genMonochrome(data, w, h) {
             let outByteW = (w + 3) & ~3;
             let bmpHeaderSize = 14 + 40 + this.palette.length;
@@ -13693,6 +13715,53 @@ var pxt;
     })(storage = pxt.storage || (pxt.storage = {}));
 })(pxt || (pxt = {}));
 var pxt;
+(function (pxt) {
+    var multiplayer;
+    (function (multiplayer) {
+        multiplayer.SHORT_LINKS = {
+            PROD: "https://aka.ms/a9",
+            PROD_BETA: "https://aka.ms/a9b",
+            STAGING: "https://aka.ms/a9s",
+            STAGING_BETA: "https://aka.ms/a9sb",
+            LOCAL: "http://localhost:3000"
+        };
+        multiplayer.SHORT_LINK = () => {
+            if (pxt.BrowserUtils.isLocalHostDev()) {
+                switch (pxt.cloud.devBackendType()) {
+                    case "prod":
+                        return multiplayer.SHORT_LINKS.PROD_BETA;
+                    case "staging":
+                        return multiplayer.SHORT_LINKS.STAGING_BETA;
+                    case "localhost":
+                        return multiplayer.SHORT_LINKS.LOCAL;
+                }
+            }
+            if (window.location.host.endsWith(".staging.pxt.io")) {
+                if (window.location.pathname.startsWith("/beta")) {
+                    return multiplayer.SHORT_LINKS.STAGING_BETA;
+                }
+                else {
+                    return multiplayer.SHORT_LINKS.STAGING;
+                }
+            }
+            if (window.location.pathname.startsWith("/beta")) {
+                return multiplayer.SHORT_LINKS.PROD_BETA;
+            }
+            else {
+                return multiplayer.SHORT_LINKS.PROD;
+            }
+        };
+        function makeHostLink(shareUrlOrCode) {
+            return `${multiplayer.SHORT_LINK()}?host=${encodeURIComponent(shareUrlOrCode)}`;
+        }
+        multiplayer.makeHostLink = makeHostLink;
+        function makeJoinLink(joinCode) {
+            return `${multiplayer.SHORT_LINK()}?join=${encodeURIComponent(joinCode)}`;
+        }
+        multiplayer.makeJoinLink = makeJoinLink;
+    })(multiplayer = pxt.multiplayer || (pxt.multiplayer = {}));
+})(pxt || (pxt = {}));
+var pxt;
 (function (pxt) {
     var assets;
     (function (assets) {
@@ -14232,6 +14301,15 @@ var pxt;
                 });
             }
             music.inflateSong = inflateSong;
+            function getSongInfo(song) {
+                return {
+                    ticksPerBeat: song.ticksPerBeat,
+                    beatsPerMeasure: song.beatsPerMeasure,
+                    beatsPerMinute: song.beatsPerMinute,
+                    measures: song.measures
+                };
+            }
+            music.getSongInfo = getSongInfo;
             function getEmptySong(measures) {
                 return {
                     ticksPerBeat: 8,
@@ -14373,7 +14451,7 @@ var pxt;
                             iconURI: "/static/music-editor/computer.png",
                             instrument: {
                                 waveform: 15,
-                                octave: 1,
+                                octave: 2,
                                 ampEnvelope: {
                                     attack: 10,
                                     decay: 100,
@@ -14390,7 +14468,7 @@ var pxt;
                             iconURI: "/static/music-editor/burger.png",
                             instrument: {
                                 waveform: 1,
-                                octave: 1,
+                                octave: 2,
                                 ampEnvelope: {
                                     attack: 10,
                                     decay: 100,
@@ -14436,7 +14514,7 @@ var pxt;
                         },
                         {
                             id: 9,
-                            name: lf("Explosion"),
+                            name: lf("Drums"),
                             notes: [],
                             iconURI: "/static/music-editor/explosion.png",
                             instrument: {

package/built/pxtrunner.js

@@ -1360,7 +1360,7 @@ var pxt;
             });
         }
         function renderAsync(options) {
-            pxt.analytics.enable();
+            pxt.analytics.enable(pxt.Util.userLanguage());
             if (!options)
                 options = defaultClientRenderOptions();
             if (options.pxtUrl)