fix: change repeated to optional

Author: dryajov

package.json

@@ -18,11 +18,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "chai-checkmark": "^1.0.1",
     "dgram": "^1.0.1",
     "ipaddr.js": "^1.7.0",
     "nat-pmp": "^1.0.0",
     "nat-upnp": "^1.1.1",
-    "network": "^0.4.1"
+    "network": "^0.4.1",
+    "sinon": "^5.0.10"
   },
   "devDependencies": {
     "aegir": "^13.1.0",

requirements.md

@@ -1,7 +1,6 @@
 # Requirements
 
-- mapper should be able to hold multiple mappings for the same external
-  port but different external ips
+- mapper should be able to hold multiple mappings for the same external port but different external ips
   - for example, if the client moves around (laptops, mobile devices) and connects
     from different access points, the mapper should be able to detect if we're using
     a different external ip/getaway for which we don't have a prior mapping and add one

src/index.js

@@ -28,15 +28,15 @@ class NatManager extends EE {
           ttl,
           (err, mapping) => {
             if (err) {
-              return callback(err)
+              return cb(err)
             }
 
             const mapKey = `${mapping.externalIp}:${mapping.externalPort}`
             this.activeMappings[mapKey] = mapper
-            callback(null, mapping)
+            cb(null, mapping)
           })
       }
-    }))
+    }), callback)
   }
 
   deleteMapping (extPort, extIp, callback) {
@@ -52,7 +52,7 @@ class NatManager extends EE {
       (ip, cb) => {
         const mapper = this.activeMappings[`${ip}:${extPort}`]
         if (mapper) {
-          mapper.deleteMapping(extPort, callback)
+          mapper.deleteMapping(extPort, cb)
         }
       }
     ], callback)
@@ -62,6 +62,10 @@ class NatManager extends EE {
     network.get_public_ip(callback)
   }
 
+  getGwIp (callback) {
+    network.get_gateway_ip(callback)
+  }
+
   close (callback) {
     parallel(Object.keys(this.activeMappings).map((key) => {
       const [ip, port] = key.split(':')

src/mappers/mapper.js

@@ -4,7 +4,7 @@ const natPmp = require('nat-pmp')
 const waterfall = require('async/waterfall')
 const network = require('network')
 
-const Mapper = require('./mapper')
+const Mapper = require('./')
 
 class NatPMP extends Mapper {
   constructor () {
@@ -20,7 +20,7 @@ class NatPMP extends Mapper {
    * @param {Function} callback
    * @returns {undefined}
    */
-  createMapping (intPort, extPort, ttl, callback) {
+  _addPortMapping (intPort, extPort, ttl, callback) {
     network.get_active_interface((err, activeIf) => {
       if (err) {
         return callback(err)
@@ -65,7 +65,7 @@ class NatPMP extends Mapper {
     })
   }
 
-  _internalDeleteMapping (intPort, extPort, callback) {
+  _removePortMapping (intPort, extPort, callback) {
     network.get_gateway_ip((err, routerIp) => {
       if (err) {
         return callback(err)

src/mappers/pmp.js

@@ -4,7 +4,7 @@ const natUpnp = require('nat-upnp')
 const waterfall = require('async/waterfall')
 const network = require('network')
 
-const Mapper = require('./mapper')
+const Mapper = require('./')
 
 class NatPMP extends Mapper {
   constructor () {
@@ -20,7 +20,7 @@ class NatPMP extends Mapper {
    * @param {Function} callback
    * @returns {undefined}
    */
-  createMapping (intPort, extPort, ttl, callback) {
+  _addPortMapping (intPort, extPort, ttl, callback) {
     network.get_active_interface((err, activeIf) => {
       if (err) {
         return callback(err)
@@ -64,7 +64,7 @@ class NatPMP extends Mapper {
     })
   }
 
-  _internalDeleteMapping (intPort, extPort, callback) {
+  _removePortMapping (intPort, extPort, callback) {
     const client = natUpnp.createClient()
     client.portUnmapping({
       public: extPort

src/mappers/upnp.js

@@ -1,4 +1,5 @@
 'use strict'
 
+require('./manager')
 require('./pmp')
 require('./upnp')