@auxilium/datalynk-client 1.3.16 → 1.3.17

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 (validated with fallback) */
+      __publicField(this, "resolvedIconUrl", "https://datalynk-client.primary.auxilium.world/logo.png");
       this.api = api;
     }
     get headless() {
@@ -2380,17 +2382,19 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const installBtn = document.querySelector("#installPwaBtn");
       if (!installBtn) return;
       installBtn.onclick = async () => {
-        var _a;
+        var _a, _b;
         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(((_a = this.api.options.pwaSettings) == null ? void 0 : _a.dismissExpiry) ?? 7);
         if (choice.outcome === "accepted") {
           console.log("PWA installed");
-          localStorage.setItem(`${this.api.options.name}:pwa`, "installed");
+          localStorage.setItem(storageKey, "installed");
         } else {
-          localStorage.setItem(`${this.api.options.name}:pwa`, Date.now().toString());
+          expiryDays === 0 ? localStorage.removeItem(storageKey) : localStorage.setItem(storageKey, Date.now().toString());
         }
-        (_a = document.querySelector(".pwa-prompt")) == null ? void 0 : _a.remove();
+        (_b = document.querySelector(".pwa-prompt")) == null ? void 0 : _b.remove();
       };
     }
     /** Setup the PWA */
@@ -2435,11 +2439,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           exists.href = href;
           return exists;
         }
-        const link2 = document.createElement("link");
-        link2.rel = rel;
-        link2.href = href;
-        document.head.append(link2);
-        return link2;
+        const el = document.createElement("link");
+        el.rel = rel;
+        el.href = href;
+        document.head.append(el);
+        return el;
       };
       const resolveUrl = (href) => {
         if (!href) return "";
@@ -2463,37 +2467,64 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         const anyIcon = document.querySelector('link[rel~="icon"]');
         return (anyIcon == null ? void 0 : anyIcon.href) ? resolveUrl(anyIcon.href) : "";
       };
-      const iconUrl = resolveUrl((_a = this.api.options.pwaSettings) == null ? void 0 : _a.icon) || pickFavicon() || "https://datalynk-client.primary.auxilium.world/logo.png";
+      const firstWorkingIcon = async (...candidates) => {
+        for (const c of candidates) {
+          const url = resolveUrl(c);
+          if (!url) continue;
+          const ok = await new Promise((res) => {
+            const img = new Image();
+            const t = setTimeout(() => res(false), 2500);
+            img.onload = () => {
+              clearTimeout(t);
+              res(true);
+            };
+            img.onerror = () => {
+              clearTimeout(t);
+              res(false);
+            };
+            img.src = url;
+          });
+          if (ok) return url;
+        }
+        return "https://datalynk-client.primary.auxilium.world/logo.png";
+      };
+      const iconUrl = await firstWorkingIcon(
+        ((_a = this.api.options.pwaSettings) == null ? void 0 : _a.icon) || "",
+        pickFavicon() || "",
+        "https://datalynk-client.primary.auxilium.world/logo.png"
+      );
+      this.resolvedIconUrl = iconUrl;
       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);
       link("apple-touch-icon", iconUrl);
       link("apple-touch-startup-image", iconUrl);
