@azure-net/kit 1.2.6 → 1.2.7

package/dist/core/delivery/injectableDependencies/AsyncHelpers.d.ts

@@ -1,4 +1,4 @@
-import { createErrorParser, type AppError } from './ErrorHandler.js';
+import { type AppError, createErrorParser } from './ErrorHandler.js';
 export interface AsyncActionResponse<T, D = unknown, CustomErrorField = never> {
     success: boolean;
     response: T;
@@ -9,7 +9,7 @@ export declare const createAsyncHelpers: <Custom = unknown>(opts?: {
     parseError?: ReturnType<typeof createErrorParser<Custom>>;
 }) => {
     createAsyncAction: <Res = unknown, Req = unknown>(action: ActionOrThunk<Res>, args?: {
-        beforeSend?: (abort: () => void) => void | Promise<void>;
+        beforeSend?: (next: () => void, abort: () => void) => void | Promise<void>;
         onSuccess?: (result: AsyncActionResponse<Res, undefined, Custom>) => Promise<unknown> | unknown;
         onError?: (result: AsyncActionResponse<never, Req, Custom>) => Promise<unknown> | unknown;
         reject?: boolean;
@@ -20,7 +20,7 @@ export declare const createAsyncHelpers: <Custom = unknown>(opts?: {
         fallbackResponse?: Res;
     }) => Promise<AsyncActionResponse<Res, Req, Custom>>;
     createAsyncResource: <Res, Req_1 = unknown>(action: ActionOrThunk<Res>, args?: {
-        beforeSend?: (abort: () => void) => void | Promise<void>;
+        beforeSend?: (next: () => void, abort: () => void) => void | Promise<void>;
         onSuccess?: (result: Res) => Promise<unknown> | unknown;
         onError?: (error: AppError<Req_1, Custom>) => Promise<unknown> | unknown;
         reject?: boolean;

package/dist/core/delivery/injectableDependencies/AsyncHelpers.js

@@ -19,27 +19,28 @@ export const createAsyncHelpers = (opts) => {
             };
         }
         if (args?.beforeSend) {
-            let aborted = false;
-            await Promise.race([
-                Promise.resolve(args.beforeSend(() => {
-                    aborted = true;
-                })),
-                new Promise((_, reject) => {
-                    if (aborted)
-                        reject(new Error('Aborted in beforeSend'));
-                })
-            ]).catch((err) => {
+            const beforeSendResult = await new Promise((resolve) => {
+                const next = () => resolve('next');
+                const abort = () => resolve('abort');
+                Promise.resolve(args.beforeSend(next, abort)).catch((err) => {
+                    console.error('Error in beforeSend:', err);
+                    resolve('abort');
+                });
+            });
+            if (beforeSendResult === 'abort') {
                 const abortError = {
                     type: 'abort',
                     message: 'Aborted in beforeSend',
-                    original: err
+                    original: new Error('Aborted in beforeSend')
                 };
+                if (args?.reject)
+                    throw abortError;
                 return {
                     success: false,
                     error: abortError,
                     response: args?.fallbackResponse
                 };
-            });
+            }
         }
         try {
             const response = await Promise.resolve(typeof action === 'function' ? action() : action);
@@ -64,27 +65,25 @@ export const createAsyncHelpers = (opts) => {
             return args.fallbackResponse;
         }
         if (args?.beforeSend) {
-            let aborted = false;
-            await Promise.race([
-                Promise.resolve(args.beforeSend(() => {
-                    aborted = true;
-                })),
-                new Promise((_, reject) => {
-                    if (aborted)
-                        reject(new Error('Aborted in beforeSend'));
-                })
-            ]).catch((err) => {
-                const abortError = {
-                    type: 'abort',
-                    message: 'Aborted in beforeSend',
-                    original: err
-                };
-                return {
-                    success: false,
-                    error: abortError,
-                    response: args?.fallbackResponse
-                };
+            const beforeSendResult = await new Promise((resolve) => {
+                const next = () => resolve('next');
+                const abort = () => resolve('abort');
+                Promise.resolve(args.beforeSend(next, abort)).catch((err) => {
+                    console.error('Error in beforeSend:', err);
+                    // If beforeSend throws, treat it as abort
+                    resolve('abort');
+                });
             });
+            if (beforeSendResult === 'abort') {
+                if (args?.reject) {
+                    throw {
+                        type: 'abort',
+                        message: 'Aborted in beforeSend',
+                        original: new Error('Aborted in beforeSend')
+                    };
+                }
+                return args.fallbackResponse;
+            }
         }
         try {
             const response = await Promise.resolve(typeof action === 'function' ? action() : action);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-net/kit",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "files": [
     "dist",
     "!dist/**/*.test.*",