@microblink/blinkid-core 7.4.2 → 7.6.0

package/dist/blinkid-core.js

@@ -724,13 +724,6 @@ const Se = [
 ];
 function ye() {
   const e = navigator.userAgent;
-  if (window.webkit?.messageHandlers) {
-    const n = e.match(/OS ([\d_]+)/);
-    return {
-      name: "iOS WebView",
-      version: n ? n[1].replace(/_/g, ".") : ""
-    };
-  }
   for (const n of Se) {
     const r = e.match(n.regex);
     if (r)
@@ -739,6 +732,13 @@ function ye() {
         version: n.getVersion(r, e)
       };
   }
+  if (window.webkit?.messageHandlers) {
+    const n = e.match(/OS ([\d_]+)/);
+    return {
+      name: "iOS WebView",
+      version: n ? n[1].replace(/_/g, ".") : ""
+    };
+  }
   return { name: "Unknown", version: "" };
 }
 function Ee(e, n) {
@@ -798,30 +798,30 @@ function Ie() {
 function xe(e, n) {
   const r = ve();
   let t = "";
-  if (e?.model)
-    t = e.model;
+  if (n?.model)
+    t = n.model;
   else if (r)
     t = r;
   else {
-    const u = n.match(/Android.*?; ([^)]+)\)/);
+    const u = e.match(/Android.*?; ([^)]+)\)/);
     u?.[1] && (t = u[1]);
   }
   let o = ["Desktop"];
-  e?.formFactors?.length ? o = e.formFactors : e?.mobile ? o = ["Mobile"] : r && (r === "iPhone" ? o = ["Mobile"] : r === "iPad" && (o = ["Tablet"]));
+  n?.formFactors?.length ? o = n.formFactors : n?.mobile ? o = ["Mobile"] : r && (r === "iPhone" ? o = ["Mobile"] : r === "iPad" && (o = ["Tablet"]));
   let a = "";
-  e?.platform ? a = e.platform : a = Ie().os;
+  n?.platform ? a = n.platform : a = Ie().os;
   let i = "", s = "";
-  if (e?.brands?.length)
-    i = (e.brands.find(
+  if (n?.brands?.length)
+    i = (n.brands.find(
       (c) => !/not.a.brand/i.test(c.brand) && c.brand !== "Chromium"
-    ) ?? e.brands.find((c) => !/not.a.brand/i.test(c.brand)))?.brand ?? "", e.fullVersionList ? s = e.fullVersionList.find((c) => c.brand === i)?.version ?? "" : s = e.brands.find((c) => c.brand === i)?.version ?? "";
+    ) ?? n.brands.find((c) => !/not.a.brand/i.test(c.brand)))?.brand ?? "", n.fullVersionList ? s = n.fullVersionList.find((c) => c.brand === i)?.version ?? "" : s = n.brands.find((c) => c.brand === i)?.version ?? "";
   else {
     const u = ye();
     i = u.name, s = u.version;
   }
   return t === "" && a === "macOS" && (t = "Mac"), {
     model: t,
-    formFactor: o,
+    formFactors: o,
     platform: a,
     browser: {
       brand: i,
@@ -889,8 +889,8 @@ async function _e() {
       localStorageEnabled: Te()
     },
     derivedDeviceInfo: xe(
-      e,
-      navigator.userAgent
+      navigator.userAgent,
+      e
     )
   };
 }