@plattar/plattar-ar-adapter 1.115.2 → 1.116.1

package/dist/ar/product-ar.d.ts

@@ -3,7 +3,7 @@ import { LauncherAR } from "./launcher-ar";
  * Performs AR functionality related to Plattar Products and Variation types
  */
 export declare class ProductAR extends LauncherAR {
-    private readonly _analytics;
+    private _analytics;
     private readonly _productID;
     private readonly _variationID;
     private _ar;

package/dist/ar/product-ar.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductAR = void 0;
 const plattar_api_1 = require("@plattar/plattar-api");
-const analytics_1 = __importDefault(require("../analytics/analytics"));
+const plattar_analytics_1 = require("@plattar/plattar-analytics");
 const util_1 = require("../util/util");
 const quicklook_viewer_1 = __importDefault(require("../viewers/quicklook-viewer"));
 const reality_viewer_1 = __importDefault(require("../viewers/reality-viewer"));
@@ -17,12 +17,13 @@ const launcher_ar_1 = require("./launcher-ar");
 class ProductAR extends launcher_ar_1.LauncherAR {
     constructor(productID = null, variationID = null) {
         super();
+        // analytics instance
+        this._analytics = null;
         if (!productID) {
             throw new Error("ProductAR.constructor(productID, variationID) - productID must be defined");
         }
         this._productID = productID;
         this._variationID = variationID ? variationID : "default";
-        this._analytics = new analytics_1.default();
         this._ar = null;
     }
     get productID() {
@@ -32,27 +33,32 @@ class ProductAR extends launcher_ar_1.LauncherAR {
         return this._variationID;
     }
     _setupAnalytics(product, variation) {
-        const analytics = this._analytics;
+        let analytics = null;
         const scene = product.relationships.find(plattar_api_1.Scene);
         // setup scene stuff (if any)
         if (scene) {
-            analytics.push("sceneId", scene.id);
-            analytics.push("sceneTitle", scene.attributes.title);
+            analytics = new plattar_analytics_1.Analytics(scene.attributes.application_id);
+            analytics.origin = plattar_api_1.Server.location().type;
+            this._analytics = analytics;
+            analytics.data.push("sceneId", scene.id);
+            analytics.data.push("sceneTitle", scene.attributes.title);
             const application = scene.relationships.find(plattar_api_1.Project);
             // setup application stuff (if any)
             if (application) {
-                analytics.push("applicationId", application.id);
-                analytics.push("applicationTitle", application.attributes.title);
+                analytics.data.push("applicationId", application.id);
+                analytics.data.push("applicationTitle", application.attributes.title);
             }
         }
-        // set product stuff
-        analytics.push("productId", product.id);
-        analytics.push("productTitle", product.attributes.title);
-        analytics.push("productSKU", product.attributes.sku);
-        // set variation stuff
-        analytics.push("variationId", variation.id);
-        analytics.push("variationTitle", variation.attributes.title);
-        analytics.push("variationSKU", variation.attributes.sku);
+        if (analytics) {
+            // set product stuff
+            analytics.data.push("productId", product.id);
+            analytics.data.push("productTitle", product.attributes.title);
+            analytics.data.push("productSKU", product.attributes.sku);
+            // set variation stuff
+            analytics.data.push("variationId", variation.id);
+            analytics.data.push("variationTitle", variation.attributes.title);
+            analytics.data.push("variationSKU", variation.attributes.sku);
+        }
     }
     /**
      * Initialise the ProductAR instance. This returns a Promise that resolves
@@ -144,14 +150,16 @@ class ProductAR extends launcher_ar_1.LauncherAR {
         if (!this._ar) {
             throw new Error("ProductAR.start() - cannot proceed as AR instance is null");
         }
+        const analytics = this._analytics;
+        if (analytics) {
+            analytics.data.push("device", this._ar.device);
+            analytics.data.push("eventCategory", this._ar.nodeType);
+            analytics.data.push("eventAction", "Start Augment");
+            analytics.write();
+            analytics.startRecordEngagement();
+        }
         // this was initialised via the init() function
         this._ar.start();
-        this._analytics.track({
-            device: this._ar.device,
-            eventCategory: this._ar.nodeType,
-            eventAction: "Start Augment"
-        });
-        this._analytics.startRecordEngagement();
     }
 }
 exports.ProductAR = ProductAR;

package/dist/util/util.d.ts

@@ -7,7 +7,6 @@ export declare class Util {
     static canSceneViewer(): boolean;
     static canRealityViewer(): boolean;
     static isSafari(): boolean;
-    static generateUUID(): string;
     static getIOSVersion(): number[];
     static getChromeVersion(): number;
 }

package/dist/util/util.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Util = void 0;
-const _lut = [];
-for (let i = 0; i < 256; i++) {
-    _lut[i] = (i < 16 ? '0' : '') + (i).toString(16);
-}
 /**
  * Static Utility Functions
  */
@@ -54,17 +50,6 @@ class Util {
         }
         return false;
     }
-    static generateUUID() {
-        const d0 = Math.random() * 0xffffffff | 0;
-        const d1 = Math.random() * 0xffffffff | 0;
-        const d2 = Math.random() * 0xffffffff | 0;
-        const d3 = Math.random() * 0xffffffff | 0;
-        const uuid = _lut[d0 & 0xff] + _lut[d0 >> 8 & 0xff] + _lut[d0 >> 16 & 0xff] + _lut[d0 >> 24 & 0xff] + '-' +
-            _lut[d1 & 0xff] + _lut[d1 >> 8 & 0xff] + '-' + _lut[d1 >> 16 & 0x0f | 0x40] + _lut[d1 >> 24 & 0xff] + '-' +
-            _lut[d2 & 0x3f | 0x80] + _lut[d2 >> 8 & 0xff] + '-' + _lut[d2 >> 16 & 0xff] + _lut[d2 >> 24 & 0xff] +
-            _lut[d3 & 0xff] + _lut[d3 >> 8 & 0xff] + _lut[d3 >> 16 & 0xff] + _lut[d3 >> 24 & 0xff];
-        return uuid.toLowerCase();
-    }
     static getIOSVersion() {
         if (/iP(hone|od|ad)/.test(navigator.platform)) {
             const v = (navigator.appVersion).match(/OS (\d+)_(\d+)_?(\d+)?/);

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "1.115.2";
+declare const _default: "1.116.1";
 export default _default;

package/dist/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plattar/plattar-ar-adapter",
-  "version": "1.115.2",
+  "version": "1.116.1",
   "description": "Plattar AR Adapter for interfacing with Google & Apple WebAR",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -37,12 +37,13 @@
   },
   "homepage": "https://www.plattar.com",
   "dependencies": {
-    "@plattar/plattar-api": "^1.114.1",
+    "@plattar/plattar-analytics": "^1.116.2",
+    "@plattar/plattar-api": "^1.115.2",
     "@plattar/plattar-qrcode": "1.114.1",
     "@plattar/plattar-web": "^1.113.10"
   },
   "devDependencies": {
-    "@babel/cli": "^7.15.4",
+    "@babel/cli": "^7.15.7",
     "@babel/core": "^7.15.5",
     "@babel/preset-env": "^7.15.6",
     "browserify": "^17.0.0",

package/dist/analytics/analytics.d.ts

@@ -1,10 +0,0 @@
-export default class Analytics {
-    private readonly _map;
-    constructor();
-    track(dataSet?: any | undefined | null): void;
-    pageview(dataSet?: any | undefined | null): void;
-    private _send;
-    push(key: string, value: any): void;
-    getUserID(): string;
-    startRecordEngagement(): void;
-}

package/dist/analytics/analytics.js

@@ -1,92 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("../util/util");
-const plattar_api_1 = require("@plattar/plattar-api");
-class Analytics {
-    constructor() {
-        this._map = new Map();
-        this.push("source", "embed");
-        this.push("pageTitle", document.title);
-        this.push("pageURL", location.href);
-        this.push("referrer", document.referrer);
-        this.push("user_id", this.getUserID());
-    }
-    track(dataSet = null) {
-        this._send("track", dataSet);
-    }
-    pageview(dataSet = null) {
-        this._send("pageview", dataSet);
-    }
-    _send(event, dataSet = null) {
-        const url = plattar_api_1.Server.location().analytics;
-        const data = dataSet || {};
-        const dims = Object.fromEntries(this._map);
-        const cData = Object.assign(data, dims);
-        const analytic = {
-            event: event,
-            origin: plattar_api_1.Server.location().type,
-            application_id: cData.applicationId,
-            data: cData
-        };
-        // NOTE - Consider switching this to navigator.sendBeacon which is designed
-        // for sending analytics data even when page is unloaded
-        // see https://stackoverflow.com/questions/40523469/navigator-sendbeacon-to-pass-header-information
-        // see https://developer.mozilla.org/en-US/docs/Web/API/Beacon_API
-        try {
-            const xmlhttp = new XMLHttpRequest();
-            xmlhttp.open("POST", url);
-            xmlhttp.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
-            xmlhttp.send(JSON.stringify(analytic));
-        }
-        catch (err) {
-            console.error("Analytics.send(" + event + ") - Error during POST - " + err);
-        }
-    }
-    push(key, value) {
-        this._map.set(key, value);
-    }
-    getUserID() {
-        const key = "plattar_user_id";
-        let userID = null;
-        try {
-            userID = localStorage.getItem(key);
-        }
-        catch (err) {
-            userID = util_1.Util.generateUUID();
-            // try storing if just generated
-            try {
-                localStorage.setItem(key, userID);
-            }
-            catch (_err) { /* silent */ }
-        }
-        if (!userID) {
-            userID = util_1.Util.generateUUID();
-            // try storing if just generated
-            try {
-                localStorage.setItem(key, userID);
-            }
-            catch (_err) { /*silent */ }
-        }
-        return userID;
-    }
-    startRecordEngagement() {
-        let time;
-        const handlePageHide = () => {
-            if (document.visibilityState === "hidden") {
-                time = new Date();
-            }
-            else {
-                const time2 = new Date();
-                const diff = time2.getTime() - time.getTime();
-                this.track({
-                    eventAction: "View Time",
-                    viewTime: diff,
-                    eventLabel: diff
-                });
-                document.removeEventListener("visibilitychange", handlePageHide, false);
-            }
-        };
-        document.addEventListener("visibilitychange", handlePageHide, false);
-    }
-}
-exports.default = Analytics;

package/dist/util/basic-http.d.ts

@@ -1,6 +0,0 @@
-/**
- * Simple HTTP interaction module
- */
-export default class BasicHTTP {
-    static get(protocol: string, path: string): Promise<any>;
-}

package/dist/util/basic-http.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * Simple HTTP interaction module
- */
-class BasicHTTP {
-    static get(protocol, path) {
-        return new Promise((accept, reject) => {
-            try {
-                const http = new XMLHttpRequest();
-                http.open(protocol, path, true);
-                http.onload = (e) => {
-                    if (http.status === 200) {
-                        if (http.response) {
-                            try {
-                                const resp = JSON.parse(http.response);
-                                return accept(resp);
-                            }
-                            catch (_err) { /* silent */ }
-                        }
-                        return accept({});
-                    }
-                    else {
-                        return reject(e);
-                    }
-                };
-                http.onerror = (e) => {
-                    return reject(e);
-                };
-                http.send(null);
-            }
-            catch (e) {
-                return reject(e);
-            }
-        });
-    }
-}
-exports.default = BasicHTTP;