adding brightness adjustments to websockets

caleyg · caleyg · commit 20aafee3f0bc · 2023-04-25T17:56:38.000-05:00
diff --git a/app/brightness.js b/app/brightness.js
@@ -0,0 +1,71 @@
+const _ = require("lodash");
+const {updateBrightness, getCurrentBrightness} = require("../db/controllers/brightness");
+const {discoverPixelBlazes, sendCommand} = require("./pixelBlazeUtils");
+
+let currentBrightness
+let pixelBlazeData    = []
+let pixelBlazeIds     = []
+init = async () => {
+    getCurrentBrightness()
+        .then((brightness) => {
+            try {
+                currentBrightness = brightness[0].value
+            } catch (err) {
+                console.warn(`Error: ${err}`)
+            }
+        })
+    pixelBlazeData = discoverPixelBlazes()
+    pixelBlazeIds = _.map(pixelBlazeData, 'id')
+}
+
+initInterval = setInterval(init, 100)
+
+class Brightness {
+    constructor(utils) {
+        this.utils = utils ? utils : null
+    }
+    adjustBrightness = async (brightness) => {
+        await new Promise((resolve) => {
+            this.delayedSaveBrightness(resolve, brightness)
+        })
+    }
+    delayedSaveBrightness = _.debounce(async (resolve, brightness) => {
+        sendCommand(pixelBlazeIds, null, brightness)
+        await this.storeBrightness(brightness);
+        currentBrightness = brightness
+        await this.utils.broadcastMessage({ currentBrightness: currentBrightness})
+    }, 1000)
+    getBrightness = async () =>{
+        console.log(currentBrightness)
+        await this.utils.broadcastMessage({ currentBrightness: currentBrightness})
+    }
+    storeBrightness = async (brightness) => {
+        const body = {
+            value: brightness
+        }
+        await updateBrightness(body)
+    }
+
+}
+
+module.exports.BrightnessWebsocket = function (utils) {
+    const brightness = new Brightness(utils)
+    this.utils = utils
+    this.receiveMessage = async function (data) {
+        let message
+        try {
+            message = JSON.parse(data);
+        } catch (err) {
+            this.utils.sendError(err)
+            return
+        }
+        if (message.type === 'ADJUST_BRIGHTNESS') {
+            console.log('received adjust brightness message!')
+            await brightness.adjustBrightness(parseFloat(message.brightness))
+        }
+        if (message.type === 'GET_CURRENT_BRIGHTNESS') {
+            console.log('received get current brightness message!')
+            await brightness.getBrightness()
+        }
+    }
+}
diff --git a/app/firestormWebsocket.js b/app/firestormWebsocket.js
@@ -1,6 +1,7 @@
 const WebSocketServer = require('ws').Server
 const {PlaylistWebSocket} = require('./playlist')
 const {Utils} = require('./utils')
+const {BrightnessWebsocket} = require("./brightness");
 
 // start playlist server
 const address = '0.0.0.0';
