This commit is contained in:
syuilo 2019-02-07 21:02:33 +09:00
parent 27768081e2
commit 5448c22031
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
19 changed files with 125 additions and 194 deletions

View File

@ -4,10 +4,9 @@
import * as fs from 'fs'; import * as fs from 'fs';
import { URL } from 'url'; import { URL } from 'url';
import $ from 'cafy';
import * as yaml from 'js-yaml'; import * as yaml from 'js-yaml';
import { Source, Mixin } from './types';
import * as pkg from '../../package.json'; import * as pkg from '../../package.json';
import { fromNullable } from '../prelude/maybe';
/** /**
* Path of configuration directory * Path of configuration directory
@ -22,148 +21,31 @@ const path = process.env.NODE_ENV == 'test'
: `${dir}/default.yml`; : `${dir}/default.yml`;
export default function load() { export default function load() {
const config = yaml.safeLoad(fs.readFileSync(path, 'utf-8')); const config = yaml.safeLoad(fs.readFileSync(path, 'utf-8')) as Source;
if (typeof config.url !== 'string') { const mixin = {} as Mixin;
throw 'You need to configure the URL.';
}
const url = validateUrl(config.url); const url = validateUrl(config.url);
if (typeof config.port !== 'number') { config.url = normalizeUrl(config.url);
throw 'You need to configure the port.';
}
if (config.https != null) { mixin.host = url.host;
if (typeof config.https.key !== 'string') { mixin.hostname = url.hostname;
throw 'You need to configure the https key.'; mixin.scheme = url.protocol.replace(/:$/, '');
} mixin.ws_scheme = mixin.scheme.replace('http', 'ws');
if (typeof config.https.cert !== 'string') { mixin.ws_url = `${mixin.ws_scheme}://${mixin.host}`;
throw 'You need to configure the https cert.'; mixin.api_url = `${mixin.scheme}://${mixin.host}/api`;
} mixin.auth_url = `${mixin.scheme}://${mixin.host}/auth`;
} mixin.dev_url = `${mixin.scheme}://${mixin.host}/dev`;
mixin.docs_url = `${mixin.scheme}://${mixin.host}/docs`;
mixin.stats_url = `${mixin.scheme}://${mixin.host}/stats`;
mixin.status_url = `${mixin.scheme}://${mixin.host}/status`;
mixin.drive_url = `${mixin.scheme}://${mixin.host}/files`;
mixin.user_agent = `Misskey/${pkg.version} (${config.url})`;
if (config.mongodb == null) { if (config.autoAdmin == null) config.autoAdmin = false;
throw 'You need to configure the MongoDB.';
}
if (typeof config.mongodb.host !== 'string') { return Object.assign(config, mixin);
throw 'You need to configure the MongoDB host.';
}
if (typeof config.mongodb.port !== 'number') {
throw 'You need to configure the MongoDB port.';
}
if (typeof config.mongodb.db !== 'string') {
throw 'You need to configure the MongoDB database name.';
}
if (config.drive == null) {
throw 'You need to configure the drive.';
}
if (typeof config.drive.storage !== 'string') {
throw 'You need to configure the drive storage type.';
}
if (!$.str.or(['db', 'minio']).ok(config.drive.storage)) {
throw 'Unrecognized drive storage type is specified.';
}
if (config.drive.storage === 'minio') {
if (typeof config.drive.bucket !== 'string') {
throw 'You need to configure the minio bucket.';
}
if (typeof config.drive.prefix !== 'string') {
throw 'You need to configure the minio prefix.';
}
if (config.drive.prefix.config == null) {
throw 'You need to configure the minio.';
}
}
if (config.redis != null) {
if (typeof config.redis.host !== 'string') {
throw 'You need to configure the Redis host.';
}
if (typeof config.redis.port !== 'number') {
throw 'You need to configure the Redis port.';
}
}
if (config.elasticsearch != null) {
if (typeof config.elasticsearch.host !== 'string') {
throw 'You need to configure the Elasticsearch host.';
}
if (typeof config.elasticsearch.port !== 'number') {
throw 'You need to configure the Elasticsearch port.';
}
}
const source = {
url: normalizeUrl(config.url as string),
port: config.port as number,
https: fromNullable(config.https).map(x => ({
key: x.key as string,
cert: x.cert as string,
ca: fromNullable<string>(x.ca)
})),
mongodb: {
host: config.mongodb.host as string,
port: config.mongodb.port as number,
db: config.mongodb.db as string,
user: fromNullable<string>(config.mongodb.user),
pass: fromNullable<string>(config.mongodb.pass)
},
redis: fromNullable(config.redis).map(x => ({
host: x.host as string,
port: x.port as number,
pass: fromNullable<string>(x.pass)
})),
elasticsearch: fromNullable(config.elasticsearch).map(x => ({
host: x.host as string,
port: x.port as number,
pass: fromNullable<string>(x.pass)
})),
disableHsts: typeof config.disableHsts === 'boolean' ? config.disableHsts as boolean : false,
drive: {
storage: config.drive.storage as string,
bucket: config.drive.bucket as string,
prefix: config.drive.prefix as string,
baseUrl: fromNullable<string>(config.drive.baseUrl),
config: config.drive.config
},
autoAdmin: typeof config.autoAdmin === 'boolean' ? config.autoAdmin as boolean : false,
proxy: fromNullable<string>(config.proxy),
clusterLimit: typeof config.clusterLimit === 'number' ? config.clusterLimit as number : Infinity,
};
const host = url.host;
const scheme = url.protocol.replace(/:$/, '');
const ws_scheme = scheme.replace('http', 'ws');
const mixin = {
host: url.host,
hostname: url.hostname,
scheme: scheme,
ws_scheme: ws_scheme,
ws_url: `${ws_scheme}://${host}`,
api_url: `${scheme}://${host}/api`,
auth_url: `${scheme}://${host}/auth`,
dev_url: `${scheme}://${host}/dev`,
docs_url: `${scheme}://${host}/docs`,
stats_url: `${scheme}://${host}/stats`,
status_url: `${scheme}://${host}/status`,
drive_url: `${scheme}://${host}/files`,
user_agent: `Misskey/${pkg.version} (${config.url})`
};
return Object.assign(source, mixin);
} }
function tryCreateUrl(url: string) { function tryCreateUrl(url: string) {

View File

@ -1,3 +1,64 @@
import load from "./load"; /**
*
*/
export type Source = {
repository_url?: string;
feedback_url?: string;
url: string;
port: number;
https?: { [x: string]: string };
disableHsts?: boolean;
mongodb: {
host: string;
port: number;
db: string;
user: string;
pass: string;
};
redis: {
host: string;
port: number;
pass: string;
};
elasticsearch: {
host: string;
port: number;
pass: string;
};
drive?: {
storage: string;
bucket?: string;
prefix?: string;
baseUrl?: string;
config?: any;
};
export type Config = ReturnType<typeof load>; autoAdmin?: boolean;
proxy?: string;
accesslog?: string;
clusterLimit?: number;
};
/**
* Misskeyが自動的に()
*/
export type Mixin = {
host: string;
hostname: string;
scheme: string;
ws_scheme: string;
api_url: string;
ws_url: string;
auth_url: string;
docs_url: string;
stats_url: string;
status_url: string;
dev_url: string;
drive_url: string;
user_agent: string;
};
export type Config = Source & Mixin;

