From 3368fe855249f45bdf1e4c1e509d325d44e80fbe Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 13 Apr 2018 06:06:18 +0900
Subject: wip

---
 src/server/web/docs.ts        | 25 +++++++-------
 src/server/web/index.ts       | 77 ++++++++++++++++++++++++-------------------
 src/server/web/url-preview.ts |  8 ++---
 3 files changed, 59 insertions(+), 51 deletions(-)

(limited to 'src/server/web')

diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts
index 889532e17e..a546d1e88c 100644
--- a/src/server/web/docs.ts
+++ b/src/server/web/docs.ts
@@ -1,24 +1,21 @@
 /**
- * Docs Server
+ * Docs
  */
 
 import * as path from 'path';
-import * as express from 'express';
+import * as Router from 'koa-router';
+import * as send from 'koa-send';
 
 const docs = path.resolve(`${__dirname}/../../client/docs/`);
 
-/**
- * Init app
- */
-const app = express();
-app.disable('x-powered-by');
+const router = new Router();
 
-app.use('/assets', express.static(`${docs}/assets`));
+router.get('/assets', async ctx => {
+	await send(ctx, `${docs}/assets`);
+});
 
-/**
- * Routing
- */
-app.get(/^\/([a-z_\-\/]+?)$/, (req, res) =>
-	res.sendFile(`${docs}/${req.params[0]}.html`));
+router.get(/^\/([a-z_\-\/]+?)$/, async ctx => {
+	await send(ctx, `${docs}/${ctx.params[0]}.html`);
+});
 
-module.exports = app;
+module.exports = router;
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 5b1b6409b9..b28ad5592c 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -5,60 +5,71 @@
 import * as path from 'path';
 import ms = require('ms');
 
-// express modules
-import * as express from 'express';
-import * as bodyParser from 'body-parser';
-import * as favicon from 'serve-favicon';
-import * as compression from 'compression';
+import * as Koa from 'koa';
+import * as Router from 'koa-router';
+import * as send from 'koa-send';
+import * as favicon from 'koa-favicon';
 
 const client = path.resolve(`${__dirname}/../../client/`);
 
-// Create server
-const app = express();
-app.disable('x-powered-by');
+// Init app
+const app = new Koa();
 
-app.use('/docs', require('./docs'));
-
-app.use(bodyParser.urlencoded({ extended: true }));
-app.use(bodyParser.json({
-	type: ['application/json', 'text/plain']
-}));
-app.use(compression());
+// Serve favicon
+app.use(favicon(`${client}/assets/favicon.ico`));
 
