@auxilium/datalynk-client 1.5.2 → 1.6.1

package/dist/service.worker.mjs

@@ -2,8 +2,80 @@ import {Api} from 'https://datalynk-client.primary.auxilium.world/dist/index.mjs
 
 let api = null;
 const CACHE_NAME = 'datalynk';
+const STATE_CACHE = 'datalynk-app-state';
 let ONLINE = true;
 const netChan = 'BroadcastChannel' in self ? new BroadcastChannel('sw-net') : null;
+let updateQueue = Promise.resolve();
+
+function safeAsset(url) {
+	return ['http:', 'https:'].includes(url.protocol)
+		&& !/\/(api|login|logout|settings)(\/|$)/i.test(url.pathname)
+		&& ![...url.searchParams.keys()].some(key => /token|auth|secret|key|session|password/i.test(key));
+}
+
+async function activeCacheName() {
+	const state = await caches.open(STATE_CACHE);
+	const response = await state.match(self.location.origin + '/datalynk-app-active');
+	return response ? response.text() : CACHE_NAME;
+}
+
+async function activeCache() {
+	return caches.open(await activeCacheName());
+}
+
+function updateAppAssets(values) {
+	updateQueue = updateQueue.catch(() => {}).then(async () => {
+		const urls = [...new Set(values.map(value => {
+			try {
+				const url = new URL(value, self.location.origin);
+				url.hash = '';
+				return safeAsset(url) && (url.origin === self.location.origin
+					|| !/\.(?:png|jpe?g|gif|webp|svg)(?:$|\?)/i.test(url.href)) ? url.href : null;
+			} catch { return null; }
+		}).filter(Boolean))];
+		if(!urls.length) return;
+		const previousName = await activeCacheName();
+		const nextName = 'datalynk-app-' + Date.now() + '-' + Math.random().toString(36).slice(2);
+		const previous = await caches.open(previousName);
+		const next = await caches.open(nextName);
+		try {
+			for(const request of await previous.keys()) {
+				if(new URL(request.url).pathname === new URL(urls[0]).pathname
+					&& new URL(request.url).origin === new URL(urls[0]).origin) continue;
+				const saved = await previous.match(request);
+				if(saved && safeAsset(new URL(request.url))) await next.put(request, saved);
+			}
+			for(const url of urls) {
+				const response = await fetch(url, {mode: new URL(url).origin === self.location.origin ? 'same-origin' : 'no-cors'});
+				if((!response.ok && response.type !== 'opaque') || response.headers.has('set-cookie')
+					|| /private|no-store/i.test(response.headers.get('cache-control') || '')
+					|| (/\.json$/i.test(new URL(url).pathname) && !/\bpublic\b/i.test(response.headers.get('cache-control') || ''))
+					|| (/\.(?:m?js|css)(?:$|\?)/i.test(url) && /text\/html/i.test(response.headers.get('content-type') || '')))
+					throw new Error('Offline app update incomplete: ' + url);
+				if(response.type === 'opaque' && await previous.match(url)) continue;
+				await next.put(url, response);
+			}
+			for(const request of await previous.keys()) {
+				if(new URL(request.url).pathname === new URL(urls[0]).pathname
+					&& new URL(request.url).origin === new URL(urls[0]).origin) continue;
+				if(await next.match(request)) continue;
+				const saved = await previous.match(request);
+				if(saved && safeAsset(new URL(request.url))) await next.put(request, saved);
+			}
+			const state = await caches.open(STATE_CACHE);
+			await state.put(self.location.origin + '/datalynk-app-active', new Response(nextName));
+		} catch(error) {
+			await caches.delete(nextName);
+			console.warn(error);
+			return;
+		}
+		if(previousName !== nextName) {
+			try { await caches.delete(previousName); }
+			catch(error) { console.warn('Unable to remove previous app cache', error); }
+		}
+	});
+	return updateQueue;
+}
 
 function broadcastStatus(online) {
 	if(ONLINE === online) return;
@@ -40,7 +112,17 @@ self.addEventListener('activate', (event) => {
 	event.waitUntil((async () => {
 		await self.clients.claim();
 
+		const appCache = await activeCache();
+		for(const request of await appCache.keys())
+			if(!safeAsset(new URL(request.url))
+				|| (/\.json$/i.test(new URL(request.url).pathname)
+					&& !/\bpublic\b/i.test((await appCache.match(request))?.headers.get('cache-control') || '')))
+				await appCache.delete(request);
+
 		const keys = await caches.keys();
+		const activeName = await activeCacheName();
+		await Promise.all(keys.filter(k => k.startsWith('datalynk-app-')
+			&& k !== STATE_CACHE && k !== activeName).map(k => caches.delete(k)));
 		await Promise.all(
 			keys.filter((k) => k.startsWith('app-cache-') && k !== CACHE_NAME)
 				.map((k) => caches.delete(k))
@@ -76,32 +158,45 @@ self.addEventListener('fetch', (event) => {
 	}
 
 	event.respondWith((async () => {
-		const cache = await caches.open(CACHE_NAME);
-		if(!ONLINE) {
-			const cachedEarly = await cache.match(request);
-			if(cachedEarly) return cachedEarly;
-		}
-
+		const cache = await activeCache();
+		const url = new URL(request.url);
+		const appFile = request.mode === 'navigate' || ['script', 'style', 'image', 'font', 'worker'].includes(request.destination);
+		const staticJson = url.origin === self.location.origin && /\.json$/i.test(url.pathname) && !request.destination;
+		const cacheable = (appFile || staticJson) && safeAsset(url) && !request.headers.has('authorization')
+			&& !request.headers.has('range') && (url.origin === self.location.origin || request.destination !== 'image');
 		try {
 			const networkResponse = await fetch(request);
 			broadcastStatus(true);
-			if(networkResponse.status === 404) { // purge stale
-				await cache.delete(request);
-				return networkResponse;
+			if((networkResponse.status === 404 || networkResponse.status >= 500) && cacheable) {
+				const cached = await (await activeCache()).match(request, {ignoreSearch: request.mode === 'navigate'});
+				if(cached) { broadcastStatus(false); return cached; }
 			}
 			const isCacheable = networkResponse.ok || networkResponse.type === 'opaque';
-			if(isCacheable) {
+			const saved = cacheable && await cache.match(request, {ignoreSearch: request.mode === 'navigate'});
+			if(isCacheable && cacheable && (networkResponse.ok || !saved)
+			&& (!staticJson || /\bpublic\b/i.test(networkResponse.headers.get('cache-control') || ''))
+							&& !networkResponse.headers.has('set-cookie')
+			&& !/private|no-store/i.test(networkResponse.headers.get('cache-control') || '')
+			&& !(/\.(?:m?js|css)(?:$|\?)/i.test(url.href) && /text\/html/i.test(networkResponse.headers.get('content-type') || ''))) {
 				const isOpaqueNav = networkResponse.type === 'opaque' && request.mode === 'navigate';
 				if (!isOpaqueNav) {
-					event.waitUntil(cache.put(request, networkResponse.clone()));
+					event.waitUntil((async () => {
+						const current = await activeCache();
+						const key = request.mode === 'navigate' ? url.origin + url.pathname : request;
+						await current.put(key, networkResponse.clone());
+						if(request.mode === 'navigate')
+						for(const old of await current.keys())
+						if(old.url !== key && new URL(old.url).origin === url.origin && new URL(old.url).pathname === url.pathname)
+						await current.delete(old);
+					})());
 				}
 			}
 			return networkResponse;
 		} catch {
 			broadcastStatus(false);
-			const cached = await cache.match(request);
+			const cached = cacheable && await (await activeCache()).match(request, {ignoreSearch: request.mode === 'navigate'});
 			if(cached) return cached;
-			if(request.mode === 'navigate') {
+			if(cacheable && request.mode === 'navigate') {
 				const fallback = (await cache.match('/')) || (await cache.match('/index.html'));
 				if(fallback) return fallback;
 			}
@@ -116,6 +211,9 @@ self.addEventListener('fetch', (event) => {
 });
 
 self.addEventListener('message', async (event) => {
+	if(Array.isArray(event.data?.offlineAssets)) {
+		event.waitUntil(updateAppAssets(event.data.offlineAssets));
+	}
 	if(event.data?.options) { // 🔧 Update settings
 		api = new Api(event.data.options.url, { ...event.data.options, serviceWorker: false, replayOfflineQueue: false });
 		await setSettings(event.data.options);
@@ -128,6 +226,7 @@ self.addEventListener('message', async (event) => {
 		await setSettings({token});
 	}
 	if(event.data?.clearCache) { // 🧹 Clear cache
-		await caches.delete(CACHE_NAME);
+		await caches.delete(await activeCacheName());
+		await caches.delete(STATE_CACHE);
 	}
 });

package/dist/socket.d.ts

@@ -43,6 +43,10 @@ export type WebRTCEvent = {
 export type SocketOptions = {
     /** Set connection URL or disable with false */
     url?: string | false;
+    /** Use one-time socket tickets only when explicitly enabled by a chat-capable host. */
+    authentication?: 'token' | 'ticket';
+    /** Optional realm used by backward-compatible token authentication. */
+    realm?: string;
 };
 /** Callback shape */
 export type SocketListener<T = SocketEvent<any>> = (event: T) => any;
@@ -55,6 +59,7 @@ export declare class Socket {
     private listeners;
     private retry?;
     private socket?;
+    private connectGeneration;
     open: boolean;
     constructor(api: Api, options?: SocketOptions);
     /**
@@ -76,7 +81,14 @@ export declare class Socket {
      * Connect socket client to socket server
      * @param {number} timeout Retry to connect every x seconds
      */
-    connect(timeout?: number): void;
+    connect(timeout?: number): void | Promise<void>;
+    /**
+     * Ticket-authenticated connection path, used only once a chat-capable host switches
+     * this instance to `authentication: 'ticket'` (see Api.openChat). Entirely separate
+     * from the token path above so existing non-chat consumers are never affected.
+     */
+    private connectWithTicket;
+    private scheduleReconnect;
     /**
      * Send data to socket server
      *
@@ -91,5 +103,6 @@ export declare class Socket {
      * @return {Unsubscribe} Run returned function to unsubscribe callback
      */
     sliceEvents(slice: number | number[] | string | string[], callback: SocketListener<SocketEventSlice>): Unsubscribe;
+    private normalizeUrl;
 }
 //# sourceMappingURL=socket.d.ts.map

package/dist/socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,CAAA;CACP,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GACvC,CAAC;IAAC,SAAS,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,CAAA;CAAC,GAC7C;IAAC,YAAY,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,CAAA;CAAC,GAC/C;IAAC,KAAK,EAAE;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,yBAAyB,CAAA;KAAC,CAAA;CAAC,GACtF;IAAC,MAAM,EAAE;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,yBAAyB,CAAA;KAAC,CAAA;CAAC,CAAC,CAAC;AAE1F,yBAAyB;AACzB,MAAM,MAAM,aAAa,GAAG;IAC3B,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CACrB,CAAA;AAED,qBAAqB;AACrB,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC;AACrE,8CAA8C;AAC9C,MAAM,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAErC,iCAAiC;AACjC,qBAAa,MAAM;IAON,OAAO,CAAC,QAAQ,CAAC,GAAG;aAAuB,OAAO,EAAE,aAAa;IAN7E,OAAO,CAAC,SAAS,CAAoC;IACrD,OAAO,CAAC,KAAK,CAAC,CAAM;IACpB,OAAO,CAAC,MAAM,CAAC,CAAY;IAE3B,IAAI,UAAS;gBAEgB,GAAG,EAAE,GAAG,EAAkB,OAAO,GAAE,aAAkB;IAWlF;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,IAAI,GAAG,WAAW;IAOnE;;OAEG;IACH,KAAK;IASL;;;OAGG;IACH,OAAO,CAAC,OAAO,GAAE,MAAW;IAgC5B;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,GAAG;IAKjB;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,EAAE,cAAc,CAAC,gBAAgB,CAAC,GAAG,WAAW;CAUlH"}
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,CAAA;CACP,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GACvC,CAAC;IAAC,SAAS,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,CAAA;CAAC,GAC7C;IAAC,YAAY,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,CAAA;CAAC,GAC/C;IAAC,KAAK,EAAE;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,yBAAyB,CAAA;KAAC,CAAA;CAAC,GACtF;IAAC,MAAM,EAAE;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,yBAAyB,CAAA;KAAC,CAAA;CAAC,CAAC,CAAC;AAE1F,yBAAyB;AACzB,MAAM,MAAM,aAAa,GAAG;IAC3B,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACrB,uFAAuF;IACvF,cAAc,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IACpC,uEAAuE;IACvE,KAAK,CAAC,EAAE,MAAM,CAAC;CACf,CAAA;AAED,qBAAqB;AACrB,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC;AACrE,8CAA8C;AAC9C,MAAM,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAErC,iCAAiC;AACjC,qBAAa,MAAM;IAQN,OAAO,CAAC,QAAQ,CAAC,GAAG;aAAuB,OAAO,EAAE,aAAa;IAP7E,OAAO,CAAC,SAAS,CAAoC;IACrD,OAAO,CAAC,KAAK,CAAC,CAAM;IACpB,OAAO,CAAC,MAAM,CAAC,CAAY;IAC3B,OAAO,CAAC,iBAAiB,CAAK;IAE9B,IAAI,UAAS;gBAEgB,GAAG,EAAE,GAAG,EAAkB,OAAO,GAAE,aAAkB;IAWlF;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,IAAI,GAAG,WAAW;IAOnE;;OAEG;IACH,KAAK;IAUL;;;OAGG;IACH,OAAO,CAAC,OAAO,GAAE,MAAW;IAiC5B;;;;OAIG;YACW,iBAAiB;IA6D/B,OAAO,CAAC,iBAAiB;IASzB;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,GAAG;IAKjB;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,EAAE,cAAc,CAAC,gBAAgB,CAAC,GAAG,WAAW;IAWlH,OAAO,CAAC,YAAY;CAUpB"}

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.5.2",
+	"version": "1.6.1",
 	"author": "Auxilium Group <devops@auxiliumgroup.com>",
 	"private": false,
 	"main": "./dist/index.cjs",
@@ -13,13 +13,18 @@
 			"types": "./dist/index.d.ts",
 			"import": "./dist/index.mjs",
 			"require": "./dist/index.cjs"
+		},
+		"./chat": {
+			"types": "./dist/chat-entry.d.ts",
+			"import": "./dist/chat.mjs",
+			"require": "./dist/chat.cjs"
 		}
 	},
 	"bin": {
 		"datalynk-models": "./bin/datalynk-models.mjs"
 	},
 	"scripts": {
-		"build": "tsc && npx vite build",
+		"build": "tsc && npx vite build && npx vite build --config vite.chat.config.ts",
 		"postbuild": "node -e \"const fs=require('fs');fs.cpSync('src/service.worker.mjs','dist/service.worker.mjs')\"",
 		"test": "npm run build && node --test test/*.test.mjs",
 		"datalynk-models": "node --no-warnings ./bin/datalynk-models.mjs",