pxt-core 13.2.9 → 13.2.10

package/built/pxtsim.js

@@ -6506,7 +6506,7 @@ var pxsim;
             this.setState(SimulatorState.Pending);
         }
         focus() {
-            const frame = this.simFrames()[0];
+            const frame = this.mainFrame();
             if (frame)
                 frame.focus();
         }
@@ -6553,7 +6553,7 @@ var pxsim;
             this.themes = themes;
         }
         startRecording(width) {
-            const frame = this.simFrames()[0];
+            const frame = this.mainFrame();
             if (!frame)
                 return undefined;
             this.postMessage({
@@ -6561,7 +6561,7 @@ var pxsim;
                 action: 'start',
                 source: MESSAGE_SOURCE,
                 width
-            });
+            }, undefined, frame.id);
         }
         stopRecording() {
             this.postMessage({ type: 'recorder', source: MESSAGE_SOURCE, action: 'stop' });
@@ -6635,6 +6635,14 @@ var pxsim;
                 frames.unshift(loanedFrame);
             return frames;
         }
+        /**
+         * Returns the main simulator frame: the first frame not running a
+         * simulator extension, or undefined when there is none.
+         * @param skipLoaned excludes the loaned simulator's frame, as `simFrames` does
+         */
+        mainFrame(skipLoaned = false) {
+            return this.simFrames(skipLoaned).find(frame => !frame.dataset[FRAME_DATA_MESSAGE_CHANNEL]);
+        }
         getSimUrl() {
             var _a, _b;
             const simUrl = this.options.simUrl || ((_a = window.pxtConfig) === null || _a === void 0 ? void 0 : _a.simUrl) || ((_b = pxt.webConfig) === null || _b === void 0 ? void 0 : _b.simUrl) || `${location.origin}/sim/simulator.html`;
@@ -6667,8 +6675,8 @@ var pxsim;
                 // include index of the source iframe
                 broadcastmsg.srcFrameIndex = this.simFrames().findIndex((item) => item.contentWindow === source);
                 const sourceFrame = broadcastmsg.srcFrameIndex >= 0 ? this.simFrames()[broadcastmsg.srcFrameIndex] : undefined;
-                // jacdac messages from a board sim other than first should be dropped
-                if (broadcastmsg.srcFrameIndex > 0 && mkcdFrames.find(f => f === sourceFrame) && messageChannel === "jacdac")
+                // jacdac messages from a board sim other than the main frame should be dropped
+                if (sourceFrame !== this.mainFrame() && mkcdFrames.find(f => f === sourceFrame) && messageChannel === "jacdac")
                     return;
                 // if the editor is hosted in a multi-editor setting
                 // don't start extra frames
@@ -6777,13 +6785,14 @@ var pxsim;
             }
             // now that we have iframe starts,
             // dispatch message to other frames
