@auxilium/datalynk-client 1.3.17-1 → 1.3.18

package/dist/index.cjs

@@ -2343,6 +2343,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     constructor(api) {
       /** Capture Install Event */
       __publicField(this, "nativeInstallPrompt", null);
+      /** Resolved icon URL used for prompt + manifest */
+      __publicField(this, "resolvedIconUrl", "https://datalynk-client.primary.auxilium.world/logo.png");
       this.api = api;
     }
     get headless() {
@@ -2380,19 +2382,17 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const installBtn = document.querySelector("#installPwaBtn");
       if (!installBtn) return;
       installBtn.onclick = async () => {
-        var _a, _b, _c;
+        var _a;
         if (!this.nativeInstallPrompt) return console.warn("PWA is not supported");
         this.nativeInstallPrompt.prompt();
         const choice = await this.nativeInstallPrompt.userChoice;
-        const storageKey = `${this.api.options.name}:pwa`;
-        const expiryDays = Number(((_b = (_a = this.api.options) == null ? void 0 : _a.pwaSettings) == null ? void 0 : _b.dismissExpiry) ?? 7);
         if (choice.outcome === "accepted") {
           console.log("PWA installed");
-          localStorage.setItem(storageKey, "installed");
+          localStorage.setItem(`${this.api.options.name}:pwa`, "installed");
         } else {
-          expiryDays === 0 ? localStorage.removeItem(storageKey) : localStorage.setItem(storageKey, Date.now().toString());
+          localStorage.setItem(`${this.api.options.name}:pwa`, Date.now().toString());
         }
-        (_c = document.querySelector(".pwa-prompt")) == null ? void 0 : _c.remove();
+        (_a = document.querySelector(".pwa-prompt")) == null ? void 0 : _a.remove();
       };
     }
     /** Setup the PWA */
@@ -2422,19 +2422,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         hidePWAPrompt: false,
         ...this.api.options.pwaSettings
       };
