@fails-components/webtransport 1.0.10 → 1.1.0

package/lib/http2/node/capsuleparser.js

@@ -1,4 +1,9 @@
-import { ParserBaseHttp2, readVarInt, writeVarInt } from '../parserbasehttp2.js'
+import {
+  ParserBaseHttp2,
+  readVarInt,
+  readUint32,
+  writeVarInt
+} from '../parserbasehttp2.js'
 import { lengthVarInt } from '../parserbase.js'
 
 export class Http2CapsuleParser extends ParserBaseHttp2 {
@@ -9,7 +14,8 @@ export class Http2CapsuleParser extends ParserBaseHttp2 {
     stream,
     nativesession,
     isclient,
-    initialStreamSendWindowOffset,
+    initialStreamSendWindowOffsetBidi,
+    initialStreamSendWindowOffsetUnidi,
     initialStreamReceiveWindowOffset,
     streamShouldAutoTuneReceiveWindow,
     streamReceiveWindowSizeLimit
@@ -18,7 +24,8 @@ export class Http2CapsuleParser extends ParserBaseHttp2 {
       stream,
       nativesession,
       isclient,
-      initialStreamSendWindowOffset,
+      initialStreamSendWindowOffsetBidi,
+      initialStreamSendWindowOffsetUnidi,
       initialStreamReceiveWindowOffset,
       streamShouldAutoTuneReceiveWindow,
       streamReceiveWindowSizeLimit
@@ -211,6 +218,23 @@ export class Http2CapsuleParser extends ParserBaseHttp2 {
               case Http2CapsuleParser.WT_STREAMS_BLOCKED_BIDI:
                 this.onStreamsBlockedBidi(readVarInt(bufferstate))
                 break
+              case Http2CapsuleParser.CLOSE_WEBTRANSPORT_SESSION:
+                {
+                  const code = readUint32(bufferstate) || 0
+                  const decoder = new TextDecoder()
+                  const reason = decoder.decode(
+                    new Uint8Array(
+                      bufferstate.buffer.buffer,
+                      bufferstate.buffer.byteOffset + bufferstate.offset,
+                      offsetend - bufferstate.offset
+                    )
+                  )
+                  this.onCloseWebTransportSession({ code, reason })
+                }
+                break
+              case Http2CapsuleParser.DRAIN_WEBTRANSPORT_SESSION:
+                this.onDrain()
+                break
               case Http2CapsuleParser.DATAGRAM:
                 this.session.jsobj.onDatagramReceived({
                   datagram: new Uint8Array(
@@ -275,9 +299,9 @@ export class Http2CapsuleParser extends ParserBaseHttp2 {
   }
 
   /**
-   * @param{{type: Number, headerVints: Array<Number>, payload: Uint8Array|undefined}} bs
+   * @param{{type: Number, headerVints: Array<Number>, payload: Uint8Array|undefined, end?: () => void}} bs
    */
-  writeCapsule({ type, headerVints, payload }) {
+  writeCapsule({ type, headerVints, payload, end }) {
     let length = 0
     for (const ind in headerVints) length += lengthVarInt(headerVints[ind])
     let headlength = length
@@ -289,11 +313,18 @@ export class Http2CapsuleParser extends ParserBaseHttp2 {
     writeVarInt(bufferstate, length)
     for (const ind in headerVints) writeVarInt(bufferstate, headerVints[ind])
     if (!this.stream) return
-    let blocked = !this.stream.write(cdata)
-    if (payload) blocked = !this.stream.write(payload) || blocked
-    // do something if blocked
-    if (blocked) this.blocked = true
-    return blocked
+    // note it might be illegal to split the write
+    if (!end) {
+      let blocked = !this.stream.write(cdata)
+      if (payload) blocked = !this.stream.write(payload) || blocked
+      // do something if blocked
+      if (blocked) this.blocked = true
+      return blocked
+    } else {
+      if (!payload) this.stream.end(cdata, end)
+      else this.stream.write(cdata)
+      if (payload) this.stream.end(payload, end)
+    }
   }
 
   /**

package/lib/http2/node/client.js

@@ -44,9 +44,10 @@ export class Http2WebTransportClient {
 
   createTransport() {
     /**
+     * @param {string} hostname
      * @param {import('node:tls').PeerCertificate} cert
      * */
-    const webTransportVerifier = (cert) => {
+    const webTransportVerifier = (hostname, cert) => {
       if (
         this.serverCertificateHashes &&
         this.serverCertificateHashes.some((el) => {
@@ -91,7 +92,8 @@ export class Http2WebTransportClient {
           0x2b63: this.initialStreamFlowControlWindow, // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAM_DATA_BIDI
           0x2b64: this.initialUnidirectionalStreams, // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAMS_UNI
           0x2b65: this.initialBidirectionalStreams // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAMS_BIDI
-        }
+        },
+        remoteCustomSettings: [0x2b60, 0x2b61, 0x2b62, 0x2b63, 0x2b64, 0x2b65]
       },
       localPort: this.localPort,
       // TODO: REMOVE BEFORE RELEASE; UNSAFE SETTING
@@ -141,7 +143,9 @@ export class Http2WebTransportClient {
       if (!oursocket.authorized) {
         // ok last hope we have hashes
         if (this.serverCertificateHashes) {
-          if (!webTransportVerifier(oursocket.getPeerCertificate())) {
+          if (
+            !webTransportVerifier(this.hostname, oursocket.getPeerCertificate())
+          ) {
             this.clientInt?.destroy(
               undefined,
               http2constants.NGHTTP2_REFUSED_STREAM
@@ -210,6 +214,14 @@ export class Http2WebTransportClient {
       authority: this.hostname,
       origin: this.hostname
     })
+    const {
+      0x2b65: remoteBidirectionalStreams = undefined,
+      0x2b64: remoteUnidirectionalStreams = undefined,
+      0x2b63: remoteBidirectionalStreamFlowControlWindow = undefined,
+      0x2b62: remoteUnidirectionalStreamFlowControlWindow = undefined,
+      0x2b61: remoteSessionFlowControlWindow = undefined
+      // @ts-ignore
+    } = this.clientInt.remoteSettings?.customSettings || {}
 
     const retObj = {
       header: stream.sentHeaders,
@@ -221,18 +233,27 @@ export class Http2WebTransportClient {
             stream,
             nativesession,
             isclient: true,
-            initialStreamSendWindowOffset: this.initialStreamFlowControlWindow, // TODO, once supported by node, use initial settings
+            initialStreamSendWindowOffsetBidi:
+              remoteBidirectionalStreamFlowControlWindow ||
+              this.initialStreamFlowControlWindow,
+            initialStreamSendWindowOffsetUnidi:
+              remoteUnidirectionalStreamFlowControlWindow ||
+              this.initialStreamFlowControlWindow,
             initialStreamReceiveWindowOffset:
               this.initialStreamFlowControlWindow,
             streamShouldAutoTuneReceiveWindow:
               this.streamShouldAutoTuneReceiveWindow,
             streamReceiveWindowSizeLimit: this.streamFlowControlWindowSizeLimit
           }),
-        initialBidirectionalSendStreams: this.initialBidirectionalStreams, // TODO, once supported by node, use initial settings
+        initialBidirectionalSendStreams:
+          remoteBidirectionalStreams || this.initialBidirectionalStreams,
         initialBidirectionalReceiveStreams: this.initialBidirectionalStreams,
-        initialUnidirectionalSendStreams: this.initialUnidirectionalStreams, // TODO, once supported by node, use initial settings
+        initialUnidirectionalSendStreams:
+          remoteUnidirectionalStreams || this.initialUnidirectionalStreams,
         initialUnidirectionalReceiveStreams: this.initialUnidirectionalStreams,
-        sendWindowOffset: this.sessionFlowControlWindowSizeLimit,
+        sendWindowOffset:
+          remoteSessionFlowControlWindow ||
+          this.sessionFlowControlWindowSizeLimit,
         receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
         shouldAutoTuneReceiveWindow: this.sessionShouldAutoTuneReceiveWindow,
         receiveWindowSizeLimit: this.sessionFlowControlWindowSizeLimit

package/lib/http2/node/server.js

@@ -65,7 +65,8 @@ export class Http2WebTransportServer {
           0x2b63: this.initialStreamFlowControlWindow, // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAM_DATA_BIDI
           0x2b64: this.initialUnidirectionalStreams, // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAMS_UNI
           0x2b65: this.initialBidirectionalStreams // SETTINGS_WEBTRANSPORT_INITIAL_MAX_STREAMS_BIDI
-        }
+        },
+        remoteCustomSettings: [0x2b60, 0x2b61, 0x2b62, 0x2b63, 0x2b64, 0x2b65]
       }
     })
 
@@ -126,20 +127,31 @@ export class Http2WebTransportServer {
       'upgrade',
       (request, stream /* actually a socket */, head) => {
         let path = request.url
-        const header = request.headers
         if (!path) {
           stream.destroy()
           return
         }
+        while (path.length > 1 && path[0] === '/' && path[1] === '/') {
+          path = path?.slice(1)
+        }
+        const header = { ...request.headers, ':path': path }
         const websocketProt = this.checkProtocolHeader(header)
         if (!websocketProt) {
           stream.destroy()
           return
         }
-        while (path.length > 1 && path[0] === '/' && path[1] === '/') {
-          path = path?.slice(1)
-        }
-        if (this.paths[path]) {
+        if (this.hasrequesthandler) {
+          stream.head = head
+
+          const retObj = {
+            header,
+            session: stream,
+            protocol: 'websocketoverhttp1',
+            head,
+            transportPrivate: { websocketProt }
+          }
+          this.jsobj.onSessionRequest(retObj)
+        } else if (this.paths[path]) {
           this.sendHttp1Headers({ stream, header, protocol: websocketProt })
             .then(() => {
               const retObj = {
@@ -153,7 +165,8 @@ export class Http2WebTransportServer {
                       stream,
                       nativesession,
                       isclient: false,
-                      initialStreamSendWindowOffset: 0,
+                      initialStreamSendWindowOffsetBidi: 0,
+                      initialStreamSendWindowOffsetUnidi: 0,
                       initialStreamReceiveWindowOffset:
                         this.initialStreamFlowControlWindow,
                       streamShouldAutoTuneReceiveWindow:
@@ -187,16 +200,6 @@ export class Http2WebTransportServer {
               log('Problem sendHttp1Header', error)
               stream.destroy()
             })
-        } else if (this.hasrequesthandler) {
-          stream.head = head
-
-          const retObj = {
-            header,
-            session: stream,
-            protocol: 'websocketoverhttp1',
-            head
-          }
-          this.jsobj.onSessionRequest(retObj)
         } else {
           stream.destroy()
         }
@@ -243,7 +246,24 @@ export class Http2WebTransportServer {
       while (path.length > 1 && path[0] === '/' && path[1] === '/') {
         path = path?.slice(1)
       }
-      if (this.paths[path]) {
+      header[':path'] = path // also adapt it for the middleware
+      if (this.hasrequesthandler) {
+        const retObj = {
+          header,
+          session: stream,
+          protocol: websocketProt ? 'websocket' : 'capsule',
+          transportPrivate: { websocketProt }
+        }
+        this.jsobj.onSessionRequest(retObj)
+      } else if (this.paths[path]) {
+        const {
+          0x2b65: remoteBidirectionalStreams = undefined,
+          0x2b64: remoteUnidirectionalStreams = undefined,
+          0x2b63: remoteBidirectionalStreamFlowControlWindow = undefined,
+          0x2b62: remoteUnidirectionalStreamFlowControlWindow = undefined,
+          0x2b61: remoteSessionFlowControlWindow = undefined
+          // @ts-ignore
+        } = stream?.session?.remoteSettings?.customSettings || {}
         const retObj = {
           session: new Http2WebTransportSession({
             stream,
@@ -256,8 +276,12 @@ export class Http2WebTransportServer {
                   stream,
                   nativesession,
                   isclient: false,
-                  initialStreamSendWindowOffset:
-                    this.initialStreamFlowControlWindow, // TODO, once supported by node, use initial settings
+                  initialStreamSendWindowOffsetBidi:
+                    remoteBidirectionalStreamFlowControlWindow ||
+                    this.initialStreamFlowControlWindow,
+                  initialStreamSendWindowOffsetUnidi:
+                    remoteUnidirectionalStreamFlowControlWindow ||
+                    this.initialStreamFlowControlWindow,
                   initialStreamReceiveWindowOffset:
                     this.initialStreamFlowControlWindow,
                   streamShouldAutoTuneReceiveWindow:
@@ -270,7 +294,8 @@ export class Http2WebTransportServer {
                   stream,
                   nativesession,
                   isclient: false,
-                  initialStreamSendWindowOffset: 0,
+                  initialStreamSendWindowOffsetBidi: 0,
+                  initialStreamSendWindowOffsetUnidi: 0,
                   initialStreamReceiveWindowOffset:
                     this.initialStreamFlowControlWindow,
                   streamShouldAutoTuneReceiveWindow:
@@ -280,18 +305,20 @@ export class Http2WebTransportServer {
                 }))
               }
             },
-            initialBidirectionalSendStreams: websocketProt // TODO, once supported by node, use initial settings
+            initialBidirectionalSendStreams: websocketProt
               ? 0
-              : this.initialBidirectionalStreams,
+              : remoteBidirectionalStreams || this.initialBidirectionalStreams,
             initialBidirectionalReceiveStreams:
               this.initialBidirectionalStreams,
             initialUnidirectionalSendStreams: websocketProt
               ? 0
-              : this.initialUnidirectionalStreams, // TODO, once supported by node, use initial settings
+              : remoteUnidirectionalStreams ||
+                this.initialUnidirectionalStreams,
             initialUnidirectionalReceiveStreams:
               this.initialUnidirectionalStreams,
             sendWindowOffset: !websocketProt
-              ? this.sessionFlowControlWindowSizeLimit
+              ? remoteSessionFlowControlWindow ||
+                this.sessionFlowControlWindowSizeLimit
               : 0, // TODO, once supported by node, use initial settings
             receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
             shouldAutoTuneReceiveWindow:
@@ -310,19 +337,6 @@ export class Http2WebTransportServer {
         if (websocketProt) resp['sec-websocket-protocol'] = websocketProt
         stream.respond(resp)
         this.jsobj.onHttpWTSessionVisitor(retObj)
-      } else if (this.hasrequesthandler) {
-        const retObj = {
-          header,
-          session: stream,
-          protocol: websocketProt ? 'websocket' : 'capsule'
-        }
-        const resp = {
-          ':status': '200'
-        }
-        // @ts-ignore
-        if (websocketProt) resp['sec-websocket-protocol'] = websocketProt
-        stream.respond(resp)
-        this.jsobj.onSessionRequest(retObj)
       } else {
         stream.respond({
           ':status': '404'
@@ -364,8 +378,8 @@ export class Http2WebTransportServer {
   }
 
   /**
-   * @param {string} cert
-   * @param {string} privKey
+   * @param {string|string[]} cert
+   * @param {string|string[]} privKey
    * @param {boolean} http2only
    * */
   updateCert(cert, privKey, http2only) {
@@ -420,17 +434,35 @@ export class Http2WebTransportServer {
   /**
    * @param {import('../../types.js').NativeFinishSessionRequest} args
    */
-  finishSessionRequest({ header, session: stream, status, protocol, head }) {
+  finishSessionRequest({
+    header,
+    userData,
+    session: stream,
+    status,
+    protocol,
+    head,
+    path,
+    transportPrivate
+  }) {
     if (status !== 200) {
       if (protocol === 'websocketoverhttp1') {
         stream.destroy()
       } else {
-        stream.close(constants.HTTP_STATUS_NOT_FOUND)
+        stream.respond({
+          ':status': status.toString()
+        })
+        stream.end()
+        stream.close()
       }
     } else {
       if (protocol === 'websocketoverhttp1') {
-        // @ts-ignore
-        this.sendHttp1Headers({ stream, header })
+        this.sendHttp1Headers({
+          // @ts-ignore
+          stream,
+          header,
+          // @ts-ignore
+          protocol: transportPrivate.websocketProt
+        })
           .then(() => {
             const retObj = {
               session: new Http2WebTransportSession({
@@ -443,7 +475,8 @@ export class Http2WebTransportServer {
                     stream,
                     nativesession,
                     isclient: false,
-                    initialStreamSendWindowOffset: 0,
+                    initialStreamSendWindowOffsetBidi: 0,
+                    initialStreamSendWindowOffsetUnidi: 0,
                     initialStreamReceiveWindowOffset:
                       this.initialStreamFlowControlWindow,
                     streamShouldAutoTuneReceiveWindow:
@@ -466,8 +499,9 @@ export class Http2WebTransportServer {
                   this.sessionShouldAutoTuneReceiveWindow,
                 receiveWindowSizeLimit: this.sessionFlowControlWindowSizeLimit
               }),
-              path: header[':path'],
-              header
+              path,
+              header,
+              userData
             }
             // @ts-ignore
             this.jsobj.onHttpWTSessionVisitor(retObj)
@@ -476,6 +510,22 @@ export class Http2WebTransportServer {
             log('sendHttp1Headers error', error)
           })
       } else {
+        const resp = {
+          ':status': '200'
+        }
+        // @ts-ignore
+        if (transportPrivate?.websocketProt)
+          // @ts-ignore
+          resp['sec-websocket-protocol'] = transportPrivate.websocketProt
+        stream.respond(resp)
+        const {
+          0x2b65: remoteBidirectionalStreams = undefined,
+          0x2b64: remoteUnidirectionalStreams = undefined,
+          0x2b63: remoteBidirectionalStreamFlowControlWindow = undefined,
+          0x2b62: remoteUnidirectionalStreamFlowControlWindow = undefined,
+          0x2b61: remoteSessionFlowControlWindow = undefined
+          // @ts-ignore
+        } = stream?.session?.remoteSettings?.customSettings || {}
         const retObj = {
           session: new Http2WebTransportSession({
             stream,
@@ -488,8 +538,12 @@ export class Http2WebTransportServer {
                   stream,
                   nativesession,
                   isclient: false,
-                  initialStreamSendWindowOffset:
-                    this.initialStreamFlowControlWindow, // TODO, once supported by node, use initial settings
+                  initialStreamSendWindowOffsetBidi:
+                    remoteBidirectionalStreamFlowControlWindow ||
+                    this.initialStreamFlowControlWindow,
+                  initialStreamSendWindowOffsetUnidi:
+                    remoteUnidirectionalStreamFlowControlWindow ||
+                    this.initialStreamFlowControlWindow,
                   initialStreamReceiveWindowOffset:
                     this.initialStreamFlowControlWindow,
                   streamShouldAutoTuneReceiveWindow:
@@ -502,7 +556,8 @@ export class Http2WebTransportServer {
                   stream,
                   nativesession,
                   isclient: false,
-                  initialStreamSendWindowOffset: 0,
+                  initialStreamSendWindowOffsetBidi: 0,
+                  initialStreamSendWindowOffsetUnidi: 0,
                   initialStreamReceiveWindowOffset:
                     this.initialStreamFlowControlWindow,
                   streamShouldAutoTuneReceiveWindow:
@@ -513,24 +568,31 @@ export class Http2WebTransportServer {
               }
             },
             initialBidirectionalSendStreams:
-              protocol !== 'websocket' ? this.initialBidirectionalStreams : 0, // TODO, once supported by node, use initial settings
+              protocol !== 'websocket'
+                ? remoteBidirectionalStreams || 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
+              protocol !== 'websocket'
+                ? remoteUnidirectionalStreams ||
+                  this.initialUnidirectionalStreams
+                : 0, // TODO, once supported by node, use initial settings
             initialUnidirectionalReceiveStreams:
               this.initialUnidirectionalStreams,
             sendWindowOffset:
               protocol !== 'websocket'
-                ? this.sessionFlowControlWindowSizeLimit
+                ? remoteSessionFlowControlWindow ||
+                  this.sessionFlowControlWindowSizeLimit
                 : 0, // TODO, once supported by node, use initial settings
             receiveWindowOffset: this.sessionFlowControlWindowSizeLimit,
             shouldAutoTuneReceiveWindow:
               this.sessionShouldAutoTuneReceiveWindow,
             receiveWindowSizeLimit: this.sessionFlowControlWindowSizeLimit
           }),
-          path: header[':path'],
-          header
+          path,
+          header,
+          userData
         }
         // @ts-ignore
         this.jsobj.onHttpWTSessionVisitor(retObj)

package/lib/http2/node/websocketparser.js

@@ -1,6 +1,11 @@
 import { randomBytes } from 'node:crypto'
 import { ParserBase, lengthVarInt } from '../parserbase.js'
-import { ParserBaseHttp2, readVarInt, writeVarInt } from '../parserbasehttp2.js'
+import {
+  ParserBaseHttp2,
+  readVarInt,
+  writeVarInt,
+  readUint32
+} from '../parserbasehttp2.js'
 import { logger } from '../../utils.js'
 
 const log = logger(`webtransport:http2:node:websocketparser(${process?.pid})`)
@@ -174,7 +179,8 @@ export class WebSocketParser extends ParserBaseHttp2 {
     stream,
     nativesession,
     isclient,
-    initialStreamSendWindowOffset,
+    initialStreamSendWindowOffsetUnidi,
+    initialStreamSendWindowOffsetBidi,
     initialStreamReceiveWindowOffset,
     streamShouldAutoTuneReceiveWindow,
     streamReceiveWindowSizeLimit
@@ -183,7 +189,8 @@ export class WebSocketParser extends ParserBaseHttp2 {
       stream,
       nativesession,
       isclient,
-      initialStreamSendWindowOffset,
+      initialStreamSendWindowOffsetUnidi,
+      initialStreamSendWindowOffsetBidi,
       initialStreamReceiveWindowOffset,
       streamShouldAutoTuneReceiveWindow,
       streamReceiveWindowSizeLimit
@@ -598,6 +605,23 @@ export class WebSocketParser extends ParserBaseHttp2 {
                 case ParserBase.WT_STREAMS_BLOCKED_BIDI:
                   this.onStreamsBlockedBidi(readVarInt(bufferstate))
                   break
+                case ParserBase.CLOSE_WEBTRANSPORT_SESSION:
+                  {
+                    const code = readUint32(bufferstate) || 0
+                    const decoder = new TextDecoder()
+                    const reason = decoder.decode(
+                      new Uint8Array(
+                        bufferstate.buffer.buffer,
+                        bufferstate.buffer.byteOffset + bufferstate.offset,
+                        offsetend - bufferstate.offset
+                      )
+                    )
+                    this.onCloseWebTransportSession({ code, reason })
+                  }
+                  break
+                case ParserBase.DRAIN_WEBTRANSPORT_SESSION:
+                  this.onDrain()
+                  break
                 case ParserBase.DATAGRAM:
                   if (wbufferstate) {
                     this.session.jsobj.onDatagramReceived({
@@ -688,19 +712,12 @@ export class WebSocketParser extends ParserBaseHttp2 {
    * @param{{code: Number, reason: string}}arg
    */
   sendClose({ code, reason }) {
-    const reasBuf = Buffer.from(
-      (code || 0).toString() + ':' + (reason || ''),
-      'utf8'
-    )
-    const wbuf = Buffer.allocUnsafe(2 + reasBuf.byteLength)
-    const errorcode = code === 0 ? 1000 : 1003
-    wbuf.writeUint16BE(errorcode, 0)
-    reasBuf.copy(wbuf, 2)
-    this.sendCloseInt(wbuf)
+    super.sendClose({ code, reason })
+    this.sendCloseInt()
   }
 
   /**
-   * @param {Uint8Array} payload
+   * @param {Uint8Array} [payload]
    */
   sendCloseInt(payload) {
     this.writeWSFrame({ opcode: WebSocketParser.WS_CLOSE, payload })
@@ -715,9 +732,9 @@ export class WebSocketParser extends ParserBaseHttp2 {
   }
 
   /**
-   * @param{{type: Number, headerVints: Array<Number|bigint>, payload: Uint8Array|undefined}} bs
+   * @param{{type: Number, headerVints: Array<Number|bigint>, payload: Uint8Array|undefined, end?: () => void}} bs
    */
-  writeCapsule({ type, headerVints, payload }) {
+  writeCapsule({ type, headerVints, payload, end }) {
     let plength = 0
     for (const ind in headerVints) plength += lengthVarInt(headerVints[ind])
     plength += lengthVarInt(type)
@@ -762,8 +779,13 @@ export class WebSocketParser extends ParserBaseHttp2 {
           payload.byteLength
         )
     }
-    let blocked = !this.stream.write(cdata)
-    if (payload) blocked = !this.stream.write(payload) || blocked
+    let blocked = false
+    if (payload) {
+      blocked = !this.stream.write(cdata)
+      blocked = !this.stream.write(payload, end) || blocked
+    } else {
+      blocked = !this.stream.write(cdata, end)
+    }
     // do something if blocked
     if (blocked) this.blocked = true
     return blocked
@@ -802,10 +824,10 @@ export class WebSocketParser extends ParserBaseHttp2 {
   }
 
   /**
-   * @param {{ opcode: number; payload: Uint8Array; }} args
+   * @param {{ opcode: number; payload: Uint8Array|undefined; }} args
    */
   writeWSFrame({ opcode, payload }) {
-    const plength = payload.byteLength
+    const plength = payload?.byteLength || 0
     let headlength = 2
     let mask = 0
     if (this.isclient) {
@@ -825,7 +847,7 @@ export class WebSocketParser extends ParserBaseHttp2 {
       throw new Error('Headlength does not match pos')
 
     let blocked = !this.stream.write(cdata)
-    if (maskstate)
+    if (maskstate && payload)
       applyMask(
         maskstate,
         Buffer.from(payload.buffer, payload.byteOffset, payload.byteLength),