@txstate-mws/sveltekit-utils 1.2.7 → 1.2.9

package/dist/api.d.ts

@@ -47,6 +47,7 @@ export declare class APIBase {
         body?: any;
         query?: APIBaseQueryPayload;
         inlineValidation?: boolean;
+        keepalive?: boolean;
     }): Promise<ReturnType>;
     uploadWithProgress(path: string, formData: FormData, progress: APIBaseProgressFn): Promise<any>;
     get<ReturnType = any>(path: string, query?: APIBaseQueryPayload): Promise<ReturnType>;
@@ -109,8 +110,11 @@ export declare class APIBase {
          */
         progress?: APIBaseProgressFn;
     }): Promise<ReturnType>;
+    protected lastAnalyticsSent: number;
     protected analyticsQueue: InteractionEvent[];
+    protected analyticsTimer: ReturnType<typeof setTimeout> | undefined;
     recordInteraction(evt: Optional<InteractionEvent, 'screen'>): void;
+    sendBatchedAnalytics(): Promise<void>;
     /**
      * Due to the mechanics of sveltekit, this function cannot be fully automatic and must
      * be called in your global +layout.svelte

package/dist/api.js

@@ -76,6 +76,13 @@ export class APIBase {
         else {
             this.token ??= sessionStorage.getItem('token') ?? undefined;
         }
+        if (typeof document !== 'undefined') {
+            document.addEventListener("visibilitychange", () => {
+                if (document.visibilityState === "hidden") {
+                    this.sendBatchedAnalytics().catch(console.error);
+                }
+            });
+        }
         this.ready();
     }
     stringifyQuery(query) {
@@ -95,6 +102,7 @@ export class APIBase {
         try {
             const resp = await this.fetch(this.apiBase + path + this.stringifyQuery(opts?.query), {
                 method,
+                keepalive: opts?.keepalive,
                 headers: {
                     Authorization: `Bearer ${this.token ?? ''}`,
                     Accept: 'application/json',
@@ -261,16 +269,28 @@ export class APIBase {
         }
         return gqlresponse.data;
     }
+    lastAnalyticsSent = new Date().getTime();
     analyticsQueue = [];
+    analyticsTimer;
     recordInteraction(evt) {
         evt.screen ??= get(page).route.id;
         this.analyticsQueue.push(evt);
-        setTimeout(() => {
-            const events = [...this.analyticsQueue];
-            this.analyticsQueue.length = 0;
-            if (events.length)
-                this.post('/analytics', events).catch((e) => console.error(e));
-        }, 2000);
+        clearTimeout(this.analyticsTimer);
+        // If the last analytics was sent more than 2 seconds ago, send immediately
+        if (new Date().getTime() - this.lastAnalyticsSent > 2000)
+            this.sendBatchedAnalytics().catch(console.error);
+        // Otherwise, collect more analytics for up to 2 seconds
+        else
+            this.analyticsTimer = setTimeout(() => this.sendBatchedAnalytics().catch(console.error), 2000);
+    }
+    async sendBatchedAnalytics() {
+        const events = [...this.analyticsQueue];
+        this.analyticsQueue.length = 0;
+        if (events.length) {
+            this.lastAnalyticsSent = new Date().getTime();
+            // keepalive true means the request will not be cancelled even if the user navigates away
+            await this.request('/analytics', 'POST', { body: events, keepalive: true });
+        }
     }
     /**
      * Due to the mechanics of sveltekit, this function cannot be fully automatic and must

package/dist/unifiedauth.js

@@ -33,7 +33,7 @@ export const unifiedAuth = {
         if (isBlank(api.token))
             return;
         const authRedirect = new URL(api.authRedirect);
-        authRedirect.pathname = '/logout';
+        authRedirect.pathname = [...authRedirect.pathname.split('/').slice(0, -1), 'logout'].join('/');
         authRedirect.searchParams.set('unifiedJwt', api.token);
         api.token = undefined;
         sessionStorage.removeItem('token');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@txstate-mws/sveltekit-utils",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "Shared library for code that is specifically tied to sveltekit in addition to svelte.",
   "type": "module",
   "exports": {