@etsoo/shared 1.2.41 → 1.2.42

package/README.md

@@ -224,8 +224,10 @@ DOM/window related utilities
 |headersToObject|Convert headers to object|
 |isFormData|Is IFormData type guard|
 |isJSONContentType|Is JSON content type|
+|isWechatClient|Is Wechat client|
 |mergeFormData|Merge form data to primary one|
 |mergeURLSearchParams|Merge URL search parameters|
+|parseUserAgent|parseUserAgent|
 |setFocus|Set HTML element focus by name|
 |setupLogging|Setup frontend logging|
 |verifyPermission|Verify file system permission|

package/__tests__/DomUtils.ts

@@ -328,6 +328,95 @@ test('Tests for getInputValue', () => {
     }
 });
 
+test('Tests for getUserAgentData 1', () => {
+    const data = DomUtils.parseUserAgent(
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36'
+    );
+    expect(data?.device).toBe('Desktop');
+    expect(data?.platform).toBe('Windows NT');
+    expect(data?.platformVersion).toBe('10.0');
+    expect(data?.brands.find((b) => b.brand === 'Chrome')?.version).toBe('124');
+});
+
+test('Tests for getUserAgentData 2', () => {
+    const data = DomUtils.parseUserAgent(
+        'Mozilla/5.0 (Linux; U; Android 2.3.6; zh-cn; GT-S5660 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 MicroMessenger/4.5.255'
+    );
+    expect(data?.device).toBe('GT-S5660');
+    expect(data?.platform).toBe('Android');
+    expect(data?.platformVersion).toBe('2.3.6');
+    expect(data?.mobile).toBeTruthy();
+    expect(DomUtils.isWechatClient(data)).toBeTruthy();
+});
+
+test('Tests for getUserAgentData 3', () => {
+    const data = DomUtils.parseUserAgent(
+        'Mozilla/5.0 (Linux; Android 7.1.1;MEIZU E3 Build/NGI77B; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/9.6 TBS/044428 Mobile Safari/537.36 MicroMessenger/6.6.7.1321(0x26060739) NetType/WIFI Language/zh_CN'
+    );
+
+    expect(data?.device).toBe('MEIZU E3');
+    expect(data?.platform).toBe('Android');
+    expect(data?.platformVersion).toBe('7.1.1');
+    expect(data?.mobile).toBeTruthy();
+    expect(DomUtils.isWechatClient(data)).toBeTruthy();
+});
+
+test('Tests for getUserAgentData 4', () => {
+    const data = DomUtils.parseUserAgent(
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 17_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4.1 Mobile/15E148 Safari/604.1'
+    );
+
+    expect(data?.device).toBe('iPhone');
+    expect(data?.platform).toBe('iPhone OS');
+    expect(data?.platformVersion).toBe('17.5.1');
+    expect(data?.mobile).toBeTruthy();
+    expect(DomUtils.isWechatClient(data)).toBeFalsy();
+});
+
+test('Tests for getUserAgentData 5', () => {
+    const data = DomUtils.parseUserAgent(
+        'Mozilla/5.0 (SMART-TV; Linux; Tizen 2.3) AppleWebkit/538.1 (KHTML, like Gecko) SamsungBrowser/1.0 TV Safari/538.1'
+    );
+
+    expect(data?.device).toBe('SMART-TV');
+    expect(data?.platform).toBe('Tizen');
+    expect(data?.platformVersion).toBe('2.3');
+    expect(data?.mobile).toBeFalsy();
+});
+
+test('Tests for getUserAgentData 6', () => {
+    const data = DomUtils.parseUserAgent(
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0 Safari/605.1.15'
+    );
+
+    expect(data?.device).toBe('Macintosh');
+    expect(data?.platform).toBe('Mac OS X');
+    expect(data?.platformVersion).toBe('10.15');
+    expect(data?.mobile).toBeFalsy();
+});
+
+test('Tests for getUserAgentData 7', () => {
+    const data = DomUtils.parseUserAgent(
+        'Mozilla/5.0 (Linux; Android 8.1; LEO-DLXXE Build/HONORLRA-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 HuaweiBrowser/9.1.1.308 Mobile Safari/537.36'
+    );
+
+    expect(data?.device).toBe('LEO-DLXXE');
+    expect(data?.platform).toBe('Android');
+    expect(data?.platformVersion).toBe('8.1');
+    expect(data?.mobile).toBeTruthy();
+});
+
+test('Tests for getUserAgentData 8', () => {
+    const data = DomUtils.parseUserAgent(
+        'Mozilla/5.0 (Linux; Android 9; SM-R825F Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/80.0.3987.119 Mobile Safari/537.36'
+    );
+
+    expect(data?.device).toBe('SM-R825F');
+    expect(data?.platform).toBe('Android');
+    expect(data?.platformVersion).toBe('9');
+    expect(data?.mobile).toBeTruthy();
+});
+
 test('Tests for setupLogging', async () => {
     // Arrange
     const action = jest.fn((data: ErrorData) => {

package/__tests__/Utils.ts

@@ -355,4 +355,5 @@ test('Tests for trimEnd', () => {
     expect(Utils.trimEnd('//a/', '/')).toBe('//a');
     expect(Utils.trimEnd('/*/a*/', ...['/', '*'])).toBe('/*/a');
     expect(Utils.trimEnd('abc', ...['/', '*'])).toBe('abc');
+    expect(Utils.trimEnd('12.0.0.0', '.0')).toBe('12');
 });

package/lib/cjs/DomUtils.d.ts

@@ -2,6 +2,35 @@
 import { DataTypes } from './DataTypes';
 import { ErrorData, ErrorType } from './types/ErrorData';
 import { FormDataFieldValue, IFormData } from './types/FormData';
+/**
+ * User agent data, maybe replaced by navigator.userAgentData in future
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/userAgentData
+ */
+export type UserAgentData = {
+    /**
+     * Browser brands
+     */
+    brands: {
+        brand: string;
+        version: string;
+    }[];
+    /**
+     * Is mobile device
+     */
+    mobile: boolean;
+    /**
+     * Device brand (name)
+     */
+    device: string;
+    /**
+     * Platform (OS)
+     */
+    platform: string;
+    /**
+     * Platform version
+     */
+    platformVersion?: string;
+};
 /**
  * Dom Utilities
  * Not all methods support Node
@@ -71,6 +100,12 @@ export declare namespace DomUtils {
      * @returns Object
      */
     function formDataToObject(form: IFormData): Record<string, FormDataFieldValue | FormDataFieldValue[]>;
+    /**
+     * Is wechat client
+     * @param data User agent data
+     * @returns Result
+     */
+    function isWechatClient(data?: UserAgentData | null): boolean;
     /**
      * Culture match case Enum
      */
@@ -144,6 +179,14 @@ export declare namespace DomUtils {
      * @param data New simple object data to merge
      */
     function mergeURLSearchParams(base: URLSearchParams, data: DataTypes.SimpleObject): URLSearchParams;
+    /**
+     * Parse navigator's user agent string
+     * Lightweight User-Agent string parser
+     * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent
+     * @param ua User agent string
+     * @returns User agent data
+     */
+    function parseUserAgent(ua?: string): UserAgentData | null;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/lib/cjs/DomUtils.js

@@ -307,6 +307,18 @@ var DomUtils;
         return dic;
     }
     DomUtils.formDataToObject = formDataToObject;
+    /**
+     * Is wechat client
+     * @param data User agent data
+     * @returns Result
+     */
+    function isWechatClient(data) {
+        data ?? (data = parseUserAgent());
+        if (!data)
+            return false;
+        return data.brands.some((item) => item.brand.toLowerCase() === 'micromessenger');
+    }
+    DomUtils.isWechatClient = isWechatClient;
     /**
      * Culture match case Enum
      */
@@ -483,6 +495,93 @@ var DomUtils;
         return base;
     }
     DomUtils.mergeURLSearchParams = mergeURLSearchParams;
+    /**
+     * Parse navigator's user agent string
+     * Lightweight User-Agent string parser
+     * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent
+     * @param ua User agent string
+     * @returns User agent data
+     */
+    function parseUserAgent(ua) {
+        ua ?? (ua = globalThis.navigator.userAgent);
+        if (!ua) {
+            return null;
+        }
+        const parts = ua.split(/(?!\(.*)\s+(?!\()(?![^(]*?\))/g);
+        let mobile = false;
+        let platform = '';
+        let platformVersion;
+        let device = 'Desktop';
+        const brands = [];
+        // with the 'g' will causing failures for multiple calls
+        const platformVersionReg = /^[a-zA-Z0-9-\s]+\s+(0|\d+)(\.(0|\d+)){0,3}(\(|$)/;
+        const versionReg = /^[a-zA-Z0-9]+\/(0|\d+)(\.(0|\d+)){0,3}(\(|$)/;
+        parts.forEach((part) => {
+            const pl = part.toLowerCase();
+            if (pl.startsWith('mozilla/')) {
+                const data = /\((.*)\)$/.exec(part);
+                if (data && data.length > 1) {
+                    const pfItems = data[1].split(/;\s*/);
+                    // Platform + Version
+                    const pfIndex = pfItems.findIndex((item) => platformVersionReg.test(item));
+                    if (pfIndex !== -1) {
+                        const pfParts = pfItems[pfIndex].split(/\s+/);
+                        platformVersion = pfParts.pop();
+                        platform = pfParts.join(' ');
+                    }
+                    else {
+                        const appleVersionReg = /((iPhone|Mac)\s+OS(\s+\w+)?)\s+((0|\d+)(_(0|\d+)){0,3})/i;
+                        for (let i = 0; i < pfItems.length; i++) {
+                            const match = appleVersionReg.exec(pfItems[i]);
+                            if (match && match.length > 4) {
+                                platform = match[1];
+                                platformVersion = match[4].replace(/_/g, '.');
+                                pfItems.splice(i, 1);
+                                break;
+                            }
+                        }
+                    }
+                    // Device
+                    const deviceIndex = pfItems.findIndex((item) => item.includes(' Build/'));
+                    if (deviceIndex === -1) {
+                        const firstItem = pfItems[0];
+                        if (firstItem.toLowerCase() !== 'linux' &&
+                            !firstItem.startsWith(platform)) {
+                            device = firstItem;
+                            pfItems.shift();
+                        }
+                    }
+                    else {
+                        device = pfItems[deviceIndex].split(' Build/')[0];
+                        pfItems.splice(deviceIndex, 1);
+                    }
+                }
+                return;
+            }
+            if (pl === 'mobile' || pl.startsWith('mobile/')) {
+                mobile = true;
+                return;
+            }
+            if (pl === 'version' || pl.startsWith('version/')) {
+                // No process
+                return;
+            }
+            if (versionReg.test(part)) {
+                let [brand, version] = part.split('/');
+                const pindex = version.indexOf('(');
+                if (pindex > 0) {
+                    version = version.substring(0, pindex);
+                }
+                brands.push({
+                    brand,
+                    version: Utils_1.Utils.trimEnd(version, '.0')
+                });
+                return;
+            }
+        });
+        return { mobile, platform, platformVersion, brands, device };
+    }
+    DomUtils.parseUserAgent = parseUserAgent;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/lib/cjs/Utils.js

@@ -655,10 +655,11 @@ var Utils;
      * @returns Result
      */
     Utils.trimEnd = (input, ...chars) => {
-        let start = input.length - 1;
-        while (start >= 0 && chars.indexOf(input[start]) >= 0)
-            --start;
-        return input.substring(0, start + 1);
+        let char;
+        while ((char = chars.find((char) => input.endsWith(char))) != null) {
+            input = input.substring(0, input.length - char.length);
+        }
+        return input;
     };
     /**
      * Trim start chars
@@ -667,10 +668,10 @@ var Utils;
      * @returns Result
      */
     Utils.trimStart = (input, ...chars) => {
-        let start = 0;
-        const end = input.length;
-        while (start < end && chars.indexOf(input[start]) >= 0)
-            ++start;
-        return input.substring(start);
+        let char;
+        while ((char = chars.find((char) => input.startsWith(char))) != null) {
+            input = input.substring(char.length);
+        }
+        return input;
     };
 })(Utils || (exports.Utils = Utils = {}));

package/lib/mjs/DomUtils.d.ts

@@ -2,6 +2,35 @@
 import { DataTypes } from './DataTypes';
 import { ErrorData, ErrorType } from './types/ErrorData';
 import { FormDataFieldValue, IFormData } from './types/FormData';
+/**
+ * User agent data, maybe replaced by navigator.userAgentData in future
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/userAgentData
+ */
+export type UserAgentData = {
+    /**
+     * Browser brands
+     */
+    brands: {
+        brand: string;
+        version: string;
+    }[];
+    /**
+     * Is mobile device
+     */
+    mobile: boolean;
+    /**
+     * Device brand (name)
+     */
+    device: string;
+    /**
+     * Platform (OS)
+     */
+    platform: string;
+    /**
+     * Platform version
+     */
+    platformVersion?: string;
+};
 /**
  * Dom Utilities
  * Not all methods support Node
@@ -71,6 +100,12 @@ export declare namespace DomUtils {
      * @returns Object
      */
     function formDataToObject(form: IFormData): Record<string, FormDataFieldValue | FormDataFieldValue[]>;
+    /**
+     * Is wechat client
+     * @param data User agent data
+     * @returns Result
+     */
+    function isWechatClient(data?: UserAgentData | null): boolean;
     /**
      * Culture match case Enum
      */
@@ -144,6 +179,14 @@ export declare namespace DomUtils {
      * @param data New simple object data to merge
      */
     function mergeURLSearchParams(base: URLSearchParams, data: DataTypes.SimpleObject): URLSearchParams;
+    /**
+     * Parse navigator's user agent string
+     * Lightweight User-Agent string parser
+     * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent
+     * @param ua User agent string
+     * @returns User agent data
+     */
+    function parseUserAgent(ua?: string): UserAgentData | null;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/lib/mjs/DomUtils.js

@@ -304,6 +304,18 @@ export var DomUtils;
         return dic;
     }
     DomUtils.formDataToObject = formDataToObject;
+    /**
+     * Is wechat client
+     * @param data User agent data
+     * @returns Result
+     */
+    function isWechatClient(data) {
+        data ?? (data = parseUserAgent());
+        if (!data)
+            return false;
+        return data.brands.some((item) => item.brand.toLowerCase() === 'micromessenger');
+    }
+    DomUtils.isWechatClient = isWechatClient;
     /**
      * Culture match case Enum
      */
@@ -480,6 +492,93 @@ export var DomUtils;
         return base;
     }
     DomUtils.mergeURLSearchParams = mergeURLSearchParams;
+    /**
+     * Parse navigator's user agent string
+     * Lightweight User-Agent string parser
+     * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent
+     * @param ua User agent string
+     * @returns User agent data
+     */
+    function parseUserAgent(ua) {
+        ua ?? (ua = globalThis.navigator.userAgent);
+        if (!ua) {
+            return null;
+        }
+        const parts = ua.split(/(?!\(.*)\s+(?!\()(?![^(]*?\))/g);
+        let mobile = false;
+        let platform = '';
+        let platformVersion;
+        let device = 'Desktop';
+        const brands = [];
+        // with the 'g' will causing failures for multiple calls
+        const platformVersionReg = /^[a-zA-Z0-9-\s]+\s+(0|\d+)(\.(0|\d+)){0,3}(\(|$)/;
+        const versionReg = /^[a-zA-Z0-9]+\/(0|\d+)(\.(0|\d+)){0,3}(\(|$)/;
+        parts.forEach((part) => {
+            const pl = part.toLowerCase();
+            if (pl.startsWith('mozilla/')) {
+                const data = /\((.*)\)$/.exec(part);
+                if (data && data.length > 1) {
+                    const pfItems = data[1].split(/;\s*/);
+                    // Platform + Version
+                    const pfIndex = pfItems.findIndex((item) => platformVersionReg.test(item));
+                    if (pfIndex !== -1) {
+                        const pfParts = pfItems[pfIndex].split(/\s+/);
+                        platformVersion = pfParts.pop();
+                        platform = pfParts.join(' ');
+                    }
+                    else {
+                        const appleVersionReg = /((iPhone|Mac)\s+OS(\s+\w+)?)\s+((0|\d+)(_(0|\d+)){0,3})/i;
+                        for (let i = 0; i < pfItems.length; i++) {
+                            const match = appleVersionReg.exec(pfItems[i]);
+                            if (match && match.length > 4) {
+                                platform = match[1];
+                                platformVersion = match[4].replace(/_/g, '.');
+                                pfItems.splice(i, 1);
+                                break;
+                            }
+                        }
+                    }
+                    // Device
+                    const deviceIndex = pfItems.findIndex((item) => item.includes(' Build/'));
+                    if (deviceIndex === -1) {
+                        const firstItem = pfItems[0];
+                        if (firstItem.toLowerCase() !== 'linux' &&
+                            !firstItem.startsWith(platform)) {
+                            device = firstItem;
+                            pfItems.shift();
+                        }
+                    }
+                    else {
+                        device = pfItems[deviceIndex].split(' Build/')[0];
+                        pfItems.splice(deviceIndex, 1);
+                    }
+                }
+                return;
+            }
+            if (pl === 'mobile' || pl.startsWith('mobile/')) {
+                mobile = true;
+                return;
+            }
+            if (pl === 'version' || pl.startsWith('version/')) {
+                // No process
+                return;
+            }
+            if (versionReg.test(part)) {
+                let [brand, version] = part.split('/');
+                const pindex = version.indexOf('(');
+                if (pindex > 0) {
+                    version = version.substring(0, pindex);
+                }
+                brands.push({
+                    brand,
+                    version: Utils.trimEnd(version, '.0')
+                });
+                return;
+            }
+        });
+        return { mobile, platform, platformVersion, brands, device };
+    }
+    DomUtils.parseUserAgent = parseUserAgent;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/lib/mjs/Utils.js

@@ -649,10 +649,11 @@ export var Utils;
      * @returns Result
      */
     Utils.trimEnd = (input, ...chars) => {
-        let start = input.length - 1;
-        while (start >= 0 && chars.indexOf(input[start]) >= 0)
-            --start;
-        return input.substring(0, start + 1);
+        let char;
+        while ((char = chars.find((char) => input.endsWith(char))) != null) {
+            input = input.substring(0, input.length - char.length);
+        }
+        return input;
     };
     /**
      * Trim start chars
@@ -661,10 +662,10 @@ export var Utils;
      * @returns Result
      */
     Utils.trimStart = (input, ...chars) => {
-        let start = 0;
-        const end = input.length;
-        while (start < end && chars.indexOf(input[start]) >= 0)
-            ++start;
-        return input.substring(start);
+        let char;
+        while ((char = chars.find((char) => input.startsWith(char))) != null) {
+            input = input.substring(char.length);
+        }
+        return input;
     };
 })(Utils || (Utils = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.2.41",
+    "version": "1.2.42",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/DomUtils.ts

@@ -11,6 +11,40 @@ if (typeof navigator === 'undefined') {
     globalThis.location = { href: 'http://localhost/' } as any;
 }
 
+/**
+ * User agent data, maybe replaced by navigator.userAgentData in future
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/userAgentData
+ */
+export type UserAgentData = {
+    /**
+     * Browser brands
+     */
+    brands: {
+        brand: string;
+        version: string;
+    }[];
+
+    /**
+     * Is mobile device
+     */
+    mobile: boolean;
+
+    /**
+     * Device brand (name)
+     */
+    device: string;
+
+    /**
+     * Platform (OS)
+     */
+    platform: string;
+
+    /**
+     * Platform version
+     */
+    platformVersion?: string;
+};
+
 /**
  * Dom Utilities
  * Not all methods support Node
@@ -367,6 +401,20 @@ export namespace DomUtils {
         return dic;
     }
 
+    /**
+     * Is wechat client
+     * @param data User agent data
+     * @returns Result
+     */
+    export function isWechatClient(data?: UserAgentData | null) {
+        data ??= parseUserAgent();
+        if (!data) return false;
+
+        return data.brands.some(
+            (item) => item.brand.toLowerCase() === 'micromessenger'
+        );
+    }
+
     /**
      * Culture match case Enum
      */
@@ -583,6 +631,114 @@ export namespace DomUtils {
         return base;
     }
 
+    /**
+     * Parse navigator's user agent string
+     * Lightweight User-Agent string parser
+     * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent
+     * @param ua User agent string
+     * @returns User agent data
+     */
+    export function parseUserAgent(ua?: string): UserAgentData | null {
+        ua ??= globalThis.navigator.userAgent;
+
+        if (!ua) {
+            return null;
+        }
+
+        const parts = ua.split(/(?!\(.*)\s+(?!\()(?![^(]*?\))/g);
+
+        let mobile = false;
+        let platform = '';
+        let platformVersion: string | undefined;
+        let device = 'Desktop';
+        const brands: UserAgentData['brands'] = [];
+
+        // with the 'g' will causing failures for multiple calls
+        const platformVersionReg =
+            /^[a-zA-Z0-9-\s]+\s+(0|\d+)(\.(0|\d+)){0,3}(\(|$)/;
+        const versionReg = /^[a-zA-Z0-9]+\/(0|\d+)(\.(0|\d+)){0,3}(\(|$)/;
+
+        parts.forEach((part) => {
+            const pl = part.toLowerCase();
+
+            if (pl.startsWith('mozilla/')) {
+                const data = /\((.*)\)$/.exec(part);
+                if (data && data.length > 1) {
+                    const pfItems = data[1].split(/;\s*/);
+
+                    // Platform + Version
+                    const pfIndex = pfItems.findIndex((item) =>
+                        platformVersionReg.test(item)
+                    );
+
+                    if (pfIndex !== -1) {
+                        const pfParts = pfItems[pfIndex].split(/\s+/);
+                        platformVersion = pfParts.pop();
+                        platform = pfParts.join(' ');
+                    } else {
+                        const appleVersionReg =
+                            /((iPhone|Mac)\s+OS(\s+\w+)?)\s+((0|\d+)(_(0|\d+)){0,3})/i;
+
+                        for (let i = 0; i < pfItems.length; i++) {
+                            const match = appleVersionReg.exec(pfItems[i]);
+                            if (match && match.length > 4) {
+                                platform = match[1];
+                                platformVersion = match[4].replace(/_/g, '.');
+
+                                pfItems.splice(i, 1);
+                                break;
+                            }
+                        }
+                    }
+
+                    // Device
+                    const deviceIndex = pfItems.findIndex((item) =>
+                        item.includes(' Build/')
+                    );
+                    if (deviceIndex === -1) {
+                        const firstItem = pfItems[0];
+                        if (
+                            firstItem.toLowerCase() !== 'linux' &&
+                            !firstItem.startsWith(platform)
+                        ) {
+                            device = firstItem;
+                            pfItems.shift();
+                        }
+                    } else {
+                        device = pfItems[deviceIndex].split(' Build/')[0];
+                        pfItems.splice(deviceIndex, 1);
+                    }
+                }
+                return;
+            }
+
+            if (pl === 'mobile' || pl.startsWith('mobile/')) {
+                mobile = true;
+                return;
+            }
+
+            if (pl === 'version' || pl.startsWith('version/')) {
+                // No process
+                return;
+            }
+
+            if (versionReg.test(part)) {
+                let [brand, version] = part.split('/');
+                const pindex = version.indexOf('(');
+                if (pindex > 0) {
+                    version = version.substring(0, pindex);
+                }
+                brands.push({
+                    brand,
+                    version: Utils.trimEnd(version, '.0')
+                });
+                return;
+            }
+        });
+
+        return { mobile, platform, platformVersion, brands, device };
+    }
+
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/src/Utils.ts

@@ -870,11 +870,11 @@ export namespace Utils {
      * @returns Result
      */
     export const trimEnd = (input: string, ...chars: string[]) => {
-        let start = input.length - 1;
-
-        while (start >= 0 && chars.indexOf(input[start]) >= 0) --start;
-
-        return input.substring(0, start + 1);
+        let char: string | undefined;
+        while ((char = chars.find((char) => input.endsWith(char))) != null) {
+            input = input.substring(0, input.length - char.length);
+        }
+        return input;
     };
 
     /**
@@ -884,11 +884,10 @@ export namespace Utils {
      * @returns Result
      */
     export const trimStart = (input: string, ...chars: string[]) => {
-        let start = 0;
-        const end = input.length;
-
-        while (start < end && chars.indexOf(input[start]) >= 0) ++start;
-
-        return input.substring(start);
+        let char: string | undefined;
+        while ((char = chars.find((char) => input.startsWith(char))) != null) {
+            input = input.substring(char.length);
+        }
+        return input;
     };
 }