bug(live ips not working): improved ip catching

Author: GuyARoss

dmon-web/src/components/layout/header.js

@@ -1,6 +1,6 @@
 import React, { useState, createContext, useMemo } from 'react';
 
-import { Nav, Navbar, NavDropdown } from 'react-bootstrap';
+import { Nav, Navbar } from 'react-bootstrap';
 import Autosuggest from 'react-autosuggest';
 
 import './header.css';

dmon-web/src/containers/live/index.js

@@ -1,6 +1,6 @@
 import React, { useState, useMemo, useContext, useEffect } from 'react';
 
-import { Breadcrumb, Container, Row } from 'react-bootstrap'
+import { Breadcrumb, Container, Row } from 'react-bootstrap';
 
 import useLive from './useLive';
 import context from './context';
@@ -48,7 +48,9 @@ export default ({ match: { params }, history }) => {
       ...updateTransmissionPacket(prev, packet, stateKeys),
     }))
   },
-    !!params.ip ? [params.ip] : ips,
+    // this in a way is a "hack", the server will
+    // return us everything if the ips array is empty
+    !!params.ip ? [params.ip] : [], 
     [transmissionPackets, params.id]
   );
 

host-monitor/lib/bridge/live-socket-pool.js

@@ -12,19 +12,26 @@ class LiveSocketPool {
   /**
    * registers a active units
    * @param {any} socketInstance
+   * @param {any} ips
    * @param {any} cb
    */
-  register(socketInstance, cb) {
-    this.active[socketInstance] = cb;
+  register(socketInstance, ips, cb) {
+    this.active[socketInstance] = {ips, cb};
   }
 
   /**
    * writes to open socket
+   * @param {*} ip
    * @param {*} request
    */
-  async writeSocket(request) {
-    Object.values(this.active).forEach((cb) => {
-      if (typeof cb === 'function') {
+  async writeSocket(ip, request) {
+    Object.values(this.active).forEach((props) => {
+      if (props === undefined) {
+        return;
+      }
+
+      const {ips, cb} = props;
+      if (ips.includes(ip) || ips.length === 0) {
         cb(request);
       }
     });

host-monitor/lib/rpc-handlers/transmit-handler.js

@@ -14,7 +14,7 @@ export default async (request) => {
 
   // writes to an open socket if found
   liveSocketPool.writeSocket(
-      updatedRequest,
+      request.IP, updatedRequest,
   );
 
   const elasticResp = await ElasticClient.index(

host-monitor/lib/ws-handlers/live.js

@@ -7,6 +7,7 @@ export default async (socket) => {
   socket.on('subscribeToLiveTransmission', async (ips) => {
     liveSocketPool.register(
         connectionInstance,
+        ips,
         (data) => {
           socket.emit(
               'liveTransmission',

host-monitor/test/functional-grpc.js

@@ -35,7 +35,7 @@ const TRANSMIT_PACKETS = [{
   DeviceID: 'example_device',
 
   Version: 'basic',
-  IP: 'duh',
+  IP: 'duh2',
 
   InboundBandwith: 2,
   OutboundBandwith: 9,