pxt-core 11.3.9 → 11.3.11

package/built/pxt.js

@@ -97735,8 +97735,8 @@ var pxt;
                 if (!data)
                     pxt.aiTrackEvent(id);
                 else {
-                    const props = Object.assign({}, defaultProps) || {};
-                    const measures = Object.assign({}, defaultMeasures) || {};
+                    const props = Object.assign({}, defaultProps);
+                    const measures = Object.assign({}, defaultMeasures);
                     Object.keys(data).forEach(k => {
                         if (typeof data[k] == "string")
                             props[k] = data[k];
@@ -99844,6 +99844,11 @@ var ts;
             function requestAsync(options) {
                 //if (debugHttpRequests)
                 //    pxt.debug(`>> ${options.method || "GET"} ${options.url.replace(/[?#].*/, "...")}`); // don't leak secrets in logs
+                const measureParams = {
+                    "url": `${encodeURI(options.url.replace(/[?#].*/, "..."))}`,
+                    "method": `${options.method || "GET"}`
+                };
+                pxt.perf.measureStart(Measurements.NetworkRequest);
                 return Util.httpRequestCoreAsync(options)
                     .then(resp => {
                     //if (debugHttpRequests)
@@ -99859,6 +99864,25 @@ var ts;
                     if (resp.text && /application\/json/.test(resp.headers["content-type"]))
                         resp.json = pxtc.U.jsonTryParse(resp.text);
                     return resp;
+                })
+                    .then(resp => {
+                    const contentLength = resp.headers["content-length"];
+                    if (contentLength) {
+                        measureParams["sizeInBytes"] = `${contentLength}`;
+                    }
+                    else if (resp.text) {
+                        if (pxt.perf.isEnabled()) {
+                            // only do this work if perf measurement is actually enabled
+                            const encoder = new TextEncoder();
+                            const encoded = encoder.encode(resp.text);
+                            measureParams["sizeInBytes"] = encoded.length + "";
+                        }
+                    }
+                    measureParams["statusCode"] = `${resp.statusCode}`;
+                    return resp;
+                })
+                    .finally(() => {
+                    pxt.perf.measureEnd(Measurements.NetworkRequest, measureParams);
                 });
             }
             Util.requestAsync = requestAsync;
@@ -100890,9 +100914,9 @@ var ts;
             }
             BrowserImpl.sha256buffer = sha256buffer;
             function sha256string(s) {
-                pxt.perf.measureStart("sha256buffer");
+                pxt.perf.measureStart(Measurements.Sha256Buffer);
                 const res = sha256buffer(pxtc.Util.toUTF8Array(s));
-                pxt.perf.measureEnd("sha256buffer");
+                pxt.perf.measureEnd(Measurements.Sha256Buffer);
                 return res;
             }
             BrowserImpl.sha256string = sha256string;
@@ -101293,6 +101317,8 @@ var pxt;
 (function () {
     // Sometimes these aren't initialized, for example in tests. We only care about them
     // doing anything in the browser.
+    if (!pxt.perf.isEnabled)
+        pxt.perf.isEnabled = () => false;
     if (!pxt.perf.report)
         pxt.perf.report = () => undefined;
     if (!pxt.perf.recordMilestone)
@@ -101521,7 +101547,7 @@ var pxt;
         }
     }
     function reloadAppTargetVariant(temporary = false) {
-        pxt.perf.measureStart("reloadAppTargetVariant");
+        pxt.perf.measureStart(Measurements.ReloadAppTargetVariant);
         const curr = temporary ? "" : JSON.stringify(pxt.appTarget);
         pxt.appTarget = pxt.U.cloneTargetBundle(savedAppTarget);
         if (pxt.appTargetVariant) {
@@ -101535,7 +101561,7 @@ var pxt;
         // check if apptarget changed
         if (!temporary && pxt.onAppTargetChanged && curr != JSON.stringify(pxt.appTarget))
             pxt.onAppTargetChanged();
-        pxt.perf.measureEnd("reloadAppTargetVariant");
+        pxt.perf.measureEnd(Measurements.ReloadAppTargetVariant);
     }
     pxt.reloadAppTargetVariant = reloadAppTargetVariant;
     // this is set by compileServiceVariant in pxt.json
@@ -103573,13 +103599,13 @@ var pxt;
                 });
             }
             setAsync(filename, snippets, code, highlights, codeValidationMap, branch) {
-                pxt.perf.measureStart("tutorial info db setAsync");
+                pxt.perf.measureStart(Measurements.TutorialInfoDbSetAsync);
                 const key = getTutorialInfoKey(filename, branch);
                 const hash = getTutorialCodeHash(code);
                 return this.setWithHashAsync(filename, snippets, hash, highlights, codeValidationMap);
             }
             setWithHashAsync(filename, snippets, hash, highlights, codeValidationMap, branch) {
-                pxt.perf.measureStart("tutorial info db setAsync");
+                pxt.perf.measureStart(Measurements.TutorialInfoDbSetAsync);
                 const key = getTutorialInfoKey(filename, branch);
                 const blocks = {};
                 Object.keys(snippets).forEach(hash => {
@@ -103598,7 +103624,7 @@ var pxt;
                 };
                 return this.db.setAsync(TutorialInfoIndexedDb.TABLE, entry)
                     .then(() => {
-                    pxt.perf.measureEnd("tutorial info db setAsync");
+                    pxt.perf.measureEnd(Measurements.TutorialInfoDbSetAsync);
                 });
             }
             clearAsync() {
@@ -103953,6 +103979,8 @@ var pxt;
         commands.electronDeployAsync = undefined; // A pointer to the Electron deploy function, so that targets can access it in their extension.ts
         commands.webUsbPairDialogAsync = undefined;
         commands.onTutorialCompleted = undefined;
+        commands.onPerfMilestone = undefined;
+        commands.onPerfMeasurement = undefined;
         commands.workspaceLoadedAsync = undefined;
         commands.onMarkdownActivityLoad = undefined;
     })(commands = pxt.commands || (pxt.commands = {}));
