Skip to content
New issue

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

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

Already on GitHub? # to your account

Stage/4 #4

Open
wants to merge 11 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
1 change: 1 addition & 0 deletions .env-sample
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
PORT=1234
APP_NAME=remind.ist
DATABASE_URL=postgres://
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,6 @@ typings/

.DS_Store
.env

# Because I am sick of messing with the merge conflicts of this file
package-lock.json
15 changes: 15 additions & 0 deletions actions/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// actions/index.js

const glob = require('glob')

module.exports = glob.sync(
'./actions/**/*.js',
{ ignore: [ './actions/index.js' ] }
).reduce((actions, filename) => {
const pathTokens = filename.split('/')
const key = pathTokens[pathTokens.length - 1].slice(0, -3)

actions[key] = require(`.${filename}`)

return actions
}, {})
10 changes: 10 additions & 0 deletions actions/newReminder.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// actions/newReminder.js

module.exports = async (db, { email, message, send_at }) => {
const { rows: [ reminder ] } = await db.query(
'INSERT INTO reminders (email, message, send_at) VALUES ($1, $2, $3) RETURNING *',
[ email, message, send_at ]
)

return reminder
}
9 changes: 8 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
// app.js

const server = require('./initialisers/http')
const db = require('./initialisers/postgres')

const run = () => {
server({ db })
}

server()
run()
23 changes: 23 additions & 0 deletions bin/db/init
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env node

if (!process.env.DATABASE_URL) require('dotenv').config()

const { readFileSync } = require('fs')

const db = require('../../initialisers/postgres')

const run = () => new Promise(async resolve => {
const schema = readFileSync('./sql/schema.sql', { encoding: 'utf8' })

try {
console.info(`=> Running db query:\n`, schema)
await db.query(schema)
} catch (error) {
console.error(`=> Error running query:\n`, schema, error)
return resolve(1)
}

return resolve(0)
})

run().then(process.exit)
28 changes: 19 additions & 9 deletions initialisers/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,36 @@ 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
module.exports = ({ db }) => {
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
}
responseParams.db = db
}

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
9 changes: 9 additions & 0 deletions initialisers/postgres.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// initialisers/postgres.js

const { Pool } = require('pg')

const { DATABASE_URL } = process.env

if (!DATABASE_URL) throw new Error('DATABASE_URL not set!')

module.exports = new Pool({ connectionString: DATABASE_URL })
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, db }, 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, db })

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

module.exports = { serveStaticFile, serveRoute }
Loading