@auxilium/datalynk-client 1.3.13 → 1.3.15

package/README.md

@@ -11,7 +11,7 @@ Datalynk client library to integrate JavaScript clients with the Datalynk API.
 - [Datalynk Client Library](#datalynk-client-library)
   - [Table of Contents](#table-of-contents)
   - [Quick Start](#quick-start)
-  - [API Documentation](https://datalynk-client.scarborough.auxilium.world)
+  - [API Documentation](https://datalynk-client.primary.auxilium.world)
   - [Cheatsheet](#cheatsheet)
     - [Integration](#integration)
       - [Angular](#angular)
@@ -49,7 +49,7 @@ const api = new API('https://spoke.auxiliumgroup.com');
 const resp = await api.request({'$/auth/current':{}});
 ```
 
-## [API Documentation](https://datalynk-client.scarborough.auxilium.world)
+## [API Documentation](https://datalynk-client.primary.auxilium.world)
 
 ## Cheatsheet
 
@@ -247,7 +247,7 @@ await prompt.wait; // Wait for the user to login/close the prompt
 prompt.close(); // Close prompt manually
 ```
 
-[Full list of options](https://datalynk-client.scarborough.auxilium.world/types/login-prompt.LoginPromptOptions.html)
+[Full list of options](https://datalynk-client.primary.auxilium.world/types/login-prompt.LoginPromptOptions.html)
 
 #### Manual Login
 
@@ -288,7 +288,7 @@ api.pwa.prompt();
 ```
 
 #### Static assets
-Upload the [service worker](https://datalynk-client.scarborough.auxilium.world/dist/service.worker.mjs) `dist/service.worker.mjs` to the *root* directory of the server
+Upload the [service worker](https://datalynk-client.primary.auxilium.world/dist/service.worker.mjs) `dist/service.worker.mjs` to the *root* directory of the server
 to cache all files for use offline
 ```ts
 const api = new Api(`https://${spoke}.auxiliumgroup.com`, {

package/dist/index.cjs

@@ -2396,6 +2396,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     /** Setup the PWA */
     async setup(manifest = {}) {
       var _a;
+      const storageKey = `${this.api.options.name}:pwa`;
       window.addEventListener("beforeinstallprompt", (e) => {
         e.preventDefault();
         this.nativeInstallPrompt = e;
@@ -2405,6 +2406,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           this.bindInstallButton();
         }
       });
+      window.addEventListener("appinstalled", () => {
+        var _a2;
+        localStorage.setItem(storageKey, "installed");
+        (_a2 = document.querySelector(".pwa-prompt")) == null ? void 0 : _a2.remove();
+      });
       this.api.options.pwaSettings = {
         timeout: 30,
         // Seconds
@@ -2425,8 +2431,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       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.scarborough.auxilium.world/logo.png`);
-      meta("name", "apple-touch-startup-image", `https://datalynk-client.scarborough.auxilium.world/logo.png`);
+      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`);
       if (!document.querySelector('link[rel="manifest"]')) {
         const link = document.createElement("link");
         link.rel = "manifest";
@@ -2445,19 +2451,33 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         link.href = `${base}/manifest?json=${encodeURIComponent(JSON.stringify(manifestObj))}`;
         document.head.append(link);
       }
-      if (!((_a = this.api.options.pwaSettings) == null ? void 0 : _a.hidePWAPrompt) && !this.headless && !this.iframe && !this.pwa && this.platform != "mac") setTimeout(() => {
-        var _a2, _b, _c, _d;
-        if (((_b = (_a2 = this.api.options) == null ? void 0 : _a2.pwaSettings) == null ? void 0 : _b.dismissExpiry) === 0) localStorage.removeItem(`${this.api.options.name}:pwa`);
-        let dismissedDate = localStorage.getItem(`${this.api.options.name}:pwa`);
-        if (dismissedDate) dismissedDate = JSON.parse(dismissedDate);
-        if (!!dismissedDate && Date.now() > dismissedDate + ((_d = (_c = this.api.options) == null ? void 0 : _c.pwaSettings) == null ? void 0 : _d.dismissExpiry) * 6e4 * 60 * 24) return;
-        this.prompt();
-      }, this.api.options.pwaSettings.timeout);
+      if (!((_a = this.api.options.pwaSettings) == null ? void 0 : _a.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;
+        setTimeout(() => {
+          var _a2, _b, _c, _d;
+          const raw = localStorage.getItem(storageKey);
+          if (raw === "installed") return;
+          if (((_b = (_a2 = this.api.options) == null ? void 0 : _a2.pwaSettings) == null ? void 0 : _b.dismissExpiry) === 0) {
+            if (raw !== "installed") localStorage.removeItem(storageKey);
+          }
+          const dismissedAt = raw ? Number(raw) : 0;
+          const expiryDays = Number(((_d = (_c = this.api.options) == null ? void 0 : _c.pwaSettings) == null ? void 0 : _d.dismissExpiry) ?? 0);
+          if (dismissedAt && expiryDays > 0) {
+            const expiryMs = expiryDays * 24 * 60 * 60 * 1e3;
+            if (Date.now() < dismissedAt + expiryMs) return;
+          }
+          this.prompt();
+        }, timeoutMs);
+      }
     }
     /** Prompt user to install the app */
     async prompt(platform) {
       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 targetPlatform = platform || this.platform;
       const isAndroid = targetPlatform == "android";
@@ -2584,7 +2604,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       prompt.classList.add("pwa-prompt");
       prompt.innerHTML = `
 			<div class="pwa-prompt-header">
-				<img src="https://datalynk-client.scarborough.auxilium.world/logo.png" alt="Logo" />
+				<img src="https://datalynk-client.primary.auxilium.world/logo.png" alt="Logo" />
 				<h1>Install ${this.api.options.name}</h1>
 				<button class="pwa-prompt-close">&times;</button>
 			</div>
@@ -2601,7 +2621,7 @@ 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(`${this.api.options.name}:pwa`, Date.now().toString()) : localStorage.removeItem(`${this.api.options.name}:pwa`);
+        !!((_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);
@@ -3716,7 +3736,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       } });
     }
   }
-  const version = "1.3.13";
+  const version = "1.3.15";
   class WebRtc {
     constructor(api) {
       __publicField(this, "ice");

package/dist/index.mjs

@@ -2392,6 +2392,7 @@ class PWA {
   /** Setup the PWA */
   async setup(manifest = {}) {
     var _a;
+    const storageKey = `${this.api.options.name}:pwa`;
     window.addEventListener("beforeinstallprompt", (e) => {
       e.preventDefault();
       this.nativeInstallPrompt = e;
@@ -2401,6 +2402,11 @@ class PWA {
         this.bindInstallButton();
       }
     });
+    window.addEventListener("appinstalled", () => {
+      var _a2;
+      localStorage.setItem(storageKey, "installed");
+      (_a2 = document.querySelector(".pwa-prompt")) == null ? void 0 : _a2.remove();
+    });
     this.api.options.pwaSettings = {
       timeout: 30,
       // Seconds
@@ -2421,8 +2427,8 @@ class PWA {
     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.scarborough.auxilium.world/logo.png`);
-    meta("name", "apple-touch-startup-image", `https://datalynk-client.scarborough.auxilium.world/logo.png`);
+    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`);
     if (!document.querySelector('link[rel="manifest"]')) {
       const link = document.createElement("link");
       link.rel = "manifest";
@@ -2441,19 +2447,33 @@ class PWA {
       link.href = `${base}/manifest?json=${encodeURIComponent(JSON.stringify(manifestObj))}`;
       document.head.append(link);
     }
-    if (!((_a = this.api.options.pwaSettings) == null ? void 0 : _a.hidePWAPrompt) && !this.headless && !this.iframe && !this.pwa && this.platform != "mac") setTimeout(() => {
-      var _a2, _b, _c, _d;
-      if (((_b = (_a2 = this.api.options) == null ? void 0 : _a2.pwaSettings) == null ? void 0 : _b.dismissExpiry) === 0) localStorage.removeItem(`${this.api.options.name}:pwa`);
-      let dismissedDate = localStorage.getItem(`${this.api.options.name}:pwa`);
-      if (dismissedDate) dismissedDate = JSON.parse(dismissedDate);
-      if (!!dismissedDate && Date.now() > dismissedDate + ((_d = (_c = this.api.options) == null ? void 0 : _c.pwaSettings) == null ? void 0 : _d.dismissExpiry) * 6e4 * 60 * 24) return;
-      this.prompt();
-    }, this.api.options.pwaSettings.timeout);
+    if (!((_a = this.api.options.pwaSettings) == null ? void 0 : _a.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;
+      setTimeout(() => {
+        var _a2, _b, _c, _d;
+        const raw = localStorage.getItem(storageKey);
+        if (raw === "installed") return;
+        if (((_b = (_a2 = this.api.options) == null ? void 0 : _a2.pwaSettings) == null ? void 0 : _b.dismissExpiry) === 0) {
+          if (raw !== "installed") localStorage.removeItem(storageKey);
+        }
+        const dismissedAt = raw ? Number(raw) : 0;
+        const expiryDays = Number(((_d = (_c = this.api.options) == null ? void 0 : _c.pwaSettings) == null ? void 0 : _d.dismissExpiry) ?? 0);
+        if (dismissedAt && expiryDays > 0) {
+          const expiryMs = expiryDays * 24 * 60 * 60 * 1e3;
+          if (Date.now() < dismissedAt + expiryMs) return;
+        }
+        this.prompt();
+      }, timeoutMs);
+    }
   }
   /** Prompt user to install the app */
   async prompt(platform) {
     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 targetPlatform = platform || this.platform;
     const isAndroid = targetPlatform == "android";
@@ -2580,7 +2600,7 @@ class PWA {
     prompt.classList.add("pwa-prompt");
     prompt.innerHTML = `
 			<div class="pwa-prompt-header">
-				<img src="https://datalynk-client.scarborough.auxilium.world/logo.png" alt="Logo" />
+				<img src="https://datalynk-client.primary.auxilium.world/logo.png" alt="Logo" />
 				<h1>Install ${this.api.options.name}</h1>
 				<button class="pwa-prompt-close">&times;</button>
 			</div>
@@ -2597,7 +2617,7 @@ 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(`${this.api.options.name}:pwa`, Date.now().toString()) : localStorage.removeItem(`${this.api.options.name}:pwa`);
+      !!((_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);
@@ -3712,7 +3732,7 @@ class Superuser {
     } });
   }
 }
-const version = "1.3.13";
+const version = "1.3.15";
 class WebRtc {
   constructor(api) {
     __publicField(this, "ice");

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;IAiBzB,oBAAoB;IACd,KAAK,CAAC,QAAQ,GAAE,GAAQ;IAsE9B,qCAAqC;IAC/B,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,KAAK;CA8KzC"}
+{"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;IAiBzB,oBAAoB;IACd,KAAK,CAAC,QAAQ,GAAE,GAAQ;IAgG9B,qCAAqC;IAC/B,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,KAAK;CAkLzC"}

package/dist/service.worker.mjs

@@ -1,4 +1,4 @@
-import {Api} from 'https://datalynk-client.scarborough.auxilium.world/dist/index.mjs';
+import {Api} from 'https://datalynk-client.primary.auxilium.world/dist/index.mjs';
 
 let api = null;
 const CACHE_NAME = 'datalynk';

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