From 2a1fe80b85af18116f65f6be1a1af140d7d73a93 Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Tue, 10 May 2022 23:15:20 -0700 Subject: [PATCH] server: ditch unmaintained "spdy" HTTP/2 support can be restored after migration to fastify. Bug: #524 --- package-lock.json | 20 -------------------- package.json | 2 -- server/bin/web-server.ts | 8 +++++--- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 753b60b7d..6dc85ddb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,7 +63,6 @@ "@types/react-router-dom": "^5.3.3", "@types/react-transition-group": "^4.4.4", "@types/react-window": "^1.8.5", - "@types/spdy": "^3.4.5", "@types/supertest": "^2.0.12", "@types/tar-fs": "^2.0.1", "@types/yargs": "^17.0.10", @@ -145,7 +144,6 @@ "sass-loader": "^12.6.0", "saxen": "^8.1.2", "source-map-loader": "^3.0.1", - "spdy": "^4.0.2", "style-loader": "^3.3.1", "supertest": "^6.2.3", "tar-fs": "^2.1.1", @@ -4041,15 +4039,6 @@ "@types/node": "*" } }, - "node_modules/@types/spdy": { - "version": "3.4.5", - "resolved": "https://registry.npmjs.org/@types/spdy/-/spdy-3.4.5.tgz", - "integrity": "sha512-/33fIRK/aqkKNxg9BSjpzt1ucmvPremgeDywm9z2C2mOlIh5Ljjvgc3UhQHqwXsSLDLHPT9jlsnrjKQ1XiVJzA==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/stack-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", @@ -20056,15 +20045,6 @@ "@types/node": "*" } }, - "@types/spdy": { - "version": "3.4.5", - "resolved": "https://registry.npmjs.org/@types/spdy/-/spdy-3.4.5.tgz", - "integrity": "sha512-/33fIRK/aqkKNxg9BSjpzt1ucmvPremgeDywm9z2C2mOlIh5Ljjvgc3UhQHqwXsSLDLHPT9jlsnrjKQ1XiVJzA==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, "@types/stack-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", diff --git a/package.json b/package.json index 56c4d3d9e..242b06c44 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,6 @@ "@types/react-router-dom": "^5.3.3", "@types/react-transition-group": "^4.4.4", "@types/react-window": "^1.8.5", - "@types/spdy": "^3.4.5", "@types/supertest": "^2.0.12", "@types/tar-fs": "^2.0.1", "@types/yargs": "^17.0.10", @@ -194,7 +193,6 @@ "sass-loader": "^12.6.0", "saxen": "^8.1.2", "source-map-loader": "^3.0.1", - "spdy": "^4.0.2", "style-loader": "^3.3.1", "supertest": "^6.2.3", "tar-fs": "^2.1.1", diff --git a/server/bin/web-server.ts b/server/bin/web-server.ts index a9a0512e4..da17e9941 100755 --- a/server/bin/web-server.ts +++ b/server/bin/web-server.ts @@ -2,7 +2,7 @@ import chalk from 'chalk'; import debug from 'debug'; import fs from 'fs'; import http from 'http'; -import spdy from 'spdy'; +import https from 'https'; import app from '../app'; import config from '../../config'; @@ -37,7 +37,7 @@ const startWebServer = () => { app.set('host', host); // Create HTTP or HTTPS server. - let server: http.Server | spdy.Server; + let server: http.Server | https.Server; if (useSSL) { if (!config.sslKey || !config.sslCert) { @@ -45,7 +45,9 @@ const startWebServer = () => { process.exit(1); } - server = spdy.createServer( + server = http.createServer(); + + server = https.createServer( { key: fs.readFileSync(config.sslKey), cert: fs.readFileSync(config.sslCert),