fixup

lib/agent.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { InvalidArgumentError } = require('./core/errors')
-const { kClients, kRunning } = require('./core/symbols')
+const { kClients, kRunning, kClose, kDestroy } = require('./core/symbols')
 const DispatcherBase = require('./dispatcher-base')
 const Pool = require('./pool')
 const Client = require('./client')
@@ -117,7 +117,7 @@ class Agent extends DispatcherBase {
     return dispatcher.dispatch(opts, handler)
   }
 
-  async _close () {
+  async [kClose] () {
     const closePromises = []
     for (const ref of this[kClients].values()) {
       const client = ref.deref()
@@ -130,7 +130,7 @@ class Agent extends DispatcherBase {
     await Promise.all(closePromises)
   }
 
-  async _destroy (err) {
+  async [kDestroy] (err) {
     const destroyPromises = []
     for (const ref of this[kClients].values()) {
       const client = ref.deref()

lib/client.js

@@ -58,7 +58,9 @@ const {
   kConnector,
   kMaxRedirections,
   kMaxRequests,
-  kCounter
+  kCounter,
+  kClose,
+  kDestroy
 } = require('./core/symbols')
 
 const kClosedResolve = Symbol('kClosedResolve')
@@ -279,7 +281,7 @@ class Client extends DispatcherBase {
     return this[kNeedDrain] < 2
   }
 
-  async _close () {
+  async [kClose] () {
     return new Promise((resolve) => {
       if (!this[kSize]) {
         this.destroy(resolve)
@@ -289,7 +291,7 @@ class Client extends DispatcherBase {
     })
   }
 
-  async _destroy (err) {
+  async [kDestroy] (err) {
     return new Promise((resolve) => {
       const requests = this[kQueue].splice(this[kPendingIdx])
       for (let i = 0; i < requests.length; i++) {

lib/core/symbols.js

@@ -1,4 +1,6 @@
 module.exports = {
+  kClose: Symbol('close'),
+  kDestroy: Symbol('destroy'),
   kUrl: Symbol('url'),
   kWriting: Symbol('writing'),
   kResuming: Symbol('resuming'),

lib/dispatcher-base.js

@@ -6,6 +6,7 @@ const {
   ClientClosedError,
   InvalidArgumentError
 } = require('./core/errors')
+const { kDestroy, kClose } = require('./core/symbols')
 
 const kDestroyed = Symbol('destroyed')
 const kClosed = Symbol('closed')
@@ -69,7 +70,7 @@ class DispatcherBase extends Dispatcher {
     }
 
     // Should not error.
-    this._close()
+    this[kClose]()
       .then(() => this.destroy())
       .then(() => {
         queueMicrotask(onClosed)
@@ -119,7 +120,7 @@ class DispatcherBase extends Dispatcher {
     }
 
     // Should not error.
-    this._destroy(err).then(() => {
+    this[kDestroy](err).then(() => {
       queueMicrotask(onDestroyed)
     })
   }

lib/pool-base.js

@@ -2,7 +2,7 @@
 
 const DispatcherBase = require('./dispatcher-base')
 const FixedQueue = require('./node/fixed-queue')
-const { kConnected, kSize, kRunning, kPending, kQueued, kBusy, kFree, kUrl } = require('./core/symbols')
+const { kConnected, kSize, kRunning, kPending, kQueued, kBusy, kFree, kUrl, kClose, kDestroy } = require('./core/symbols')
 const PoolStats = require('./pool-stats')
 
 const kClients = Symbol('clients')
@@ -111,7 +111,7 @@ class PoolBase extends DispatcherBase {
     return this[kStats]
   }
 
-  async _close () {
+  async [kClose] () {
     if (this[kQueue].isEmpty()) {
       return Promise.all(this[kClients].map(c => c.close()))
     } else {
@@ -121,7 +121,7 @@ class PoolBase extends DispatcherBase {
     }
   }
 
-  async _destroy (err) {
+  async [kDestroy] (err) {
     while (true) {
       const item = this[kQueue].shift()
       if (!item) {

lib/proxy-agent.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { kProxy } = require('./core/symbols')
+const { kProxy, kClose, kDestroy } = require('./core/symbols')
 const { URL } = require('url')
 const Agent = require('./agent')
 const DispatcherBase = require('./dispatcher-base')
@@ -31,11 +31,11 @@ class ProxyAgent extends DispatcherBase {
     )
   }
 
-  async _close () {
+  async [kClose] () {
     await this[kAgent].close()
   }
 
-  async _destroy () {
+  async [kDestroy] () {
     await this[kAgent].destroy()
   }
 }