nat-upnp - npm Package Compare versions

Comparing version 0.1.0 to 0.1.1

lib/nat-upnp.js

 var nat = exports;
 
+nat.utils = require('./nat-upnp/utils');
 nat.ssdp = require('./nat-upnp/ssdp');
 nat.device = require('./nat-upnp/device');
 nat.createClient = require('./nat-upnp/client').create;

lib/nat-upnp/client.js

@@ -47,2 +47,21 @@ var nat = require('../nat-upnp');
 
+Client.prototype.externalIp = function externalIp(callback) {
+  this.findGateway(function(err, gateway, address) {
+    gateway.run('GetExternalIPAddress', [], function(err, data) {
+      if (err) return callback(err);
+      var key;
+
+      Object.keys(data).some(function(k) {
+        if (!/:GetExternalIPAddressResponse$/.test(k)) return false;
+
+        key = k;
+        return true;
+      });
+
+      if (!key) return callback(Error('Incorrect response'));
+      callback(null, data[key].NewExternalIPAddress);
+    });
+  });
+};
+
 Client.prototype.findGateway = function findGateway(callback) {
@@ -49,0 +68,0 @@ var ssdp = nat.ssdp.create(),

lib/nat-upnp/device.js

@@ -1,2 +0,3 @@
-var request = require('request'),
+var nat = require('../nat-upnp'),
+    request = require('request'),
     url = require('url'),
@@ -146,9 +147,17 @@ xml2js = require('xml2js'),
       if (err) return callback(err);
-      if (res.statusCode !== 200) {
-        return callback(Error('Request failed: ' + res.statusCode));
-      }
 
-      callback(null);
+      var parser = new xml2js.Parser();
+      parser.parseString(body, function(err, body) {
+        if (res.statusCode !== 200) {
+          return callback(Error('Request failed: ' + res.statusCode));
+        }
+
+        var soapns = nat.utils.getNamespace(
+          body,
+          'http://schemas.xmlsoap.org/soap/envelope/');
+
+        callback(null, body[soapns + 'Body']);
+      });
     });
   });
 };

package.json

 {
   "name": "nat-upnp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "lib/nat-upnp",
@@ -5,0 +5,0 @@ "author": "Fedor Indutny <[e-mail]>",

README.md

@@ -10,9 +10,7 @@ # NAT UPnP
 
-natUpnp.createClient().addMapping({
-  remote: {
-    port: 12345
-  },
-  internal: {
-    port: 54321
-  },
+var client = natUpnp.createClient();
+
+client.portMapping({
+  public: 12345
+  private: 54321,
   ttl: 10
@@ -22,2 +20,5 @@ }, function(err) {
 });
+
+client.externalIp(function(err, ip) {
+});
 ```
@@ -24,0 +25,0 @@

test/api-test.js

 var assert = require('assert'),
+    net = require('net'),
     natUpnp = require('..');
@@ -10,3 +11,3 @@
 
-  it('should find router device', function(callback) {
+  it('should add port mapping', function(callback) {
     c.portMapping({
@@ -21,2 +22,10 @@ public: ~~(Math.random() * 65536),
   });
+
+  it('should get external ip address', function(callback) {
+    c.externalIp(function(err, ip) {
+      assert.equal(err, null);
+      assert(net.isIP(ip));
+      callback();
+    });
+  });
 });

New alerts

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

14184

increased by11.5%

Number of package files

10

increased by11.11%

Lines of code

384

increased by13.61%

Number of lines in readme file

48

increased by2.13%

Worsened metrics

Number of medium supply chain risk alerts

2

increased by100%

No dependency changes