@tramvai/module-router 1.82.2 → 1.82.3

package/lib/index.es.js

@@ -15,7 +15,7 @@ import replace from '@tinkoff/utils/string/replace';
 import React from 'react';
 import { isFileSystemPageComponent, fileSystemPagesEnabled, getStaticFileSystemPages, fileSystemPageToRoute } from '@tramvai/experiments';
 import uniq from '@tinkoff/utils/array/uniq';
-import { isRedirectFoundError, isNotFoundError, throwHttpError, throwRedirectFoundError } from '@tinkoff/errors';
+import { isRedirectFoundError, isNotFoundError, throwRedirectFoundError, HttpError, makeErrorSilent } from '@tinkoff/errors';
 import { SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
 import prop from '@tinkoff/utils/object/prop';
 import { createPapiMethod } from '@tramvai/papi';
@@ -500,24 +500,33 @@ const serverHooks = [
 ];
 
 const routerOptions = ({ requestManager, responseManager, }) => {
-    const throwError = (defaultStatus) => {
-        return throwHttpError({
+    const getUrl = (navigation) => { var _a, _b; return (_b = (_a = navigation.url) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : requestManager.getUrl(); };
+    const throwError = ({ defaultStatus, url, silent, }) => {
+        const error = new HttpError({
+            url,
             httpStatus: responseManager.getStatus() >= 300 ? responseManager.getStatus() : defaultStatus,
         });
+        if (silent) {
+            makeErrorSilent(error);
+        }
+        throw error;
     };
     return {
-        onNotFound: async () => {
-            throwError(404);
+        onNotFound: async (navigation) => {
+            // isSilent is used to prevent command line error logs,
+            // because 404 errors is expected behavior
+            throwError({ defaultStatus: 404, url: getUrl(navigation), silent: true });
         },
         onRedirect: async (navigation) => {
             const { fromUrl, url, code } = navigation;
             throwRedirectFoundError({
+                url: getUrl(navigation),
                 nextUrl: fromUrl.origin !== url.origin ? url.href : url.path,
                 httpStatus: code,
             });
         },
-        onBlock: async () => {
-            throwError(500);
+        onBlock: async (navigation) => {
+            throwError({ defaultStatus: 500, url: getUrl(navigation) });
         },
         defaultRedirectCode: requestManager.getMethod() === 'GET' ? 301 : 308,
     };

package/lib/index.js

@@ -512,24 +512,33 @@ const serverHooks = [
 ];
 
 const routerOptions = ({ requestManager, responseManager, }) => {
-    const throwError = (defaultStatus) => {
-        return errors.throwHttpError({
+    const getUrl = (navigation) => { var _a, _b; return (_b = (_a = navigation.url) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : requestManager.getUrl(); };
+    const throwError = ({ defaultStatus, url, silent, }) => {
+        const error = new errors.HttpError({
+            url,
             httpStatus: responseManager.getStatus() >= 300 ? responseManager.getStatus() : defaultStatus,
         });
+        if (silent) {
+            errors.makeErrorSilent(error);
+        }
+        throw error;
     };
     return {
-        onNotFound: async () => {
-            throwError(404);
+        onNotFound: async (navigation) => {
+            // isSilent is used to prevent command line error logs,
+            // because 404 errors is expected behavior
+            throwError({ defaultStatus: 404, url: getUrl(navigation), silent: true });
         },
         onRedirect: async (navigation) => {
             const { fromUrl, url, code } = navigation;
             errors.throwRedirectFoundError({
+                url: getUrl(navigation),
                 nextUrl: fromUrl.origin !== url.origin ? url.href : url.path,
                 httpStatus: code,
             });
         },
-        onBlock: async () => {
-            throwError(500);
+        onBlock: async (navigation) => {
+            throwError({ defaultStatus: 500, url: getUrl(navigation) });
         },
         defaultRedirectCode: requestManager.getMethod() === 'GET' ? 301 : 308,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "1.82.2",
+  "version": "1.82.3",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -22,26 +22,26 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/errors": "0.2.19",
+    "@tinkoff/errors": "0.2.20",
     "@tinkoff/router": "0.1.71",
     "@tinkoff/url": "0.7.37",
-    "@tramvai/tokens-child-app": "1.82.2",
-    "@tramvai/tokens-render": "1.82.2",
-    "@tramvai/tokens-router": "1.82.2",
-    "@tramvai/tokens-server": "1.82.2",
-    "@tramvai/experiments": "1.82.2"
+    "@tramvai/tokens-child-app": "1.82.3",
+    "@tramvai/tokens-render": "1.82.3",
+    "@tramvai/tokens-router": "1.82.3",
+    "@tramvai/tokens-server": "1.82.3",
+    "@tramvai/experiments": "1.82.3"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.82.2",
-    "@tramvai/core": "1.82.2",
-    "@tramvai/module-log": "1.82.2",
-    "@tramvai/module-server": "1.82.2",
-    "@tramvai/papi": "1.82.2",
-    "@tramvai/state": "1.82.2",
-    "@tramvai/test-helpers": "1.82.2",
-    "@tramvai/test-mocks": "1.82.2",
-    "@tramvai/tokens-common": "1.82.2",
+    "@tramvai/cli": "1.82.3",
+    "@tramvai/core": "1.82.3",
+    "@tramvai/module-log": "1.82.3",
+    "@tramvai/module-server": "1.82.3",
+    "@tramvai/papi": "1.82.3",
+    "@tramvai/state": "1.82.3",
+    "@tramvai/test-helpers": "1.82.3",
+    "@tramvai/test-mocks": "1.82.3",
+    "@tramvai/tokens-common": "1.82.3",
     "@tinkoff/dippy": "0.7.39",
     "react": "*",
     "tslib": "^2.0.3"