Refactor to not use getters but object

Author: tdeekens

lib/core/symbols.js

@@ -64,6 +64,5 @@ module.exports = {
   kMaxConcurrentStreams: Symbol('max concurrent streams'),
   kNoProxyAgent: Symbol('no proxy agent'),
   kHttpProxyAgent: Symbol('http proxy agent'),
-  kHttpsProxyAgent: Symbol('https proxy agent'),
-  kStats: Symbol('stats')
+  kHttpsProxyAgent: Symbol('https proxy agent')
 }

lib/dispatcher/client.js

@@ -52,8 +52,7 @@ const {
   kOnError,
   kHTTPContext,
   kMaxConcurrentStreams,
-  kResume,
-  kStats
+  kResume
 } = require('../core/symbols.js')
 const connectH1 = require('./client-h1.js')
 const connectH2 = require('./client-h2.js')
@@ -251,8 +250,6 @@ class Client extends DispatcherBase {
 
     this[kResume] = (sync) => resume(this, sync)
     this[kOnError] = (err) => onError(this, err)
-
-    this[kStats] = new ClientStats(this)
   }
 
   get pipelining () {
@@ -265,7 +262,7 @@ class Client extends DispatcherBase {
   }
 
   get stats () {
-    return this[kStats]
+    return new ClientStats(this)
   }
 
   get [kPending] () {

lib/dispatcher/pool-base.js

@@ -3,7 +3,7 @@
 const { PoolStats } = require('../util/stats.js')
 const DispatcherBase = require('./dispatcher-base')
 const FixedQueue = require('./fixed-queue')
-const { kConnected, kSize, kRunning, kPending, kQueued, kBusy, kFree, kUrl, kClose, kDestroy, kDispatch, kStats } = require('../core/symbols')
+const { kConnected, kSize, kRunning, kPending, kQueued, kBusy, kFree, kUrl, kClose, kDestroy, kDispatch } = require('../core/symbols')
 
 const kClients = Symbol('clients')
 const kNeedDrain = Symbol('needDrain')
@@ -66,8 +66,6 @@ class PoolBase extends DispatcherBase {
     this[kOnConnectionError] = (origin, targets, err) => {
       pool.emit('connectionError', origin, [pool, ...targets], err)
     }
-
-    this[kStats] = new PoolStats(this)
   }
 
   get [kBusy] () {
@@ -107,7 +105,7 @@ class PoolBase extends DispatcherBase {
   }
 
   get stats () {
-    return this[kStats]
+    return new PoolStats(this)
   }
 
   async [kClose] () {

lib/util/stats.js

@@ -9,58 +9,23 @@ const {
   kQueued
 } = require('../core/symbols')
 
-const kPool = Symbol('pool')
-const kClient = Symbol('client')
-
 class ClientStats {
   constructor (client) {
-    this[kClient] = client
-  }
-
-  get connected () {
-    return this[kClient][kConnected]
-  }
-
-  get pending () {
-    return this[kClient][kPending]
-  }
-
-  get running () {
-    return this[kClient][kRunning]
-  }
-
-  get size () {
-    return this[kClient][kSize]
+    this.connected = client[kConnected]
+    this.pending = client[kPending]
+    this.running = client[kRunning]
+    this.size = client[kSize]
   }
 }
 
 class PoolStats {
   constructor (pool) {
-    this[kPool] = pool
-  }
-
-  get connected () {
-    return this[kPool][kConnected]
-  }
-
-  get free () {
-    return this[kPool][kFree]
-  }
-
-  get pending () {
-    return this[kPool][kPending]
-  }
-
-  get queued () {
-    return this[kPool][kQueued]
-  }
-
-  get running () {
-    return this[kPool][kRunning]
-  }
-
-  get size () {
-    return this[kPool][kSize]
+    this.connected = pool[kConnected]
+    this.free = pool[kFree]
+    this.pending = pool[kPending]
+    this.queued = pool[kQueued]
+    this.running = pool[kRunning]
+    this.size = pool[kSize]
   }
 }