@v1nt1248/3nclient-lib 0.3.15 → 0.3.16

package/dist/ui3n-utils.js

@@ -4199,30 +4199,29 @@ var Me = class extends Error {
 	}
 };
 async function J(e) {
-	let { fn: t, fnArgs: n, defaultValue: r, doesErrorPropagateStop: i = !1, timeoutValue: a = 5e3, retryCount: o = 0, retryDelay: s = 1e3, errorText: c = "An error occurred while executing the function.", actionIfError: l, actionIfSuccess: u, actionInFinally: d } = e, f, p = o + 1;
-	for (let e = 1; e <= p; e++) {
-		let r = new AbortController(), { signal: i } = r, o = null;
+	let { fn: t, fnArgs: n, passSignal: r = !1, defaultValue: i, doesErrorPropagateStop: a = !1, timeoutValue: o = 5e3, retryCount: s = 0, retryDelay: c = 1e3, errorText: l = "An error occurred while executing the function.", actionIfError: u, actionIfSuccess: d, actionInFinally: f } = e, p = n, m = s + 1, h;
+	for (let e = 1; e <= m; e++) {
+		let n = new AbortController(), i = null;
 		try {
-			let s = new Promise((t, i) => {
-				a <= 0 || (o = setTimeout(() => {
-					r.abort(), i(new Me(`Attempt ${e}/${p} timed out.`, {
+			let a = (async () => r ? t(n.signal, ...p) : t(...p))(), s = new Promise((t, r) => {
+				o > 0 && (i = setTimeout(() => {
+					n.abort(), r(new Me(`Attempt ${e}/${m} timed out.`, {
 						cause: "timeout",
-						fnArgs: n
+						fnArgs: p
 					}));
-				}, a));
-			}), c = n, l = t.length > c.length ? t(i, ...c) : t(...c), d = await Promise.race([Promise.resolve(l), s]);
-			return u?.(), o && clearTimeout(o), d;
+				}, o));
+			}), c = await Promise.race([a, s]);
+			return i && clearTimeout(i), d?.(), f?.(), c;
 		} catch (t) {
-			if (o && clearTimeout(o), f = t, e === p) break;
-			console.warn(`Attempt ${e} failed. Retrying in ${s}ms...`, t), s > 0 && await b(s);
+			i && clearTimeout(i), h = t, e < m && (console.warn(`[executeFunc] Attempt ${e} failed. Retrying in ${c}ms...`, t), c > 0 && await b(c));
 		}
 	}
-	let m = f instanceof Me && f.cause === "timeout", h = f.name === "AbortError" || f.name === "CanceledError", g = m ? f : new Me(h ? "Operation aborted" : c, {
-		cause: f,
-		fnArgs: n
+	let g = h instanceof Me && h.cause === "timeout", _ = h?.name === "AbortError" || h?.name === "CanceledError", v = g ? h : new Me(_ ? "Operation aborted" : l, {
+		cause: h,
+		fnArgs: p
 	});
-	if (console.error(`All ${p} attempts failed.`, g), l?.(g), !i) throw g;
-	return d?.(), r;
+	if (console.error(`[executeFunc] All ${m} attempts failed.`, v), u?.(v), f?.(), !a) throw v;
+	return i;
 }
 //#endregion
 //#region src/utils/remove-whitespace-in-string.ts
@@ -7248,4 +7247,4 @@ function jt(e) {
 	return e.replace(/[A-Z]/g, (e) => `_${e.toLowerCase()}`);
 }
 //#endregion
-export { g as DIALOGS_KEY, Me as ExecuteFunctionError, _ as NOTIFICATIONS_KEY, T as NamedProcs, Et as SQLiteOn3NStorage, w as SingleCyclicProc, x as SingleProc, O as TaskRunner, v as VUEBUS_KEY, lt as b64ToBlob, ut as blobFromDataURL, ct as blobToB64, qe as capitalize, je as copyToClipboard, pt as createVideoThumbnail, y as defer, h as emoticons, J as executeFunc, ft as fileToUint8Array, Ye as formatFileSize, Be as generateColor, ke as getDeliveryErrors, G as getFileExtension, A as getRandomId, ze as hasSlotContent, He as html2text, Ve as invertColor, st as isFileArchive, it as isFileAudio, Qe as isFileImage, tt as isFileVideo, m as mailReg, C as makeSyncedFunc, Re as markSearch, K as mimeTypes, ne as patchTextareaMaxRowsSupport, Ke as prepareDateAsSting, Ne as removeWhitespaceInString, dt as resizeImage, k as round, D as schedulerYield, Fe as selectAll, Le as selectEnd, Ie as selectStart, b as sleep, q as transformFileToWeb3NFile, Ae as transformWeb3nFileToFile, ht as tryOnScopeDispose, X as uint8ToDataURL, mt as unrefElement };
+export { g as DIALOGS_KEY, _ as NOTIFICATIONS_KEY, T as NamedProcs, Et as SQLiteOn3NStorage, w as SingleCyclicProc, x as SingleProc, O as TaskRunner, v as VUEBUS_KEY, lt as b64ToBlob, ut as blobFromDataURL, ct as blobToB64, qe as capitalize, je as copyToClipboard, pt as createVideoThumbnail, y as defer, h as emoticons, J as executeFunc, ft as fileToUint8Array, Ye as formatFileSize, Be as generateColor, ke as getDeliveryErrors, G as getFileExtension, A as getRandomId, ze as hasSlotContent, He as html2text, Ve as invertColor, st as isFileArchive, it as isFileAudio, Qe as isFileImage, tt as isFileVideo, m as mailReg, C as makeSyncedFunc, Re as markSearch, K as mimeTypes, ne as patchTextareaMaxRowsSupport, Ke as prepareDateAsSting, Ne as removeWhitespaceInString, dt as resizeImage, k as round, D as schedulerYield, Fe as selectAll, Le as selectEnd, Ie as selectStart, b as sleep, q as transformFileToWeb3NFile, Ae as transformWeb3nFileToFile, ht as tryOnScopeDispose, X as uint8ToDataURL, mt as unrefElement };

package/dist/utils/execute-function.d.ts

@@ -1,7 +1,8 @@
-export type ExtractArgs<F> = F extends (signal: AbortSignal, ...args: infer P) => any ? P : F extends (...args: infer P) => any ? P : never;
-export interface ExecuteFnBaseProps<F extends (...args: any[]) => any, V> {
+type ExtractArgs<F> = F extends (signal: AbortSignal, ...args: infer P) => any ? P : F extends (...args: infer P) => any ? P : never;
+interface BaseProps<F extends (...args: any[]) => any, V> {
     fn: F;
     fnArgs: ExtractArgs<F>;
+    passSignal?: boolean;
     timeoutValue?: number;
     retryCount?: number;
     retryDelay?: number;
@@ -10,20 +11,14 @@ export interface ExecuteFnBaseProps<F extends (...args: any[]) => any, V> {
     actionIfSuccess?: () => void;
     actionInFinally?: () => void;
 }
-export interface ExecuteFunctionPropsNoCatchError<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> extends ExecuteFnBaseProps<F, V> {
+interface ExecuteFunctionPropsNoCatchError<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> extends BaseProps<F, V> {
     doesErrorPropagateStop: true;
     defaultValue: V;
 }
-export interface ExecuteFunctionPropsCatchError<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> extends ExecuteFnBaseProps<F, V> {
+interface ExecuteFunctionPropsCatchError<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> extends BaseProps<F, V> {
     doesErrorPropagateStop?: false;
     defaultValue?: undefined;
 }
-export type ExecuteFunctionProps<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> = ExecuteFunctionPropsCatchError<F, V> | ExecuteFunctionPropsNoCatchError<F, V>;
-export declare class ExecuteFunctionError extends Error {
-    cause: unknown;
-    constructor(message: string, data?: {
-        cause?: unknown;
-        fnArgs?: unknown[];
-    });
-}
+type ExecuteFunctionProps<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> = ExecuteFunctionPropsCatchError<F, V> | ExecuteFunctionPropsNoCatchError<F, V>;
 export declare function executeFunc<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>>(props: ExecuteFunctionProps<F, V>): Promise<V>;
+export {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "@v1nt1248/3nclient-lib",
   "license": "AGPL-3.0-or-later",
   "author": "v1nt1248",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "description": "Library for 3NWeb clients",
   "type": "module",
   "files": [