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.toml

@@ -369,96 +369,58 @@ generate_voice = false
 generate_gps = true
 
 [[assets]]
-asset_id = 7796
+asset_id = 7704
-group_id = 2557
+group_id = 2552
+generate_voice = false
+generate_gps = true
 
 [[assets]]
-asset_id = 7797
+asset_id = 7703
-group_id = 2557
+group_id = 2552
+generate_voice = false
+generate_gps = true
 
 [[assets]]
-asset_id = 7798
+asset_id = 7702
-group_id = 2557
+group_id = 2552
+generate_voice = false
+generate_gps = true
 
 [[assets]]
-asset_id = 7799
+asset_id = 7701
-group_id = 2557
+group_id = 2552
+generate_voice = false
+generate_gps = true
 
 [[assets]]
-asset_id = 7800
+asset_id = 7700
-group_id = 2557
+group_id = 2552
+generate_voice = false
+generate_gps = true
 
 [[assets]]
-asset_id = 7801
+asset_id = 7699
-group_id = 2557
+group_id = 2552
+generate_voice = false
+generate_gps = true
 
 [[assets]]
-asset_id = 7802
+asset_id = 7698
-group_id = 2557
+group_id = 2552
+generate_voice = false
+generate_gps = true
 
 [[assets]]
-asset_id = 7803
+asset_id = 7697
-group_id = 2557
+group_id = 2552
+generate_voice = false
+generate_gps = true
 
 [[assets]]
-asset_id = 7804
+asset_id = 7696
-group_id = 2557
+group_id = 2552
-
+generate_voice = false
-[[assets]]
+generate_gps = true
-asset_id = 7805
-group_id = 2557
-
-[[assets]]
-asset_id = 7806
-group_id = 2557
-
-[[assets]]
-asset_id = 7817
-group_id = 2556
-
-[[assets]]
-asset_id = 7818
-group_id = 2556
-
-[[assets]]
-asset_id = 7819
-group_id = 2556
-
-[[assets]]
-asset_id = 7820
-group_id = 2556
-
-[[assets]]
-asset_id = 7821
-group_id = 2556
-
-[[assets]]
-asset_id = 7822
-group_id = 2556
-
-[[assets]]
-asset_id = 7823
-group_id = 2556
-
-[[assets]]
-asset_id = 7824
-group_id = 2556
-
-[[assets]]
-asset_id = 7825
-group_id = 2556
-
-[[assets]]
-asset_id = 7826
-group_id = 2556
-
-[[assets]]
-asset_id = 7827
-group_id = 2556
-
-
-
-
 
 
 

src/asset.js

@@ -90,8 +90,8 @@ class Asset {
 					this.hubAddress = data.configuration.hub_address;
 					return callback();
 				} else {
-					utils.writeLog(`_getConfiguration | response ${JSON.stringify(response)} | body: ${JSON.stringify(body)}`)
+					utils.writeLog(`ERROR | _getConfiguration | response ${JSON.stringify(response)} | body: ${JSON.stringify(body)}`)
-					utils.writeLog(`ERROR getting informations about asset ${this.id}`, error);
+					utils.writeLog(`ERROR | _getConfiguration | Getting informations about asset ${this.id}`, error);
 					utils.writeErrorLog(`ERROR_API | _getConfiguration`);
 					return callback(error);
 				}
@@ -121,7 +121,7 @@ class Asset {
 					}					
 				} else {
 					utils.writeLog(`_checkGroupToJoin | response ${JSON.stringify(response)} | body: ${JSON.stringify(body)}`)
-					utils.writeLog(`ERROR getting informations about asset ${this.id}`, error);
+					utils.writeLog(`ERROR | _checkGroupToJoin | Getting informations about asset ${this.id}`, error);
 					utils.writeErrorLog(`ERROR_API | _checkGroupToJoin`);
 					return callback(error);
 				}
@@ -144,7 +144,7 @@ class Asset {
 					this.assetProps = bodyObj.data;
 					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 | _getDataFromApi`);
 					return callback(error);
 				}
@@ -186,14 +186,14 @@ class Asset {
 					}
 
 					if (!this.group_id) {
-						utils.writeErrorLog(`Group/Default voice group not found for asset: ${this.group_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 | _getGroupsFromApi`);
 					return callback(error);
 				}
@@ -269,7 +269,7 @@ class Asset {
 		};
 		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 | _connectToMurmur`);
 				return callback(err);
 			} else {
@@ -294,8 +294,7 @@ class Asset {
 					utils.writeLog(`Asset ${this.id} audio registered`);
 					return callback();
 				} else {
-					console.log('body', body)
+					utils.writeLog(`ERROR | _register | Asset ${this.id} audio registered error`, error);
-					utils.writeLog(`Asset ${this.id} audio registered error`, error);
 					utils.writeErrorLog(`ERROR_AUDIO | _register`);
 					return callback(error);
 				}
@@ -336,7 +335,7 @@ class Asset {
 						if (callback) return callback('Cannot send group-monitoring: Hub not connected');
 					}
 				} else {
-					utils.writeLog(`Asset ${this.id} audio enter group error`, error);
+					utils.writeLog(`ERROR | _moveToChannel | Asset ${this.id} audio enter group error`, error);
 					utils.writeErrorLog(`ERROR_AUDIO | _moveToChannel`);
 					return callback(error);
 				}
@@ -389,7 +388,7 @@ 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 | _getRecord`);
 				}
 				let assetIds = configs.assets.ids;
@@ -461,7 +460,7 @@ class Asset {
 						this._sendPttRelease();
 						const now = +new Date();
 						if(this.endTime > now) {
-							this._makePtt();
+							this._makePtt(callback);
 						} else {
 
 							setTimeout(() => {