-      if (!document.querySelector('link[rel="manifest"]')) {
-        const link2 = document.createElement("link");
-        link2.rel = "manifest";
-        const base = String(this.api.url).replace(/\/+$/, "");
-        const startUrl = location.pathname;
-        const scopePath = startUrl.endsWith("/") ? startUrl : startUrl.replace(/[^/]+$/, "");
-        const manifestObj = {
-          name: this.api.options.name,
-          short_name: this.api.options.name,
-          start_url: startUrl,
-          scope: scopePath || "/",
-          display: "standalone",
-          ...this.api.options.manifest || {},
-          ...manifest || {}
-        };
-        if (!((_b = manifestObj.icons) == null ? void 0 : _b.length)) {
-          manifestObj.icons = [
-            { src: iconUrl, sizes: "192x192", type: "image/png", purpose: "any" },
-            { src: iconUrl, sizes: "512x512", type: "image/png", purpose: "any" },
-            { src: iconUrl, sizes: "512x512", type: "image/png", purpose: "maskable" }
-          ];
-        }
-        link2.href = `${base}/manifest?json=${encodeURIComponent(JSON.stringify(manifestObj))}`;
-        document.head.append(link2);
+      let manifestLink = document.querySelector('link[rel="manifest"]');
+      if (!manifestLink) {
+        manifestLink = document.createElement("link");
+        manifestLink.rel = "manifest";
+        document.head.append(manifestLink);
       }
+      const base = String(this.api.url).replace(/\/+$/, "");
+      const startUrl = location.pathname;
+      const scopePath = startUrl.endsWith("/") ? startUrl : startUrl.replace(/[^/]+$/, "");
+      const manifestObj = {
+        name: this.api.options.name,
+        short_name: this.api.options.name,
+        start_url: startUrl,
+        scope: scopePath || "/",
+        display: "standalone",
+        ...this.api.options.manifest || {},
+        ...manifest || {}
+      };
+      if (!((_b = manifestObj.icons) == null ? void 0 : _b.length)) {
+        manifestObj.icons = [
+          { src: iconUrl, sizes: "192x192", type: "image/png", purpose: "any" },
+          { src: iconUrl, sizes: "512x512", type: "image/png", purpose: "any" },
+          { src: iconUrl, sizes: "512x512", type: "image/png", purpose: "maskable" }
+        ];
+      }
+      manifestLink.href = `${base}/manifest?ts=${Date.now()}&json=${encodeURIComponent(JSON.stringify(manifestObj))}`;
       if (!((_c = this.api.options.pwaSettings) == null ? void 0 : _c.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;
@@ -2516,35 +2547,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     /** Prompt user to install the app */
     async prompt(platform) {
-      var _a, _b;
+      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 resolveUrl = (href) => {
-        if (!href) return "";
-        try {
-          return new URL(href, location.href).href;
-        } catch (e) {
-          return href;
-        }
-      };
-      const pickFavicon = () => {
-        const touch = document.querySelector('link[rel="apple-touch-icon"]');
-        if (touch == null ? void 0 : touch.href) return resolveUrl(touch.href);
-        const iconWithSizes = Array.from(document.querySelectorAll('link[rel~="icon"][sizes]'));
-        if (iconWithSizes.length) {
-          const best = iconWithSizes.sort((a, b) => {
-            var _a2, _b2;
-            return (parseInt((((_a2 = b.sizes) == null ? void 0 : _a2.value) || "0").split("x")[0]) || 0) - (parseInt((((_b2 = a.sizes) == null ? void 0 : _b2.value) || "0").split("x")[0]) || 0);
-          })[0];
-          if (best == null ? void 0 : best.href) return resolveUrl(best.href);
-        }
-        const anyIcon = document.querySelector('link[rel~="icon"]');
-        return (anyIcon == null ? void 0 : anyIcon.href) ? resolveUrl(anyIcon.href) : "";
-      };
-      const iconUrl = resolveUrl((_b = this.api.options.pwaSettings) == null ? void 0 : _b.icon) || pickFavicon() || "https://datalynk-client.primary.auxilium.world/logo.png";
+      const iconUrl = this.resolvedIconUrl || "https://datalynk-client.primary.auxilium.world/logo.png";
       const targetPlatform = platform || this.platform;
       const isAndroid = targetPlatform == "android";
       const isIOS = targetPlatform == "ios";
@@ -2687,10 +2696,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const closeBtn = prompt.querySelector(".pwa-prompt-close");
       closeBtn.onclick = () => {
         var _a2;
-        !!((_a2 = this.api.options.pwaSettings) == null ? void 0 : _a2.dismissExpiry) ? localStorage.setItem(storageKey, Date.now().toString()) : localStorage.removeItem(storageKey);
+        const expiryDays = Number(((_a2 = this.api.options.pwaSettings) == null ? void 0 : _a2.dismissExpiry) ?? 7);
+        expiryDays === 0 ? localStorage.removeItem(storageKey) : localStorage.setItem(storageKey, Date.now().toString());
         prompt.remove();
       };
       document.body.append(prompt);
+      const img = prompt.querySelector(".pwa-prompt-header img");
+      if (img) img.onerror = () => img.src = "https://datalynk-client.primary.auxilium.world/logo.png";
       if (this.nativeInstallPrompt) this.bindInstallButton();
     }
   }
@@ -3802,7 +3814,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       } });
     }
   }
-  const version = "1.3.16";
+  const version = "1.3.17";
   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 (validated with fallback) */
