heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix bug

Browse source
This commit is contained in:
syuilo 2019-04-10 00:40:10 +09:00
parent d1c16a90b4
commit 72a5f7b1e2
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/config/load.ts
View file

@ -7,7 +7,6 @@ import { URL } from 'url';
import * as yaml from 'js-yaml'; import * as yaml from 'js-yaml';
import { Source, Mixin } from './types'; import { Source, Mixin } from './types';
import * as pkg from '../../package.json'; import * as pkg from '../../package.json';
import { toPuny } from '../misc/convert-host';
/** /**
* Path of configuration directory * Path of configuration directory
@ -26,14 +25,14 @@ export default function load() {
const mixin = {} as Mixin; const mixin = {} as Mixin;
const url = validateUrl(config.url); const url = tryCreateUrl(config.url);
config.url = toPuny(normalizeUrl(config.url)); config.url = url.origin;
config.port = config.port || parseInt(process.env.PORT, 10); config.port = config.port || parseInt(process.env.PORT, 10);
mixin.host = toPuny(url.host); mixin.host = url.host;
mixin.hostname = toPuny(url.hostname); mixin.hostname = url.hostname;
mixin.scheme = url.protocol.replace(/:$/, ''); mixin.scheme = url.protocol.replace(/:$/, '');
mixin.wsScheme = mixin.scheme.replace('http', 'ws'); mixin.wsScheme = mixin.scheme.replace('http', 'ws');
mixin.wsUrl = `${mixin.wsScheme}://${mixin.host}`; mixin.wsUrl = `${mixin.wsScheme}://${mixin.host}`;
@ -54,14 +53,3 @@ function tryCreateUrl(url: string) {
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.`;
return result;
}
function normalizeUrl(url: string) {
return url.endsWith('/') ? url.substr(0, url.length - 1) : url;
}