add typescript and http/2 and server push support

.gitattributes

@@ -0,0 +1,5 @@
+*.js linguist-language=Typescript 
+*.css linguist-language=Typescript 
+*.html linguist-language=Typescript 
+*.jsx linguist-language=Typescript
+*.ts linguist-language=Typescript

.gitignore

@@ -0,0 +1,2 @@
+node_modules
+*.pem

.prettierrc.json

@@ -0,0 +1 @@
+{ "tabWidth": 4, "arrowParens": "always" }

LICENSE

@@ -1,10 +1,13 @@
-Copyright 2014 Brian White. All rights reserved.
+
+The MIT License (MIT)
+
+
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in
@@ -14,6 +17,26 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+特此授予获得副本的任何人免费的许可
+本软件和相关文档文件（以下简称“软件”）
+不受限制地处理软件，包括但不限于
+使用，复制，修改，合并，发布，分发，再许可和/或授权的权利
+出售本软件的副本，并允许本软件所涉及的人
+具备以下条件：
+
+上述版权声明和此许可声明应包含在
+软件的所有副本或实质性部分。
+
+本软件按“原样”提供，没有任何形式的明示或明示担保。
+暗示（包括但不限于对适销性的保证），
+适用于特定目的和非侵权。在任何情况下都不会
+作者或版权持有人对任何索赔，损害或其他责任
+无论是在合同，侵权或其他情况下的责任
+来自，与软件或使用或其他交易有关的，与之相关的
+在软件中。
+

README.md

@@ -1,81 +1,126 @@
-Description
-===========
+# Description
 
-A module for serving http and https connections over the same port.
+Serve http and https and spdy and http2 connections over the same port with node.js
 
