suggestion(server): refactor isWebviewEnvironment

src/server/constants.ts

@@ -1,6 +1,7 @@
-export const THEME_QUERY = 'theme';
-export const TITLE = 'title';
-export const WEBVIEW_IOS_APP_ID_QUERY = 'applicationId';
-export const WEBVIEW_IOS_APP_VERSION_QUERY = 'device_app_version';
-export const WEBVIEW_NEXT_PAGE_ID_QUERY = 'nextPageId';
-export const NATIVE_PARAMS_COOKIE_NAME = 'app_native_params';
+export const APP_VERSION_HEADER_KEY = 'app-version';
+export const IOS_APP_ID_QUERY_KEY = 'applicationId';
+export const IOS_APP_VERSION_QUERY_KEY = 'device_app_version';
+export const NATIVE_PARAMS_COOKIE_KEY = 'app_native_params';
+export const NEXT_PAGE_ID_QUERY_KEY = 'nextPageId';
+export const THEME_QUERY_KEY = 'theme';
+export const TITLE_QUERY_KEY = 'title';

src/server/extract-native-params.ts

@@ -1,16 +1,16 @@
 import {
-    THEME_QUERY,
-    TITLE,
-    WEBVIEW_IOS_APP_ID_QUERY,
-    WEBVIEW_IOS_APP_VERSION_QUERY,
-    WEBVIEW_NEXT_PAGE_ID_QUERY,
+    THEME_QUERY_KEY,
+    TITLE_QUERY_KEY,
+    IOS_APP_ID_QUERY_KEY,
+    IOS_APP_VERSION_QUERY_KEY,
+    NEXT_PAGE_ID_QUERY_KEY,
 } from './constants';
 
 import { extractAppVersion } from './utils';
 
 import { extractAndJoinOriginalWebviewParams } from './extract-and-join-original-webview-params';
 import { iosAppIdPattern, versionPattern } from './reg-exp-patterns';
-import { RequestHeaderType } from "./types";
+import { UniversalRequest } from "./types";
 import { isWebviewEnvironment } from "./is-webview-environment";
 import {NativeParams} from "../shared/types";
 
