diff --git a/preload.js b/preload.js index 79a308c..5b68bfe 100644 --- a/preload.js +++ b/preload.js @@ -1,14 +1,14 @@ -const { remote } = require('electron'); +// const { remote } = require('electron'); const { ipcRenderer } = require('electron'); // let currWindow = remote.BrowserWindow.getFocusedWindow(); -const { v4: uuid } = require('uuid'); -const ejs = require('ejs'); +// const { v4: uuid } = require('uuid'); +// const ejs = require('ejs'); -const net = require('net'); +// const net = require('net'); const DEVICE = require('./src/device.js'); const PLUGINS = require('./src/plugins.js'); -const SEARCH = require('./src/search.js'); +// const SEARCH = require('./src/search.js'); const VIEW = require('./src/view.js'); const SAVESLOTS = require('./src/saveSlots.js'); @@ -168,8 +168,6 @@ ipcRenderer.on('doSlots3', (event, message) => { SAVESLOTS.loadSlot(3); }); -function log(type, message) {} - function switchClass(element, className) { try { document.getElementsByClassName(className)[0].classList.remove(className); diff --git a/src/device.js b/src/device.js index 2b47cde..e5bf305 100644 --- a/src/device.js +++ b/src/device.js @@ -2,7 +2,7 @@ const { v4: uuid } = require('uuid'); const osc = require('osc'); const net = require('net'); const udp = require('dgram'); -const _ = require('lodash/function'); +const { debounce } = require('lodash/function'); const PLUGINS = require('./plugins.js'); const VIEW = require('./view.js'); @@ -55,7 +55,7 @@ registerDevice = function (newDevice) { lastDrawn: 0, lastHeartbeat: 0, heartbeatInterval: PLUGINS.all[newDevice.type].heartbeatInterval, - draw: _.debounce( + draw: debounce( function () { VIEW.draw(this); }, diff --git a/src/search.js b/src/search.js index a1bc519..66e79fc 100644 --- a/src/search.js +++ b/src/search.js @@ -1,5 +1,5 @@ const { ipcRenderer } = require('electron'); -const netmask = require('netmask').Netmask; +const { Netmask } = require('netmask'); const dgram = require('dgram'); const bonjour = require('bonjour')(); const net = require('net'); @@ -7,7 +7,7 @@ const os = require('os'); const ip = require('ip'); const DEVICE = require('./device.js'); -const SEARCH = require('./search.js'); +// const SEARCH = require('./search.js'); const PLUGINS = require('./plugins.js'); var searching = false; @@ -188,7 +188,7 @@ function getServers() { } findOnlineDevices = function () { - var allInterfaces = require('os').networkInterfaces(); + var allInterfaces = os.networkInterfaces(); var validInterfaces = []; for (var i in allInterfaces) { for (var j = 0; j < allInterfaces[i].length; j++) { @@ -205,7 +205,7 @@ findOnlineDevices = function () { } for (var i = 0; i < validInterfaces.length; i++) { - var block = new netmask(validInterfaces[i].cidr); + var block = new Netmask(validInterfaces[i].cidr); var f = block.first.split('.'); var l = block.last.split('.'); var cur = [f[0], f[1], f[2], f[3]]; diff --git a/src/view.js b/src/view.js index 68d72ea..ba2c646 100644 --- a/src/view.js +++ b/src/view.js @@ -1,7 +1,7 @@ const { ipcRenderer } = require('electron'); const DEVICE = require('./device.js'); const PLUGINS = require('./plugins.js'); -const _ = require('lodash/function'); +// const _ = require('lodash/function'); var pinnedDevices = []; module.exports.pinnedDevices = pinnedDevices;