@lowentry/utils 1.13.4 → 1.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowentry/utils",
-  "version": "1.13.4",
+  "version": "1.14.1",
   "private": false,
   "type": "module",
   "main": "./index.js",

package/src/LeUtils.js

@@ -1091,7 +1091,7 @@ export const LeUtils = {
 			ms = FLOAT_LAX(ms);
 			
 			let lastTime = performance.now();
-			let handler = setTimeout(() =>
+			let handler = window.setTimeout(() =>
 			{
 				const currentTime = performance.now();
 				try
@@ -1111,7 +1111,7 @@ export const LeUtils = {
 					{
 						if(handler !== null)
 						{
-							clearTimeout(handler);
+							window.clearTimeout(handler);
 							handler = null;
 						}
 					},
@@ -1159,7 +1159,7 @@ export const LeUtils = {
 			}
 			
 			let lastTime = performance.now();
-			let handler = setInterval(() =>
+			let handler = window.setInterval(() =>
 			{
 				const currentTime = performance.now();
 				try
@@ -1179,7 +1179,7 @@ export const LeUtils = {
 					{
 						if(handler !== null)
 						{
-							clearInterval(handler);
+							window.clearInterval(handler);
 							handler = null;
 						}
 					},
@@ -1237,7 +1237,7 @@ export const LeUtils = {
 						return;
 					}
 					frames--;
-					requestAnimationFrameId = (typeof window === 'undefined') ? setTimeout(tick, 1000 / 60) : requestAnimationFrame(tick);
+					requestAnimationFrameId = window.requestAnimationFrame(tick);
 				}
 			};
 			tick();
@@ -1249,7 +1249,7 @@ export const LeUtils = {
 						run = false;
 						if(requestAnimationFrameId !== null)
 						{
-							(typeof window === 'undefined') ? clearTimeout(requestAnimationFrameId) : cancelAnimationFrame(requestAnimationFrameId);
+							window.cancelAnimationFrame(requestAnimationFrameId);
 							requestAnimationFrameId = null;
 						}
 					},
@@ -1322,11 +1322,11 @@ export const LeUtils = {
 					
 					if(run)
 					{
-						requestAnimationFrameId = (typeof window === 'undefined') ? setTimeout(tick, 1000 / 60) : requestAnimationFrame(tick);
+						requestAnimationFrameId = window.requestAnimationFrame(tick);
 					}
 				}
 			};
-			(typeof window === 'undefined') ? setTimeout(tick, 1000 / 60) : requestAnimationFrame(tick);
+			window.requestAnimationFrame(tick);
 			
 			return {
 				remove:
@@ -1335,7 +1335,7 @@ export const LeUtils = {
 						run = false;
 						if(requestAnimationFrameId !== null)
 						{
-							(typeof window === 'undefined') ? clearTimeout(requestAnimationFrameId) : cancelAnimationFrame(requestAnimationFrameId);
+							window.cancelAnimationFrame(requestAnimationFrameId);
 							requestAnimationFrameId = null;
 						}
 					},
@@ -1356,7 +1356,7 @@ export const LeUtils = {
 			{
 				return new Promise(resolve => resolve(undefined));
 			}
-			return new Promise(resolve => setTimeout(resolve, ms));
+			return new Promise(resolve => LeUtils.setTimeout(resolve, ms));
 		},
 	
 	/**
@@ -1380,7 +1380,7 @@ export const LeUtils = {
 	 * Allows you to do a fetch, with built-in retry and abort functionality.
 	 *
 	 * @param {string} url
-	 * @param {Object} [options]
+	 * @param {{[retries]:number|null, [delay]:number|((attempt:number)=>number)|null}|null} [options]
 	 * @returns {{then:Function, catch:Function, finally:Function, remove:Function, isRemoved:Function}}
 	 */
 	fetch:
@@ -1466,6 +1466,68 @@ export const LeUtils = {
 			return result;
 		},
 	
+	/**
+	 * Allows you to do a fetch, with built-in retry functionality. Caches on the requested URL, so that the same URL will not be fetched multiple times.
+	 *
+	 * @param {string} url
+	 * @param {{[retries]:number|null, [delay]:number|((attempt:number)=>number)|null, [verify]:((data:*, response:*)=>void)|null}|null} [options]
+	 * @param {((response:*) => *)|null} [responseFunction] A function that will be called with the response object, and should return the data to be cached.
+	 * @returns {Promise<*>}
+	 */
+	cachedFetch:
+		(() =>
+		{
+			const cache = new Map();
+			return async (url, options, responseFunction) =>
+			{
+				if(cache.has(url))
+				{
+					const result = cache.get(url);
+					if(result.data)
+					{
+						return result.data;
+					}
+					if(result.promise)
+					{
+						return await result.promise;
+					}
+					if(result.error)
+					{
+						throw result.error;
+					}
+					console.warn('Failed to use the cachedFetch cache, for URL: ', url, ', it is in an unexpected state: ', result);
+					return null;
+				}
+				
+				const promise = LeUtils.fetch(url, options)
+					.then(async response =>
+					{
+						const data = responseFunction ? (await responseFunction(response)) : response;
+						if(typeof options?.verify === 'function')
+						{
+							await options.verify(data, response);
+						}
+						return data;
+					})
+					.then(data =>
+					{
+						cache.set(url, {data});
+						return data;
+					})
+					.catch(error =>
+					{
+						cache.set(url, {error});
+						console.error('Failed to fetch: ', error);
+						throw error;
+					});
+				if(!cache.has(url))
+				{
+					cache.set(url, {promise});
+				}
+				return await promise;
+			};
+		})(),
+	
 	/**
 	 * Returns true if the user is on a smartphone device (mobile).
 	 * Will return false if the user is on a tablet or on a desktop.
@@ -1812,7 +1874,7 @@ export const LeUtils = {
 		(() =>
 		{
 			let previousUniqueIdsTime = null;
-			let previousUniqueIds = {};
+			let previousUniqueIds = new Map();
 			
 			const numberToBytes = (number) =>
 			{
@@ -1896,12 +1958,13 @@ export const LeUtils = {
 					if(previousUniqueIdsTime !== result.time)
 					{
 						previousUniqueIdsTime = result.time;
-						previousUniqueIds = {[result.id]:true};
+						previousUniqueIds.clear();
+						previousUniqueIds.set(result.id, true);
 						return result.id;
 					}
-					else if(previousUniqueIds[result.id] !== true)
+					else if(previousUniqueIds.get(result.id) !== true)
 					{
-						previousUniqueIds[result.id] = true;
+						previousUniqueIds.set(result.id, true);
 						return result.id;
 					}
 				}
@@ -3146,16 +3209,16 @@ export const LeUtils = {
 			}
 			
 			const worker = new Worker('/workers/' + name + '.worker.js');
-			let listeners = {};
+			let listeners = new Map();
 			
 			const addListener = (id, callback) =>
 			{
-				listeners[id] = callback;
+				listeners.set(id, callback);
 			};
 			
 			const removeListener = (id) =>
 			{
-				delete listeners[id];
+				listeners.delete(id);
 			};
 			
 			const sendMessage = (data, options) =>
@@ -3186,7 +3249,7 @@ export const LeUtils = {
 				const data = message.data;
 				if(data?.id)
 				{
-					const callback = listeners[data.id];
+					const callback = listeners.get(data.id);
 					if(callback)
 					{
 						removeListener(data.id);
@@ -3211,14 +3274,14 @@ export const LeUtils = {
 	sendWorkerMessage:
 		(() =>
 		{
-			const workers = {};
+			const workers = new Map();
 			return (workerName, data, options) =>
 			{
-				if(!workers[workerName])
+				if(!workers.has(workerName))
 				{
-					workers[workerName] = LeUtils.createWorkerThread(workerName);
+					workers.set(workerName, LeUtils.createWorkerThread(workerName));
 				}
-				return workers[workerName].sendMessage(data, options);
+				return workers.get(workerName).sendMessage(data, options);
 			};
 		})(),