@fails-components/webtransport 1.0.8 → 1.0.9

package/lib/http2/node/server.js

@@ -28,6 +28,10 @@ export class Http2WebTransportServer {
     this.initialSessionFlowControlWindow =
       args?.initialSessionFlowControlWindow || 16 * 1024 // 16 KB
 
+    this.initialBidirectionalStreams = args?.initialBidirectionalStreams || 100
+    this.initialUnidirectionalStreams =
+      args?.initialUnidirectionalStreams || 100
+
     this.streamShouldAutoTuneReceiveWindow =
       args.streamShouldAutoTuneReceiveWindow || false
     this.streamFlowControlWindowSizeLimit =
@@ -45,6 +49,8 @@ export class Http2WebTransportServer {
     // @ts-ignore
     this.jsobj = undefined // the transport will set this
 
+    this.canHandleSettings = false // TODO replace with version check, or other check once my patch lands in node
+
     // @ts-ignore
     this.serverInt = createSecureServer({
       key,
@@ -57,8 +63,8 @@ export class Http2WebTransportServer {
           0x2b61: this.initialSessionFlowControlWindow, // SETTINGS_WEBTRANSPORT_INITIAL_MAX_DATA
           0x2b62: this.initialStreamFlowControlWindow, // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAM_DATA_UNI
           0x2b63: this.initialStreamFlowControlWindow, // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAM_DATA_BIDI
-          0x2b64: 0xffffff, // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAMS_UNI
-          0x2b65: 0xffffff // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAMS_BIDI
+          0x2b64: this.initialUnidirectionalStreams, // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAMS_UNI
+          0x2b65: this.initialBidirectionalStreams // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAMS_BIDI
         }
       }
     })
@@ -147,8 +153,7 @@ export class Http2WebTransportServer {
                       stream,
                       nativesession,
                       isclient: false,
-                      initialStreamSendWindowOffset:
-                        this.initialStreamFlowControlWindow,
+                      initialStreamSendWindowOffset: 0,
                       initialStreamReceiveWindowOffset:
                         this.initialStreamFlowControlWindow,
                       streamShouldAutoTuneReceiveWindow:
@@ -159,7 +164,13 @@ export class Http2WebTransportServer {
                     if (head.byteLength > 0) parse.parseData(head)
                     return parse
                   },
-                  sendWindowOffset: this.sessionFlowControlWindowSizeLimit,
+                  initialBidirectionalSendStreams: 0,
+                  initialBidirectionalReceiveStreams:
+                    this.initialBidirectionalStreams,
+                  initialUnidirectionalSendStreams: 0,
+                  initialUnidirectionalReceiveStreams:
+                    this.initialUnidirectionalStreams,
+                  sendWindowOffset: 0,
                   receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
                   shouldAutoTuneReceiveWindow:
                     this.sessionShouldAutoTuneReceiveWindow,
@@ -246,7 +257,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 +270,7 @@ export class Http2WebTransportServer {
                   stream,
                   nativesession,
                   isclient: false,
-                  initialStreamSendWindowOffset:
-                    this.initialStreamFlowControlWindow,
+                  initialStreamSendWindowOffset: 0,
                   initialStreamReceiveWindowOffset:
                     this.initialStreamFlowControlWindow,
                   streamShouldAutoTuneReceiveWindow:
@@ -270,7 +280,19 @@ export class Http2WebTransportServer {
                 }))
               }
             },
-            sendWindowOffset: this.sessionFlowControlWindowSizeLimit,
+            initialBidirectionalSendStreams: websocketProt // TODO, once supported by node, use initial settings
+              ? 0
+              : this.initialBidirectionalStreams,
+            initialBidirectionalReceiveStreams:
+              this.initialBidirectionalStreams,
+            initialUnidirectionalSendStreams: websocketProt
+              ? 0
+              : this.initialUnidirectionalStreams, // TODO, once supported by node, use initial settings
+            initialUnidirectionalReceiveStreams:
+              this.initialUnidirectionalStreams,
+            sendWindowOffset: !websocketProt
+              ? this.sessionFlowControlWindowSizeLimit
+              : 0, // TODO, once supported by node, use initial settings
             receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
             shouldAutoTuneReceiveWindow:
               this.sessionShouldAutoTuneReceiveWindow,
