Skip to content
This repository has been archived by the owner on Oct 11, 2023. It is now read-only.

Commit

Permalink
Merge argument fix with device id check
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre Cauchois committed Nov 29, 2017
2 parents a1aa606 + ff43855 commit 761d87a
Showing 1 changed file with 85 additions and 68 deletions.
153 changes: 85 additions & 68 deletions iothub-explorer-monitor-events.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

'use strict';

var Registry = require('azure-iothub').Registry;

// external dependencies
var program = require('commander');
var colorsTmpl = require('colors-tmpl');
Expand All @@ -24,85 +26,100 @@ program
.option('-st, --start-time <start-time>', 'Specify the time that should be used as a starting point to read messages in the partitions (number of milliseconds since epoch or ISO-8601 string)')
.parse(process.argv);

if(!program.login) inputError('You must provide a connection string using the --login argument.');
if (!program.login) inputError('You must provide a connection string using the --login argument.');

var deviceId = program.args[0];
var connectionString = program.login;

if(!program.raw) {
if (deviceId) {
console.log(colorsTmpl('\n{grey}Monitoring events from device {green}' + deviceId + '{/green}...{/grey}'));
} else {
console.log(colorsTmpl('\n{grey}Monitoring events from all devices...{/grey}'));
var monitorEvents = function () {
if (!program.raw) {
if (deviceId) {
console.log(colorsTmpl('\n{grey}Monitoring events from device {green}' + deviceId + '{/green}...{/grey}'));
} else {
console.log(colorsTmpl('\n{grey}Monitoring events from all devices...{/grey}'));
}
}
}

var consumerGroup = program.consumerGroup || '$Default';
var startTime = program.startTime ?
isNaN(program.startTime) ? new Date(program.startTime) : new Date(parseInt(program.startTime)) :
Date.now();

var ehClient = EventHubsClient.fromConnectionString(connectionString);
ehClient.open()
.then(ehClient.getPartitionIds.bind(ehClient))
.then(function (partitionIds) {
return partitionIds.map(function (partitionId) {
return ehClient.createReceiver(consumerGroup, partitionId, { 'startAfterTime' : startTime}).then(function(receiver) {
receiver.on('errorReceived', function (error) {
serviceError(error.message);
});
receiver.on('message', function (eventData) {
var from = eventData.annotations['iothub-connection-device-id'];
var raw = program.raw;
if (!deviceId || (deviceId && from === deviceId)) {
if (!raw) console.log('==== From: ' + from + ' ====');
if (eventData.body instanceof Buffer) {
console.log(eventData.body.toString());
} else if (typeof eventData.body === 'string') {
console.log(JSON.stringify(eventData.body));
} else {
if (!raw) {
console.log(JSON.stringify(eventData.body, null, 2));
} else {
console.log(JSON.stringify(eventData.body));
}
}
var consumerGroup = program.consumerGroup || '$Default';
var startTime = program.startTime ?
isNaN(program.startTime) ? new Date(program.startTime) : new Date(parseInt(program.startTime)) :
Date.now();

var ehClient = EventHubsClient.fromConnectionString(connectionString);
ehClient.open()
.then(ehClient.getPartitionIds.bind(ehClient))
.then(function (partitionIds) {
return partitionIds.map(function (partitionId) {
return ehClient.createReceiver(consumerGroup, partitionId, { 'startAfterTime': startTime }).then(function (receiver) {
receiver.on('errorReceived', function (error) {
serviceError(error.message);
});
receiver.on('message', function (eventData) {
var from = eventData.annotations['iothub-connection-device-id'];
var raw = program.raw;
if (!deviceId || (deviceId && from === deviceId)) {
if (!raw) console.log('==== From: ' + from + ' ====');
if (eventData.body instanceof Buffer) {
console.log(eventData.body.toString());
} else if (typeof eventData.body === 'string') {
console.log(JSON.stringify(eventData.body));
} else {
if (!raw) {
console.log(JSON.stringify(eventData.body, null, 2));
} else {
console.log(JSON.stringify(eventData.body));
}
}

if (program.verbose) {
if (eventData.annotations) {
if (!raw) {
console.log('---- annotations ----');
console.log(JSON.stringify(eventData.annotations, null, 2));
} else {
console.log(JSON.stringify(eventData.annotations));
}
}

if (eventData.properties) {
if (!raw) {
console.log('---- properties ----');
console.log(JSON.stringify(eventData.properties, null, 2));
} else {
console.log(JSON.stringify(eventData.properties));
}
}
if (program.verbose) {
if (eventData.annotations) {
if (!raw) {
console.log('---- annotations ----');
console.log(JSON.stringify(eventData.annotations, null, 2));
} else {
console.log(JSON.stringify(eventData.annotations));
}
}

if (eventData.applicationProperties) {
if (!raw) {
console.log('---- application properties ----');
console.log(JSON.stringify(eventData.applicationProperties, null, 2));
} else {
console.log(JSON.stringify(eventData.applicationProperties));
}
if (eventData.properties) {
if (!raw) {
console.log('---- properties ----');
console.log(JSON.stringify(eventData.properties, null, 2));
} else {
console.log(JSON.stringify(eventData.properties));
}
}
}

if (!raw) console.log('====================');
if (eventData.applicationProperties) {
if (!raw) {
console.log('---- application properties ----');
console.log(JSON.stringify(eventData.applicationProperties, null, 2));
} else {
console.log(JSON.stringify(eventData.applicationProperties));
}
});
});
}

if (!raw) console.log('====================');
}
});
})
.catch(function (error) {
serviceError(error.message);
});
});
})
.catch(function (error) {
serviceError(error.message);
});
};

if (deviceId) {
var registry = Registry.fromConnectionString(connectionString);
registry.get(deviceId, function (err) {
if (err) serviceError(err);
else {
monitorEvents();
}
});
}
else {
monitorEvents();
}

0 comments on commit 761d87a

Please sign in to comment.