routup 4.0.0 → 4.0.2

package/dist/index.cjs

@@ -10,8 +10,7 @@ var readableStream = require('readable-stream');
 var http = require('@ebec/http');
 var pathToRegexp = require('path-to-regexp');
 
-exports.MethodName = void 0;
-(function(MethodName) {
+var MethodName = /*#__PURE__*/ function(MethodName) {
     MethodName["GET"] = "GET";
     MethodName["POST"] = "POST";
     MethodName["PUT"] = "PUT";
@@ -19,9 +18,9 @@ exports.MethodName = void 0;
     MethodName["DELETE"] = "DELETE";
     MethodName["OPTIONS"] = "OPTIONS";
     MethodName["HEAD"] = "HEAD";
-})(exports.MethodName || (exports.MethodName = {}));
-exports.HeaderName = void 0;
-(function(HeaderName) {
+    return MethodName;
+}({});
+var HeaderName = /*#__PURE__*/ function(HeaderName) {
     HeaderName["ACCEPT"] = "accept";
     HeaderName["ACCEPT_CHARSET"] = "accept-charset";
     HeaderName["ACCEPT_ENCODING"] = "accept-encoding";
@@ -53,10 +52,11 @@ exports.HeaderName = void 0;
     HeaderName["X_FORWARDED_HOST"] = "x-forwarded-host";
     HeaderName["X_FORWARDED_FOR"] = "x-forwarded-for";
     HeaderName["X_FORWARDED_PROTO"] = "x-forwarded-proto";
-})(exports.HeaderName || (exports.HeaderName = {}));
+    return HeaderName;
+}({});
 
 function isRequestCacheable(req, modifiedTime) {
-    const modifiedSince = req.headers[exports.HeaderName.IF_MODIFIED_SINCE];
+    const modifiedSince = req.headers[HeaderName.IF_MODIFIED_SINCE];
     if (!modifiedSince) {
         return false;
     }
@@ -411,7 +411,7 @@ function getRequestAcceptableContentType(req, input) {
     if (items.length === 0) {
         return getRequestAcceptableContentTypes(req).shift();
     }
-    const header = getRequestHeader(req, exports.HeaderName.ACCEPT);
+    const header = getRequestHeader(req, HeaderName.ACCEPT);
     if (!header) {
         return items[0];
     }
@@ -485,7 +485,7 @@ function getRequestAcceptableLanguage(req, input) {
 }
 
 function matchRequestContentType(req, contentType) {
-    const header = getRequestHeader(req, exports.HeaderName.CONTENT_TYPE);
+    const header = getRequestHeader(req, HeaderName.CONTENT_TYPE);
     if (!header) {
         return true;
     }
@@ -538,9 +538,9 @@ function getRequestHostName(req, options) {
     } else {
         trustProxy = findRouterOption('trustProxy', useRequestRouterPath(req));
     }
-    let hostname = req.headers[exports.HeaderName.X_FORWARDED_HOST];
+    let hostname = req.headers[HeaderName.X_FORWARDED_HOST];
     if (!hostname || !req.socket.remoteAddress || !trustProxy(req.socket.remoteAddress, 0)) {
-        hostname = req.headers[exports.HeaderName.HOST];
+        hostname = req.headers[HeaderName.HOST];
     } else {
         hostname = Array.isArray(hostname) ? hostname.pop() : hostname;
         if (hostname && hostname.indexOf(',') !== -1) {
@@ -627,7 +627,7 @@ function getRequestProtocol(req, options) {
     if (!req.socket.remoteAddress || !trustProxy(req.socket.remoteAddress, 0)) {
         return protocol;
     }
-    let header = req.headers[exports.HeaderName.X_FORWARDED_PROTO];
+    let header = req.headers[HeaderName.X_FORWARDED_PROTO];
     /* istanbul ignore next */ if (Array.isArray(header)) {
         header = header.pop();
     }
@@ -793,11 +793,11 @@ class EventStream {
             this.end();
         });
         this.passThrough.on('close', ()=>this.end());
-        this.response.setHeader(exports.HeaderName.CONTENT_TYPE, 'text/event-stream');
-        this.response.setHeader(exports.HeaderName.CACHE_CONTROL, 'private, no-cache, no-store, no-transform, must-revalidate, max-age=0');
-        this.response.setHeader(exports.HeaderName.X_ACCEL_BUFFERING, 'no');
+        this.response.setHeader(HeaderName.CONTENT_TYPE, 'text/event-stream');
+        this.response.setHeader(HeaderName.CACHE_CONTROL, 'private, no-cache, no-store, no-transform, must-revalidate, max-age=0');
+        this.response.setHeader(HeaderName.X_ACCEL_BUFFERING, 'no');
         if (!isRequestHTTP2(this.response.req)) {
-            this.response.setHeader(exports.HeaderName.CONNECTION, 'keep-alive');
+            this.response.setHeader(HeaderName.CONNECTION, 'keep-alive');
         }
         this.response.statusCode = 200;
     }
@@ -909,7 +909,7 @@ function setResponseContentTypeByFileName(res, fileName) {
             if (charset) {
                 type += `; charset=${charset}`;
             }
-            res.setHeader(exports.HeaderName.CONTENT_TYPE, type);
+            res.setHeader(HeaderName.CONTENT_TYPE, type);
         }
     }
 }
@@ -918,19 +918,19 @@ function setResponseHeaderAttachment(res, filename) {
     if (typeof filename === 'string') {
         setResponseContentTypeByFileName(res, filename);
     }
-    res.setHeader(exports.HeaderName.CONTENT_DISPOSITION, `attachment${filename ? `; filename="${filename}"` : ''}`);
+    res.setHeader(HeaderName.CONTENT_DISPOSITION, `attachment${filename ? `; filename="${filename}"` : ''}`);
 }
 
 function setResponseHeaderContentType(res, input, ifNotExists) {
     if (ifNotExists) {
-        const header = res.getHeader(exports.HeaderName.CONTENT_TYPE);
+        const header = res.getHeader(HeaderName.CONTENT_TYPE);
         if (header) {
             return;
         }
     }
     const contentType = getMimeType(input);
     if (contentType) {
-        res.setHeader(exports.HeaderName.CONTENT_TYPE, contentType);
+        res.setHeader(HeaderName.CONTENT_TYPE, contentType);
     }
 }
 
@@ -983,7 +983,7 @@ async function sendWebBlob(res, blob) {
 
 async function sendWebResponse(res, webResponse) {
     if (webResponse.redirected) {
-        res.setHeader(exports.HeaderName.LOCATION, webResponse.url);
+        res.setHeader(HeaderName.LOCATION, webResponse.url);
     }
     if (webResponse.status) {
         res.statusCode = webResponse.status;
@@ -992,7 +992,7 @@ async function sendWebResponse(res, webResponse) {
         res.statusMessage = webResponse.statusText;
     }
     webResponse.headers.forEach((value, key)=>{
-        if (key === exports.HeaderName.SET_COOKIE) {
+        if (key === HeaderName.SET_COOKIE) {
             res.appendHeader(key, splitCookiesString(value));
         } else {
             res.setHeader(key, value);
@@ -1045,8 +1045,8 @@ async function send(res, chunk) {
     }
     let encoding;
     if (typeof chunk === 'string') {
-        res.setHeader(exports.HeaderName.CONTENT_ENCODING, 'utf-8');
-        appendResponseHeaderDirective(res, exports.HeaderName.CONTENT_TYPE, 'charset=utf-8');
+        res.setHeader(HeaderName.CONTENT_ENCODING, 'utf-8');
+        appendResponseHeaderDirective(res, HeaderName.CONTENT_TYPE, 'charset=utf-8');
         encoding = 'utf-8';
     }
     // populate Content-Length
@@ -1064,7 +1064,7 @@ async function send(res, chunk) {
             encoding = undefined;
             len = chunk.length;
         }
-        res.setHeader(exports.HeaderName.CONTENT_LENGTH, `${len}`);
+        res.setHeader(HeaderName.CONTENT_LENGTH, `${len}`);
     }
     if (typeof len !== 'undefined') {
         const etagFn = findRouterOption('etag', useRequestRouterPath(res.req));
@@ -1073,22 +1073,22 @@ async function send(res, chunk) {
             return;
         }
         if (typeof chunkHash === 'string') {
-            res.setHeader(exports.HeaderName.ETag, chunkHash);
-            if (res.req.headers[exports.HeaderName.IF_NONE_MATCH] === chunkHash) {
+            res.setHeader(HeaderName.ETag, chunkHash);
+            if (res.req.headers[HeaderName.IF_NONE_MATCH] === chunkHash) {
                 res.statusCode = 304;
             }
         }
     }
     // strip irrelevant headers
     if (res.statusCode === 204 || res.statusCode === 304) {
-        res.removeHeader(exports.HeaderName.CONTENT_TYPE);
-        res.removeHeader(exports.HeaderName.CONTENT_LENGTH);
-        res.removeHeader(exports.HeaderName.TRANSFER_ENCODING);
+        res.removeHeader(HeaderName.CONTENT_TYPE);
+        res.removeHeader(HeaderName.CONTENT_LENGTH);
+        res.removeHeader(HeaderName.TRANSFER_ENCODING);
     }
     // alter headers for 205
     if (res.statusCode === 205) {
-        res.setHeader(exports.HeaderName.CONTENT_LENGTH, 0);
-        res.removeHeader(exports.HeaderName.TRANSFER_ENCODING);
+        res.setHeader(HeaderName.CONTENT_LENGTH, 0);
+        res.removeHeader(HeaderName.TRANSFER_ENCODING);
     }
     if (isResponseGone(res)) {
         return;
@@ -1138,7 +1138,7 @@ async function sendFile(res, options, next) {
     if (name) {
         const fileName = basename(name);
         if (options.attachment) {
-            const dispositionHeader = res.getHeader(exports.HeaderName.CONTENT_DISPOSITION);
+            const dispositionHeader = res.getHeader(HeaderName.CONTENT_DISPOSITION);
             if (!dispositionHeader) {
                 setResponseHeaderAttachment(res, fileName);
             }
@@ -1148,7 +1148,7 @@ async function sendFile(res, options, next) {
     }
     const contentOptions = {};
     if (stats.size) {
-        const rangeHeader = res.req.headers[exports.HeaderName.RANGE];
+        const rangeHeader = res.req.headers[HeaderName.RANGE];
         if (rangeHeader) {
             const [x, y] = rangeHeader.replace('bytes=', '').split('-');
             contentOptions.end = Math.min(parseInt(y, 10) || stats.size - 1, stats.size - 1);
@@ -1157,21 +1157,21 @@ async function sendFile(res, options, next) {
                 contentOptions.end = stats.size - 1;
             }
             if (contentOptions.start >= stats.size) {
-                res.setHeader(exports.HeaderName.CONTENT_RANGE, `bytes */${stats.size}`);
+                res.setHeader(HeaderName.CONTENT_RANGE, `bytes */${stats.size}`);
                 res.statusCode = 416;
                 res.end();
                 return Promise.resolve();
             }
-            res.setHeader(exports.HeaderName.CONTENT_RANGE, `bytes ${contentOptions.start}-${contentOptions.end}/${stats.size}`);
-            res.setHeader(exports.HeaderName.CONTENT_LENGTH, contentOptions.end - contentOptions.start + 1);
+            res.setHeader(HeaderName.CONTENT_RANGE, `bytes ${contentOptions.start}-${contentOptions.end}/${stats.size}`);
+            res.setHeader(HeaderName.CONTENT_LENGTH, contentOptions.end - contentOptions.start + 1);
         } else {
-            res.setHeader(exports.HeaderName.CONTENT_LENGTH, stats.size);
+            res.setHeader(HeaderName.CONTENT_LENGTH, stats.size);
         }
-        res.setHeader(exports.HeaderName.ACCEPT_RANGES, 'bytes');
+        res.setHeader(HeaderName.ACCEPT_RANGES, 'bytes');
         if (stats.mtime) {
             const mtime = new Date(stats.mtime);
-            res.setHeader(exports.HeaderName.LAST_MODIFIED, mtime.toUTCString());
-            res.setHeader(exports.HeaderName.ETag, `W/"${stats.size}-${mtime.getTime()}"`);
+            res.setHeader(HeaderName.LAST_MODIFIED, mtime.toUTCString());
+            res.setHeader(HeaderName.ETag, `W/"${stats.size}-${mtime.getTime()}"`);
         }
     }
     try {
@@ -1273,7 +1273,7 @@ function createResponse(request) {
         finished: false,
         addTrailers (_headers) {},
         appendHeader (name, value) {
-            if (name === exports.HeaderName.SET_COOKIE) {
+            if (name === HeaderName.SET_COOKIE) {
                 value = splitCookiesString(value);
             }
             name = name.toLowerCase();
@@ -1308,12 +1308,24 @@ function createResponse(request) {
             delete headers[name.toLowerCase()];
         },
         setHeader (name, value) {
-            if (name === exports.HeaderName.SET_COOKIE && typeof value !== 'number') {
+            if (name === HeaderName.SET_COOKIE && typeof value !== 'number') {
                 value = splitCookiesString(value);
             }
             headers[name.toLowerCase()] = value;
             return this;
         },
+        setHeaders (headers) {
+            if (headers instanceof Map) {
+                headers.entries().forEach(([key, value])=>{
+                    this.setHeader(key, value);
+                });
+                return this;
+            }
+            headers.forEach((value, key)=>{
+                this.setHeader(key, value);
+            });
+            return this;
+        },
         setTimeout (_msecs, _callback) {
             return this;
         },
@@ -1427,7 +1439,7 @@ class DispatchEvent {
     constructor(context){
         this.request = context.request;
         this.response = context.response;
-        this.method = context.method || exports.MethodName.GET;
+        this.method = context.method || MethodName.GET;
         this.methodsAllowed = [];
         this.mountPath = '/';
         this.params = {};
@@ -1445,7 +1457,7 @@ async function dispatchNodeRequest(router, request, response) {
         request,
         response,
         path: useRequestPath(request),
-        method: toMethodName(request.method, exports.MethodName.GET)
+        method: toMethodName(request.method, MethodName.GET)
     });
     await router.dispatch(event);
     if (event.dispatched) {
@@ -1497,7 +1509,7 @@ function transformHeadersToTuples(input) {
 }
 
 async function dispatchRawRequest(router, request) {
-    const method = toMethodName(request.method, exports.MethodName.GET);
+    const method = toMethodName(request.method, MethodName.GET);
     const req = createRequest({
         url: request.path,
         method,
@@ -1555,7 +1567,7 @@ async function dispatchWebRequest(router, request) {
     request.headers.forEach((value, key)=>{
         headers[key] = value;
     });
-    const method = toMethodName(request.method, exports.MethodName.GET);
+    const method = toMethodName(request.method, MethodName.GET);
     const res = await dispatchRawRequest(router, {
         method,
         path: url.pathname + url.search,
@@ -1563,7 +1575,7 @@ async function dispatchWebRequest(router, request) {
         body: request.body
     });
     let body;
-    if (method === exports.MethodName.HEAD || res.status === 304 || res.status === 101 || res.status === 204 || res.status === 205) {
+    if (method === MethodName.HEAD || res.status === 304 || res.status === 101 || res.status === 204 || res.status === 205) {
         body = null;
     } else {
         body = res.body;
@@ -1578,22 +1590,22 @@ function createWebDispatcher(router) {
     return async (request)=>dispatchWebRequest(router, request);
 }
 
-exports.HandlerType = void 0;
-(function(HandlerType) {
+var HandlerType = /*#__PURE__*/ function(HandlerType) {
     HandlerType["CORE"] = "core";
     HandlerType["ERROR"] = "error";
-})(exports.HandlerType || (exports.HandlerType = {}));
+    return HandlerType;
+}({});
 const HandlerSymbol = Symbol.for('Handler');
 
-var HookName;
-(function(HookName) {
+var HookName = /*#__PURE__*/ function(HookName) {
     HookName["ERROR"] = "error";
     HookName["DISPATCH_START"] = "dispatchStart";
     HookName["DISPATCH_END"] = "dispatchEnd";
     HookName["CHILD_MATCH"] = "childMatch";
     HookName["CHILD_DISPATCH_BEFORE"] = "childDispatchBefore";
     HookName["CHILD_DISPATCH_AFTER"] = "childDispatchAfter";
-})(HookName || (HookName = {}));
+    return HookName;
+}({});
 
 class HookManager {
     // --------------------------------------------------
@@ -1725,7 +1737,7 @@ class PathMatcher {
         this.path = path;
         this.regexpOptions = options || {};
         const regexp = pathToRegexp.pathToRegexp(path, options);
-        this.regexp = regexp;
+        this.regexp = regexp.regexp;
         this.regexpKeys = regexp.keys;
     }
 }
@@ -1766,7 +1778,7 @@ class Handler {
         }
         try {
             event.dispatched = await dispatch(event, (done)=>{
-                if (this.config.type === exports.HandlerType.ERROR) {
+                if (this.config.type === HandlerType.ERROR) {
                     if (event.error) {
                         return this.config.fn(event.error, event.request, event.response, done);
                     }
@@ -1810,7 +1822,7 @@ class Handler {
     }
     // --------------------------------------------------
     matchMethod(method) {
-        return !this.method || method === this.method || method === exports.MethodName.HEAD && this.method === exports.MethodName.GET;
+        return !this.method || method === this.method || method === MethodName.HEAD && this.method === MethodName.GET;
     }
     setMethod(input) {
         const method = toMethodName(input);
@@ -1842,12 +1854,12 @@ class Handler {
 function coreHandler(input) {
     if (typeof input === 'function') {
         return new Handler({
-            type: exports.HandlerType.CORE,
+            type: HandlerType.CORE,
             fn: input
         });
     }
     return new Handler({
-        type: exports.HandlerType.CORE,
+        type: HandlerType.CORE,
         ...input
     });
 }
@@ -1855,12 +1867,12 @@ function coreHandler(input) {
 function errorHandler(input) {
     if (typeof input === 'function') {
         return new Handler({
-            type: exports.HandlerType.ERROR,
+            type: HandlerType.ERROR,
             fn: input
         });
     }
     return new Handler({
-        type: exports.HandlerType.ERROR,
+        type: HandlerType.ERROR,
         ...input
     });
 }
@@ -1893,15 +1905,15 @@ function transformRouterOptions(input) {
 }
 
 const RouterSymbol = Symbol.for('Router');
-var RouterPipelineStep;
-(function(RouterPipelineStep) {
+var RouterPipelineStep = /*#__PURE__*/ function(RouterPipelineStep) {
     RouterPipelineStep[RouterPipelineStep["START"] = 0] = "START";
     RouterPipelineStep[RouterPipelineStep["LOOKUP"] = 1] = "LOOKUP";
     RouterPipelineStep[RouterPipelineStep["CHILD_BEFORE"] = 2] = "CHILD_BEFORE";
     RouterPipelineStep[RouterPipelineStep["CHILD_DISPATCH"] = 3] = "CHILD_DISPATCH";
     RouterPipelineStep[RouterPipelineStep["CHILD_AFTER"] = 4] = "CHILD_AFTER";
     RouterPipelineStep[RouterPipelineStep["FINISH"] = 5] = "FINISH";
-})(RouterPipelineStep || (RouterPipelineStep = {}));
+    return RouterPipelineStep;
+}({});
 
 let nextId = 0;
 function generateRouterID() {
@@ -1976,7 +1988,7 @@ class Router {
         let match;
         const item = this.stack[context.stackIndex];
         if (isHandler(item)) {
-            if (context.event.error && item.type === exports.HandlerType.CORE || !context.event.error && item.type === exports.HandlerType.ERROR) {
+            if (context.event.error && item.type === HandlerType.CORE || !context.event.error && item.type === HandlerType.ERROR) {
                 context.stackIndex++;
                 return this.executePipelineStepLookup(context);
             }
@@ -2050,13 +2062,13 @@ class Router {
         if (context.event.error || context.event.dispatched) {
             return this.hookManager.trigger(HookName.DISPATCH_END, context.event);
         }
-        if (!context.event.dispatched && context.event.routerPath.length === 1 && context.event.method && context.event.method === exports.MethodName.OPTIONS) {
-            if (context.event.methodsAllowed.indexOf(exports.MethodName.GET) !== -1) {
-                context.event.methodsAllowed.push(exports.MethodName.HEAD);
+        if (!context.event.dispatched && context.event.routerPath.length === 1 && context.event.method && context.event.method === MethodName.OPTIONS) {
+            if (context.event.methodsAllowed.indexOf(MethodName.GET) !== -1) {
+                context.event.methodsAllowed.push(MethodName.HEAD);
             }
             smob.distinctArray(context.event.methodsAllowed);
             const options = context.event.methodsAllowed.map((key)=>key.toUpperCase()).join(',');
-            context.event.response.setHeader(exports.HeaderName.ALLOW, options);
+            context.event.response.setHeader(HeaderName.ALLOW, options);
             await send(context.event.response, options);
             context.event.dispatched = true;
         }
@@ -2090,31 +2102,31 @@ class Router {
         });
     }
     delete(...input) {
-        this.useForMethod(exports.MethodName.DELETE, ...input);
+        this.useForMethod(MethodName.DELETE, ...input);
         return this;
     }
     get(...input) {
-        this.useForMethod(exports.MethodName.GET, ...input);
+        this.useForMethod(MethodName.GET, ...input);
         return this;
     }
     post(...input) {
-        this.useForMethod(exports.MethodName.POST, ...input);
+        this.useForMethod(MethodName.POST, ...input);
         return this;
     }
     put(...input) {
-        this.useForMethod(exports.MethodName.PUT, ...input);
+        this.useForMethod(MethodName.PUT, ...input);
         return this;
     }
     patch(...input) {
-        this.useForMethod(exports.MethodName.PATCH, ...input);
+        this.useForMethod(MethodName.PATCH, ...input);
         return this;
     }
     head(...input) {
-        this.useForMethod(exports.MethodName.HEAD, ...input);
+        this.useForMethod(MethodName.HEAD, ...input);
         return this;
     }
     options(...input) {
-        this.useForMethod(exports.MethodName.OPTIONS, ...input);
+        this.useForMethod(MethodName.OPTIONS, ...input);
         return this;
     }
     // --------------------------------------------------
@@ -2226,6 +2238,9 @@ exports.DispatchEvent = DispatchEvent;
 exports.EventStream = EventStream;
 exports.Handler = Handler;
 exports.HandlerSymbol = HandlerSymbol;
+exports.HandlerType = HandlerType;
+exports.HeaderName = HeaderName;
+exports.MethodName = MethodName;
 exports.PathMatcher = PathMatcher;
 exports.Router = Router;
 exports.RoutupError = RoutupError;