@@ -421,8 +443,7 @@ export class Http2WebTransportServer {
                     stream,
                     nativesession,
                     isclient: false,
-                    initialStreamSendWindowOffset:
-                      this.initialStreamFlowControlWindow,
+                    initialStreamSendWindowOffset: 0,
                     initialStreamReceiveWindowOffset:
                       this.initialStreamFlowControlWindow,
                     streamShouldAutoTuneReceiveWindow:
@@ -433,7 +454,13 @@ export class Http2WebTransportServer {
                   if (head && head.byteLength > 0) parse.parseData(head)
                   return parse
                 },
-                sendWindowOffset: this.sessionFlowControlWindowSizeLimit,
+                initialBidirectionalSendStreams: 0,
+                initialBidirectionalReceiveStreams:
+                  this.initialBidirectionalStreams,
+                initialUnidirectionalSendStreams: 0,
+                initialUnidirectionalReceiveStreams:
+                  this.initialUnidirectionalStreams,
+                sendWindowOffset: 0,
                 receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
                 shouldAutoTuneReceiveWindow:
                   this.sessionShouldAutoTuneReceiveWindow,
@@ -462,7 +489,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 +502,7 @@ export class Http2WebTransportServer {
                   stream,
                   nativesession,
                   isclient: false,
-                  initialStreamSendWindowOffset:
-                    this.initialStreamFlowControlWindow,
+                  initialStreamSendWindowOffset: 0,
                   initialStreamReceiveWindowOffset:
                     this.initialStreamFlowControlWindow,
                   streamShouldAutoTuneReceiveWindow:
@@ -486,7 +512,18 @@ export class Http2WebTransportServer {
                 }))
               }
             },
-            sendWindowOffset: this.sessionFlowControlWindowSizeLimit,
+            initialBidirectionalSendStreams:
+              protocol !== 'websocket' ? this.initialBidirectionalStreams : 0, // TODO, once supported by node, use initial settings
+            initialBidirectionalReceiveStreams:
+              this.initialBidirectionalStreams,
+            initialUnidirectionalSendStreams:
+              protocol !== 'websocket' ? this.initialUnidirectionalStreams : 0, // TODO, once supported by node, use initial settings
+            initialUnidirectionalReceiveStreams:
+              this.initialUnidirectionalStreams,
+            sendWindowOffset:
+              protocol !== 'websocket'
+                ? this.sessionFlowControlWindowSizeLimit
+                : 0, // TODO, once supported by node, use initial settings
             receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
             shouldAutoTuneReceiveWindow:
               this.sessionShouldAutoTuneReceiveWindow,

package/lib/http2/node/websocketparser.js

