@e22m4u/js-trie-router 0.3.1 → 0.3.3

package/dist/cjs/index.cjs

@@ -925,6 +925,10 @@ var _Route = class _Route extends import_js_debug.Debuggable {
 __name(_Route, "Route");
 var Route = _Route;
 
+// src/trie-router.js
+var import_http4 = require("http");
+var import_http5 = require("http");
+
 // src/senders/data-sender.js
 var import_js_format15 = require("@e22m4u/js-format");
 var _DataSender = class _DataSender extends DebuggableService {
@@ -1619,6 +1623,8 @@ var _TrieRouter = class _TrieRouter extends DebuggableService {
       const container = new import_js_service5.ServiceContainer(this.container);
       const context = new RequestContext(container, req, res);
       container.set(RequestContext, context);
+      container.set(import_http5.IncomingMessage, req);
+      container.set(import_http4.ServerResponse, res);
       context.params = params;
       let data;
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-trie-router",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "HTTP маршрутизатор для Node.js на основе префиксного дерева",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -38,10 +38,10 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@e22m4u/js-debug": "~0.3.1",
+    "@e22m4u/js-debug": "~0.3.2",
     "@e22m4u/js-format": "~0.2.0",
     "@e22m4u/js-path-trie": "~0.0.12",
-    "@e22m4u/js-service": "~0.4.0",
+    "@e22m4u/js-service": "~0.4.4",
     "debug": "~4.4.3",
     "http-errors": "~2.0.0",
     "statuses": "~2.0.2"
@@ -49,20 +49,20 @@
   "devDependencies": {
     "@commitlint/cli": "~20.1.0",
     "@commitlint/config-conventional": "~20.0.0",
-    "@eslint/js": "~9.36.0",
+    "@eslint/js": "~9.38.0",
     "@types/chai-as-promised": "~8.0.2",
     "c8": "~10.1.3",
     "chai": "~6.2.0",
     "chai-as-promised": "~8.0.2",
-    "esbuild": "~0.25.10",
-    "eslint": "~9.36.0",
+    "esbuild": "~0.25.11",
+    "eslint": "~9.38.0",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
-    "eslint-plugin-jsdoc": "~60.6.0",
-    "eslint-plugin-mocha": "~11.1.0",
+    "eslint-plugin-jsdoc": "~61.1.10",
+    "eslint-plugin-mocha": "~11.2.0",
     "globals": "~16.4.0",
     "husky": "~9.1.7",
-    "mocha": "~11.7.3",
+    "mocha": "~11.7.4",
     "prettier": "~3.6.2",
     "rimraf": "~6.0.1",
     "typescript": "~5.9.3"

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

@@ -1,4 +1,5 @@
 import {Callable} from '../types.js';
+import {RequestContext} from '../request-context.js';
 import {DebuggableService} from '../debuggable-service.js';
 
 /**
@@ -17,12 +18,38 @@ export type HookType = (typeof HookType)[keyof typeof HookType];
 /**
  * Router hook.
  */
-export type RouterHook<T = unknown> = Callable<T>;
+export type RouterHook = Callable;
+
+/**
+ * Pre handler hook.
+ */
+export type PreHandlerHook = (ctx: RequestContext) => unknown;
+
+/**
+ * Post handler hook.
+ */
+export type PostHandlerHook = (ctx: RequestContext, data: unknown) => unknown;
 
 /**
  * Hook registry.
  */
 export declare class HookRegistry extends DebuggableService {
+  /**
+   * Add hook.
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type: typeof HookType.PRE_HANDLER, hook: PreHandlerHook): this;
+
+  /**
+   * Add hook.
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type: typeof HookType.POST_HANDLER, hook: PostHandlerHook): this;
+
   /**
    * Add hook.
    *

package/src/trie-router.d.ts

@@ -1,10 +1,15 @@
 import {Route} from './route.js';
 import {RequestListener} from 'http';
-import {HookType} from './hooks/index.js';
 import {RouteDefinition} from './route.js';
-import {RouterHook} from './hooks/index.js';
 import {DebuggableService} from './debuggable-service.js';
 
+import {
+  HookType,
+  RouterHook,
+  PostHandlerHook,
+  PreHandlerHook,
+} from './hooks/index.js';
+
 /**
  * Trie router.
  */
@@ -56,6 +61,22 @@ export declare class TrieRouter extends DebuggableService {
    */
   get requestListener(): RequestListener;
 
+  /**
+   * Add hook.
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type: typeof HookType.PRE_HANDLER, hook: PreHandlerHook): this;
+
+  /**
+   * Add hook.
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type: typeof HookType.POST_HANDLER, hook: PostHandlerHook): this;
+
   /**
    * Add hook.
    *

package/src/trie-router.js

@@ -1,9 +1,12 @@
+import {ServerResponse} from 'http';
+import {IncomingMessage} from 'http';
 import {HookType} from './hooks/index.js';
-import {isPromise, isResponseSent} from './utils/index.js';
+import {isPromise} from './utils/index.js';
 import {HookInvoker} from './hooks/index.js';
 import {DataSender} from './senders/index.js';
 import {HookRegistry} from './hooks/index.js';
 import {ErrorSender} from './senders/index.js';
+import {isResponseSent} from './utils/index.js';
 import {RequestParser} from './parsers/index.js';
 import {RouteRegistry} from './route-registry.js';
 import {RequestContext} from './request-context.js';
@@ -94,8 +97,12 @@ export class TrieRouter extends DebuggableService {
       const container = new ServiceContainer(this.container);
       const context = new RequestContext(container, req, res);
       // регистрация контекста запроса в сервис-контейнере
-      // для удобного доступа через container.getRegistered(RequestContext)
+      // для доступа через container.getRegistered(RequestContext)
       container.set(RequestContext, context);
+      // регистрация текущего экземпляра IncomingMessage
+      // и ServerResponse в сервис-контейнере запроса
+      container.set(IncomingMessage, req);
+      container.set(ServerResponse, res);
       // запись параметров пути в контекст запроса,
       // так как они были определены в момент
       // поиска подходящего роута

package/src/trie-router.spec.js

@@ -1,5 +1,7 @@
 import {Route} from './route.js';
 import {expect} from './chai.js';
+import {ServerResponse} from 'http';
+import {IncomingMessage} from 'http';
 import {HttpMethod} from './route.js';
 import {HookType} from './hooks/index.js';
 import {TrieRouter} from './trie-router.js';
@@ -473,6 +475,38 @@ describe('TrieRouter', function () {
       router.requestListener(req, res);
     });
 
+    it('should register the IncomingMessage in the request-scope ServiceContainer', function (done) {
+      const router = new TrieRouter();
+      const req = createRequestMock();
+      const res = createResponseMock();
+      router.defineRoute({
+        method: HttpMethod.GET,
+        path: '/',
+        handler(ctx) {
+          const result = ctx.container.getRegistered(IncomingMessage);
+          expect(result).to.be.eq(req);
+          done();
+        },
+      });
+      router.requestListener(req, res);
+    });
+
+    it('should register the ServerResponse in the request-scope ServiceContainer', function (done) {
+      const router = new TrieRouter();
+      const req = createRequestMock();
+      const res = createResponseMock();
+      router.defineRoute({
+        method: HttpMethod.GET,
+        path: '/',
+        handler(ctx) {
+          const result = ctx.container.getRegistered(ServerResponse);
+          expect(result).to.be.eq(res);
+          done();
+        },
+      });
+      router.requestListener(req, res);
+    });
+
     it('should send parsing error response instead of throwing error', async function () {
       const router = new TrieRouter();
       router.defineRoute({