@plattar/plattar-ar-adapter 1.139.2 → 1.140.2

package/dist/util/util.d.ts

@@ -6,8 +6,13 @@ export declare class Util {
     static canQuicklook(): boolean;
     static canSceneViewer(): boolean;
     static canRealityViewer(): boolean;
-    static isSafari(): boolean;
+    static isSafariOnIOS(): boolean;
     static isChromeOnIOS(): boolean;
+    static isIOS(): boolean;
+    static isAndroid(): boolean;
+    static isFirefox(): boolean;
+    static isOculus(): boolean;
+    static isSafari(): boolean;
     static getIOSVersion(): number[];
     static getChromeVersion(): number;
 }

package/dist/util/util.js

@@ -6,58 +6,45 @@ exports.Util = void 0;
  */
 class Util {
     static canAugment() {
-        const userAgent = navigator.userAgent;
-        // test google chrome on IOS and standard IOS test
-        if ((/CriOS/i.test(userAgent) || /Macintosh|iPad|iPhone|iPod/.test(userAgent)) && !window.MSStream) {
-            // inside facebook browser
-            if (/\bFB[\w_]+\//.test(userAgent)) {
-                return false;
-            }
-            // inside instagram browser
-            if (/\bInstagram/i.test(userAgent)) {
-                return false;
+        return Util.canQuicklook() || Util.canSceneViewer();
+    }
+    static canQuicklook() {
+        if (Util.isIOS()) {
+            const isWKWebView = Boolean((window && window).webkit && window.webkit.messageHandlers);
+            if (isWKWebView) {
+                return Boolean(/CriOS\/|EdgiOS\/|FxiOS\/|GSA\/|DuckDuckGo\//.test(navigator.userAgent));
             }
-            return Util.canQuicklook();
-        }
-        else if (/android/i.test(userAgent)) {
-            return true;
+            const tempAnchor = document.createElement("a");
+            return tempAnchor.relList && tempAnchor.relList.supports && tempAnchor.relList.supports("ar");
         }
         return false;
     }
-    static canQuicklook() {
-        const tempAnchor = document.createElement("a");
-        return tempAnchor.relList &&
-            tempAnchor.relList.supports &&
-            tempAnchor.relList.supports("ar");
-    }
     static canSceneViewer() {
-        return Util.canAugment() && /android/i.test(navigator.userAgent);
+        return Util.isAndroid() && !Util.isFirefox() && !Util.isOculus();
     }
     static canRealityViewer() {
-        if (!Util.canAugment()) {
-            return false;
-        }
-        if (/Macintosh|iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
-            if (Util.isSafari() && Util.getIOSVersion()[0] >= 13) {
-                return true;
-            }
-        }
-        return false;
+        return Util.isIOS() && Util.getIOSVersion()[0] >= 13;
     }
-    static isSafari() {
-        if (navigator.vendor && navigator.userAgent) {
-            return navigator.vendor.indexOf("Apple") > -1 &&
-                navigator.userAgent.indexOf("CriOS") === -1 &&
-                navigator.userAgent.indexOf("FxiOS") === -1;
-        }
-        return false;
+    static isSafariOnIOS() {
+        return Util.isIOS() && Util.isSafari();
     }
     static isChromeOnIOS() {
-        const userAgent = navigator.userAgent;
-        if (userAgent) {
-            return Util.canAugment() && /CriOS/i.test(userAgent);
-        }
-        return false;
+        return Util.isIOS() && /CriOS\//.test(navigator.userAgent);
+    }
+    static isIOS() {
+        return (/iPad|iPhone|iPod/.test(navigator.userAgent) && !self.MSStream) || (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1);
+    }
+    static isAndroid() {
+        return /android/i.test(navigator.userAgent);
+    }
+    static isFirefox() {
+        return /firefox/i.test(navigator.userAgent);
+    }
+    static isOculus() {
+        return /OculusBrowser/.test(navigator.userAgent);
+    }
+    static isSafari() {
+        return Util.isIOS() && /Safari\//.test(navigator.userAgent);
     }
     static getIOSVersion() {
         if (/iP(hone|od|ad)/.test(navigator.platform)) {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "1.139.2";
+declare const _default: "1.140.2";
 export default _default;

package/dist/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = "1.139.2";
+exports.default = "1.140.2";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plattar/plattar-ar-adapter",
-  "version": "1.139.2",
+  "version": "1.140.2",
   "description": "Plattar AR Adapter for interfacing with Google & Apple WebAR",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -45,8 +45,8 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.19.6",
-    "@babel/preset-env": "^7.19.4",
+    "@babel/core": "^7.20.2",
+    "@babel/preset-env": "^7.20.2",
     "browserify": "^17.0.0",
     "typescript": "^4.8.4",
     "uglify-js": "^3.17.4"