@tramvai/module-cookie 2.70.1 → 2.72.0

package/lib/browser.js

@@ -1,100 +1,10 @@
 import { __decorate } from 'tslib';
 import { Module, provide, Scope } from '@tramvai/core';
 import { ClientHintsModule, USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
-import { Cookies } from '@tinkoff/browser-cookies';
+import { CookieManager } from './cookieManager.browser.browser.js';
 import { COOKIE_MANAGER_TOKEN } from '@tramvai/tokens-cookie';
 export { COOKIE_MANAGER_TOKEN } from '@tramvai/tokens-cookie';
 
-// ipv4 + IPv4-mapped IPv6 addresses and IPv4-translated addresses
-const reIpWithDots = /^(?:::(?:ffff:(0:)?)?)?(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/; // IPv4-Embedded IPv6 Address
-const reIpv4Embedded = /^([0-9a-fA-F]{1,4}:){1,4}:(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/;
-const calculateExpires = (expires) => {
-    // if expires is number than treat it as seconds
-    if (!expires) {
-        return;
-    }
-    return new Date(typeof expires === 'number' ? +new Date() + expires * 1000 : expires);
-};
-const isIpWithDots = (host) => {
-    return reIpWithDots.test(host) || reIpv4Embedded.test(host);
-};
-const trimPort = (host) => {
-    return host.replace(/:\d+$/, '');
-};
-const trimSubdomains = (host) => {
-    if (isIpWithDots(host)) {
-        return host;
-    }
-    return trimPort(host.indexOf('localhost') >= 0 ? host : `.${host.split('.').slice(-2).join('.')}`);
-};
-const prepareCookieOptions = ({ userAgent: { sameSiteNoneCompatible }, defaultHost, secureProtocol }, { sameSite, noSubdomains, ...options }) => ({
-    ...options,
-    ...(sameSite === 'none' && (!sameSiteNoneCompatible || !secureProtocol) ? {} : { sameSite }),
-    ...(secureProtocol && sameSite === 'none' && sameSiteNoneCompatible ? { secure: true } : {}),
-    expires: calculateExpires(options.expires),
-    domain: noSubdomains ? trimSubdomains(options.domain || defaultHost) : options.domain,
-});
-
-const checkCookieEnabled = () => {
-    const testCookieName = 'testcookiesenabled';
-    document.cookie = testCookieName;
-    if (document.cookie.indexOf(testCookieName) > -1) {
-        document.cookie = `${testCookieName}; expires=Thu, 01 Jan 1970 00:00:01 GMT'`;
-        return true;
-    }
-    return false;
-};
-class CookiesFallback {
-    constructor() {
-        this.cache = Object.create(null);
-    }
-    get(name) {
-        return this.cache[name] || undefined;
-    }
-    set(name, value) {
-        this.cache[name] = value;
-    }
-    erase(name) {
-        delete this.cache[name];
-    }
-    all() {
-        return this.cache;
-    }
-}
-class CookieManager {
-    constructor({ cookieOptions = {}, userAgent, }) {
-        const isSecure = window.location.protocol === 'https:';
-        this.cookies = checkCookieEnabled()
-            ? new Cookies({
-                sameSite: userAgent.sameSiteNoneCompatible && isSecure ? 'none' : 'lax',
-                secure: isSecure,
-                ...cookieOptions,
-            })
-            : new CookiesFallback();
-        this.userAgent = userAgent;
-    }
-    // eslint-disable-next-line class-methods-use-this
-    get(name) {
-        return this.cookies.get(name) || undefined;
-    }
-    // eslint-disable-next-line class-methods-use-this
-    set({ name, value, ...options }) {
-        this.cookies.set(name, value, prepareCookieOptions({
-            userAgent: this.userAgent,
-            defaultHost: window.location.hostname,
-            secureProtocol: window.location.protocol === 'https:',
-        }, options));
-    }
-    // eslint-disable-next-line class-methods-use-this
-    all() {
-        return this.cookies.all();
-    }
-    // eslint-disable-next-line class-methods-use-this
-    remove(name, options) {
-        return this.cookies.erase(name, options);
-    }
-}
-
 let CookieModule = class CookieModule {
 };
 CookieModule = __decorate([

package/lib/cookieManager.browser.browser.js

@@ -0,0 +1,64 @@
+import { Cookies } from '@tinkoff/browser-cookies';
+import { prepareCookieOptions } from './utils.browser.js';
+
+const checkCookieEnabled = () => {
+    const testCookieName = 'testcookiesenabled';
+    document.cookie = testCookieName;
+    if (document.cookie.indexOf(testCookieName) > -1) {
+        document.cookie = `${testCookieName}; expires=Thu, 01 Jan 1970 00:00:01 GMT'`;
+        return true;
+    }
+    return false;
+};
+class CookiesFallback {
+    constructor() {
+        this.cache = Object.create(null);
+    }
+    get(name) {
+        return this.cache[name] || undefined;
+    }
+    set(name, value) {
+        this.cache[name] = value;
+    }
+    erase(name) {
+        delete this.cache[name];
+    }
+    all() {
+        return this.cache;
+    }
+}
+class CookieManager {
+    constructor({ cookieOptions = {}, userAgent, }) {
+        const isSecure = window.location.protocol === 'https:';
+        this.cookies = checkCookieEnabled()
+            ? new Cookies({
+                sameSite: userAgent.sameSiteNoneCompatible && isSecure ? 'none' : 'lax',
+                secure: isSecure,
+                ...cookieOptions,
+            })
+            : new CookiesFallback();
+        this.userAgent = userAgent;
+    }
+    // eslint-disable-next-line class-methods-use-this
+    get(name) {
+        return this.cookies.get(name) || undefined;
+    }
+    // eslint-disable-next-line class-methods-use-this
+    set({ name, value, ...options }) {
+        this.cookies.set(name, value, prepareCookieOptions({
+            userAgent: this.userAgent,
+            defaultHost: window.location.hostname,
+            secureProtocol: window.location.protocol === 'https:',
+        }, options));
+    }
+    // eslint-disable-next-line class-methods-use-this
+    all() {
+        return this.cookies.all();
+    }
+    // eslint-disable-next-line class-methods-use-this
+    remove(name, options) {
+        return this.cookies.erase(name, options);
+    }
+}
+
+export { CookieManager };

package/lib/cookieManager.server.es.js

@@ -0,0 +1,32 @@
+import { serialize } from 'cookie';
+import { prepareCookieOptions } from './utils.es.js';
+
+class CookieManager {
+    constructor({ requestManager, responseManager, userAgent, }) {
+        this.requestManager = requestManager;
+        this.responseManager = responseManager;
+        this.userAgent = userAgent;
+        this.cookies = { ...requestManager.getCookies() };
+    }
+    get(name) {
+        return this.cookies[name];
+    }
+    set({ name, value, ...options }) {
+        this.responseManager.setCookie(name, serialize(name, value, prepareCookieOptions({
+            userAgent: this.userAgent,
+            defaultHost: this.requestManager.getHost(),
+            secureProtocol: this.requestManager.getUrl().startsWith('https:'),
+        }, { path: '/', ...options })));
+        // Записываем в cookie request, так как эти данные могут дальше читаться и использоваться
+        this.cookies[name] = value;
+    }
+    all() {
+        return this.cookies;
+    }
+    remove(name, options) {
+        this.set({ ...options, name, value: '', expires: new Date(0) });
+        delete this.cookies[name];
+    }
+}
+
+export { CookieManager };

package/lib/cookieManager.server.js

@@ -0,0 +1,36 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var cookie = require('cookie');
+var utils = require('./utils.js');
+
+class CookieManager {
+    constructor({ requestManager, responseManager, userAgent, }) {
+        this.requestManager = requestManager;
+        this.responseManager = responseManager;
+        this.userAgent = userAgent;
+        this.cookies = { ...requestManager.getCookies() };
+    }
+    get(name) {
+        return this.cookies[name];
+    }
+    set({ name, value, ...options }) {
+        this.responseManager.setCookie(name, cookie.serialize(name, value, utils.prepareCookieOptions({
+            userAgent: this.userAgent,
+            defaultHost: this.requestManager.getHost(),
+            secureProtocol: this.requestManager.getUrl().startsWith('https:'),
+        }, { path: '/', ...options })));
+        // Записываем в cookie request, так как эти данные могут дальше читаться и использоваться
+        this.cookies[name] = value;
+    }
+    all() {
+        return this.cookies;
+    }
+    remove(name, options) {
+        this.set({ ...options, name, value: '', expires: new Date(0) });
+        delete this.cookies[name];
+    }
+}
+
+exports.CookieManager = CookieManager;

package/lib/server.es.js

@@ -2,68 +2,10 @@ import { __decorate } from 'tslib';
 import { Module, provide, Scope } from '@tramvai/core';
 import { REQUEST_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN } from '@tramvai/tokens-common';
 import { ClientHintsModule, USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
-import { serialize } from 'cookie';
+import { CookieManager } from './cookieManager.server.es.js';
 import { COOKIE_MANAGER_TOKEN } from '@tramvai/tokens-cookie';
 export { COOKIE_MANAGER_TOKEN } from '@tramvai/tokens-cookie';
 
-// ipv4 + IPv4-mapped IPv6 addresses and IPv4-translated addresses
-const reIpWithDots = /^(?:::(?:ffff:(0:)?)?)?(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/; // IPv4-Embedded IPv6 Address
-const reIpv4Embedded = /^([0-9a-fA-F]{1,4}:){1,4}:(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/;
-const calculateExpires = (expires) => {
-    // if expires is number than treat it as seconds
-    if (!expires) {
-        return;
-    }
-    return new Date(typeof expires === 'number' ? +new Date() + expires * 1000 : expires);
-};
-const isIpWithDots = (host) => {
-    return reIpWithDots.test(host) || reIpv4Embedded.test(host);
-};
-const trimPort = (host) => {
-    return host.replace(/:\d+$/, '');
-};
-const trimSubdomains = (host) => {
-    if (isIpWithDots(host)) {
-        return host;
-    }
-    return trimPort(host.indexOf('localhost') >= 0 ? host : `.${host.split('.').slice(-2).join('.')}`);
-};
-const prepareCookieOptions = ({ userAgent: { sameSiteNoneCompatible }, defaultHost, secureProtocol }, { sameSite, noSubdomains, ...options }) => ({
-    ...options,
-    ...(sameSite === 'none' && (!sameSiteNoneCompatible || !secureProtocol) ? {} : { sameSite }),
-    ...(secureProtocol && sameSite === 'none' && sameSiteNoneCompatible ? { secure: true } : {}),
-    expires: calculateExpires(options.expires),
-    domain: noSubdomains ? trimSubdomains(options.domain || defaultHost) : options.domain,
-});
-
-class CookieManager {
-    constructor({ requestManager, responseManager, userAgent, }) {
-        this.requestManager = requestManager;
-        this.responseManager = responseManager;
-        this.userAgent = userAgent;
-        this.cookies = { ...requestManager.getCookies() };
-    }
-    get(name) {
-        return this.cookies[name];
-    }
-    set({ name, value, ...options }) {
-        this.responseManager.setCookie(name, serialize(name, value, prepareCookieOptions({
-            userAgent: this.userAgent,
-            defaultHost: this.requestManager.getHost(),
-            secureProtocol: this.requestManager.getUrl().startsWith('https:'),
-        }, { path: '/', ...options })));
-        // Записываем в cookie request, так как эти данные могут дальше читаться и использоваться
-        this.cookies[name] = value;
-    }
-    all() {
-        return this.cookies;
-    }
-    remove(name, options) {
-        this.set({ ...options, name, value: '', expires: new Date(0) });
-        delete this.cookies[name];
-    }
-}
-
 let CookieModule = class CookieModule {
 };
 CookieModule = __decorate([

package/lib/server.js

@@ -6,67 +6,9 @@ var tslib = require('tslib');
 var core = require('@tramvai/core');
 var tokensCommon = require('@tramvai/tokens-common');
 var moduleClientHints = require('@tramvai/module-client-hints');
-var cookie = require('cookie');
+var cookieManager_server = require('./cookieManager.server.js');
 var tokensCookie = require('@tramvai/tokens-cookie');
 
-// ipv4 + IPv4-mapped IPv6 addresses and IPv4-translated addresses
-const reIpWithDots = /^(?:::(?:ffff:(0:)?)?)?(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/; // IPv4-Embedded IPv6 Address
-const reIpv4Embedded = /^([0-9a-fA-F]{1,4}:){1,4}:(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/;
-const calculateExpires = (expires) => {
-    // if expires is number than treat it as seconds
-    if (!expires) {
-        return;
-    }
-    return new Date(typeof expires === 'number' ? +new Date() + expires * 1000 : expires);
-};
-const isIpWithDots = (host) => {
-    return reIpWithDots.test(host) || reIpv4Embedded.test(host);
-};
-const trimPort = (host) => {
-    return host.replace(/:\d+$/, '');
-};
-const trimSubdomains = (host) => {
-    if (isIpWithDots(host)) {
-        return host;
-    }
-    return trimPort(host.indexOf('localhost') >= 0 ? host : `.${host.split('.').slice(-2).join('.')}`);
-};
-const prepareCookieOptions = ({ userAgent: { sameSiteNoneCompatible }, defaultHost, secureProtocol }, { sameSite, noSubdomains, ...options }) => ({
-    ...options,
-    ...(sameSite === 'none' && (!sameSiteNoneCompatible || !secureProtocol) ? {} : { sameSite }),
-    ...(secureProtocol && sameSite === 'none' && sameSiteNoneCompatible ? { secure: true } : {}),
-    expires: calculateExpires(options.expires),
-    domain: noSubdomains ? trimSubdomains(options.domain || defaultHost) : options.domain,
-});
-
-class CookieManager {
-    constructor({ requestManager, responseManager, userAgent, }) {
-        this.requestManager = requestManager;
-        this.responseManager = responseManager;
-        this.userAgent = userAgent;
-        this.cookies = { ...requestManager.getCookies() };
-    }
-    get(name) {
-        return this.cookies[name];
-    }
-    set({ name, value, ...options }) {
-        this.responseManager.setCookie(name, cookie.serialize(name, value, prepareCookieOptions({
-            userAgent: this.userAgent,
-            defaultHost: this.requestManager.getHost(),
-            secureProtocol: this.requestManager.getUrl().startsWith('https:'),
-        }, { path: '/', ...options })));
-        // Записываем в cookie request, так как эти данные могут дальше читаться и использоваться
-        this.cookies[name] = value;
-    }
-    all() {
-        return this.cookies;
-    }
-    remove(name, options) {
-        this.set({ ...options, name, value: '', expires: new Date(0) });
-        delete this.cookies[name];
-    }
-}
-
 exports.CookieModule = class CookieModule {
 };
 exports.CookieModule = tslib.__decorate([
@@ -76,7 +18,7 @@ exports.CookieModule = tslib.__decorate([
             core.provide({
                 // Управление куками в приложении
                 provide: tokensCookie.COOKIE_MANAGER_TOKEN,
-                useClass: CookieManager,
+                useClass: cookieManager_server.CookieManager,
                 scope: core.Scope.REQUEST,
                 deps: {
                     requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,

package/lib/utils.browser.js

@@ -0,0 +1,31 @@
+// ipv4 + IPv4-mapped IPv6 addresses and IPv4-translated addresses
+const reIpWithDots = /^(?:::(?:ffff:(0:)?)?)?(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/; // IPv4-Embedded IPv6 Address
+const reIpv4Embedded = /^([0-9a-fA-F]{1,4}:){1,4}:(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/;
+const calculateExpires = (expires) => {
+    // if expires is number than treat it as seconds
+    if (!expires) {
+        return;
+    }
+    return new Date(typeof expires === 'number' ? +new Date() + expires * 1000 : expires);
+};
+const isIpWithDots = (host) => {
+    return reIpWithDots.test(host) || reIpv4Embedded.test(host);
+};
+const trimPort = (host) => {
+    return host.replace(/:\d+$/, '');
+};
+const trimSubdomains = (host) => {
+    if (isIpWithDots(host)) {
+        return host;
+    }
+    return trimPort(host.indexOf('localhost') >= 0 ? host : `.${host.split('.').slice(-2).join('.')}`);
+};
+const prepareCookieOptions = ({ userAgent: { sameSiteNoneCompatible }, defaultHost, secureProtocol }, { sameSite, noSubdomains, ...options }) => ({
+    ...options,
+    ...(sameSite === 'none' && (!sameSiteNoneCompatible || !secureProtocol) ? {} : { sameSite }),
+    ...(secureProtocol && sameSite === 'none' && sameSiteNoneCompatible ? { secure: true } : {}),
+    expires: calculateExpires(options.expires),
+    domain: noSubdomains ? trimSubdomains(options.domain || defaultHost) : options.domain,
+});
+
+export { calculateExpires, prepareCookieOptions, trimSubdomains };

package/lib/utils.es.js

@@ -0,0 +1,31 @@
+// ipv4 + IPv4-mapped IPv6 addresses and IPv4-translated addresses
+const reIpWithDots = /^(?:::(?:ffff:(0:)?)?)?(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/; // IPv4-Embedded IPv6 Address
+const reIpv4Embedded = /^([0-9a-fA-F]{1,4}:){1,4}:(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/;
+const calculateExpires = (expires) => {
+    // if expires is number than treat it as seconds
+    if (!expires) {
+        return;
+    }
+    return new Date(typeof expires === 'number' ? +new Date() + expires * 1000 : expires);
+};
+const isIpWithDots = (host) => {
+    return reIpWithDots.test(host) || reIpv4Embedded.test(host);
+};
+const trimPort = (host) => {
+    return host.replace(/:\d+$/, '');
+};
+const trimSubdomains = (host) => {
+    if (isIpWithDots(host)) {
+        return host;
+    }
+    return trimPort(host.indexOf('localhost') >= 0 ? host : `.${host.split('.').slice(-2).join('.')}`);
+};
+const prepareCookieOptions = ({ userAgent: { sameSiteNoneCompatible }, defaultHost, secureProtocol }, { sameSite, noSubdomains, ...options }) => ({
+    ...options,
+    ...(sameSite === 'none' && (!sameSiteNoneCompatible || !secureProtocol) ? {} : { sameSite }),
+    ...(secureProtocol && sameSite === 'none' && sameSiteNoneCompatible ? { secure: true } : {}),
+    expires: calculateExpires(options.expires),
+    domain: noSubdomains ? trimSubdomains(options.domain || defaultHost) : options.domain,
+});
+
+export { calculateExpires, prepareCookieOptions, trimSubdomains };

package/lib/utils.js

@@ -0,0 +1,37 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+// ipv4 + IPv4-mapped IPv6 addresses and IPv4-translated addresses
+const reIpWithDots = /^(?:::(?:ffff:(0:)?)?)?(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/; // IPv4-Embedded IPv6 Address
+const reIpv4Embedded = /^([0-9a-fA-F]{1,4}:){1,4}:(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/;
+const calculateExpires = (expires) => {
+    // if expires is number than treat it as seconds
+    if (!expires) {
+        return;
+    }
+    return new Date(typeof expires === 'number' ? +new Date() + expires * 1000 : expires);
+};
+const isIpWithDots = (host) => {
+    return reIpWithDots.test(host) || reIpv4Embedded.test(host);
+};
+const trimPort = (host) => {
+    return host.replace(/:\d+$/, '');
+};
+const trimSubdomains = (host) => {
+    if (isIpWithDots(host)) {
+        return host;
+    }
+    return trimPort(host.indexOf('localhost') >= 0 ? host : `.${host.split('.').slice(-2).join('.')}`);
+};
+const prepareCookieOptions = ({ userAgent: { sameSiteNoneCompatible }, defaultHost, secureProtocol }, { sameSite, noSubdomains, ...options }) => ({
+    ...options,
+    ...(sameSite === 'none' && (!sameSiteNoneCompatible || !secureProtocol) ? {} : { sameSite }),
+    ...(secureProtocol && sameSite === 'none' && sameSiteNoneCompatible ? { secure: true } : {}),
+    expires: calculateExpires(options.expires),
+    domain: noSubdomains ? trimSubdomains(options.domain || defaultHost) : options.domain,
+});
+
+exports.calculateExpires = calculateExpires;
+exports.prepareCookieOptions = prepareCookieOptions;
+exports.trimSubdomains = trimSubdomains;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-cookie",
-  "version": "2.70.1",
+  "version": "2.72.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -14,22 +14,21 @@
     "url": "git@github.com:Tinkoff/tramvai.git"
   },
   "scripts": {
-    "build": "tramvai-build --for-publish",
-    "watch": "tsc -w",
-    "build-for-publish": "true"
+    "build": "tramvai-build --forPublish --preserveModules",
+    "watch": "tsc -w"
   },
   "dependencies": {
-    "@tinkoff/browser-cookies": "2.0.5",
-    "@tramvai/tokens-cookie": "2.70.1",
-    "@tramvai/module-client-hints": "2.70.1",
+    "@tinkoff/browser-cookies": "2.0.6",
+    "@tramvai/tokens-cookie": "2.72.0",
+    "@tramvai/module-client-hints": "2.72.0",
     "cookie": "^0.4.0"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "2.70.1",
-    "@tramvai/state": "2.70.1",
-    "@tramvai/tokens-common": "2.70.1",
-    "@tinkoff/dippy": "0.8.12",
+    "@tramvai/core": "2.72.0",
+    "@tramvai/state": "2.72.0",
+    "@tramvai/tokens-common": "2.72.0",
+    "@tinkoff/dippy": "0.8.13",
     "tslib": "^2.4.0"
   },
   "devDependencies": {