diff --git a/.gitignore b/.gitignore
index 8ccfc57..2b5d615 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,8 @@ node_modules
.node_repl_history
db.sqlite
+db.json
+package-lock.json
public/client.js
public/main.js
public/status.js
diff --git a/Dockerfile b/Dockerfile
index 275e6cd..5894b50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,10 +11,9 @@ COPY public $HOME/public
WORKDIR $HOME
-RUN apk add --no-cache make gcc g++ python && \
- npm install && \
- apk del make gcc g++ python && \
- npm run build
+RUN npm install && \
+ npm run build && \
+ rm -rf node_modules
###########################
# Server
@@ -27,13 +26,10 @@ COPY .babelrc config.js log.js index.js package.json $HOME/
WORKDIR $HOME
-RUN apk add --no-cache make gcc g++ python && \
- npm install --production
+RUN npm install --production
COPY api $HOME/api
-COPY migrations $HOME/migrations
COPY config $HOME/config
-COPY script $HOME/script
COPY --from=build /app/public $HOME/public
EXPOSE 3000
diff --git a/api/casparcg/client.mjs b/api/casparcg/client.mjs
index 0620be6..01e0494 100644
--- a/api/casparcg/client.mjs
+++ b/api/casparcg/client.mjs
@@ -14,7 +14,7 @@ let casparIsConnected
let currentHost
export function initialise(log, db, socket) {
- io = socket.socket
+ io = socket
logger = log
db = db
diff --git a/api/content/routes.mjs b/api/content/routes.mjs
index 21f613a..2217b44 100644
--- a/api/content/routes.mjs
+++ b/api/content/routes.mjs
@@ -1,4 +1,4 @@
-import template from 'lodash.template'
+import _ from 'lodash'
export const active = { }
@@ -13,7 +13,7 @@ function getSocket(ctx, all) {
* Display a specific graphic content
*/
export async function display(ctx, data) {
- let compiled = template(data.graphic.settings.html)
+ let compiled = _.template(data.graphic.settings.html)
let html = compiled(data.data)
// let old = await Content.getSingle(data.graphic.name)
@@ -68,7 +68,7 @@ function generateDisplayText(item) {
// return `${item.data.text} - ${item.data.finished}`
// }
try {
- return template(item.graphic.settings.main)(item.data)
+ return _.template(item.graphic.settings.main)(item.data)
} catch (e) {
return `Error creating display: ${e.message}`
}
diff --git a/api/graphic/routes.mjs b/api/graphic/routes.mjs
index 60e188f..6d68966 100644
--- a/api/graphic/routes.mjs
+++ b/api/graphic/routes.mjs
@@ -41,9 +41,9 @@ export async function create(ctx, data) {
data.settings.main = '<%- text %> - <%- finished %>'
}
- let graphics = ctx.db.get('graphics').insert(data)
+ let graphics = ctx.db.get('graphics')
+ await graphics.insert(data).write()
let graphic = graphics.last().value()
- await graphics.write()
ctx.io.emit('graphic.single', graphic)
}
diff --git a/api/log.mjs b/api/log.mjs
index 4fdccf2..7939a95 100644
--- a/api/log.mjs
+++ b/api/log.mjs
@@ -1,4 +1,4 @@
-import bunyan from 'bunyan'
+import bunyan from 'bunyan-lite'
import defaults from './defaults.mjs'
import config from './config.mjs'
diff --git a/api/middlewares.mjs b/api/middlewares.mjs
deleted file mode 100644
index a0e8711..0000000
--- a/api/middlewares.mjs
+++ /dev/null
@@ -1,40 +0,0 @@
-
-export function bunyanLogger(logger) {
- return async (ctx, next) => {
- ctx.log = logger.child({
- })
-
- const d1 = new Date().getTime()
-
- await next()
-
- const d2 = new Date().getTime()
-
- let level = 'info'
- if (ctx.status >= 400) {
- level = 'warn'
- }
- if (ctx.status >= 500) {
- level = 'error'
- }
-
- ctx.log[level]({
- duration: (d2 - d1),
- status: ctx.res.statusCode,
- }, `<-- ${ctx.request.method} ${ctx.request.url}`)
- }
-}
-
-export function errorHandler() {
- return async (ctx, next) => {
- try {
- await next()
- } catch(err) {
- ctx.log.error(err, 'Unknown error occured')
- ctx.status = 500
- ctx.render('error', {
- error: err,
- })
- }
- }
-}
diff --git a/api/routerio.mjs b/api/routerio.mjs
index dbda909..e30dc71 100644
--- a/api/routerio.mjs
+++ b/api/routerio.mjs
@@ -11,8 +11,8 @@ import * as settings from './settings/routes.mjs'
import * as schedule from './schedule/routes.mjs'
function onConnection(server, db, data) {
- const io = server.socket
- const socket = data.socket
+ const io = server
+ const socket = data
const log = logger.child({
id: socket.id,
})
diff --git a/api/server.mjs b/api/server.mjs
index 360e3ae..48990c4 100644
--- a/api/server.mjs
+++ b/api/server.mjs
@@ -1,38 +1,69 @@
-import Koa from 'koa'
-import serve from 'koa-better-serve'
-import socket from 'koa-socket'
+import socket from 'socket.io-serveronly'
+import http from 'http'
+import nStatic from 'node-static'
import * as casparcg from './casparcg/client.mjs'
import lowdb from './db.mjs'
import config from './config.mjs'
import log from './log.mjs'
import onConnection from './routerio.mjs'
-import { bunyanLogger, errorHandler } from './middlewares.mjs'
log.info('Server: Opening database db.json')
lowdb().then(function(db) {
- const app = new Koa()
- const io = new socket()
+ const fileServer = new nStatic.Server('./public')
+ const server = http.createServer(function (req, res) {
+ const child = log.child({})
- io.attach(app)
+ const d1 = new Date().getTime()
+ var done = function () {
+ var requestTime = new Date().getTime() - d1
+
+ let level = 'info'
+ if (res.status >= 400) {
+ level = 'warn'
+ }
+ if (res.status >= 500) {
+ level = 'error'
+ }
+
+ child[level]({
+ duration: requestTime,
+ status: res.statusCode,
+ }, `<-- ${req.method} ${req.url}`)
+ }
+
+ res.addListener('finish', done);
+ res.addListener('close', done);
+
+ req.addListener('end', function () {
+ if (req.url === '/') {
+ res.writeHead(302, { Location: '/index.html' })
+ return res.end()
+ }
+
+ fileServer.serve(req, res, function (err) {
+ if (err) {
+ log.error(err);
+
+ res.writeHead(err.status, err.headers);
+ res.end(err.message);
+ }
+ });
+ }).resume()
+ })
+
+ const io = new socket(server)
io.on('connection', onConnection.bind(this, io, db))
casparcg.initialise(log, db, io)
- app.use(bunyanLogger(log))
- app.use(errorHandler())
- app.use(async (ctx, next) => {
- if (ctx.url === '/') {
- return ctx.redirect('/index.html')
+ server.listen(config.get('server:port'), '0.0.0.0', function(err) {
+ if (err) {
+ log.fatal(err)
+ return process.exit(2)
}
- await next()
- })
- app.use(serve('./public', ''))
-
- app.listen(config.get('server:port'), err => {
- if (err) return log.fatal(err)
log.info(`Server is listening on ${config.get('server:port')}`)
})
}, function(e) {
diff --git a/db.json b/db.json
deleted file mode 100644
index 9add6da..0000000
--- a/db.json
+++ /dev/null
@@ -1,187 +0,0 @@
-{
- "graphics": [
- {
- "name": "Nidurteljari",
- "engine": "countdown",
- "settings": {
- "html": "<%- text %>
countdown appears here",
- "main": "text",
- "text": "Sunnudagssamkoman hefst klukkan 11:00",
- "countdown": "2018-07-01 11:00",
- "finished": "Skamma stund",
- "css": "#Nidurteljari {\n position: absolute;\n font: 2em \"Berthold Akzidenz Grotesk BE\";\n top: 830px;\n left: 230px;\n width: 1450px;\n padding-top: 20px;\n border-top: 1px solid #095376;\n text-align: center;\n color: #095376;\n font-size: 60pt;\n line-height: 70pt;\n font-weight: bold;\n}\n#Nidurteljari-countdown-timer {\n font-size: 80pt;\n}"
- },
- "id": 1586112780891
- },
- {
- "name": "Nafn",
- "engine": "text",
- "settings": {
- "properties": [
- "nafn",
- "titill"
- ],
- "main": "<%- nafn %>",
- "html": "\n
\n
<%- nafn %>
\n<%- titill %>
\n\n
<%- bok %>
\n<%- vers %>
"
- },
- "id": 1586112780893
- },
- {
- "name": "Forn",
- "engine": "text",
- "settings": {
- "properties": [
- "Titill",
- "Text"
- ],
- "main": "<%- Titill %> - <%- Text %>",
- "css": "#Forn {\nposition: absolute;\ntop: 50px;\nleft: 95px;\nborder: 4px solid white;\npadding: 6px;\nbackground: transparent;\ncolor: black;\nfont-family: Raleway;\n}\n\n#Forn .inside {\npadding: 6px 24px;\nbackground: white;\ndisplay: flex;\nflex-direction: column;\n}\n\n#Forn .inside h2 {\nfont-weight: bold;\nfont-size: 24px;\ntext-align: center;\ntext-transform: uppercase;\npadding: 0;\nmargin: 0;\n}\n\n#Forn .inside h4 {\nfont-weight: normal;\nfont-size: 18px;\npadding: 0;\nmargin: 0;\ntext-align: center;\nline-height: 125%;\n}",
- "html": "\n
<%- Titill %>
\n<%= Text.replace('\\n', '
') %>
\n"
- },
- "id": 1586112780894
- },
- {
- "name": "Lög",
- "engine": "text",
- "settings": {
- "properties": [
- "nafn"
- ],
- "html": "\n\n\n",
- "css": ".box-before {\n margin-bottom: 15px;\n width: 160px;\n height: 112px;\n margin-right: -37px;\n /* ---------- THEME COLOR ---------- */\n background-image: -webkit-radial-gradient(200px 50%, circle, rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 75px, rgba(0,68,105,1) 77px);\n /* ---------- END THEME COLOR ---------- */\n}\n.box-after {\n /* ---------- THEME COLOR ---------- */\n background-image: -webkit-radial-gradient(-40px 50%, circle, rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 75px, rgba(0,68,105,1) 77px);\n /* ---------- END THEME COLOR ---------- */\n margin-bottom: 15px;\n width: 100px;\n height: 112px;\n margin-left: -37px;\n}\n\n#Lög {\n position: absolute;\n color: white;\n font: 2em \"Berthold Akzidenz Grotesk BE\";\n top: 100px;\n left: 0px;\n}\n\n#Lög > div { display: inline-block; }\n\n.box-logo {\n width: 141px;\n height: 141px;\n background: url('uploads/logo.png') 0px 0px no-repeat;\n background-size: contain;\n}\n\n.box-name {\n margin-bottom: 15px;\n height: 112px;\n position: relative;\n margin-left: -6px;\n width: 700px;\n}\n.holder { position: absolute; }\n.name-holder {\n position: relative;\n background: linear-gradient(to right, rgba(207,209,210,0.6) 0%,rgba(235,235,237,0.6) 50%,rgba(183,185,185,0.6) 100%);\n line-height: 102px;\n font-size: 60px;\n color: rgba(0,68,105,1);\n padding: 10px 30px 0px 20px;\n}\n.name-triangle {\n position: absolute;\n right: -112px;\n border-width: 0 112px 112px 0px;\n top: 0;\n border-style: solid;\n border-color: transparent transparent rgba(183,185,185,0.6) transparent;\n}",
- "main": "nafn"
- },
- "id": 1586112780895
- },
- {
- "name": "Dagskra",
- "engine": "schedule",
- "settings": {
- "properties": [
- "temp"
- ],
- "textfields": [
- "item1"
- ],
- "main": "temp"
- },
- "id": 1586112780896
- }
- ],
- "presets": [
- {
- "graphic_id": 1586112780892,
- "values": {
- "nafn": "Bla",
- "titill": "test"
- },
- "sort": 1,
- "id": 1586205588587
- },
- {
- "graphic_id": 1586112780892,
- "values": {
- "nafn": "Bla 2",
- "titill": "test 2"
- },
- "sort": 2,
- "id": 1586205644890
- }
- ],
- "playing": [
- {
- "graphic": {
- "name": "Nafn",
- "engine": "text",
- "settings": {
- "properties": [
- "nafn",
- "titill"
- ],
- "main": "<%- nafn %>",
- "html": "\n
\n
<%- nafn %>
\n<%- titill %>
\n\n
\n
\n
<%- nafn %>
\n<%- titill %>
\n\n
\n
\n
<%- nafn %>
\n<%- titill %>
\n\n