@scrypted/client - npm Package Compare versions

Comparing version 1.0.15 to 1.0.16

dist/packages/client/src/index.js

@@ -174,2 +174,5 @@ "use strict";
             else {
+                ready.send(JSON.stringify({
+                    pluginId,
+                }));
                 const session = new rtc_signaling_1.BrowserSignalingSession();
@@ -200,9 +203,25 @@ const pcPromise = session.pcDeferred.promise;
                         console.log('got dc', dc);
-                        dc.onmessage = message => {
-                            readable.write(Buffer.from(message.data));
-                        };
                         const debouncer = new datachannel_debouncer_1.DataChannelDebouncer(dc);
                         writable.on('data', data => debouncer.send(data));
                         (0, rtc_signaling_1.waitPeerIceConnectionClosed)(pc).then(() => ready.close());
-                        ready.on('close', () => pc.close());
+                        ready.on('close', () => {
+                            console.log('datachannel upgrade cancelled/closed');
+                            pc.close();
+                        });
+                        await new Promise(resolve => {
+                            let buffers = [];
+                            dc.onmessage = message => {
+                                buffers.push(Buffer.from(message.data));
+                                resolve(undefined);
+                                process.nextTick(() => {
+                                    if (buffers) {
+                                        for (const buffer of buffers) {
+                                            readable.write(buffer);
+                                        }
+                                        buffers = undefined;
+                                    }
+                                    dc.onmessage = message => readable.write(Buffer.from(message.data));
+                                });
+                            };
+                        });
                         if (isTimedOut()) {
@@ -209,0 +228,0 @@ console.log('peer connection established too late. closing.');

package.json

 {
   "name": "@scrypted/client",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "",
@@ -5,0 +5,0 @@ "main": "dist/packages/client/src/index.js",

src/index.ts

@@ -192,2 +192,5 @@ import { timeoutFunction, timeoutPromise } from "../../../common/src/promise-utils";
             else {
+                ready.send(JSON.stringify({
+                    pluginId,
+                }));
                 const session = new BrowserSignalingSession();
@@ -226,5 +229,2 @@ const pcPromise = session.pcDeferred.promise;
                     console.log('got dc', dc);
-                    dc.onmessage = message => {
-                        readable.write(Buffer.from(message.data));
-                    };
 
@@ -235,4 +235,25 @@ const debouncer = new DataChannelDebouncer(dc);
                     waitPeerIceConnectionClosed(pc).then(() => ready.close());
-                    ready.on('close', () => pc.close());
+                    ready.on('close', () => {
+                        console.log('datachannel upgrade cancelled/closed');
+                        pc.close()
+                    });
 
+                    await new Promise(resolve => {
+                        let buffers: Buffer[] = [];
+                        dc.onmessage = message => {
+                            buffers.push(Buffer.from(message.data));
+                            resolve(undefined);
+
+                            process.nextTick(() => {
+                                if (buffers) {
+                                    for (const buffer of buffers) {
+                                        readable.write(buffer);
+                                    }
+                                    buffers = undefined;
+                                }
+                                dc.onmessage = message => readable.write(Buffer.from(message.data));
+                            });
+                        };
+                    });
+
                     if (isTimedOut()) {
@@ -239,0 +260,0 @@ console.log('peer connection established too late. closing.');

No alert changes

Improved metrics

Total package byte prevSize

287754

increased by0.85%

Lines of code

5546

increased by0.69%

No dependency changes