pxt-core 10.2.28 → 10.2.30

package/built/pxt.js

@@ -120608,28 +120608,27 @@ var pxt;
                 };
                 loop();
             }
-            recvPacketAsync() {
-                let final = (res) => {
-                    if (res.status != "ok")
-                        this.error("USB IN transfer failed");
-                    let arr = new Uint8Array(res.data.buffer);
-                    if (arr.length == 0)
-                        return this.recvPacketAsync();
-                    return arr;
-                };
-                if (!this.dev)
-                    return Promise.reject(new Error("Disconnected"));
-                if (!this.epIn) {
-                    return this.dev.controlTransferIn({
+            async recvPacketAsync(timeoutMs) {
+                const startTime = Date.now();
+                while (!timeoutMs || Date.now() < startTime + timeoutMs) {
+                    if (!this.dev) {
+                        return Promise.reject(new Error("Disconnected"));
+                    }
+                    const res = await (this.epIn ? this.dev.transferIn(this.epIn.endpointNumber, 64) : this.dev.controlTransferIn({
                         requestType: "class",
                         recipient: "interface",
                         request: controlTransferGetReport,
                         value: controlTransferInReport,
                         index: this.iface.interfaceNumber
-                    }, 64).then(final);
+                    }, 64));
+                    if (res.status != "ok")
+                        this.error("USB IN transfer failed");
+                    let arr = new Uint8Array(res.data.buffer);
+                    if (arr.length != 0) {
+                        return arr;
+                    }
                 }
-                return this.dev.transferIn(this.epIn.endpointNumber, 64)
-                    .then(final);
+                this.error("USB IN timed out");
             }
             initAsync() {
                 if (!this.dev)

package/built/pxtlib.d.ts

@@ -1959,7 +1959,7 @@ declare namespace pxt.packetio {
     }
     interface PacketIO {
         sendPacketAsync(pkt: Uint8Array): Promise<void>;
-        recvPacketAsync?: () => Promise<Uint8Array>;
+        recvPacketAsync?: (timeout?: number) => Promise<Uint8Array>;
         onDeviceConnectionChanged: (connect: boolean) => void;
         onConnectionChanged: () => void;
         onData: (v: Uint8Array) => void;

package/built/pxtlib.js

@@ -22922,28 +22922,27 @@ var pxt;
                 };
                 loop();
             }
-            recvPacketAsync() {
-                let final = (res) => {
-                    if (res.status != "ok")
-                        this.error("USB IN transfer failed");
-                    let arr = new Uint8Array(res.data.buffer);
-                    if (arr.length == 0)
-                        return this.recvPacketAsync();
-                    return arr;
-                };
-                if (!this.dev)
-                    return Promise.reject(new Error("Disconnected"));
-                if (!this.epIn) {
-                    return this.dev.controlTransferIn({
+            async recvPacketAsync(timeoutMs) {
+                const startTime = Date.now();
+                while (!timeoutMs || Date.now() < startTime + timeoutMs) {
+                    if (!this.dev) {
+                        return Promise.reject(new Error("Disconnected"));
+                    }
+                    const res = await (this.epIn ? this.dev.transferIn(this.epIn.endpointNumber, 64) : this.dev.controlTransferIn({
                         requestType: "class",
                         recipient: "interface",
                         request: controlTransferGetReport,
                         value: controlTransferInReport,
                         index: this.iface.interfaceNumber
-                    }, 64).then(final);
+                    }, 64));
+                    if (res.status != "ok")
+                        this.error("USB IN transfer failed");
+                    let arr = new Uint8Array(res.data.buffer);
+                    if (arr.length != 0) {
+                        return arr;
+                    }
                 }
-                return this.dev.transferIn(this.epIn.endpointNumber, 64)
-                    .then(final);
+                this.error("USB IN timed out");
             }
             initAsync() {
                 if (!this.dev)

package/built/pxtservices/editorDriver.d.ts

@@ -71,6 +71,7 @@ export declare class EditorDriver extends IframeDriver {
     addEventListener(event: "workspacediagnostics", handler: (ev: pxt.editor.EditorWorkspaceDiagnostics) => void): void;
     addEventListener(event: "editorcontentloaded", handler: (ev: pxt.editor.EditorContentLoadedRequest) => void): void;
     addEventListener(event: "projectcloudstatus", handler: (ev: pxt.editor.EditorMessageProjectCloudStatus) => void): void;
+    addEventListener(event: "serviceworkerregistered", handler: (ev: pxt.editor.EditorMessageServiceWorkerRegisteredRequest) => void): void;
     sendMessage(message: pxt.editor.EditorMessageRequest): Promise<pxt.editor.EditorMessageResponse>;
     protected handleMessage(event: MessageEvent): void;
     protected handleWorkspaceSync(event: pxt.editor.EditorWorkspaceSyncRequest | pxt.editor.EditorWorkspaceSaveRequest): Promise<void>;