@deepkit/http 1.0.19 → 1.1.0

package/dist/esm/src/static-serving.js

@@ -4,13 +4,26 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 function __assignType(fn, args) {
     fn.__type = args;
     return fn;
 }
+escapeHtml.__type = ['value', 'escapeHtml', 'P&2!&/"'];
+sendHtml.__type = [() => HttpResponse, 'response', 'status', 'title', 'body', 'headers', () => ({}), 'sendHtml', 'PP7!2"\'2#&2$&2%P&&LM2&>\'"/('];
+sendError.__type = [() => HttpResponse, 'response', 'status', 'headers', () => ({}), 'sendError', 'PP7!2"\'2#P&&LM2$>%"/&'];
+encodeUrl.__type = ['url', 'encodeUrl', 'P&2!&/"'];
+parseHttpDate.__type = ['date', 'parseHttpDate', 'PP&\'&FJ2!8\'/"'];
+parseTokenList.__type = ['value', 'parseTokenList', 'P&2!&F/"'];
+matchesETag.__type = ['header', 'etag', 'matchesETag', 'P&2!&2")/#'];
+parseRange.__type = ['size', 'header', 'start', 'end', -1, 'parseRange', 'P\'2!&2"PP\'4#\'4$MF.%-J/&'];
+sendFile.__type = [() => HttpRequest, 'request', () => HttpResponse, 'response', 'path', 'stats', 'sendFile', 'PP7!2"P7#2$&2%!2&"/\''];
+staticServe.__type = ['localPath', 'path', () => HttpRequest, 'request', () => HttpResponse, 'response', 'staticServe', 'P&2!&2"P7#2$P7%2&"/\''];
+staticOnRoute.__type = [() => httpWorkflow.onRoute.event, 'event', 'path', 'localPath', 'staticOnRoute', 'Pi!2"&2#&2$"/%'];
+serveStaticListener.__type = [() => AppModule, 'module', 'path', 'localPath', () => path, () => __ΩClassType, 'serveStaticListener', 'PP"7!2"&2#&2$>%n&/\''];
+loadHtml.__type = ['localPath', 'path', 'loadHtml', 'P&2!&2"&/#'];
+registerStaticHttpController.__type = [() => AppModule, 'module', () => __ΩStaticHttpOptions, 'options', 'registerStaticHttpController', 'PP"7!2"n#2$$/%'];
+const Ωt0 = [() => HttpRouter, 'P7!'];
+const Ωt1 = [() => HttpRouter, 'P7!'];
 /*
  * Deepkit Framework
  * Copyright (C) 2021 Deepkit UG, Marc J. Schmidt
@@ -21,8 +34,9 @@ function __assignType(fn, args) {
  * You should have received a copy of the MIT License along with this program.
  */
 import { http } from './decorator.js';
-import { join } from 'path';
-import { readFileSync, stat } from 'fs';
+import { join, normalize, resolve, sep } from 'path';
+import { createReadStream, readFileSync, stat } from 'fs';
+import { STATUS_CODES } from 'http';
 import { HtmlResponse, httpWorkflow } from './http.js';
 import { AppModule } from '@deepkit/app';
 import { normalizeDirectory } from './utils.js';
@@ -30,17 +44,216 @@ import { normalizeDirectory } from './utils.js';
 import { __ΩClassType } from '@deepkit/core';
 import { urlJoin } from '@deepkit/core';
 import { HttpRequest, HttpResponse } from './model.js';
-import send from 'send';
+import { getContentType } from './mime.js';
 import { eventDispatcher } from '@deepkit/event';
 import { HttpRouter, RouteConfig } from './router.js';
