Skip to content

Stage/3 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions initialisers/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,35 @@ if (!process.env.PORT) require('dotenv').config()

const { createServer } = require('http')

const serveStaticFile = require('../lib/responder')
const { serveStaticFile, serveRoute } = require('../lib/responder')
const errors = require('../config/errors')

const { PORT, APP_NAME } = process.env

module.exports = () => {
const server = createServer(async ({ url }, response) => {
const urlTokens = url.split('.')
const extension = urlTokens.length > 1 ? `${urlTokens[urlTokens.length - 1].toLowerCase().trim()}` : false
const isRoot = [ '', '/' ].indexOf(url) > -1
const path = isRoot ? '/index.html' : url
const server = createServer(async (request, response) => {
const urlTokens = request.url.split('.')
const extension = urlTokens.length > 1 ? urlTokens[urlTokens.length - 1].toLowerCase().trim() : false
const serveResponse = extension ? serveStaticFile : serveRoute
const responseParams = { path: request.url }

if (extension) {
responseParams.extension = extension
} else {
responseParams.request = request
responseParams.context = {
app_name: APP_NAME
}
}

try {
return await serveStaticFile({ file: path, extension: isRoot ? 'html' : extension }, response)
return await serveResponse(responseParams, response)
} catch (error) {
console.error(error)
const errorData = errors(error)

return await serveStaticFile({
file: '/error.html',
path: '/error.html',
extension: 'html',
statusCode: errorData.code
}, response)
Expand Down
15 changes: 15 additions & 0 deletions lib/formdata.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const { parse: parseFormadata } = require('querystring')

const getRequestBody = request => new Promise((resolve, reject) => {
let formData = ''

request.on('data', buffer => formData += buffer.toString())
request.on('error', reject)

request.on('end', () => {
const parsedData = parseFormadata(formData)
return resolve(parsedData)
})
})

module.exports = getRequestBody
27 changes: 23 additions & 4 deletions lib/responder.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
const { open } = require('fs').promises
const { readFileSync, promises: { open } } = require('fs')
const { lookup } = require('mime-types')
const Handlebars = require('handlebars')

const { STATIC_EXTENSIONS } = require('../config/constants')

const serveStaticFile = async ({ file, extension, statusCode }, response) => {
const routes = require('../routes')
const basePage = readFileSync(`./templates/template.hbs`, { encoding: 'utf8' })

const serveStaticFile = async ({ path, extension, statusCode }, response) => {
if (STATIC_EXTENSIONS.indexOf(extension) === -1) throw new Error('not_found')

let fileHandle

try {
fileHandle = await open(`./public/${file}`, 'r')
fileHandle = await open(`./public/${path}`, 'r')
const staticFile = await fileHandle.readFile()

const mime = lookup(extension)
Expand All @@ -28,4 +32,19 @@ const serveStaticFile = async ({ file, extension, statusCode }, response) => {
}
}

module.exports = serveStaticFile
const serveRoute = async ({ request, context }, response) => {
const key = `${request.method}:${request.url}`
const route = routes[key]

if (!route) throw new Error('not_found')

Handlebars.registerPartial('content', route.body)
const hbs = Handlebars.compile(basePage)

let routeContext = {}
if (route.data) routeContext = await route.data(request)

return response.end(hbs({ ...context, ...routeContext }))
}

module.exports = { serveStaticFile, serveRoute }
122 changes: 112 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
"description": "Schedule a reminder for yourself, by email",
"main": "app.js",
"dependencies": {
"glob": "^7.1.3",
"handlebars": "^4.1.2",
"mime-types": "^2.1.24"
},
"devDependencies": {
"dotenv": "^7.0.0",
"nodemon": "^1.18.11"
},
"scripts": {
"start": "nodemon --inspect -e js,html"
"start": "nodemon --inspect -e js,html,hbs"
},
"repository": {
"type": "git",
Expand All @@ -22,5 +24,8 @@
"bugs": {
"url": "https://github.com/mtimofiiv/remind.ist/issues"
},
"homepage": "https://github.com/mtimofiiv/remind.ist#readme"
"homepage": "https://github.com/mtimofiiv/remind.ist#readme",
"engines": {
"node": ">=12"
}
}
17 changes: 17 additions & 0 deletions routes/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const { readFileSync } = require('fs')
const glob = require('glob')

module.exports = glob.sync(
'./routes/**/*.js',
{ ignore: [ './routes/index.js' ] }
).reduce((routeMap, filename) => {
const route = require(`.${filename}`)

if (route.template) {
route.body = readFileSync(`./templates/${route.template}.hbs`, { encoding: 'utf8' })
}

routeMap[`${route.method || 'GET'}:${route.uri}`] = route

return routeMap
}, {})
10 changes: 10 additions & 0 deletions routes/new-reminder.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const getRequestBody = require('../lib/formdata')

exports.uri = '/new'
exports.template = 'new_reminder'
exports.method = 'POST'

exports.data = async request => {
const formData = await getRequestBody(request)
return formData
}
2 changes: 2 additions & 0 deletions routes/root.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
exports.uri = '/'
exports.template = 'root'
7 changes: 7 additions & 0 deletions templates/new_reminder.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<h1>Data received!</h1>

<p>Email: {{email}}</p>

<p>Message:</p>

<p>{{message}}</p>
Loading