View File

@ -42,10 +42,9 @@ const index = {
}; };
// Init ElasticSearch connection // Init ElasticSearch connection
const client = config.elasticsearch ? new elasticsearch.Client({
const client = config.elasticsearch.map(({ host, port }) => { host: `${config.elasticsearch.host}:${config.elasticsearch.port}`
return new elasticsearch.Client({ host: `${host}:${port}` }); }) : null;
}).getOrElse(null);
if (client) { if (client) {
// Send a HEAD request // Send a HEAD request

View File

@ -1,7 +1,7 @@
import config from '../config'; import config from '../config';
const u = config.mongodb.user.map(x => encodeURIComponent(x)).getOrElse(null); const u = config.mongodb.user ? encodeURIComponent(config.mongodb.user) : null;
const p = config.mongodb.pass.map(x => encodeURIComponent(x)).getOrElse(null); const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null;
const uri = `mongodb://${u && p ? `${u}:${p}@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`; const uri = `mongodb://${u && p ? `${u}:${p}@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;

View File

@ -1,8 +1,10 @@
import * as redis from 'redis'; import * as redis from 'redis';
import config from '../config'; import config from '../config';
export default config.redis.map(({ host, port, pass }) => { export default config.redis ? redis.createClient(
return redis.createClient(port, host, { config.redis.port,
auth_pass: pass.getOrElse(null) config.redis.host,
}); {
}).getOrElse(null); auth_pass: config.redis.pass
}
) : null;

View File

@ -228,7 +228,7 @@ async function init(): Promise<Config> {
return config; return config;
} }
async function spawnWorkers(limit: number) { async function spawnWorkers(limit: number = Infinity) {
const workers = Math.min(limit, os.cpus().length); const workers = Math.min(limit, os.cpus().length);
bootLogger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`); bootLogger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`);
await Promise.all([...Array(workers)].map(spawnWorker)); await Promise.all([...Array(workers)].map(spawnWorker));

View File

@ -1,7 +1,5 @@
export interface Maybe<T> { export interface Maybe<T> {
isJust(): this is Just<T>; isJust(): this is Just<T>;
map<S>(f: (x: T) => S): Maybe<S>;
getOrElse(x: T): T;
} }
export type Just<T> = Maybe<T> & { export type Just<T> = Maybe<T> & {
@ -11,8 +9,6 @@ export type Just<T> = Maybe<T> & {
export function just<T>(value: T): Just<T> { export function just<T>(value: T): Just<T> {
return { return {
isJust: () => true, isJust: () => true,
getOrElse: (_: T) => value,
map: <S>(f: (x: T) => S) => just(f(value)),
get: () => value get: () => value
}; };
} }
@ -20,11 +16,5 @@ export function just<T>(value: T): Just<T> {
export function nothing<T>(): Maybe<T> { export function nothing<T>(): Maybe<T> {
return { return {
isJust: () => false, isJust: () => false,
getOrElse: (value: T) => value,
map: <S>(_: (x: T) => S) => nothing<S>()
}; };
} }
export function fromNullable<T>(value: T): Maybe<T> {
return value == null ? nothing() : just(value);
}

View File

@ -8,17 +8,17 @@ import handler from './processors';
import { queueLogger } from './logger'; import { queueLogger } from './logger';
const enableQueue = !program.disableQueue; const enableQueue = !program.disableQueue;
const queueAvailable = config.redis.isJust(); const queueAvailable = config.redis != null;
const queue = initializeQueue(); const queue = initializeQueue();
function initializeQueue() { function initializeQueue() {
return config.redis.map(({ port, host, pass }) => { if (queueAvailable) {
return new Queue('misskey', { return new Queue('misskey', {
redis: { redis: {
port: port, port: config.redis.port,
host: host, host: config.redis.host,
password: pass.getOrElse(null) password: config.redis.pass
}, },
removeOnSuccess: true, removeOnSuccess: true,
@ -27,7 +27,9 @@ function initializeQueue() {
sendEvents: false, sendEvents: false,
storeJobs: false storeJobs: false
}); });
}).getOrElse(null); } else {
return null;
}
} }
export function deliver(user: ILocalUser, content: any, to: any) { export function deliver(user: ILocalUser, content: any, to: any) {

View File

@ -57,7 +57,7 @@ export default class Resolver {
const object = await request({ const object = await request({
url: value, url: value,
proxy: config.proxy.getOrElse(null), proxy: config.proxy,
timeout: this.timeout, timeout: this.timeout,
headers: { headers: {
'User-Agent': config.user_agent, 'User-Agent': config.user_agent,

View File

@ -46,7 +46,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
description: instance.description, description: instance.description,
langs: instance.langs, langs: instance.langs,
secure: config.https.isJust(), secure: config.https != null,
machine: os.hostname(), machine: os.hostname(),
os: os.platform(), os: os.platform(),
node: process.version, node: process.version,
@ -83,9 +83,9 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
registration: !instance.disableRegistration, registration: !instance.disableRegistration,
localTimeLine: !instance.disableLocalTimeline, localTimeLine: !instance.disableLocalTimeline,
globalTimeLine: !instance.disableGlobalTimeline, globalTimeLine: !instance.disableGlobalTimeline,
elasticsearch: config.elasticsearch.isJust(), elasticsearch: config.elasticsearch ? true : false,
recaptcha: instance.enableRecaptcha, recaptcha: instance.enableRecaptcha,
objectStorage: config.drive.storage === 'minio', objectStorage: config.drive && config.drive.storage === 'minio',
twitter: instance.enableTwitterIntegration, twitter: instance.enableTwitterIntegration,
github: instance.enableGithubIntegration, github: instance.enableGithubIntegration,
discord: instance.enableDiscordIntegration, discord: instance.enableDiscordIntegration,

View File

@ -50,7 +50,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
request({ request({
url: url, url: url,
proxy: config.proxy.getOrElse(null), proxy: config.proxy,
timeout: timeout, timeout: timeout,
json: true, json: true,
followRedirect: true, followRedirect: true,

View File

@ -23,10 +23,10 @@ module.exports = (server: http.Server) => {
let ev: EventEmitter; let ev: EventEmitter;
if (config.redis.isJust()) { if (config.redis) {
// Connect to Redis // Connect to Redis
const subscriber = redis.createClient( const subscriber = redis.createClient(
config.redis.get().port, config.redis.get().host); config.redis.port, config.redis.host);
subscriber.subscribe('misskey'); subscriber.subscribe('misskey');

View File

@ -96,14 +96,13 @@ app.use(router.routes());
app.use(mount(require('./web'))); app.use(mount(require('./web')));
function createServer() { function createServer() {
if (config.https.isJust()) { if (config.https) {
const opts = { const certs: any = {};
key: fs.readFileSync(config.https.get().key), for (const k of Object.keys(config.https)) {
cert: fs.readFileSync(config.https.get().cert), certs[k] = fs.readFileSync(config.https[k]);
...config.https.get().ca.map<any>(path => ({ ca: fs.readFileSync(path) })).getOrElse({}), }
allowHTTP1: true certs['allowHTTP1'] = true;
}; return http2.createSecureServer(certs, app.callback()) as https.Server;
return http2.createSecureServer(opts, app.callback()) as https.Server;
} else { } else {
return http.createServer(app.callback()); return http.createServer(app.callback());
} }

View File

@ -69,7 +69,7 @@ async function fetch(url: string, path: string) {
const req = request({ const req = request({
url: requestUrl, url: requestUrl,
proxy: config.proxy.getOrElse(null), proxy: config.proxy,
timeout: 10 * 1000, timeout: 10 * 1000,
headers: { headers: {
'User-Agent': config.user_agent 'User-Agent': config.user_agent

View File

@ -31,9 +31,7 @@ const app = new Koa();
app.use(views(__dirname + '/views', { app.use(views(__dirname + '/views', {
extension: 'pug', extension: 'pug',
options: { options: {
config: { config
url: config.url
}
} }
})); }));

View File

@ -50,9 +50,8 @@ async function save(path: string, name: string, type: string, hash: string, size
if (type === 'image/webp') ext = '.webp'; if (type === 'image/webp') ext = '.webp';
} }
const baseUrl = config.drive.baseUrl.getOrElse( const baseUrl = config.drive.baseUrl
`${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }` || `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`;
);
// for original // for original
const key = `${config.drive.prefix}/${uuid.v4()}${ext}`; const key = `${config.drive.prefix}/${uuid.v4()}${ext}`;

View File

@ -55,7 +55,7 @@ export default async (
const req = request({ const req = request({
url: requestUrl, url: requestUrl,
proxy: config.proxy.getOrElse(null), proxy: config.proxy,
timeout: 10 * 1000, timeout: 10 * 1000,
headers: { headers: {
'User-Agent': config.user_agent 'User-Agent': config.user_agent

View File

@ -500,7 +500,7 @@ async function insertNote(user: IUser, data: Option, tags: string[], emojis: str
} }
function index(note: INote) { function index(note: INote) {
if (note.text == null || !config.elasticsearch.isJust()) return; if (note.text == null || config.elasticsearch == null) return;
es.index({ es.index({
index: 'misskey', index: 'misskey',

View File

@ -37,9 +37,8 @@ async function job(file: IDriveFile): Promise<any> {
const thumbnailKeyDir = `${config.drive.prefix}/${uuid.v4()}`; const thumbnailKeyDir = `${config.drive.prefix}/${uuid.v4()}`;
const thumbnailKey = `${thumbnailKeyDir}/${name}.thumbnail.jpg`; const thumbnailKey = `${thumbnailKeyDir}/${name}.thumbnail.jpg`;
const baseUrl = config.drive.baseUrl.getOrElse( const baseUrl = config.drive.baseUrl
`${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }` || `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`;
);
const bucket = await getDriveFileBucket(); const bucket = await getDriveFileBucket();
const readable = bucket.openDownloadStream(file._id); const readable = bucket.openDownloadStream(file._id);