@alfalab/bridge-to-native 1.4.0-beta.7b254fa → 1.4.1-beta.52a0437

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

@@ -1,5 +1,5 @@
  
-import { type BrowserHistoryApiWrappers, type HistoryPushStateParams, type HistoryReplaceStateParams, type LocationAssignParam, type LogError, type NativeFeatureKey, type PdfType } from './types';
+import { type BrowserHistoryApiWrappers, type HistoryPushStateParams, type HistoryReplaceStateParams, type LocationAssignParam, type LogError, type NativeFeatureKey, type NoopOptions, type PdfType } from './types';
 /**
  * Сервис, предоставляет методы для WA, работающего внутри NA.
  */
@@ -13,12 +13,15 @@ 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 nativeExecuteService;
     private externalLinksService;
     private nativeNavigationAndTitleService;
     /**

package/client/bridge-to-native.js

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

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

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

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

@@ -12,8 +12,9 @@ const QUERY_OPEN_IN_BROWSER_VALUE = 'true';
  * и связанных с этим действий.
  */
 class ExternalLinksService {
-    constructor(nativeParamsService) {
+    constructor(nativeParamsService, nativeExecuteService) {
         this.nativeParamsService = nativeParamsService;
+        this.nativeExecuteService = nativeExecuteService;
         this.navigationByNativeAppInProgress = false;
     }
     handleNativeDeeplink(deeplink, closeWebviewBeforeCallNativeDeeplinkHandler = false) {
@@ -27,13 +28,15 @@ class ExternalLinksService {
             : originalNativeUrl;
         if (closeWebviewBeforeCallNativeDeeplinkHandler &&
             this.nativeParamsService.canUseNativeFeature('savedBackStack')) {
-            (0, utils_1.closeWebviewUtil)();
+            this.nativeExecuteService.execute('closeWebview', () => (0, utils_1.closeWebviewUtil)());
             // Проверено, ОС получает диплинк и передаёт его NA, не смотря на то,
             // что это происходит в следующей макрозадаче после команды на закрытие WV.
-            setTimeout(() => window.location.replace(preparedNativeUrl), 0);
+            this.nativeExecuteService.execute('nativeDeeplink', () => {
+                setTimeout(() => window.location.replace(preparedNativeUrl), 0);
+            }, { deeplink: preparedNativeUrl });
             return;
         }
-        this.navigateByNativeApp(preparedNativeUrl);
+        this.nativeExecuteService.execute('nativeDeeplink', () => this.navigateByNativeApp(preparedNativeUrl), { deeplink: preparedNativeUrl });
     }
     getHrefToOpenInBrowser(link) {
         if (!this.nativeParamsService.canUseNativeFeature('linksInBrowser')) {
@@ -53,7 +56,7 @@ class ExternalLinksService {
         }
         const url = new URL(link);
         url.searchParams.append(QUERY_OPEN_IN_BROWSER_KEY, QUERY_OPEN_IN_BROWSER_VALUE);
-        this.navigateByNativeApp(url.href);
+        this.nativeExecuteService.execute('openInBrowser', () => this.navigateByNativeApp(url.href), { url: url.href });
     }
     openInNewWebview(link, nativeTitle = '', closeCurrentWebview = false) {
         const url = new URL(link);
@@ -81,7 +84,7 @@ class ExternalLinksService {
             this.nativeParamsService.environment === 'ios'
                 ? (0, utils_1.appendFromCurrentQueryParamForIos)(replaceUrl)
                 : replaceUrl;
-        this.navigateByNativeApp(replaceUrl);
+        this.nativeExecuteService.execute('openPdf ', () => this.navigateByNativeApp(replaceUrl), { replaceUrl });
     }
     navigateByNativeApp(url) {
         this.navigationByNativeAppInProgress = true;

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

@@ -0,0 +1,7 @@
+import { type Environment, type NoopOptions } from '../types';
+export declare class NativeExecuteService {
+    private isNoop?;
+    private environment?;
+    constructor(isNoop?: NoopOptions["enabled"] | undefined, environment?: Environment | undefined);
+    execute(action: string, fn: () => void, payload?: unknown): void;
+}

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NativeExecuteService = void 0;
+class NativeExecuteService {
+    constructor(isNoop, environment) {
+        this.isNoop = isNoop;
+        this.environment = environment;
+    }
+    execute(action, fn, payload) {
+        if (this.isNoop) {
+            console.info(`[B2N noop][${this.environment}] ${action}`, payload);
+            return;
+        }
+        fn();
+    }
+}
+exports.NativeExecuteService = NativeExecuteService;

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

@@ -1,4 +1,5 @@
 import { type BrowserHistoryApiWrappers, type HistoryPushStateParams, type LocationAssignParam, type LogError } from '../types';
+import { type NativeExecuteService } from './native-execute-service';
 import { type NativeParamsService } from './native-params-service';
 /**
  * Сервис, отвечающий за взаимодействие WA с WV компонентами NA —
@@ -9,6 +10,7 @@ import { type NativeParamsService } from './native-params-service';
  */
 export declare class NativeNavigationAndTitleService {
     private nativeParamsService;
+    private nativeExecuteService;
     private browserHistoryApiWrappers?;
     private logError?;
     private lastSetPageSettingsParams;
@@ -16,7 +18,7 @@ export declare class NativeNavigationAndTitleService {
     private numOfBackSteps;
     private isGoBackLocked;
     private isNavigateServerSideLocked;
-    constructor(nativeParamsService: NativeParamsService, browserHistoryApiWrappers?: BrowserHistoryApiWrappers | undefined, logError?: LogError | undefined);
+    constructor(nativeParamsService: NativeParamsService, nativeExecuteService: NativeExecuteService, 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": 350, "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,8 +13,9 @@ const NativeHistoryStackStub = 0;
  * см. в документе {@link ./NAVIGATION_SCENARIOS.md}.
  */
 class NativeNavigationAndTitleService {
-    constructor(nativeParamsService, browserHistoryApiWrappers, logError) {
+    constructor(nativeParamsService, nativeExecuteService, browserHistoryApiWrappers, logError) {
         this.nativeParamsService = nativeParamsService;
+        this.nativeExecuteService = nativeExecuteService;
         this.browserHistoryApiWrappers = browserHistoryApiWrappers;
         this.logError = logError;
         // Здесь сохраняются параметры, которые в последний раз были отправлены
@@ -277,7 +278,7 @@ class NativeNavigationAndTitleService {
             const narrowedPageId = pageId !== null && pageId !== void 0 ? pageId : 1;
             const paramsToSend = JSON.stringify({ pageId: narrowedPageId, pageTitle });
             if (this.lastSetPageSettingsParams !== paramsToSend) {
-                (_a = this.nativeParamsService.AndroidBridge) === null || _a === void 0 ? void 0 : _a.setPageSettings(paramsToSend);
+                this.nativeExecuteService.execute('syncHistoryWithNative', () => { var _a; return (_a = this.nativeParamsService.AndroidBridge) === null || _a === void 0 ? void 0 : _a.setPageSettings(paramsToSend); }, { paramsToSend });
                 this.lastSetPageSettingsParams = paramsToSend;
             }
         }
@@ -286,7 +287,7 @@ class NativeNavigationAndTitleService {
             const pageIdStr = pageId ? `&pageId=${pageId}` : '';
             const paramsToSend = `ios:setPageSettings/${pageTitleStr + pageIdStr}`;
             if (this.lastSetPageSettingsParams !== paramsToSend) {
-                window.location.replace(paramsToSend);
+                (_a = this.nativeExecuteService) === null || _a === void 0 ? void 0 : _a.execute('syncHistoryWithNative', () => window.location.replace(paramsToSend), { paramsToSend });
                 this.lastSetPageSettingsParams = paramsToSend;
             }
         }

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

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

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

@@ -7,12 +7,13 @@ const constants_1 = require("../constants");
  * Сервис, аккумулирующий детали о NA и предоставляющий методы, связанные с этим.
  */
 class NativeParamsService {
-    constructor(logError) {
+    constructor(noop, logError) {
+        this.noop = noop;
         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 = NativeParamsService.isValidVersionFormat(nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.appVersion)
             ? nativeParams.appVersion
             : '0.0.0';
@@ -76,5 +77,12 @@ 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';
+    }
 }
 exports.NativeParamsService = NativeParamsService;

package/client/types.d.ts

@@ -18,4 +18,8 @@ export type NativeFeaturesFromVersion = Readonly<{
 }>;
 export type PdfType = 'pdfFile' | 'base64' | 'binary';
 export type Theme = 'light' | 'dark';
+export type NoopOptions = {
+    enabled: boolean;
+    environment?: Environment;
+};
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfalab/bridge-to-native",
-  "version": "1.4.0-beta.7b254fa",
+  "version": "1.4.1-beta.52a0437",
   "license": "MIT",
   "description": "Утилита для удобной работы веб приложения внутри нативного приложения и коммуникации с ним.",
   "engines": {

package/server/is-webview-env.js

@@ -10,20 +10,22 @@ const utils_1 = require("./utils");
  * @param request Объект запроса (Request или IncomingMessage).
  */
 function isWebviewEnv(request) {
-    // Выставленная ранее кука — однозначный индикатор вебвью окружения.
-    const cookieHeader = (0, utils_1.getHeaderValue)(request, query_and_headers_keys_1.HEADER_KEY_COOKIE);
-    if ((0, utils_1.hasBridgeToNativeDataCookie)(cookieHeader)) {
-        return true;
-    }
     const appVersion = (0, utils_1.getHeaderValue)(request, query_and_headers_keys_1.HEADER_KEY_NATIVE_APPVERSION);
+    const userAgent = (0, utils_1.getHeaderValue)(request, query_and_headers_keys_1.HEADER_KEY_USER_AGENT);
+    const isWebviewByHeaders = 
     // `app-version` в заголовках — основной индикатор запроса из вебвью.
-    if (appVersion && regexp_patterns_1.versionPattern.test(appVersion)) {
+    (appVersion && regexp_patterns_1.versionPattern.test(appVersion)) ||
+        // Проверка «на всякий случай» для iOS — нет уверенности,
+        // что `app-version` стабильно и на всех версиях есть во всех запросах из вебвью.
+        (userAgent && regexp_patterns_1.webviewUaIOSPattern.test(userAgent));
+    if (isWebviewByHeaders)
         return true;
-    }
-    const userAgent = (0, utils_1.getHeaderValue)(request, query_and_headers_keys_1.HEADER_KEY_USER_AGENT);
-    // Проверка «на всякий случай» для iOS — нет уверенности,
-    // что `app-version` стабильно и на всех версиях есть во всех запросах из вебвью.
-    if (userAgent && regexp_patterns_1.webviewUaIOSPattern.test(userAgent)) {
+    const isBrowserEnv = userAgent && !regexp_patterns_1.webviewUaIOSPattern.test(userAgent) && !appVersion;
+    if (isBrowserEnv)
+        return false;
+    // Выставленная ранее кука — однозначный индикатор вебвью окружения.
+    const cookieHeader = (0, utils_1.getHeaderValue)(request, query_and_headers_keys_1.HEADER_KEY_COOKIE);
+    if ((0, utils_1.hasBridgeToNativeDataCookie)(cookieHeader)) {
         return true;
     }
     return false;