natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Revert "Update load.ts" 

This reverts commit cf9e8ed39e, commit 67792fcb5e, and commit c7e8c27ce6.
This commit is contained in:
Acid Chicken (硫酸鶏) 2019-02-04 22:30:24 +09:00
parent c7e8c27ce6
commit 9595a56346
No known key found for this signature in database
GPG Key ID: 5388F56C75B677A1
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/config/load.ts
View File

@ -47,22 +47,14 @@ export default function load() {
return Object.assign(config, mixin); return Object.assign(config, mixin);
} }
function tryCreateUrl(url: string) { function validateUrl(url: string) {
try { try {
return new URL(url); return new URL(url);
} catch (e) { } catch (e) {
throw `url="${url}" is not a valid URL.`; throw `url="${url}" is not a valid URL`;
} }
} }
function validateUrl(url: string) {
const result = tryCreateUrl(url);
if (result.pathname.replace('/', '').length) throw `url="${url}" is not a valid URL, has a pathname.`;
if (!url.includes(result.host)) throw `url="${url}" is not a valid URL, has an invalid hostname.`;
if (!/^https?:$/.test(result.protocol)) throw `url="${url}" is not a valid URL, has an invalid protocol.`;
return result;
}
function normalizeUrl(url: string) { function normalizeUrl(url: string) {
return url.endsWith('/') ? url.substr(0, url.length - 1) : url; return url.endsWith('/') ? url.substr(0, url.length - 1) : url;
} }