Respect initial settings for websocket

fails-components · Jan 2, 2024 · ade25ab · ade25ab
1 parent 7df1db8
commit ade25ab
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/main/lib/http2/browser/browser.js b/main/lib/http2/browser/browser.js
@@ -122,7 +122,7 @@ export class Http2WebTransportBrowser {
             ws: this.clientInt,
             nativesession,
             isclient: true,
-            initialStreamSendWindowOffset: this.initialStreamFlowControlWindow,
+            initialStreamSendWindowOffset: 0,
             initialStreamReceiveWindowOffset:
               this.initialStreamFlowControlWindow,
             streamShouldAutoTuneReceiveWindow:
@@ -200,7 +200,7 @@ export class Http2WebTransportBrowser {
             })
           return session
         },
-        sendWindowOffset: this.sessionFlowControlWindowSizeLimit,
+        sendWindowOffset: 0,
         receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
         shouldAutoTuneReceiveWindow: this.sessionShouldAutoTuneReceiveWindow,
         receiveWindowSizeLimit: this.sessionFlowControlWindowSizeLimit

diff --git a/main/lib/http2/node/client.js b/main/lib/http2/node/client.js
@@ -216,7 +216,7 @@ export class Http2WebTransportClient {
             stream,
             nativesession,
             isclient: true,
-            initialStreamSendWindowOffset: this.initialStreamFlowControlWindow,
+            initialStreamSendWindowOffset: this.initialStreamFlowControlWindow, // TODO, once supported by node, use initial settings
             initialStreamReceiveWindowOffset:
               this.initialStreamFlowControlWindow,
             streamShouldAutoTuneReceiveWindow:

diff --git a/main/lib/http2/node/server.js b/main/lib/http2/node/server.js
@@ -147,8 +147,7 @@ export class Http2WebTransportServer {
                       stream,
                       nativesession,
                       isclient: false,
-                      initialStreamSendWindowOffset:
-                        this.initialStreamFlowControlWindow,
+                      initialStreamSendWindowOffset: 0,
                       initialStreamReceiveWindowOffset:
                         this.initialStreamFlowControlWindow,
                       streamShouldAutoTuneReceiveWindow:
@@ -159,7 +158,7 @@ export class Http2WebTransportServer {
                     if (head.byteLength > 0) parse.parseData(head)
                     return parse
                   },
-                  sendWindowOffset: this.sessionFlowControlWindowSizeLimit,
+                  sendWindowOffset: 0,
                   receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
                   shouldAutoTuneReceiveWindow:
                     this.sessionShouldAutoTuneReceiveWindow,
@@ -246,7 +245,7 @@ export class Http2WebTransportServer {
                   nativesession,
                   isclient: false,
                   initialStreamSendWindowOffset:
-                    this.initialStreamFlowControlWindow,
+                    this.initialStreamFlowControlWindow, // TODO, once supported by node, use initial settings
                   initialStreamReceiveWindowOffset:
                     this.initialStreamFlowControlWindow,
                   streamShouldAutoTuneReceiveWindow:
@@ -259,8 +258,7 @@ export class Http2WebTransportServer {
                   stream,
                   nativesession,
                   isclient: false,
-                  initialStreamSendWindowOffset:
-                    this.initialStreamFlowControlWindow,
+                  initialStreamSendWindowOffset: 0,
                   initialStreamReceiveWindowOffset:
                     this.initialStreamFlowControlWindow,
                   streamShouldAutoTuneReceiveWindow:
@@ -270,7 +268,9 @@ export class Http2WebTransportServer {
                 }))
               }
             },
-            sendWindowOffset: this.sessionFlowControlWindowSizeLimit,
+            sendWindowOffset: !websocketProt
+              ? this.sessionFlowControlWindowSizeLimit
+              : 0, // TODO, once supported by node, use initial settings
             receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
             shouldAutoTuneReceiveWindow:
               this.sessionShouldAutoTuneReceiveWindow,
@@ -421,8 +421,7 @@ export class Http2WebTransportServer {
                     stream,
                     nativesession,
                     isclient: false,
-                    initialStreamSendWindowOffset:
-                      this.initialStreamFlowControlWindow,
+                    initialStreamSendWindowOffset: 0,
                     initialStreamReceiveWindowOffset:
                       this.initialStreamFlowControlWindow,
                     streamShouldAutoTuneReceiveWindow:
@@ -433,7 +432,7 @@ export class Http2WebTransportServer {
                   if (head && head.byteLength > 0) parse.parseData(head)
                   return parse
                 },
-                sendWindowOffset: this.sessionFlowControlWindowSizeLimit,
+                sendWindowOffset: 0,
                 receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
                 shouldAutoTuneReceiveWindow:
                   this.sessionShouldAutoTuneReceiveWindow,
@@ -462,7 +461,7 @@ export class Http2WebTransportServer {
                   nativesession,
                   isclient: false,
                   initialStreamSendWindowOffset:
-                    this.initialStreamFlowControlWindow,
+                    this.initialStreamFlowControlWindow, // TODO, once supported by node, use initial settings
                   initialStreamReceiveWindowOffset:
                     this.initialStreamFlowControlWindow,
                   streamShouldAutoTuneReceiveWindow:
@@ -475,8 +474,7 @@ export class Http2WebTransportServer {
                   stream,
                   nativesession,
                   isclient: false,
-                  initialStreamSendWindowOffset:
-                    this.initialStreamFlowControlWindow,
+                  initialStreamSendWindowOffset: 0,
                   initialStreamReceiveWindowOffset:
                     this.initialStreamFlowControlWindow,
                   streamShouldAutoTuneReceiveWindow:
@@ -486,7 +484,10 @@ export class Http2WebTransportServer {
                 }))
               }
             },
-            sendWindowOffset: this.sessionFlowControlWindowSizeLimit,
+            sendWindowOffset:
+              protocol !== 'websocket'
+                ? this.sessionFlowControlWindowSizeLimit
+                : 0, // TODO, once supported by node, use initial settings
             receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
             shouldAutoTuneReceiveWindow:
               this.sessionShouldAutoTuneReceiveWindow,

diff --git a/main/lib/session.js b/main/lib/session.js
@@ -199,6 +199,9 @@ export class HttpWTSession {
       this.objint = object
       this.objint.jsobj = this
       this.reliable = !!reliable
+      if (this.objint.sendInitialParameters) {
+        this.objint.sendInitialParameters()
+      }
     }
   }