diff --git a/apps/nocapd/src/classes/Worker.js b/apps/nocapd/src/classes/Worker.js index 8170c86a..bc0f6b88 100644 --- a/apps/nocapd/src/classes/Worker.js +++ b/apps/nocapd/src/classes/Worker.js @@ -150,7 +150,7 @@ export class NWWorker { this.log.info( `[${chalk.bgBlack(this.calculateProgress())}] `+ `${mute(this.processed)}/${mute(this.total)} `+ - `${url}: ${result?.connect?.data? success("online"): failure("offline")} `+ + `${url}: ${result?.connect?.data === true? success("online"): failure("offline")} ${result?.read?.data === true? success("readable"): failure("unreadable")} ${result?.write?.data === true? success("writable"): failure("unwritable")} `+ `${(result?.connect?.duration+result?.read?.duration+result?.write?.duration)/1000} seconds `+ `${error? chalk.gray.italic('error'): ''}`) } @@ -437,5 +437,4 @@ const eventDataFromResult = result => { const k30066 = ev30066(translated) const k30166 = ev30166(translated) return [ k30066, k30166 ] -} - +} \ No newline at end of file diff --git a/packages/publisher/src/kinds/Kind30066.js b/packages/publisher/src/kinds/Kind30066.js index 16709c37..fba87b2b 100644 --- a/packages/publisher/src/kinds/Kind30066.js +++ b/packages/publisher/src/kinds/Kind30066.js @@ -54,11 +54,11 @@ export class Kind30066 extends Publisher { tags.push( ['other', 'network', data.network] ) if(isRtt) { - if(data.connect) + if(data.connect?.data && data.connect?.duration > 0) tags.push([ 'rtt', 'open', data.connect.duration.toString() ]) - if(data?.read) + if(data.read?.data && data?.read?.duration > 0) tags.push([ 'rtt', 'read', data.read.duration.toString() ]) - if(data?.write) + if(data.write?.data && data?.write?.duration > 0) tags.push([ 'rtt', 'write', data.write.duration.toString() ]) }