@tramvai/module-request-limiter 1.94.0 → 1.94.1

package/lib/server.es.js

@@ -1,8 +1,9 @@
 import { __decorate } from 'tslib';
 import { Module, provide, Scope } from '@tramvai/core';
-import { WEB_FASTIFY_APP_LIMITER_TOKEN, WEB_FASTIFY_APP_TOKEN } from '@tramvai/tokens-server-private';
+import { WEB_FASTIFY_APP_LIMITER_TOKEN } from '@tramvai/tokens-server-private';
 import fp from 'fastify-plugin';
 import { HttpError } from '@tinkoff/errors';
+import onFinished from 'on-finished';
 import { monitorEventLoopDelay } from 'perf_hooks';
 import { createToken } from '@tinkoff/dippy';
 
@@ -126,8 +127,15 @@ class RequestLimiter {
             this.run(this.queue.pop());
         }
     }
-    run({ next }) {
+    run({ next, res }) {
         this.currentActive++;
+        // onFinished doesn't work OK in DEV mode. Just stuck with high load without any reasons
+        // fastify: it only works this way with on-finished, as using hook `onRequest` is not enough to handle all of the requests
+        // and some of the failed requests are getting disappeared
+        // and other hooks useless as well. [related issue](https://github.com/fastify/fastify/issues/1352)
+        onFinished(res.raw, () => {
+            this.onResponse();
+        });
         next();
     }
 }
@@ -135,9 +143,6 @@ const fastifyRequestsLimiter = fp(async (fastify, { requestsLimiter }) => {
     fastify.addHook('onRequest', (req, res, next) => {
         requestsLimiter.add({ req, res, next });
     });
-    fastify.addHook('onResponse', async () => {
-        requestsLimiter.onResponse();
-    });
 });
 
 const REQUESTS_LIMITER_TOKEN = createToken('requestsLimiterToken');
@@ -166,16 +171,15 @@ RequestLimiterModule = __decorate([
             provide({
                 provide: WEB_FASTIFY_APP_LIMITER_TOKEN,
                 multi: true,
-                useFactory: ({ app, requestsLimiter, featureEnable }) => {
-                    return async () => {
+                useFactory: ({ requestsLimiter, featureEnable, }) => {
+                    return async (app) => {
                         if (featureEnable !== true) {
                             return;
                         }
-                        await app.register(fastifyRequestsLimiter, { requestsLimiter });
+                        await fastifyRequestsLimiter(app, { requestsLimiter });
                     };
                 },
                 deps: {
-                    app: WEB_FASTIFY_APP_TOKEN,
                     requestsLimiter: REQUESTS_LIMITER_TOKEN,
                     featureEnable: { token: REQUESTS_LIMITER_ACTIVATE_TOKEN, optional: true },
                 },

package/lib/server.js

@@ -7,12 +7,14 @@ var core = require('@tramvai/core');
 var tokensServerPrivate = require('@tramvai/tokens-server-private');
 var fp = require('fastify-plugin');
 var errors = require('@tinkoff/errors');
+var onFinished = require('on-finished');
 var perf_hooks = require('perf_hooks');
 var dippy = require('@tinkoff/dippy');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var fp__default = /*#__PURE__*/_interopDefaultLegacy(fp);
+var onFinished__default = /*#__PURE__*/_interopDefaultLegacy(onFinished);
 
 class DoubleLinkedList {
     constructor() {
@@ -134,8 +136,15 @@ class RequestLimiter {
             this.run(this.queue.pop());
         }
     }
-    run({ next }) {
+    run({ next, res }) {
         this.currentActive++;
+        // onFinished doesn't work OK in DEV mode. Just stuck with high load without any reasons
+        // fastify: it only works this way with on-finished, as using hook `onRequest` is not enough to handle all of the requests
+        // and some of the failed requests are getting disappeared
+        // and other hooks useless as well. [related issue](https://github.com/fastify/fastify/issues/1352)
+        onFinished__default["default"](res.raw, () => {
+            this.onResponse();
+        });
         next();
     }
 }
@@ -143,9 +152,6 @@ const fastifyRequestsLimiter = fp__default["default"](async (fastify, { requests
     fastify.addHook('onRequest', (req, res, next) => {
         requestsLimiter.add({ req, res, next });
     });
-    fastify.addHook('onResponse', async () => {
-        requestsLimiter.onResponse();
-    });
 });
 
 const REQUESTS_LIMITER_TOKEN = dippy.createToken('requestsLimiterToken');
@@ -174,16 +180,15 @@ exports.RequestLimiterModule = tslib.__decorate([
             core.provide({
                 provide: tokensServerPrivate.WEB_FASTIFY_APP_LIMITER_TOKEN,
                 multi: true,
-                useFactory: ({ app, requestsLimiter, featureEnable }) => {
-                    return async () => {
+                useFactory: ({ requestsLimiter, featureEnable, }) => {
+                    return async (app) => {
                         if (featureEnable !== true) {
                             return;
                         }
-                        await app.register(fastifyRequestsLimiter, { requestsLimiter });
+                        await fastifyRequestsLimiter(app, { requestsLimiter });
                     };
                 },
                 deps: {
-                    app: tokensServerPrivate.WEB_FASTIFY_APP_TOKEN,
                     requestsLimiter: REQUESTS_LIMITER_TOKEN,
                     featureEnable: { token: REQUESTS_LIMITER_ACTIVATE_TOKEN, optional: true },
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-request-limiter",
-  "version": "1.94.0",
+  "version": "1.94.1",
   "description": "Enable different rendering modes for pages",
   "main": "lib/server.js",
   "module": "lib/server.es.js",
@@ -25,13 +25,14 @@
   },
   "dependencies": {
     "@tinkoff/errors": "0.2.20",
-    "fastify-plugin": "^3.0.1"
+    "fastify-plugin": "^3.0.1",
+    "on-finished": "^2.3.0"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.7.39",
-    "@tramvai/core": "1.94.0",
-    "@tramvai/tokens-server-private": "1.94.0",
+    "@tramvai/core": "1.94.1",
+    "@tramvai/tokens-server-private": "1.94.1",
     "fastify": "^3.0.0",
     "tslib": "^2.0.3"
   }