diff --git a/package-lock.json b/package-lock.json index d54b4b9..8e34f22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,13 @@ "@vue/compiler-sfc": "^3.2.38", "@vue/server-renderer": "^3.2.38", "axios": "^0.27.2", + "compression": "^1.7.4", "cross-env": "^7.0.3", "d3-regression": "^1.3.10", "dotenv": "^16.0.2", "express": "^4.18.1", "node-cache": "^5.1.2", + "sirv": "^2.0.2", "vite": "^3.0.9", "vite-plugin-ssr": "^0.4.28", "vite-plugin-windicss": "^1.8.7", @@ -1198,6 +1200,11 @@ "node": ">= 8" } }, + "node_modules/@polka/url": { + "version": "1.0.0-next.21", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz", + "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==" + }, "node_modules/@sinclair/typebox": { "version": "0.24.35", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.35.tgz", @@ -2143,6 +2150,60 @@ "node": ">= 0.8" } }, + "node_modules/compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "dependencies": { + "mime-db": ">= 1.43.0 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/compression": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "dependencies": { + "accepts": "~1.3.5", + "bytes": "3.0.0", + "compressible": "~2.0.16", + "debug": "2.6.9", + "on-headers": "~1.0.2", + "safe-buffer": "5.1.2", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/compression/node_modules/bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/compression/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/compression/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/compression/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -4616,6 +4677,14 @@ "node": "*" } }, + "node_modules/mrmime": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz", + "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==", + "engines": { + "node": ">=10" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -4721,6 +4790,14 @@ "node": ">= 0.8" } }, + "node_modules/on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -5435,6 +5512,19 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, + "node_modules/sirv": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.2.tgz", + "integrity": "sha512-4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w==", + "dependencies": { + "@polka/url": "^1.0.0-next.20", + "mrmime": "^1.0.0", + "totalist": "^3.0.0" + }, + "engines": { + "node": ">= 10" + } + }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -5706,6 +5796,14 @@ "node": ">=0.6" } }, + "node_modules/totalist": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.0.tgz", + "integrity": "sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==", + "engines": { + "node": ">=6" + } + }, "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -7015,6 +7113,11 @@ "fastq": "^1.6.0" } }, + "@polka/url": { + "version": "1.0.0-next.21", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz", + "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==" + }, "@sinclair/typebox": { "version": "0.24.35", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.35.tgz", @@ -7762,6 +7865,53 @@ "delayed-stream": "~1.0.0" } }, + "compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "requires": { + "mime-db": ">= 1.43.0 < 2" + } + }, + "compression": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "requires": { + "accepts": "~1.3.5", + "bytes": "3.0.0", + "compressible": "~2.0.16", + "debug": "2.6.9", + "on-headers": "~1.0.2", + "safe-buffer": "5.1.2", + "vary": "~1.1.2" + }, + "dependencies": { + "bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -9503,6 +9653,11 @@ "brace-expansion": "^1.1.7" } }, + "mrmime": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz", + "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==" + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -9581,6 +9736,11 @@ "ee-first": "1.1.1" } }, + "on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -10063,6 +10223,16 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, + "sirv": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.2.tgz", + "integrity": "sha512-4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w==", + "requires": { + "@polka/url": "^1.0.0-next.20", + "mrmime": "^1.0.0", + "totalist": "^3.0.0" + } + }, "sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -10261,6 +10431,11 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" }, + "totalist": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.0.tgz", + "integrity": "sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==" + }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", diff --git a/package.json b/package.json index eeed1b0..04bfde2 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "scripts": { "dev": "npm run server", "prod": "npm run build && npm run server:prod", - "build": "vite build && vite build --ssr", + "build": "vite build", "server": "node ./src", "server:prod": "cross-env NODE_ENV=production node ./src", "lint": "eslint \"src/**/*.{js,vue}\" --cache --format=json -o eslint.out", @@ -19,11 +19,13 @@ "@vue/compiler-sfc": "^3.2.38", "@vue/server-renderer": "^3.2.38", "axios": "^0.27.2", + "compression": "^1.7.4", "cross-env": "^7.0.3", "d3-regression": "^1.3.10", "dotenv": "^16.0.2", "express": "^4.18.1", "node-cache": "^5.1.2", + "sirv": "^2.0.2", "vite": "^3.0.9", "vite-plugin-ssr": "^0.4.28", "vite-plugin-windicss": "^1.8.7", diff --git a/src/expressRouting.js b/src/expressRouting.js new file mode 100644 index 0000000..6532e9a --- /dev/null +++ b/src/expressRouting.js @@ -0,0 +1,34 @@ +/** @typedef {import('express').Express} Express */ + +import {renderPage} from 'vite-plugin-ssr'; +import {getData} from './serverStore/index.js'; + +/** @type {Express} */ +let app; + +/** @param {Express} expressApp */ +export default expressApp => { + app = expressApp; + apiHandler(); + ssrHandler(); +}; + +const apiHandler = () => { + app.get('/api/weather-data', async (req, res) => { + res.send(getData('weatherData')); + }); + app.get('/api/report-data', async (req, res) => { + res.send(getData('reportData')); + }); +}; + +const ssrHandler = () => { + app.get('*', async (req, res, next) => { + const pageContextInit = {urlOriginal: req.originalUrl}; + const pageContext = await renderPage(pageContextInit); + const {httpResponse} = pageContext; + if (!httpResponse) return next(); + const {body, statusCode, contentType} = httpResponse; + res.status(statusCode).type(contentType).send(body); + }); +}; diff --git a/src/index.js b/src/index.js index 9819c3d..bc345f6 100644 --- a/src/index.js +++ b/src/index.js @@ -1,57 +1,38 @@ /* eslint-env node */ -import {renderPage} from 'vite-plugin-ssr'; +import expressRouting from './expressRouting.js'; +import {deploy} from './services/data.js'; +import compression from 'compression'; +import {createServer} from 'vite'; import express from 'express'; -// import vite from 'vite'; import path from 'path'; -import {deploy} from './services/data.js'; -import {getData} from './serverStore/index.js'; - -await deploy(); +import sirv from 'sirv'; const isProduction = process.env.NODE_ENV === 'production'; const root = path.resolve(path.dirname('')); +const port = process.env.PORT || 3000; +const app = express(); +app.use(compression()); + +// 1st time data fetch from visualcrossing weather APIs +await deploy(); + +const productionServer = () => app.use(sirv(`${root}/dist/client`)); + +const developmentServer = async () => { + const viteDevMiddleware = ( + await createServer({ + root, + server: {middlewareMode: true}, + }) + ).middlewares; + app.use(viteDevMiddleware); +}; (async function startServer() { - const app = express(); - - if (isProduction) { - app.use(express.static(`${root}/dist/client`)); - } else { - const viteDevMiddleware = ( - await ( - await import('vite') - ).createServer({ - root, - server: { - middlewareMode: true, - watch: { - usePolling: true, - interval: 100, - }, - }, - }) - ).middlewares; - app.use(viteDevMiddleware); - } - - app.get('/api/weather-data', async (req, res) => { - res.send(getData('weatherData')); - }); - app.get('/api/report-data', async (req, res) => { - res.send(getData('reportData')); - }); - - app.get('*', async (req, res, next) => { - const urlOriginal = req.originalUrl; - const pageContextInit = {urlOriginal}; - const pageContext = await renderPage(pageContextInit); - const {httpResponse} = pageContext; - if (!httpResponse) return next(); - const {body, statusCode, contentType} = httpResponse; - res.status(statusCode).type(contentType).send(body); - }); - - const port = process.env.PORT || 3000; + isProduction ? productionServer() : await developmentServer(); + + expressRouting(app); + app.listen(port, () => console.log(`Server running at http://localhost:${port}`)); // eslint-disable-line no-console })();