@fails-components/webtransport 1.3.0 → 1.4.0

package/dist/lib/http2/browser/browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../../lib/http2/browser/browser.js"],"names":[],"mappings":"AAOA;IACE;;OAEG;IACH,kBAFW,OAAO,gBAAgB,EAAE,mBAAmB,EAiCtD;IA9BC,aAA6B;IAC7B,iBAAyC;IACzC,oBAAsC;IACtC,uCACmD;IACnD,wCACoD;IAEpD,oCAC8C;IAC9C,qCAC+C;IAE/C,wCACgD;IAChD,yCAC2D;IAE3D,yCACiD;IACjD,0CAC6D;IAC7D,oDAAoD;IAEpD,OAFW,OAAO,kBAAkB,EAAE,UAAU,CAE1B;IACtB,wBAAwB;IAExB,WAFW,SAAS,CAEM;IAC1B,+BAA+B;IAC/B,uBADW,SAAS,GAAC,MAAM,CACW;IAGxC;;OAEG;IACH,0BAFW;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,QA6ExB;IAED;;OAEG;IAEH,oBAHW,MAAM,QAkHhB;IAED,oBAGC;CACF"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../../lib/http2/browser/browser.js"],"names":[],"mappings":"AAOA;IACE;;OAEG;IACH,kBAFW,OAAO,gBAAgB,EAAE,mBAAmB,EAiCtD;IA9BC,aAA6B;IAC7B,iBAAyC;IACzC,oBAAsC;IACtC,uCACmD;IACnD,wCACoD;IAEpD,oCAC8C;IAC9C,qCAC+C;IAE/C,wCACgD;IAChD,yCAC2D;IAE3D,yCACiD;IACjD,0CAC6D;IAC7D,oDAAoD;IAEpD,OAFW,OAAO,kBAAkB,EAAE,UAAU,CAE1B;IACtB,wBAAwB;IAExB,WAFW,SAAS,CAEM;IAC1B,+BAA+B;IAC/B,uBADW,SAAS,GAAC,MAAM,CACW;IAGxC;;OAEG;IACH,0BAFW;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,QA+ExB;IAED;;OAEG;IAEH,oBAHW,MAAM,QAkHhB;IAED,oBAGC;CACF"}

package/dist/lib/http2/node/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../lib/http2/node/client.js"],"names":[],"mappings":";AAOA;IACE;;OAEG;IACH,kBAFW,OAAO,gBAAgB,EAAE,mBAAmB,EAkCtD;IA7BC,aAAwB;IACxB,iBAAyC;IACzC,mEAAyE;IACzE,oBAAsC;IACtC,8BAAqD;IACrD,sBAA+C;IAC/C,mBAAyC;IACzC,uCACmD;IACnD,wCACoD;IAEpD,oCAC8C;IAC9C,qCAC+C;IAE/C,wCACgD;IAChD,yCAC2D;IAE3D,yCACiD;IACjD,0CAC6D;IAC7D,oDAAoD;IAEpD,OAFW,OAAO,kBAAkB,EAAE,UAAU,CAE1B;IAGxB,wBAiKC;IAnGC,0DAGC;IAkGH;;OAEG;IACH,oBAFW,MAAM,QAkEhB;IAED,oBAEC;CACF"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../lib/http2/node/client.js"],"names":[],"mappings":";AAOA;IACE;;OAEG;IACH,kBAFW,OAAO,gBAAgB,EAAE,mBAAmB,EAkCtD;IA7BC,aAAwB;IACxB,iBAAyC;IACzC,mEAAyE;IACzE,oBAAsC;IACtC,8BAAqD;IACrD,sBAA+C;IAC/C,mBAAyC;IACzC,uCACmD;IACnD,wCACoD;IAEpD,oCAC8C;IAC9C,qCAC+C;IAE/C,wCACgD;IAChD,yCAC2D;IAE3D,yCACiD;IACjD,0CAC6D;IAC7D,oDAAoD;IAEpD,OAFW,OAAO,kBAAkB,EAAE,UAAU,CAE1B;IAGxB,wBAiKC;IAnGC,0DAGC;IAkGH;;OAEG;IACH,oBAFW,MAAM,QAuEhB;IAED,oBAEC;CACF"}

