routup 3.1.0 → 3.2.0

package/dist/index.mjs

@@ -842,6 +842,78 @@ function setResponseHeaderContentType(res, input, ifNotExists) {
     }
 }
 
+async function sendStream(res, stream, next) {
+    if (isWebStream(stream)) {
+        return stream.pipeTo(new WritableStream({
+            write (chunk) {
+                res.write(chunk);
+            }
+        })).then(()=>{
+            if (next) {
+                return next();
+            }
+            res.end();
+            return Promise.resolve();
+        }).catch((err)=>{
+            if (next) {
+                return next(err);
+            }
+            return Promise.reject(err);
+        });
+    }
+    return new Promise((resolve, reject)=>{
+        stream.on('open', ()=>{
+            stream.pipe(res);
+        });
+        /* istanbul ignore next */ stream.on('error', (err)=>{
+            if (next) {
+                Promise.resolve().then(()=>next(err)).then(()=>resolve()).catch((e)=>reject(e));
+                return;
+            }
+            res.end();
+            reject(err);
+        });
+        stream.on('close', ()=>{
+            if (next) {
+                Promise.resolve().then(()=>next()).then(()=>resolve()).catch((e)=>reject(e));
+                return;
+            }
+            res.end();
+            resolve();
+        });
+    });
+}
+
+async function sendWebBlob(res, blob) {
+    setResponseHeaderContentType(res, blob.type);
+    await sendStream(res, blob.stream());
+}
+
+async function sendWebResponse(res, webResponse) {
+    if (webResponse.redirected) {
+        res.setHeader(HeaderName.LOCATION, webResponse.url);
+    }
+    if (webResponse.status) {
+        res.statusCode = webResponse.status;
+    }
+    if (webResponse.statusText) {
+        res.statusMessage = webResponse.statusText;
+    }
+    webResponse.headers.forEach((value, key)=>{
+        if (key === HeaderName.SET_COOKIE) {
+            res.appendHeader(key, splitCookiesString(value));
+        } else {
+            res.setHeader(key, value);
+        }
+    });
+    if (webResponse.body) {
+        await sendStream(res, webResponse.body);
+        return Promise.resolve();
+    }
+    res.end();
+    return Promise.resolve();
+}
+
 async function send(res, chunk) {
     switch(typeof chunk){
         case 'string':
@@ -853,11 +925,28 @@ async function send(res, chunk) {
         case 'number':
         case 'object':
             {
-                if (Buffer.isBuffer(chunk)) {
-                    setResponseHeaderContentType(res, 'bin', true);
-                } else if (chunk !== null) {
-                    chunk = JSON.stringify(chunk);
-                    setResponseHeaderContentType(res, 'application/json', true);
+                if (chunk !== null) {
+                    if (chunk instanceof Error) {
+                        throw chunk;
+                    }
+                    if (isStream(chunk)) {
+                        await sendStream(res, chunk);
+                        return;
+                    }
+                    if (isWebBlob(chunk)) {
+                        await sendWebBlob(res, chunk);
+                        return;
+                    }
+                    if (isWebResponse(chunk)) {
+                        await sendWebResponse(res, chunk);
+                        return;
+                    }
+                    if (Buffer.isBuffer(chunk)) {
+                        setResponseHeaderContentType(res, 'bin', true);
+                    } else {
+                        chunk = JSON.stringify(chunk);
+                        setResponseHeaderContentType(res, 'application/json', true);
+                    }
                 }
                 break;
             }
@@ -940,48 +1029,6 @@ function sendCreated(res, chunk) {
     return send(res, chunk);
 }
 
-async function sendStream(res, stream, next) {
-    if (isWebStream(stream)) {
-        return stream.pipeTo(new WritableStream({
-            write (chunk) {
-                res.write(chunk);
-            }
-        })).then(()=>{
-            if (next) {
-                return next();
-            }
-            res.end();
-            return Promise.resolve();
-        }).catch((err)=>{
-            if (next) {
-                return next(err);
-            }
-            return Promise.reject(err);
-        });
-    }
-    return new Promise((resolve, reject)=>{
-        stream.on('open', ()=>{
-            stream.pipe(res);
-        });
-        /* istanbul ignore next */ stream.on('error', (err)=>{
-            if (next) {
-                Promise.resolve().then(()=>next(err)).then(()=>resolve()).catch((e)=>reject(e));
-                return;
-            }
-            res.end();
-            reject(err);
-        });
-        stream.on('close', ()=>{
-            if (next) {
-                Promise.resolve().then(()=>next()).then(()=>resolve()).catch((e)=>reject(e));
-                return;
-            }
-            res.end();
-            resolve();
-        });
-    });
-}
-
 async function sendFile(res, options, next) {
     let stats;
     try {
@@ -1071,36 +1118,6 @@ function sendRedirect(res, location, statusCode = 302) {
     return send(res, html);
 }
 
-async function sendWebResponse(res, webResponse) {
-    if (webResponse.redirected) {
-        res.setHeader(HeaderName.LOCATION, webResponse.url);
-    }
-    if (webResponse.status) {
-        res.statusCode = webResponse.status;
-    }
-    if (webResponse.statusText) {
-        res.statusMessage = webResponse.statusText;
-    }
-    webResponse.headers.forEach((value, key)=>{
-        if (key === HeaderName.SET_COOKIE) {
-            res.appendHeader(key, splitCookiesString(value));
-        } else {
-            res.setHeader(key, value);
-        }
-    });
-    if (webResponse.body) {
-        await sendStream(res, webResponse.body);
-        return Promise.resolve();
-    }
-    res.end();
-    return Promise.resolve();
-}
-
-async function sendWebBlob(res, blob) {
-    setResponseHeaderContentType(res, blob.type);
-    await sendStream(res, blob.stream());
-}
-
 function createResponse(request) {
     let output;
     let encoding;
@@ -1246,24 +1263,6 @@ function createResponse(request) {
     return writable;
 }
 
-async function sendData(event, chunk) {
-    if (chunk instanceof Error) {
-        return Promise.reject(createError(chunk));
-    }
-    if (isStream(chunk)) {
-        await sendStream(event.response, chunk);
-        return Promise.resolve();
-    }
-    if (isWebBlob(chunk)) {
-        await sendWebBlob(event.response, chunk);
-        return Promise.resolve();
-    }
-    if (isWebResponse(chunk)) {
-        await sendWebResponse(event.response, chunk);
-        return Promise.resolve();
-    }
-    return send(event.response, chunk);
-}
 function dispatch(event, target) {
     setRequestParams(event.request, event.params);
     setRequestMountPath(event.request, event.mountPath);
@@ -1297,7 +1296,7 @@ function dispatch(event, target) {
             handled = true;
             unsubscribe();
             if (!event.dispatched) {
-                await sendData(event, data);
+                await send(event.response, data);
             }
             return true;
         };