@@ -193,6 +193,9 @@ export class WebSocketParser extends ParserBaseHttp2 {
     this.saveddata = undefined
     /** @type {Number|undefined} */
     this.rtype = undefined
+
+    this.bidirectionalLimitsSet = false
+    this.unidirectionalLimitsSet = false
   }
 
   /**
@@ -500,22 +503,30 @@ export class WebSocketParser extends ParserBaseHttp2 {
                 case ParserBase.WT_STOP_SENDING:
                   if (wbufferstate) {
                     const streamid = readVarInt(wbufferstate)
-                    const stream = this.wtstreams.get(streamid)
-                    const code = readVarInt(wbufferstate)
-                    if (stream && typeof code !== 'undefined')
-                      stream.jsobj.onStreamRecvSignal({
-                        code,
-                        nettask:
+                    if (typeof streamid !== 'undefined') {
+                      const stream = this.wtstreams.get(streamid)
+                      const code = readVarInt(wbufferstate)
+                      if (stream && typeof code !== 'undefined') {
+                        stream.onStreamSignal(
                           type === ParserBase.WT_RESET_STREAM
                             ? 'resetStream'
                             : 'stopSending'
-                      })
+                        )
+                        stream.jsobj.onStreamRecvSignal({
+                          code: Number(code),
+                          nettask:
+                            type === ParserBase.WT_RESET_STREAM
+                              ? 'resetStream'
+                              : 'stopSending'
+                        })
+                      }
+                    }
                   }
                   break
                 case ParserBase.WT_STREAM_WOFIN:
                 case ParserBase.WT_STREAM_WFIN:
                   if (!continuep) {
-                    streamid = Number(readVarInt(bufferstate))
+                    streamid = readVarInt(bufferstate)
                     this.cstreamid = streamid
                   } else {
                     streamid = this.cstreamid
@@ -524,9 +535,14 @@ export class WebSocketParser extends ParserBaseHttp2 {
                     let object = this.wtstreams.get(streamid)
                     if (!object) {
                       object = this.newStream(streamid)
+                      if (!object) return // stream broken
                     }
                     // TODO submit data
                     if (offsetend - bufferstate.offset >= 0) {
+                      const fin =
+                        type === ParserBase.WT_STREAM_WFIN &&
+                        bufferstate.size >= length + offsetbegin
+                      if (fin) object.onFin()
                       object.recvData({
                         data:
                           offsetend - bufferstate.offset > 0
@@ -537,9 +553,7 @@ export class WebSocketParser extends ParserBaseHttp2 {
                                 offsetend - bufferstate.offset
                               )
                             : undefined,
-                        fin:
-                          type === ParserBase.WT_STREAM_WFIN &&
-                          bufferstate.size >= length + offsetbegin
+                        fin
                       })
                     }
                   }
@@ -548,49 +562,41 @@ export class WebSocketParser extends ParserBaseHttp2 {
                   this.onMaxData(readVarInt(bufferstate))
                   break
                 case ParserBase.WT_MAX_STREAM_DATA:
-                  this.onMaxStreamData(
-                    readVarInt(bufferstate),
-                    readVarInt(bufferstate)
-                  )
+                  {
+                    const streamid = readVarInt(bufferstate)
+                    const offset = readVarInt(bufferstate)
+                    if (
+                      typeof streamid !== 'undefined' &&
+                      typeof offset !== 'undefined'
+                    )
+                      this.onMaxStreamData(streamid, offset)
+                  }
                   break
                 case ParserBase.WT_MAX_STREAMS_BIDI:
-                  // this.recvSession({ maxstreams: readVarInt(bufferstate), type })
+                  this.onMaxStreamBiDi(readVarInt(bufferstate))
                   break
                 case ParserBase.WT_MAX_STREAMS_UNIDI:
-                  // this.recvSession({ maxstreams: readVarInt(bufferstate), type })
+                  this.onMaxStreamUniDi(readVarInt(bufferstate))
                   break
                 case ParserBase.WT_DATA_BLOCKED:
                   this.onDataBlocked(readVarInt(bufferstate))
                   break
                 case ParserBase.WT_STREAM_DATA_BLOCKED:
-                  this.onStreamDataBlocked(
-                    readVarInt(bufferstate),
-                    readVarInt(bufferstate)
-                  )
+                  {
+                    const streamid = readVarInt(bufferstate)
+                    const offset = readVarInt(bufferstate)
+                    if (
+                      typeof streamid !== 'undefined' &&
+                      typeof offset !== 'undefined'
+                    )
+                      this.onStreamDataBlocked(streamid, offset)
+                  }
                   break
                 case ParserBase.WT_STREAMS_BLOCKED_UNIDI:
-                  /* {
-                 const streamid = readVarInt(bufferstate)
-                  const object = this.wtstreams.get(streamid)
-                  if (object)
-                    this.recvStream({
-                      maxstreams: readVarInt(bufferstate),
-                      type,
-                      object
-                    })
-                } */
+                  this.onStreamsBlockedUnidi(readVarInt(bufferstate))
                   break
                 case ParserBase.WT_STREAMS_BLOCKED_BIDI:
