Removed "heroku-ssl-redirect" package

This commit is contained in:
ポール ウェッブ 2019-01-08 12:46:29 -06:00
parent 5f24739d37
commit a6d365450c
2 changed files with 12 additions and 16 deletions

View file

@ -29,7 +29,6 @@
"fs-exists-sync": "^0.1.0", "fs-exists-sync": "^0.1.0",
"got": "^9.5.0", "got": "^9.5.0",
"graceful-fs": "^4.1.15", "graceful-fs": "^4.1.15",
"heroku-ssl-redirect": "0.0.4",
"make-promises-safe": "^4.0.0", "make-promises-safe": "^4.0.0",
"markdown-it": "^8.4.2", "markdown-it": "^8.4.2",
"markdown-it-anchor": "^5.0.2", "markdown-it-anchor": "^5.0.2",

View file

@ -7,7 +7,6 @@
const color = require("colorette"); const color = require("colorette");
const cors = require("cors"); const cors = require("cors");
const local = require("app-root-path").require; const local = require("app-root-path").require;
// const ssl = require("heroku-ssl-redirect");
const fastify = require("fastify")({ const fastify = require("fastify")({
logger: { logger: {
@ -26,7 +25,6 @@ const messageSlack = local("app/helpers/slack").default;
// P R O G R A M // P R O G R A M
fastify fastify
// .use(ssl())
.use(cors()) .use(cors())
.register(require("fastify-compress")) .register(require("fastify-compress"))
.register(require("@inc/fastify-ws")) .register(require("@inc/fastify-ws"))
@ -39,19 +37,18 @@ fastify
}) })
.register(require("choo-ssr/fastify"), { .register(require("choo-ssr/fastify"), {
app: require("./app") app: require("./app")
}); })
.addHook("preHandler", (request, reply, next) => {
fastify.addHook("preHandler", (request, reply, next) => {
if (process.env.NODE_ENV !== "development") { if (process.env.NODE_ENV !== "development") {
if (request.headers["x-forwarded-proto"] !== "https") if (request.headers["x-forwarded-proto"] !== "https")
reply.redirect(302, "https://" + request.raw.hostname + request.raw.originalUrl); reply.redirect(302, `https://${request.raw.hostname}${request.raw.originalUrl}`);
else else
next(); next();
} }
next(); next();
}); });
fastify.ready(err => { fastify.ready(err => {
if (err) throw err; if (err) throw err;
@ -73,7 +70,7 @@ fastify.ready(err => {
const start = async() => { const start = async() => {
try { try {
await fastify.listen(process.env.PORT || 8080, process.env.IP || "0.0.0.0"); await fastify.listen(process.env.PORT || 8080, process.env.IP || "0.0.0.0");
} catch (err) { } catch(err) {
fastify.log.error(err); fastify.log.error(err);
process.exit(1); process.exit(1);
} }