+            const mainFrame = this.mainFrame();
             for (let i = 0; i < frames.length; ++i) {
                 const frame = frames[i];
                 // same frame as source
                 if (source && frame.contentWindow == source)
                     continue;
-                // if jacdac message, don't send to other (board) simulator frames
-                if (i > 0 && !frame.dataset[FRAME_DATA_MESSAGE_CHANNEL] &&
+                // if jacdac message, don't send to (board) simulator frames other than the main frame
+                if (frame !== mainFrame && !frame.dataset[FRAME_DATA_MESSAGE_CHANNEL] &&
                     msg.type === "messagepacket" && msg.channel === "jacdac")
                     continue;
                 // frame not in DOM
@@ -6888,9 +6897,10 @@ var pxsim;
                 this._currentRuntime = undefined;
                 this.container.textContent = "";
             }
-            if (!this.simFrames().length) {
-                this.container.appendChild(this.createFrame());
-                this.applyAspectRatio(aspectRatio);
+            if (!this.mainFrame()) {
+                const wrapper = this.createFrame();
+                this.container.insertBefore(wrapper, this.container.firstElementChild);
+                this.applyAspectRatioToFrame(wrapper.firstElementChild, aspectRatio);
                 this.setStarting();
             }
         }
@@ -6932,10 +6942,11 @@ var pxsim;
         // returns a simulator iframe that can be hosted anywhere in the page
         // while a loaned simulator is active, all other iframes are suspended
         loanSimulator() {
+            var _a;
             if (this.loanedSimulator)
                 return this.loanedSimulator;
             // reuse first simulator or create new one
-            this.loanedSimulator = this.container.firstElementChild || this.createFrame();
+            this.loanedSimulator = ((_a = this.mainFrame(true)) === null || _a === void 0 ? void 0 : _a.parentElement) || this.createFrame();
             if (this.loanedSimulator.parentNode)
                 this.container.removeChild(this.loanedSimulator);
             return this.loanedSimulator;
@@ -7000,8 +7011,8 @@ var pxsim;
         }
         cleanupFrames() {
             // drop unused extras frames after 5 seconds
-            const frames = this.simFrames(true);
-            frames.shift(); // drop first frame
+            const mainFrame = this.mainFrame(true);
+            const frames = this.simFrames(true).filter(frame => frame !== mainFrame);
             frames.filter(frame => !frame.dataset[PERMANENT])
                 .forEach(frame => {
                 if (this.state == SimulatorState.Stopped
@@ -7019,7 +7030,10 @@ var pxsim;
                 return;
             const frames = this.simFrames();
             frames.forEach(frame => {
-                this.options.removeElement(frame.parentElement, completeHandler);
+                if (frame.dataset[PERMANENT] && this.options.hideElement)
+                    this.options.hideElement(frame.parentElement, completeHandler);
+                else
+                    this.options.removeElement(frame.parentElement, completeHandler);
             });
             // Execute the complete handler if there are no frames in sim view
             if (frames.length == 0 && completeHandler) {
@@ -7087,10 +7101,10 @@ var pxsim;
             this.singleSimulator = false;
             this.breakpointsSet = false;
             // first frame
-            let frame = this.simFrames()[0];
+            let frame = this.mainFrame();
             if (!frame) {
                 let wrapper = this.createFrame();
-                this.container.appendChild(wrapper);
+                this.container.insertBefore(wrapper, this.container.firstElementChild);
                 frame = wrapper.firstElementChild;
             }
             this.startFrame(frame);

package/built/server.d.ts

@@ -14,6 +14,7 @@ export interface ServeOptions {
     noauth?: boolean;
     backport?: number;
     https?: boolean;
+    localRepos?: pxt.Map<string>;
 }
 export declare function compileScriptAsync(id: string): Promise<string>;
 export declare function serveAsync(options: ServeOptions): Promise<void>;

package/built/server.js

@@ -11,6 +11,7 @@ const nodeutil = require("./nodeutil");
 const hid = require("./hid");
 const net = require("net");
 const storage = require("./storage");
+const localrepos = require("./localrepos");
 const subwebapp_1 = require("./subwebapp");
 const util_1 = require("util");
 var U = pxt.Util;
@@ -363,6 +364,10 @@ function handleApiAsync(req, res, elts) {
         // target config
         return readFileAsync("targetconfig.json").then(buf => JSON.parse(buf.toString("utf8")));
     }
+    else if (cmd == "GET localrepos")
+        return Promise.resolve({ repos: Object.keys(serveOptions.localRepos || {}) });
+    else if (cmd == "GET gh")
+        return Promise.resolve().then(() => localrepos.resolveLocalRepoRequest(serveOptions.localRepos || {}, innerPath));
     else
         throw throwError(400, `unknown command ${cmd.slice(0, 140)}`);
 }
@@ -890,6 +895,14 @@ async function compileScriptAsync(id) {
     return r;
 }
 exports.compileScriptAsync = compileScriptAsync;
+function logLocalRepos() {
+    const slugs = Object.keys(serveOptions.localRepos || {});
+    if (!slugs.length)
+        return;
+    console.log(`Serving GitHub repositories from local directories:`);
+    for (const slug of slugs)
+        console.log(`    ${slug} -> ${serveOptions.localRepos[slug]}`);
+}
 function serveAsync(options) {
     serveOptions = options;
     if (!serveOptions.port)
@@ -899,6 +912,7 @@ function serveAsync(options) {
     if (!serveOptions.hostname)
         serveOptions.hostname = "localhost";
     setupRootDir();
+    logLocalRepos();
     const wsServerPromise = initSocketServer(serveOptions.wsPort, serveOptions.hostname);
     if (serveOptions.serial)
         initSerialMonitor();