Add configuration option for defer

#76

README.md

@@ -44,3 +44,16 @@ export default function main() {
   return app;
 }
 ```
+
+### Configuration
+
+You can configure whether to run the middleware before or after await next. The default is running after await next.
+
+```js
+import {HttpHandlerConfigToken} from 'fusion-plugin-http-handler';
+
+// Configure to run before await next
+if (__NODE__) {
+  app.register(HttpHandlerConfigToken, {defer: false});
+}
+```

src/__tests__/express-get.node.js

@@ -9,7 +9,7 @@
 import test from 'tape-cup';
 import App from 'fusion-core';
 import express from 'express';
-import {HttpHandlerToken} from '../tokens.js';
+import {HttpHandlerToken, HttpHandlerConfigToken} from '../tokens.js';
 import HttpHandlerPlugin from '../server.js';
 import {startServer} from '../test-util.js';
 
@@ -53,3 +53,45 @@ test('http handler with express', async t => {
   server.close();
   t.end();
 });
+
+test('http handler with express and defer false', async t => {
+  const app = new App('test', () => 'test');
+  app.middleware((ctx, next) => {
+    if (ctx.url === '/send') {
+      ctx.body = 'hello world';
+    }
+    return next();
+  });
+  app.register(HttpHandlerPlugin);
+  app.register(HttpHandlerConfigToken, {defer: false});
+  let hitExpressMiddleware = false;
+  const expressApp = express();
+  expressApp.use((req, res, next) => {
+    hitExpressMiddleware = true;
+    return next();
+  });
+  expressApp.get('/lol', (req, res) => {
+    res.status(200);
+    res.end('OK');
+  });
+
+  app.register(HttpHandlerToken, expressApp);
+
+  const {server, request} = await startServer(app.callback());
+
+  t.equal(
+    await request('/send'),
+    'hello world',
+    'can send response from koa middleware'
+  );
+  t.equal(
+    hitExpressMiddleware,
+    false,
+    'does not run through express middleware if response is sent by koa'
+  );
+
+  t.equal(await request('/lol'), 'OK', 'express routes can send responses');
+  t.equal(hitExpressMiddleware, true, 'express middleware hit');
+  server.close();
+  t.end();
+});

src/index.js

@@ -12,4 +12,4 @@ import server from './server';
 const plugin = __BROWSER__ ? browser : server;
 
 export default plugin;
-export {HttpHandlerToken} from './tokens.js';
+export {HttpHandlerToken, HttpHandlerConfigToken} from './tokens.js';

src/server.js

@@ -10,22 +10,28 @@
 
 import {createPlugin} from 'fusion-core';
 import type {FusionPlugin} from 'fusion-core';
-import {HttpHandlerToken} from './tokens.js';
+import {HttpHandlerToken, HttpHandlerConfigToken} from './tokens.js';
 import type {DepsType} from './types.js';
 
+const defaultConfig = {
+  defer: true,
+};
+
 const plugin =
   __NODE__ &&
   createPlugin({
     deps: {
       handler: HttpHandlerToken,
+      config: HttpHandlerConfigToken.optional,
     },
-
     middleware: deps => {
-      const {handler} = deps;
+      const {handler, config = defaultConfig} = deps;
       return async (ctx, next) => {
-        await next();
+        if (config.defer) {
+          await next();
+        }
         if (ctx.body) {
-          return;
+          return config.defer || next();
         }
         return new Promise((resolve, reject) => {
           const {req, res} = ctx;
@@ -69,6 +75,10 @@ const plugin =
             }
             return resolve();
           }
+        }).then(() => {
+          if (!config.defer) {
+            return next();
+          }
         });
       };
     },

src/tokens.js

@@ -8,6 +8,9 @@
 
 import {createToken} from 'fusion-core';
 import type {Token} from 'fusion-core';
-import type {ServiceType} from './types.js';
+import type {ServiceType, ConfigType} from './types.js';
 
 export const HttpHandlerToken: Token<ServiceType> = createToken('HttpHandler');
+export const HttpHandlerConfigToken: Token<ConfigType> = createToken(
+  'HttpHandlerConfigToken'
+);

src/types.js

@@ -13,3 +13,7 @@ export type DepsType = {
 };
 
 export type ServiceType = (mixed, mixed, (error?: any) => Promise<any>) => void;
+
+export type ConfigType = {
+  defer: boolean,
+};