-app.use((req, res, next) => {
-	res.header('X-Frame-Options', 'DENY');
+// Common request handler
+app.use((ctx, next) => {
+	// IFrameの中に入れられないようにする
+	ctx.set('X-Frame-Options', 'DENY');
 	next();
 });
 
+// Init router
+const router = new Router();
+
 //#region static assets
 
-app.use(favicon(`${client}/assets/favicon.ico`));
-app.get('/apple-touch-icon.png', (req, res) => res.sendFile(`${client}/assets/apple-touch-icon.png`));
-app.use('/assets', express.static(`${client}/assets`, {
-	maxAge: ms('7 days')
-}));
-app.use('/assets/*.js', (req, res) => res.sendFile(`${client}/assets/404.js`));
-app.use('/assets', (req, res) => {
-	res.sendStatus(404);
+router.get('/assets', async ctx => {
+	await send(ctx, ctx.path, {
+		root: `${client}/assets`,
+		maxage: ms('7 days'),
+		immutable: true
+	});
+});
+
+// Apple touch icon
+router.get('/apple-touch-icon.png', async ctx => {
+	await send(ctx, `${client}/assets/apple-touch-icon.png`);
 });
 
 // ServiceWroker
-app.get(/^\/sw\.(.+?)\.js$/, (req, res) =>
-	res.sendFile(`${client}/assets/sw.${req.params[0]}.js`));
+router.get(/^\/sw\.(.+?)\.js$/, async ctx => {
+	await send(ctx, `${client}/assets/sw.${ctx.params[0]}.js`);
+});
 
 // Manifest
-app.get('/manifest.json', (req, res) =>
-	res.sendFile(`${client}/assets/manifest.json`));
+router.get('/manifest.json', async ctx => {
+	await send(ctx, `${client}/assets/manifest.json`);
+});
 
 //#endregion
 
-app.get(/\/api:url/, require('./url-preview'));
+// Docs
+router.use('/docs', require('./docs').routes());
+
+// URL preview endpoint
+router.get('url', require('./url-preview'));
 
 // Render base html for all requests
-app.get('*', (req, res) => {
-	res.sendFile(path.resolve(`${client}/app/base.html`), {
-		maxAge: ms('7 days')
+router.get('*', async ctx => {
+	await send(ctx, `${client}/app/base.html`, {
+		maxage: ms('7 days'),
+		immutable: true
 	});
 });
 
+// Register router
+app.use(router.routes());
+
 module.exports = app;
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index 0c5fd8a78e..4b3f44a5da 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -1,11 +1,11 @@
-import * as express from 'express';
+import * as Koa from 'koa';
 import summaly from 'summaly';
 
-module.exports = async (req: express.Request, res: express.Response) => {
-	const summary = await summaly(req.query.url);
+module.exports = async (ctx: Koa.Context) => {
+	const summary = await summaly(ctx.query.url);
 	summary.icon = wrap(summary.icon);
 	summary.thumbnail = wrap(summary.thumbnail);
-	res.send(summary);
+	ctx.body = summary;
 };
 
 function wrap(url: string): string {
-- 
cgit v1.2.3-freya


From 61f21594a9edbb3102d6a0f45c1e95ed82c3f606 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 13 Apr 2018 07:34:27 +0900
Subject: wip

---
 src/server/api/index.ts |  2 ++
 src/server/file/pour.ts |  5 +++--
 src/server/index.ts     | 16 +++++++---------
 src/server/web/index.ts | 17 ++++++++---------
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/server/web')

diff --git a/src/server/api/index.ts b/src/server/api/index.ts
index d2427d30ae..c383e1cf8d 100644
--- a/src/server/api/index.ts
+++ b/src/server/api/index.ts
@@ -5,6 +5,7 @@
 import * as Koa from 'koa';
 import * as Router from 'koa-router';
 import * as multer from 'koa-multer';
+import * as bodyParser from 'koa-bodyparser';
 
 import endpoints from './endpoints';
 
@@ -12,6 +13,7 @@ const handler = require('./api-handler').default;
 
 // Init app
 const app = new Koa();
+app.use(bodyParser);
 
 // Init multer instance
 const upload = multer({
diff --git a/src/server/file/pour.ts b/src/server/file/pour.ts
index 2a31cb5898..b38b969c2d 100644
--- a/src/server/file/pour.ts
+++ b/src/server/file/pour.ts
@@ -80,10 +80,11 @@ export default function(readable: stream.Readable, type: string, ctx: Koa.Contex
 	}
 
 	if (ctx.query.download !== undefined) {
-		ctx.header('Content-Disposition', 'attachment');
+		ctx.set('Content-Disposition', 'attachment');
 	}
 
-	ctx.header('Content-Type', data.contentType);
+	ctx.set('Cache-Control', 'max-age=31536000, immutable');
+	ctx.set('Content-Type', data.contentType);
 
 	data.stream.pipe(ctx.res);
 
diff --git a/src/server/index.ts b/src/server/index.ts
index 02362037ee..a637e8598b 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -4,10 +4,9 @@
 
 import * as fs from 'fs';
 import * as http from 'http';
-import * as https from 'https';
+import * as http2 from 'http2';
 import * as Koa from 'koa';
 import * as Router from 'koa-router';
-import * as bodyParser from 'koa-bodyparser';
 import * as mount from 'koa-mount';
 
 import activityPub from './activitypub';
@@ -17,14 +16,13 @@ import config from '../config';
 // Init app
 const app = new Koa();
 app.proxy = true;
-app.use(bodyParser);
 
 // HSTS
 // 6months (15552000sec)
 if (config.url.startsWith('https')) {
-	app.use((ctx, next) => {
+	app.use(async (ctx, next) => {
 		ctx.set('strict-transport-security', 'max-age=15552000; preload');
-		next();
+		await next();
 	});
 }
 
@@ -38,20 +36,20 @@ const router = new Router();
 router.use(activityPub.routes());
 router.use(webFinger.routes());
 
-app.use(mount(require('./web')));
-
 // Register router
 app.use(router.routes());
 
+app.use(mount(require('./web')));
+
 function createServer() {
 	if (config.https) {
 		const certs = {};
 		Object.keys(config.https).forEach(k => {
 			certs[k] = fs.readFileSync(config.https[k]);
 		});
-		return https.createServer(certs, app.callback);
+		return http2.createSecureServer(certs, app.callback());
 	} else {
-		return http.createServer(app.callback);
+		return http.createServer(app.callback());
 	}
 }
 
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index b28ad5592c..dd296f875d 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -2,15 +2,13 @@
  * Web Client Server
  */
 
-import * as path from 'path';
 import ms = require('ms');
-
 import * as Koa from 'koa';
 import * as Router from 'koa-router';
 import * as send from 'koa-send';
 import * as favicon from 'koa-favicon';
 
-const client = path.resolve(`${__dirname}/../../client/`);
+const client = `${__dirname}/../../client/`;
 
 // Init app
 const app = new Koa();
@@ -19,10 +17,10 @@ const app = new Koa();
 app.use(favicon(`${client}/assets/favicon.ico`));
 
 // Common request handler
-app.use((ctx, next) => {
+app.use(async (ctx, next) => {
 	// IFrameの中に入れられないようにする
 	ctx.set('X-Frame-Options', 'DENY');
-	next();
+	await next();
 });
 
 // Init router
@@ -30,9 +28,9 @@ const router = new Router();
 
 //#region static assets
 
-router.get('/assets', async ctx => {
+router.get('/assets/*', async ctx => {
 	await send(ctx, ctx.path, {
-		root: `${client}/assets`,
+		root: client,
 		maxage: ms('7 days'),
 		immutable: true
 	});
@@ -63,8 +61,9 @@ router.get('url', require('./url-preview'));
 
 // Render base html for all requests
 router.get('*', async ctx => {
-	await send(ctx, `${client}/app/base.html`, {
-		maxage: ms('7 days'),
+	await send(ctx, `app/base.html`, {
+		root: client,
+		maxage: ms('3 days'),
 		immutable: true
 	});
 });
-- 
cgit v1.2.3-freya


From b099ad2a30aac43c4dbe36864f9045a687cfd30b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 13 Apr 2018 12:05:24 +0900
Subject: wip

---
 .../app/common/views/components/url-preview.vue      |  2 +-
 src/client/docs/layout.pug                           |  2 +-
 src/server/web/docs.ts                               | 20 +++++++++++++-------
 src/server/web/index.ts                              |  4 +++-
 4 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'src/server/web')

diff --git a/src/client/app/common/views/components/url-preview.vue b/src/client/app/common/views/components/url-preview.vue
index e91e510550..fd25480f61 100644
--- a/src/client/app/common/views/components/url-preview.vue
+++ b/src/client/app/common/views/components/url-preview.vue
@@ -45,7 +45,7 @@ export default Vue.extend({
 		} else if (url.hostname == 'youtu.be') {
 			this.youtubeId = url.pathname;
 		} else {
-			fetch('/api:url?url=' + this.url).then(res => {
+			fetch('/url?url=' + this.url).then(res => {
 				res.json().then(info => {
 					this.title = info.title;
 					this.description = info.description;
diff --git a/src/client/docs/layout.pug b/src/client/docs/layout.pug
index 29d2a3ff69..1d9ebcb4cd 100644
--- a/src/client/docs/layout.pug
+++ b/src/client/docs/layout.pug
@@ -6,7 +6,7 @@ html(lang= lang)
 		meta(name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no")
 		title
 			| #{title} | Misskey Docs
-		link(rel="stylesheet" href="/assets/style.css")
+		link(rel="stylesheet" href="/docs/assets/style.css")
 		block meta
 
 		//- FontAwesome style
diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts
index a546d1e88c..75da010682 100644
--- a/src/server/web/docs.ts
+++ b/src/server/web/docs.ts
@@ -2,20 +2,26 @@
  * Docs
  */
 
-import * as path from 'path';
+import ms = require('ms');
 import * as Router from 'koa-router';
 import * as send from 'koa-send';
 
-const docs = path.resolve(`${__dirname}/../../client/docs/`);
+const docs = `${__dirname}/../../client/docs/`;
 
 const router = new Router();
 
-router.get('/assets', async ctx => {
-	await send(ctx, `${docs}/assets`);
+router.get('/assets/*', async ctx => {
+	await send(ctx, ctx.path, {
+		root: docs,
+		maxage: ms('7 days'),
+		immutable: true
+	});
 });
 
-router.get(/^\/([a-z_\-\/]+?)$/, async ctx => {
-	await send(ctx, `${docs}/${ctx.params[0]}.html`);
+router.get('*', async ctx => {
+	await send(ctx, `${ctx.params[0]}.html`, {
+		root: docs
+	});
 });
 
-module.exports = router;
+export default router;
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index dd296f875d..376aadda73 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -8,6 +8,8 @@ import * as Router from 'koa-router';
 import * as send from 'koa-send';
 import * as favicon from 'koa-favicon';
 
+import docs from './docs';
+
 const client = `${__dirname}/../../client/`;
 
 // Init app
@@ -54,7 +56,7 @@ router.get('/manifest.json', async ctx => {
 //#endregion
 
 // Docs
-router.use('/docs', require('./docs').routes());
+router.use('/docs', docs.routes());
 
 // URL preview endpoint
 router.get('url', require('./url-preview'));
-- 
cgit v1.2.3-freya


From f618dedfbc1471de19ea72a4ab6ffbad44dc7e56 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 13 Apr 2018 12:08:56 +0900
Subject: Fix

---
 src/server/web/docs.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/server/web')

diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts
index 75da010682..e65cc87b12 100644
--- a/src/server/web/docs.ts
+++ b/src/server/web/docs.ts
@@ -11,8 +11,8 @@ const docs = `${__dirname}/../../client/docs/`;
 const router = new Router();
 
 router.get('/assets/*', async ctx => {
-	await send(ctx, ctx.path, {
-		root: docs,
+	await send(ctx, ctx.params[0], {
+		root: docs + '/assets/',
 		maxage: ms('7 days'),
 		immutable: true
 	});
-- 
cgit v1.2.3-freya