@server/next 0.17.0 → 0.17.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.17.0",
+  "version": "0.17.3",
   "description": "An experimental reimplementation of server.js focused on the DX",
   "homepage": "https://node-server.com/",
   "repository": "https://github.com/franciscop/server-next.git",

package/readme.md

@@ -49,7 +49,7 @@ Major changes:
 
 - Router has all verbs, as well as URL pattern matches
 - Full URL parsing, including `query` and `params` in ctx.url.
-- Body and Files parsing is working (TODO: try with binary files and add tests)
+- Body and Files parsing is working (need testing)
 - The middleware can return:
   - A number and it'll be set as the status code
   - A string and it'll be sent as plain text or html (if it starts with "<")
@@ -70,7 +70,7 @@ import Redis from 'redis';
 const bucket = Bucket('my-bucket', { id, key });
 const cache = Redis('my-redis', ...);
 
-const app = server({ public:  bucket, cache });
+const app = server({ public: bucket, uploads: bucket, cache });
 
 app([
   post('/uploads', ctx => {

package/src/index.js

@@ -146,8 +146,8 @@ const parseOutput = async (res, data) => {
 
   // When piping the output
   if (data.pipe) {
-    res.body = data;
     res.status = 200;
+    res.body = data;
     // It's a file; find its mimetype
     if (res.body.path) {
       res.type = await getMime(res.body.path);
@@ -159,7 +159,7 @@ const parseOutput = async (res, data) => {
   if (data.type) res.type = data.type;
   res.headers = { ...res.headers, ...(data.headers || {}) };
   res.body = data.body || ""; // This could also be a pipe and that's okay
-  res.status = data.status || 200;
+  res.status = data.status || 200; // user set > default
   return res;
 };
 
@@ -184,14 +184,15 @@ export default function (options = {}, plugins) {
 
     let out;
     let err;
-    ctx.res = { headers: {} };
+    // Will (hopefully) be overwritten later on!
+    ctx.res = { status: 500, headers: {} };
     for (let cb of app.middleware) {
       try {
         if (err) {
           if (cb.handle) {
             out = await cb.handle(err);
           }
-        } else {
+        } else if (typeof cb === "function") {
           out = await cb(ctx);
         }
         if (out) {
@@ -226,8 +227,8 @@ export default function (options = {}, plugins) {
     res.writeHead(ctx.res.status, ctx.res.headers);
 
     // If it's not a pipe, e.g. a String, make it a pipe
-    if (!ctx.res.body.pipe) {
-      ctx.res.body = Readable.from([ctx.res.body]);
+    if (!ctx.res.body || !ctx.res.body.pipe) {
+      ctx.res.body = Readable.from([ctx.res.body || ""]);
     }
 
     if (compress) {