LAPI:705: Update .gitignore

Reviewed-on: #6

.gitignore

@@ -1,6 +1,6 @@
 node_modules
 .vscode
-logs/*
-!logs
 config/default.toml
-certs
+certs
+logs/*
+!logs

config/dev/default-no-gps.toml

@@ -0,0 +1,440 @@
+[elogs]
+name = 'dev'
+
+[api]
+port = ''
+host = 'node.dev.linx.safemobile.com/api'
+use_secure = true
+accept_untrusted_certs = true
+
+[settings]
+max_fails = 3
+send_group_monitoring_before_each_call = 'false'
+gps_report_interval = ''
+gps_min_interval = 1000
+gps_max_interval = 10000
+gps_lat_start_point = 46.217802
+gps_lng_start_point = 24.776126
+delay_between_clients = 500
+testing_duration = 240 # seconds
+
+
+# group 1 / 1 send / 10 listen
+[[assets]]
+asset_id = 7516
+group_id = 2561
+generate_voice = true
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7517
+group_id = 2561
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7518
+group_id = 2561
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7519
+group_id = 2561
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7520
+group_id = 2561
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7521
+group_id = 2561
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7522
+group_id = 2561
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7523
+group_id = 2561
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7524
+group_id = 2561
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7525
+group_id = 2561
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7526
+group_id = 2561
+generate_voice = false
+
+ 
+# group 2 / 1 send / 10 listen
+ 
+[[assets]]
+asset_id = 7536
+group_id = 2560
+generate_voice = true
+
+ 
+[[assets]]
+asset_id = 7537
+group_id = 2560
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7538
+group_id = 2560
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7539
+group_id = 2560
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7540
+group_id = 2560
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7541
+group_id = 2560
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7542
+group_id = 2560
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7543
+group_id = 2560
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7544
+group_id = 2560
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7545
+group_id = 2560
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7546
+group_id = 2560
+generate_voice = false
+
+ 
+# group 3 / 1 send / 10 listen
+ 
+[[assets]]
+asset_id = 7556
+group_id = 2559
+generate_voice = true
+
+ 
+[[assets]]
+asset_id = 7557
+group_id = 2559
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7558
+group_id = 2559
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7559
+group_id = 2559
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7560
+group_id = 2559
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7561
+group_id = 2559
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7562
+group_id = 2559
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7563
+group_id = 2559
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7564
+group_id = 2559
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7565
+group_id = 2559
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7566
+group_id = 2559
+generate_voice = false
+
+ 
+# group 4 / 1 send / 10 listen
+ 
+[[assets]]
+asset_id = 7576
+group_id = 2558
+generate_voice = true
+
+ 
+[[assets]]
+asset_id = 7577
+group_id = 2558
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7578
+group_id = 2558
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7579
+group_id = 2558
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7580
+group_id = 2558
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7581
+group_id = 2558
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7582
+group_id = 2558
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7583
+group_id = 2558
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7584
+group_id = 2558
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7585
+group_id = 2558
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7586
+group_id = 2558
+generate_voice = false
+
+ 
+# group 5 / 1 send / 10 listen
+ 
+# group 6 / 1 send / 10 listen
+ 
+# group 7 / 1 send / 10 listen
+ 
+# group 8 / 1 send / 10 listen
+ 
+# group 9 / 1 send / 10 listen
+ 
+# group 10 / 1 send / 10 listen
+ 
+[[assets]]
+asset_id = 7715
+group_id = 2552
+generate_voice = true
+
+ 
+[[assets]]
+asset_id = 7714
+group_id = 2552
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7713
+group_id = 2552
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7712
+group_id = 2552
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7711
+group_id = 2552
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7710
+group_id = 2552
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7709
+group_id = 2552
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7708
+group_id = 2552
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7707
+group_id = 2552
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7706
+group_id = 2552
+generate_voice = false
+
+ 
+[[assets]]
+asset_id = 7705
+group_id = 2552
+generate_voice = false
+
+
+[[assets]]
+asset_id = 7704
+group_id = 2552
+generate_voice = false
+
+
+[[assets]]
+asset_id = 7703
+group_id = 2552
+generate_voice = false
+
+
+[[assets]]
+asset_id = 7702
+group_id = 2552
+generate_voice = false
+
+
+[[assets]]
+asset_id = 7701
+group_id = 2552
+generate_voice = false
+
+
+[[assets]]
+asset_id = 7700
+group_id = 2552
+generate_voice = false
+
+
+[[assets]]
+asset_id = 7699
+group_id = 2552
+generate_voice = false
+
+
+[[assets]]
+asset_id = 7698
+group_id = 2552
+generate_voice = false
+
+
+[[assets]]
+asset_id = 7697
+group_id = 2552
+generate_voice = false
+
+
+[[assets]]
+asset_id = 7696
+group_id = 2552
+generate_voice = false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[sounds]
+tracks = ['1.mp3','2.mp3','3.mp3','4.mp3','5.mp3','6.mp3','7.mp3','8.mp3','9.mp3','10.mp3','11.mp3','12.mp3','13.mp3','14.mp3','15.mp3','16.mp3','17.mp3','18.mp3','19.mp3']

config/dev/default.sergiu.toml

@@ -0,0 +1,28 @@
+[elogs]
+name = 'dev'
+
+[api]
+port = ''
+host = 'node.dev.linx.safemobile.com/api'
+use_secure = true
+accept_untrusted_certs = true
+
+[settings]
+max_fails = 3
+send_group_monitoring_before_each_call = 'false'
+gps_report_interval = ''
+gps_min_interval = 500
+gps_max_interval = 1000
+gps_lat_start_point = 46.217802
+gps_lng_start_point = 24.776126
+delay_between_clients = 500
+testing_duration = 10 # seconds
+ 
+[[assets]]
+asset_id = 60
+group_id = 1
+generate_voice = true
+generate_gps = true
+
+[sounds]
+tracks = ['1.mp3','2.mp3','3.mp3','4.mp3','5.mp3','6.mp3','7.mp3','8.mp3','9.mp3','10.mp3','11.mp3','12.mp3','13.mp3','14.mp3','15.mp3','16.mp3','17.mp3','18.mp3','19.mp3']

config/dev/default.toml

@@ -1,40 +1,440 @@
-[mumble]
-port = '5668'
-host = 'dev.linx.safemobile.com'
-
-[hub]
-address = 'https://hub.dev.linx.safemobile.com/'
-
 [elogs]
 name = 'dev'
 
 [api]
 port = ''
-host = 'dev.linx.safemobile.com/api'
+host = 'node.dev.linx.safemobile.com/api'
 use_secure = true
 accept_untrusted_certs = true
 
 [settings]
 max_fails = 3
-send_group_monitoring_before_each_call = 'true'
+send_group_monitoring_before_each_call = 'false'
-gps_report_interval = 1000 # The interval in which the GPS is sent
+gps_report_interval = ''
+gps_min_interval = 1000
+gps_max_interval = 10000
 gps_lat_start_point = 46.217802
 gps_lng_start_point = 24.776126
-delay_between_clients = 300
+delay_between_clients = 500
-testing_duration = 40 # seconds
+testing_duration = 240 # seconds
 
 
+# group 1 / 1 send / 10 listen
 [[assets]]
-asset_id = 63
+asset_id = 7516
-group_id = 1
+group_id = 2561
 generate_voice = true
 generate_gps = true
-
+ 
 [[assets]]
-asset_id = 64
+asset_id = 7517
-group_id = 1
+group_id = 2561
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7518
+group_id = 2561
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7519
+group_id = 2561
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7520
+group_id = 2561
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7521
+group_id = 2561
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7522
+group_id = 2561
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7523
+group_id = 2561
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7524
+group_id = 2561
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7525
+group_id = 2561
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7526
+group_id = 2561
+generate_voice = false
+generate_gps = true
+ 
+# group 2 / 1 send / 10 listen
+ 
+[[assets]]
+asset_id = 7536
+group_id = 2560
+generate_voice = true
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7537
+group_id = 2560
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7538
+group_id = 2560
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7539
+group_id = 2560
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7540
+group_id = 2560
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7541
+group_id = 2560
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7542
+group_id = 2560
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7543
+group_id = 2560
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7544
+group_id = 2560
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7545
+group_id = 2560
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7546
+group_id = 2560
+generate_voice = false
+generate_gps = true
+ 
+# group 3 / 1 send / 10 listen
+ 
+[[assets]]
+asset_id = 7556
+group_id = 2559
+generate_voice = true
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7557
+group_id = 2559
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7558
+group_id = 2559
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7559
+group_id = 2559
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7560
+group_id = 2559
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7561
+group_id = 2559
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7562
+group_id = 2559
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7563
+group_id = 2559
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7564
+group_id = 2559
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7565
+group_id = 2559
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7566
+group_id = 2559
+generate_voice = false
+generate_gps = true
+ 
+# group 4 / 1 send / 10 listen
+ 
+[[assets]]
+asset_id = 7576
+group_id = 2558
+generate_voice = true
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7577
+group_id = 2558
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7578
+group_id = 2558
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7579
+group_id = 2558
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7580
+group_id = 2558
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7581
+group_id = 2558
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7582
+group_id = 2558
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7583
+group_id = 2558
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7584
+group_id = 2558
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7585
+group_id = 2558
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7586
+group_id = 2558
+generate_voice = false
+generate_gps = true
+ 
+# group 5 / 1 send / 10 listen
+ 
+# group 6 / 1 send / 10 listen
+ 
+# group 7 / 1 send / 10 listen
+ 
+# group 8 / 1 send / 10 listen
+ 
+# group 9 / 1 send / 10 listen
+ 
+# group 10 / 1 send / 10 listen
+ 
+[[assets]]
+asset_id = 7715
+group_id = 2552
+generate_voice = true
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7714
+group_id = 2552
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7713
+group_id = 2552
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7712
+group_id = 2552
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7711
+group_id = 2552
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7710
+group_id = 2552
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7709
+group_id = 2552
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7708
+group_id = 2552
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7707
+group_id = 2552
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7706
+group_id = 2552
+generate_voice = false
+generate_gps = true
+ 
+[[assets]]
+asset_id = 7705
+group_id = 2552
 generate_voice = false
 generate_gps = true
 
+[[assets]]
+asset_id = 7704
+group_id = 2552
+generate_voice = false
+generate_gps = true
+
+[[assets]]
+asset_id = 7703
+group_id = 2552
+generate_voice = false
+generate_gps = true
+
+[[assets]]
+asset_id = 7702
+group_id = 2552
+generate_voice = false
+generate_gps = true
+
+[[assets]]
+asset_id = 7701
+group_id = 2552
+generate_voice = false
+generate_gps = true
+
+[[assets]]
+asset_id = 7700
+group_id = 2552
+generate_voice = false
+generate_gps = true
+
+[[assets]]
+asset_id = 7699
+group_id = 2552
+generate_voice = false
+generate_gps = true
+
+[[assets]]
+asset_id = 7698
+group_id = 2552
+generate_voice = false
+generate_gps = true
+
+[[assets]]
+asset_id = 7697
+group_id = 2552
+generate_voice = false
+generate_gps = true
+
+[[assets]]
+asset_id = 7696
+group_id = 2552
+generate_voice = false
+generate_gps = true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 [sounds]
 tracks = ['1.mp3','2.mp3','3.mp3','4.mp3','5.mp3','6.mp3','7.mp3','8.mp3','9.mp3','10.mp3','11.mp3','12.mp3','13.mp3','14.mp3','15.mp3','16.mp3','17.mp3','18.mp3','19.mp3']

createCA.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+OPENSSL_PATH="/usr/bin" #default install path
+#OPENSSL_PATH="/usr/local/ssl/bin" #workaround for dual openssl install
 
 DAYS=$((10*365))
 LEVELS=1
@@ -12,10 +14,10 @@ OPENSSL_CNF="/etc/ssl/openssl.cnf"
 mkdir -p $CERTS_PATH
 
 #generate root key pair
-openssl genrsa -out "$CERTS_PATH/root-key.pem" 4096
+$OPENSSL_PATH/openssl genrsa -out "$CERTS_PATH/root-key.pem" 4096
 
 #generate root self-signed cert
-openssl req -new -x509 -days $DAYS -key "$CERTS_PATH/root-key.pem" -subj "$DN/CN=Root" -out "$CERTS_PATH/root-cert.pem"
+$OPENSSL_PATH/openssl req -new -x509 -days $DAYS -key "$CERTS_PATH/root-key.pem" -subj "$DN/CN=Root" -out "$CERTS_PATH/root-cert.pem"
 cat "$CERTS_PATH/root-cert.pem" > $CHAIN
 
 
@@ -30,17 +32,17 @@ for i in `seq 1 $LEVELS`; do
     fi
 
     #generate key pair
-    openssl genrsa -out "$CERTS_PATH/ca$i-key.pem" 4096
+    $OPENSSL_PATH/openssl genrsa -out "$CERTS_PATH/ca$i-key.pem" 4096
 
     #generate signing request
-    openssl req -new -key "$CERTS_PATH/ca$i-key.pem" -subj "$DN/CN=Level$i" -out "$CERTS_PATH/ca$i-csr.pem"
+    $OPENSSL_PATH/openssl req -new -key "$CERTS_PATH/ca$i-key.pem" -subj "$DN/CN=Level$i" -out "$CERTS_PATH/ca$i-csr.pem"
 
 echo "-------------"
 echo ">>>>>>>>>>>>>>>>>"$SIGNER_CERT
 echo ">>>>>>>>>>>>>>>>>"$SIGNER_KEY
 
     #sign new cert
-    openssl x509 -req -days $DAYS -in "$CERTS_PATH/ca$i-csr.pem" -CA $SIGNER_CERT -CAkey $SIGNER_KEY \
+    $OPENSSL_PATH/openssl x509 -req -days $DAYS -in "$CERTS_PATH/ca$i-csr.pem" -CA $SIGNER_CERT -CAkey $SIGNER_KEY \
             -set_serial $i -out "$CERTS_PATH/ca$i-cert.pem" -extfile $OPENSSL_CNF -extensions v3_ca
     cat "$CERTS_PATH/ca$i-cert.pem" >> $CHAIN
 echo "-------------"

createCerts.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
-
+OPENSSL_PATH="/usr/bin" #default install path
+#OPENSSL_PATH="/usr/local/ssl/bin" #workaround for dual openssl install
 if test "$#" -ne 1; then
     echo "Error: Wrong parameters --> You must provide the certificate name."
     echo "Please use: ./createCerts.sh 18"
@@ -13,11 +14,11 @@ ID=$1
 CERTS_PATH=certs
 
 #generate key pair
-openssl genrsa -out "$CERTS_PATH/$ID-key.pem" 4096
+$OPENSSL_PATH/openssl genrsa -out "$CERTS_PATH/$ID-key.pem" 4096
 
 #generate signing request
-openssl req -new -key "$CERTS_PATH/$ID-key.pem" -subj "$DN/CN=$ID" -out "$CERTS_PATH/$ID-csr.pem"
+$OPENSSL_PATH/openssl req -new -key "$CERTS_PATH/$ID-key.pem" -subj "$DN/CN=$ID" -out "$CERTS_PATH/$ID-csr.pem"
 
 #sign new cert
-openssl x509 -req -days $DAYS -in "$CERTS_PATH/$ID-csr.pem" -CA "$CERTS_PATH/ca1-cert.pem"  \
+$OPENSSL_PATH/openssl x509 -req -days $DAYS -in "$CERTS_PATH/$ID-csr.pem" -CA "$CERTS_PATH/ca1-cert.pem"  \
     -CAkey "$CERTS_PATH/ca1-key.pem" -set_serial 500 -out "$CERTS_PATH/$ID-cert.pem"

index.js

@@ -6,8 +6,8 @@ const Simulator = require('./src/simulator');
 
 // Read configs.
 let configs = {
-	mumble: config.get('mumble'),
+	// mumble: config.get('mumble'),
-	hub: config.get('hub'),
+	// hub: config.get('hub'),
 	api: config.get('api'),
 	assets: config.get('assets'),
 	sounds: config.get('sounds'),

installOpenSSL1.02.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd /usr/local/
+wget https://www.openssl.org/source/openssl-1.0.2g.tar.gz
+tar -xzvf openssl-1.0.2g.tar.gz
+cd openssl-1.0.2g/
+./config
+make install
+
+/usr/local/ssl/bin/openssl version

src/asset.js

@@ -21,9 +21,14 @@ class Asset {
 	constructor(asset, configs, token) {
 
 		this.id = asset.asset_id;
+		this.mumbleHost = null;
+		this.mumblePort = null;
+		this.murmurUser = null;
+		this.murmurPassword = null;
+		this.hubAddress = null;
 		this.group_id = asset.group_id;
-		this.generate_voice = asset.generate_voice;
+		this.generate_voice = asset.generate_voice || false;
-		this.generate_gps = asset.generate_gps;
+		this.generate_gps = asset.generate_gps || false;
 		this.token = token;
 		this.configs = configs
 		this._processConfigs();
@@ -36,7 +41,9 @@ class Asset {
 
 		// Do async work: Init asset.
 		async.waterfall([
+			this._getConfiguration.bind(this),
 			this._getDataFromApi.bind(this),
+			this._checkGroupToJoin.bind(this),
 			this._connectToHub.bind(this),
 			this._connectToMurmur.bind(this),
 			this._register.bind(this),
@@ -56,12 +63,72 @@ class Asset {
 		});
 	}
 
-	_processConfigs() {
+	_processConfigs(callback) {
 		let apiConfig = this.configs.api;
 		this.apiEndpoint = apiConfig.use_secure ? 'https' : 'http';
 		this.apiEndpoint += '://' +  apiConfig.host + (apiConfig.port ? (':' + apiConfig.port) : '');
 	}
 
+	_getConfiguration(callback) {
+		console.log('_getConfiguration', this.id);
+		Request.get(
+			this.apiEndpoint + '/asset/' + this.id + '/account',
+			{
+				headers: {
+					Authorization: `Bearer ${this.token}`
+				}
+			},
+			(error, response, body) => {
+				if (!error && (response.statusCode === 200 || response.statusCode === 201)) {
+					const bodyObj = JSON.parse(body);
+					const data = bodyObj.data;
+					// console.log('_getConfiguration', data);
+					this.mumbleHost = data.configuration.mumble_address;
+					this.mumblePort = data.configuration.voice_rtp_port;
+					this.murmurUser = bodyObj.data.configuration.mumble_username;
+					this.murmurPassword = bodyObj.data.configuration.mumble_password;
+					this.hubAddress = data.configuration.hub_address;
+					return callback();
+				} else {
+					utils.writeLog(`ERROR | _getConfiguration | response ${JSON.stringify(response)} | body: ${JSON.stringify(body)}`)
+					utils.writeLog(`ERROR | _getConfiguration | Getting informations about asset ${this.id}`, error);
+					utils.writeErrorLog(`ERROR_API | _getConfiguration`);
+					return callback(error);
+				}
+			}
+		);
+	}
+
+	_checkGroupToJoin(callback) {
+		console.log('_checkGroupToJoin', this.id);
+		Request.get(
+			this.apiEndpoint + '/assets/' + this.id + '/groups',
+			{
+				headers: {
+					Authorization: `Bearer ${this.token}`
+				}
+			},
+			(error, response, body) => {
+				if (!error && (response.statusCode === 200 || response.statusCode === 201)) {
+					const bodyObj = JSON.parse(body);
+					const data = bodyObj.data.map(group => group.group_id);
+					if (data.includes(this.group_id)) {
+						utils.writeLog(`Asset ${this.id} have group ${this.group_id}`);
+						return callback();
+					} else {
+						utils.writeLog(`ERROR Asset ${this.id} is not in group ${this.group_id}`);
+						return;
+					}					
+				} else {
+					utils.writeLog(`_checkGroupToJoin | response ${JSON.stringify(response)} | body: ${JSON.stringify(body)}`)
+					utils.writeLog(`ERROR | _checkGroupToJoin | Getting informations about asset ${this.id}`, error);
+					utils.writeErrorLog(`ERROR_API | _checkGroupToJoin`);
+					return callback(error);
+				}
+			}
+		);
+	}
+
 	_getDataFromApi(callback) {
 		utils.writeLog(`Get informations about asset ${this.id}`);
 		Request.get(
@@ -74,39 +141,11 @@ class Asset {
 			(error, response, body) => {
 				if (!error && (response.statusCode === 200 || response.statusCode === 201)) {
 					let bodyObj = JSON.parse(body);
-					// Here are the asset fields.
 					this.assetProps = bodyObj.data;
-					// console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!', this.assetProps)
-					return this._getMumblePassword(callback);
-				} else {
-					utils.writeLog(`ERROR getting informations about asset ${this.id}`, error);
-					utils.writeErrorLog(`ERROR_API`);
-					return callback(error);
-				}
-			}
-		);
-	}
-
-	_getMumblePassword(callback) {
-		utils.writeLog(`Get Mumble password for asset ${this.id}`);
-		Request.get(
-			this.apiEndpoint + '/asset/' + this.id + '/account',
-			{
-				headers: {
-					Authorization: `Bearer ${this.token}`
-				}
-			},
-			(error, response, body) => {
-				if (!error && (response.statusCode === 200 || response.statusCode === 201)) {
-					let bodyObj = JSON.parse(body);
-
-					// Here are the asset fields.
-					this.murmurPassword = bodyObj.data.configuration.mumble_password;
-					// console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!', this.assetProps)
 					return this._getGroupsFromApi(callback);
 				} else {
-					utils.writeLog(`ERROR getting informations about asset ${this.id}`, error);
+					utils.writeLog(`ERROR | _getDataFromApi | Getting informations about asset ${this.id}`, error);
-					utils.writeErrorLog(`ERROR_API`);
+					utils.writeErrorLog(`ERROR_API | _getDataFromApi`);
 					return callback(error);
 				}
 			}
@@ -129,22 +168,33 @@ class Asset {
 
 					this.groups = bodyObj.data;
 
-					// Find what group this asset is monitoring.
+					if (this.group_id) {
-					this.groups.forEach((g) => {
+						this.groups.forEach((g) => {
-						if (g.id === this.group_id) {
+							if (g.id === this.group_id) {
-							this.groupSipId = g.sip_id;
+								this.groupSipId = g.sip_id;
-							this.groupName = g.name;
+								this.groupName = g.name;
-						}
+							}
-					});
+						});
+					} else {
+						this.groups.forEach((g) => {
+							if (g.is_talk_group && g.monitoring.indexOf(this.id) != -1) {
+								this.groupSipId = g.sip_id;
+								this.groupName = g.name;
+								this.group_id = g.id;
+							}
+						})
+					}
 
-					// if (!this.groupId) {
+					if (!this.group_id) {
-					// 	return callback('No talk group assigned to ' + this.id);
+						utils.writeLog(`Group/Default voice group not found for asset: ${this.group_id}`);
-					// }
+					}
+
+					utils.writeLog(`Group: ${this.group_id} found for asset: ${this.id}`);
 					utils.writeLog(`Informations about asset ${this.id} received | groupId: ${this.group_id} | groupName: ${this.groupName}`);
 					return callback();
 				} else {
-					utils.writeLog(`Error getting informations about asset ${this.id}`, error);
+					utils.writeLog(`ERROR | _getGroupsFromApi | Getting informations about asset ${this.id}`, error);
-					utils.writeErrorLog(`ERROR_API`);
+					utils.writeErrorLog(`ERROR_API | _getGroupsFromApi`);
 					return callback(error);
 				}
 			}
@@ -152,10 +202,8 @@ class Asset {
 	}
 
 	_connectToHub(callback) {
-
-		let hubAddress = this.configs.hub.address;
 		let options = {rejectUnauthorized: false, secure: true};
-		let hub = io(hubAddress, options);
+		let hub = io(this.hubAddress, options);
 		this.hub = hub;
 
 		// Disconnect event
@@ -165,12 +213,12 @@ class Asset {
 
 		hub.on('connect_timeout', () => {
 			utils.writeLog(`Asset ${this.id} connect_timeout from HUB`);
-			utils.writeErrorLog(`ERROR_HUB`);
+			utils.writeErrorLog(`ERROR_HUB | _connectToHub`);
 		});
 
 		hub.on('connect_error', () => {
 			utils.writeLog(`Asset ${this.id} connect_error from HUB`);
-			utils.writeErrorLog(`ERROR_HUB`);
+			utils.writeErrorLog(`ERROR_HUB | _connectToHub`);
 		});
 
 		hub.once('connect', () => {
@@ -210,19 +258,24 @@ class Asset {
 	}
 
 	_connectToMurmur(callback) {
-		console.log(`Asset ${this.id} connecting to Murmur`);
+		if (!this.group_id) { return callback(); }
-		this.configs.murmurPassword = this.murmurPassword;
 
-		this.mumble = new Mumble(this.id, this.configs, (err) => {
+		console.log(`Asset ${this.id} connecting to Murmur`);
+		const murmurConnectionDetails = {
+			mumbleHost: this.mumbleHost,
+			mumblePort: this.mumblePort,
+			murmurUser: this.murmurUser,
+			murmurPassword: this.murmurPassword
+		};
+		this.mumble = new Mumble(this.id, murmurConnectionDetails, (err) => {
 			if (err) {
-				utils.writeLog(`Asset ${this.id} Murmur connection error`, err);
+				utils.writeLog(`ERROR | _connectToMurmur | Asset ${this.id} Murmur connection error`, err);
-				utils.writeErrorLog(`ERROR_MURMUR`);
+				utils.writeErrorLog(`ERROR_MURMUR | _connectToMurmur`);
 				return callback(err);
 			} else {
-				// return callback();
 				setTimeout(()=> {
 					return callback();
-				}, 400);
+				}, 500);
 			}
 		});
 	}
@@ -241,13 +294,9 @@ class Asset {
 					utils.writeLog(`Asset ${this.id} audio registered`);
 					return callback();
 				} else {
-					console.log('_register--------------------')
+					utils.writeLog(`ERROR | _register | Asset ${this.id} audio registered error`, error);
-					console.log('error---', error)
+					utils.writeErrorLog(`ERROR_AUDIO | _register`);
-					// console.log('response---', response)
+					return callback(error);
-					console.log('body---', body)
-					// utils.writeLog(`Asset ${this.id} audio registered error`, error);
-					// utils.writeErrorLog(`ERROR_API`);
-					// return callback(error);
 				}
 			}
 		);
@@ -286,21 +335,26 @@ class Asset {
 						if (callback) return callback('Cannot send group-monitoring: Hub not connected');
 					}
 				} else {
-					console.log('_moveToChannel--------------------')
+					utils.writeLog(`ERROR | _moveToChannel | Asset ${this.id} audio enter group error`, error);
-					console.log('error---', error)
+					utils.writeErrorLog(`ERROR_AUDIO | _moveToChannel`);
-					// console.log('response---', response)
+					return callback(error);
-					console.log('body---', body)
-					// utils.writeLog(`Asset ${this.id} audio enter group error`, error);
-					// utils.writeErrorLog(`ERROR_API`);
-					// return callback(error);
 				}
 			}
 		);
 	}
 
 	_start() {
-		this.generate_voice && this._makePtt();
+		this.generate_voice && this._makePtt(); // Generate voce
-		this.generate_gps && this._sendGPS();
+		this.generate_gps && this._sendGPS(); // Generate GPS
+		this._measuringTestTime();	// Process exit base on this.endTime and current date
+	}
+
+	_measuringTestTime() {
+		setInterval(() => {
+			if(Date.now() > this.endTime + 18000) {
+				process.exit(0)
+			}
+		}, 1000);
 	}
 
 	_verifyRecorder(callback) {
@@ -343,8 +397,8 @@ class Asset {
 						console.log(chalk.yellow(`[RECORDER] for asset ${this.id} not found`));
 					}
 				} else {
-					utils.writeLog(`Error getting record for asset ${this.id} | ${error}`);
+					utils.writeLog(`ERROR | _getRecord | Error getting record for asset ${this.id} | ${error}`);
-					utils.writeErrorLog(`ERROR_RECORDER`);
+					utils.writeErrorLog(`ERROR_RECORDER | _getRecord`);
 				}
 				let assetIds = configs.assets.ids;
 
@@ -413,19 +467,12 @@ class Asset {
 					this.pttEndSuccessfully = true;
 					setTimeout(() => {
 						this._sendPttRelease();
-						const now = +new Date();
+						if(this.endTime > +new Date()) {
-						if(this.endTime > now) {
+							this._makePtt(callback);
-							this._makePtt();
 						} else {
-
+							utils.writeLog(`Asset ${this.id} Voice sleeping...`);
-							setTimeout(() => {
-								utils.writeLog(`Asset: ${this.id} - STOP`)
-								.then(() => {
-									process.exit(0);
-								});
-							}, 10000);
 						}
-					}, 1800); // Hangtime
+					}, 1500); // Hangtime
 				});
 
 				// @TODO: Ugly hack for the voice to work with mp3 (The fix is to remove float32ToInt16 conversion). It is the _transform function from OpusEncoderStream class (mumble-client-codecs-node project).
@@ -487,42 +534,45 @@ class Asset {
 		})
 	}
 
-	_sendGPS(callback) {
+	_sendGPS() {
 		let hub = this.hub;
 		if (hub && hub.connected) {
 			let lat = this.configs.settings.gps_lat_start_point;
 			let lng = this.configs.settings.gps_lng_start_point;
+			const max = this.configs.settings.gps_max_interval;
+			const min = this.configs.settings.gps_min_interval;
 
-			setInterval(() => {
+			let interval = null;
-				const now = +new Date();
+			if (!this.configs.settings.gps_report_interval) {
-				if(this.endTime > now) {
+				interval = Math.floor(Math.random() * (max - min + 1) + min);
-					var new_lat = this._randomCoordinates(lat);
+			} else {
-					var new_lng = this._randomCoordinates(lng);
+				interval = this.configs.settings.gps_report_interval;
+			}
 
-					hub.emit('gps', JSON.stringify(
+			const now = +new Date();
-						{
+			if(this.endTime > now) {
-							unix_time: 1467126677000,
+				var new_lat = this._randomCoordinates(lat);
-							asset_id: this.assetProps.id,
+				var new_lng = this._randomCoordinates(lng);
-							asset_sip_id: this.assetProps.sip_id,
+
-							speed_kmh: 16,
+				hub.emit('gps', JSON.stringify(
-							lat: new_lat,
+					{
-							lng: new_lng,
+						unix_time: 1467126677000,
-							accuracy: 20.3,
+						asset_id: this.assetProps.id,
-							activity_type: "driving",
+						asset_sip_id: this.assetProps.sip_id,
-							activity_confidence: 90
+						speed_kmh: 16,
-						}
+						lat: new_lat,
-					));
+						lng: new_lng,
-					lat = new_lat;
+						accuracy: 20.3,
-					lng = new_lng;
+						activity_type: "driving",
-				} else {
+						activity_confidence: 90
-					setTimeout(() => {
+					}
-						utils.writeLog(`Asset: ${this.id} - STOP`)
+				));
-						.then(() => {
+				lat = new_lat;
-							process.exit(0);
+				lng = new_lng;
-						});
+				setTimeout(() => { this._sendGPS(); }, interval);
-					}, 11000);
+			} else {
-				}
+				utils.writeLog(`Asset ${this.id} GPS sleeping...`);
-			}, this.configs.settings.gps_report_interval);
+			}
 		}
 	}
 

src/mumble.js

@@ -11,12 +11,19 @@ const OpusEncoder = require('node-opus').OpusEncoder;
 
 class Mumble {
 	
-	constructor(id, configs, connectedCallback) {
+	constructor(id, murmurConnectionDetails, connectedCallback) {
 		this.id = id;
-		this.configs = configs;
+		this.mumbleHost = murmurConnectionDetails.mumbleHost;
-		let mumble = configs.mumble;
+		this.mumblePort = murmurConnectionDetails.mumblePort;
+		this.murmurUser = murmurConnectionDetails.murmurUser;
+		this.murmurPassword = murmurConnectionDetails.murmurPassword;
+		// console.log('mumbleHost', this.mumbleHost)
+		// console.log('mumblePort', this.mumblePort)
+		// console.log('murmurUser', this.murmurUser)
+		// console.log('murmurPassword', this.murmurPassword)
+
 		this._createCertificatesForUser(id, () => {
-			this._makeMumbleConnection(id, mumble.port, mumble.host, id, this.configs.murmurPassword, connectedCallback);
+			this._makeMumbleConnection(id, this.mumblePort, this.mumbleHost, id, this.murmurPassword, connectedCallback);
 		})
 	}
 

src/simulator.js

@@ -36,19 +36,11 @@ class Simulator {
 	_start() {
 		const settings = this.configs.settings;
 
-		// this.assetIds.forEach((id, i) => {
 		this.assets.forEach((asset, i) => {
-			let delay_between_clients = 500;
+			console.log('asset_id', asset.asset_id, i * settings.delay_between_clients + 'ms');
-			if(settings.hasOwnProperty('delay_between_clients')) {
-				delay_between_clients = parseInt(settings.delay_between_clients, 10);
-			}
-			console.log('asset_id', asset.asset_id, i * delay_between_clients+'ms')
-
-			delay_between_clients = this._getRandomInt(delay_between_clients);
 			setTimeout(() => {
 				new Asset(asset, this.configs, this.token);
-				// console.log('id, this.configs, this.token', id, this.configs, this.token)
+			}, i * settings.delay_between_clients);
-			}, i * delay_between_clients);
 		})
 	}