package/dist/lib/http2/node/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../lib/http2/node/server.js"],"names":[],"mappings":";;AASA;IACE;;OAEG;IACH,kBAFW,OAAO,gBAAgB,EAAE,mBAAmB,EAuWtD;IAlWC,aAAwB;IACxB,eAA0B;IAE1B,aAAqC;IAMrC,uCACmD;IACnD,wCACoD;IAEpD,oCAA2E;IAC3E,qCAC2C;IAE3C,wCACgD;IAChD,yCAC2D;IAE3D,yCACiD;IACjD,0CAC6D;IAE7D,sCAAsC;IACtC,OADW,OAAO,MAAM,EAAE,OAAO,CAAC,CACnB;IACf,2BAA8B;IAC9B,oDAAoD;IAEpD,OAFW,OAAO,kBAAkB,EAAE,UAAU,CAE1B;IAEtB,2BAA8B;IAG9B,iNAgBE;IAqG6B,4BAYb;IA6LpB;;;OAGG;IACH,4BAHW,OAAO,OAAO,EAAE,mBAAmB,GAClC;QAAC,aAAa,EAAE,MAAM,GAAC,SAAS,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAC,CA6BvE;IAED,oBAEC;IAED,mBAGC;IAED;;;;SAIK;IAEL,iBALW,MAAM,GAAC,MAAM,EAAE,WACf,MAAM,GAAC,MAAM,EAAE,aACf,OAAO,QAKjB;IAED;;OAEG;IACH,2BAFW,OAAO,QAIjB;IAED;;OAEG;IACH,cAFW,MAAM,QAIhB;IAED;;OAEG;IACH,+CAFW;QAAC,MAAM,EAAE,OAAO,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,iBA4BvE;IAED;;OAEG;IACH,2IAFW,OAAO,gBAAgB,EAAE,0BAA0B,QAmL7D;CACF"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../lib/http2/node/server.js"],"names":[],"mappings":";;AASA;IACE;;OAEG;IACH,kBAFW,OAAO,gBAAgB,EAAE,mBAAmB,EAyYtD;IApYC,aAAwB;IACxB,eAA0B;IAE1B,aAAqC;IAMrC,uCACmD;IACnD,wCACoD;IAEpD,oCAA2E;IAC3E,qCAC2C;IAE3C,wCACgD;IAChD,yCAC2D;IAE3D,yCACiD;IACjD,0CAC6D;IAE7D,sCAAsC;IACtC,OADW,OAAO,MAAM,EAAE,OAAO,CAAC,CACnB;IACf,2BAA8B;IAC9B,oDAAoD;IAEpD,OAFW,OAAO,kBAAkB,EAAE,UAAU,CAE1B;IAEtB,2BAA8B;IAG9B,iNAgBE;IAqG6B,4BAYb;IA+NpB;;;OAGG;IACH,4BAHW,OAAO,OAAO,EAAE,mBAAmB,GAClC;QAAC,aAAa,EAAE,MAAM,GAAC,SAAS,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAC,CA+BvE;IAED,oBAEC;IAED,mBAGC;IAED;;;;SAIK;IAEL,iBALW,MAAM,GAAC,MAAM,EAAE,WACf,MAAM,GAAC,MAAM,EAAE,aACf,OAAO,QAKjB;IAED;;OAEG;IACH,2BAFW,OAAO,QAIjB;IAED;;OAEG;IACH,cAFW,MAAM,QAIhB;IAED;;OAEG;IACH,+CAFW;QAAC,MAAM,EAAE,OAAO,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,iBA4BvE;IAED;;OAEG;IACH,2IAFW,OAAO,gBAAgB,EAAE,0BAA0B,QAmL7D;CACF"}

package/eslint.config.js

@@ -1,6 +1,8 @@
 import js from '@eslint/js'
 import promise from 'eslint-plugin-promise'
 import babelParser from '@babel/eslint-parser'
+import importplug from 'eslint-plugin-import'
+// eslint-disable-next-line import/extensions
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
 import globals from 'globals'
 
