get-uri - npm Package Compare versions

Comparing version 2.0.3 to 2.0.4

ftp.js

@@ -126,4 +126,9 @@
 
-  // TODO: add auth
+  if (parsed.auth) {
+    const [user, password] = parsed.auth.split(":");
+    opts.user = user;
+    opts.password = password;
+  }
+  
   client.connect(opts);
 }

package.json

 {
   "name": "get-uri",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Returns a `stream.Readable` from a URI string",
@@ -34,14 +34,14 @@ "main": "index.js",
     "ftpd": "sstur/nodeftpd",
-    "mocha": "5",
-    "st": "1",
+    "mocha": "3",
+    "st": "^0.5.5",
     "stream-to-array": "2"
   },
   "dependencies": {
-    "data-uri-to-buffer": "2",
+    "data-uri-to-buffer": "1",
     "ftp": "~0.3.10",
-    "debug": "4",
+    "debug": "2",
     "extend": "~3.0.2",
     "file-uri-to-path": "1",
-    "readable-stream": "3"
+    "readable-stream": "2"
   }
 }

test/redirect.js

@@ -19,7 +19,2 @@
 
-    var options = {
-      key: fs.readFileSync(__dirname + '/server.key'),
-      cert: fs.readFileSync(__dirname + '/server.crt')
-    };
-
     var httpServer;
@@ -30,2 +25,22 @@ var httpsServer;
 
+    before(function(done) {
+      httpServer = http.createServer();
+      httpServer.listen(function() {
+        httpPort = httpServer.address().port;
+        done();
+      });
+    });
+
+    before(function(done) {
+      var options = {
+        key: fs.readFileSync(__dirname + '/server.key'),
+        cert: fs.readFileSync(__dirname + '/server.crt')
+      };
+      httpsServer = https.createServer(options);
+      httpsServer.listen(function() {
+        httpsPort = httpsServer.address().port;
+        done();
+      });
+    });
+
     after(function (done) {
@@ -35,4 +50,8 @@ httpsServer.once('close', function () {
       });
+      httpsServer.close();
+    });
+
+    after(function (done) {
       httpServer.once('close', function () {
-        httpsServer.close();
+        done();
       });
@@ -43,24 +62,17 @@ httpServer.close();
     it('should handle http -> https redirect', function (done) {
-      httpsServer = https.createServer(options, st(__dirname));
-      httpsServer.listen(function () {
-        httpsPort = httpsServer.address().port;
-        httpServer = http.createServer(function(req, res) {
-          res.writeHead(301, {'Location': 'https://127.0.0.1:' + httpsPort + '/' + path.basename(__filename)});
-          res.end('Moved');
-        });
-        httpServer.listen(function () {
-          httpPort = httpServer.address().port;
-
-          var uri = 'http://127.0.0.1:' + httpPort + '/' + path.basename(__filename);
-          fs.readFile(__filename, 'utf8', function (err, real) {
+      httpsServer.once('request', st(__dirname));
+      httpServer.once('request', function(req, res) {
+        res.writeHead(301, {'Location': 'https://127.0.0.1:' + httpsPort + '/' + path.basename(__filename)});
+        res.end('Moved');
+      });
+      var uri = 'http://127.0.0.1:' + httpPort + '/' + path.basename(__filename);
+      fs.readFile(__filename, 'utf8', function (err, real) {
+        if (err) return done(err);
+        getUri(uri, { rejectUnauthorized: false }, function (err, rs) {
+          if (err) return done(err);
+          streamToArray(rs, function (err, array) {
             if (err) return done(err);
-            getUri(uri, { rejectUnauthorized: false }, function (err, rs) {
-              if (err) return done(err);
-              streamToArray(rs, function (err, array) {
-                if (err) return done(err);
-                var str = Buffer.concat(array).toString('utf8');
-                assert.equal(str, real);
-                done();
-              });
-            });
+            var str = Buffer.concat(array).toString('utf8');
+            assert.equal(str, real);
+            done();
           });
@@ -72,24 +84,18 @@ });
     it('should handle https -> http redirect', function (done) {
-      httpServer = http.createServer(st(__dirname));
-      httpServer.listen(function () {
-        httpPort = httpServer.address().port;
-        httpsServer = https.createServer(options, function(req, res) {
-          res.writeHead(301, {'Location': 'http://127.0.0.1:' + httpPort + '/' + path.basename(__filename)});
-          res.end('Moved');
-        });
-        httpsServer.listen(function () {
-          httpsPort = httpsServer.address().port;
+      httpServer.once('request', st(__dirname));
+      httpsServer.once('request', function(req, res) {
+        res.writeHead(301, {'Location': 'http://127.0.0.1:' + httpPort + '/' + path.basename(__filename)});
+        res.end('Moved');
+      });
 
-          var uri = 'http://127.0.0.1:' + httpPort + '/' + path.basename(__filename);
-          fs.readFile(__filename, 'utf8', function (err, real) {
+      var uri = 'http://127.0.0.1:' + httpPort + '/' + path.basename(__filename);
+      fs.readFile(__filename, 'utf8', function (err, real) {
+        if (err) return done(err);
+        getUri(uri, function (err, rs) {
+          if (err) return done(err);
+          streamToArray(rs, function (err, array) {
             if (err) return done(err);
-            getUri(uri, function (err, rs) {
-              if (err) return done(err);
-              streamToArray(rs, function (err, array) {
-                if (err) return done(err);
-                var str = Buffer.concat(array).toString('utf8');
-                assert.equal(str, real);
-                done();
-              });
-            });
+            var str = Buffer.concat(array).toString('utf8');
+            assert.equal(str, real);
+            done();
           });
@@ -96,0 +102,0 @@ });

test/test.js

@@ -6,10 +6,4 @@
 
-var fs = require('fs');
-var st = require('st');
-var ftpd = require('ftpd');
-var http = require('http');
-var https = require('https');
 var getUri = require('../');
 var assert = require('assert');
-var streamToArray = require('stream-to-array');
 
@@ -16,0 +10,0 @@ describe('get-uri', function () {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

42053

increased by0.65%

Lines of code

954

increased by0.32%

Number of low supply chain risk alerts

6

decreased by-14.29%

Number of medium supply chain risk alerts

7

decreased by-22.22%

Dependency changes

• + Addeddata-uri-to-buffer@1.2.0(transitive)

• + Addeddebug@2.6.9(transitive)

• + Addedisarray@1.0.0(transitive)

• + Addedms@2.0.0(transitive)

• + Addedprocess-nextick-args@2.0.1(transitive)

• + Addedreadable-stream@2.3.8(transitive)

• + Addedsafe-buffer@5.1.2(transitive)

• + Addedstring_decoder@1.1.1(transitive)

• - Removeddata-uri-to-buffer@2.0.2(transitive)

• - Removeddebug@4.3.7(transitive)

• - Removedms@2.1.3(transitive)

• - Removedreadable-stream@3.6.2(transitive)

• - Removedsafe-buffer@5.2.1(transitive)

• - Removedstring_decoder@1.3.0(transitive)

• Updateddata-uri-to-buffer@1

• Updateddebug@2

• Updatedreadable-stream@2