@alfalab/bridge-to-native 1.4.1-beta.720f0f8 → 1.4.2

package/client/bridge-to-native.d.ts

@@ -1,5 +1,4 @@
  
-import { type NoopOptions } from '../types';
 import { type BrowserHistoryApiWrappers, type HistoryPushStateParams, type HistoryReplaceStateParams, type LocationAssignParam, type LogError, type NativeFeatureKey, type PdfType } from './types';
 /**
  * Сервис, предоставляет методы для WA, работающего внутри NA.
@@ -14,15 +13,12 @@ export declare class BridgeToNative {
      *  будут использованы стандартные `History: pushState()` и `History: go()`.
      * @param options.logError Функция с помощью которой B2N может залогировать ошибку,
      *  если не передать, B2N не будет логировать ошибки.
-     * @param options.noop ....
      */
     constructor(options?: {
         browserHistoryApiWrappers?: BrowserHistoryApiWrappers;
         logError?: LogError;
-        noop?: NoopOptions;
     } | undefined);
     private nativeParamsService;
-    private nativeLogService;
     private externalLinksService;
     private nativeNavigationAndTitleService;
     /**
@@ -36,7 +32,7 @@ export declare class BridgeToNative {
     /**
      * Платформа, в окружении которой работает NA и WA.
      */
-    get environment(): import("../types").Environment;
+    get environment(): import("./types").Environment;
     /**
      * Индикатор проблемы чтения данных о NA. Если `true`, используются умолчания,
      * возможно ошибочные (например, версия будет `0.0.0`).

package/client/bridge-to-native.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeToNative = void 0;
 const external_links_service_1 = require("./services-and-utils/external-links-service");
-const native_log_service_1 = require("./services-and-utils/native-log-service");
 const native_navigation_and_title_service_1 = require("./services-and-utils/native-navigation-and-title-service");
 const native_params_service_1 = require("./services-and-utils/native-params-service");
 /**
@@ -18,15 +17,13 @@ class BridgeToNative {
      *  будут использованы стандартные `History: pushState()` и `History: go()`.
      * @param options.logError Функция с помощью которой B2N может залогировать ошибку,
      *  если не передать, B2N не будет логировать ошибки.
-     * @param options.noop ....
      */
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d;
         this.options = options;