@@ -9,7 +11,8 @@ export default [
   eslintPluginPrettierRecommended,
   {
     plugins: {
-      promise
+      promise,
+      import: importplug
     },
     languageOptions: {
       globals: {
@@ -37,7 +40,15 @@ export default [
       'import/export': 0,
       'promise/catch-or-return': 'error',
       'no-useless-return': 1,
-      camelcase: 1
+      camelcase: 1,
+      'import/extensions': [
+        'error',
+        'always',
+        {
+          js: 'always',
+          jsx: 'always'
+        }
+      ]
     }
   },
   {

package/lib/http2/browser/browser.js

@@ -54,10 +54,12 @@ export class Http2WebTransportBrowser {
         (/** @type {string} */ el) => 'webtransport_' + el
       )
       if (this.protocols.length > 0) {
+        const oldprotocols = protocols
         protocols = protocols
           .filter((el) => el !== 'kDraft1')
           .map((el) => this.protocols.map((el2) => el + '_' + el2))
           .flat(1)
+        protocols.push(...oldprotocols) // also need to support no protocol selection
       }
       // eslint-disable-next-line no-undef
       this.clientInt = new WebSocket(url, protocols)

package/lib/http2/node/client.js

@@ -222,7 +222,12 @@ export class Http2WebTransportClient {
     }
     if (this.protocols.length > 0) {
       // @ts-ignore
-      requestOpts['wt-available-protocols'] = this.protocols.join(',')
+      requestOpts['wt-available-protocols'] =
+        '"' +
+        this.protocols
+          .map((el) => el.replace(/\\/g, '\\\\').replace(/"/g, '\\"'))
+          .join('","') +
+        '"'
     }
 
     const stream = this.clientInt.request(requestOpts)

package/lib/http2/node/server.js

@@ -241,6 +241,40 @@ export class Http2WebTransportServer {
           header['wt-available-protocols'] = obj.webtransportProt
         }
       }
+      if (
+        header[':protocol'] === 'webtransport' &&
+        header['wt-available-protocols']
+      ) {
+        let splitted = header['wt-available-protocols']
+          // @ts-ignore
+          .split(',')
+          .map((/** @type {string} */ el) => el.trim())
+        if (
+          splitted.some(
+            (/** @type {string} */ el) =>
+              typeof el !== 'string' ||
+              el.length < 2 ||
+              el[0] !== '"' ||
+              el.at(-1) !== '"'
+          )
+        ) {
+          stream.respond({
+            ':status': '406'
+          })
+          stream.close(constants.NGHTTP2_REFUSED_STREAM)
+          return
+        }
+        splitted = splitted.map((/** @type {string} */ el) => el.slice(1, -1))
+        if (
+          splitted.some((/** @type {string} */ el) => /\\([^"\\])/.test(el))
+        ) {
+          stream.close(constants.NGHTTP2_REFUSED_STREAM)
+          return
+        }
+        header['wt-available-protocols'] = splitted.map(
+          (/** @type {string} */ el) => el.replace(/\\(["\\])/g, '$1')
+        )
+      }
       if (header[':protocol'] !== 'webtransport' && !websocketProt) {
         stream.respond({
           ':status': '406'
@@ -393,11 +427,13 @@ export class Http2WebTransportServer {
       prots = prots.filter((el) => el[1] === selWtVersion)
       /** @type {{websocketProt: string|undefined, webtransportProt?: string}} */
       const retObj = { websocketProt: prots[0].slice(0, 2).join('_') }
-      if (prots[0][2]) {
+      if (prots.some((el) => el[2])) {
         // @ts-ignore
         retObj.webtransportProt = [
-          ...new Set(prots.map((el) => el.slice(2).join('_')))
-        ].join(',')
+          ...new Set(
+            prots.filter((el) => el[2]).map((el) => el.slice(2).join('_'))
+          )
+        ]
       }
       return retObj
     } else return { websocketProt: undefined }

package/lib/webtransport.browser.js

@@ -3,7 +3,7 @@ import { HttpWTSession } from './session.js'
 import { HttpClient } from './client.js'
 import { Http2WebTransportBrowser } from './http2/browser/browser.js'
 import { logger } from './utils.js'
-import { WebTransportError } from './error'
+import { WebTransportError } from './error.js'
 
 const log = logger(`webtransport:browser()`)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/webtransport",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "A component to add webtransport support (server and client) to node.js using libquiche",
   "exports": {
     ".": {