@@ -9,6 +10,7 @@ const firestormServer = new WebSocketServer({host: address , port: port});
 console.log(`Firestorm server is running on ${address}:${port}`);
 firestormServer.on('connection', function (connection) {
     const utils = new Utils(connection)
+    const brightnessWebsocket = new BrightnessWebsocket(utils)
     const playlistWebSocket = new PlaylistWebSocket(utils)
     if(utils.addFirestormClient(connection)) {
         return
@@ -19,6 +21,9 @@ firestormServer.on('connection', function (connection) {
         if (await playlistWebSocket.receiveMessage(message)) {
             return
         }
+        if (await brightnessWebsocket.receiveMessage(message)) {
+            return
+        }
     })
     connection.on('close', function() {
         console.log('closed connection')
diff --git a/app/pixelBlazeUtils.js b/app/pixelBlazeUtils.js
@@ -0,0 +1,35 @@
+const _ = require("lodash");
+const {discoveries} = require("./discovery");
+
+module.exports.discoverPixelBlazes = () => {
+    return _.map(discoveries, function (v, k) {
+        let res = _.pick(v, ['lastSeen', 'address']);
+        _.assign(res, v.controller.props);
+        return res;
+    })
+}
+
+module.exports.sendCommand = (pixelBlazeIds, name, brightness) => {
+    _.each(pixelBlazeIds, async id => {
+        id = String(id);
+        let controller = discoveries[id] && discoveries[id].controller;
+        if (controller) {
+            let command = null
+            if(name) {
+                command = {
+                    programName: name
+                }
+            }
+            if(brightness){
+                command = {
+                    brightness: brightness
+                }
+            }
+            if (command) {
+                await controller.setCommand(command);
+            } else {
+                console.log(`No command sent to Pixelblazes command is ${command}`)
+            }
+        }
+    })
+}
diff --git a/app/playlist.js b/app/playlist.js
@@ -1,7 +1,6 @@
 const _ = require("lodash");
-const {discoveries} = require("./discovery");
 const {getPlaylistFromDB, addPatternToPlaylist, removeAllPatterns} = require("../db/controllers/playlist");
-
+const {discoverPixelBlazes, sendCommand} = require("./pixelBlazeUtils");
 let currentPlaylistData  = []
 let currentPlaylist      = []
 let initInterval
@@ -27,13 +26,7 @@ init = async () => {
     pixelBlazeData = discoverPixelBlazes()
     pixelBlazeIds = _.map(pixelBlazeData, 'id')
 }
-discoverPixelBlazes = () => {
-    return _.map(discoveries, function (v, k) {
-        let res = _.pick(v, ['lastSeen', 'address']);
-        _.assign(res, v.controller.props);
-        return res;
-    })
-}
+
 initInterval = setInterval(init, 100)
 
 class Playlist {
@@ -48,7 +41,6 @@ class Playlist {
             await new Promise(resolve => {
                 this.playlistLoopTimeout = setTimeout(resolve, 100)
             });
-            console.log({currentPlaylist})
             if(pixelBlazeIds.length) {
                 await this.iterateOnPlaylist()
             }
@@ -126,23 +118,13 @@ class Playlist {
     }
     sendPattern = (pattern) => {
         const name = pattern.name
-        _.each(pixelBlazeIds, async id => {
-            id = String(id);
-            let controller = discoveries[id] && discoveries[id].controller;
-            if (controller) {
-                const command = {
-                    programName: pattern.name
-                }
-                await controller.setCommand(command);
-            }
-        })
+        sendCommand(pixelBlazeIds, name)
         // skipping this if utils is not initialized due to no websocket connections
+        let message = {
+            currentRunningPattern: name,
+            currentPlaylist: currentPlaylist
+        }
         if(this.utils) {
-            let message = {
-                currentRunningPattern: name,
-                currentPlaylist: currentPlaylist
-            }
-            console.log(message)
             this.utils.broadcastMessage(message)
         }
     }
diff --git a/app/utils.js b/app/utils.js
@@ -1,4 +1,5 @@
 const {v4: uuidv4} = require("uuid");
+const _ = require("lodash");
 module.exports.Utils = function (connection) {
     this.connection = connection
     this.firestormClients = new Array()
diff --git a/db/api/router.js b/db/api/router.js
@@ -1,4 +1,3 @@
-const brightnessDbRoutes = require('../controllers/brightness')
 const playlistDbRoutes = require('../controllers/playlist')
 
 // Create router
@@ -7,7 +6,4 @@ module.exports = function (app) {
     app.post('/playlist/addPattern', playlistDbRoutes.addPatternToPlaylist)
     app.put('/playlist/removePattern', playlistDbRoutes.removePatternFromPlaylist)
     app.put('/playlist/newPlaylist', playlistDbRoutes.newPlaylist)
-    app.put('/playlist/newPlaylist', playlistDbRoutes.newPlaylist)
-    app.get('/brightness/current', brightnessDbRoutes.currentBrightness)
-    app.post('/brightness/update', brightnessDbRoutes.updateBrightness)
 }
diff --git a/db/controllers/brightness.js b/db/controllers/brightness.js
@@ -12,20 +12,30 @@ exports.doesBrightnessExistInTable = async (req) => {
         })
 }
 
-exports.currentBrightness = async (req, res) => {
+exports.getCurrentBrightness = async (req, res) => {
     return await knex
         .select('*')
         .from(brightness_table)
         .then((data) => {
-            res.status(200)
-                .json(data);
+            if(res) {
+                res.status(200)
+                    .json(data);
+            } else {
+                return data
+            }
         })
         .catch(err => {
             console.log(`There was an error retrieving brightness: ${err}`)
         })
 }
 
 exports.updateBrightness = async (req, res) => {
+    let brightnessValue = ''
+    try {
+        brightnessValue = req.body.value
+    } catch(err) {
+        brightnessValue = req.value
+    }
     await knex.transaction(async trx => {
         //clear table first
         await knex
@@ -36,20 +46,30 @@ exports.updateBrightness = async (req, res) => {
         // insert new pattern
         await knex
             .insert({
-                value: req.body.value,
+                value: brightnessValue,
             })
             .into(brightness_table)
             .transacting(trx);
     })
-        .then( () => {
-                res.status(200)
-                    .json({ message: `Creating a new brightness with level '${req.body.value}'.`});
-            }
-        )
-        .catch(err => {
+    .then( () => {
+        if(res) {
+            res.status(200)
+                .json({message: `Creating a new brightness with level '${brightnessValue}'.`})
+        } else {
+            return JSON.stringify({message: 'ok'})
+        }
+    })
+    .catch(err => {
+        if(res) {
             res.status(500)
                 .json({
-                    message: `There was an error creating a new brightness with level '${req.body.value}', error: ${err}`
+                    message: `There was an error creating a new brightness with level '${brightnessValue}', error: ${err}`
                 })
-        })
+        } else {
+            return JSON.stringify({
+                code: 500,
+                message: `There was an error creating a new brightness with level '${brightnessValue}', error: ${err}`
+            })
+        }
+    })
 }
diff --git a/db/db.js b/db/db.js
@@ -27,18 +27,10 @@ knex.schema
                 })
         }
     })
-    .then(() => {
-        console.log('done')
-    })
     .catch((error) => {
         console.error(`There was an error setting up the database: ${error}`)
     })
 
-knex.select('*').from('playlist')
-    .then(data => console.log('data:', data))
-    .catch(err => console.log(err))
-
-
 knex.schema
     .hasTable('brightness')
     .then((exists) => {
@@ -61,16 +53,8 @@ knex.schema
                 })
         }
     })
-    .then(() => {
-        console.log('done')
-    })
     .catch((error) => {
         console.error(`There was an error setting up the database: ${error}`)
     })
 
-knex.select('*').from('brightness')
-    .then(data => console.log('data:', data))
-    .catch(err => console.log(err))
-
-
 module.exports = knex
diff --git a/src/App.js b/src/App.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`const {v4: uuidv4} = require("uuid");`
	`2`	`+const _ = require("lodash");`
`2`	`3`	`module.exports.Utils = function (connection) {`
`3`	`4`	`this.connection = connection`
`4`	`5`	`this.firestormClients = new Array()`