@alfalab/bridge-to-native 1.4.1 → 1.4.2

package/client/bridge-to-native.js

@@ -19,11 +19,11 @@ class BridgeToNative {
      *  если не передать, B2N не будет логировать ошибки.
      */
     constructor(options) {
-        var _a, _b, _c;
+        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.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.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,4 +1,4 @@
-import { type PdfType } from '../types';
+import { type LogError, type PdfType } from '../types';
 import { type NativeParamsService } from './native-params-service';
 /**
  * Сервис, предоставляющий методы для открытия внешних для текущего WA экранов
@@ -6,8 +6,9 @@ import { type NativeParamsService } from './native-params-service';
  */
 export declare class ExternalLinksService {
     private nativeParamsService;
+    private logError?;
     private navigationByNativeAppInProgress;
-    constructor(nativeParamsService: NativeParamsService);
+    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,8 +12,9 @@ const QUERY_OPEN_IN_BROWSER_VALUE = 'true';
  * и связанных с этим действий.
  */
 class ExternalLinksService {
-    constructor(nativeParamsService) {
+    constructor(nativeParamsService, logError) {
         this.nativeParamsService = nativeParamsService;
+        this.logError = logError;
         this.navigationByNativeAppInProgress = false;
     }
     handleNativeDeeplink(deeplink, closeWebviewBeforeCallNativeDeeplinkHandler = false) {
@@ -39,7 +40,10 @@ class ExternalLinksService {
         if (!this.nativeParamsService.canUseNativeFeature('linksInBrowser')) {
             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;
     }
@@ -51,12 +55,18 @@ class ExternalLinksService {
             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.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);
         }

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

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint max-lines: ["error", {"max": 350, "skipComments": true}] */
+/* eslint max-lines: ["error", {"max": 360, "skipComments": true}] */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NativeNavigationAndTitleService = void 0;
 const query_and_headers_keys_1 = require("../../query-and-headers-keys");
@@ -88,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);

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/package.json

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