@arcware-cloud/pixelstreaming-websdk 1.2.16 → 1.2.18

package/index.esm.js

@@ -23356,7 +23356,7 @@ class ArcwareConfig extends _epicgames_ps_lib_pixelstreamingfrontend_ue5_5__WEBP
         if (!config.initialSettings.ss)
             config.initialSettings.ss = DefaultUrl;
         super(config);
-        this.VERSION = "1.2.16";
+        this.VERSION = "1.2.18";
         this.settings = settings;
         this.session = new _domain_Session__WEBPACK_IMPORTED_MODULE_0__.Session();
         this._initialSettings = config.initialSettings;
@@ -23502,18 +23502,18 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(655);
 /* harmony import */ var _arcware_cloud_shared_pixelstreaming_websdk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7910);
-/* harmony import */ var _epicgames_ps_lib_pixelstreamingfrontend_ue5_5__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(516);
+/* harmony import */ var _epicgames_ps_lib_pixelstreamingfrontend_ue5_5__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(516);
 /* harmony import */ var _epicgames_ps_lib_pixelstreamingfrontend_ue5_5__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(7800);
 /* harmony import */ var _epicgames_ps_lib_pixelstreamingfrontend_ue5_5__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(7463);
-/* harmony import */ var _ApplyUrlHack__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4790);
-/* harmony import */ var _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(3379);
+/* harmony import */ var _ApplyUrlHack__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(4790);
+/* harmony import */ var _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(3379);
 /* harmony import */ var _domain_Stats__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9764);
 /* harmony import */ var _domain_debounce__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(9580);
 /* harmony import */ var _ui_LoveLetters__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(4572);
 /* harmony import */ var _ui_ArcwareLogoLoader__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(6469);
-/* harmony import */ var _ui_MicrophoneOverlay__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(3613);
+/* harmony import */ var _ui_MicrophoneOverlay__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(3613);
 /* harmony import */ var _domain_ConnectionIdentifier__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5999);
-/* harmony import */ var _DiagnosticsCollector__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(6478);
+/* harmony import */ var _DiagnosticsCollector__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6478);
 
 
 
