WIP

Author: CMCDragonkai

src/QUICServer.ts

@@ -84,10 +84,10 @@ class QUICServer extends EventTarget {
       key: ArrayBuffer;
       ops: Crypto;
     };
-    config: Partial<QUICConfig & {
+    config: Partial<QUICConfig> & {
       key: string | Array<string> | Uint8Array | Array<Uint8Array>;
       cert: string | Array<string> | Uint8Array | Array<Uint8Array>;
-    }>;
+    };
     socket?: QUICSocket;
     resolveHostname?: (hostname: Hostname) => Host | PromiseLike<Host>;
     reasonToCode?: StreamReasonToCode;

tests/QUICServer.test.ts

@@ -97,10 +97,8 @@ describe(QUICServer.name, () => {
       const quicServer = new QUICServer({
         crypto,
         config: {
-          tlsConfig: {
-            privKeyPem: keyPairRSAPEM.privateKey,
-            certChainPem: certRSAPEM,
-          },
+          key: keyPairRSAPEM.privateKey,
+          cert: certRSAPEM,
         },
         logger: logger.getChild('QUICServer'),
       });
@@ -114,10 +112,8 @@ describe(QUICServer.name, () => {
       const quicServer = new QUICServer({
         crypto,
         config: {
-          tlsConfig: {
-            privKeyPem: keyPairECDSAPEM.privateKey,
-            certChainPem: certECDSAPEM,
-          },
+          key: keyPairECDSAPEM.privateKey,
+          cert: certECDSAPEM,
         },
         logger: logger.getChild('QUICServer'),
       });
@@ -131,10 +127,8 @@ describe(QUICServer.name, () => {
       const quicServer = new QUICServer({
         crypto,
         config: {
-          tlsConfig: {
-            privKeyPem: keyPairEd25519PEM.privateKey,
-            certChainPem: certEd25519PEM,
-          },
+          key: keyPairEd25519PEM.privateKey,
+          cert: certEd25519PEM,
         },
         logger: logger.getChild('QUICServer'),
       });
@@ -145,59 +139,57 @@ describe(QUICServer.name, () => {
       await quicServer.stop();
     });
   });
-  test('bootstrapping a new connection', async () => {
-    const quicServer = new QUICServer({
-      crypto,
-      config: {
-        tlsConfig: {
-          privKeyPem: keyPairEd25519PEM.privateKey,
-          certChainPem: certEd25519PEM,
-        },
-      },
-      logger: logger.getChild('QUICServer'),
-    });
-    await quicServer.start();
+  // test('bootstrapping a new connection', async () => {
+  //   const quicServer = new QUICServer({
+  //     crypto,
+  //     config: {
+  //       key: keyPairEd25519PEM.privateKey,
+  //       cert: certEd25519PEM,
+  //     },
+  //     logger: logger.getChild('QUICServer'),
+  //   });
+  //   await quicServer.start();
 
-    const scidBuffer = new ArrayBuffer(quiche.MAX_CONN_ID_LEN);
-    await crypto.ops.randomBytes(scidBuffer);
-    const scid = new QUICConnectionId(scidBuffer);
+  //   const scidBuffer = new ArrayBuffer(quiche.MAX_CONN_ID_LEN);
+  //   await crypto.ops.randomBytes(scidBuffer);
+  //   const scid = new QUICConnectionId(scidBuffer);
 
-    const socket = new QUICSocket({
-      crypto,
-      resolveHostname: utils.resolveHostname,
-      logger: logger.getChild(QUICSocket.name),
-    });
-    await socket.start();
+  //   const socket = new QUICSocket({
+  //     crypto,
+  //     resolveHostname: utils.resolveHostname,
+  //     logger: logger.getChild(QUICSocket.name),
+  //   });
+  //   await socket.start();
 
-    // Const config = buildQuicheConfig({
-    //   ...clientDefault
-    // });
-    // Here we want to VERIFY the peer
-    // If we use the same certificate
-    // then it should be consider as if it is trusted!
+  //   // Const config = buildQuicheConfig({
+  //   //   ...clientDefault
+  //   // });
+  //   // Here we want to VERIFY the peer
+  //   // If we use the same certificate
+  //   // then it should be consider as if it is trusted!
 
-    const quicConfig: QUICConfig = {
-      ...clientDefault,
-      verifyPeer: true,
-    };
+  //   const quicConfig: QUICConfig = {
+  //     ...clientDefault,
+  //     verifyPeer: true,
+  //   };
 
-    const connection = await QUICConnection.connectQUICConnection({
-      scid,
-      socket,
+  //   const connection = await QUICConnection.connectQUICConnection({
+  //     scid,
+  //     socket,
 
-      remoteInfo: {
-        host: utils.resolvesZeroIP(quicServer.host),
-        port: quicServer.port,
-      },
+  //     remoteInfo: {
+  //       host: utils.resolvesZeroIP(quicServer.host),
+  //       port: quicServer.port,
+  //     },
 
-      config: quicConfig,
-    });
+  //     config: quicConfig,
+  //   });
 
-    await socket.stop();
-    await quicServer.stop();
+  //   await socket.stop();
+  //   await quicServer.stop();
 
-    // We can run with several rsa keypairs and certificates
-  });
+  //   // We can run with several rsa keypairs and certificates
+  // });
   describe('updating configuration', () => {
     // We want to test changing the configuration over time
   });