-                  /* {
-                  const streamid = readVarInt(bufferstate)
-                  const object = this.wtstreams.get(streamid)
-                  if (object)
-                    this.recvStream({
-                      maxstreams: readVarInt(bufferstate),
-                      type,
-                      streamid
-                    })
-                } */
+                  this.onStreamsBlockedBidi(readVarInt(bufferstate))
                   break
                 case ParserBase.DATAGRAM:
                   if (wbufferstate) {
@@ -640,24 +646,28 @@ export class WebSocketParser extends ParserBaseHttp2 {
               // not in j mode
               // TODO submitData
               const object = this.wtstreams.get(this.rstreamid)
-              if (this.maskcontext)
-                applyMask(
-                  this.maskcontext,
-                  bufferstate.buffer,
-                  bufferstate.buffer.byteOffset + bufferstate.offset,
-                  clength
-                )
-              // TODO submit data
-              object.recvData({
-                data: new Uint8Array(
-                  bufferstate.buffer.buffer,
-                  bufferstate.buffer.byteOffset + bufferstate.offset,
-                  clength
-                ),
-                fin:
-                  this.rtype === ParserBase.WT_STREAM_WFIN &&
-                  this.remainlength === clength
-              })
+              const fin =
+                this.rtype === ParserBase.WT_STREAM_WFIN &&
+                this.remainlength === clength
+              if (object) {
+                if (fin) object.onFin()
+                if (this.maskcontext)
+                  applyMask(
+                    this.maskcontext,
+                    bufferstate.buffer,
+                    bufferstate.buffer.byteOffset + bufferstate.offset,
+                    clength
+                  )
+                // TODO submit data
+                object.recvData({
+                  data: new Uint8Array(
+                    bufferstate.buffer.buffer,
+                    bufferstate.buffer.byteOffset + bufferstate.offset,
+                    clength
+                  ),
+                  fin
+                })
+              }
             }
 
             this.remainlength = this.remainlength - clength

package/lib/http2/parserbase.js

@@ -1,4 +1,8 @@
 import { Http2WebTransportStream } from './stream.js'
+import { logger } from '../utils.js'
+
+const pid = typeof process !== 'undefined' ? process.pid : 0
+const log = logger(`webtransport:parserbase(${pid})`)
 
 /**
  * @param{Number|bigint} int
@@ -49,6 +53,7 @@ export class ParserBase {
     this.streamShouldAutoTuneReceiveWindow = streamShouldAutoTuneReceiveWindow
     this.streamReceiveWindowSizeLimit = streamReceiveWindowSizeLimit
 
+    /** @type {Map<bigint,Http2WebTransportStream>} */
     this.wtstreams = new Map()
   }
 
