Fix handling errors on hosts with custom port

barbushin · barbushin · commit 8626545ca33a · 2016-03-31T12:27:20.000+08:00
diff --git a/background.js b/background.js
@@ -17,9 +17,9 @@ function formatStackForPopup(stack) {
 }
 
 function getBaseHostByUrl(url) {
-	var localUrlRegexp = /(file:\/\/.*)|(:\/\/[^.:]+([\/?]|$))/;
-	var rootHostRegexp = /:\/\/(([\w-]+\.\w+)|(\d+\.\d+\.\d+\.\d+)|(\w+:\w+:\w+:[\w:]+))([\/?]|$)/;
-	var subDomainRegexp = /:\/\/.*\.([\w-]+\.\w+)([\/?]|$)/;
+	var localUrlRegexp = /(file:\/\/.*)|(:\/\/[^.:]+([\/?]|$))/; // file://
+	var rootHostRegexp = /:\/\/(([\w-]+\.\w+)|(\d+\.\d+\.\d+\.\d+)|(\[[\w:]+\]))([\/?:]|$)/; // domain.com | IPv4 | IPv6
+	var subDomainRegexp = /:\/\/.*\.([\w-]+\.\w+)([\/?:]|$)/; // sub.domain.com
 	return localUrlRegexp.exec(url) ? 'localhost' : (rootHostRegexp.exec(url) || subDomainRegexp.exec(url))[1];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ function formatStackForPopup(stack) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`function getBaseHostByUrl(url) {`
`20`		`- var localUrlRegexp = /(file:\/\/.*)\|(:\/\/[^.:]+([\/?]\|$))/;`
`21`		`- var rootHostRegexp = /:\/\/(([\w-]+\.\w+)\|(\d+\.\d+\.\d+\.\d+)\|(\w+:\w+:\w+:[\w:]+))([\/?]\|$)/;`
`22`		`- var subDomainRegexp = /:\/\/.*\.([\w-]+\.\w+)([\/?]\|$)/;`
	`20`	`+ var localUrlRegexp = /(file:\/\/.*)\|(:\/\/[^.:]+([\/?]\|$))/; // file://`
	`21`	`+ var rootHostRegexp = /:\/\/(([\w-]+\.\w+)\|(\d+\.\d+\.\d+\.\d+)\|(\[[\w:]+\]))([\/?:]\|$)/; // domain.com \| IPv4 \| IPv6`
	`22`	`+ var subDomainRegexp = /:\/\/.*\.([\w-]+\.\w+)([\/?:]\|$)/; // sub.domain.com`
`23`	`23`	`return localUrlRegexp.exec(url) ? 'localhost' : (rootHostRegexp.exec(url) \|\| subDomainRegexp.exec(url))[1];`
`24`	`24`	`}`
`25`	`25`