fix: bundle size (#46)

* fix: reduce bundle size

* fix: update deps

* fix: fix lint

* chore: update deps

package.json

@@ -37,16 +37,14 @@
     "labs"
   ],
   "engines": {
-    "node": ">=4.0.0",
-    "npm": ">=3.0.0"
+    "node": ">=10.0.0",
+    "npm": ">=6.0.0"
   },
   "license": "MIT",
   "dependencies": {
     "interface-connection": "~0.3.2",
     "async": "^2.6.0",
-    "debug": "^3.1.0",
-    "lodash.isfunction": "^3.0.9",
-    "lodash.range": "^3.2.0",
+    "debug": "^4.1.0",
     "once": "^1.4.0",
     "pull-handshake": "^1.1.4",
     "pull-length-prefixed": "^1.3.1",
@@ -55,11 +53,11 @@
     "varint": "^5.0.0"
   },
   "devDependencies": {
-    "aegir": "^15.1.0",
+    "aegir": "^18.0.3",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
     "libp2p-multiplex": "~0.5.1",
-    "libp2p-spdy": "~0.12.1",
+    "libp2p-spdy": "~0.13.1",
     "pull-pair": "^1.1.0",
     "pump": "^3.0.0",
     "run-parallel": "^1.1.9",

src/dialer/index.js

@@ -1,7 +1,10 @@
 'use strict'
 
 const varint = require('varint')
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
+const map = require('pull-stream/throughs/map')
+const collect = require('pull-stream/sinks/collect')
+const take = require('pull-stream/throughs/take')
 const pullLP = require('pull-length-prefixed')
 const Connection = require('interface-connection').Connection
 const util = require('../util')
@@ -113,8 +116,8 @@ class Dialer {
         conn,
         pullLP.decode(),
         collectLs(conn),
-        pull.map(stringify),
-        pull.collect((err, list) => {
+        map(stringify),
+        collect((err, list) => {
           if (err) {
             return callback(err)
           }
@@ -139,7 +142,7 @@ function collectLs (conn) {
   let first = true
   let counter = 0
 
-  return pull.take((msg) => {
+  return take((msg) => {
     if (first) {
       varint.decode(msg)
       counter = varint.decode(msg, varint.decode.bytes)

src/listener/index.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const pull = require('pull-stream')
-const isFunction = require('lodash.isfunction')
+const pull = require('pull-stream/pull')
 const assert = require('assert')
 const select = require('../select')
 const selectHandler = require('./select-handler')
@@ -77,7 +76,7 @@ class Listener {
    */
   addHandler (protocol, handlerFunc, matchFunc) {
     this.log('adding handler: ' + protocol)
-    assert(isFunction(handlerFunc), 'handler must be a function')
+    assert(typeof handlerFunc === 'function', 'handler must be a function')
 
     if (this.handlers[protocol]) {
       this.log('overwriting handler for ' + protocol)

src/listener/ls-handler.js

@@ -1,6 +1,7 @@
 'use strict'
 
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
+const values = require('pull-stream/sources/values')
 const pullLP = require('pull-length-prefixed')
 const varint = require('varint')
 
@@ -24,10 +25,9 @@ function lsHandler (self, conn) {
   const encodedProtos = protos.map((proto) => {
     return Buffer.from(proto + '\n')
   })
-  const values = [buf].concat(encodedProtos)
 
   pull(
-    pull.values(values),
+    values([buf].concat(encodedProtos)),
     pullLP.encode(),
     conn
   )

src/util.js

@@ -1,6 +1,8 @@
 'use strict'
 
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
+const values = require('pull-stream/sources/values')
+const collect = require('pull-stream/sinks/collect')
 const pullLP = require('pull-length-prefixed')
 const debug = require('debug')
 
@@ -13,12 +15,10 @@ function randomId () {
 // prefixes a message with a varint
 // TODO this is a pull-stream 'creep' (pull stream to add a byte?')
 function encode (msg, callback) {
-  const values = Buffer.isBuffer(msg) ? [msg] : [Buffer.from(msg)]
-
   pull(
-    pull.values(values),
+    values(Buffer.isBuffer(msg) ? [msg] : [Buffer.from(msg)]),
     pullLP.encode(),
-    pull.collect((err, encoded) => {
+    collect((err, encoded) => {
       if (err) {
         return callback(err)
       }

test/handshake.spec.js

@@ -17,9 +17,9 @@ const util = require('./util')
 const createPair = util.createPair
 
 const options = [
-  {name: 'over pull-pair'},
-  {name: 'over spdy', muxer: spdy},
-  {name: 'over multiplex', muxer: multiplex}
+  { name: 'over pull-pair' },
+  { name: 'over spdy', muxer: spdy },
+  { name: 'over multiplex', muxer: multiplex }
 ]
 
 options.forEach((option) => {