@@ -104052,6 +104080,14 @@ var pxt;
         return ("0" + n.toString(16)).slice(-2);
     }
 })(pxt || (pxt = {}));
+var Measurements;
+(function (Measurements) {
+    Measurements.TutorialInfoDbSetAsync = "tutorial info db setAsync";
+    Measurements.ReloadAppTargetVariant = "reloadAppTargetVariant";
+    Measurements.Sha256Buffer = "sha256buffer";
+    Measurements.WebworkerRecvHandler = "webworker recvHandler";
+    Measurements.NetworkRequest = "network.request";
+})(Measurements || (Measurements = {}));
 /// <reference path="../localtypings/pxtarget.d.ts"/>
 var pxt;
 (function (pxt) {
@@ -121097,9 +121133,9 @@ var pxt;
             let worker = new Worker(workerFile);
             let iface = wrap(v => worker.postMessage(v));
             worker.onmessage = ev => {
-                pxt.perf.measureStart("webworker recvHandler");
+                pxt.perf.measureStart(Measurements.WebworkerRecvHandler);
                 iface.recvHandler(ev.data);
-                pxt.perf.measureEnd("webworker recvHandler");
+                pxt.perf.measureEnd(Measurements.WebworkerRecvHandler);
             };
             return iface;
         }

package/built/pxtlib.d.ts

@@ -523,6 +523,10 @@ declare namespace ts.pxtc.jsonPatch.tests {
     function patchTests(): void;
 }
 declare namespace pxt.perf {
+    type EventSource<T> = {
+        subscribe(listener: (payload: T) => void): () => void;
+    };
+    function isEnabled(): boolean;
     let perfReportLogged: boolean;
     function report(): {
         milestones: {
@@ -532,9 +536,20 @@ declare namespace pxt.perf {
             [index: string]: number;
         };
     } | undefined;
-    function recordMilestone(msg: string, time?: number): void;
+    function recordMilestone(msg: string, params?: Map<string>): void;
     function measureStart(name: string): void;
-    function measureEnd(name: string): void;
+    function measureEnd(name: string, params?: Map<string>): void;
+    const onMilestone: EventSource<{
+        milestone: string;
+        time: number;
+        params?: Map<string>;
+    }>;
+    const onMeasurement: EventSource<{
+        name: string;
+        start: number;
+        duration: number;
+        params?: Map<string>;
+    }>;
 }
 declare namespace pxt {
     export import U = pxtc.Util;
@@ -1007,6 +1022,18 @@ declare namespace pxt.commands {
     let electronDeployAsync: (r: ts.pxtc.CompileResult) => Promise<void>;
     let webUsbPairDialogAsync: (pairAsync: () => Promise<boolean>, confirmAsync: (options: any) => Promise<WebUSBPairResult>, implicitlyCalled?: boolean) => Promise<WebUSBPairResult>;
     let onTutorialCompleted: () => void;
+    let onPostHostMessage: (msg: any) => void;
+    let onPerfMilestone: (payload: {
+        milestone: string;
+        time: number;
+        params?: Map<string>;
+    }) => void;
+    let onPerfMeasurement: (payload: {
+        name: string;
+        start: number;
+        duration: number;
+        params?: Map<string>;
+    }) => void;
     let workspaceLoadedAsync: () => Promise<void>;
     let onMarkdownActivityLoad: (path: string, title?: string, editorProjectName?: string) => Promise<void>;
 }
@@ -1014,6 +1041,13 @@ declare namespace pxt {
     function getWhiteContrastingBackground(color: string): string;
     function contrastRatio(fg: string, bg: string): number;
 }
+declare namespace Measurements {
+    const TutorialInfoDbSetAsync = "tutorial info db setAsync";
+    const ReloadAppTargetVariant = "reloadAppTargetVariant";
+    const Sha256Buffer = "sha256buffer";
+    const WebworkerRecvHandler = "webworker recvHandler";
+    const NetworkRequest = "network.request";
+}
 declare namespace pxt {
     function lzmaDecompressAsync(buf: Uint8Array): Promise<string>;
     function lzmaCompressAsync(text: string): Promise<Uint8Array>;

package/built/pxtlib.js

@@ -49,8 +49,8 @@ var pxt;
                 if (!data)
                     pxt.aiTrackEvent(id);
                 else {
-                    const props = Object.assign({}, defaultProps) || {};
-                    const measures = Object.assign({}, defaultMeasures) || {};
+                    const props = Object.assign({}, defaultProps);
+                    const measures = Object.assign({}, defaultMeasures);
                     Object.keys(data).forEach(k => {
                         if (typeof data[k] == "string")
                             props[k] = data[k];
@@ -2158,6 +2158,11 @@ var ts;
             function requestAsync(options) {
                 //if (debugHttpRequests)
                 //    pxt.debug(`>> ${options.method || "GET"} ${options.url.replace(/[?#].*/, "...")}`); // don't leak secrets in logs
+                const measureParams = {
+                    "url": `${encodeURI(options.url.replace(/[?#].*/, "..."))}`,
+                    "method": `${options.method || "GET"}`
+                };
+                pxt.perf.measureStart(Measurements.NetworkRequest);
                 return Util.httpRequestCoreAsync(options)
                     .then(resp => {
                     //if (debugHttpRequests)
@@ -2173,6 +2178,25 @@ var ts;
                     if (resp.text && /application\/json/.test(resp.headers["content-type"]))
                         resp.json = pxtc.U.jsonTryParse(resp.text);
                     return resp;
+                })
+                    .then(resp => {
+                    const contentLength = resp.headers["content-length"];
+                    if (contentLength) {
+                        measureParams["sizeInBytes"] = `${contentLength}`;
+                    }
+                    else if (resp.text) {
+                        if (pxt.perf.isEnabled()) {
+                            // only do this work if perf measurement is actually enabled
+                            const encoder = new TextEncoder();
+                            const encoded = encoder.encode(resp.text);
+                            measureParams["sizeInBytes"] = encoded.length + "";
+                        }
+                    }
+                    measureParams["statusCode"] = `${resp.statusCode}`;
+                    return resp;
+                })
+                    .finally(() => {
+                    pxt.perf.measureEnd(Measurements.NetworkRequest, measureParams);
                 });
             }
             Util.requestAsync = requestAsync;
@@ -3204,9 +3228,9 @@ var ts;
             }
             BrowserImpl.sha256buffer = sha256buffer;
             function sha256string(s) {
-                pxt.perf.measureStart("sha256buffer");
+                pxt.perf.measureStart(Measurements.Sha256Buffer);
                 const res = sha256buffer(pxtc.Util.toUTF8Array(s));
-                pxt.perf.measureEnd("sha256buffer");
+                pxt.perf.measureEnd(Measurements.Sha256Buffer);
                 return res;
             }
             BrowserImpl.sha256string = sha256string;
@@ -3607,6 +3631,8 @@ var pxt;
 (function () {
     // Sometimes these aren't initialized, for example in tests. We only care about them
     // doing anything in the browser.
+    if (!pxt.perf.isEnabled)
+        pxt.perf.isEnabled = () => false;
     if (!pxt.perf.report)
         pxt.perf.report = () => undefined;
     if (!pxt.perf.recordMilestone)
@@ -3835,7 +3861,7 @@ var pxt;
         }
     }
     function reloadAppTargetVariant(temporary = false) {
-        pxt.perf.measureStart("reloadAppTargetVariant");
+        pxt.perf.measureStart(Measurements.ReloadAppTargetVariant);
         const curr = temporary ? "" : JSON.stringify(pxt.appTarget);
         pxt.appTarget = pxt.U.cloneTargetBundle(savedAppTarget);
         if (pxt.appTargetVariant) {
@@ -3849,7 +3875,7 @@ var pxt;
         // check if apptarget changed
         if (!temporary && pxt.onAppTargetChanged && curr != JSON.stringify(pxt.appTarget))
             pxt.onAppTargetChanged();
-        pxt.perf.measureEnd("reloadAppTargetVariant");
+        pxt.perf.measureEnd(Measurements.ReloadAppTargetVariant);
     }
     pxt.reloadAppTargetVariant = reloadAppTargetVariant;
     // this is set by compileServiceVariant in pxt.json
@@ -5887,13 +5913,13 @@ var pxt;
                 });
             }
             setAsync(filename, snippets, code, highlights, codeValidationMap, branch) {
-                pxt.perf.measureStart("tutorial info db setAsync");
+                pxt.perf.measureStart(Measurements.TutorialInfoDbSetAsync);
                 const key = getTutorialInfoKey(filename, branch);
                 const hash = getTutorialCodeHash(code);
                 return this.setWithHashAsync(filename, snippets, hash, highlights, codeValidationMap);
             }
             setWithHashAsync(filename, snippets, hash, highlights, codeValidationMap, branch) {
-                pxt.perf.measureStart("tutorial info db setAsync");
+                pxt.perf.measureStart(Measurements.TutorialInfoDbSetAsync);
                 const key = getTutorialInfoKey(filename, branch);
                 const blocks = {};
                 Object.keys(snippets).forEach(hash => {
@@ -5912,7 +5938,7 @@ var pxt;
                 };
                 return this.db.setAsync(TutorialInfoIndexedDb.TABLE, entry)
                     .then(() => {
-                    pxt.perf.measureEnd("tutorial info db setAsync");
+                    pxt.perf.measureEnd(Measurements.TutorialInfoDbSetAsync);
                 });
             }
             clearAsync() {
@@ -6267,6 +6293,8 @@ var pxt;
         commands.electronDeployAsync = undefined; // A pointer to the Electron deploy function, so that targets can access it in their extension.ts
         commands.webUsbPairDialogAsync = undefined;
         commands.onTutorialCompleted = undefined;
+        commands.onPerfMilestone = undefined;
+        commands.onPerfMeasurement = undefined;
         commands.workspaceLoadedAsync = undefined;
         commands.onMarkdownActivityLoad = undefined;
     })(commands = pxt.commands || (pxt.commands = {}));
@@ -6366,6 +6394,14 @@ var pxt;
         return ("0" + n.toString(16)).slice(-2);
     }
 })(pxt || (pxt = {}));
+var Measurements;
+(function (Measurements) {
+    Measurements.TutorialInfoDbSetAsync = "tutorial info db setAsync";
+    Measurements.ReloadAppTargetVariant = "reloadAppTargetVariant";
+    Measurements.Sha256Buffer = "sha256buffer";
+    Measurements.WebworkerRecvHandler = "webworker recvHandler";
+    Measurements.NetworkRequest = "network.request";
+})(Measurements || (Measurements = {}));
 /// <reference path="../localtypings/pxtarget.d.ts"/>
 var pxt;
 (function (pxt) {
@@ -23411,9 +23447,9 @@ var pxt;
             let worker = new Worker(workerFile);
             let iface = wrap(v => worker.postMessage(v));
             worker.onmessage = ev => {
-                pxt.perf.measureStart("webworker recvHandler");
+                pxt.perf.measureStart(Measurements.WebworkerRecvHandler);
                 iface.recvHandler(ev.data);
-                pxt.perf.measureEnd("webworker recvHandler");
+                pxt.perf.measureEnd(Measurements.WebworkerRecvHandler);
             };
             return iface;
         }