Merge pull request fails-components#108 from fails-components/chore/add-test-framework

Chore/add test framework

Author: martenrichter

.github/workflows/libtest-linux.yml

@@ -39,4 +39,7 @@ jobs:
         run: npm run build
 
       - name: Run unit tests
-        run: NODE_ENV=production npm test
+        run: NODE_ENV=production npm test
+
+      - name: Run old unit tests
+        run: NODE_ENV=production npm run oldtest

.github/workflows/libtest-macos.yml

@@ -42,3 +42,6 @@ jobs:
 
       - name: Run unit tests
         run: NODE_ENV=production npm test
+
+      - name: Run old unit tests
+        run: NODE_ENV=production npm run oldtest

.github/workflows/libtest-windows.yml

@@ -46,3 +46,7 @@ jobs:
           $env:NODE_ENV="production"
           npm test
 
+      - name: Run old unit tests
+        run: | 
+          $env:NODE_ENV="production"
+          npm run oldtest

.vscode/launch.json

@@ -6,8 +6,9 @@
        "name": "Launch Program",
        "preLaunchTask": "npm: build-debug",
        "program": "/usr/local/bin/node",
-       "args": [
-          "/workspaces/webtransport/test/test.js"
+       "args": ["node_modules/.bin/_mocha",
+         "test/bidirectional-streams.spec.js"
+ //         "/workspaces/webtransport/test/test.js"
        ]
     }]
   }

lib/client.js

@@ -51,7 +51,7 @@ export class Http3Client extends Http3WebTransport {
           this.quicconnectedProm.reject(new Error('Timeout client connection'))
           delete this.quicconnectedProm
         }
-      }, 5000)
+      }, 8000)
       await this.quicconnected
       // now create Webtransport session
       setTimeout(() => {

lib/server.js

@@ -2,16 +2,15 @@ import { Http3WebTransport } from './transport.js'
 import { ReadableStream } from 'node:stream/web'
 import { Http3WTSession } from './session.js'
 import { isIPv4 } from 'net'
+// @ts-ignore
 import { defer } from './utils.js'
 
 /**
  * @typedef {import('./types').WebTransportSession} WebTransportSession
  * @typedef {import('./types').NativeHttp3WTSession} NativeHttp3WTSession
  * @typedef {import('./types').Http3ServerEventHandler} Http3ServerEventHandler
  * @typedef {import('./types').Http3WTServerSessionVisitorEvent} Http3WTServerSessionVisitorEvent
- * @typedef {import('./types').Http3ServerListeningEvent} Http3ServerListeningEvent
- * @typedef {import('./types').Http3ServerCloseEvent} Http3ServerCloseEvent
- * @typedef {import('./types').Http3ServerErrorEvent} Http3ServerErrorEvent
+ * @typedef {import('./types').ServerStatusEvent} ServerStatusEvent
  */
 
 /**
@@ -31,6 +30,9 @@ export class Http3Server extends Http3WebTransport {
     /** @type {Record<string, ReadableStreamController<any>>} */
     this.sessionController = {}
 
+    this.port = null
+    this.host = null
+
     this._ready = defer()
     this.ready = this._ready.promise
 
@@ -54,16 +56,16 @@ export class Http3Server extends Http3WebTransport {
   /**
    * @returns {{ port: number, host: string, family: 'IPv4' | 'IPv6' } | null}
    */
-  address () {
-    if (this.transportInt.port == null) {
-      console.info('returning numll')
+  address() {
+    if (this.port == null || this.host == null) {
+      console.info('returning null')
       return null
     }
 
     return {
-      port: this.transportInt.port,
-      host: this.transportInt.host,
-      family: isIPv4(this.transportInt.host) ? 'IPv4' : 'IPv6'
+      port: this.port,
+      host: this.host,
+      family: isIPv4(this.host) ? 'IPv4' : 'IPv6'
     }
   }
 
@@ -100,28 +102,48 @@ export class Http3Server extends Http3WebTransport {
   }
 
   /**
-   * @param {Http3ServerErrorEvent} evt
    */
-  onHttp3ServerError(evt) {
+  onServerError() {
     this._ready.reject()
   }
 
   /**
-   * @param {Http3ServerListeningEvent} evt
    */
-  onHttp3ServerListening(evt) {
+  onServerListening() {
     this._ready.resolve()
   }
 
   /**
-   * @param {Http3ServerCloseEvent} evt
    */
-  onHttp3ServerClose(evt) {
+  onServerClose() {
     this._closed.resolve()
   }
 
   /**
-   * @param {Http3WTServerSessionVisitorEvent | Http3ServerErrorEvent | Http3ServerListeningEvent | Http3ServerCloseEvent} args
+   * @param {ServerStatusEvent} evt
+   */
+  onServerStatus(evt) {
+    if (evt.host) this.host = evt.host
+    if (evt.port) this.port = evt.port
+
+    switch (evt.status) {
+      case 'close':
+        this.onServerClose()
+        break
+      case 'listening':
+        this.onServerListening()
+        break
+      case 'error':
+        this.onServerListening()
+        break
+      default: {
+        throw new Error('unknown status')
+      }
+    }
+  }
+
+  /**
+   * @param {Http3WTServerSessionVisitorEvent | ServerStatusEvent} args
    */
   customCallback(args) {
     // console.log('incoming callback server', args)
@@ -130,16 +152,9 @@ export class Http3Server extends Http3WebTransport {
         case 'Http3WTSessionVisitor':
           this.onHttp3WTSessionVisitor(args)
           break
-        case 'Http3ServerListening':
-          this.onHttp3ServerListening(args)
-          break
-        case 'Http3ServerClose':
-          this.onHttp3ServerClose(args)
+        case 'ServerStatus':
+          this.onServerStatus(args)
           break
-        case 'Http3ServerError':
-          this.onHttp3ServerError(args)
-          break
-
         default: {
           throw new Error('unknown purpose')
         }

lib/types.ts

@@ -141,22 +141,20 @@ export interface Http3ServerListeningEvent {
 /**
  * The Http3 server has stopped listening on the specified port
  */
- export interface Http3ServerCloseEvent {
-  purpose: 'Http3ServerClose'
+ export interface ServerStatusEvent {
+  port: number | null
+  host: string | null
+  purpose: 'ServerStatus',
+  status: 'error' | 'listening' | 'close'
 }
 
-/**
- * The Http3 server failed to listen on the specified port
- */
-export interface Http3ServerErrorEvent {
-  purpose: 'Http3ServerError'
-}
 
 export interface Http3ServerEventHandler {
   onHttp3WTSessionVisitor: (evt: Http3WTServerSessionVisitorEvent) => void
-  onHttp3ServerError: (evt: Http3ServerErrorEvent) => void
-  onHttp3ServerListening: (evt: Http3ServerListeningEvent) => void
-  onHttp3ServerClose: (evt: Http3ServerCloseEvent) => void
+  onServerError: () => void
+  onServerListening: () => void
+  onServerClose: () => void
+  onServerStatus: (evt: ServerStatusEvent) => void
 }
 
 /**