Fix http3 client

main/lib/index.node.js

@@ -25,4 +25,4 @@
 
 // also edit index.types.js
 export { HttpServer, Http3Server, Http2Server } from './server.js'
-export { WebTransport } from './webtransport.node.js'
+export { WebTransport, quicheLoaded } from './webtransport.node.js'

main/lib/index.types.js

@@ -25,7 +25,7 @@
 
 // both imports from the browser side and for nodes to generate a joint type file
 export { HttpServer, Http3Server, Http2Server } from './server.js'
-export { WebTransport } from './webtransport.node.js'
+export { WebTransport, quicheLoaded } from './webtransport.node.js'
 
 export {
   WebTransportPonyfill,

main/lib/webtransport.node.js

@@ -18,9 +18,13 @@ let Http3WebTransportClientSocket
  * @type {new (arg0: import("./types").HttpWebTransportInit) => any}
  */
 let Http3WebTransportClient
+/**
+ * @type {boolean}
+ */
+let quicheLoadedReady
 // @ts-ignore
 // eslint-disable-next-line no-unused-vars
-const quicheLoaded = new Promise((resolve, reject) => {
+export const quicheLoaded = new Promise((resolve, reject) => {
   // @ts-ignore
   import('@fails-components/webtransport-transport-http3-quiche')
     .then(
@@ -39,6 +43,9 @@ const quicheLoaded = new Promise((resolve, reject) => {
         resolve(undefined)
       }
     )
+    .finally(() => {
+      quicheLoadedReady = true
+    })
     .catch((error) => {
       log('Problem loading http3-quiche transport', error)
       reject(error)
@@ -102,6 +109,8 @@ export class WebTransport extends WebTransportBase {
    */
   createClient(args) {
     let createUnreliableClient
+    if (!quicheLoadedReady)
+      throw new Error('Lib quiche loading attempt did not end')
     if (checkQuicheInit) {
       createUnreliableClient = function (/** @type {any} */ _client) {
         if (

main/lib/webtransportbase.js

@@ -68,7 +68,7 @@ export class WebTransportBase {
    * @abstract
    */
   startUpConnection({ client, sessionint, ourl }) {
-    throw new Error('Implement createClient')
+    throw new Error('Implement startUpConnection')
   }
 
   get reliability() {

main/old_test/test.js

@@ -5,7 +5,12 @@
 // this file runs various tests
 
 import { generateWebTransportCertificate } from '../test/fixtures/certificate.js'
-import { Http3Server, Http2Server, WebTransport } from '../lib/index.node.js'
+import {
+  Http3Server,
+  Http2Server,
+  WebTransport,
+  quicheLoaded
+} from '../lib/index.node.js'
 import { echoTestsConnection, runEchoServer } from './testsuite.js'
 
 let http2 = false
@@ -15,6 +20,13 @@ if (process.argv.some((el) => el === 'http2')) {
 }
 
 async function run() {
+  if (
+    process.env.USE_HTTP2 !== 'true' &&
+    process.env.USE_PONYFILL !== 'true' &&
+    process.env.USE_POLYFILL !== 'true'
+  ) {
+    await quicheLoaded
+  }
   console.log('try connecting to server that does not exist')
   const badClient = new WebTransport('https://127.0.0.1:49823/echo', {
     serverCertificateHashes: [

main/package.json

@@ -83,6 +83,7 @@
   },
   "browser": {
     "./test/fixtures/webtransport.js": "./test/fixtures/webtransport.browser.js",
+    "./test/fixtures/quiche.js": "./test/fixtures/quiche.browser.js",
     "./lib/webstreams.js": "./lib/webstreams.browser.js"
   }
 }

main/readme.md

@@ -126,6 +126,9 @@ The `WebTransportSession` should behave most like a WebTransport object on the b
 ### Using a client
 The `WebTransport` object for node or the `WebTransportPonyfill`,  `WebTransportPolyfill` objects for the browser, behave like the `WebTransport` client object for the browser with few additions and some missing features.
 
+As the http/3 package is loaded dynamically and the WebTransport object is created synchronously, you may want to make sure, that the modules are already loaded. You can do so, by waiting for the promise `quicheLoaded` exported by the package.
+
+
 ## Specification divergence
 
 This module implements parts of the [WebTransport spec](https://datatracker.ietf.org/doc/html/draft-vvv-webtransport-quic-00) but not all of it.

main/test/bidirectional-streams.spec.js

@@ -6,6 +6,7 @@ import { readStream } from './fixtures/read-stream.js'
 import { writeStream } from './fixtures/write-stream.js'
 import { readCertHash } from './fixtures/read-cert-hash.js'
 import WebTransport from './fixtures/webtransport.js'
+import { quicheLoaded } from './fixtures/quiche.js'
 import * as ui8 from 'uint8arrays'
 import {
   KNOWN_BYTES,
@@ -38,6 +39,17 @@ describe('bidirectional streams', function () {
     // @ts-ignore
     delete wtOptions.serverCertificateHashes
 
+  // @ts-ignore
+  beforeEach(async () => {
+    if (
+      process.env.USE_HTTP2 !== 'true' &&
+      process.env.USE_PONYFILL !== 'true' &&
+      process.env.USE_POLYFILL !== 'true'
+    ) {
+      await quicheLoaded
+    }
+  })
+
   // @ts-ignore
   afterEach(async () => {
     if (client != null) {

main/test/datagrams.spec.js

@@ -5,6 +5,7 @@ import { expect } from './fixtures/chai.js'
 import { readStream } from './fixtures/read-stream.js'
 import { readCertHash } from './fixtures/read-cert-hash.js'
 import { pTimeout } from './fixtures/p-timeout.js'
+import { quicheLoaded } from './fixtures/quiche.js'
 
 /**
  * @template T
@@ -32,6 +33,17 @@ describe('datagrams', function () {
     // @ts-ignore
     delete wtOptions.serverCertificateHashes
 
+  // @ts-ignore
+  beforeEach(async () => {
+    if (
+      process.env.USE_HTTP2 !== 'true' &&
+      process.env.USE_PONYFILL !== 'true' &&
+      process.env.USE_POLYFILL !== 'true'
+    ) {
+      await quicheLoaded
+    }
+  })
+
   // @ts-ignore
   afterEach(async () => {
     if (client != null) {

main/test/fixtures/quiche.browser.js

@@ -0,0 +1,2 @@
+const quicheLoaded = Promise.resolve()
+export { quicheLoaded }

main/test/fixtures/quiche.js

@@ -0,0 +1 @@
+export { quicheLoaded } from '../../lib/index.node.js'

main/test/session.spec.js

@@ -3,6 +3,7 @@
 import { readCertHash } from './fixtures/read-cert-hash.js'
 import WebTransport from './fixtures/webtransport.js'
 import { expect } from './fixtures/chai.js'
+import { quicheLoaded } from './fixtures/quiche.js'
 
 /**
  * @template T
@@ -38,6 +39,17 @@ describe('session', function () {
     // @ts-ignore
     delete wtOptions.serverCertificateHashes
 
+  // @ts-ignore
+  beforeEach(async () => {
+    if (
+      process.env.USE_HTTP2 !== 'true' &&
+      process.env.USE_PONYFILL !== 'true' &&
+      process.env.USE_POLYFILL !== 'true'
+    ) {
+      await quicheLoaded
+    }
+  })
+
   // @ts-ignore
   afterEach(async () => {
     if (client != null) {

main/test/stream-limits.spec.js

@@ -3,6 +3,7 @@
 import { readCertHash } from './fixtures/read-cert-hash.js'
 import WebTransport from './fixtures/webtransport.js'
 import { expect } from './fixtures/chai.js'
+import { quicheLoaded } from './fixtures/quiche.js'
 
 /**
  * @template T
@@ -44,6 +45,17 @@ describe('streamlimits', function () {
     // @ts-ignore
     delete wtOptions.serverCertificateHashes
 
+  // @ts-ignore
+  beforeEach(async () => {
+    if (
+      process.env.USE_HTTP2 !== 'true' &&
+      process.env.USE_PONYFILL !== 'true' &&
+      process.env.USE_POLYFILL !== 'true'
+    ) {
+      await quicheLoaded
+    }
+  })
+
   // @ts-ignore
   afterEach(async () => {
     if (client != null) {

main/test/unidirectional-streams.spec.js

@@ -8,6 +8,7 @@ import { writeStream } from './fixtures/write-stream.js'
 import { readCertHash } from './fixtures/read-cert-hash.js'
 import * as ui8 from 'uint8arrays'
 import { KNOWN_BYTES, KNOWN_BYTES_LENGTH } from './fixtures/known-bytes.js'
+import { quicheLoaded } from './fixtures/quiche.js'
 
 describe('unidirectional streams', function () {
   /** @type {import('../lib/dom').WebTransport | undefined} */
@@ -29,6 +30,17 @@ describe('unidirectional streams', function () {
     // @ts-ignore
     delete wtOptions.serverCertificateHashes
 
+  // @ts-ignore
+  beforeEach(async () => {
+    if (
+      process.env.USE_HTTP2 !== 'true' &&
+      process.env.USE_PONYFILL !== 'true' &&
+      process.env.USE_POLYFILL !== 'true'
+    ) {
+      await quicheLoaded
+    }
+  })
+
   // @ts-ignore
   afterEach(async () => {
     if (client != null) {

transports/http3-quiche/src/http3client.cc

@@ -532,7 +532,7 @@ namespace quic
             if (wait_for_encryption_)
             {
                 if (EncryptionBeingEstablished())
-                    return false;
+                    return true;
                 wait_for_encryption_ = false;
                 ParsedQuicVersion version = UnsupportedQuicVersion();
                 if (session_ != nullptr && !CanReconnectWithDifferentVersion(&version) && !session_->connection()->connected())
@@ -569,11 +569,6 @@ namespace quic
                 recheck = true;
         }
 
-        if (checkSession())
-        {
-            recheck = true;
-        }
-
         return recheck;
     }
 
@@ -826,16 +821,18 @@ namespace quic
 
         if (client_->connectionrecheck_)
         {
-            client_->connectionrecheck_ = !client_->handleConnecting();
+            client_->connectionrecheck_ = client_->handleConnecting();
         }
+        if (client_->needsToCheckForSession()) client_->checkSession();
     }
 
     void Http3ClientJS::onCanWrite(const Napi::CallbackInfo &info)
     {
         if (client_->connectionrecheck_)
         {
-            client_->connectionrecheck_ = !client_->handleConnecting();
+            client_->connectionrecheck_ = client_->handleConnecting();
         }
+        if (client_->needsToCheckForSession()) client_->checkSession();
         client_->OnCanWrite();
     }
 

transports/http3-quiche/src/http3client.h

@@ -349,6 +349,10 @@ namespace quic
 
         bool checkSession();
 
+        bool needsToCheckForSession() {
+            return finish_stream_open_.size() > 0 && session_->CanOpenNextOutgoingBidirectionalStream();
+        }
+
         // Read oldest received response and remove it from closed_stream_states_.
         // void ReadNextResponse();