-        this.nativeParamsService = new native_params_service_1.NativeParamsService((_a = this.options) === null || _a === void 0 ? void 0 : _a.noop, (_b = this.options) === null || _b === void 0 ? void 0 : _b.logError);
-        this.nativeLogService = new native_log_service_1.NativeLogService(this.nativeParamsService.environment, this.nativeParamsService.appVersion, (_d = (_c = this.options) === null || _c === void 0 ? void 0 : _c.noop) === null || _d === void 0 ? void 0 : _d.enabled);
-        this.externalLinksService = new external_links_service_1.ExternalLinksService(this.nativeParamsService, this.nativeLogService);
-        this.nativeNavigationAndTitleService = new native_navigation_and_title_service_1.NativeNavigationAndTitleService(this.nativeParamsService, this.nativeLogService, (_e = this.options) === null || _e === void 0 ? void 0 : _e.browserHistoryApiWrappers, (_f = this.options) === null || _f === void 0 ? void 0 : _f.logError);
+        this.nativeParamsService = new native_params_service_1.NativeParamsService((_a = this.options) === null || _a === void 0 ? void 0 : _a.logError);
+        this.externalLinksService = new external_links_service_1.ExternalLinksService(this.nativeParamsService, (_b = this.options) === null || _b === void 0 ? void 0 : _b.logError);
+        this.nativeNavigationAndTitleService = new native_navigation_and_title_service_1.NativeNavigationAndTitleService(this.nativeParamsService, (_c = this.options) === null || _c === void 0 ? void 0 : _c.browserHistoryApiWrappers, (_d = this.options) === null || _d === void 0 ? void 0 : _d.logError);
     }
     /**
      * Схема NA.

package/client/services-and-utils/external-links-service.d.ts

@@ -1,5 +1,4 @@
-import { type PdfType } from '../types';
-import { type NativeLogService } from './native-log-service';
+import { type LogError, type PdfType } from '../types';
 import { type NativeParamsService } from './native-params-service';
 /**
  * Сервис, предоставляющий методы для открытия внешних для текущего WA экранов
@@ -7,9 +6,9 @@ import { type NativeParamsService } from './native-params-service';
  */
 export declare class ExternalLinksService {
     private nativeParamsService;
-    private nativeLogService;
+    private logError?;
     private navigationByNativeAppInProgress;
-    constructor(nativeParamsService: NativeParamsService, nativeLogService: NativeLogService);
+    constructor(nativeParamsService: NativeParamsService, logError?: LogError | undefined);
     handleNativeDeeplink(deeplink: string, closeWebviewBeforeCallNativeDeeplinkHandler?: boolean): void;
     getHrefToOpenInBrowser(link: string): string;
     openInBrowser(link: string): void;

package/client/services-and-utils/external-links-service.js

@@ -12,9 +12,9 @@ const QUERY_OPEN_IN_BROWSER_VALUE = 'true';
  * и связанных с этим действий.
  */
 class ExternalLinksService {
-    constructor(nativeParamsService, nativeLogService) {
+    constructor(nativeParamsService, logError) {
         this.nativeParamsService = nativeParamsService;
-        this.nativeLogService = nativeLogService;
+        this.logError = logError;
         this.navigationByNativeAppInProgress = false;
     }
     handleNativeDeeplink(deeplink, closeWebviewBeforeCallNativeDeeplinkHandler = false) {
@@ -28,40 +28,22 @@ class ExternalLinksService {
             : originalNativeUrl;
         if (closeWebviewBeforeCallNativeDeeplinkHandler &&
             this.nativeParamsService.canUseNativeFeature('savedBackStack')) {
-            this.nativeLogService.execute('closeWebview', () => (0, utils_1.closeWebviewUtil)());
+            (0, utils_1.closeWebviewUtil)();
             // Проверено, ОС получает диплинк и передаёт его NA, не смотря на то,
             // что это происходит в следующей макрозадаче после команды на закрытие WV.
-            this.nativeLogService.execute('nativeDeeplink', () => {
-                setTimeout(() => window.location.replace(preparedNativeUrl), 0);
-            }, { payload: { deeplink: preparedNativeUrl } });
+            setTimeout(() => window.location.replace(preparedNativeUrl), 0);
             return;
         }
-        let featureContext = null;
-        const { fromVersion } = constants_1.NATIVE_FEATURES_FROM_VERSION[this.nativeParamsService.environment].savedBackStack;
-        if (this.nativeParamsService.environment === 'android' &&
-            !this.nativeParamsService.isCurrentVersionHigherOrEqual(fromVersion)) {
-            featureContext = {
-                feature: 'savedBackStack',
-                fallbackReason: 'Открытие нового webview в Android приведет к закрытию текущего',
-            };
-        }
-        this.nativeLogService.execute('nativeDeeplink', () => this.navigateByNativeApp(preparedNativeUrl), {
-            payload: { deeplink: preparedNativeUrl },
-            featureContext: featureContext !== null && featureContext !== void 0 ? featureContext : null,
-        });
+        this.navigateByNativeApp(preparedNativeUrl);
     }
     getHrefToOpenInBrowser(link) {
         if (!this.nativeParamsService.canUseNativeFeature('linksInBrowser')) {
-            if ((this, this.nativeParamsService.environment === 'android')) {
-                this.nativeLogService.logFeatureFallback({
-                    feature: 'linksInBrowser',
-                    fallbackReason: 'Открытие в браузере технически недоступно, будет открыто в новом webview',
-                    payload: { link },
-                });
-            }
             return `${this.nativeParamsService.appId}://webFeature?type=recommendation&url=${encodeURIComponent(link)}`;
         }
-        const url = new URL(link);
+        const url = (0, utils_1.validateUrl)(link, this.logError);
+        if (!url) {
+            throw new Error(`invalid url: ${link}`);
+        }
         url.searchParams.append(QUERY_OPEN_IN_BROWSER_KEY, QUERY_OPEN_IN_BROWSER_VALUE);
         return url.href;
     }
@@ -70,24 +52,21 @@ class ExternalLinksService {
             return;
         }
         if (!this.nativeParamsService.canUseNativeFeature('linksInBrowser')) {
-            if ((this, this.nativeParamsService.environment === 'android')) {
-                this.nativeLogService.logFeatureFallback({
-                    feature: 'linksInBrowser',
-                    fallbackReason: 'Открытие в браузере технически недоступно, будет открыто в новом webview',
-                    payload: { link },
-                });
-            }
             this.openInNewWebview(link);
             return;
         }
-        const url = new URL(link);
+        const url = (0, utils_1.validateUrl)(link, this.logError);
+        if (!url) {
+            throw new Error(`invalid url: ${link}`);
+        }
         url.searchParams.append(QUERY_OPEN_IN_BROWSER_KEY, QUERY_OPEN_IN_BROWSER_VALUE);
-        this.nativeLogService.execute('openInBrowser', () => this.navigateByNativeApp(url.href), {
-            payload: { url: url.href },
-        });
+        this.navigateByNativeApp(url.href);
     }
     openInNewWebview(link, nativeTitle = '', closeCurrentWebview = false) {
-        const url = new URL(link);
+        const url = (0, utils_1.validateUrl)(link, this.logError);
+        if (!url) {
+            throw new Error(`invalid url: ${link}`);
+        }
         if (nativeTitle) {
             url.searchParams.set(query_and_headers_keys_1.QUERY_B2N_TITLE, nativeTitle);
         }
@@ -112,9 +91,7 @@ class ExternalLinksService {
             this.nativeParamsService.environment === 'ios'
                 ? (0, utils_1.appendFromCurrentQueryParamForIos)(replaceUrl)
                 : replaceUrl;
-        this.nativeLogService.execute('openPdf ', () => this.navigateByNativeApp(replaceUrl), {
-            payload: { replaceUrl },
-        });
+        this.navigateByNativeApp(replaceUrl);
     }
     navigateByNativeApp(url) {
         this.navigationByNativeAppInProgress = true;

package/client/services-and-utils/native-navigation-and-title-service.d.ts

@@ -1,5 +1,4 @@
 import { type BrowserHistoryApiWrappers, type HistoryPushStateParams, type LocationAssignParam, type LogError } from '../types';
-import { type NativeLogService } from './native-log-service';
 import { type NativeParamsService } from './native-params-service';
 /**
  * Сервис, отвечающий за взаимодействие WA с WV компонентами NA —
@@ -10,7 +9,6 @@ import { type NativeParamsService } from './native-params-service';
  */
 export declare class NativeNavigationAndTitleService {
     private nativeParamsService;
-    private nativeLogService;
     private browserHistoryApiWrappers?;
     private logError?;
     private lastSetPageSettingsParams;
@@ -18,7 +16,7 @@ export declare class NativeNavigationAndTitleService {
     private numOfBackSteps;
     private isGoBackLocked;
     private isNavigateServerSideLocked;
-    constructor(nativeParamsService: NativeParamsService, nativeLogService: NativeLogService, browserHistoryApiWrappers?: BrowserHistoryApiWrappers | undefined, logError?: LogError | undefined);
+    constructor(nativeParamsService: NativeParamsService, browserHistoryApiWrappers?: BrowserHistoryApiWrappers | undefined, logError?: LogError | undefined);
     closeWebview(): void;
     goBack(): void;
     goBackAFewSteps(stepsNumber: number, autoCloseWebview?: boolean): void;

package/client/services-and-utils/native-navigation-and-title-service.js

@@ -1,7 +1,7 @@
 "use strict";
+/* eslint max-lines: ["error", {"max": 360, "skipComments": true}] */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NativeNavigationAndTitleService = void 0;
-/* eslint max-lines: ["error", {"max": 360, "skipComments": true}] */
 const query_and_headers_keys_1 = require("../../query-and-headers-keys");
 const utils_1 = require("./utils");
 const NativeHistoryStackStub = 0;
@@ -13,9 +13,8 @@ const NativeHistoryStackStub = 0;
  * см. в документе {@link ./NAVIGATION_SCENARIOS.md}.
  */
 class NativeNavigationAndTitleService {
-    constructor(nativeParamsService, nativeLogService, browserHistoryApiWrappers, logError) {
+    constructor(nativeParamsService, browserHistoryApiWrappers, logError) {
         this.nativeParamsService = nativeParamsService;
-        this.nativeLogService = nativeLogService;
         this.browserHistoryApiWrappers = browserHistoryApiWrappers;
         this.logError = logError;
         // Здесь сохраняются параметры, которые в последний раз были отправлены
@@ -89,11 +88,22 @@ class NativeNavigationAndTitleService {
         this.syncHistoryWithNative();
     }
     navigateServerSide(link, nativeTitle = '') {
+        var _a;
         if (this.isNavigateServerSideLocked) {
             return;
         }
         this.isNavigateServerSideLocked = true;
-        const url = link instanceof URL ? link : new URL(link);
+        let url;
+        try {
+            url = link instanceof URL ? link : new URL(link);
+        }
+        catch (error) {
+            (_a = this.logError) === null || _a === void 0 ? void 0 : _a.call(this, 'navigateServerSide: URL creating error', {
+                link,
+                error,
+            });
+            throw error;
+        }
         this.nativeHistoryStack.push(nativeTitle || '');
         if (nativeTitle) {
             url.searchParams.set(query_and_headers_keys_1.QUERY_B2N_TITLE, nativeTitle);
@@ -272,12 +282,13 @@ class NativeNavigationAndTitleService {
      * с `nativeHistoryStack`.
      */
     syncHistoryWithNative() {
+        var _a;
         const { pageId, pageTitle } = this.getNativePageIdAndTitle();
         if (this.nativeParamsService.environment === 'android') {
             const narrowedPageId = pageId !== null && pageId !== void 0 ? pageId : 1;
             const paramsToSend = JSON.stringify({ pageId: narrowedPageId, pageTitle });
             if (this.lastSetPageSettingsParams !== paramsToSend) {
-                this.nativeLogService.execute('syncHistoryWithNative', () => { var _a; return (_a = this.nativeParamsService.AndroidBridge) === null || _a === void 0 ? void 0 : _a.setPageSettings(paramsToSend); }, { payload: paramsToSend });
+                (_a = this.nativeParamsService.AndroidBridge) === null || _a === void 0 ? void 0 : _a.setPageSettings(paramsToSend);
                 this.lastSetPageSettingsParams = paramsToSend;
             }
         }
@@ -286,7 +297,7 @@ class NativeNavigationAndTitleService {
             const pageIdStr = pageId ? `&pageId=${pageId}` : '';
             const paramsToSend = `ios:setPageSettings/${pageTitleStr + pageIdStr}`;
             if (this.lastSetPageSettingsParams !== paramsToSend) {
-                this.nativeLogService.execute('syncHistoryWithNative', () => window.location.replace(paramsToSend), { payload: paramsToSend });
+                window.location.replace(paramsToSend);
                 this.lastSetPageSettingsParams = paramsToSend;
             }
         }

package/client/services-and-utils/native-params-service.d.ts

@@ -1,10 +1,8 @@
-import { type Environment, type NoopOptions } from '../../types';
-import { type LogError, type NativeFeatureKey, type Theme } from '../types';
+import { type Environment, type LogError, type NativeFeatureKey, type Theme } from '../types';
 /**
  * Сервис, аккумулирующий детали о NA и предоставляющий методы, связанные с этим.
  */
 export declare class NativeParamsService {
-    private noop?;
     private logError?;
     AndroidBridge: {
         setPageSettings: (params: string) => void;
@@ -18,12 +16,10 @@ export declare class NativeParamsService {
     theme: Theme;
     title: string;
     webviewLaunchTime: number | null;
-    constructor(noop?: NoopOptions | undefined, logError?: LogError | undefined);
+    constructor(logError?: LogError | undefined);
     canUseNativeFeature(feature: NativeFeatureKey): boolean;
     isCurrentVersionHigherOrEqual(versionToCompare: string): boolean;
     private static isValidVersionFormat;
     private getAppId;
     private readNativeParamsCookie;
-    private resolveEnvironment;
-    private resolveAppVersion;
 }

package/client/services-and-utils/native-params-service.js

@@ -7,14 +7,15 @@ const constants_1 = require("../constants");
  * Сервис, аккумулирующий детали о NA и предоставляющий методы, связанные с этим.
  */
 class NativeParamsService {
-    constructor(noop, logError) {
-        this.noop = noop;
+    constructor(logError) {
         this.logError = logError;
         this.AndroidBridge = window.Android;
+        this.environment = window.Android ? 'android' : 'ios';
         this.nativeParamsReadErrorFlag = false;
         const nativeParams = this.readNativeParamsCookie();
-        this.environment = this.resolveEnvironment();
-        this.appVersion = this.resolveAppVersion(nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.appVersion);
+        this.appVersion = NativeParamsService.isValidVersionFormat(nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.appVersion)
+            ? nativeParams.appVersion
+            : '0.0.0';
         this.appId = this.getAppId(nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.iosAppId);
         this.nextPageId = (nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.nextPageId) || null;
         this.originalWebviewParams = (nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.originalWebviewParams) || null;
@@ -75,21 +76,5 @@ class NativeParamsService {
             return null;
         }
     }
-    resolveEnvironment() {
-        var _a;
-        if (((_a = this.noop) === null || _a === void 0 ? void 0 : _a.enabled) && this.noop.environment) {
-            return this.noop.environment;
-        }
-        return window.Android ? 'android' : 'ios';
-    }
-    resolveAppVersion(versionFromCookie) {
-        var _a;
-        if (((_a = this.noop) === null || _a === void 0 ? void 0 : _a.enabled) && this.noop.appVersion) {
-            return this.noop.appVersion;
-        }
-        return NativeParamsService.isValidVersionFormat(versionFromCookie)
-            ? versionFromCookie
-            : '0.0.0';
-    }
 }
 exports.NativeParamsService = NativeParamsService;

package/client/services-and-utils/utils.d.ts

@@ -1,2 +1,4 @@
+import { type LogError } from '../types';
 export declare function appendFromCurrentQueryParamForIos(nativeUrl: string): string;
 export declare const closeWebviewUtil: () => void;
+export declare const validateUrl: (link: URL | string, logError?: LogError) => URL | null;

package/client/services-and-utils/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeWebviewUtil = void 0;
+exports.validateUrl = exports.closeWebviewUtil = void 0;
 exports.appendFromCurrentQueryParamForIos = appendFromCurrentQueryParamForIos;
 const QUERY_CLOSE_WEBVIEW_KEY = 'closeWebView';
 const QUERY_CLOSE_WEBVIEW_VALUE = 'true';
@@ -23,3 +23,18 @@ const closeWebviewUtil = () => {
     window.location.href = originalPageUrl.toString();
 };
 exports.closeWebviewUtil = closeWebviewUtil;
+const validateUrl = (link, logError) => {
+    let url;
+    try {
+        url = link instanceof URL ? link : new URL(link);
+    }
+    catch (error) {
+        logError === null || logError === void 0 ? void 0 : logError('validateUrl: URL parsing error', {
+            error,
+            link,
+        });
+        return null;
+    }
+    return url;
+};
+exports.validateUrl = validateUrl;

package/client/types.d.ts

@@ -3,15 +3,12 @@ export type BrowserHistoryApiWrappers = {
     go?: (delta: number) => void;
     replace?: (url: HistoryReplaceStateParams[2], state: HistoryReplaceStateParams[0]) => void;
 };
+export type Environment = 'android' | 'ios';
 export type HistoryPushStateParams = Parameters<typeof window.history.pushState>;
 export type HistoryReplaceStateParams = Parameters<typeof window.history.replaceState>;
 export type LocationAssignParam = Parameters<typeof window.location.assign>[0];
 export type LogError = (b2nErrorMessage: string, originalError: unknown) => void;
 export type NativeFeatureKey = 'geolocation' | 'linksInBrowser' | 'savedBackStack';
-export type NativeFeatureContext = {
-    feature: NativeFeatureKey;
-    fallbackReason?: string;
-};
 type NativeFeaturesParams = Readonly<Record<NativeFeatureKey, {
     fromVersion: string;
 }>>;

package/package.json

@@ -1,121 +1,121 @@
 {
-  "name": "@alfalab/bridge-to-native",
-  "version": "1.4.1-beta.720f0f8",
-  "license": "MIT",
-  "description": "Утилита для удобной работы веб приложения внутри нативного приложения и коммуникации с ним.",
-  "engines": {
-    "node": ">=20.19.2",
-    "npm": "please-use-yarn"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/core-ds/bridge-to-native.git"
-  },
-  "exports": {
-    "./client": {
-      "import": "./client/index.js",
-      "require": "./client/index.js",
-      "types": "./client/index.d.ts"
+    "name": "@alfalab/bridge-to-native",
+    "version": "1.4.2",
+    "license": "MIT",
+    "description": "Утилита для удобной работы веб приложения внутри нативного приложения и коммуникации с ним.",
+    "engines": {
+        "node": ">=20.19.2",
+        "npm": "please-use-yarn"
     },
-    "./server": {
-      "import": "./server/index.js",
-      "require": "./server/index.js",
-      "types": "./server/index.d.ts"
-    }
-  },
-  "sideEffects": false,
-  "bugs": {
-    "url": "https://github.com/core-ds/bridge-to-native/issues"
-  },
-  "scripts": {
-    "build": "yarn build:clean && yarn build:ts",
-    "build:clean": "shx rm -rf .publish",
-    "build:copy-package-json": "shx cp package.json .publish/package.json",
-    "build:ts": "tsc --build",
-    "format": "arui-presets-lint format",
-    "format:check": "arui-presets-lint format:check",
-    "lint": "yarn lint:scripts && yarn format:check",
-    "lint:fix": "yarn lint:scripts --fix && yarn format",
-    "lint:scripts": "arui-presets-lint scripts",
-    "pub": "npm publish .publish --userconfig \"../.npmrc\" --tag \"$TAG\"",
-    "release": "yarn build && yarn build:copy-package-json && yarn pub",
-    "test": "arui-scripts test --silent --collect-coverage"
-  },
-  "devDependencies": {
-    "@happy-dom/jest-environment": "18.0.1",
-    "@types/jest": "29.5.14",
-    "@types/node": "20.19.1",
-    "arui-presets-lint": "8.7.0",
-    "arui-scripts": "19.0.7",
-    "copyfiles": "2.4.1",
-    "jest-junit": "10.0.0",
-    "lint-staged": "^12.5.0",
-    "promisify-child-process": "4.1.1",
-    "shx": "0.3.4",
-    "typescript": "5.5.4"
-  },
-  "commitlint": {
-    "extends": "./node_modules/arui-presets-lint/commitlint"
-  },
-  "eslintConfig": {
-    "extends": "./node_modules/arui-presets-lint/eslint",
-    "parserOptions": {
-      "project": [
-        "./__tests__/tsconfig.json",
-        "./src/client/tsconfig.json",
-        "./src/server/tsconfig.json"
-      ]
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/core-ds/bridge-to-native.git"
     },
-    "overrides": [
-      {
-        "files": [
-          "__tests__/**/*"
-        ],
-        "rules": {
-          "max-lines": "off"
+    "exports": {
+        "./client": {
+            "import": "./client/index.js",
+            "require": "./client/index.js",
+            "types": "./client/index.d.ts"
+        },
+        "./server": {
+            "import": "./server/index.js",
+            "require": "./server/index.js",
+            "types": "./server/index.d.ts"
         }
-      }
-    ]
-  },
-  "jest": {
-    "projects": [
-      {
-        "displayName": "client-tests",
-        "testEnvironment": "@happy-dom/jest-environment",
-        "testPathIgnorePatterns": [
-          "/__tests__/server/"
+    },
+    "sideEffects": false,
+    "bugs": {
+        "url": "https://github.com/core-ds/bridge-to-native/issues"
+    },
+    "scripts": {
+        "build": "yarn build:clean && yarn build:ts",
+        "build:clean": "shx rm -rf .publish",
+        "build:copy-package-json": "shx cp package.json .publish/package.json",
+        "build:ts": "tsc --build",
+        "format": "arui-presets-lint format",
+        "format:check": "arui-presets-lint format:check",
+        "lint": "yarn lint:scripts && yarn format:check",
+        "lint:fix": "yarn lint:scripts --fix && yarn format",
+        "lint:scripts": "arui-presets-lint scripts",
+        "pub": "npm publish .publish --userconfig \"../.npmrc\" --tag \"$TAG\"",
+        "release": "yarn build && yarn build:copy-package-json && yarn pub",
+        "test": "arui-scripts test --silent --collect-coverage"
+    },
+    "devDependencies": {
+        "@happy-dom/jest-environment": "18.0.1",
+        "@types/jest": "29.5.14",
+        "@types/node": "20.19.1",
+        "arui-presets-lint": "8.7.0",
+        "arui-scripts": "19.0.7",
+        "copyfiles": "2.4.1",
+        "jest-junit": "10.0.0",
+        "lint-staged": "^12.5.0",
+        "promisify-child-process": "4.1.1",
+        "shx": "0.3.4",
+        "typescript": "5.5.4"
+    },
+    "commitlint": {
+        "extends": "./node_modules/arui-presets-lint/commitlint"
+    },
+    "eslintConfig": {
+        "extends": "./node_modules/arui-presets-lint/eslint",
+        "parserOptions": {
+            "project": [
+                "./__tests__/tsconfig.json",
+                "./src/client/tsconfig.json",
+                "./src/server/tsconfig.json"
+            ]
+        },
+        "overrides": [
+            {
+                "files": [
+                    "__tests__/**/*"
+                ],
+                "rules": {
+                    "max-lines": "off"
+                }
+            }
+        ]
+    },
+    "jest": {
+        "projects": [
+            {
+                "displayName": "client-tests",
+                "testEnvironment": "@happy-dom/jest-environment",
+                "testPathIgnorePatterns": [
+                    "/__tests__/server/"
+                ]
+            },
+            {
+                "displayName": "server-tests",
+                "testEnvironment": "node",
+                "testPathIgnorePatterns": [
+                    "/__tests__/client/"
+                ]
+            }
+        ],
+        "testRegex": [
+            "__tests__/.*\\.test\\.ts"
+        ],
+        "coveragePathIgnorePatterns": [
+            "/node_modules/",
+            "/src/(client|server)/index.ts"
+        ],
+        "reporters": [
+            "default",
+            "jest-junit"
         ]
-      },
-      {
-        "displayName": "server-tests",
-        "testEnvironment": "node",
-        "testPathIgnorePatterns": [
-          "/__tests__/client/"
+    },
+    "prettier": "arui-presets-lint/prettier",
+    "stylelint": {
+        "extends": "arui-presets-lint/stylelint",
+        "ignoreFiles": [
+            "coverage/**/*.js",
+            ".yarn/releases/*"
         ]
-      }
-    ],
-    "testRegex": [
-      "__tests__/.*\\.test\\.ts"
-    ],
-    "coveragePathIgnorePatterns": [
-      "/node_modules/",
-      "/src/(client|server)/index.ts"
-    ],
-    "reporters": [
-      "default",
-      "jest-junit"
-    ]
-  },
-  "prettier": "arui-presets-lint/prettier",
-  "stylelint": {
-    "extends": "arui-presets-lint/stylelint",
-    "ignoreFiles": [
-      "coverage/**/*.js",
-      ".yarn/releases/*"
-    ]
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  },
-  "packageManager": "yarn@4.12.0"
+    },
+    "publishConfig": {
+        "registry": "https://registry.npmjs.org"
+    },
+    "packageManager": "yarn@4.12.0"
 }

package/query-and-headers-keys.js

@@ -11,8 +11,6 @@ exports.HEADER_KEY_USER_AGENT = 'user-agent';
  */
 // Ключ cookie, с помощью которого серверная часть B2N передаст на клиент информацию об NA.
 exports.COOKIE_KEY_BRIDGE_TO_NATIVE_DATA = 'bridgeToNativeData';
-// Ключ cookie, с помощью которого серверная часть B2N передаст на клиент информацию об NA.
-// export const B2N_MODE = 'b2n_mode';
 // NA на обеих платформах подмешивает этот заголовок к запросу за HTML.
 // TODO:
 // * Исследовать, делает ли оно это при запросах к прочим ресурсам;

package/server/prepare-native-app-details-for-client.d.ts

@@ -1,4 +1,4 @@
-import { type NativeParams, type NoopOptions } from '../types';
+import { type NativeParams } from '../types';
 import { type UniversalRequest } from './types';
 /**
  * Парсит запрос, доставая из него данные о нативном приложении,
@@ -11,4 +11,4 @@ import { type UniversalRequest } from './types';
  *  Нужно передать функцию, которая средствами используемого веб-сервера добавит заголовок в ответ.
  *  b2native с её помощью добавит `Set-Cookie` заголовок с некоторыми данными для своего клиентского кода.
  */
-export declare function prepareNativeAppDetailsForClient(request: UniversalRequest, setResponseHeader: (headerKey: string, headerValue: string) => void, noop?: NoopOptions): Partial<NativeParams>;
+export declare function prepareNativeAppDetailsForClient(request: UniversalRequest, setResponseHeader: (headerKey: string, headerValue: string) => void): Partial<NativeParams>;

package/server/prepare-native-app-details-for-client.js

@@ -16,17 +16,15 @@ const utils_1 = require("./utils");
  *  Нужно передать функцию, которая средствами используемого веб-сервера добавит заголовок в ответ.
  *  b2native с её помощью добавит `Set-Cookie` заголовок с некоторыми данными для своего клиентского кода.
  */
-function prepareNativeAppDetailsForClient(request, setResponseHeader, noop) {
+function prepareNativeAppDetailsForClient(request, setResponseHeader) {
     // Поскольку вебвью модули имеют особенность сохранять сессионную куку подолгу,
     // даже после перезагрузки устройства или обновления приложения/ОС, ее значение
     // актуализируется при каждом запросе на сервер.
     const cookieHeader = (0, utils_1.getHeaderValue)(request, query_and_headers_keys_1.HEADER_KEY_COOKIE);
     const nativeParamsFromCookie = (0, utils_1.readNativeParamsFromCookie)(cookieHeader);
     const nativeParams = buildNativeParams(request, nativeParamsFromCookie);
-    if (!noop?.enabled) {
-        const serializedNativeParams = encodeURIComponent(JSON.stringify(nativeParams));
-        setResponseHeader('Set-Cookie', `${query_and_headers_keys_1.COOKIE_KEY_BRIDGE_TO_NATIVE_DATA}=${serializedNativeParams}; Path=/`);
-    }
+    const serializedNativeParams = encodeURIComponent(JSON.stringify(nativeParams));
+    setResponseHeader('Set-Cookie', `${query_and_headers_keys_1.COOKIE_KEY_BRIDGE_TO_NATIVE_DATA}=${serializedNativeParams}; Path=/`);
     return nativeParams;
 }
 function buildNativeParams(request, nativeParamsFromCookie) {

package/server/utils.js

@@ -74,8 +74,6 @@ const getBridgeToNativeDataCookie = (cookieHeader) => {
     return undefined;
 };
 exports.getBridgeToNativeDataCookie = getBridgeToNativeDataCookie;
-// export const getBridgeToNativeDataCookie = (cookieHeader: string | null) =>
-//     getCookieValue(cookieHeader, COOKIE_KEY_BRIDGE_TO_NATIVE_DATA);
 /**
  * Возвращает десериализованные данные из `bridgeToNativeData` cookie.
  */
@@ -91,10 +89,3 @@ function readNativeParamsFromCookie(cookieHeader) {
         return null;
     }
 }
-// export function readModeFromCookie(cookieHeader: string | null) {
-//     const mode = getCookieValue(cookieHeader, B2N_MODE);
-//     if (!mode) {
-//         return null;
-//     }
-//     return mode as 'noop' | 'native';
-// }

package/types.d.ts

@@ -7,9 +7,3 @@ export type NativeParams = {
     originalWebviewParams: string;
     webviewLaunchTime?: number;
 };
-export type Environment = 'android' | 'ios';
-export type NoopOptions = {
-    enabled: boolean;
-    environment?: Environment;
-    appVersion?: string;
-};

package/client/services-and-utils/native-log-service.d.ts

@@ -1,27 +0,0 @@
-import { type Environment, type NoopOptions } from '../../types';
-import { type NativeFeatureContext, type NativeFeatureKey } from '../types';
-/**
- * Обёртка для выполнения нативных вызовов с noop-режимом и логированием версионных фич
- */
-export declare class NativeLogService {
-    private environment;
-    private appVersion;
-    private isNoop?;
-    constructor(environment: Environment, appVersion: string, isNoop?: NoopOptions["enabled"] | undefined);
-    /**
-     * Метод для вывода в консоль информации о недоступности фич,
-     * перечисленных в `NATIVE_FEATURES_FROM_VERSION` src/client/constants.ts
-     */
-    logFeatureFallback(params: {
-        feature: NativeFeatureKey;
-        fallbackReason: string;
-        payload?: unknown;
-    }): void;
-    /**
-     * Метод подменяющий нативный вызов и логирующий его, для работы в noop режиме
-     */
-    execute(action: string, fn: () => void, meta?: {
-        featureContext?: NativeFeatureContext | null;
-        payload?: unknown;
-    }): void;
-}

package/client/services-and-utils/native-log-service.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NativeLogService = void 0;
-const constants_1 = require("../constants");
-/**
- * Обёртка для выполнения нативных вызовов с noop-режимом и логированием версионных фич
- */
-class NativeLogService {
-    constructor(environment, appVersion, isNoop) {
-        this.environment = environment;
-        this.appVersion = appVersion;
-        this.isNoop = isNoop;
-    }
-    /**
-     * Метод для вывода в консоль информации о недоступности фич,
-     * перечисленных в `NATIVE_FEATURES_FROM_VERSION` src/client/constants.ts
-     */
-    logFeatureFallback(params) {
-        if (!this.isNoop)
-            return;
-        const { fromVersion } = constants_1.NATIVE_FEATURES_FROM_VERSION[this.environment][params.feature];
-        console.info([
-            `[B2N noop][${this.environment}][v${this.appVersion}]`,
-            `Feature: ${params.feature}`,
-            `${params.fallbackReason}`,
-            `Будет исправлено в версии: ${fromVersion}`,
-        ].join('\n'), params.payload);
-    }
-    /**
-     * Метод подменяющий нативный вызов и логирующий его, для работы в noop режиме
-     */
-    execute(action, fn, meta) {
-        var _a;
-        if (this.isNoop) {
-            if (meta === null || meta === void 0 ? void 0 : meta.featureContext) {
-                this.logFeatureFallback({
-                    feature: meta.featureContext.feature,
-                    fallbackReason: (_a = meta.featureContext.fallbackReason) !== null && _a !== void 0 ? _a : '',
-                    payload: meta.payload,
-                });
-            }
-            else {
-                console.info(`[B2N noop][${this.environment}][v${this.appVersion}] ${action}`, ...((meta === null || meta === void 0 ? void 0 : meta.payload) !== undefined ? [meta.payload] : []));
-            }
-            return;
-        }
-        fn();
-    }
-}
-exports.NativeLogService = NativeLogService;