chore: upgrade human-to-milliseconds (#2213)

* chore: upgrade human to milliseconds

* chore: add clearInterval if stream ended

package.json

@@ -89,7 +89,7 @@
     "glob": "^7.1.3",
     "hapi-pino": "^6.0.0",
     "hashlru": "^2.3.0",
-    "human-to-milliseconds": "^1.0.0",
+    "human-to-milliseconds": "^2.0.0",
     "interface-datastore": "~0.6.0",
     "ipfs-bitswap": "~0.24.1",
     "ipfs-block": "~0.8.1",

src/core/components/name.js

@@ -109,9 +109,20 @@ module.exports = function name (self) {
         return callback(err)
       }
 
+      let pubLifetime
+      try {
+        pubLifetime = human(lifetime)
+
+        // Calculate lifetime with nanoseconds precision
+        pubLifetime = pubLifetime.toFixed(6)
+      } catch (err) {
+        log.error(err)
+        return callback(err)
+      }
+
+      // TODO: ttl human for cache
+
       parallel([
-        (cb) => human(lifetime, cb),
-        // (cb) => ttl ? human(ttl, cb) : cb(),
         (cb) => keyLookup(self, key, cb),
         // verify if the path exists, if not, an error will stop the execution
         (cb) => resolve.toString() === 'true' ? path.resolvePath(self, value, cb) : cb()
@@ -121,16 +132,8 @@ module.exports = function name (self) {
           return callback(err)
         }
 
-        // Calculate lifetime with nanoseconds precision
-        const pubLifetime = results[0].toFixed(6)
-        const privateKey = results[1]
-
-        // TODO IMPROVEMENT - Handle ttl for cache
-        // const ttl = results[1]
-        // const privateKey = results[2]
-
         // Start publishing process
-        self._ipns.publish(privateKey, value, pubLifetime, callback)
+        self._ipns.publish(results[0], value, pubLifetime, callback)
       })
     }),
 

src/core/components/stats.js

@@ -49,17 +49,26 @@ module.exports = function stats (self) {
     })
 
     if (opts.poll) {
-      human(opts.interval || '1s', (err, value) => {
-        if (err) {
-          return stream.end(errCode(err, 'ERR_INVALID_POLL_INTERVAL'))
-        }
+      let value
+      try {
+        value = human(opts.interval || '1s')
+      } catch (err) {
+        // Pull stream expects async work, so we need to simulate it.
+        process.nextTick(() => {
+          stream.end(errCode(err, 'ERR_INVALID_POLL_INTERVAL'))
+        })
+      }
 
-        interval = setInterval(() => {
-          bandwidthStats(self, opts)
-            .then((stats) => stream.push(stats))
-            .catch((err) => stream.end(err))
-        }, value)
-      })
+      interval = setInterval(() => {
+        bandwidthStats(self, opts)
+          .then((stats) => stream.push(stats))
+          .catch((err) => {
+            if (interval) {
+              clearInterval(interval)
+            }
+            stream.end(err)
+          })
+      }, value)
     } else {
       bandwidthStats(self, opts)
         .then((stats) => {