-Forked from the original [`httpolyglot`](https://github.com/mscdex/httpolyglot) to fix various issues required for [HTTP Toolkit](https://httptoolkit.tech), including:
+# Requirements
 
-* Fixing `tlsClientError`: https://github.com/mscdex/httpolyglot/pull/11.
-* Exposing the lost bytes from https://github.com/mscdex/httpolyglot/issues/13 on the socket, as `__httpPeekedData`.
-* Dropping support for old versions of Node (and thereby simplifying the code somewhat)
+-   [node.js](http://nodejs.org/) -- v12.0.0 or newer
 
-Requirements
-============
+# Install
 
-* [node.js](http://nodejs.org/) -- v8.0.0 or newer
+```shell
+yarn add spdy  @masx200/http-https-spdy-http2-polyglot
+```
+
+# Connection protocol judgment
+
+Determine if the connection is over tls.
+
+```js
+const istls = "encrypted" in req.socket;
+```
+
+Determine if the connection is `http/2`.
+
+```js
+const ishttp2 = "h2" === req.socket.alpnProtocol;
+```
 
+# Examples
 
-Install
-============
+-   http2 server push
 
-    npm install @httptoolkit/httpolyglot
+https://github.com/masx200/http-https-spdy-http2-polyglot/blob/master/test/push.js
 
+-   Websocket server
 
-Examples
-========
+https://github.com/masx200/http-https-spdy-http2-polyglot/blob/master/test/websocket.js
 
-* Simple usage:
+-   Simple Determine the connection protocol
 
 ```javascript
-const httpolyglot = require('@httptoolkit/httpolyglot');
-const fs = require('fs');
-
-httpolyglot.createServer({
-  key: fs.readFileSync('server.key'),
-  cert: fs.readFileSync('server.crt')
-}, function(req, res) {
-  res.writeHead(200, { 'Content-Type': 'text/plain' });
-  res.end((req.socket.encrypted ? 'HTTPS' : 'HTTP') + ' Connection!');
-}).listen(9000, 'localhost', function() {
-  console.log('httpolyglot server listening on port 9000');
-  // visit http://localhost:9000 and https://localhost:9000 in your browser ...
+const httpolyglot = require("@masx200/http-https-spdy-http2-polyglot");
+const fs = require("fs");
+const port = 9000;
+const server = httpolyglot.createServer(
+    {
+        key: fs.readFileSync("server.key.pem"),
+        cert: fs.readFileSync("server.crt.pem"),
+    },
+    function (req, res) {
+        res.writeHead(200, { "Content-Type": "text/html" });
+        res.end(
+            ("encrypted" in req.socket ? "HTTPS" : "HTTP") + " Connection!"
+        );
+    }
+);
+server.listen(port, "localhost", function () {
+    console.log("httpolyglot server listening on port " + port);
 });
 ```
 
-* Simple redirect of all http connections to https:
+-   redirect all http connections to https:
 
-```javascript
-const httpolyglot = require('@httptoolkit/httpolyglot');
-const fs = require('fs');
-
-httpolyglot.createServer({
-  key: fs.readFileSync('server.key'),
-  cert: fs.readFileSync('server.crt')
-}, function(req, res) {
-  if (!req.socket.encrypted) {
-    res.writeHead(301, { 'Location': 'https://localhost:9000' });
-    return res.end();
-  }
-  res.writeHead(200, { 'Content-Type': 'text/plain' });
-  res.end('Welcome, HTTPS user!');
-}).listen(9000, 'localhost', function() {
-  console.log('httpolyglot server listening on port 9000');
-  // visit http://localhost:9000 and https://localhost:9000 in your browser ...
-});
+https://github.com/masx200/http-https-spdy-http2-polyglot/blob/master/test/redirect.js
+
+-   create a "404 not found" server
+
+https://github.com/masx200/http-https-spdy-http2-polyglot/blob/master/test/notfound.js
+
+# API
+
+## Exports
+
+https://github.com/masx200/http-https-spdy-http2-polyglot/blob/master/lib/index.d.ts
+
+-   **createServer** - Creates and returns a new Server instance.
+
+```ts
+declare function createServer(
+    config: ServerOptions,
+    requestListener?: RequestListener,
+    upgradeListener?: UpgradeListener
+): net.Server;
 ```
 
+The `requestListener` is a function which is automatically added to the 'request' event
+
+The `upgradeListener` is a function which is automatically added to the 'upgrade' event
+
+If no "requestListener" or "upgradeListener" is provided, the default "404 not found" listener will be used instead.
+
+# How it Works
 
-API
-===
+https://github.com/lvgithub/blog/blob/master/http_and_https_over_same_port/README.MD
 
-Exports
--------
+TLS and HTTP connections are easy to distinguish based on the first byte sent by clients trying to connect. See this comment for more information.
 
-* **Server** - A class similar to https.Server (except instances have `setTimeout()` from http.Server).
+https://github.com/mscdex/httpolyglot/issues/3#issuecomment-173680155
 
-* **createServer**(< _object_ >tlsConfig[, < _function_ >requestListener]) - _Server_ - Creates and returns a new Server instance.
+https://github.com/httptoolkit/httpolyglot/blob/master/lib/index.js
 
-How it Works
-============
+# test
+
+```powershell
+yarn install
+```
+
+```powershell
+./generate-ssl-cert.ps1
+```
 
-TLS and HTTP connections are easy to distinguish based on the first byte sent by clients trying to connect. See [this comment](https://github.com/mscdex/httpolyglot/issues/3#issuecomment-173680155) for more information.
+```powershell
+yarn build
+```
+
+```powershell
+yarn serve
+```
+
+```powershell
+yarn test
+```
+
+```powershell
+yarn open
+```

api-extractor.json

@@ -0,0 +1,21 @@
+{
+    "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+    "mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts",
+    "bundledPackages": [],
+    "compiler": {},
+    "apiReport": { "enabled": false },
+    "docModel": { "enabled": false },
+    "dtsRollup": {
+        "enabled": true,
+        "untrimmedFilePath": "<projectFolder>/dist/index.d.ts"
+    },
+    "tsdocMetadata": { "enabled": false },
+    "messages": {
+        "compilerMessageReporting": { "default": { "logLevel": "warning" } },
+        "extractorMessageReporting": {
+            "ae-missing-release-tag": { "logLevel": "none" },
+            "default": { "logLevel": "warning" }
+        },
+        "tsdocMessageReporting": { "default": { "logLevel": "warning" } }
+    }
+}

dist/index.d.ts

@@ -0,0 +1,62 @@
+/// <reference types="node" />
+import http from "http";
+import https from "https";
+import net from "net";
+import spdy from "spdy";
+import stream from "stream";
+import tls from "tls";
+
+export declare function createServer(
+    config: ServerOptions,
+    requestListener?: RequestListener,
+    upgradeListener?: UpgradeListener
+): net.Server;
+
+export declare interface PushOptions {
+    status?: number;
+    method?: string;
+    request?: http.OutgoingHttpHeaders;
+    response?: http.OutgoingHttpHeaders;
+}
+
+export declare type RequestListener = (
+    req: ServerRequest,
+    res: ServerResponse
+) => void;
+
+export declare const requestNotFound: (
+    req: ServerRequest,
+    res: ServerResponse
+) => void;
+
+export declare type ServerOptions = spdy.ServerOptions & {
+    allowHalfOpen?: boolean | undefined;
+    pauseOnConnect?: boolean | undefined;
+} & http.ServerOptions &
+    tls.TlsOptions &
+    https.ServerOptions;
+
+export declare interface ServerRequest extends http.IncomingMessage {
+    socket: Socket;
+}
+
+export declare interface ServerResponse extends http.ServerResponse {
+    socket: Socket;
+    push?: (pathname: string, options?: PushOptions) => stream.Writable;
+}
+
+export declare type Socket = Partial<tls.TLSSocket> & net.Socket;
+
+export declare type UpgradeListener = (
+    req: ServerRequest,
+    socket: Socket,
+    head: Buffer
+) => void;
+
+export declare const upgradeNotFound: (
+    req: ServerRequest,
+    socket: Socket,
+    head: Buffer
+) => void;
+
+export {};

generate-ssl-cert.ps1

@@ -0,0 +1 @@
+openssl req -x509  -days 365 -newkey rsa:2048 -nodes -sha256 -subj "/C=CN/ST=Shanghai/L=Shanghai/O=boyusc/OU=boyusc/CN=localhost" -keyout "server.key.pem" -out "server.crt.pem"

lib/declaration.d.ts

@@ -0,0 +1,46 @@
+/// <reference types="node" />
+import http from "http";
+import net from "net";
+import spdy from "spdy";
+import tls from "tls";
+import stream from "stream";
+import https from "https";
+export interface ServerRequest extends http.IncomingMessage {
+    socket: Socket;
+}
+export interface PushOptions {
+    status?: number;
+    method?: string;
+    request?: http.OutgoingHttpHeaders;
+    response?: http.OutgoingHttpHeaders;
+}
+export interface ServerResponse extends http.ServerResponse {
+    socket: Socket;
+    push?: (pathname: string, options?: PushOptions) => stream.Writable;
+}
+export declare type Socket = Partial<tls.TLSSocket> & net.Socket;
+export declare type RequestListener = (
+    req: ServerRequest,
+    res: ServerResponse
+) => void;
+export declare type UpgradeListener = (
+    req: ServerRequest,
+    socket: Socket,
+    head: Buffer
+) => void;
+export declare type ServerOptions = spdy.ServerOptions & {
+    allowHalfOpen?: boolean | undefined;
+    pauseOnConnect?: boolean | undefined;
+} & http.ServerOptions &
+    tls.TlsOptions &
+    https.ServerOptions;
+export declare const requestNotFound: (
+    req: ServerRequest,
+    res: ServerResponse
+) => void;
+export declare const upgradeNotFound: (
+    req: ServerRequest,
+    socket: Socket,
+    head: Buffer
+) => void;
+//# sourceMappingURL=declaration.d.ts.map

lib/declaration.js

@@ -0,0 +1,10 @@
+export const requestNotFound = function (req, res) {
+    res.statusCode = 404;
+    res.setHeader("content-type", "text/html");
+    res.write("404");
+    res.end();
+};
+export const upgradeNotFound = function (req, socket, head) {
+    socket.write(`HTTP/1.1 404 Not Found\r\nConnection: keep-alive\r\n\r\n`);
+    socket.destroy();
+};