@e22m4u/js-trie-router 0.7.6 → 0.7.8

package/README.md

@@ -1035,6 +1035,42 @@ router.defineRoute({
 }
 ```
 
+### Перехват и логирование ошибок
+
+По умолчанию маршрутизатор не выводит информацию об ошибках в консоль,
+чтобы не нарушать формат логов приложения и не допускать утечки чувствительных
+данных (например, токенов из заголовков запроса).
+
+Если требуется реализовать собственное логирование ошибок, то можно
+переопределить встроенный сервис `RouterErrorSender`. Для этого потребуется
+унаследовать класс данного сервиса и подменить стандартную реализацию
+в контейнере маршрутизатора.
+
+```js
+import {TrieRouter, RouterErrorSender} from '@e22m4u/js-trie-router';
+
+// создание собственного сервиса обработки ошибок
+class CustomErrorSender extends RouterErrorSender {
+  send(request, response, error) {
+    // логирование ошибки удобным способом
+    console.error(`[Error on ${request.method} ${request.url}]:`, error);
+    // вызов родительского метода для стандартной
+    // отправки JSON-ответа с ошибкой клиенту
+    super.send(request, response, error);
+  }
+}
+
+const router = new TrieRouter();
+// подмена стандартного сервиса новым экземпляром,
+// передавая текущий контейнер в конструктор (обязательно)
+router.setService(RouterErrorSender, new CustomErrorSender(router.container));
+// ... регистрация маршрутов и запуск сервера
+```
+
+*При необходимости можно переопределить метод `send404(request, response)`,
+чтобы отслеживать запросы к несуществующим маршрутам или изменять формат
+ответа.*
+
 ## Отладка
 
 Установка переменной `DEBUG` включает вывод логов.

package/build-cjs.js

@@ -6,7 +6,7 @@ await esbuild.build({
   outfile: 'dist/cjs/index.cjs',
   format: 'cjs',
   platform: 'node',
-  target: ['node16'],
+  target: ['node18'],
   bundle: true,
   keepNames: true,
   external: [

package/dist/cjs/index.cjs

@@ -86,7 +86,10 @@ var import_js_debug = require("@e22m4u/js-debug");
 // src/debuggable-service.js
 var import_js_service = require("@e22m4u/js-service");
 var MODULE_DEBUG_NAMESPACE = "jsTrieRouter";
-var _DebuggableService = class _DebuggableService extends import_js_service.DebuggableService {
+var DebuggableService = class extends import_js_service.DebuggableService {
+  static {
+    __name(this, "DebuggableService");
+  }
   /**
    * Constructor.
    *
@@ -99,8 +102,6 @@ var _DebuggableService = class _DebuggableService extends import_js_service.Debu
     });
   }
 };
-__name(_DebuggableService, "DebuggableService");
-var DebuggableService = _DebuggableService;
 
 // src/utils/clone-deep.js
 function cloneDeep(value) {
@@ -953,7 +954,10 @@ __name(getRequestPathname, "getRequestPathname");
 // src/request-context.js
 var import_js_format11 = require("@e22m4u/js-format");
 var import_js_service2 = require("@e22m4u/js-service");
-var _RequestContext = class _RequestContext {
+var RequestContext = class {
+  static {
+    __name(this, "RequestContext");
+  }
   /**
    * Service container.
    *
@@ -1139,8 +1143,6 @@ var _RequestContext = class _RequestContext {
     this._route = route;
   }
 };
-__name(_RequestContext, "RequestContext");
-var RequestContext = _RequestContext;
 
 // src/hooks/router-hook-invoker.js
 var import_js_format13 = require("@e22m4u/js-format");
@@ -1154,7 +1156,10 @@ var RouterHookType = {
   POST_HANDLER: "postHandler"
 };
 var ROUTER_HOOK_TYPES = Object.values(RouterHookType);
-var _RouterHookRegistry = class _RouterHookRegistry {
+var RouterHookRegistry = class {
+  static {
+    __name(this, "RouterHookRegistry");
+  }
   /**
    * Hooks.
    *
@@ -1237,11 +1242,12 @@ var _RouterHookRegistry = class _RouterHookRegistry {
     return this._hooks.get(type) || [];
   }
 };
-__name(_RouterHookRegistry, "RouterHookRegistry");
-var RouterHookRegistry = _RouterHookRegistry;
 
 // src/hooks/router-hook-invoker.js
-var _RouterHookInvoker = class _RouterHookInvoker extends DebuggableService {
+var RouterHookInvoker = class extends DebuggableService {
+  static {
+    __name(this, "RouterHookInvoker");
+  }
   /**
    * Invoke on-request hooks.
    *
@@ -1502,8 +1508,6 @@ var _RouterHookInvoker = class _RouterHookInvoker extends DebuggableService {
     return currentData;
   }
 };
-__name(_RouterHookInvoker, "RouterHookInvoker");
-var RouterHookInvoker = _RouterHookInvoker;
 
 // src/route/validate-route-definition.js
 var import_js_format14 = require("@e22m4u/js-format");
@@ -1586,6 +1590,7 @@ __name(validateRouteDefinition, "validateRouteDefinition");
 // src/route/route.js
 var HttpMethod = {
   GET: "GET",
+  HEAD: "HEAD",
   POST: "POST",
   PUT: "PUT",
   PATCH: "PATCH",
@@ -1593,7 +1598,10 @@ var HttpMethod = {
   OPTIONS: "OPTIONS"
 };
 var DEFAULT_META = Object.freeze({});
-var _Route = class _Route extends import_js_debug.Debuggable {
+var Route = class extends import_js_debug.Debuggable {
+  static {
+    __name(this, "Route");
+  }
   /**
    * Definition.
    *
@@ -1695,14 +1703,15 @@ var _Route = class _Route extends import_js_debug.Debuggable {
     return this.handler(context);
   }
 };
-__name(_Route, "Route");
-var Route = _Route;
 
 // src/route/route-registry.js
 var import_js_path_trie = require("@e22m4u/js-path-trie");
 var import_js_service3 = require("@e22m4u/js-service");
 var import_js_format15 = require("@e22m4u/js-format");
-var _RouteRegistry = class _RouteRegistry extends DebuggableService {
+var RouteRegistry = class extends DebuggableService {
+  static {
+    __name(this, "RouteRegistry");
+  }
   /**
    * Constructor.
    *
@@ -1792,38 +1801,7 @@ var _RouteRegistry = class _RouteRegistry extends DebuggableService {
       requestPath
     );
   }
-  /**
-   * Get allowed methods for request path.
-   *
-   * @param {string} requestPath
-   * @returns {string[]}
-   */
-  getAllowedMethodsForRequestPath(requestPath) {
-    if (typeof requestPath !== "string") {
-      throw new import_js_format15.InvalidArgumentError(
-        'Parameter "requestPath" must be a String, but %v was given.',
-        requestPath
-      );
-    }
-    const debug = this.getDebuggerFor(this.getAllowedMethodsForRequestPath);
-    const allowedMethods = [];
-    for (const method of Object.values(HttpMethod)) {
-      const rawTriePath = `${method}/${requestPath}`;
-      const triePath = rawTriePath.replace(/\/+/g, "/");
-      if (this._trie.match(triePath)) {
-        allowedMethods.push(method);
-      }
-    }
-    if (allowedMethods.length) {
-      debug("Allowed methods for %v are: %l.", requestPath, allowedMethods);
-    } else {
-      debug("Path %v does not have allowed methods.", requestPath);
-    }
-    return allowedMethods;
-  }
 };
-__name(_RouteRegistry, "RouteRegistry");
-var RouteRegistry = _RouteRegistry;
 
 // src/branch/router-branch.js
 var import_js_format17 = require("@e22m4u/js-format");
@@ -1934,7 +1912,10 @@ function mergeRouterBranchDefinitions(firstDef, secondDef) {
 __name(mergeRouterBranchDefinitions, "mergeRouterBranchDefinitions");
 
 // src/branch/router-branch.js
-var _RouterBranch = class _RouterBranch extends DebuggableService {
+var RouterBranch = class _RouterBranch extends DebuggableService {
+  static {
+    __name(this, "RouterBranch");
+  }
   /**
    * Router.
    *
@@ -2053,8 +2034,6 @@ var _RouterBranch = class _RouterBranch extends DebuggableService {
     return new _RouterBranch(this._router, branchDef, this);
   }
 };
-__name(_RouterBranch, "RouterBranch");
-var RouterBranch = _RouterBranch;
 
 // src/parsers/request-parser.js
 var import_http3 = require("http");
@@ -2066,7 +2045,10 @@ var import_js_format19 = require("@e22m4u/js-format");
 
 // src/trie-router-options.js
 var import_js_format18 = require("@e22m4u/js-format");
-var _TrieRouterOptions = class _TrieRouterOptions {
+var TrieRouterOptions = class {
+  static {
+    __name(this, "TrieRouterOptions");
+  }
   /**
    * Request body bytes limit.
    *
@@ -2141,11 +2123,12 @@ var _TrieRouterOptions = class _TrieRouterOptions {
     }
   }
 };
-__name(_TrieRouterOptions, "TrieRouterOptions");
-var TrieRouterOptions = _TrieRouterOptions;
 
 // src/parsers/request-body-parser.js
-var _RequestBodyParser = class _RequestBodyParser extends DebuggableService {
+var RequestBodyParser = class extends DebuggableService {
+  static {
+    __name(this, "RequestBodyParser");
+  }
   /**
    * Parsers.
    *
@@ -2288,8 +2271,6 @@ var _RequestBodyParser = class _RequestBodyParser extends DebuggableService {
     });
   }
 };
-__name(_RequestBodyParser, "RequestBodyParser");
-var RequestBodyParser = _RequestBodyParser;
 function parseJsonBody(input) {
   if (typeof input !== "string") {
     return void 0;
@@ -2304,7 +2285,10 @@ __name(parseJsonBody, "parseJsonBody");
 
 // src/parsers/request-query-parser.js
 var import_querystring2 = __toESM(require("querystring"), 1);
-var _RequestQueryParser = class _RequestQueryParser extends DebuggableService {
+var RequestQueryParser = class extends DebuggableService {
+  static {
+    __name(this, "RequestQueryParser");
+  }
   /**
    * Parse
    *
@@ -2330,11 +2314,12 @@ var _RequestQueryParser = class _RequestQueryParser extends DebuggableService {
     return query;
   }
 };
-__name(_RequestQueryParser, "RequestQueryParser");
-var RequestQueryParser = _RequestQueryParser;
 
 // src/parsers/request-cookies-parser.js
-var _RequestCookiesParser = class _RequestCookiesParser extends DebuggableService {
+var RequestCookiesParser = class extends DebuggableService {
+  static {
+    __name(this, "RequestCookiesParser");
+  }
   /**
    * Parse
    *
@@ -2360,11 +2345,12 @@ var _RequestCookiesParser = class _RequestCookiesParser extends DebuggableServic
     return cookies;
   }
 };
-__name(_RequestCookiesParser, "RequestCookiesParser");
-var RequestCookiesParser = _RequestCookiesParser;
 
 // src/parsers/request-parser.js
-var _RequestParser = class _RequestParser extends DebuggableService {
+var RequestParser = class extends DebuggableService {
+  static {
+    __name(this, "RequestParser");
+  }
   /**
    * Parse.
    *
@@ -2402,15 +2388,16 @@ var _RequestParser = class _RequestParser extends DebuggableService {
     return promises.length ? Promise.all(promises).then(() => data) : data;
   }
 };
-__name(_RequestParser, "RequestParser");
-var RequestParser = _RequestParser;
 
 // src/trie-router.js
 var import_http4 = require("http");
 
 // src/senders/router-data-sender.js
 var import_js_format21 = require("@e22m4u/js-format");
-var _RouterDataSender = class _RouterDataSender extends DebuggableService {
+var RouterDataSender = class extends DebuggableService {
+  static {
+    __name(this, "RouterDataSender");
+  }
   /**
    * Send.
    *
@@ -2471,14 +2458,14 @@ var _RouterDataSender = class _RouterDataSender extends DebuggableService {
     debug(debugMsg);
   }
 };
-__name(_RouterDataSender, "RouterDataSender");
-var RouterDataSender = _RouterDataSender;
 
 // src/senders/router-error-sender.js
-var import_util = require("util");
 var import_statuses = __toESM(require("statuses"), 1);
 var EXPOSED_ERROR_PROPERTIES = ["code", "details"];
-var _RouterErrorSender = class _RouterErrorSender extends DebuggableService {
+var RouterErrorSender = class extends DebuggableService {
+  static {
+    __name(this, "RouterErrorSender");
+  }
   /**
    * Handle.
    *
@@ -2509,24 +2496,6 @@ var _RouterErrorSender = class _RouterErrorSender extends DebuggableService {
         body.error[name] = safeError[name];
       }
     });
-    const requestData = {
-      url: request.url,
-      method: request.method,
-      headers: request.headers
-    };
-    const inspectOptions = {
-      showHidden: false,
-      depth: null,
-      colors: true,
-      compact: false
-    };
-    console.warn((0, import_util.inspect)(requestData, inspectOptions));
-    console.warn((0, import_util.inspect)(body, inspectOptions));
-    if (error.stack) {
-      console.log(error.stack);
-    } else {
-      console.error(error);
-    }
     response.statusCode = statusCode;
     response.setHeader("Content-Type", "application/json; charset=utf-8");
     response.end(JSON.stringify(body, null, 2), "utf-8");
@@ -2556,12 +2525,13 @@ var _RouterErrorSender = class _RouterErrorSender extends DebuggableService {
     );
   }
 };
-__name(_RouterErrorSender, "RouterErrorSender");
-var RouterErrorSender = _RouterErrorSender;
 
 // src/trie-router.js
 var import_js_service4 = require("@e22m4u/js-service");
-var _TrieRouter = class _TrieRouter extends DebuggableService {
+var TrieRouter = class extends DebuggableService {
+  static {
+    __name(this, "TrieRouter");
+  }
   /**
    * Constructor.
    *
@@ -2616,7 +2586,7 @@ var _TrieRouter = class _TrieRouter extends DebuggableService {
    * Example:
    * ```js
    * const router = new TrieRouter();
-   * const apiBranch = router.createBranch({path: 'api'});
+   * const apiBranch = router.createBranch({path: '/api'});
    *
    * // GET /api/hello
    * apiBranch.defineRoute({
@@ -2683,22 +2653,6 @@ var _TrieRouter = class _TrieRouter extends DebuggableService {
       }
       const resolved = this.getService(RouteRegistry).matchRouteByRequest(request);
       if (!resolved) {
-        if (request.method.toUpperCase() === HttpMethod.OPTIONS) {
-          const allowedMethods = this.getService(RouteRegistry).getAllowedMethodsForRequestPath(
-            requestPath
-          );
-          if (allowedMethods.length > 0) {
-            debug("Auto-handling OPTIONS request.");
-            if (!allowedMethods.includes("OPTIONS")) {
-              allowedMethods.push("OPTIONS");
-            }
-            const allowHeader = allowedMethods.join(", ");
-            response.statusCode = 204;
-            response.setHeader("Allow", allowHeader);
-            response.end();
-            return;
-          }
-        }
         debug(
           "No route found for the request %s %v.",
           request.method,
@@ -2784,8 +2738,6 @@ var _TrieRouter = class _TrieRouter extends DebuggableService {
     return this.getService(RouterHookRegistry).hasHook(type, hook);
   }
 };
-__name(_TrieRouter, "TrieRouter");
-var TrieRouter = _TrieRouter;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CHARACTER_ENCODING_LIST,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-trie-router",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "description": "HTTP маршрутизатор для Node.js на основе префиксного дерева",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -26,7 +26,7 @@
     "require": "./dist/cjs/index.cjs"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "scripts": {
     "lint": "tsc && eslint ./src",
@@ -41,19 +41,19 @@
     "@e22m4u/js-debug": "~0.4.1",
     "@e22m4u/js-format": "~0.4.0",
     "@e22m4u/js-path-trie": "~0.2.0",
-    "@e22m4u/js-service": "~0.5.1",
+    "@e22m4u/js-service": "~0.6.1",
     "debug": "~4.4.3",
     "http-errors": "~2.0.1",
     "statuses": "~2.0.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "~20.4.2",
-    "@commitlint/config-conventional": "~20.4.2",
+    "@commitlint/cli": "~20.4.3",
+    "@commitlint/config-conventional": "~20.4.3",
     "@eslint/js": "~9.39.2",
     "@types/chai": "~5.2.3",
     "@types/chai-as-promised": "~8.0.2",
     "@types/mocha": "~10.0.10",
-    "c8": "~10.1.3",
+    "c8": "~11.0.0",
     "chai": "~6.2.2",
     "chai-as-promised": "~8.0.2",
     "esbuild": "~0.27.3",
@@ -61,9 +61,9 @@
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
     "eslint-plugin-import": "~2.32.0",
-    "eslint-plugin-jsdoc": "~62.7.0",
+    "eslint-plugin-jsdoc": "~62.7.1",
     "eslint-plugin-mocha": "~11.2.0",
-    "globals": "~17.3.0",
+    "globals": "~17.4.0",
     "husky": "~9.1.7",
     "mocha": "~11.7.5",
     "prettier": "~3.8.1",

package/src/hooks/router-hook-registry.d.ts

@@ -1,7 +1,8 @@
-import {Callable} from '../types.js';
 import {RouteDefinition} from '../route/index.js';
 import {ServiceContainer} from '@e22m4u/js-service';
 import {RequestContext} from '../request-context.js';
+import {Callable, ValueOrPromise} from '../types.js';
+import {IncomingMessage, ServerResponse} from 'http';
 import {DebuggableService} from '../debuggable-service.js';
 
 /**
@@ -30,6 +31,23 @@ export const ROUTER_HOOK_TYPES: RouterHookType[];
  */
 export type RouterHook = Callable;
 
+/**
+ * On defined route hook.
+ */
+export type OnDefineRouteHook = (
+  routeDef: RouteDefinition,
+  container: ServiceContainer,
+) => RouteDefinition | undefined;
+
+/**
+ * On request hook.
+ */
+export type OnRequestHook = (
+  request: IncomingMessage,
+  response: ServerResponse,
+  container: ServiceContainer,
+) => ValueOrPromise<boolean | undefined>;
+
 /**
  * Pre handler hook.
  */
@@ -40,18 +58,48 @@ export type PreHandlerHook = (ctx: RequestContext) => unknown;
  */
 export type PostHandlerHook = (ctx: RequestContext, data: unknown) => unknown;
 
-/**
- * On defined route hook.
- */
-export type OnDefineRouteHook = (
-  routeDef: RouteDefinition,
-  container: ServiceContainer,
-) => RouteDefinition | undefined;
-
 /**
  * Router hook registry.
  */
 export declare class RouterHookRegistry extends DebuggableService {
+  /**
+   * Add hook (overload for "onDefineRoute" hook).
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(
+    type: typeof RouterHookType.ON_DEFINE_ROUTE,
+    hook: OnDefineRouteHook,
+  ): this;
+
+  /**
+   * Add hook (overload for "onRequest" hook).
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type: typeof RouterHookType.ON_REQUEST, hook: OnRequestHook): this;
+
+  /**
+   * Add hook (overload for "preHandler" hook).
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type: typeof RouterHookType.PRE_HANDLER, hook: PreHandlerHook): this;
+
+  /**
+   * Add hook (overload for "postHandler" hook).
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(
+    type: typeof RouterHookType.POST_HANDLER,
+    hook: PostHandlerHook,
+  ): this;
+
   /**
    * Add hook.
    *
@@ -68,6 +116,34 @@ export declare class RouterHookRegistry extends DebuggableService {
    */
   hasHook(type: RouterHookType, hook: RouterHook): boolean;
 
+  /**
+   * Get hooks (overload for "onDefineRoute").
+   *
+   * @param type
+   */
+  getHooks(type: typeof RouterHookType.ON_DEFINE_ROUTE): OnDefineRouteHook[];
+
+  /**
+   * Get hooks (overload for "onRequest").
+   *
+   * @param type
+   */
+  getHooks(type: typeof RouterHookType.ON_REQUEST): OnRequestHook[];
+
+  /**
+   * Get hooks (overload for "preHandler").
+   *
+   * @param type
+   */
+  getHooks(type: typeof RouterHookType.PRE_HANDLER): PreHandlerHook[];
+
+  /**
+   * Get hooks (overload for "postHandler").
+   *
+   * @param type
+   */
+  getHooks(type: typeof RouterHookType.POST_HANDLER): PostHandlerHook[];
+
   /**
    * Get hooks.
    *

package/src/route/route-registry.d.ts

@@ -36,11 +36,4 @@ export declare class RouteRegistry extends DebuggableService {
    * @param request
    */
   matchRouteByRequest(request: IncomingMessage): ResolvedRoute | undefined;
-
-  /**
-   * Get allowed methods for request path.
-   *
-   * @param requestPath
-   */
-  getAllowedMethodsForRequestPath(requestPath: string): string[];
 }

package/src/route/route-registry.js

@@ -1,4 +1,4 @@
-import {HttpMethod, Route} from './route.js';
+import {Route} from './route.js';
 import {PathTrie} from '@e22m4u/js-path-trie';
 import {ServiceContainer} from '@e22m4u/js-service';
 import {getRequestPathname} from '../utils/index.js';
@@ -124,34 +124,4 @@ export class RouteRegistry extends DebuggableService {
       requestPath,
     );
   }
-
-  /**
-   * Get allowed methods for request path.
-   *
-   * @param {string} requestPath
-   * @returns {string[]}
-   */
-  getAllowedMethodsForRequestPath(requestPath) {
-    if (typeof requestPath !== 'string') {
-      throw new InvalidArgumentError(
-        'Parameter "requestPath" must be a String, but %v was given.',
-        requestPath,
-      );
-    }
-    const debug = this.getDebuggerFor(this.getAllowedMethodsForRequestPath);
-    const allowedMethods = [];
-    for (const method of Object.values(HttpMethod)) {
-      const rawTriePath = `${method}/${requestPath}`;
-      const triePath = rawTriePath.replace(/\/+/g, '/');
-      if (this._trie.match(triePath)) {
-        allowedMethods.push(method);
-      }
-    }
-    if (allowedMethods.length) {
-      debug('Allowed methods for %v are: %l.', requestPath, allowedMethods);
-    } else {
-      debug('Path %v does not have allowed methods.', requestPath);
-    }
-    return allowedMethods;
-  }
 }

package/src/route/route-registry.spec.js

@@ -2,7 +2,6 @@ import {expect} from 'chai';
 import {format} from '@e22m4u/js-format';
 import {Route, HttpMethod} from './route.js';
 import {RouteRegistry} from './route-registry.js';
-import {ServiceContainer} from '@e22m4u/js-service';
 import {RouterHookRegistry, RouterHookType} from '../hooks/index.js';
 
 describe('RouteRegistry', function () {
@@ -153,95 +152,4 @@ describe('RouteRegistry', function () {
       expect(res.params).to.be.eql({p1: 'baz', p2: 'qux'});
     });
   });
-
-  describe('getAllowedMethodsForRequestPath', function () {
-    it('should require the parameter "requestPath" to be a String', function () {
-      const S = new RouteRegistry();
-      const throwable = v => () => S.getAllowedMethodsForRequestPath(v);
-      const error = v =>
-        format(
-          'Parameter "requestPath" must be a String, but %s was given.',
-          v,
-        );
-      expect(throwable(10)).to.throw(error('10'));
-      expect(throwable(0)).to.throw(error('0'));
-      expect(throwable(true)).to.throw(error('true'));
-      expect(throwable(false)).to.throw(error('false'));
-      expect(throwable([])).to.throw(error('Array'));
-      expect(throwable({})).to.throw(error('Object'));
-      expect(throwable(undefined)).to.throw(error('undefined'));
-      expect(throwable(null)).to.throw(error('null'));
-      expect(throwable(() => undefined)).to.throw(error('Function'));
-      throwable('str')();
-      throwable('')();
-    });
-
-    it('should return an empty array if no routes match the path', function () {
-      const S = new RouteRegistry(new ServiceContainer());
-      S.defineRoute({
-        method: HttpMethod.GET,
-        path: '/foo',
-        handler: () => undefined,
-      });
-      const res = S.getAllowedMethodsForRequestPath('/bar');
-      expect(res).to.be.eql([]);
-    });
-
-    it('should return an array with a single method if only one matches', function () {
-      const S = new RouteRegistry(new ServiceContainer());
-      S.defineRoute({
-        method: HttpMethod.POST,
-        path: '/foo',
-        handler: () => undefined,
-      });
-      const res = S.getAllowedMethodsForRequestPath('/foo');
-      expect(res).to.be.eql([HttpMethod.POST]);
-    });
-
-    it('should return an array with multiple methods if several routes match the path', function () {
-      const S = new RouteRegistry(new ServiceContainer());
-      const handler = () => undefined;
-      S.defineRoute({method: HttpMethod.GET, path: '/foo', handler});
-      S.defineRoute({method: HttpMethod.POST, path: '/foo', handler});
-      S.defineRoute({method: HttpMethod.DELETE, path: '/foo', handler});
-      const res = S.getAllowedMethodsForRequestPath('/foo');
-      expect(res).to.be.eql([
-        HttpMethod.GET,
-        HttpMethod.POST,
-        HttpMethod.DELETE,
-      ]);
-    });
-
-    it('should correctly resolve allowed methods for paths with parameters', function () {
-      const S = new RouteRegistry(new ServiceContainer());
-      const handler = () => undefined;
-      S.defineRoute({method: HttpMethod.GET, path: '/users/:id', handler});
-      S.defineRoute({method: HttpMethod.PUT, path: '/users/:id', handler});
-      S.defineRoute({method: HttpMethod.POST, path: '/users', handler});
-      const res = S.getAllowedMethodsForRequestPath('/users/123');
-      expect(res).to.be.eql([HttpMethod.GET, HttpMethod.PUT]);
-    });
-
-    it('should distinguish between paths with and without trailing slash', function () {
-      const S = new RouteRegistry(new ServiceContainer());
-      const handler = () => undefined;
-      S.defineRoute({method: HttpMethod.GET, path: '/foo', handler});
-      S.defineRoute({method: HttpMethod.POST, path: '/foo/', handler});
-      const res1 = S.getAllowedMethodsForRequestPath('/foo');
-      expect(res1).to.be.eql([HttpMethod.GET]);
-      const res2 = S.getAllowedMethodsForRequestPath('/foo/');
-      expect(res2).to.be.eql([HttpMethod.POST]);
-    });
-
-    it('should check for the explicitly defined OPTIONS method', function () {
-      const S = new RouteRegistry(new ServiceContainer());
-      S.defineRoute({
-        method: HttpMethod.OPTIONS,
-        path: '/api',
-        handler: () => undefined,
-      });
-      const res = S.getAllowedMethodsForRequestPath('/api');
-      expect(res).to.be.eql([HttpMethod.OPTIONS]);
-    });
-  });
 });

package/src/route/route.d.ts

@@ -7,6 +7,7 @@ import {RouterHookRegistry} from '../hooks/index.js';
  */
 export declare const HttpMethod: {
   GET: 'GET';
+  HEAD: 'HEAD';
   POST: 'POST';
   PUT: 'PUT';
   PATCH: 'PATCH';

package/src/route/route.js

@@ -24,6 +24,7 @@ import {validateRouteDefinition} from './validate-route-definition.js';
  *
  * @type {{
  *   GET: 'GET',
+ *   HEAD: 'HEAD',
  *   POST: 'POST',
  *   PUT: 'PUT',
  *   PATCH: 'PATCH',
@@ -33,6 +34,7 @@ import {validateRouteDefinition} from './validate-route-definition.js';
  */
 export const HttpMethod = {
   GET: 'GET',
+  HEAD: 'HEAD',
   POST: 'POST',
   PUT: 'PUT',
   PATCH: 'PATCH',

package/src/senders/router-error-sender.js

@@ -1,4 +1,3 @@
-import {inspect} from 'util';
 import getStatusMessage from 'statuses';
 import {getRequestPathname} from '../utils/index.js';
 import {DebuggableService} from '../debuggable-service.js';
@@ -44,24 +43,6 @@ export class RouterErrorSender extends DebuggableService {
         body.error[name] = safeError[name];
       }
     });
-    const requestData = {
-      url: request.url,
-      method: request.method,
-      headers: request.headers,
-    };
-    const inspectOptions = {
-      showHidden: false,
-      depth: null,
-      colors: true,
-      compact: false,
-    };
-    console.warn(inspect(requestData, inspectOptions));
-    console.warn(inspect(body, inspectOptions));
-    if (error.stack) {
-      console.log(error.stack);
-    } else {
-      console.error(error);
-    }
     response.statusCode = statusCode;
     response.setHeader('Content-Type', 'application/json; charset=utf-8');
     response.end(JSON.stringify(body, null, 2), 'utf-8');

package/src/trie-router.d.ts

@@ -3,10 +3,18 @@ import {RouteDefinition} from './route/index.js';
 import {ServiceContainer} from '@e22m4u/js-service';
 import {IncomingMessage, ServerResponse} from 'http';
 import {DebuggableService} from './debuggable-service.js';
-import {RouterHook, RouterHookType} from './hooks/index.js';
 import {TrieRouterOptionsInput} from './trie-router-options.js';
 import {RouterBranch, RouterBranchDefinition} from './branch/index.js';
 
+import {
+  RouterHook,
+  OnRequestHook,
+  RouterHookType,
+  PreHandlerHook,
+  PostHandlerHook,
+  OnDefineRouteHook,
+} from './hooks/index.js';
+
 /**
  * Trie router.
  */
@@ -105,6 +113,44 @@ export declare class TrieRouter extends DebuggableService {
     response: ServerResponse,
   ): Promise<void>;
 
+  /**
+   * Add hook (overload for "onDefineRoute" hook).
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(
+    type: typeof RouterHookType.ON_DEFINE_ROUTE,
+    hook: OnDefineRouteHook,
+  ): this;
+
+  /**
+   * Add hook (overload for "onRequest" hook).
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type: typeof RouterHookType.ON_REQUEST, hook: OnRequestHook): this;
+
+  /**
+   * Add hook (overload for "preHandler" hook).
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type: typeof RouterHookType.PRE_HANDLER, hook: PreHandlerHook): this;
+
+  /**
+   * Add hook (overload for "postHandler" hook).
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(
+    type: typeof RouterHookType.POST_HANDLER,
+    hook: PostHandlerHook,
+  ): this;
+
   /**
    * Add hook.
    *

package/src/trie-router.js

@@ -1,10 +1,10 @@
 import {RouterBranch} from './branch/index.js';
+import {RouteRegistry} from './route/index.js';
 import {RequestParser} from './parsers/index.js';
 import {RequestContext} from './request-context.js';
 import {ServerResponse, IncomingMessage} from 'http';
 import {DebuggableService} from './debuggable-service.js';
 import {TrieRouterOptions} from './trie-router-options.js';
-import {HttpMethod, RouteRegistry} from './route/index.js';
 import {RouterDataSender, RouterErrorSender} from './senders/index.js';
 import {isServiceContainer, ServiceContainer} from '@e22m4u/js-service';
 import {isPromise, isResponseSent, getRequestPathname} from './utils/index.js';
@@ -83,7 +83,7 @@ export class TrieRouter extends DebuggableService {
    * Example:
    * ```js
    * const router = new TrieRouter();
-   * const apiBranch = router.createBranch({path: 'api'});
+   * const apiBranch = router.createBranch({path: '/api'});
    *
    * // GET /api/hello
    * apiBranch.defineRoute({
@@ -165,27 +165,6 @@ export class TrieRouter extends DebuggableService {
       const resolved =
         this.getService(RouteRegistry).matchRouteByRequest(request);
       if (!resolved) {
-        // обработка метода OPTIONS выполняется автоматически
-        // перед отправкой ошибки 404, если для пути запроса
-        // имеются другие методы, то вместо ошибки 404 будет
-        // отправлен ответ с "Allow*" заголовками
-        if (request.method.toUpperCase() === HttpMethod.OPTIONS) {
-          const allowedMethods =
-            this.getService(RouteRegistry).getAllowedMethodsForRequestPath(
-              requestPath,
-            );
-          if (allowedMethods.length > 0) {
-            debug('Auto-handling OPTIONS request.');
-            if (!allowedMethods.includes('OPTIONS')) {
-              allowedMethods.push('OPTIONS');
-            }
-            const allowHeader = allowedMethods.join(', ');
-            response.statusCode = 204;
-            response.setHeader('Allow', allowHeader);
-            response.end();
-            return;
-          }
-        }
         debug(
           'No route found for the request %s %v.',
           request.method,

package/src/trie-router.spec.js

@@ -1625,64 +1625,6 @@ describe('TrieRouter', function () {
         });
       });
     });
-
-    describe('OPTIONS method handling', function () {
-      it('should automatically return 204 with specific headers for an unhandled OPTIONS request', async function () {
-        const router = new TrieRouter();
-        router.defineRoute({
-          method: HttpMethod.GET,
-          path: '/api/resource',
-          handler: () => 'OK',
-        });
-        router.defineRoute({
-          method: HttpMethod.POST,
-          path: '/api/resource',
-          handler: () => 'OK',
-        });
-        const req = createRequestMock({
-          method: HttpMethod.OPTIONS,
-          path: '/api/resource',
-        });
-        const res = createResponseMock();
-        await router.handleRequest(req, res);
-        expect(res.statusCode).to.be.eq(204);
-        expect(res.getHeader('Allow')).to.be.eq('GET, POST, OPTIONS');
-      });
-
-      it('should execute a custom OPTIONS handler when it is explicitly defined', async function () {
-        const router = new TrieRouter();
-        let customOptionsCalled = false;
-        router.defineRoute({
-          method: HttpMethod.OPTIONS,
-          path: '/api/resource',
-          handler: () => {
-            customOptionsCalled = true;
-            return 'Custom OPTIONS response';
-          },
-        });
-        const req = createRequestMock({
-          method: HttpMethod.OPTIONS,
-          path: '/api/resource',
-        });
-        const res = createResponseMock();
-        await router.handleRequest(req, res);
-        const body = await res.getBody();
-        expect(customOptionsCalled).to.be.true;
-        expect(res.statusCode).to.be.eq(200);
-        expect(body).to.be.eq('Custom OPTIONS response');
-      });
-
-      it('should return 404 for an OPTIONS request if the path does not exist for any method', async function () {
-        const router = new TrieRouter();
-        const req = createRequestMock({
-          method: HttpMethod.OPTIONS,
-          path: '/unknown',
-        });
-        const res = createResponseMock();
-        await router.handleRequest(req, res);
-        expect(res.statusCode).to.be.eq(404);
-      });
-    });
   });
 
   describe('addHook', function () {

package/src/utils/create-request-mock.spec.js

@@ -7,7 +7,7 @@ import {createRequestMock} from './create-request-mock.js';
 import {CHARACTER_ENCODING_LIST} from './fetch-request-body.js';
 
 describe('createRequestMock', function () {
-  it('should require the option "options" to be an Object', function () {
+  it('should require the parameter "options" to be an Object', function () {
     const throwable = v => () => createRequestMock(v);
     const error = v =>
       format('Parameter "options" must be an Object, but %s was given.', v);
@@ -496,24 +496,24 @@ describe('createRequestMock', function () {
     expect(data).to.be.eql(body);
   });
 
-  it('should pass a value form the "url" option to the request url', function () {
+  it('should pass a value from the "url" option to the request url', function () {
     const req = createRequestMock({url: '/test'});
     expect(req.url).to.be.eq('/test');
   });
 
-  it('should pass a value form the "path" option to the request url', function () {
+  it('should pass a value from the "path" option to the request url', function () {
     const req = createRequestMock({path: '/test'});
     expect(req.url).to.be.eq('/test');
   });
 
-  it('should pass a string form the "query" option to the request url', async function () {
+  it('should pass a string from the "query" option to the request url', async function () {
     const req1 = createRequestMock({query: 'p1=foo&p2=bar'});
     const req2 = createRequestMock({query: '?p1=foo&p2=bar'});
     expect(req1.url).to.be.eq('/?p1=foo&p2=bar');
     expect(req2.url).to.be.eq('/?p1=foo&p2=bar');
   });
 
-  it('should pass an object form the "query" option to the request url', async function () {
+  it('should pass an object from the "query" option to the request url', async function () {
     const req = createRequestMock({query: {foo: 'bar', baz: 'qux'}});
     expect(req.url).to.be.eq('/?foo=bar&baz=qux');
   });

package/src/utils/create-response-mock.spec.js

@@ -139,7 +139,7 @@ describe('createResponseMock', function () {
   });
 
   describe('Stream', function () {
-    it('should set the property "headerSent" to true when the stream ends', function () {
+    it('should set the property "headersSent" to true when the stream ends', function () {
       const res = createResponseMock();
       expect(res.headersSent).to.be.false;
       res.end('test');

package/src/utils/fetch-request-body.d.ts

@@ -23,4 +23,4 @@ export const CHARACTER_ENCODING_LIST: (
 export declare function fetchRequestBody(
   request: IncomingMessage,
   bodyBytesLimit?: number,
-): Promise<string>;
+): Promise<string | undefined>;

package/src/utils/fetch-request-body.spec.js

@@ -123,7 +123,7 @@ describe('fetchRequestBody', function () {
       );
     });
 
-    it('should not throw an error if the body length does match with the header', async function () {
+    it('should not throw an error if the body length matches the header', async function () {
       const body = 'Lorem Ipsum is simply dummy text.';
       const contentLength = String(Buffer.from(body).byteLength);
       const req = createRequestMock({