+    __publicField(this, "resolvedIconUrl", "https://datalynk-client.primary.auxilium.world/logo.png");
     this.api = api;
   }
   get headless() {
@@ -2376,17 +2378,19 @@ class PWA {
     const installBtn = document.querySelector("#installPwaBtn");
     if (!installBtn) return;
     installBtn.onclick = async () => {
-      var _a;
+      var _a, _b;
       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(((_a = this.api.options.pwaSettings) == null ? void 0 : _a.dismissExpiry) ?? 7);
       if (choice.outcome === "accepted") {
         console.log("PWA installed");
-        localStorage.setItem(`${this.api.options.name}:pwa`, "installed");
+        localStorage.setItem(storageKey, "installed");
       } else {
-        localStorage.setItem(`${this.api.options.name}:pwa`, Date.now().toString());
+        expiryDays === 0 ? localStorage.removeItem(storageKey) : localStorage.setItem(storageKey, Date.now().toString());
       }
-      (_a = document.querySelector(".pwa-prompt")) == null ? void 0 : _a.remove();
+      (_b = document.querySelector(".pwa-prompt")) == null ? void 0 : _b.remove();
     };
   }
   /** Setup the PWA */
@@ -2431,11 +2435,11 @@ class PWA {
         exists.href = href;
         return exists;
       }
-      const link2 = document.createElement("link");
-      link2.rel = rel;
-      link2.href = href;
-      document.head.append(link2);
-      return link2;
+      const el = document.createElement("link");
+      el.rel = rel;
+      el.href = href;
+      document.head.append(el);
+      return el;
     };
     const resolveUrl = (href) => {
       if (!href) return "";
@@ -2459,37 +2463,64 @@ class PWA {
       const anyIcon = document.querySelector('link[rel~="icon"]');
       return (anyIcon == null ? void 0 : anyIcon.href) ? resolveUrl(anyIcon.href) : "";
     };
-    const iconUrl = resolveUrl((_a = this.api.options.pwaSettings) == null ? void 0 : _a.icon) || pickFavicon() || "https://datalynk-client.primary.auxilium.world/logo.png";
+    const firstWorkingIcon = async (...candidates) => {
+      for (const c of candidates) {
+        const url = resolveUrl(c);
+        if (!url) continue;
+        const ok = await new Promise((res) => {
+          const img = new Image();
+          const t = setTimeout(() => res(false), 2500);
+          img.onload = () => {
+            clearTimeout(t);
+            res(true);
+          };
+          img.onerror = () => {
+            clearTimeout(t);
+            res(false);
+          };
+          img.src = url;
+        });
+        if (ok) return url;
+      }
+      return "https://datalynk-client.primary.auxilium.world/logo.png";
+    };
+    const iconUrl = await firstWorkingIcon(
+      ((_a = this.api.options.pwaSettings) == null ? void 0 : _a.icon) || "",
+      pickFavicon() || "",
+      "https://datalynk-client.primary.auxilium.world/logo.png"
+    );
+    this.resolvedIconUrl = iconUrl;
     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);
     link("apple-touch-icon", iconUrl);
     link("apple-touch-startup-image", iconUrl);
