vhost - npm Package Compare versions

Comparing version 3.0.1 to 3.0.2

HISTORY.md

@@ -0,1 +1,7 @@
+3.0.2 / 2015-10-12
+==================
+
+  * perf: hoist regular expressions
+  * perf: use single regular expression for anchor checking
+
 3.0.1 / 2015-07-19
@@ -2,0 +8,0 @@ ==================

index.js

 /*!
  * vhost
  * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2014 Douglas Christopher Wilson
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
  * MIT Licensed
@@ -11,2 +11,20 @@ */
 /**
+ * Module exports.
+ * @public
+ */
+
+module.exports = vhost
+
+/**
+ * Module variables.
+ * @private
+ */
+
+var asteriskRegExp = /\*/g
+var asteriskReplace = '([^\.]+)'
+var endAnchoredRegExp = /(?:^|[^\\])(?:\\\\)*\$$/
+var escapeRegExp = /([.+?^=!:${}()|\[\]\/\\])/g
+var escapeReplace = '\\$1'
+
+/**
  * Create a vhost middleware.
@@ -20,3 +38,3 @@ *
 
-module.exports = function vhost(hostname, handle) {
+function vhost(hostname, handle) {
   if (!hostname) {
@@ -37,3 +55,3 @@ throw new TypeError('argument hostname is required')
 
-  return function vhost(req, res, next){
+  return function vhost(req, res, next) {
     var vhostdata = vhostof(req, regexp)
@@ -50,4 +68,4 @@
     handle(req, res, next)
-  };
-};
+  }
+}
 
@@ -62,3 +80,3 @@ /**
 
-function hostnameof(req){
+function hostnameof(req) {
   var host = req.headers.host
@@ -88,3 +106,3 @@
 
-function isregexp(val){
+function isregexp(val) {
   return Object.prototype.toString.call(val) === '[object RegExp]'
@@ -100,5 +118,5 @@ }
 
-function hostregexp(val){
+function hostregexp(val) {
   var source = !isregexp(val)
-    ? String(val).replace(/([.+?^=!:${}()|\[\]\/\\])/g, '\\$1').replace(/\*/g, '([^\.]+)')
+    ? String(val).replace(escapeRegExp, escapeReplace).replace(asteriskRegExp, asteriskReplace)
     : val.source
@@ -112,7 +130,5 @@
   // force trailing anchor matching
-  source = source.replace(/(\\*)(.)$/, function(s, b, c){
-    return c !== '$' || b.length % 2 === 1
-      ? s + '$'
-      : s
-  })
+  if (!endAnchoredRegExp.test(source)) {
+    source += '$'
+  }
 
@@ -131,3 +147,3 @@ return new RegExp(source, 'i')
 
-function vhostof(req, regexp){
+function vhostof(req, regexp) {
   var host = req.headers.host
@@ -134,0 +150,0 @@ var hostname = hostnameof(req)

package.json

 {
   "name": "vhost",
   "description": "virtual domain hosting",
-  "version": "3.0.1",
-  "author": "Jonathan Ong <[e-mail]> (http://jongleberry.com)",
+  "version": "3.0.2",
   "contributors": [
-    "Douglas Christopher Wilson <[e-mail]>"
+    "Douglas Christopher Wilson <[e-mail]>",
+    "Jonathan Ong <[e-mail]> (http://jongleberry.com)"
   ],
@@ -12,5 +12,5 @@ "license": "MIT",
   "devDependencies": {
-    "istanbul": "0.3.17",
-    "mocha": "2.2.5",
-    "supertest": "1.0.1"
+    "istanbul": "0.3.22",
+    "mocha": "2.3.3",
+    "supertest": "1.1.0"
   },
@@ -17,0 +17,0 @@ "files": [

No alert changes

Improved metrics

Total package byte prevSize

9795

increased by3.72%

Lines of code

129

increased by10.26%

No dependency changes