@@ -21,22 +21,22 @@ import {NativeParams} from "../shared/types";
  */
 
 export const extractNativeParams = (
-    request: RequestHeaderType
+    request: UniversalRequest
 ): NativeParams | null => {
 
     if(!isWebviewEnvironment(request)) {
         return null;
     }
 
     const {
-        [THEME_QUERY]: themeQuery,
+        [THEME_QUERY_KEY]: themeQuery,
         // При желании через диплинк на вебвью можно передать желаемый заголовок
         // По умолчанию нужна именно пустая строка.
-        [TITLE]: title = '',
+        [TITLE_QUERY_KEY]: title = '',
         // Говорят, этого может и не быть в урле. Формат `com.xxxxxxxxx.app`.
-        [WEBVIEW_IOS_APP_ID_QUERY]: iosAppIdQuery,
-        [WEBVIEW_IOS_APP_VERSION_QUERY]: iosAppVersionQuery,
-        [WEBVIEW_NEXT_PAGE_ID_QUERY]: nextPageId,
+        [IOS_APP_ID_QUERY_KEY]: iosAppIdQuery,
+        [IOS_APP_VERSION_QUERY_KEY]: iosAppVersionQuery,
+        [NEXT_PAGE_ID_QUERY_KEY]: nextPageId,
     } = request.query as Record<string, string>;
 
     const originalWebviewParams = extractAndJoinOriginalWebviewParams(

src/server/handle-native-params.ts

@@ -1,10 +1,10 @@
 import type { NativeParams } from '../shared/types';
 import {extractNativeParams} from "./extract-native-params";
 import {setNativeParamsCookie} from "./set-native-params-cookie";
-import { RequestHeaderType } from "./types";
+import { UniversalRequest } from "./types";
 
 export const handleNativeParams = (
-    request: RequestHeaderType,
+    request: UniversalRequest,
     setCookie: (cookieKey: string, cookieValue: string) => void
 ): NativeParams | null => {
     const nativeParams = extractNativeParams(request);

src/server/index.ts

@@ -2,4 +2,3 @@ export * from './is-webview-environment';
 export * from './extract-native-params';
 export * from './set-native-params-cookie';
 export * from './handle-native-params';
-export * from './types';

src/server/is-webview-environment.ts

@@ -1,31 +1,20 @@
-import {
-    extractAppVersion,
-    extractUserAgent,
-    extractNativeParamsFromCookieHeader
-} from './utils';
-import { RequestHeaderType } from './types';
+import { extractAppVersion, extractUserAgent, extractNativeParams } from './utils';
+import { UniversalRequest } from './types';
 import { versionPattern, webviewUaIOSPattern } from './reg-exp-patterns';
 
-export const isWebviewByUserAgent = (
-    userAgent: string,
-    appVersion: string | undefined,
-) => {
-    return (
-        (appVersion && versionPattern.test(appVersion)) || !!userAgent?.match(webviewUaIOSPattern)
-    );
-};
+export const isWebviewEnvironment = (request: UniversalRequest) => {
+    const nativeParams = extractNativeParams(request);
 
-export const isWebviewByCookies = (nativeParamsFromCookies: Record<string, any> | null) => {
-    return !!(nativeParamsFromCookies && nativeParamsFromCookies.isWebview)
-}
-export const isWebviewEnvironment = (
-    request: RequestHeaderType,
-): boolean => {
-    const userAgent = extractUserAgent(request);
+    if (nativeParams) {
+        return true;
+    }
 
-    // `app-version` в заголовках – индикатор вебвью. В iOS есть только в первом запросе от webview
+    // `app-version` в заголовках – индикатор вебвью. В iOS есть только в первом запросе от webview.
     const appVersion = extractAppVersion(request);
-    const nativeParams = extractNativeParamsFromCookieHeader(request);
+    const userAgent = extractUserAgent(request);
 
-    return isWebviewByCookies(nativeParams) || isWebviewByUserAgent(userAgent, appVersion);
+    return !!(
+        (appVersion && versionPattern.test(appVersion)) ||
+        (userAgent && webviewUaIOSPattern.test(userAgent))
+    );
 };

src/server/set-native-params-cookie.ts

@@ -1,7 +1,7 @@
-import { NATIVE_PARAMS_COOKIE_NAME } from "./constants";
+import { NATIVE_PARAMS_COOKIE_KEY } from "./constants";
 import { NativeParams } from "../shared/types";
 
 export const setNativeParamsCookie = (params: NativeParams, setCookie: (name: string, value: string) => void): void => {
-    setCookie(NATIVE_PARAMS_COOKIE_NAME, encodeURIComponent(JSON.stringify(params)))
+    setCookie(NATIVE_PARAMS_COOKIE_KEY, encodeURIComponent(JSON.stringify(params)))
 }
 

src/shared/utils.ts

@@ -1,4 +1,4 @@
-import { NATIVE_PARAMS_COOKIE_NAME } from "../server/constants";
+import { NATIVE_PARAMS_COOKIE_KEY } from "../server/constants";
 
 /**
  * Возвращает объект с `webview-параметрами` из cookies
@@ -10,7 +10,7 @@ export function extractNativeParamsFromCookies(cookies?: string): Record<string,
     }
 
     const cookiesArray = cookies.split('; ');
-    const cookieString = cookiesArray.find((cookie: string) => cookie.startsWith(`${NATIVE_PARAMS_COOKIE_NAME}=`));
+    const cookieString = cookiesArray.find((cookie: string) => cookie.startsWith(`${NATIVE_PARAMS_COOKIE_KEY}=`));
 
     if (!cookieString) return null;
 

test/server/extract-native-params.ts

@@ -1,5 +1,5 @@
 import { extractNativeParams } from '../../src/server/extract-native-params';
-import { isWebviewEnvironment, RequestHeaderType } from "../../src/server";
+import { isWebviewEnvironment, UniversalRequest } from "../../src/server";
 import { IncomingMessage } from "http";
 import { Socket } from "net";
 

test/shared/utils.test.ts

@@ -1,5 +1,5 @@
 import { extractNativeParamsFromCookies } from '../../src/shared/utils';
-import { NATIVE_PARAMS_COOKIE_NAME } from '../../src/server/constants';
+import { NATIVE_PARAMS_COOKIE_KEY } from '../../src/server/constants';
 
 describe('extractNativeParamsFromCookies', () => {
     it('should return an empty object if cookie header is missing', () => {
@@ -16,22 +16,22 @@ describe('extractNativeParamsFromCookies', () => {
         const nativeParams = { param1: 'value1', param2: 'value2' };
         const encodedNativeParams = encodeURIComponent(JSON.stringify(nativeParams));
 
-        const result = extractNativeParamsFromCookies(`${NATIVE_PARAMS_COOKIE_NAME}=${encodedNativeParams}`);
+        const result = extractNativeParamsFromCookies(`${NATIVE_PARAMS_COOKIE_KEY}=${encodedNativeParams}`);
         expect(result).toEqual(nativeParams);
     });
 
     it('should return null if native params cookie has invalid JSON', () => {
         const invalidJsonValue = 'invalid%7Bjson';
 
-        const result = extractNativeParamsFromCookies(`${NATIVE_PARAMS_COOKIE_NAME}=${invalidJsonValue}`);
+        const result = extractNativeParamsFromCookies(`${NATIVE_PARAMS_COOKIE_KEY}=${invalidJsonValue}`);
         expect(result).toBeNull();
     });
 
     it('should handle multiple cookies and return only native params cookie value', () => {
         const nativeParams = { param1: 'value1', param2: 'value2' };
         const encodedNativeParams = encodeURIComponent(JSON.stringify(nativeParams));
 
-        const result = extractNativeParamsFromCookies(`otherCookie=value; ${NATIVE_PARAMS_COOKIE_NAME}=${encodedNativeParams}; anotherCookie=anotherValue`);
+        const result = extractNativeParamsFromCookies(`otherCookie=value; ${NATIVE_PARAMS_COOKIE_KEY}=${encodedNativeParams}; anotherCookie=anotherValue`);
         expect(result).toEqual(nativeParams);
     });
 });