-      const meta = (key, name, value) => {
-        const exists = document.querySelector(`meta[${key}="${name}"]`);
-        if (value === void 0 || exists) return exists;
-        const meta2 = document.createElement("meta");
-        meta2.setAttribute(key, name);
-        meta2.content = value;
-        document.head.append(meta2);
-      };
-      meta("name", "mobile-web-app-capable", "yes");
-      meta("name", "apple-mobile-web-app-status-bar-style", "default");
-      meta("name", "apple-mobile-web-app-title", this.api.options.name);
-      meta("name", "apple-touch-icon", `https://datalynk-client.primary.auxilium.world/logo.png`);
-      meta("name", "apple-touch-startup-image", `https://datalynk-client.primary.auxilium.world/logo.png`);
       const defaultIcon = "https://datalynk-client.primary.auxilium.world/logo.png";
       let iconUrl = ((_b = (_a = this.api.options) == null ? void 0 : _a.pwaSettings) == null ? void 0 : _b.icon) || defaultIcon;
       const canLoad = (url) => new Promise((res) => {
@@ -2454,11 +2441,25 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         const ok = await canLoad(iconUrl);
         if (!ok) iconUrl = defaultIcon;
       }
-      let manifestLink = document.querySelector('link[rel="manifest"]');
-      if (!manifestLink) {
-        manifestLink = document.createElement("link");
-        manifestLink.rel = "manifest";
-        document.head.append(manifestLink);
+      this.resolvedIconUrl = iconUrl;
+      const meta = (key, name, value) => {
+        const exists = document.querySelector(`meta[${key}="${name}"]`);
+        if (value === void 0 || exists) return exists;
+        const meta2 = document.createElement("meta");
+        meta2.setAttribute(key, name);
+        meta2.content = value;
+        document.head.append(meta2);
+      };
+      meta("name", "mobile-web-app-capable", "yes");
+      meta("name", "apple-mobile-web-app-status-bar-style", "default");
+      meta("name", "apple-mobile-web-app-title", this.api.options.name);
+      meta("name", "apple-touch-icon", this.resolvedIconUrl);
+      meta("name", "apple-touch-startup-image", this.resolvedIconUrl);
+      let link = document.querySelector('link[rel="manifest"]');
+      if (!link) {
+        link = document.createElement("link");
+        link.rel = "manifest";
+        document.head.append(link);
       }
       const base = String(this.api.url).replace(/\/+$/, "");
       const startUrl = location.pathname;
@@ -2474,11 +2475,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       };
       if (!((_c = manifestObj.icons) == null ? void 0 : _c.length)) {
         manifestObj.icons = [
-          { src: iconUrl, sizes: "192x192", type: "image/png" },
-          { src: iconUrl, sizes: "512x512", type: "image/png" }
+          { src: this.resolvedIconUrl, sizes: "192x192", type: "image/png", purpose: "any" },
+          { src: this.resolvedIconUrl, sizes: "512x512", type: "image/png", purpose: "any" },
+          { src: this.resolvedIconUrl, sizes: "512x512", type: "image/png", purpose: "maskable" }
         ];
       }
-      manifestLink.href = `${base}/manifest?ts=${Date.now()}&json=${encodeURIComponent(JSON.stringify(manifestObj))}`;
+      link.href = `${base}/manifest?json=${encodeURIComponent(JSON.stringify(manifestObj))}`;
       if (!((_d = this.api.options.pwaSettings) == null ? void 0 : _d.hidePWAPrompt) && !this.headless && !this.iframe && !this.pwa && this.platform != "mac") {
         const t = Number(this.api.options.pwaSettings.timeout ?? 30);
         const timeoutMs = t >= 1e3 ? t : t * 1e3;
@@ -2501,14 +2503,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     /** Prompt user to install the app */
     async prompt(platform) {
-      var _a, _b, _c;
+      var _a;
       const storageKey = `${this.api.options.name}:pwa`;
       if ((_a = this.api.options.pwaSettings) == null ? void 0 : _a.hidePWAPrompt) return;
       if (this.pwa) return;
       if (localStorage.getItem(storageKey) === "installed") return;
       if (document.querySelector(".pwa-prompt")) return;
-      const defaultIcon = "https://datalynk-client.primary.auxilium.world/logo.png";
-      const iconUrl = ((_c = (_b = this.api.options) == null ? void 0 : _b.pwaSettings) == null ? void 0 : _c.icon) || defaultIcon;
       const targetPlatform = platform || this.platform;
       const isAndroid = targetPlatform == "android";
       const isIOS = targetPlatform == "ios";
@@ -2630,6 +2630,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 			}`;
         document.head.append(style);
       }
+      const iconUrl = this.resolvedIconUrl || "https://datalynk-client.primary.auxilium.world/logo.png";
       const prompt = document.createElement("div");
       prompt.classList.add("pwa-prompt");
       prompt.innerHTML = `
@@ -2650,14 +2651,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 		`;
       const closeBtn = prompt.querySelector(".pwa-prompt-close");
       closeBtn.onclick = () => {
-        var _a2, _b2;
-        const expiryDays = Number(((_b2 = (_a2 = this.api.options) == null ? void 0 : _a2.pwaSettings) == null ? void 0 : _b2.dismissExpiry) ?? 7);
-        expiryDays === 0 ? localStorage.removeItem(storageKey) : localStorage.setItem(storageKey, Date.now().toString());
+        var _a2;
+        !!((_a2 = this.api.options.pwaSettings) == null ? void 0 : _a2.dismissExpiry) ? localStorage.setItem(storageKey, Date.now().toString()) : localStorage.removeItem(storageKey);
         prompt.remove();
       };
       document.body.append(prompt);
       const img = prompt.querySelector(".pwa-prompt-header img");
-      if (img) img.onerror = () => img.src = defaultIcon;
+      if (img) img.onerror = () => img.src = "https://datalynk-client.primary.auxilium.world/logo.png";
       if (this.nativeInstallPrompt) this.bindInstallButton();
     }
   }
@@ -3769,7 +3769,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       } });
     }
   }
-  const version = "1.3.17-1";
+  const version = "1.3.18";
   class WebRtc {
     constructor(api) {
       __publicField(this, "ice");

package/dist/index.mjs

@@ -2339,6 +2339,8 @@ class PWA {
   constructor(api) {
     /** Capture Install Event */
     __publicField(this, "nativeInstallPrompt", null);
+    /** Resolved icon URL used for prompt + manifest */
+    __publicField(this, "resolvedIconUrl", "https://datalynk-client.primary.auxilium.world/logo.png");
     this.api = api;
   }
   get headless() {
@@ -2376,19 +2378,17 @@ class PWA {
     const installBtn = document.querySelector("#installPwaBtn");
     if (!installBtn) return;
     installBtn.onclick = async () => {
-      var _a, _b, _c;
+      var _a;
       if (!this.nativeInstallPrompt) return console.warn("PWA is not supported");
       this.nativeInstallPrompt.prompt();
       const choice = await this.nativeInstallPrompt.userChoice;
-      const storageKey = `${this.api.options.name}:pwa`;
-      const expiryDays = Number(((_b = (_a = this.api.options) == null ? void 0 : _a.pwaSettings) == null ? void 0 : _b.dismissExpiry) ?? 7);
       if (choice.outcome === "accepted") {
         console.log("PWA installed");
-        localStorage.setItem(storageKey, "installed");
+        localStorage.setItem(`${this.api.options.name}:pwa`, "installed");
       } else {
-        expiryDays === 0 ? localStorage.removeItem(storageKey) : localStorage.setItem(storageKey, Date.now().toString());
+        localStorage.setItem(`${this.api.options.name}:pwa`, Date.now().toString());
       }
-      (_c = document.querySelector(".pwa-prompt")) == null ? void 0 : _c.remove();
+      (_a = document.querySelector(".pwa-prompt")) == null ? void 0 : _a.remove();
     };
   }
   /** Setup the PWA */
@@ -2418,19 +2418,6 @@ class PWA {
       hidePWAPrompt: false,
       ...this.api.options.pwaSettings
     };
-    const meta = (key, name, value) => {
-      const exists = document.querySelector(`meta[${key}="${name}"]`);
-      if (value === void 0 || exists) return exists;
-      const meta2 = document.createElement("meta");
-      meta2.setAttribute(key, name);
-      meta2.content = value;
-      document.head.append(meta2);
-    };
-    meta("name", "mobile-web-app-capable", "yes");
-    meta("name", "apple-mobile-web-app-status-bar-style", "default");
-    meta("name", "apple-mobile-web-app-title", this.api.options.name);
-    meta("name", "apple-touch-icon", `https://datalynk-client.primary.auxilium.world/logo.png`);
-    meta("name", "apple-touch-startup-image", `https://datalynk-client.primary.auxilium.world/logo.png`);
     const defaultIcon = "https://datalynk-client.primary.auxilium.world/logo.png";
     let iconUrl = ((_b = (_a = this.api.options) == null ? void 0 : _a.pwaSettings) == null ? void 0 : _b.icon) || defaultIcon;
     const canLoad = (url) => new Promise((res) => {
@@ -2450,11 +2437,25 @@ class PWA {
       const ok = await canLoad(iconUrl);
       if (!ok) iconUrl = defaultIcon;
     }
-    let manifestLink = document.querySelector('link[rel="manifest"]');
-    if (!manifestLink) {
-      manifestLink = document.createElement("link");
-      manifestLink.rel = "manifest";
-      document.head.append(manifestLink);
+    this.resolvedIconUrl = iconUrl;
+    const meta = (key, name, value) => {
+      const exists = document.querySelector(`meta[${key}="${name}"]`);
+      if (value === void 0 || exists) return exists;
+      const meta2 = document.createElement("meta");
+      meta2.setAttribute(key, name);
+      meta2.content = value;
+      document.head.append(meta2);
+    };
+    meta("name", "mobile-web-app-capable", "yes");
+    meta("name", "apple-mobile-web-app-status-bar-style", "default");
+    meta("name", "apple-mobile-web-app-title", this.api.options.name);
+    meta("name", "apple-touch-icon", this.resolvedIconUrl);
+    meta("name", "apple-touch-startup-image", this.resolvedIconUrl);
+    let link = document.querySelector('link[rel="manifest"]');
+    if (!link) {
+      link = document.createElement("link");
+      link.rel = "manifest";
+      document.head.append(link);
     }
     const base = String(this.api.url).replace(/\/+$/, "");
     const startUrl = location.pathname;
@@ -2470,11 +2471,12 @@ class PWA {
     };
     if (!((_c = manifestObj.icons) == null ? void 0 : _c.length)) {
       manifestObj.icons = [
-        { src: iconUrl, sizes: "192x192", type: "image/png" },
-        { src: iconUrl, sizes: "512x512", type: "image/png" }
+        { src: this.resolvedIconUrl, sizes: "192x192", type: "image/png", purpose: "any" },
+        { src: this.resolvedIconUrl, sizes: "512x512", type: "image/png", purpose: "any" },
+        { src: this.resolvedIconUrl, sizes: "512x512", type: "image/png", purpose: "maskable" }
       ];
     }
-    manifestLink.href = `${base}/manifest?ts=${Date.now()}&json=${encodeURIComponent(JSON.stringify(manifestObj))}`;
+    link.href = `${base}/manifest?json=${encodeURIComponent(JSON.stringify(manifestObj))}`;
     if (!((_d = this.api.options.pwaSettings) == null ? void 0 : _d.hidePWAPrompt) && !this.headless && !this.iframe && !this.pwa && this.platform != "mac") {
       const t = Number(this.api.options.pwaSettings.timeout ?? 30);
       const timeoutMs = t >= 1e3 ? t : t * 1e3;
@@ -2497,14 +2499,12 @@ class PWA {
   }
   /** Prompt user to install the app */
   async prompt(platform) {
-    var _a, _b, _c;
+    var _a;
     const storageKey = `${this.api.options.name}:pwa`;
     if ((_a = this.api.options.pwaSettings) == null ? void 0 : _a.hidePWAPrompt) return;
     if (this.pwa) return;
     if (localStorage.getItem(storageKey) === "installed") return;
     if (document.querySelector(".pwa-prompt")) return;
-    const defaultIcon = "https://datalynk-client.primary.auxilium.world/logo.png";
-    const iconUrl = ((_c = (_b = this.api.options) == null ? void 0 : _b.pwaSettings) == null ? void 0 : _c.icon) || defaultIcon;
     const targetPlatform = platform || this.platform;
     const isAndroid = targetPlatform == "android";
     const isIOS = targetPlatform == "ios";
@@ -2626,6 +2626,7 @@ class PWA {
 			}`;
       document.head.append(style);
     }
+    const iconUrl = this.resolvedIconUrl || "https://datalynk-client.primary.auxilium.world/logo.png";
     const prompt = document.createElement("div");
     prompt.classList.add("pwa-prompt");
     prompt.innerHTML = `
@@ -2646,14 +2647,13 @@ class PWA {
 		`;
     const closeBtn = prompt.querySelector(".pwa-prompt-close");
     closeBtn.onclick = () => {
-      var _a2, _b2;
-      const expiryDays = Number(((_b2 = (_a2 = this.api.options) == null ? void 0 : _a2.pwaSettings) == null ? void 0 : _b2.dismissExpiry) ?? 7);
-      expiryDays === 0 ? localStorage.removeItem(storageKey) : localStorage.setItem(storageKey, Date.now().toString());
+      var _a2;
+      !!((_a2 = this.api.options.pwaSettings) == null ? void 0 : _a2.dismissExpiry) ? localStorage.setItem(storageKey, Date.now().toString()) : localStorage.removeItem(storageKey);
       prompt.remove();
     };
     document.body.append(prompt);
     const img = prompt.querySelector(".pwa-prompt-header img");
-    if (img) img.onerror = () => img.src = defaultIcon;
+    if (img) img.onerror = () => img.src = "https://datalynk-client.primary.auxilium.world/logo.png";
     if (this.nativeInstallPrompt) this.bindInstallButton();
   }
 }
@@ -3765,7 +3765,7 @@ class Superuser {
     } });
   }
 }
-const version = "1.3.17-1";
+const version = "1.3.18";
 class WebRtc {
   constructor(api) {
     __publicField(this, "ice");

package/dist/pwa.d.ts

@@ -3,6 +3,8 @@ export declare class PWA {
     private readonly api;
     /** Capture Install Event */
     nativeInstallPrompt: any;
+    /** Resolved icon URL used for prompt + manifest */
+    private resolvedIconUrl;
     get headless(): boolean;
     get iframe(): boolean;
     get mobile(): boolean;

package/dist/pwa.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pwa.d.ts","sourceRoot":"","sources":["../src/pwa.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,qBAAa,GAAG;IAmCH,OAAO,CAAC,QAAQ,CAAC,GAAG;IAlChC,4BAA4B;IACrB,mBAAmB,EAAE,GAAG,CAAQ;IAEvC,IAAI,QAAQ,IAAI,OAAO,CAAyC;IAEhE,IAAI,MAAM,IAAI,OAAO,CAAyC;IAE9D,IAAI,MAAM,IAAI,OAAO,CAAuD;IAE5E,IAAI,QAAQ,IAAI,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAQ1E;IAED,IAAI,OAAO,IAAI,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CASxF;IAED,IAAI,GAAG,IAAI,OAAO,CAEjB;gBAE4B,GAAG,EAAE,GAAG;IAErC,OAAO,CAAC,iBAAiB;IAuBzB,oBAAoB;IACd,KAAK,CAAC,QAAQ,GAAE,GAAQ;IA8H9B,qCAAqC;IAC/B,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,KAAK;CA2LzC"}
+{"version":3,"file":"pwa.d.ts","sourceRoot":"","sources":["../src/pwa.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,qBAAa,GAAG;IAsCH,OAAO,CAAC,QAAQ,CAAC,GAAG;IArChC,4BAA4B;IACrB,mBAAmB,EAAE,GAAG,CAAQ;IAEvC,mDAAmD;IACnD,OAAO,CAAC,eAAe,CAAqE;IAE5F,IAAI,QAAQ,IAAI,OAAO,CAAyC;IAEhE,IAAI,MAAM,IAAI,OAAO,CAAyC;IAE9D,IAAI,MAAM,IAAI,OAAO,CAAuD;IAE5E,IAAI,QAAQ,IAAI,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAQ1E;IAED,IAAI,OAAO,IAAI,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CASxF;IAED,IAAI,GAAG,IAAI,OAAO,CAEjB;gBAE4B,GAAG,EAAE,GAAG;IAErC,OAAO,CAAC,iBAAiB;IAiBzB,oBAAoB;IACd,KAAK,CAAC,QAAQ,GAAE,GAAQ;IA8H9B,qCAAqC;IAC/B,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,KAAK;CAyLzC"}

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@auxilium/datalynk-client",
 	"description": "Datalynk client library",
 	"repository": "https://gitlab.auxiliumgroup.com/auxilium/datalynk/datalynk-client",
-	"version": "1.3.17-1",
+	"version": "1.3.18",
 	"author": "Zak Timson <zaktimson@gmail.com>",
 	"private": false,
 	"main": "./dist/index.cjs",