mentie 0.2.28 → 0.2.30

package/modules/cache.js

@@ -36,14 +36,15 @@ export function cache( key, value ) {
  * Function to inspect concurrency.
  * 
  * @param {Function} logger - The logger function.
+ * @param {string} key_prefix - The key for the concurrency value, used to tag the logging
  * @returns {number} - The concurrency value.
  */
-export function concurrency( logger ) {
+export function concurrency( logger, key_prefix ) {
 
     // Get the concurrency key
     let key = cache( `concurrency_key` )
     if( !key ) {
-        cache( `concurrency_key`, Date.now() )
+        cache( `concurrency_key`, `${ key_prefix }_${ Date.now() }` )
         key = cache( `concurrency_key` )
     }
 

package/modules/promises.js

@@ -100,4 +100,29 @@ export async function throttle_and_retry( async_function_array = [], { max_paral
     logger( `Starting queue of ${ async_function_array.length } functions with options: `, throttle_config )
     return Throttle.all( retryable_async_functions, throttle_config )
 
+}
+
+/**
+ * A function that adds a timeout to a promise.
+ *
+ * @param {Promise} promise - The promise to add a timeout to.
+ * @param {number} [timeout_in_ms=60000] - The timeout duration in milliseconds. Default is 60000ms (1 minute).
+ * @param {boolean} [throw_on_timeout=true] - Whether to throw an error on timeout. Default is true.
+ * @returns {Promise} - A promise that resolves with the result of the original promise or a timeout message.
+ */
+export async function promise_timeout( promise, timeout_in_ms=60_000, throw_on_timeout=true ) {
+
+    // Timeout finction
+    const timeout = () => new Promise( ( res, rej ) => setTimeout( throw_on_timeout ? rej : () => res( 'timed out' ), timeout_in_ms ) )
+
+    // Race the promise against the timeout
+    return Promise.race( [
+
+        // If the promise resolves first, return the result (including throwsing on error)
+        promise,
+
+        // If this resolves first, this function throws or returns a timeout message
+        timeout()
+    ] )
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mentie",
-  "version": "0.2.28",
+  "version": "0.2.30",
   "description": "Mentor's toolbelt",
   "type": "module",
   "main": "index.js",