From ddd3b08a4a3b393375b6e9716697b9442fcfa66d Mon Sep 17 00:00:00 2001 From: chenchao Date: Thu, 7 Nov 2019 11:14:03 +0800 Subject: handle localhost urls with path --- src/shared/urls.ts | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/shared/urls.ts b/src/shared/urls.ts index ab01c49..8fa9a49 100644 --- a/src/shared/urls.ts +++ b/src/shared/urls.ts @@ -16,6 +16,20 @@ const isLocalhost = (url: string): boolean => { 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); @@ -25,10 +39,11 @@ const searchUrl = (keywords: string, search: Search): string => { } catch (e) { // fallthrough } - if (isLocalhost(keywords) || - (keywords.includes('.') && !keywords.includes(' '))) { + + if (isMissingHttp(keywords)) { return 'http://' + keywords; } + let template = search.engines[search.defaultEngine]; let query = keywords; -- cgit v1.2.3