Resolve timing.end on errored requests (#333)

#333

src/__tests__/timing.js

@@ -38,3 +38,43 @@ test('timing plugin', async t => {
     t.end();
   });
 });
+
+test('timing plugin on error middleware', async t => {
+  const element = 'hi';
+  const renderFn = el => {
+    return el;
+  };
+  const app = new App(element, renderFn);
+  let resolved = {
+    downstream: false,
+    upstream: false,
+    render: false,
+  };
+  app.middleware((ctx, next) => {
+    ctx.timing.downstream.then(result => {
+      resolved.downstream = true;
+    });
+    ctx.timing.render.then(result => {
+      resolved.render = true;
+    });
+    ctx.timing.upstream.then(result => {
+      resolved.upstream = true;
+    });
+    ctx.timing.end.then(result => {
+      t.equal(typeof result, 'number', 'sets end timing result');
+      t.equal(resolved.downstream, false, 'does not resolve downstream');
+      t.equal(resolved.render, false, 'does not resolve render');
+      t.equal(resolved.upstream, false, 'does not resolve upstream');
+      t.equal(ctx.status, 500, 'sets ctx.status');
+      t.end();
+    });
+    return next();
+  });
+  app.middleware((ctx, next) => {
+    const e = new Error('fail request');
+    // $FlowFixMe
+    e.status = 500;
+    throw e;
+  });
+  await run(app).catch(e => {});
+});

src/plugins/timing.js

@@ -52,12 +52,24 @@ function middleware(ctx, next) {
     downstream: downstream.promise,
     upstream: upstream.promise,
   };
-  return next().then(() => {
-    const upstreamTime = now() - timing.from(ctx).upstreamStart;
-    upstream.resolve(upstreamTime);
-    const endTime = now() - ctx.timing.start;
-    end.resolve(endTime);
-  });
+  return next()
+    .then(() => {
+      const upstreamTime = now() - timing.from(ctx).upstreamStart;
+      upstream.resolve(upstreamTime);
+      const endTime = now() - ctx.timing.start;
+      end.resolve(endTime);
+    })
+    .catch(e => {
+      // currently we only resolve upstream and downstream when the request does not error
+      // we should however always resolve the request end timing
+      if (e && e.status) {
+        // this ensures any logging / metrics based on ctx.status will recieve the correct status code
+        ctx.status = e.status;
+      }
+      const endTime = now() - ctx.timing.start;
+      end.resolve(endTime);
+      throw e;
+    });
 }
 
 export default createPlugin({