+const upPathRegExp = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
+function escapeHtml(value) {
+    return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;');
+}
+function sendHtml(response, status, title, body, headers = {}) {
+    const doc = `<!DOCTYPE html>\n<html lang="en">\n<head>\n<meta charset="utf-8">\n<title>${title}</title>\n</head>\n<body>\n<pre>${escapeHtml(body)}</pre>\n</body>\n</html>\n`;
+    for (const [name, value] of Object.entries(headers))
+        response.setHeader(name, value);
+    response.statusCode = status;
+    response.setHeader('Content-Type', 'text/html; charset=UTF-8');
+    response.setHeader('Content-Length', Buffer.byteLength(doc));
+    response.setHeader('Content-Security-Policy', "default-src 'none'");
+    response.setHeader('X-Content-Type-Options', 'nosniff');
+    response.end(doc);
+}
+function sendError(response, status, headers = {}) {
+    for (const name of response.getHeaderNames())
+        response.removeHeader(name);
+    sendHtml(response, status, 'Error', STATUS_CODES[status] || String(status), headers);
+}
+/**
+ * Encodes characters not allowed in a URL, but keeps already percent-encoded sequences.
+ */
+function encodeUrl(url) {
+    return url
+        .replace(/(^|[^\uD800-\uDBFF])[\uDC00-\uDFFF]|[\uD800-\uDBFF]([^\uDC00-\uDFFF]|$)/g, '$1\uFFFD$2')
+        .replace(/(?:[^\x21\x23-\x3B\x3D\x3F-\x5F\x61-\x7A\x7C\x7E]|%(?:[^0-9A-Fa-f]|[0-9A-Fa-f][^0-9A-Fa-f]|$))+/g, encodeURI);
+}
+function parseHttpDate(date) {
+    const timestamp = 'string' === typeof date ? Date.parse(date) : NaN;
+    return 'number' === typeof timestamp ? timestamp : NaN;
+}
+function parseTokenList(value) {
+    return value.split(',').map(__assignType(v => v.trim(), ['v', '', 'P"2!"/"'])).filter(__assignType(v => v !== '', ['v', '', 'P"2!"/"']));
+}
+function matchesETag(header, etag) {
+    return parseTokenList(header).some(__assignType(match => match === etag || match === 'W/' + etag || 'W/' + match === etag, ['match', '', 'P"2!"/"']));
+}
+/**
+ * Parses a `Range: bytes=...` header. Returns undefined for a syntactically invalid header, -1 if not satisfiable,
+ * and the ranges otherwise (overlapping and adjacent ranges are combined).
+ */
+function parseRange(size, header) {
+    const index = header.indexOf('=');
+    if (index === -1)
+        return;
+    const ranges = [];
+    for (const part of header.slice(index + 1).split(',')) {
+        const [startString, endString] = part.split('-');
+        let start = parseInt(startString, 10);
+        let end = parseInt(endString, 10);
+        if (isNaN(start)) {
+            // -nnn: the last nnn bytes
+            start = size - end;
+            end = size - 1;
+        }
+        else if (isNaN(end)) {
+            // nnn-: from nnn to the end
+            end = size - 1;
+        }
+        if (end > size - 1)
+            end = size - 1;
+        if (isNaN(start) || isNaN(end) || start > end || start < 0)
+            continue;
+        ranges.push({ start, end, index: ranges.length });
+    }
+    if (!ranges.length)
+        return -1;
+    const ordered = ranges.sort(__assignType((a, b) => a.start - b.start, ['a', 'b', '', 'P"2!"2""/#']));
+    let j = 0;
+    for (let i = 1; i < ordered.length; i++) {
+        const range = ordered[i];
+        const current = ordered[j];
+        if (range.start > current.end + 1) {
+            ordered[++j] = range;
+        }
+        else if (range.end > current.end) {
+            current.end = range.end;
+            current.index = Math.min(current.index, range.index);
+        }
+    }
+    ordered.length = j + 1;
+    return ordered.sort(__assignType((a, b) => a.index - b.index, ['a', 'b', '', 'P"2!"2""/#'])).map(__assignType(v => ({ start: v.start, end: v.end }), ['v', '', 'P"2!"/"']));
+}
+function sendFile(request, response, path, stats) {
+    if (response.headersSent)
+        return sendError(response, 500);
+    if (!response.getHeader('Accept-Ranges'))
+        response.setHeader('Accept-Ranges', 'bytes');
+    if (!response.getHeader('Cache-Control'))
+        response.setHeader('Cache-Control', 'public, max-age=0');
+    if (!response.getHeader('Last-Modified'))
+        response.setHeader('Last-Modified', stats.mtime.toUTCString());
+    if (!response.getHeader('ETag'))
+        response.setHeader('ETag', `W/"${stats.size.toString(16)}-${stats.mtime.getTime().toString(16)}"`);
+    if (!response.getHeader('Content-Type'))
+        response.setHeader('Content-Type', getContentType(path) || 'application/octet-stream');
+    const etag = String(response.getHeader('ETag'));
+    const lastModified = parseHttpDate(response.getHeader('Last-Modified'));
+    const headers = request.headers;
+    // precondition failure
+    const ifMatch = headers['if-match'];
+    if (ifMatch ? ifMatch !== '*' && !matchesETag(ifMatch, etag) : lastModified > parseHttpDate(headers['if-unmodified-since'])) {
+        return sendError(response, 412);
+    }
+    // not modified
+    const ifNoneMatch = headers['if-none-match'];
+    const ifModifiedSince = headers['if-modified-since'];
+    const noCache = /(?:^|,)\s*?no-cache\s*?(?:,|$)/.test(headers['cache-control'] || '');
+    const isCachable = (response.statusCode >= 200 && response.statusCode < 300) || response.statusCode === 304;
+    if (isCachable && (ifNoneMatch || ifModifiedSince) && !noCache) {
+        const fresh = ifNoneMatch
+            ? ifNoneMatch === '*' || matchesETag(ifNoneMatch, etag)
+            : lastModified <= parseHttpDate(ifModifiedSince);
+        if (fresh) {
+            for (const name of ['Content-Encoding', 'Content-Language', 'Content-Length', 'Content-Range', 'Content-Type']) {
+                response.removeHeader(name);
+            }
+            response.statusCode = 304;
+            response.end();
+            return;
+        }
+    }
+    let start = 0;
+    let length = stats.size;
+    const rangeHeader = headers.range;
+    if (rangeHeader && /^ *bytes=/.test(rangeHeader)) {
+        let ranges = parseRange(length, rangeHeader);
+        // If-Range: only send the range if the representation is unchanged, otherwise the whole file
+        const ifRange = headers['if-range'];
+        if (ifRange && (ifRange.includes('"') ? !ifRange.includes(etag) : !(lastModified <= parseHttpDate(ifRange)))) {
+            ranges = undefined;
+        }
+        if (ranges === -1) {
+            return sendError(response, 416, { 'Content-Range': `bytes */${length}` });
+        }
+        // multiple ranges are answered with the whole file
+        if (ranges && ranges.length === 1) {
+            response.statusCode = 206;
+            response.setHeader('Content-Range', `bytes ${ranges[0].start}-${ranges[0].end}/${length}`);
+            start = ranges[0].start;
+            length = ranges[0].end - ranges[0].start + 1;
+        }
+    }
+    response.setHeader('Content-Length', length);
+    if (request.method === 'HEAD') {
+        response.end();
+        return;
+    }
+    const stream = createReadStream(path, { start, end: Math.max(start, start + length - 1) });
+    response.once('close', () => stream.destroy());
+    stream.once('error', () => {
+        stream.destroy();
+        if (response.headersSent) {
+            response.destroy();
+        }
+        else {
+            sendError(response, 500);
+        }
+    });
+    stream.pipe(response);
+}
+/**
+ * Sends the file at `path` (URL encoded, relative to `localPath`) as response.
+ *
+ * Supports HEAD, Range requests, and conditional requests (ETag, Last-Modified).
+ * Paths with `..` are rejected with 403, paths to dotfiles (or in dot-directories) with 404.
+ */
 export function staticServe(localPath, path, request, response) {
-    return new Promise(__assignType((resolve, reject) => {
-        const res = send(request, path, { root: localPath });
-        res.pipe(response);
-        res.on('end', resolve);
-    }, ['resolve', 'reject', '', 'P"2!"2""/#']));
+    return new Promise(__assignType(resolvePromise => {
+        response.once('finish', resolvePromise);
+        response.once('close', resolvePromise);
+        let decodedPath;
+        try {
+            decodedPath = decodeURIComponent(path);
+        }
+        catch {
+            return sendError(response, 400);
+        }
+        if (decodedPath.includes('\0'))
+            return sendError(response, 400);
+        // normalize relative to root
+        if (decodedPath)
+            decodedPath = normalize('.' + sep + decodedPath);
+        if (upPathRegExp.test(decodedPath))
+            return sendError(response, 403);
+        // dotfiles are ignored
+        if (decodedPath.split(sep).some(__assignType(part => part.length > 1 && part[0] === '.', ['part', '', 'P"2!"/"'])))
+            return sendError(response, 404);
+        const filePath = normalize(join(resolve(localPath), decodedPath));
+        const hasTrailingSlash = path[path.length - 1] === '/';
+        stat(hasTrailingSlash ? join(filePath, 'index.html') : filePath, __assignType((error, stats) => {
+            if (error) {
+                const notFound = error.code === 'ENOENT' || error.code === 'ENOTDIR' || error.code === 'ENAMETOOLONG';
+                return sendError(response, notFound ? 404 : 500);
+            }
+            if (stats.isDirectory()) {
+                if (hasTrailingSlash)
+                    return sendError(response, 404);
+                const location = encodeUrl((path + '/').replace(/^\/+/, '/'));
+                sendHtml(response, 301, 'Redirecting', 'Redirecting to ' + location, { Location: location });
+                return;
+            }
+            sendFile(request, response, hasTrailingSlash ? join(filePath, 'index.html') : filePath, stats);
+        }, ['error', 'stats', '', 'P"2!"2""/#']));
+    }, ['resolvePromise', '', 'P"2!"/"']));
 }