-    if (!document.querySelector('link[rel="manifest"]')) {
-      const link2 = document.createElement("link");
-      link2.rel = "manifest";
-      const base = String(this.api.url).replace(/\/+$/, "");
-      const startUrl = location.pathname;
-      const scopePath = startUrl.endsWith("/") ? startUrl : startUrl.replace(/[^/]+$/, "");
-      const manifestObj = {
-        name: this.api.options.name,
-        short_name: this.api.options.name,
-        start_url: startUrl,
-        scope: scopePath || "/",
-        display: "standalone",
-        ...this.api.options.manifest || {},
-        ...manifest || {}
-      };
-      if (!((_b = manifestObj.icons) == null ? void 0 : _b.length)) {
-        manifestObj.icons = [
-          { src: iconUrl, sizes: "192x192", type: "image/png", purpose: "any" },
-          { src: iconUrl, sizes: "512x512", type: "image/png", purpose: "any" },
-          { src: iconUrl, sizes: "512x512", type: "image/png", purpose: "maskable" }
-        ];
-      }
-      link2.href = `${base}/manifest?json=${encodeURIComponent(JSON.stringify(manifestObj))}`;
-      document.head.append(link2);
+    let manifestLink = document.querySelector('link[rel="manifest"]');
+    if (!manifestLink) {
+      manifestLink = document.createElement("link");
+      manifestLink.rel = "manifest";
+      document.head.append(manifestLink);
     }
+    const base = String(this.api.url).replace(/\/+$/, "");
+    const startUrl = location.pathname;
+    const scopePath = startUrl.endsWith("/") ? startUrl : startUrl.replace(/[^/]+$/, "");
+    const manifestObj = {
+      name: this.api.options.name,
+      short_name: this.api.options.name,
+      start_url: startUrl,
+      scope: scopePath || "/",
+      display: "standalone",
+      ...this.api.options.manifest || {},
+      ...manifest || {}
+    };
+    if (!((_b = manifestObj.icons) == null ? void 0 : _b.length)) {
+      manifestObj.icons = [
+        { src: iconUrl, sizes: "192x192", type: "image/png", purpose: "any" },
+        { src: iconUrl, sizes: "512x512", type: "image/png", purpose: "any" },
+        { src: iconUrl, sizes: "512x512", type: "image/png", purpose: "maskable" }
+      ];
+    }
+    manifestLink.href = `${base}/manifest?ts=${Date.now()}&json=${encodeURIComponent(JSON.stringify(manifestObj))}`;
     if (!((_c = this.api.options.pwaSettings) == null ? void 0 : _c.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;
@@ -2512,35 +2543,13 @@ class PWA {
   }
   /** Prompt user to install the app */
   async prompt(platform) {
-    var _a, _b;
+    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 resolveUrl = (href) => {
-      if (!href) return "";
-      try {
-        return new URL(href, location.href).href;
-      } catch (e) {
-        return href;
-      }
-    };
-    const pickFavicon = () => {
-      const touch = document.querySelector('link[rel="apple-touch-icon"]');
-      if (touch == null ? void 0 : touch.href) return resolveUrl(touch.href);
-      const iconWithSizes = Array.from(document.querySelectorAll('link[rel~="icon"][sizes]'));
-      if (iconWithSizes.length) {
-        const best = iconWithSizes.sort((a, b) => {
-          var _a2, _b2;
-          return (parseInt((((_a2 = b.sizes) == null ? void 0 : _a2.value) || "0").split("x")[0]) || 0) - (parseInt((((_b2 = a.sizes) == null ? void 0 : _b2.value) || "0").split("x")[0]) || 0);
-        })[0];
-        if (best == null ? void 0 : best.href) return resolveUrl(best.href);
-      }
-      const anyIcon = document.querySelector('link[rel~="icon"]');
-      return (anyIcon == null ? void 0 : anyIcon.href) ? resolveUrl(anyIcon.href) : "";
-    };
-    const iconUrl = resolveUrl((_b = this.api.options.pwaSettings) == null ? void 0 : _b.icon) || pickFavicon() || "https://datalynk-client.primary.auxilium.world/logo.png";
+    const iconUrl = this.resolvedIconUrl || "https://datalynk-client.primary.auxilium.world/logo.png";
     const targetPlatform = platform || this.platform;
     const isAndroid = targetPlatform == "android";
     const isIOS = targetPlatform == "ios";
@@ -2683,10 +2692,13 @@ class PWA {
     const closeBtn = prompt.querySelector(".pwa-prompt-close");
     closeBtn.onclick = () => {
       var _a2;
-      !!((_a2 = this.api.options.pwaSettings) == null ? void 0 : _a2.dismissExpiry) ? localStorage.setItem(storageKey, Date.now().toString()) : localStorage.removeItem(storageKey);
+      const expiryDays = Number(((_a2 = this.api.options.pwaSettings) == null ? void 0 : _a2.dismissExpiry) ?? 7);
+      expiryDays === 0 ? localStorage.removeItem(storageKey) : localStorage.setItem(storageKey, Date.now().toString());
       prompt.remove();
     };
     document.body.append(prompt);
+    const img = prompt.querySelector(".pwa-prompt-header img");
+    if (img) img.onerror = () => img.src = "https://datalynk-client.primary.auxilium.world/logo.png";
     if (this.nativeInstallPrompt) this.bindInstallButton();
   }
 }
@@ -3798,7 +3810,7 @@ class Superuser {
     } });
   }
 }
-const version = "1.3.16";
+const version = "1.3.17";
 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 (validated with fallback) */
+    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":"AACA,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;IAiBzB,oBAAoB;IACd,KAAK,CAAC,QAAQ,GAAE,GAAQ;IAoJ9B,qCAAqC;IAC/B,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,KAAK;CAyMzC"}
+{"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,6EAA6E;IAC7E,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;IAsBzB,oBAAoB;IACd,KAAK,CAAC,QAAQ,GAAE,GAAQ;IA0K9B,qCAAqC;IAC/B,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,KAAK;CA0LzC"}

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.16",
+	"version": "1.3.17",
 	"author": "Zak Timson <zaktimson@gmail.com>",
 	"private": false,
 	"main": "./dist/index.cjs",