@@ -23526,7 +23526,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-class ArcwarePixelStreaming extends _epicgames_ps_lib_pixelstreamingfrontend_ue5_5__WEBPACK_IMPORTED_MODULE_3__.PixelStreaming {
+class ArcwarePixelStreaming extends _epicgames_ps_lib_pixelstreamingfrontend_ue5_5__WEBPACK_IMPORTED_MODULE_4__.PixelStreaming {
     /** Returns a list of WebSocketStates of all PixelStreaming Instances generated. */
     get WebsocketStates() {
         return _domain_ConnectionIdentifier__WEBPACK_IMPORTED_MODULE_2__.ConnectionIdentifier.Instance.GetWebSocketStates();
@@ -23543,24 +23543,24 @@ class ArcwarePixelStreaming extends _epicgames_ps_lib_pixelstreamingfrontend_ue5
     }
     constructor(config, overrides) {
         /** As soon as upstream is fixed, we got to adjust the url building process. */
-        (0,_ApplyUrlHack__WEBPACK_IMPORTED_MODULE_4__.ApplyUrlHack)();
+        (0,_ApplyUrlHack__WEBPACK_IMPORTED_MODULE_5__.ApplyUrlHack)();
         super(config, overrides);
         this.loveLettersQueue = [];
         this.isProcessingQueue = false;
         // Externalized
         /** On ping the session creation timestamp will be updated. */
-        this.queueHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler();
+        this.queueHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler();
         /** Error receiver. */
-        this.errorHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler();
+        this.errorHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler();
         /** LoveLetter */
-        this.loveLetterHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler();
+        this.loveLetterHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler();
         /** SessionId */
-        this.sessionIdHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler();
+        this.sessionIdHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler();
         /** VideoInitialized */
-        this.videoInitializedHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler();
+        this.videoInitializedHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler();
         // Internal
         /** WebSocket Close */
-        this.websocketOnCloseHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler();
+        this.websocketOnCloseHandler = new _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler();
         /** Theoretically this call should be used to implement the signalling url, but this would not work at all, if config is setup for "AutoConnect=true"
          * Instead we use ApplyUrlHack();
          */
@@ -23572,8 +23572,8 @@ class ArcwarePixelStreaming extends _epicgames_ps_lib_pixelstreamingfrontend_ue5
         // Set override config.
         this.config = config;
         this.loveLettersList = [];
-        this.microphoneOverlay = new _ui_MicrophoneOverlay__WEBPACK_IMPORTED_MODULE_6__.MicrophoneOverlay(this);
-        this.diagnosticsCollector = new _DiagnosticsCollector__WEBPACK_IMPORTED_MODULE_7__.DiagnosticsCollector({
+        this.microphoneOverlay = new _ui_MicrophoneOverlay__WEBPACK_IMPORTED_MODULE_7__.MicrophoneOverlay(this);
+        this.diagnosticsCollector = new _DiagnosticsCollector__WEBPACK_IMPORTED_MODULE_3__.DiagnosticsCollector({
             enableBandwidthProbe: false,
         });
         // this.loveLettersContainer = null;
@@ -23684,30 +23684,30 @@ class ArcwarePixelStreaming extends _epicgames_ps_lib_pixelstreamingfrontend_ue5
     }
     onQueue(message) {
         _epicgames_ps_lib_pixelstreamingfrontend_ue5_5__WEBPACK_IMPORTED_MODULE_10__.Logger.Info(`QueueInfo received.`);
-        _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler.Emit(this.queueHandler, message);
+        _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler.Emit(this.queueHandler, message);
     }
     onError(error) {
         _epicgames_ps_lib_pixelstreamingfrontend_ue5_5__WEBPACK_IMPORTED_MODULE_10__.Logger.Error(error.type);
-        _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler.Emit(this.errorHandler, error);
+        _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler.Emit(this.errorHandler, error);
     }
     onLoveLetter(loveLetter) {
         // Logger.Info(Logger.GetStackTrace(), loveLetter.reason);
         if (this.config.settings.loveLetterLogging)
             console.info(loveLetter.reason);
-        _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler.Emit(this.loveLetterHandler, loveLetter);
+        _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler.Emit(this.loveLetterHandler, loveLetter);
         this.pushLetter(loveLetter.reason);
     }
     onSessionId(message) {
         _epicgames_ps_lib_pixelstreamingfrontend_ue5_5__WEBPACK_IMPORTED_MODULE_10__.Logger.Info(message.sessionId);
         // console.info(`Session: ${message.sessionId}`);
         this.session.set(message.sessionId);
-        _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler.Emit(this.sessionIdHandler, message.sessionId);
+        _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler.Emit(this.sessionIdHandler, message.sessionId);
     }
     onVideoInitialized() {
         /** The videoInitialized event is important for the Arcware Cloud BAckend, since without that event the instance will be cleaned up (killed). */
         this.handleMouseLock();
         this.send({ type: "onVideoInitialized" });
-        _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler.Emit(this.videoInitializedHandler, undefined);
+        _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler.Emit(this.videoInitializedHandler, undefined);
         this.handleResolutionChange();
         this.handleRemoveLoveLetters();
         this.microphoneOverlay.toggleVisibility(false);
@@ -23928,7 +23928,7 @@ class ArcwarePixelStreaming extends _epicgames_ps_lib_pixelstreamingfrontend_ue5
         var _a, _b;
         let self = this;
         (_b = (_a = this.webRtcController) === null || _a === void 0 ? void 0 : _a.transport) === null || _b === void 0 ? void 0 : _b.addEventListener("close", (event) => {
-            _domain_EventHandler__WEBPACK_IMPORTED_MODULE_5__.EventHandler.Emit(self.websocketOnCloseHandler, event);
+            _domain_EventHandler__WEBPACK_IMPORTED_MODULE_6__.EventHandler.Emit(self.websocketOnCloseHandler, event);
         });
     }
     onStreamingStateChange(callback) {
@@ -23975,7 +23975,9 @@ class ArcwarePixelStreaming extends _epicgames_ps_lib_pixelstreamingfrontend_ue5
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "DiagnosticsCollector": () => (/* binding */ DiagnosticsCollector)
+/* harmony export */   "DiagnosticsCollector": () => (/* binding */ DiagnosticsCollector),
+/* harmony export */   "Orientation": () => (/* binding */ Orientation),
+/* harmony export */   "Type": () => (/* binding */ Type)
 /* harmony export */ });
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(655);
 /**
@@ -23992,15 +23994,27 @@ __webpack_require__.r(__webpack_exports__);
  *   Default location: /diag/probe.bin
  */
 
+var Orientation;
+(function (Orientation) {
+    Orientation["Landscape"] = "landscape";
+    Orientation["Portrait"] = "portrait";
+})(Orientation || (Orientation = {}));
+var Type;
+(function (Type) {
+    Type["Desktop"] = "desktop";
+    Type["Mobile"] = "mobile";
+    Type["Tablet"] = "tablet";
+})(Type || (Type = {}));
 /**
  * DiagnosticsCollector
  */
 class DiagnosticsCollector {
     constructor(opts = {}) {
         var _a, _b, _c, _d;
+        this.uaInfoCache = null;
         this.opts = {
             enableBandwidthProbe: (_a = opts.enableBandwidthProbe) !== null && _a !== void 0 ? _a : true,
-            probeUrl: (_b = opts.probeUrl) !== null && _b !== void 0 ? _b : '/diag/probe.bin',
+            probeUrl: (_b = opts.probeUrl) !== null && _b !== void 0 ? _b : "/diag/probe.bin",
             respectSaveData: (_c = opts.respectSaveData) !== null && _c !== void 0 ? _c : true,
             sampleRate: Math.max(0, Math.min(1, (_d = opts.sampleRate) !== null && _d !== void 0 ? _d : 1))
         };
@@ -24013,8 +24027,8 @@ class DiagnosticsCollector {
         return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__awaiter)(this, void 0, void 0, function* () {
             if (!this.shouldSample()) {
                 return {
-                    device: { type: 'desktop', touchSupport: false },
-                    runtime: { browser: { family: 'Unknown', version: null }, os: { family: 'Unknown', version: null } },
+                    device: { type: Type.Desktop, touchSupport: false },
+                    runtime: { browser: { family: "Unknown", version: null }, os: { family: "Unknown", version: null } },
                     powerHints: { saveData: null, prefersReducedData: null, prefersReducedMotion: null },
                     network: { type: null, effectiveType: null, downlinkMbps: null, rttMs: null, measuredDownlinkMbps: null },
                     timestamps: { collectedAt: Date.now() }
@@ -24060,9 +24074,9 @@ class DiagnosticsCollector {
                 const stats = yield pc.getStats();
                 let selected, transport, local, remote;
                 stats.forEach((r) => {
-                    if (r.type === 'transport' && r.selectedCandidatePairId)
+                    if (r.type === "transport" && r.selectedCandidatePairId)
                         transport = r;
-                    if (r.type === 'candidate-pair' && (r.selected || r.nominated))
+                    if (r.type === "candidate-pair" && (r.selected || r.nominated))
                         selected = r;
                 });
                 if (selected) {
@@ -24103,16 +24117,16 @@ class DiagnosticsCollector {
     hasTouch() {
         var _a;
         const nav = navigator;
-        return 'ontouchstart' in window || ((_a = nav.maxTouchPoints) !== null && _a !== void 0 ? _a : 0) > 0;
+        return "ontouchstart" in window || ((_a = nav.maxTouchPoints) !== null && _a !== void 0 ? _a : 0) > 0;
     }
     getOrientation() {
         var _a;
         try {
             if ((_a = screen.orientation) === null || _a === void 0 ? void 0 : _a.type) {
-                return screen.orientation.type.startsWith('portrait') ? 'portrait' : 'landscape';
+                return screen.orientation.type.startsWith("portrait") ? Orientation.Portrait : Orientation.Landscape;
             }
             if (window.matchMedia) {
-                return window.matchMedia('(orientation: portrait)').matches ? 'portrait' : 'landscape';
+                return window.matchMedia("(orientation: portrait)").matches ? Orientation.Portrait : Orientation.Landscape;
             }
         }
         catch (_b) { }
@@ -24120,8 +24134,8 @@ class DiagnosticsCollector {
     }
     hasWebGL() {
         try {
-            const canvas = document.createElement('canvas');
-            return !!(canvas.getContext('webgl') || canvas.getContext('experimental-webgl'));
+            const canvas = document.createElement("canvas");
+            return !!(canvas.getContext("webgl") || canvas.getContext("experimental-webgl"));
         }
         catch (_a) {
             return false;
@@ -24129,37 +24143,50 @@ class DiagnosticsCollector {
     }
     /**
      * Heuristic device type: best-effort only.
+     * Tries UA-CH, then UA fallback, then touch + screen size heuristics.
      */
     inferDeviceType() {
         const uaData = navigator.userAgentData;
+        const ua = navigator.userAgent || "";
         const isMobileCH = (uaData === null || uaData === void 0 ? void 0 : uaData.mobile) === true;
         const minDim = Math.min(screen.width, screen.height);
-        if (isMobileCH && minDim >= 600)
-            return 'tablet';
-        if (isMobileCH)
-            return 'mobile';
-        if (/\b(iPad|Tablet)\b/i.test(navigator.userAgent))
-            return 'tablet';
-        if (('ontouchstart' in window) && minDim >= 600 && minDim <= 1100)
-            return 'tablet';
-        return 'desktop';
+        // 1. Explicit iPad / tablet detection via UA (iOS often lies in CH)
+        if (/\b(iPad|Tablet)\b/i.test(ua)) {
+            return Type.Tablet;
+        }
+        // 2. UA-CH mobile hint (Chromium only, often accurate for Android)
+        if (isMobileCH) {
+            if (minDim >= 600)
+                return Type.Tablet;
+            return Type.Mobile;
+        }
+        // 3. UA sniffing fallback for mobile
+        if (/\b(iPhone|Android.*Mobile|Windows Phone)\b/i.test(ua)) {
+            return Type.Mobile;
+        }
+        // 4. Touch-capable with "tablet-like" dimensions
+        if (("ontouchstart" in window || navigator.maxTouchPoints > 0) && minDim >= 600 && minDim <= 1100) {
+            return Type.Tablet;
+        }
+        // 5. Default fallback
+        return Type.Desktop;
     }
     getPowerHints() {
         const conn = navigator.connection;
-        const saveData = typeof (conn === null || conn === void 0 ? void 0 : conn.saveData) === 'boolean' ? conn.saveData : null;
+        const saveData = typeof (conn === null || conn === void 0 ? void 0 : conn.saveData) === "boolean" ? conn.saveData : null;
         let prefersReducedData = null;
         let prefersReducedMotion = null;
-        if (typeof window.matchMedia === 'function') {
+        if (typeof window.matchMedia === "function") {
             try {
-                const mqData = window.matchMedia('(prefers-reduced-data: reduce)');
-                if (typeof mqData.matches === 'boolean') {
+                const mqData = window.matchMedia("(prefers-reduced-data: reduce)");
+                if (typeof mqData.matches === "boolean") {
                     prefersReducedData = mqData.matches;
                 }
             }
             catch (_a) { }
             try {
-                const mqMotion = window.matchMedia('(prefers-reduced-motion: reduce)');
-                if (typeof mqMotion.matches === 'boolean') {
+                const mqMotion = window.matchMedia("(prefers-reduced-motion: reduce)");
+                if (typeof mqMotion.matches === "boolean") {
                     prefersReducedMotion = mqMotion.matches;
                 }
             }
@@ -24170,10 +24197,10 @@ class DiagnosticsCollector {
     getNetworkInfo(measuredDownlinkMbps) {
         const conn = navigator.connection;
         return {
-            type: (typeof (conn === null || conn === void 0 ? void 0 : conn.type) === 'string') ? conn.type : null,
-            effectiveType: (typeof (conn === null || conn === void 0 ? void 0 : conn.effectiveType) === 'string') ? conn.effectiveType : null,
-            downlinkMbps: (typeof (conn === null || conn === void 0 ? void 0 : conn.downlink) === 'number') ? conn.downlink : null,
-            rttMs: (typeof (conn === null || conn === void 0 ? void 0 : conn.rtt) === 'number') ? conn.rtt : null,
+            type: typeof (conn === null || conn === void 0 ? void 0 : conn.type) === "string" ? conn.type : null,
+            effectiveType: typeof (conn === null || conn === void 0 ? void 0 : conn.effectiveType) === "string" ? conn.effectiveType : null,
+            downlinkMbps: typeof (conn === null || conn === void 0 ? void 0 : conn.downlink) === "number" ? conn.downlink : null,
+            rttMs: typeof (conn === null || conn === void 0 ? void 0 : conn.rtt) === "number" ? conn.rtt : null,
             measuredDownlinkMbps
         };
     }
@@ -24188,8 +24215,8 @@ class DiagnosticsCollector {
             try {
                 const t0 = performance.now();
                 const res = yield fetch(this.withCacheBuster(this.opts.probeUrl), {
-                    cache: 'no-store',
-                    credentials: 'omit'
+                    cache: "no-store",
+                    credentials: "omit"
                 });
                 const buf = yield res.arrayBuffer();
                 const t1 = performance.now();
@@ -24197,7 +24224,7 @@ class DiagnosticsCollector {
                 const seconds = (t1 - t0) / 1000;
                 if (seconds <= 0.05)
                     return null; // ignore unstable samples
-                return +((bits / seconds) / 1000000).toFixed(2);
+                return +(bits / seconds / 1000000).toFixed(2);
             }
             catch (_a) {
                 return null;
@@ -24208,7 +24235,7 @@ class DiagnosticsCollector {
         var _a, _b;
         const u = new URL(url, location.origin);
         const token = (_b = (_a = crypto === null || crypto === void 0 ? void 0 : crypto.randomUUID) === null || _a === void 0 ? void 0 : _a.call(crypto)) !== null && _b !== void 0 ? _b : String(Date.now());
-        u.searchParams.set('cb', token);
+        u.searchParams.set("cb", token);
         return u.toString();
     }
     getCodecSupport() {
@@ -24223,10 +24250,10 @@ class DiagnosticsCollector {
     supportsCodec(mime) {
         return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__awaiter)(this, void 0, void 0, function* () {
             try {
-                if ('mediaCapabilities' in navigator) {
+                if ("mediaCapabilities" in navigator) {
                     // @ts-ignore
                     const res = yield navigator.mediaCapabilities.decodingInfo({
-                        type: 'file',
+                        type: "file",
                         video: { contentType: mime, width: 1920, height: 1080, bitrate: 5000000, framerate: 30 }
                     });
                     return !!(res === null || res === void 0 ? void 0 : res.supported);
@@ -24234,8 +24261,8 @@ class DiagnosticsCollector {
             }
             catch (_a) { }
             try {
-                const v = document.createElement('video');
-                return v.canPlayType(mime) !== '';
+                const v = document.createElement("video");
+                return v.canPlayType(mime) !== "";
             }
             catch (_b) {
                 return false;
@@ -24243,60 +24270,104 @@ class DiagnosticsCollector {
         });
     }
     getUAInfo() {
-        var _a, _b;
         return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__awaiter)(this, void 0, void 0, function* () {
+            if (this.uaInfoCache)
+                return this.uaInfoCache;
             const nav = navigator;
             const uaData = nav.userAgentData;
-            let browserFamily = 'Unknown', browserVersion = null;
-            let osFamily = 'Unknown', osVersion = null;
-            let model = null, architecture = null, bitness = null;
+            const ua = navigator.userAgent;
+            let browserFamily = "Unknown";
+            let browserVersion = null;
+            let osFamily = "Unknown";
+            let osVersion = null;
+            let model = null;
+            let architecture = null;
+            let bitness = null;
+            // --- UA-CH (modern browsers) ---
             if (uaData === null || uaData === void 0 ? void 0 : uaData.getHighEntropyValues) {
                 try {
                     const high = yield uaData.getHighEntropyValues([
-                        'platform', 'platformVersion', 'model', 'architecture', 'bitness', 'fullVersionList'
+                        "platform",
+                        "platformVersion",
+                        "model",
+                        "architecture",
+                        "bitness",
+                        "fullVersionList"
                     ]);
-                    osFamily = high.platform || 'Unknown';
+                    osFamily = high.platform || "Unknown";
                     osVersion = high.platformVersion || null;
                     model = high.model || null;
                     architecture = high.architecture || null;
                     bitness = high.bitness || null;
                     const brands = high.fullVersionList || uaData.brands || [];
-                    const real = brands.find(b => b.brand && !/Chromium|Not:?A-?Brand/i.test(b.brand));
-                    browserFamily = (real === null || real === void 0 ? void 0 : real.brand) || ((_a = brands[0]) === null || _a === void 0 ? void 0 : _a.brand) || 'Unknown';
-                    browserVersion = (real === null || real === void 0 ? void 0 : real.version) || ((_b = brands[0]) === null || _b === void 0 ? void 0 : _b.version) || null;
-                }
-                catch (_c) { }
-            }
-            if (browserFamily === 'Unknown') {
-                const ua = navigator.userAgent;
-                if (/Firefox\/(\S+)/.test(ua)) {
-                    browserFamily = 'Firefox';
-                    browserVersion = RegExp.$1;
-                }
-                else if (/Edg\/(\S+)/.test(ua)) {
-                    browserFamily = 'Edge';
-                    browserVersion = RegExp.$1;
+                    const realBrand = brands.find((b) => {
+                        if (!b.brand)
+                            return false;
+                        const normalized = b.brand.replace(/[^a-zA-Z]/g, "").toLowerCase();
+                        return !normalized.includes("chromium") && !normalized.includes("notabrand");
+                    });
+                    if (realBrand) {
+                        browserFamily = realBrand.brand;
+                        browserVersion = realBrand.version;
+                    }
                 }
-                else if (/Chrome\/(\S+)/.test(ua)) {
-                    browserFamily = 'Chrome';
-                    browserVersion = RegExp.$1;
+                catch (_a) {
+                    // silently fail
                 }
-                else if (/Version\/(\S+).*Safari/.test(ua)) {
-                    browserFamily = 'Safari';
-                    browserVersion = RegExp.$1;
+            }
+            // --- Fallback to classic UA parsing if browser unknown ---
+            if (!browserFamily || browserFamily === "Unknown") {
+                const browserRegexes = [
+                    [/Edg\/(\S+)/, "Edge"],
+                    [/OPR\/(\S+)/, "Opera"],
+                    [/SamsungBrowser\/(\S+)/, "Samsung Internet"],
+                    [/Firefox\/(\S+)/, "Firefox"],
+                    [/Chrome\/(\S+)/, "Chrome"],
+                    [/Version\/(\S+).*Safari/, "Safari"]
+                ];
+                for (const [regex, name] of browserRegexes) {
+                    const match = ua.match(regex);
+                    if (match) {
+                        browserFamily = name;
+                        browserVersion = match[1];
+                        break;
+                    }
                 }
-                if (/Windows/.test(ua))
-                    osFamily = 'Windows';
-                else if (/Mac OS X/.test(ua))
-                    osFamily = 'macOS';
-                else if (/Android/.test(ua))
-                    osFamily = 'Android';
-                else if (/iPhone|iPad|iPod/.test(ua))
-                    osFamily = 'iOS';
-                else if (/Linux/.test(ua))
-                    osFamily = 'Linux';
-            }
-            return { browserFamily, browserVersion, osFamily, osVersion, model, architecture, bitness };
+            }
+            // --- OS detection (always run, iOS first) ---
+            if (/iPhone|iPad|iPod/.test(ua)) {
+                osFamily = "iOS";
+                const match = ua.match(/OS (\d+[_\d]*)/);
+                if (match)
+                    osVersion = match[1].replace(/_/g, ".");
+            }
+            else if (uaData === null || uaData === void 0 ? void 0 : uaData.platform) {
+                osFamily = uaData.platform;
+            }
+            else if (/Windows/.test(ua)) {
+                osFamily = "Windows";
+                const match = ua.match(/Windows NT (\d+\.\d+)/);
+                if (match)
+                    osVersion = match[1];
+            }
+            else if (/Mac OS X/.test(ua)) {
+                osFamily = "macOS";
+                const match = ua.match(/Mac OS X (\d+[_\d]*)/);
+                if (match)
+                    osVersion = match[1].replace(/_/g, ".");
+            }
+            else if (/Android/.test(ua)) {
+                osFamily = "Android";
+                const match = ua.match(/Android (\d+(\.\d+)?)/);
+                if (match)
+                    osVersion = match[1];
+            }
+            else if (/Linux/.test(ua)) {
+                osFamily = "Linux";
+            }
+            const result = { browserFamily, browserVersion, osFamily, osVersion, model, architecture, bitness };
+            this.uaInfoCache = result;
+            return result;
         });
     }
 }