-staticServe.__type = ['localPath', 'path', () => HttpRequest, 'request', () => HttpResponse, 'response', 'staticServe', 'P&2!&2"P7#2$P7%2&"/\''];
 export async function staticOnRoute(event, path, localPath) {
     if (event.sent)
         return;
@@ -49,7 +262,12 @@ export async function staticOnRoute(event, path, localPath) {
     if (!event.request.url?.startsWith(path))
         return;
     const relativePath = urlJoin('/', event.url.substr(path.length));
-    const finalLocalPath = join(localPath, relativePath);
+    const root = resolve(localPath);
+    const finalLocalPath = join(root, relativePath);
+    // paths outside of the root (e.g. /../../etc/passwd) are not checked at all, otherwise 403 (exists) and
+    // 404 (doesn't exist) would tell whether a file exists anywhere on the server
+    if (finalLocalPath !== root && !finalLocalPath.startsWith(root + sep))
+        return;
     return new Promise(__assignType(resolve => {
         stat(finalLocalPath, __assignType((err, stat) => {
             if (stat && stat.isFile()) {
@@ -59,7 +277,6 @@ export async function staticOnRoute(event, path, localPath) {
         }, ['err', 'stat', '', 'P"2!"2""/#']));
     }, ['resolve', '', 'P"2!"/"']));
 }
-staticOnRoute.__type = [() => httpWorkflow.onRoute.event, 'event', 'path', 'localPath', 'staticOnRoute', 'Pi!2"&2#&2$"/%'];
 export function serveStaticListener(module, path, localPath = path) {
     class HttpRequestStaticServingListener {
         onRoute(event) {
@@ -69,14 +286,9 @@ export function serveStaticListener(module, path, localPath = path) {
     HttpRequestStaticServingListener.__type = [() => httpWorkflow.onRoute.event, 'event', 'onRoute', 'HttpRequestStaticServingListener', 'Pi!2""0#5w$'];
     __decorate([
         eventDispatcher.listen(httpWorkflow.onRoute, 101) //after default route listener at 100
-        ,
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Object]),
-        __metadata("design:returntype", void 0)
     ], HttpRequestStaticServingListener.prototype, "onRoute", null);
     return HttpRequestStaticServingListener;
 }
-serveStaticListener.__type = [() => AppModule, 'module', 'path', 'localPath', () => path, () => __ΩClassType, 'serveStaticListener', 'PP"7!2"&2#&2$>%n&/\''];
 function loadHtml(localPath, path) {
     try {
         let indexHtml = readFileSync(join(localPath, 'index.html')).toString('utf8');
@@ -87,7 +299,6 @@ function loadHtml(localPath, path) {
         return '';
     }
 }
-loadHtml.__type = ['localPath', 'path', 'loadHtml', 'P&2!&2"&/#'];
 const __ΩStaticHttpOptions = ['path', 'localPath', 'groups', 'controllerName', 'indexReplace', 'StaticHttpOptions', 'P&4!&4"&F4#8&4$8P&&LM4%8Mw&y'];
 export { __ΩStaticHttpOptions as __ΩStaticHttpOptions };
 /**
@@ -114,10 +325,7 @@ export function registerStaticHttpController(module, options) {
     }
     StaticController.__type = [() => HttpRequest, 'request', () => HttpResponse, 'response', 'serveIndex', 'StaticController', 'PP7!2"P7#2$"0%5w&'];
     __decorate([
-        (http.GET().group(...groups)),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [HttpRequest, HttpResponse]),
-        __metadata("design:returntype", void 0)
+        (http.GET().group(...groups))
     ], StaticController.prototype, "serveIndex", null);
     if (options.controllerName) {
         Object.defineProperty(StaticController, 'name', { value: options.controllerName, writable: true });
@@ -130,7 +338,7 @@ export function registerStaticHttpController(module, options) {
         methodName: 'serveIndex',
     });
     route1.groups = groups;
-    (module.configureProvider.Ω = [[() => HttpRouter, 'P7!']], module.configureProvider(__assignType(router => router.addRoute(route1), ['router', '', 'P"2!"/"']), { global: true }));
+    (module.configureProvider.Ω = [Ωt0], module.configureProvider(__assignType(router => router.addRoute(route1), ['router', '', 'P"2!"/"']), { global: true }));
     if (path !== '/') {
         const route2 = new RouteConfig('static', ['GET'], path.slice(0, -1), {
             type: 'controller',
@@ -139,10 +347,9 @@ export function registerStaticHttpController(module, options) {
             methodName: 'serveIndex',
         });
         route2.groups = groups;
-        (module.configureProvider.Ω = [[() => HttpRouter, 'P7!']], module.configureProvider(__assignType(router => router.addRoute(route2), ['router', '', 'P"2!"/"']), { global: true }));
+        (module.configureProvider.Ω = [Ωt1], module.configureProvider(__assignType(router => router.addRoute(route2), ['router', '', 'P"2!"/"']), { global: true }));
     }
     module.addProvider(StaticController);
     module.addListener(serveStaticListener(module, normalizeDirectory(options.path), options.localPath));
 }
-registerStaticHttpController.__type = [() => AppModule, 'module', () => __ΩStaticHttpOptions, 'options', 'registerStaticHttpController', 'PP"7!2"n#2$$/%'];
 //# sourceMappingURL=static-serving.js.map

package/dist/esm/src/static-serving.js.map

@@ -1 +1 @@
-{"version":3,"file":"static-serving.js","sourceRoot":"","sources":["../../../src/static-serving.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"static-serving.js","sourceRoot":"","sources":["../../../src/static-serving.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;2CAqP+B,OAAO,CAAC,KAAK;;;;;;AArP5C;;;;;;;;GAQG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,IAAI,EAAS,MAAM,IAAI,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;;6BACb,eAAe;AAAlD,OAAO,EAAa,OAAO,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEtD,MAAM,YAAY,GAAG,4BAA4B,CAAC;AAElD,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACnI,CAAC;AAED,SAAS,QAAQ,CAAC,QAAsB,EAAE,MAAc,EAAE,KAAa,EAAE,IAAY,EAAE,UAAsC,EAAE;IAC3H,MAAM,GAAG,GAAG,6EAA6E,KAAK,mCAAmC,UAAU,CAAC,IAAI,CAAC,4BAA4B,CAAC;IAC9K,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrF,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;IAC/D,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7D,QAAQ,CAAC,SAAS,CAAC,yBAAyB,EAAE,oBAAoB,CAAC,CAAC;IACpE,QAAQ,CAAC,SAAS,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;IACxD,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,SAAS,CAAC,QAAsB,EAAE,MAAc,EAAE,UAAsC,EAAE;IAC/F,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,cAAc,EAAE;QAAE,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1E,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;AACzF,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,GAAW;IAC1B,OAAO,GAAG;SACL,OAAO,CAAC,0EAA0E,EAAE,YAAY,CAAC;SACjG,OAAO,CAAC,kGAAkG,EAAE,SAAS,CAAC,CAAC;AAChI,CAAC;AAED,SAAS,aAAa,CAAC,IAAiC;IACpD,MAAM,SAAS,GAAG,QAAQ,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACpE,OAAO,QAAQ,KAAK,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;AAC3D,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACjC,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,wBAAC,CAAC,MAAM,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,wBAAC,CAAC;AACrE,CAAC;AAED,SAAS,WAAW,CAAC,MAAc,EAAE,IAAY;IAC7C,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,cAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,KAAK,KAAK,IAAI,4BAAC,CAAC;AAClH,CAAC;AAED;;;GAGG;AACH,SAAS,UAAU,CAAC,IAAY,EAAE,MAAc;IAC5C,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,KAAK,KAAK,CAAC,CAAC;QAAE,OAAO;IAEzB,MAAM,MAAM,GAAoD,EAAE,CAAC;IACnE,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACpD,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACtC,IAAI,GAAG,GAAG,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAElC,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YACf,2BAA2B;YAC3B,KAAK,GAAG,IAAI,GAAG,GAAG,CAAC;YACnB,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC;QACnB,CAAC;aAAM,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YACpB,4BAA4B;YAC5B,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC;QACnB,CAAC;QACD,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC;YAAE,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC;QACnC,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,GAAG,GAAG,IAAI,KAAK,GAAG,CAAC;YAAE,SAAS;QACrE,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACtD,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,MAAM;QAAE,OAAO,CAAC,CAAC,CAAC;IAE9B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,cAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,gCAAC,CAAC;IACzD,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;QACzB,CAAC;aAAM,IAAI,KAAK,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;YACxB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QACzD,CAAC;IACL,CAAC;IACD,OAAO,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,OAAO,CAAC,IAAI,cAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,gCAAC,CAAC,GAAG,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,wBAAC,CAAC;AAChG,CAAC;AAED,SAAS,QAAQ,CAAC,OAAoB,EAAE,QAAsB,EAAE,IAAY,EAAE,KAAY;IACtF,IAAI,QAAQ,CAAC,WAAW;QAAE,OAAO,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAE1D,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC;QAAE,QAAQ,CAAC,SAAS,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACvF,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC;QAAE,QAAQ,CAAC,SAAS,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;IACnG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC;QAAE,QAAQ,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IACzG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC;QAAE,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACpI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,CAAC;QAAE,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC,IAAI,CAAC,IAAI,0BAA0B,CAAC,CAAC;IAEhI,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC;IACxE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAEhC,uBAAuB;IACvB,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACpC,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC;QAC1H,OAAO,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,eAAe;IACf,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAC7C,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,gCAAgC,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;IACtF,MAAM,UAAU,GAAG,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,CAAC;IAC5G,IAAI,UAAU,IAAI,CAAC,WAAW,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7D,MAAM,KAAK,GAAG,WAAW;YACrB,CAAC,CAAC,WAAW,KAAK,GAAG,IAAI,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC;YACvD,CAAC,CAAC,YAAY,IAAI,aAAa,CAAC,eAAe,CAAC,CAAC;QACrD,IAAI,KAAK,EAAE,CAAC;YACR,KAAK,MAAM,IAAI,IAAI,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,CAAC,EAAE,CAAC;gBAC7G,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC;YACD,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;YAC1B,QAAQ,CAAC,GAAG,EAAE,CAAC;YACf,OAAO;QACX,CAAC;IACL,CAAC;IAED,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;IACxB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;IAClC,IAAI,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/C,IAAI,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAE7C,6FAA6F;QAC7F,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3G,MAAM,GAAG,SAAS,CAAC;QACvB,CAAC;QAED,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YAChB,OAAO,SAAS,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,eAAe,EAAE,WAAW,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9E,CAAC;QAED,mDAAmD;QACnD,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;YAC1B,QAAQ,CAAC,SAAS,CAAC,eAAe,EAAE,SAAS,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;YAC3F,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACxB,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QACjD,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAE7C,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAC5B,QAAQ,CAAC,GAAG,EAAE,CAAC;QACf,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3F,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;QACtB,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACvB,QAAQ,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;aAAM,CAAC;YACJ,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC7B,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CACvB,SAAiB,EACjB,IAAY,EACZ,OAAoB,EACpB,QAAsB;IAEtB,OAAO,IAAI,OAAO,cAAC,cAAc,CAAC,EAAE;QAChC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACxC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAEvC,IAAI,WAAmB,CAAC;QACxB,IAAI,CAAC;YACD,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAEhE,6BAA6B;QAC7B,IAAI,WAAW;YAAE,WAAW,GAAG,SAAS,CAAC,GAAG,GAAG,GAAG,GAAG,WAAW,CAAC,CAAC;QAClE,IAAI,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC;YAAE,OAAO,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAEpE,uBAAuB;QACvB,IAAI,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,cAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,2BAAC;YAAE,OAAO,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAE7G,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;QAClE,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC;QAEvD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,eAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC9E,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC;gBACtG,OAAO,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACrD,CAAC;YACD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;gBACtB,IAAI,gBAAgB;oBAAE,OAAO,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBACtD,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC9D,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,EAAE,iBAAiB,GAAG,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC7F,OAAO;YACX,CAAC;YACD,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACnG,CAAC,wCAAC,CAAC;IACP,CAAC,qCAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAC/B,KAAwC,EACxC,IAAY,EACZ,SAAiB;IAEjB,IAAI,KAAK,CAAC,IAAI;QAAE,OAAO;IACvB,IAAI,KAAK,CAAC,KAAK;QAAE,OAAO;IAExB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO;IAEjD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAChD,wGAAwG;IACxG,8EAA8E;IAC9E,IAAI,cAAc,KAAK,IAAI,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,GAAG,GAAG,CAAC;QAAE,OAAO;IAE9E,OAAO,IAAI,OAAO,cAAC,OAAO,CAAC,EAAE;QACzB,IAAI,CAAC,cAAc,eAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;gBACxB,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;YACpG,CAAC;YACD,OAAO,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC,qCAAC,CAAC;IACP,CAAC,8BAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAsB,EAAE,IAAY,EAAE,YAAoB,IAAI;IAC9F,MAAM,gCAAgC;QAElC,OAAO,CAAC,KAAwC;YAC5C,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC;;kEAFkC,OAAO,CAAC,KAAK;IAAhD;QADC,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,qCAAqC;mEAGvF;IAGL,OAAO,gCAAgC,CAAC;AAC5C,CAAC;AAED,SAAS,QAAQ,CAAC,SAAiB,EAAE,IAAY;IAC7C,IAAI,CAAC;QACD,IAAI,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7E,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,iBAAiB,EAAE,eAAe,IAAI,IAAI,CAAC,CAAC;QAC1E,OAAO,SAAS,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;;;AA0BD;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAAsB,EAAE,OAA0B;IAC3F,IAAI,SAAS,GAAG,EAAE,CAAC;IAEnB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;IAEpC,MAAM,gBAAgB;QAElB,UAAU,CAAC,OAAoB,EAAE,QAAsB;YACnD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC1E,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;oBACvB,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;wBACxD,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBACxC,CAAC;gBACL,CAAC;YACL,CAAC;YACD,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;QAC9F,CAAC;;;IAVD;QADC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;sDAW7B;IAGL,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QACzB,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACvG,CAAC;IAED,MAAM,IAAI,GAAG,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE;QACpD,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE,gBAAgB;QAC5B,MAAM;QACN,UAAU,EAAE,YAAY;KAC3B,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAA,MAAM,CAAC,iBAAiB,YAAxB,MAAM,CAAC,iBAAiB,cAAa,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,8BAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAC;IAE1F,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;YACjE,IAAI,EAAE,YAAY;YAClB,UAAU,EAAE,gBAAgB;YAC5B,MAAM;YACN,UAAU,EAAE,YAAY;SAC3B,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,CAAA,MAAM,CAAC,iBAAiB,YAAxB,MAAM,CAAC,iBAAiB,cAAa,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,8BAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAC;IAC9F,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;IACrC,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;AACzG,CAAC"}

package/dist/esm/src/utils.js

@@ -1,3 +1,4 @@
+normalizeDirectory.__type = ['path', 'normalizeDirectory', 'P&2!&/"'];
 export function normalizeDirectory(path) {
     if (path[0] !== '/')
         path = '/' + path;
@@ -5,5 +6,4 @@ export function normalizeDirectory(path) {
         path = path + '/';
     return path;
 }
-normalizeDirectory.__type = ['path', 'normalizeDirectory', 'P&2!&/"'];
 //# sourceMappingURL=utils.js.map

package/dist/esm/src/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC3C,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG;QAAE,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC;IACvC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;QAAE,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC;IACrD,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils.ts"],"names":[],"mappings":";AAAA,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC3C,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG;QAAE,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC;IACvC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;QAAE,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC;IACrD,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/index.ts

@@ -12,3 +12,5 @@ export * from './src/controllers.js';
 export * from './src/middleware.js';
 export * from './src/filter.js';
 export * from './src/utils.js';
+export * from './src/query-string.js';
+export * from './src/mime.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepkit/http",
-  "version": "1.0.19",
+  "version": "1.1.0",
   "description": "Deepkit HTTP server and router.",
   "type": "commonjs",
   "main": "./dist/cjs/index.js",
@@ -23,34 +23,31 @@
     "build": "echo '{\"type\": \"module\"}' > ./dist/esm/package.json"
   },
   "peerDependencies": {
-    "@deepkit/app": "^1.0.1",
-    "@deepkit/core": "^1.0.1",
-    "@deepkit/event": "^1.0.1",
-    "@deepkit/injector": "^1.0.1",
-    "@deepkit/logger": "^1.0.1",
-    "@deepkit/stopwatch": "^1.0.1",
-    "@deepkit/template": "^1.0.1",
-    "@deepkit/type": "^1.0.1",
-    "@deepkit/workflow": "^1.0.1"
+    "@deepkit/app": "^1.1.0",
+    "@deepkit/core": "^1.1.0",
+    "@deepkit/event": "^1.1.0",
+    "@deepkit/injector": "^1.1.0",
+    "@deepkit/logger": "^1.1.0",
+    "@deepkit/stopwatch": "^1.1.0",
+    "@deepkit/template": "^1.1.0",
+    "@deepkit/type": "^1.1.0",
+    "@deepkit/workflow": "^1.1.0"
   },
   "dependencies": {
-    "formidable": "^3.5.2",
-    "qs": "^6.14.0",
-    "send": "^1.1.0"
+    "formidable": "^3.5.2"
   },
   "devDependencies": {
-    "@deepkit/app": "^1.0.19",
-    "@deepkit/core": "^1.0.19",
-    "@deepkit/event": "^1.0.19",
-    "@deepkit/injector": "^1.0.19",
-    "@deepkit/logger": "^1.0.19",
-    "@deepkit/stopwatch": "^1.0.19",
-    "@deepkit/template": "^1.0.19",
-    "@deepkit/type": "^1.0.19",
-    "@deepkit/workflow": "^1.0.19",
+    "@deepkit/app": "^1.1.0",
+    "@deepkit/core": "^1.1.0",
+    "@deepkit/event": "^1.1.0",
+    "@deepkit/injector": "^1.1.0",
+    "@deepkit/logger": "^1.1.0",
+    "@deepkit/stopwatch": "^1.1.0",
+    "@deepkit/template": "^1.1.0",
+    "@deepkit/type": "^1.1.0",
+    "@deepkit/workflow": "^1.1.0",
     "@types/formidable": "^3.4.5",
-    "@types/node": "^22.13.1",
-    "@types/send": "^0.14.6"
+    "@types/node": "^22.13.1"
   },
   "jest": {
     "testEnvironment": "node",
@@ -70,5 +67,5 @@
       "**/tests/**/*.spec.ts"
     ]
   },
-  "gitHead": "e8ce2fe13cfaec38a3f702be203db50b618de38e"
+  "gitHead": "56081823b559bb68b77a8781957af5d9c2e019a7"
 }

package/src/http.ts

@@ -27,9 +27,10 @@ export function isElementStruct(v: any): v is ElementStruct {
 
 let templateRender: typeof render;
 
-function getTemplateRender(): typeof render {
+// @deepkit/template is optional, so it's only loaded when a controller returns a JSX element.
+async function getTemplateRender(): Promise<typeof render> {
     if (!templateRender) {
-        const template = require('@deepkit/template');
+        const template = await import('@deepkit/template');
         templateRender = template.render;
     }
 
@@ -110,6 +111,9 @@ export class HttpInternalServerError extends createHttpError(500, 'Internal serv
 export class HttpNotImplementedError extends createHttpError(501, 'Not implemented') {
 }
 
+export class HttpGatewayTimeoutError extends createHttpError(504, 'Gateway timeout') {
+}
+
 export class HttpWorkflowEvent extends BaseEvent {
     public nextState?: any;
     public nextStateEvent?: any;
@@ -318,7 +322,7 @@ export const httpWorkflow = createWorkflow('http', {
 }, {
     start: 'request',
     request: 'route',
-    route: ['auth', 'routeNotFound'],
+    route: ['auth', 'routeNotFound', 'response'],
     auth: ['resolveParameters', 'accessDenied'],
     resolveParameters: ['controller', 'parametersFailed'],
     accessDenied: 'response',
@@ -543,7 +547,7 @@ export class HttpListener {
         protected injector: Injector,
         protected stopwatch: Stopwatch,
     ) {
-        this.setRouteConfig = injector.createSetter(RouteConfig, {name: 'http'});
+        this.setRouteConfig = injector.createSetter(RouteConfig, 'http');
     }
 
     @eventDispatcher.listen(httpWorkflow.onRequest, 100)
@@ -559,6 +563,7 @@ export class HttpListener {
         if (event.sent) return;
         if (event.hasNext()) return;
         const logger = this.logger;
+        let inMiddleware = false;
 
         try {
             const resolved = this.router.resolveRequest(event.request);
@@ -570,6 +575,7 @@ export class HttpListener {
                 if (resolved.middlewares) {
                     const middlewares = resolved.middlewares(event.injectorContext);
                     if (middlewares.length) {
+                        inMiddleware = true;
                         await asyncOperation(async (resolve, reject) => {
                             let lastTimer: any = undefined;
 
@@ -581,6 +587,7 @@ export class HttpListener {
 
                             event.response.once('finish', finish);
                             let i = -1;
+                            let timedOut = false;
 
                             async function next() {
                                 i++;
@@ -594,14 +601,18 @@ export class HttpListener {
                                 const timeout = middlewares[i].timeout;
                                 if (timeout !== undefined && timeout > 0) {
                                     lastTimer = setTimeout(() => {
+                                        //a middleware that neither calls next() nor ends the response in time fails the request
+                                        timedOut = true;
                                         logger.warn(`Middleware timed out. Increase the timeout or fix the middleware. (${middlewares[i].fn})`);
-                                        next();
+                                        event.response.off('finish', finish);
+                                        reject(new HttpGatewayTimeoutError('Middleware timed out'));
                                     }, timeout);
                                 }
 
                                 try {
                                     await middlewares[i].fn(event.request, event.response, (error?: any) => {
                                         if (lastTimer) clearTimeout(lastTimer);
+                                        if (timedOut) return;
                                         if (error) {
                                             event.response.off('finish', finish);
                                             reject(error);
@@ -610,19 +621,42 @@ export class HttpListener {
                                         }
                                     });
                                 } catch (error) {
+                                    event.response.off('finish', finish);
                                     reject(error);
                                 }
                             }
 
                             await next();
                         });
+                        inMiddleware = false;
                     }
                 }
 
+                if (event.sent) {
+                    //a middleware ended the request, so we skip the controller but still trigger onResponse (e.g. for logging)
+                    event.next('response', new HttpResponseEvent(event.injectorContext, event.request, event.response, undefined, resolved.routeConfig));
+                    return;
+                }
+
                 this.setRouteConfig(resolved.routeConfig, event.injectorContext.scope);
                 event.routeFound(resolved.routeConfig, resolved.parameters);
             }
         } catch (error) {
+            if (error instanceof HttpError) {
+                if (event.request.throwErrorOnNotFound && error.httpCode === 404) {
+                    throw error;
+                }
+                event.send(new JSONResponse({
+                    message: error.message
+                }, error.httpCode).disableAutoSerializing());
+                return;
+            }
+            if (inMiddleware) {
+                //like a failing controller, an error of a middleware is a server error (#439)
+                this.logger.error('Middleware error', error);
+                event.send(new HtmlResponse('Internal error', 500));
+                return;
+            }
             this.logger.error('Could not resolve request', error);
             event.notFound();
         }
@@ -702,7 +736,7 @@ export class HttpListener {
             }
 
             if (isElementStruct(result)) {
-                const html = await getTemplateRender()(event.injectorContext.getRootInjector(), result, this.stopwatch ? this.stopwatch : undefined);
+                const html = await (await getTemplateRender())(event.injectorContext.getRootInjector(), result, this.stopwatch ? this.stopwatch : undefined);
                 result = new HtmlResponse(html, 200).header('Content-Type', 'text/html; charset=utf-8');
             }
             if (result instanceof stream.Readable) {

package/src/middleware.ts

@@ -79,8 +79,8 @@ export class HttpMiddlewareApi {
     }
 
     /**
-     * When the middleware does not respond (either calling next() or sending headers) withing <timeout> milliseconds,
-     * automatically the next is executed and warning printed.
+     * When the middleware neither calls next() nor ends the response within <timeout> milliseconds,
+     * the request fails with HttpGatewayTimeoutError (504) and a warning is logged.
      */
     timeout(timeout: number) {
         this.t.timeout = timeout;