added device type filter on recruitment broadcast

Author: Tale152

src/index.ts

@@ -5,6 +5,7 @@ import ClientSpecificP2PConnectionBuilders from './interconnected_node/p2p/build
 import P2PConnection from './interconnected_node/p2p/connections/P2PConnection';
 import MasterP2PConnection from './interconnected_node/p2p/connections/MasterP2PConnection';
 import SlaveP2PConnection from './interconnected_node/p2p/connections/SlaveP2PConnection';
+import DeviceType from './interconnected_node/broker_service_socket/DeviceType';
 
 export default InterconnectedNode;
 
@@ -15,4 +16,5 @@ export {
   P2PConnection,
   MasterP2PConnection,
   SlaveP2PConnection,
+  DeviceType,
 };

src/interconnected_node/InterconnectedNode.ts

@@ -1,16 +1,19 @@
 import BrokerServiceSocket from './broker_service_socket/BrokerServiceSocket';
+import DeviceType from './broker_service_socket/DeviceType';
 import ClientSpecificP2PConnectionBuilders from './p2p/builders/ClientSpecificP2PConnectionBuilders';
 
 export default class InterconnectedNode {
   private brokerServiceSocket: BrokerServiceSocket;
 
   constructor(
     private interconnectedNodeId: string,
-    private builders: ClientSpecificP2PConnectionBuilders
+    private builders: ClientSpecificP2PConnectionBuilders,
+    private deviceType: DeviceType
   ) {
     this.brokerServiceSocket = new BrokerServiceSocket(
       this.interconnectedNodeId,
-      this.builders
+      this.builders,
+      this.deviceType
     );
   }
 

src/interconnected_node/broker_service_socket/BrokerServiceSocket.ts

@@ -4,6 +4,7 @@ import ClientSpecificP2PConnectionBuilders from '../p2p/builders/ClientSpecificP
 import MasterP2PConnectionsHub from '../p2p/hubs/MasterP2PConnectionsHub';
 import SlaveP2PConnectionsHub from '../p2p/hubs/SlaveP2PConnectionsHub';
 import applyBrokerServiceSocketHandlers from './applyBrokerServiceSocketHandlers';
+import DeviceType from './DeviceType';
 
 export default class BrokerServiceSocket {
   private socket: Socket | undefined;
@@ -13,7 +14,8 @@ export default class BrokerServiceSocket {
 
   constructor(
     private interconnectedNodeId: string,
-    private builders: ClientSpecificP2PConnectionBuilders
+    private builders: ClientSpecificP2PConnectionBuilders,
+    private deviceType: DeviceType
   ) {
     this.socket = undefined;
     this.slaveP2PConnectionsHub = new SlaveP2PConnectionsHub();
@@ -38,7 +40,8 @@ export default class BrokerServiceSocket {
       this.slaveP2PConnectionsHub,
       this.masterP2PConnectionsHub,
       this.jobsRepository,
-      this.builders
+      this.builders,
+      this.deviceType
     );
     this.socket.connect();
   }

src/interconnected_node/broker_service_socket/DeviceType.ts

@@ -0,0 +1,6 @@
+enum DeviceType {
+  DESKTOP = 'DESKTOP',
+  MOBILE = 'MOBILE',
+}
+
+export default DeviceType;

src/interconnected_node/broker_service_socket/applyBrokerServiceSocketHandlers.ts

@@ -4,6 +4,7 @@ import JobsRepository from '../contribution/common/JobsRepository';
 import ClientSpecificP2PConnectionBuilders from '../p2p/builders/ClientSpecificP2PConnectionBuilders';
 import MasterP2PConnectionsHub from '../p2p/hubs/MasterP2PConnectionsHub';
 import SlaveP2PConnectionsHub from '../p2p/hubs/SlaveP2PConnectionsHub';
+import DeviceType from './DeviceType';
 import applyOnAnswerConnectionHandler from './handlers/applyOnAnswerConnectionHandler';
 import applyOnIceCandidateHandler from './handlers/applyOnIceCandidateHandler';
 import applyOnRecruitmentAcceptHandler from './handlers/applyOnRecruitmentAcceptHandler';
@@ -16,7 +17,8 @@ export default function applyBrokerServiceSocketHandlers(
   slaveP2PConnectionsHub: SlaveP2PConnectionsHub,
   masterP2PConnectionsHub: MasterP2PConnectionsHub,
   jobsRepository: JobsRepository,
-  builders: ClientSpecificP2PConnectionBuilders
+  builders: ClientSpecificP2PConnectionBuilders,
+  deviceType: DeviceType
 ) {
   brokerServiceSocket.on('connect', () => {
     console.log('Node connected to Broker!');
@@ -30,7 +32,8 @@ export default function applyBrokerServiceSocketHandlers(
     brokerServiceSocket,
     interconnectedNodeId,
     slaveP2PConnectionsHub,
-    jobsRepository
+    jobsRepository,
+    deviceType
   );
 
   applyOnRecruitmentAcceptHandler(

src/interconnected_node/broker_service_socket/handlers/applyOnRecruitmentBroadcastHandler.ts

@@ -2,37 +2,39 @@ import { Socket } from 'socket.io-client';
 import JobsRepository from '../../contribution/common/JobsRepository';
 import SlaveP2PConnectionsHub from '../../p2p/hubs/SlaveP2PConnectionsHub';
 import BrokerServiceChannels from '../BrokerServiceChannels';
+import DeviceType from '../DeviceType';
 
 export default function applyOnRecruitmentBroadcastHandler(
   brokerServiceSocket: Socket,
   interconnectedNodeId: string,
   slaveP2PConnectionsHub: SlaveP2PConnectionsHub,
-  jobsRepository: JobsRepository
+  jobsRepository: JobsRepository,
+  deviceType: DeviceType
 ): void {
   brokerServiceSocket.on(
     BrokerServiceChannels.RECRUITMENT_BROADCAST,
     (payload: any) => {
-      // TODO check requirements
       if (
-        payload.masterId !== interconnectedNodeId &&
-        slaveP2PConnectionsHub.getByMasterId(payload.masterId) === undefined &&
-        jobsRepository.get(payload.operationId) === undefined
+        payload.deviceTypes === undefined ||
+        payload.deviceTypes.includes(deviceType)
       ) {
-        const recruitmentAcceptPayload = {
-          masterId: payload.masterId,
-          masterRole: payload.masterRole,
-          operationId: payload.operationId,
-          slaveId: interconnectedNodeId,
-        };
-        brokerServiceSocket.emit(
-          BrokerServiceChannels.RECRUITMENT_ACCEPT,
-          recruitmentAcceptPayload
-        );
-      } else {
-        brokerServiceSocket.emit(
-          BrokerServiceChannels.RECRUITMENT_BROADCAST,
-          'ERROR'
-        );
+        if (
+          payload.masterId !== interconnectedNodeId &&
+          slaveP2PConnectionsHub.getByMasterId(payload.masterId) ===
+            undefined &&
+          jobsRepository.get(payload.operationId) === undefined
+        ) {
+          const recruitmentAcceptPayload = {
+            masterId: payload.masterId,
+            masterRole: payload.masterRole,
+            operationId: payload.operationId,
+            slaveId: interconnectedNodeId,
+          };
+          brokerServiceSocket.emit(
+            BrokerServiceChannels.RECRUITMENT_ACCEPT,
+            recruitmentAcceptPayload
+          );
+        }
       }
     }
   );