utils/util: reorganize functions.

YusukeShimizu · Aug 6, 2017 · cc1462f · cc1462f
1 parent 422d2d4
commit cc1462f
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 143 deletions.
diff --git a/lib/http/base.js b/lib/http/base.js
@@ -892,8 +892,7 @@ HTTPBaseOptions.prototype.fromOptions = function fromOptions(options) {
   }
 
   if (options.port != null) {
-    assert(typeof options.port === 'number', 'Port must be a number.');
-    assert(options.port > 0 && options.port <= 0xffff);
+    assert(util.isU16(options.port), 'Port must be a number.');
     this.port = options.port;
   }
 

diff --git a/lib/http/server.js b/lib/http/server.js
@@ -766,8 +766,7 @@ HTTPOptions.prototype.fromOptions = function fromOptions(options) {
   }
 
   if (options.port != null) {
-    assert(typeof options.port === 'number', 'Port must be a number.');
-    assert(options.port > 0 && options.port <= 0xffff);
+    assert(util.isU16(options.port), 'Port must be a number.');
     this.port = options.port;
   }
 

diff --git a/lib/net/pool.js b/lib/net/pool.js
@@ -3726,8 +3726,7 @@ PoolOptions.prototype.fromOptions = function fromOptions(options) {
   }
 
   if (options.port != null) {
-    assert(typeof options.port === 'number');
-    assert(options.port > 0 && options.port <= 0xffff);
+    assert(util.isU16(options.port));
     this.port = options.port;
     this.publicPort = options.port;
   }
@@ -3738,8 +3737,7 @@ PoolOptions.prototype.fromOptions = function fromOptions(options) {
   }
 
   if (options.publicPort != null) {
-    assert(typeof options.publicPort === 'number');
-    assert(options.publicPort > 0 && options.publicPort <= 0xffff);
+    assert(util.isU16(options.publicPort));
     this.publicPort = options.publicPort;
   }