Merge pull request #666 from chen-chao/localhost

support url started with localhost

2 files changed, 41 insertions, 2 deletions

diff --git a/src/shared/urls.ts b/src/shared/urls.ts
index 64ea4f2..8fa9a49 100644
--- a/src/shared/urls.ts
+++ b/src/shared/urls.ts
@@ -7,6 +7,29 @@ const trimStart = (str: string): string => {
 
 const SUPPORTED_PROTOCOLS = ['http:', 'https:', 'ftp:', 'mailto:', 'about:'];
 
+const isLocalhost = (url: string): boolean => {
+  if (url === 'localhost') {
+    return true;
+  }
+
+  let [host, port] = url.split(':', 2);
+  return host === 'localhost' && !isNaN(Number(port));
+};
+
+const isMissingHttp = (keywords: string): boolean => {
+  if (keywords.includes('.') && !keywords.includes(' ')) {
+    return true;
+  }
+
+  try {
+    let u = new URL('http://' + keywords);
+    return isLocalhost(u.host)
+  } catch (e) {
+    // fallthrough
+  }
+  return false;
+};
+
 const searchUrl = (keywords: string, search: Search): string => {
   try {
     let u = new URL(keywords);
@@ -16,9 +39,11 @@ const searchUrl = (keywords: string, search: Search): string => {
   } catch (e) {
     // fallthrough
   }
-  if (keywords.includes('.') && !keywords.includes(' ')) {
+
+  if (isMissingHttp(keywords)) {
     return 'http://' + keywords;
   }
+
   let template = search.engines[search.defaultEngine];
   let query = keywords;
 
diff --git a/test/shared/urls.test.ts b/test/shared/urls.test.ts
index 3a3eea6..6206d03 100644
--- a/test/shared/urls.test.ts
+++ b/test/shared/urls.test.ts
@@ -36,6 +36,21 @@ describe("shared/commands/parsers", () => {
       expect(parsers.searchUrl('std::vector', config))
         .to.equal('https://google.com/search?q=std%3A%3Avector');
     });
+
+    it('localhost urls', () => {
+      expect(parsers.searchUrl('localhost', config))
+	.to.equal('http://localhost');
+      expect(parsers.searchUrl('http://localhost', config))
+	.to.equal('http://localhost/');
+      expect(parsers.searchUrl('localhost:8080', config))
+	.to.equal('http://localhost:8080');
+      expect(parsers.searchUrl('localhost:80nan', config))
+	.to.equal('https://google.com/search?q=localhost%3A80nan');
+      expect(parsers.searchUrl('localhost 8080', config))
+	.to.equal('https://google.com/search?q=localhost%208080');
+      expect(parsers.searchUrl('localhost:80/build', config))
+	.to.equal('http://localhost:80/build')
+    })
   });
 
   describe('#normalizeUrl', () => {
@@ -47,4 +62,3 @@ describe("shared/commands/parsers", () => {
     });
   });
 });
-