@tramvai/module-common 2.31.0 → 2.33.1

package/lib/index.browser.js

@@ -6,12 +6,13 @@ import { CookieModule } from '@tramvai/module-cookie';
 export { COOKIE_MANAGER_TOKEN } from '@tramvai/module-cookie';
 import { LogModule } from '@tramvai/module-log';
 import { Hooks } from '@tinkoff/hook-runner';
-import { REQUEST_MANAGER_TOKEN, REQUEST, COMBINE_REDUCERS, STORE_TOKEN, RESPONSE_MANAGER_TOKEN, RESPONSE, ACTION_EXECUTION_TOKEN, ROOT_EXECUTION_CONTEXT_TOKEN, LOGGER_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, PUBSUB_FACTORY_TOKEN, PUBSUB_TOKEN, ROOT_PUBSUB_TOKEN, INITIAL_APP_STATE_TOKEN, ACTION_REGISTRY_TOKEN, ACTION_CONDITIONALS, CONTEXT_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, CREATE_CACHE_TOKEN, CLEAR_CACHE_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, HOOK_TOKEN, COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN } from '@tramvai/tokens-common';
+import { REQUEST_MANAGER_TOKEN, COMBINE_REDUCERS, STORE_TOKEN, RESPONSE_MANAGER_TOKEN, ACTION_EXECUTION_TOKEN, ROOT_EXECUTION_CONTEXT_TOKEN, LOGGER_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, PUBSUB_FACTORY_TOKEN, PUBSUB_TOKEN, ROOT_PUBSUB_TOKEN, INITIAL_APP_STATE_TOKEN, ACTION_REGISTRY_TOKEN, ACTION_CONDITIONALS, CONTEXT_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, CREATE_CACHE_TOKEN, CLEAR_CACHE_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, HOOK_TOKEN, COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN } from '@tramvai/tokens-common';
 export * from '@tramvai/tokens-common';
 import { resolveLazyComponent, __lazyErrorHandler } from '@tramvai/react';
 import { fileSystemPagesEnabled, getAllFileSystemPages, isFileSystemPageComponent } from '@tramvai/experiments';
 import pathOr from '@tinkoff/utils/object/pathOr';
 import flatten from '@tinkoff/utils/array/flatten';
+import { FASTIFY_REQUEST, FASTIFY_RESPONSE } from '@tramvai/tokens-server-private';
 import { createEvent, createReducer, convertAction, createDispatcher, devTools, Provider } from '@tramvai/state';
 import { format, parse } from '@tinkoff/url';
 import isEmpty from '@tinkoff/utils/is/empty';
