...

Author: contractpendev

.gitignore

@@ -159,4 +159,6 @@ typings/
 .serverless
 
 
-# End of https://www.gitignore.io/api/node,coffeescript,intellij+all
+# End of https://www.gitignore.io/api/node,coffeescript,intellij+all
+
+clientIdentity.json

package-lock.json

@@ -20,13 +20,15 @@
     "clusterws-client-js": "git+https://github.com/fundon/ClusterWS-Client-JS.git",
     "comedy": "^1.6.0",
     "commander": "^2.18.0",
+    "create-if-not-exist": "0.0.2",
     "express": "^4.16.3",
     "graphql-request": "^1.8.2",
     "handlebars": "^4.0.12",
     "handlebars-helpers": "^0.10.0",
     "html-entities": "^1.2.1",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.5",
+    "uuid": "^3.3.2",
     "uws": "^10.148.1",
     "winston": "^3.0.0"
   },

package.json

@@ -3,6 +3,15 @@ Comedy = require 'comedy'
 Awilix = require 'awilix'
 Winston = require 'winston'
 Graph = require '@dagrejs/graphlib'
+createIfNotExist = require 'create-if-not-exist'
+uuidv1 = require 'uuid/v1'
+fs = require('fs')
+
+clientIdentity =
+  uuid: uuidv1()
+createIfNotExist('./clientIdentity.json', JSON.stringify(clientIdentity))
+clientIdentity = JSON.parse(fs.readFileSync('./clientIdentity.json', 'utf8'))
+#console.log 'client identity is ' + clientIdentity.uuid
 
 graphClass = Graph.Graph
 graphInstance = new graphClass()
@@ -27,6 +36,7 @@ container.register
   actorSystem: Awilix.asValue actorSystem
   graphClass: Awilix.asClass graphClass
   graph: Awilix.asValue graphInstance
+  clientIdentity: Awilix.asValue clientIdentity
 
 opts = {}
 

src/Setup.coffee

@@ -9,39 +9,47 @@ graphQlRequest = require 'graphql-request'
 program = require 'commander'
 path = require 'path'
 ClusterWS = require './../../node_modules/clusterws-client-js/dist/index.js'
-request = require('request')
+request = require 'request'
+uuidv1 = require 'uuid/v1'
 
 class SetupClient
 
   constructor: (opts) ->
     @g = opts.graph
+    @clientIdentity = opts.clientIdentity
+
+  getWorkerId: () =>
+    @clientIdentity
 
   setup: () ->
 
     console.log '--help for command reference'
 
     program.usage('testwork <server ip address> <server port>').command('testwork <server ip address> <server port>').action (serverIp, serverPort, cmd) =>
       console.log 'send test work event'
-      await this.sendTestWorkEvent serverIp, serverPort
+      workerId = this.getWorkerId()
+      await this.sendTestWorkEvent workerId, serverIp, serverPort
 
     # Deploy a ContractPen contract to an Accord Project folder structure
     program.usage('deploy <guid> <dir>').command('deploy <guid> <dir>').action (guid, directoryToCreate, cmd) =>
       console.log 'deploying guid ' + guid
       console.log 'to directory ' + directoryToCreate
       contractJson = await this.fetchContractJsonFromServer guid
-      this.createProject directoryToCreate, contractJson
+      await this.createProject directoryToCreate, contractJson
 
     # Subscribe to server to await work events
     program.usage('subscribe <server ip address> <server port>').command('subscribe <server ip address> <server port>').action (serverIp, serverPort, cmd) =>
       console.log 'subscribe, attempting to subscribe to server for work'
       console.log 'attempting ' + serverIp + ':' + serverPort
-      this.subscribeCluster serverIp, serverPort
+      await this.subscribeCluster serverIp, serverPort
 
     program.parse process.argv
 
   # Submit test task to the server
-  sendTestWorkEvent: (serverId, port) ->
+  sendTestWorkEvent: (workerId, serverId, port) ->
     workData =
+      uuid: uuidv1()
+      workerId: workerId
       command: 'deploy'
       params: ['b03d0879-1545-4ce9-bd08-7915457ce92c', 'testcicerofolder']
 
@@ -67,6 +75,9 @@ class SetupClient
 
     # Client must execute the job as given from the server and reply the result back to the server
     socket.on 'executeJob', (job) ->
+      if (job.command == 'deploy')
+        await this.createProject job.params[0], job.params[1]
+        socket.send 'finishedJob', 'jobid'
       console.log 'client executing job'
 
     # When the server is connected we send back to the server that we are ready to accept commands
@@ -89,7 +100,7 @@ class SetupClient
     socket.on 'disconnect', (code, reason) ->
       # your code to execute on disconnect event
       return
-
+    return
 
   doNothing: (error) -> 0