Compare commits

..

No commits in common. "master" and "church_streamer_v1.0.2" have entirely different histories.

5 changed files with 2 additions and 11 deletions

View file

@ -169,7 +169,6 @@ class EncoderManager {
} }
command = command.replace('-f decklink ', `${settings.format_code} -f decklink ${settings.device} `) command = command.replace('-f decklink ', `${settings.format_code} -f decklink ${settings.device} `)
} }
command = command.replace('$date$', new Date().toISOString().replace('T','_').replace(/:/g,'').split('.')[0])
let process = await runCommand('', command, this.fromEncoder.bind(this), true) let process = await runCommand('', command, this.fromEncoder.bind(this), true)
this.attempting.value = process this.attempting.value = process

View file

@ -3,10 +3,6 @@ import serial from '../serial/serial.mjs'
import encoder from '../encoder/encoder.mjs' import encoder from '../encoder/encoder.mjs'
export default class HealthRoutes { export default class HealthRoutes {
constructor(opts = {}) {
Object.assign(this, opts)
}
registerGlobalIo(io, server) { registerGlobalIo(io, server) {
effect(() => { effect(() => {
io.io.emit('status', this.getStatus()) io.io.emit('status', this.getStatus())
@ -23,7 +19,6 @@ export default class HealthRoutes {
getStatus() { getStatus() {
return { return {
version: this.version,
serial_running: Boolean(serial.serial.value), serial_running: Boolean(serial.serial.value),
serial_display: serial.currentDisplay.value, serial_display: serial.currentDisplay.value,
encoder_running: Boolean(encoder.encoder.value), encoder_running: Boolean(encoder.encoder.value),

View file

@ -29,7 +29,7 @@ export default class Server {
static: new StaticRoutes(), static: new StaticRoutes(),
encoder: new EncoderRoutes(), encoder: new EncoderRoutes(),
serial: new SerialRoutes(), serial: new SerialRoutes(),
health: new HealthRoutes({ version: this.core.version }), health: new HealthRoutes(),
serve: new ServeHandler({ serve: new ServeHandler({
root: localUtil.getPathFromRoot('../public'), root: localUtil.getPathFromRoot('../public'),
version: this.core.version, version: this.core.version,

View file

@ -16,9 +16,6 @@ class Client {
this.status = {} this.status = {}
this.socket.on('status', status => { this.socket.on('status', status => {
if (this.status.version && status?.version && this.status.version !== status.version) {
window.location.reload(true)
}
this.status = status this.status = status
}) })
this.socket.on('disconnect', this.disconnected.bind(this)) this.socket.on('disconnect', this.disconnected.bind(this))

View file

@ -1,6 +1,6 @@
{ {
"name": "church_streamer", "name": "church_streamer",
"version": "1.0.4", "version": "1.0.2",
"description": "", "description": "",
"main": "index.mjs", "main": "index.mjs",
"scripts": { "scripts": {