@@ -74,22 +79,44 @@ export class ParserBase {
   sendClose({ code, reason }) {}
 
   /**
-   * @param {Number} streamid
+   * @param {bigint} streamid
    */
   newStream(streamid) {
+    const incoming = this.isclient ? !(streamid & 0x1n) : !!(streamid & 0x1n)
+    const streamIdManager =
+      streamid & 0x2n
+        ? this.session.streamIdMngrUni
+        : this.session.streamIdMngrBi
+
+    if (incoming) {
+      // only check incoming streams
+      const res = streamIdManager.maybeIncreaseLargestPeerStreamId(streamid)
+      if (res.error) {
+        // ok someone overstayed its welcome
+        this.session.closeConnection({
+          code: 20, // QUIC_STREAM_STREAM_CREATION_ERROR , // probably the right one...
+          reason: res.error
+        })
+
+        return undefined
+      }
+    }
     const stream = new Http2WebTransportStream({
       streamid,
+      unidirectional: !!(streamid & 0x2n),
+      incoming,
       capsuleParser: this,
       sendWindowOffset: this.initialStreamSendWindowOffset,
       receiveWindowOffset: this.initialStreamReceiveWindowOffset,
       shouldAutoTuneReceiveWindow: this.streamShouldAutoTuneReceiveWindow,
       receiveWindowSizeLimit: this.streamReceiveWindowSizeLimit,
-      sessionFlowController: this.session.flowController
+      sessionFlowController: this.session.flowController,
+      streamIdManager
     })
     this.wtstreams.set(streamid, stream)
     this.session.jsobj.onStream({
-      bidirectional: !(streamid & 0x2),
-      incoming: this.isclient ? !(streamid & 0x1) : !!(streamid & 0x1),
+      bidirectional: !(streamid & 0x2n),
+      incoming,
       stream
     })
     return stream
@@ -110,31 +137,79 @@ export class ParserBase {
   }
 
   /**
-   * @param {bigint|undefined} streamid
-   * @param {bigint|undefined} offset
+   * @param {bigint} streamid
+   * @param {bigint} offset
    */
   onMaxStreamData(streamid, offset) {
-    const object = this.wtstreams.get(Number(streamid))
+    const object = this.wtstreams.get(streamid)
     if (object && offset) {
       if (object.flowController.updateSendWindowOffset(offset))
         object.drainWrites()
     }
   }
 
+  /**
+   * @param {bigint|undefined} maxOpenStreams
+   */
+  onMaxStreamUniDi(maxOpenStreams) {
+    if (typeof maxOpenStreams === 'undefined') return
+    this.session.streamIdMngrUni.maybeAllowNewOutgoingStreams(maxOpenStreams)
+    this.session.trySendingUnidirectionalStreams()
+  }
+
+  /**
+   * @param {bigint|undefined} maxOpenStreams
+   */
+  onMaxStreamBiDi(maxOpenStreams) {
+    if (typeof maxOpenStreams === 'undefined') return
+    this.session.streamIdMngrBi.maybeAllowNewOutgoingStreams(maxOpenStreams)
+    this.session.trySendingBidirectionalStreams()
+  }
+
   /**
    * @param {bigint|undefined} val
    */
   onDataBlocked(val) {
-    this.session.flowController.reportBlocked(val)
+    log('Session received blocked frame ' + val)
+    // this.session.flowController.reportBlocked(val)
   }
 
   /**
-   * @param {bigint|undefined} streamid
-   * @param {bigint|undefined} offset
+   * @param {bigint} streamid
+   * @param {bigint} offset
    */
   onStreamDataBlocked(streamid, offset) {
-    const object = this.wtstreams.get(Number(streamid))
-    if (object && offset) object.flowController.reportBlocked(offset)
+    log('Stream ' + streamid + ' received blocked frame ' + offset)
+    // const object = this.wtstreams.get(streamid)
+    // if (object && offset) object.flowController.reportBlocked(offset)
+  }
+
+  /**
+   * @param {bigint|undefined} maxstreams
+   */
+  onStreamsBlockedBidi(maxstreams) {
+    if (typeof maxstreams === 'undefined') return
+    const ret = this.session.streamIdMngrBi.onStreamsBlockedFrame(maxstreams)
+    if (ret.error) {
+      this.session.closeConnection({
+        code: 105, // QUIC_STREAMS_BLOCKED_DATA , // probably the right one...
+        reason: ret.error
+      })
+    }
+  }
+
+  /**
+   * @param {bigint|undefined} maxstreams
+   */
+  onStreamsBlockedUnidi(maxstreams) {
+    if (typeof maxstreams === 'undefined') return
+    const ret = this.session.streamIdMngrUni.onStreamsBlockedFrame(maxstreams)
+    if (ret.error) {
+      this.session.closeConnection({
+        code: 105, // QUIC_STREAMS_BLOCKED_DATA , // probably the right one...
+        reason: ret.error
+      })
+    }
   }
 
   /**