feat: http2 support for connect compatibility application

Author: alexander-akait

lib/Server.js

@@ -101,9 +101,13 @@ const schema = require("./options.json");
  * @property {false | WatchOptions} watch
  */
 
+/**
+ * @typedef {"http" | "https" | "spdy" | "http2" | string} ServerType
+ */
+
 /**
  * @typedef {Object} ServerConfiguration
- * @property {"http" | "https" | "spdy" | string} [type]
+ * @property {ServerType} [type]
  * @property {ServerOptions} [options]
  */
 
@@ -210,8 +214,7 @@ const schema = require("./options.json");
  * @property {boolean | Record<string, never> | BonjourOptions} [bonjour]
  * @property {string | string[] | WatchFiles | Array<string | WatchFiles>} [watchFiles]
  * @property {boolean | string | Static | Array<string | Static>} [static]
- * @property {boolean | ServerOptions} [https]
- * @property {"http" | "https" | "spdy" | string | ServerConfiguration} [server]
+ * @property {ServerType | ServerConfiguration} [server]
  * @property {() => Promise<T>} [app]
  * @property {boolean | "sockjs" | "ws" | string | WebSocketServerConfiguration} [webSocketServer]
  * @property {ProxyConfigArray} [proxy]
@@ -1096,7 +1099,6 @@ class Server {
             ? /** @type {ServerConfiguration} */ (options.server).type || "http"
             : "http",
       options: {
-        .../** @type {ServerOptions} */ (options.https),
         .../** @type {ServerConfiguration} */ (options.server || {}).options,
       },
     };
@@ -1112,7 +1114,11 @@ class Server {
       };
     }
 
-    if (options.server.type === "https" || options.server.type === "spdy") {
+    if (
+      options.server.type === "https" ||
+      options.server.type === "http2" ||
+      options.server.type === "spdy"
+    ) {
       if (
         typeof (
           /** @type {ServerOptions} */ (options.server.options).requestCert
@@ -2438,16 +2444,17 @@ class Server {
    * @returns {void}
    */
   createServer() {
-    const { type, options } = /** @type {ServerConfiguration} */ (
-      this.options.server
-    );
+    const { type, options } =
+      /** @type {ServerConfiguration} */
+      (this.options.server);
 
-    /** @type {import("http").Server | undefined | null} */
     // eslint-disable-next-line import/no-dynamic-require
-    this.server = require(/** @type {string} */ (type)).createServer(
-      options,
-      this.app,
-    );
+    const serverType = require(/** @type {string} */ (type));
+    /** @type {import("http").Server | import("http2").Http2SecureServer | undefined | null} */
+    this.server =
+      type === "http2"
+        ? serverType.createSecureServer(options, this.app)
+        : serverType.createServer(options, this.app);
 
     /** @type {import("http").Server} */
     (this.server).on(

lib/options.json

@@ -526,10 +526,10 @@
       "description": "Allows to set server and options (by default 'http')."
     },
     "ServerType": {
-      "enum": ["http", "https", "spdy"]
+      "enum": ["http", "https", "spdy", "http2"]
     },
     "ServerEnum": {
-      "enum": ["http", "https", "spdy"],
+      "enum": ["http", "https", "spdy", "http2"],
       "cli": {
         "exclude": true
       }

test/e2e/app.test.js

@@ -13,12 +13,17 @@ const staticDirectory = path.resolve(
 );
 
 const apps = [
-  ["express", () => require("express")()],
+  // ["express", () => require("express")()],
   ["connect", () => require("connect")()],
-  ["connect (async)", async () => require("express")()],
+  // ["connect (async)", async () => require("express")()],
 ];
 
-const servers = ["http", "https", "spdy"];
+const servers = [
+  // "http",
+  // "https",
+  // "spdy",
+  "http2",
+];
 
 describe("app option", () => {
   for (const [appName, app] of apps) {