@@ -145,7 +146,7 @@ class RequestManager {
             this.url = format({
                 protocol: this.getHeader('x-forwarded-proto') || this.request.protocol,
                 host: this.getHost(),
-                path: this.request.originalUrl,
+                path: this.request.url,
             });
         }
         else {
@@ -168,7 +169,8 @@ class RequestManager {
         return this.request.method;
     }
     getHeader(key) {
-        return this.request.headers[key];
+        var _a;
+        return (_a = this.request.headers) === null || _a === void 0 ? void 0 : _a[key];
     }
     getHeaders() {
         return this.request.headers;
@@ -180,7 +182,8 @@ class RequestManager {
         return this.request.cookies;
     }
     getClientIp() {
-        return this.getHeader('x-real-ip') || pathOr(['connection', 'remoteAddress'], '', this.request);
+        var _a, _b;
+        return this.getHeader('x-real-ip') || ((_b = (_a = this.request) === null || _a === void 0 ? void 0 : _a.socket) === null || _b === void 0 ? void 0 : _b.remoteAddress) || '';
     }
     getHost() {
         if (typeof window === 'undefined') {
@@ -196,7 +199,7 @@ const sharedProviders$1 = [
         scope: Scope.REQUEST,
         useClass: RequestManager,
         deps: {
-            request: REQUEST,
+            request: FASTIFY_REQUEST,
         },
     },
     {
@@ -213,7 +216,7 @@ RequestManagerModule = __decorate([
         providers: [
             ...sharedProviders$1,
             provide({
-                provide: REQUEST,
+                provide: FASTIFY_REQUEST,
                 useFactory: ({ store }) => {
                     const fromServer = store.getState(RequestManagerStore);
                     return {
@@ -223,6 +226,9 @@ RequestManagerModule = __decorate([
                             'user-agent': navigator.userAgent,
                             cookie: document.cookie,
                         },
+                        // the type is not actually the same and is only partially compatible with actual request object
+                        // but provide it as a backup for some of the isomorphic code
+                        // anyway it is better not to use request/response on client
                     };
                 },
                 deps: {
@@ -286,9 +292,6 @@ const sharedProviders = [
         provide: RESPONSE_MANAGER_TOKEN,
         scope: Scope.REQUEST,
         useClass: ResponseManager,
-        deps: {
-            response: RESPONSE,
-        },
     },
 ];
 
@@ -299,7 +302,7 @@ ResponseManagerModule = __decorate([
         providers: [
             ...sharedProviders,
             {
-                provide: RESPONSE,
+                provide: FASTIFY_RESPONSE,
                 useValue: {},
             },
         ],

package/lib/index.es.js

@@ -6,13 +6,14 @@ import { CookieModule } from '@tramvai/module-cookie';
 export { COOKIE_MANAGER_TOKEN } from '@tramvai/module-cookie';
 import { LogModule } from '@tramvai/module-log';
 import { Hooks } from '@tinkoff/hook-runner';
-import { REQUEST_MANAGER_TOKEN, REQUEST, COMBINE_REDUCERS, CONTEXT_TOKEN, RESPONSE_MANAGER_TOKEN, RESPONSE, ACTION_EXECUTION_TOKEN, ROOT_EXECUTION_CONTEXT_TOKEN, LOGGER_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, PUBSUB_FACTORY_TOKEN, PUBSUB_TOKEN, ROOT_PUBSUB_TOKEN, ACTION_REGISTRY_TOKEN, ACTION_CONDITIONALS, STORE_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_TOKEN, CLEAR_CACHE_TOKEN, CREATE_CACHE_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, HOOK_TOKEN, COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN } from '@tramvai/tokens-common';
+import { REQUEST_MANAGER_TOKEN, COMBINE_REDUCERS, CONTEXT_TOKEN, RESPONSE_MANAGER_TOKEN, ACTION_EXECUTION_TOKEN, ROOT_EXECUTION_CONTEXT_TOKEN, LOGGER_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, PUBSUB_FACTORY_TOKEN, PUBSUB_TOKEN, ROOT_PUBSUB_TOKEN, ACTION_REGISTRY_TOKEN, ACTION_CONDITIONALS, STORE_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_TOKEN, CLEAR_CACHE_TOKEN, CREATE_CACHE_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, HOOK_TOKEN, COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN } from '@tramvai/tokens-common';
 export * from '@tramvai/tokens-common';
 import { resolveLazyComponent, __lazyErrorHandler } from '@tramvai/react';
 import { fileSystemPagesEnabled, getAllFileSystemPages, isFileSystemPageComponent } from '@tramvai/experiments';
 import pathOr from '@tinkoff/utils/object/pathOr';
 import flatten from '@tinkoff/utils/array/flatten';
 import { createEvent, createReducer, convertAction, createDispatcher, devTools, Provider } from '@tramvai/state';
+import { FASTIFY_REQUEST } from '@tramvai/tokens-server-private';
 import { format, parse } from '@tinkoff/url';
 import isEmpty from '@tinkoff/utils/is/empty';
 import values from '@tinkoff/utils/object/values';
@@ -147,7 +148,7 @@ class RequestManager {
             this.url = format({
                 protocol: this.getHeader('x-forwarded-proto') || this.request.protocol,
                 host: this.getHost(),
-                path: this.request.originalUrl,
+                path: this.request.url,
             });
         }
         else {
@@ -170,7 +171,8 @@ class RequestManager {
         return this.request.method;
     }
     getHeader(key) {
-        return this.request.headers[key];
+        var _a;
+        return (_a = this.request.headers) === null || _a === void 0 ? void 0 : _a[key];
     }
     getHeaders() {
         return this.request.headers;
@@ -182,7 +184,8 @@ class RequestManager {
         return this.request.cookies;
     }
     getClientIp() {
-        return this.getHeader('x-real-ip') || pathOr(['connection', 'remoteAddress'], '', this.request);
+        var _a, _b;
+        return this.getHeader('x-real-ip') || ((_b = (_a = this.request) === null || _a === void 0 ? void 0 : _a.socket) === null || _b === void 0 ? void 0 : _b.remoteAddress) || '';
     }
     getHost() {
         if (typeof window === 'undefined') {
@@ -198,7 +201,7 @@ const sharedProviders$1 = [
         scope: Scope.REQUEST,
         useClass: RequestManager,
         deps: {
-            request: REQUEST,
+            request: FASTIFY_REQUEST,
         },
     },
     {
@@ -289,9 +292,6 @@ const sharedProviders = [
         provide: RESPONSE_MANAGER_TOKEN,
         scope: Scope.REQUEST,
         useClass: ResponseManager,
-        deps: {
-            response: RESPONSE,
-        },
     },
 ];
 

package/lib/index.js

@@ -15,6 +15,7 @@ var experiments = require('@tramvai/experiments');
 var pathOr = require('@tinkoff/utils/object/pathOr');
 var flatten = require('@tinkoff/utils/array/flatten');
 var state = require('@tramvai/state');
+var tokensServerPrivate = require('@tramvai/tokens-server-private');
 var url = require('@tinkoff/url');
 var isEmpty = require('@tinkoff/utils/is/empty');
 var values = require('@tinkoff/utils/object/values');
@@ -164,7 +165,7 @@ class RequestManager {
             this.url = url.format({
                 protocol: this.getHeader('x-forwarded-proto') || this.request.protocol,
                 host: this.getHost(),
-                path: this.request.originalUrl,
+                path: this.request.url,
             });
         }
         else {
@@ -187,7 +188,8 @@ class RequestManager {
         return this.request.method;
     }
     getHeader(key) {
-        return this.request.headers[key];
+        var _a;
+        return (_a = this.request.headers) === null || _a === void 0 ? void 0 : _a[key];
     }
     getHeaders() {
         return this.request.headers;
@@ -199,7 +201,8 @@ class RequestManager {
         return this.request.cookies;
     }
     getClientIp() {
-        return this.getHeader('x-real-ip') || pathOr__default["default"](['connection', 'remoteAddress'], '', this.request);
+        var _a, _b;
+        return this.getHeader('x-real-ip') || ((_b = (_a = this.request) === null || _a === void 0 ? void 0 : _a.socket) === null || _b === void 0 ? void 0 : _b.remoteAddress) || '';
     }
     getHost() {
         if (typeof window === 'undefined') {
@@ -215,7 +218,7 @@ const sharedProviders$1 = [
         scope: core.Scope.REQUEST,
         useClass: RequestManager,
         deps: {
-            request: tokensCommon.REQUEST,
+            request: tokensServerPrivate.FASTIFY_REQUEST,
         },
     },
     {
@@ -306,9 +309,6 @@ const sharedProviders = [
         provide: tokensCommon.RESPONSE_MANAGER_TOKEN,
         scope: core.Scope.REQUEST,
         useClass: ResponseManager,
-        deps: {
-            response: tokensCommon.RESPONSE,
-        },
     },
 ];
 

package/lib/requestManager/requestManager.d.ts

@@ -1,22 +1,22 @@
-/// <reference types="node" />
 import type { Url } from '@tinkoff/url';
-import type { REQUEST, REQUEST_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import type { REQUEST_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import type { FASTIFY_REQUEST } from '@tramvai/tokens-server-private';
 declare type Interface = typeof REQUEST_MANAGER_TOKEN;
 export declare class RequestManager implements Interface {
     private request;
     private url;
     private parsedUrl;
     constructor({ request }: {
-        request: typeof REQUEST;
+        request: typeof FASTIFY_REQUEST;
     });
-    getBody(): any;
+    getBody(): unknown;
     getUrl(): string;
     getParsedUrl(): Url;
     getMethod(): string;
     getHeader(key: string): string | string[];
-    getHeaders(): import("http").IncomingHttpHeaders;
-    getCookie(key: string): any;
-    getCookies(): any;
+    getHeaders(): Record<string, string | string[]>;
+    getCookie(key: string): string;
+    getCookies(): Record<string, string>;
     getClientIp(): string;
     getHost(): string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-common",
-  "version": "2.31.0",
+  "version": "2.33.1",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -33,26 +33,27 @@
     "@tinkoff/lru-cache-nano": "^7.8.1",
     "@tinkoff/pubsub": "0.5.4",
     "@tinkoff/url": "0.8.3",
-    "@tramvai/experiments": "2.31.0",
-    "@tramvai/module-cookie": "2.31.0",
-    "@tramvai/module-environment": "2.31.0",
-    "@tramvai/module-log": "2.31.0",
-    "@tramvai/tokens-child-app": "2.31.0",
-    "@tramvai/tokens-common": "2.31.0",
-    "@tramvai/tokens-render": "2.31.0",
+    "@tramvai/experiments": "2.33.1",
+    "@tramvai/module-cookie": "2.33.1",
+    "@tramvai/module-environment": "2.33.1",
+    "@tramvai/module-log": "2.33.1",
+    "@tramvai/tokens-child-app": "2.33.1",
+    "@tramvai/tokens-common": "2.33.1",
+    "@tramvai/tokens-render": "2.33.1",
+    "@tramvai/tokens-server-private": "2.33.1",
     "hoist-non-react-statics": "^3.3.1",
     "node-abort-controller": "^3.0.1"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.8.6",
+    "@tinkoff/dippy": "0.8.7",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.31.0",
-    "@tramvai/core": "2.31.0",
-    "@tramvai/papi": "2.31.0",
-    "@tramvai/react": "2.31.0",
-    "@tramvai/state": "2.31.0",
-    "@tramvai/tokens-metrics": "2.31.0",
-    "@tramvai/tokens-server": "2.31.0",
+    "@tramvai/cli": "2.33.1",
+    "@tramvai/core": "2.33.1",
+    "@tramvai/papi": "2.33.1",
+    "@tramvai/react": "2.33.1",
+    "@tramvai/state": "2.33.1",
+    "@tramvai/tokens-metrics": "2.33.1",
+    "@tramvai/tokens-server": "2.33.1",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"
   },