john/deighton-ar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enabling test server and bug fixes

Browse Source
This commit is contained in:
John Lyon-Smith
2018-04-20 17:40:55 -07:00
parent acfbc52cf9
commit f7c73ee277
15 changed files with 399 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
server/config/default-test.json5 Normal file
View File

@@ -0,0 +1,27 @@
{
logDir: '',
serviceName: {
server: 'dar-test-server',
api: 'dar-test-api',
email: 'dar-test-email',
image: 'dar-test-image',
},
uri: {
mongo: 'mongodb://localhost/dar-test-v1',
amqp: 'amqp://localhost',
redis: 'redis://localhost',
},
api: {
port: '3002',
loginKey: '6508b427b3cc486498671cfd7967218bd6b95fbb42f5e17a112f4c9e9900057c',
uploadTimout: 3600,
},
email: {
senderEmail: 'support@kss.us.com',
maxEmailTokenAgeInHours: 36,
maxPasswordTokenAgeInHours: 3,
sendEmailDelayInSeconds: 3,
supportEmail: 'support@kss.us.com',
sendEmail: true
}
}

6
server/config/default.json5
View File

@@ -1,5 +1,11 @@
{
logDir: '',
serviceName: {
server: 'dar-server',
api: 'dar-api',
email: 'dar-email',
image: 'dar-image',
},
uri: {
mongo: 'mongodb://localhost/dar-v1',
amqp: 'amqp://localhost',

5
server/config/production-test.json5 Normal file
View File

@@ -0,0 +1,5 @@
{
api: {
port: '3006',
},
}

16
server/deighton-ar-test.service Normal file
View File

@@ -0,0 +1,16 @@
[Unit]
Description=Deighton AR Test Service
After=rabbitmq-server.service mongod.service redis-server.service
[Service]
Type=simple
User=ubuntu
Group=ubuntu
WorkingDirectory=/home/ubuntu/deighton-ar/server
Environment='NODE_ENV=production'
Environment='NODE_APP_INSTANCE=test'
ExecStart=/usr/bin/node dist/server.js
Restart=on-abort
[Install]
WantedBy=multi-user.target

5
server/src/api/index.js
View File

@@ -19,8 +19,8 @@ import * as Routes from "./routes"
let app = express()
let server = http.createServer(app)
let container = { app, server }
const serviceName = "dar-api"
const isProduction = process.env.NODE_ENV == "production"
const serviceName = config.get("serviceName.api")
const isProduction = process.env.NODE_ENV === "production"
let log = null
if (isProduction) {
@@ -71,6 +71,7 @@ Promise.all([
log.info(`Connected to Redis at ${redisUri}`)
try {
container.systemRoutes = new Routes.SystemRoutes(container)
container.authRoutes = new Routes.AuthRoutes(container)
container.userRoutes = new Routes.UserRoutes(container)
container.assetRoutes = new Routes.AssetRoutes(container)

23
server/src/api/routes/SystemRoutes.js Normal file
View File

@@ -0,0 +1,23 @@
import createError from "http-errors"
import autobind from "autobind-decorator"
import { catchAll } from "."
import { versionInfo } from "../../version"
import { version } from "urlsafe-base64/lib/urlsafe-base64"
@autobind
export class SystemRoutes {
constructor(container) {
const app = container.app
this.log = container.log
app.route("/system/version").get(this.getVersion)
}
async getVersion(req, res, next) {
const { fullVersion } = versionInfo
res.json({
fullVersion,
})
}
}

1
server/src/api/routes/index.js
View File

@@ -4,6 +4,7 @@ export { UserRoutes } from "./UserRoutes"
export { WorkItemRoutes } from "./WorkItemRoutes"
export { ActivityRoutes } from "./ActivityRoutes"
export { TeamRoutes } from "./TeamRoutes"
export { SystemRoutes } from "./SystemRoutes"
import createError from "http-errors"
export function catchAll(routeHandler) {

50
server/src/email/index.js
View File

@@ -1,19 +1,20 @@
import config from 'config'
import pino from 'pino'
import * as pinoExpress from 'pino-pretty-express'
import createError from 'http-errors'
import { MS } from '../message-service'
import { EmailHandlers } from './EmailHandlers'
import path from 'path'
import fs from 'fs'
import config from "config"
import pino from "pino"
import * as pinoExpress from "pino-pretty-express"
import createError from "http-errors"
import { MS } from "../message-service"
import { EmailHandlers } from "./EmailHandlers"
import path from "path"
import fs from "fs"
const serviceName = 'dar-email'
const isProduction = (process.env.NODE_ENV == 'production')
const serviceName = config.get("serviceName.email")
const isProduction = process.env.NODE_ENV === "production"
let log = null
if (isProduction) {
log = pino( { name: serviceName },
fs.createWriteStream(path.join(config.get('logDir'), serviceName + '.log'))
log = pino(
{ name: serviceName },
fs.createWriteStream(path.join(config.get("logDir"), serviceName + ".log"))
)
} else {
const pretty = pinoExpress.pretty({})
@@ -24,17 +25,20 @@ if (isProduction) {
const ms = new MS(serviceName, { durable: true }, log)
let container = { ms, log }
const amqpUri = config.get('uri.amqp')
const amqpUri = config.get("uri.amqp")
ms.connect(amqpUri).then(() => {
log.info(`Connected to RabbitMQ at ${amqpUri}`)
ms
.connect(amqpUri)
.then(() => {
log.info(`Connected to RabbitMQ at ${amqpUri}`)
container = {
...container,
handlers: new EmailHandlers(container)
}
container = {
...container,
handlers: new EmailHandlers(container),
}
ms.listen(container.handlers)
}).catch((err) => {
log.error(isProduction ? err.message : err)
})
ms.listen(container.handlers)
})
.catch((err) => {
log.error(isProduction ? err.message : err)
})

56
server/src/image/index.js
View File

@@ -1,19 +1,20 @@
import config from 'config'
import pino from 'pino'
import * as pinoExpress from 'pino-pretty-express'
import { DB } from '../database'
import { MS } from '../message-service'
import { ImageHandlers } from './ImageHandlers'
import path from 'path'
import fs from 'fs'
import config from "config"
import pino from "pino"
import * as pinoExpress from "pino-pretty-express"
import { DB } from "../database"
import { MS } from "../message-service"
import { ImageHandlers } from "./ImageHandlers"
import path from "path"
import fs from "fs"
const serviceName = 'dar-image'
const isProduction = (process.env.NODE_ENV == 'production')
const serviceName = config.get("serviceName.image")
const isProduction = process.env.NODE_ENV === "production"
let log = null
if (isProduction) {
log = pino( { name: serviceName },
fs.createWriteStream(path.join(config.get('logDir'), serviceName + '.log'))
log = pino(
{ name: serviceName },
fs.createWriteStream(path.join(config.get("logDir"), serviceName + ".log"))
)
} else {
const pretty = pinoExpress.pretty({})
@@ -24,22 +25,21 @@ if (isProduction) {
const ms = new MS(serviceName, { durable: false }, log)
const db = new DB()
let container = { db, ms, log }
const mongoUri = config.get('uri.mongo')
const amqpUri = config.get('uri.amqp')
const mongoUri = config.get("uri.mongo")
const amqpUri = config.get("uri.amqp")
Promise.all([
db.connect(mongoUri),
ms.connect(amqpUri)
]).then(() => {
log.info(`Connected to MongoDB at ${mongoUri}`)
log.info(`Connected to RabbitMQ at ${amqpUri}`)
Promise.all([db.connect(mongoUri), ms.connect(amqpUri)])
.then(() => {
log.info(`Connected to MongoDB at ${mongoUri}`)
log.info(`Connected to RabbitMQ at ${amqpUri}`)
container = {
...container,
handlers: new ImageHandlers(container)
}
container = {
...container,
handlers: new ImageHandlers(container),
}
ms.listen(container.handlers)
}).catch((err) => {
log.error(isProduction ? err.message : err)
})
ms.listen(container.handlers)
})
.catch((err) => {
log.error(isProduction ? err.message : err)
})

36
server/src/server.js
View File

@@ -1,18 +1,19 @@
#!/usr/bin/env node
import { ServerTool } from './ServerTool'
import pino from 'pino'
import * as pinoExpress from 'pino-pretty-express'
import path from 'path'
import fs from 'fs'
import config from 'config'
import { ServerTool } from "./ServerTool"
import pino from "pino"
import * as pinoExpress from "pino-pretty-express"
import path from "path"
import fs from "fs"
import config from "config"
const serviceName = 'dar-server'
const isProduction = (process.env.NODE_ENV == 'production')
const serviceName = config.get("serviceName.server")
const isProduction = process.env.NODE_ENV === "production"
let log = null
if (isProduction) {
log = pino( { name: serviceName },
fs.createWriteStream(path.join(config.get('logDir'), serviceName + '.log'))
log = pino(
{ name: serviceName },
fs.createWriteStream(path.join(config.get("logDir"), serviceName + ".log"))
)
} else {
const pretty = pinoExpress.pretty({})
@@ -20,10 +21,13 @@ if (isProduction) {
log = pino({ name: serviceName }, pretty)
}
const tool = new ServerTool(path.basename(process.argv[1], '.js'), log)
const tool = new ServerTool(path.basename(process.argv[1], ".js"), log)
tool.run(process.argv.slice(2)).then((exitCode) => {
process.exitCode = exitCode
}).catch((err) => {
console.error(err)
})
tool
.run(process.argv.slice(2))
.then((exitCode) => {
process.exitCode = exitCode
})
.catch((err) => {
console.error(err)
})

7
server/src/version.js Normal file
View File

@@ -0,0 +1,7 @@
export const versionInfo = {
version: '1.0.0',
fullVersion: '1.0.0-20180415.0',
title: 'Deighton AR System',
copyright: '© 2018, Kingston Software Solutions.',
supportEmail: 'support@kss.us.com',
}