@bleedingdev/modern-js-create-request 3.8.3-ultramodern.1 → 3.8.3-ultramodern.3

package/dist/cjs/requestFactory.js

@@ -81,8 +81,9 @@ const createRequestFactory = (environment)=>{
         const protectedIdentityHeaders = (identityBinding?.protectedHeaders || external_types_js_namespaceObject.BFF_DEFAULT_PROTECTED_IDENTITY_HEADERS).map((header)=>header.toLowerCase());
         const targetAllowedHeaders = realAllowedHeaders.get(requestId) || [];
         const forwardedHeaders = {};
-        if (isServerTarget) {
-            for (const key of targetAllowedHeaders)if (void 0 !== incomingHeaders[key]) forwardedHeaders[key] = incomingHeaders[key];
+        if (isServerTarget) for (const key of targetAllowedHeaders){
+            const incomingValue = (0, external_policyCore_js_namespaceObject.readHeader)(incomingHeaders, key);
+            if (void 0 !== incomingValue) (0, external_policyCore_js_namespaceObject.writeHeader)(forwardedHeaders, key, incomingValue);
         }
         if (identityBindingEnabled) {
             const derivedIdentityHeaders = {};
@@ -134,21 +135,19 @@ const createRequestFactory = (environment)=>{
                         ...forwardedHeaders
                     }
                 });
-                if (resolvedHeaders && 'object' == typeof resolvedHeaders) {
-                    for (const key of targetAllowedHeaders)if (void 0 !== resolvedHeaders[key]) {
+                if (resolvedHeaders && 'object' == typeof resolvedHeaders) for (const key of targetAllowedHeaders){
+                    const resolvedValue = (0, external_policyCore_js_namespaceObject.readHeader)(resolvedHeaders, key);
+                    if (void 0 !== resolvedValue) {
                         if (identityBindingEnabled && protectedIdentityHeaders.includes(key.toLowerCase())) {
-                            (0, external_policyCore_js_namespaceObject.writeHeader)(forwardedHeaders, key.toLowerCase(), resolvedHeaders[key]);
+                            (0, external_policyCore_js_namespaceObject.writeHeader)(forwardedHeaders, key.toLowerCase(), resolvedValue);
                             continue;
                         }
-                        forwardedHeaders[key] = resolvedHeaders[key];
+                        (0, external_policyCore_js_namespaceObject.writeHeader)(forwardedHeaders, key, resolvedValue);
                     }
                 }
             }
         }
-        if (isServerTarget) return {
-            ...headers,
-            ...forwardedHeaders
-        };
+        if (isServerTarget) for (const [header, value] of Object.entries(forwardedHeaders))(0, external_policyCore_js_namespaceObject.writeHeader)(headers, header, value);
         return headers;
     };
     const configure = (options)=>{
@@ -157,6 +156,21 @@ const createRequestFactory = (environment)=>{
         if ('default' !== requestId && !setDomain && !hasExistingDomain) throw new external_policyCore_js_namespaceObject.ProducerDomainNotConfiguredError(requestId);
         let configuredRequest = request || environment.originFetch;
         if (interceptor && !request) configuredRequest = interceptor(environment.getFetch());
+        let resolvedDomain;
+        if (setDomain) {
+            resolvedDomain = setDomain({
+                target: environment.target,
+                requestId
+            });
+            if ('default' !== requestId && (0, external_policyCore_js_namespaceObject.isEmptyDomain)(resolvedDomain)) throw new external_policyCore_js_namespaceObject.ProducerDomainNotConfiguredError(requestId);
+        }
+        realAllowedHeaders.delete(requestId);
+        realResolveHeaders.delete(requestId);
+        realTransportResilience.delete(requestId);
+        realIdentityBinding.delete(requestId);
+        realOperationContract.delete(requestId);
+        realRequireEnvelope.delete(requestId);
+        realAllowCrossOriginEnvelope.delete(requestId);
         if (Array.isArray(allowedHeaders)) realAllowedHeaders.set(requestId, allowedHeaders);
         if (isServerTarget && 'function' == typeof resolveHeaders) realResolveHeaders.set(requestId, resolveHeaders);
         if (transport && 'object' == typeof transport) realTransportResilience.set(requestId, transport);
@@ -164,14 +178,7 @@ const createRequestFactory = (environment)=>{
         if (operationContract && 'object' == typeof operationContract) realOperationContract.set(requestId, operationContract);
         if ('boolean' == typeof requireEnvelope) realRequireEnvelope.set(requestId, requireEnvelope);
         if ('boolean' == typeof allowCrossOriginEnvelope || 'function' == typeof allowCrossOriginEnvelope) realAllowCrossOriginEnvelope.set(requestId, allowCrossOriginEnvelope);
-        if (setDomain) {
-            const resolvedDomain = setDomain({
-                target: environment.target,
-                requestId
-            });
-            if ('default' !== requestId && (0, external_policyCore_js_namespaceObject.isEmptyDomain)(resolvedDomain)) throw new external_policyCore_js_namespaceObject.ProducerDomainNotConfiguredError(requestId);
-            if ('string' == typeof resolvedDomain) domainMap.set(requestId, resolvedDomain);
-        }
+        if ('string' == typeof resolvedDomain) domainMap.set(requestId, resolvedDomain);
         realRequest.set(requestId, configuredRequest);
     };
     const createRequest = (...args)=>{
@@ -208,6 +215,7 @@ const createRequestFactory = (environment)=>{
                 headers = {
                     'Content-Type': 'application/json'
                 };
+                headers = applyIdentityAndForwardedHeaders(headers, requestId, incomingHeaders);
             } else {
                 const payload = 'object' == typeof senderArgs[senderArgs.length - 1] ? senderArgs[senderArgs.length - 1] : {};
                 payload.params = payload.params || {};
@@ -282,7 +290,7 @@ const createRequestFactory = (environment)=>{
         const sender = (...args)=>{
             const fetcher = (0, external_policyCore_js_namespaceObject.resolveConfiguredRequest)(realRequest, requestId, environment.originFetch);
             const { body, headers: uploadHeaders, params } = (0, external_utiles_js_namespaceObject.getUploadPayload)(args);
-            const headers = {
+            let headers = {
                 ...uploadHeaders
             };
             const finalPath = getUploadPath ? getUploadPath(params) : path;
@@ -293,12 +301,21 @@ const createRequestFactory = (environment)=>{
                 path: finalPath
             });
             const incomingHeaders = environment.readIncomingHeaders();
+            headers = applyIdentityAndForwardedHeaders(headers, requestId, incomingHeaders);
             attachEnvelopeHeaderIfRequired(headers, requestId, finalURL, incomingHeaders);
             attachSecuredOperationHeaders(headers, requestId, 'POST', path, operationContext);
-            return fetcher(finalURL, {
+            return (0, external_transport_js_namespaceObject.executeWithResilience)({
+                requestId,
+                target: environment.target,
                 method: 'POST',
-                body,
-                headers
+                url: finalURL,
+                init: {
+                    method: 'POST',
+                    body,
+                    headers
+                },
+                fetcher: fetcher,
+                transport: realTransportResilience.get(requestId)
             });
         };
         return sender;

package/dist/cjs/transport.js

@@ -52,9 +52,12 @@ const createTimeoutError = (timeoutMs)=>{
     error.name = 'TimeoutError';
     return error;
 };
+const unrefTimer = (timer)=>{
+    if ('object' == typeof timer && null !== timer && 'unref' in timer && 'function' == typeof timer.unref) timer.unref();
+};
 const wait = (ms)=>new Promise((resolve)=>{
         const timer = setTimeout(()=>resolve(), ms);
-        if ('function' == typeof timer.unref) timer.unref();
+        unrefTimer(timer);
     });
 const toStatusCode = (error)=>{
     if (!error || 'object' != typeof error) return;
@@ -121,7 +124,7 @@ const withTimeout = async (promise, timeoutMs, signalBuilder)=>{
         if (controller) controller.abort();
         rejectTimeout?.(createTimeoutError(timeoutMs));
     }, timeoutMs);
-    if ('function' == typeof timer.unref) timer.unref();
+    unrefTimer(timer);
     try {
         const result = await Promise.race([
             promise,
@@ -149,9 +152,14 @@ const executeWithResilience = async ({ requestId, target, method, url, init, fet
         const canUseAbortController = "u" > typeof AbortController;
         let controller;
         if (timeoutMs && canUseAbortController) controller = new AbortController();
-        const nextInit = controller && !init.signal ? {
+        const callerSignal = init.signal;
+        const requestSignal = controller ? callerSignal && !callerSignal.aborted ? AbortSignal.any([
+            callerSignal,
+            controller.signal
+        ]) : callerSignal || controller.signal : callerSignal;
+        const nextInit = requestSignal ? {
             ...init,
-            signal: controller.signal
+            signal: requestSignal
         } : init;
         try {
             const { result } = await withTimeout(fetcher(url, nextInit), timeoutMs, ()=>controller);

package/dist/cjs/utiles.js

@@ -32,7 +32,7 @@ const getUploadPayload = (args)=>{
     const files = payload.files;
     if (!files) throw new Error('no files');
     const formdata = new FormData();
-    for (const [key, value] of Object.entries(files))if (value instanceof FileList) for(let i = 0; i < value.length; i++){
+    for (const [key, value] of Object.entries(files))if ("u" > typeof FileList && value instanceof FileList) for(let i = 0; i < value.length; i++){
         const file = value.item(i);
         if (file) formdata.append(key, file);
     }

package/dist/esm/requestFactory.mjs

@@ -49,8 +49,9 @@ const createRequestFactory = (environment)=>{
         const protectedIdentityHeaders = (identityBinding?.protectedHeaders || BFF_DEFAULT_PROTECTED_IDENTITY_HEADERS).map((header)=>header.toLowerCase());
         const targetAllowedHeaders = realAllowedHeaders.get(requestId) || [];
         const forwardedHeaders = {};
-        if (isServerTarget) {
-            for (const key of targetAllowedHeaders)if (void 0 !== incomingHeaders[key]) forwardedHeaders[key] = incomingHeaders[key];
+        if (isServerTarget) for (const key of targetAllowedHeaders){
+            const incomingValue = readHeader(incomingHeaders, key);
+            if (void 0 !== incomingValue) writeHeader(forwardedHeaders, key, incomingValue);
         }
         if (identityBindingEnabled) {
             const derivedIdentityHeaders = {};
@@ -101,21 +102,19 @@ const createRequestFactory = (environment)=>{
                         ...forwardedHeaders
                     }
                 });
-                if (resolvedHeaders && 'object' == typeof resolvedHeaders) {
-                    for (const key of targetAllowedHeaders)if (void 0 !== resolvedHeaders[key]) {
+                if (resolvedHeaders && 'object' == typeof resolvedHeaders) for (const key of targetAllowedHeaders){
+                    const resolvedValue = readHeader(resolvedHeaders, key);
+                    if (void 0 !== resolvedValue) {
                         if (identityBindingEnabled && protectedIdentityHeaders.includes(key.toLowerCase())) {
-                            writeHeader(forwardedHeaders, key.toLowerCase(), resolvedHeaders[key]);
+                            writeHeader(forwardedHeaders, key.toLowerCase(), resolvedValue);
                             continue;
                         }
-                        forwardedHeaders[key] = resolvedHeaders[key];
+                        writeHeader(forwardedHeaders, key, resolvedValue);
                     }
                 }
             }
         }
-        if (isServerTarget) return {
-            ...headers,
-            ...forwardedHeaders
-        };
+        if (isServerTarget) for (const [header, value] of Object.entries(forwardedHeaders))writeHeader(headers, header, value);
         return headers;
     };
     const configure = (options)=>{
@@ -124,6 +123,21 @@ const createRequestFactory = (environment)=>{
         if ('default' !== requestId && !setDomain && !hasExistingDomain) throw new ProducerDomainNotConfiguredError(requestId);
         let configuredRequest = request || environment.originFetch;
         if (interceptor && !request) configuredRequest = interceptor(environment.getFetch());
+        let resolvedDomain;
+        if (setDomain) {
+            resolvedDomain = setDomain({
+                target: environment.target,
+                requestId
+            });
+            if ('default' !== requestId && isEmptyDomain(resolvedDomain)) throw new ProducerDomainNotConfiguredError(requestId);
+        }
+        realAllowedHeaders.delete(requestId);
+        realResolveHeaders.delete(requestId);
+        realTransportResilience.delete(requestId);
+        realIdentityBinding.delete(requestId);
+        realOperationContract.delete(requestId);
+        realRequireEnvelope.delete(requestId);
+        realAllowCrossOriginEnvelope.delete(requestId);
         if (Array.isArray(allowedHeaders)) realAllowedHeaders.set(requestId, allowedHeaders);
         if (isServerTarget && 'function' == typeof resolveHeaders) realResolveHeaders.set(requestId, resolveHeaders);
         if (transport && 'object' == typeof transport) realTransportResilience.set(requestId, transport);
@@ -131,14 +145,7 @@ const createRequestFactory = (environment)=>{
         if (operationContract && 'object' == typeof operationContract) realOperationContract.set(requestId, operationContract);
         if ('boolean' == typeof requireEnvelope) realRequireEnvelope.set(requestId, requireEnvelope);
         if ('boolean' == typeof allowCrossOriginEnvelope || 'function' == typeof allowCrossOriginEnvelope) realAllowCrossOriginEnvelope.set(requestId, allowCrossOriginEnvelope);
-        if (setDomain) {
-            const resolvedDomain = setDomain({
-                target: environment.target,
-                requestId
-            });
-            if ('default' !== requestId && isEmptyDomain(resolvedDomain)) throw new ProducerDomainNotConfiguredError(requestId);
-            if ('string' == typeof resolvedDomain) domainMap.set(requestId, resolvedDomain);
-        }
+        if ('string' == typeof resolvedDomain) domainMap.set(requestId, resolvedDomain);
         realRequest.set(requestId, configuredRequest);
     };
     const createRequest = (...args)=>{
@@ -175,6 +182,7 @@ const createRequestFactory = (environment)=>{
                 headers = {
                     'Content-Type': 'application/json'
                 };
+                headers = applyIdentityAndForwardedHeaders(headers, requestId, incomingHeaders);
             } else {
                 const payload = 'object' == typeof senderArgs[senderArgs.length - 1] ? senderArgs[senderArgs.length - 1] : {};
                 payload.params = payload.params || {};
@@ -249,7 +257,7 @@ const createRequestFactory = (environment)=>{
         const sender = (...args)=>{
             const fetcher = resolveConfiguredRequest(realRequest, requestId, environment.originFetch);
             const { body, headers: uploadHeaders, params } = getUploadPayload(args);
-            const headers = {
+            let headers = {
                 ...uploadHeaders
             };
             const finalPath = getUploadPath ? getUploadPath(params) : path;
@@ -260,12 +268,21 @@ const createRequestFactory = (environment)=>{
                 path: finalPath
             });
             const incomingHeaders = environment.readIncomingHeaders();
+            headers = applyIdentityAndForwardedHeaders(headers, requestId, incomingHeaders);
             attachEnvelopeHeaderIfRequired(headers, requestId, finalURL, incomingHeaders);
             attachSecuredOperationHeaders(headers, requestId, 'POST', path, operationContext);
-            return fetcher(finalURL, {
+            return executeWithResilience({
+                requestId,
+                target: environment.target,
                 method: 'POST',
-                body,
-                headers
+                url: finalURL,
+                init: {
+                    method: 'POST',
+                    body,
+                    headers
+                },
+                fetcher: fetcher,
+                transport: realTransportResilience.get(requestId)
             });
         };
         return sender;

package/dist/esm/transport.mjs

@@ -23,9 +23,12 @@ const createTimeoutError = (timeoutMs)=>{
     error.name = 'TimeoutError';
     return error;
 };
+const unrefTimer = (timer)=>{
+    if ('object' == typeof timer && null !== timer && 'unref' in timer && 'function' == typeof timer.unref) timer.unref();
+};
 const wait = (ms)=>new Promise((resolve)=>{
         const timer = setTimeout(()=>resolve(), ms);
-        if ('function' == typeof timer.unref) timer.unref();
+        unrefTimer(timer);
     });
 const toStatusCode = (error)=>{
     if (!error || 'object' != typeof error) return;
@@ -92,7 +95,7 @@ const withTimeout = async (promise, timeoutMs, signalBuilder)=>{
         if (controller) controller.abort();
         rejectTimeout?.(createTimeoutError(timeoutMs));
     }, timeoutMs);
-    if ('function' == typeof timer.unref) timer.unref();
+    unrefTimer(timer);
     try {
         const result = await Promise.race([
             promise,
@@ -120,9 +123,14 @@ const executeWithResilience = async ({ requestId, target, method, url, init, fet
         const canUseAbortController = "u" > typeof AbortController;
         let controller;
         if (timeoutMs && canUseAbortController) controller = new AbortController();
-        const nextInit = controller && !init.signal ? {
+        const callerSignal = init.signal;
+        const requestSignal = controller ? callerSignal && !callerSignal.aborted ? AbortSignal.any([
+            callerSignal,
+            controller.signal
+        ]) : callerSignal || controller.signal : callerSignal;
+        const nextInit = requestSignal ? {
             ...init,
-            signal: controller.signal
+            signal: requestSignal
         } : init;
         try {
             const { result } = await withTimeout(fetcher(url, nextInit), timeoutMs, ()=>controller);

package/dist/esm/utiles.mjs

@@ -3,7 +3,7 @@ const getUploadPayload = (args)=>{
     const files = payload.files;
     if (!files) throw new Error('no files');
     const formdata = new FormData();
-    for (const [key, value] of Object.entries(files))if (value instanceof FileList) for(let i = 0; i < value.length; i++){
+    for (const [key, value] of Object.entries(files))if ("u" > typeof FileList && value instanceof FileList) for(let i = 0; i < value.length; i++){
         const file = value.item(i);
         if (file) formdata.append(key, file);
     }

package/dist/esm-node/requestFactory.mjs

@@ -50,8 +50,9 @@ const createRequestFactory = (environment)=>{
         const protectedIdentityHeaders = (identityBinding?.protectedHeaders || BFF_DEFAULT_PROTECTED_IDENTITY_HEADERS).map((header)=>header.toLowerCase());
         const targetAllowedHeaders = realAllowedHeaders.get(requestId) || [];
         const forwardedHeaders = {};
-        if (isServerTarget) {
-            for (const key of targetAllowedHeaders)if (void 0 !== incomingHeaders[key]) forwardedHeaders[key] = incomingHeaders[key];
+        if (isServerTarget) for (const key of targetAllowedHeaders){
+            const incomingValue = readHeader(incomingHeaders, key);
+            if (void 0 !== incomingValue) writeHeader(forwardedHeaders, key, incomingValue);
         }
         if (identityBindingEnabled) {
             const derivedIdentityHeaders = {};
@@ -102,21 +103,19 @@ const createRequestFactory = (environment)=>{
                         ...forwardedHeaders
                     }
                 });
-                if (resolvedHeaders && 'object' == typeof resolvedHeaders) {
-                    for (const key of targetAllowedHeaders)if (void 0 !== resolvedHeaders[key]) {
+                if (resolvedHeaders && 'object' == typeof resolvedHeaders) for (const key of targetAllowedHeaders){
+                    const resolvedValue = readHeader(resolvedHeaders, key);
+                    if (void 0 !== resolvedValue) {
                         if (identityBindingEnabled && protectedIdentityHeaders.includes(key.toLowerCase())) {
-                            writeHeader(forwardedHeaders, key.toLowerCase(), resolvedHeaders[key]);
+                            writeHeader(forwardedHeaders, key.toLowerCase(), resolvedValue);
                             continue;
                         }
-                        forwardedHeaders[key] = resolvedHeaders[key];
+                        writeHeader(forwardedHeaders, key, resolvedValue);
                     }
                 }
             }
         }
-        if (isServerTarget) return {
-            ...headers,
-            ...forwardedHeaders
-        };
+        if (isServerTarget) for (const [header, value] of Object.entries(forwardedHeaders))writeHeader(headers, header, value);
         return headers;
     };
     const configure = (options)=>{
@@ -125,6 +124,21 @@ const createRequestFactory = (environment)=>{
         if ('default' !== requestId && !setDomain && !hasExistingDomain) throw new ProducerDomainNotConfiguredError(requestId);
         let configuredRequest = request || environment.originFetch;
         if (interceptor && !request) configuredRequest = interceptor(environment.getFetch());
+        let resolvedDomain;
+        if (setDomain) {
+            resolvedDomain = setDomain({
+                target: environment.target,
+                requestId
+            });
+            if ('default' !== requestId && isEmptyDomain(resolvedDomain)) throw new ProducerDomainNotConfiguredError(requestId);
+        }
+        realAllowedHeaders.delete(requestId);
+        realResolveHeaders.delete(requestId);
+        realTransportResilience.delete(requestId);
+        realIdentityBinding.delete(requestId);
+        realOperationContract.delete(requestId);
+        realRequireEnvelope.delete(requestId);
+        realAllowCrossOriginEnvelope.delete(requestId);
         if (Array.isArray(allowedHeaders)) realAllowedHeaders.set(requestId, allowedHeaders);
         if (isServerTarget && 'function' == typeof resolveHeaders) realResolveHeaders.set(requestId, resolveHeaders);
         if (transport && 'object' == typeof transport) realTransportResilience.set(requestId, transport);
@@ -132,14 +146,7 @@ const createRequestFactory = (environment)=>{
         if (operationContract && 'object' == typeof operationContract) realOperationContract.set(requestId, operationContract);
         if ('boolean' == typeof requireEnvelope) realRequireEnvelope.set(requestId, requireEnvelope);
         if ('boolean' == typeof allowCrossOriginEnvelope || 'function' == typeof allowCrossOriginEnvelope) realAllowCrossOriginEnvelope.set(requestId, allowCrossOriginEnvelope);
-        if (setDomain) {
-            const resolvedDomain = setDomain({
-                target: environment.target,
-                requestId
-            });
-            if ('default' !== requestId && isEmptyDomain(resolvedDomain)) throw new ProducerDomainNotConfiguredError(requestId);
-            if ('string' == typeof resolvedDomain) domainMap.set(requestId, resolvedDomain);
-        }
+        if ('string' == typeof resolvedDomain) domainMap.set(requestId, resolvedDomain);
         realRequest.set(requestId, configuredRequest);
     };
     const createRequest = (...args)=>{
@@ -176,6 +183,7 @@ const createRequestFactory = (environment)=>{
                 headers = {
                     'Content-Type': 'application/json'
                 };
+                headers = applyIdentityAndForwardedHeaders(headers, requestId, incomingHeaders);
             } else {
                 const payload = 'object' == typeof senderArgs[senderArgs.length - 1] ? senderArgs[senderArgs.length - 1] : {};
                 payload.params = payload.params || {};
@@ -250,7 +258,7 @@ const createRequestFactory = (environment)=>{
         const sender = (...args)=>{
             const fetcher = resolveConfiguredRequest(realRequest, requestId, environment.originFetch);
             const { body, headers: uploadHeaders, params } = getUploadPayload(args);
-            const headers = {
+            let headers = {
                 ...uploadHeaders
             };
             const finalPath = getUploadPath ? getUploadPath(params) : path;
@@ -261,12 +269,21 @@ const createRequestFactory = (environment)=>{
                 path: finalPath
             });
             const incomingHeaders = environment.readIncomingHeaders();
+            headers = applyIdentityAndForwardedHeaders(headers, requestId, incomingHeaders);
             attachEnvelopeHeaderIfRequired(headers, requestId, finalURL, incomingHeaders);
             attachSecuredOperationHeaders(headers, requestId, 'POST', path, operationContext);
-            return fetcher(finalURL, {
+            return executeWithResilience({
+                requestId,
+                target: environment.target,
                 method: 'POST',
-                body,
-                headers
+                url: finalURL,
+                init: {
+                    method: 'POST',
+                    body,
+                    headers
+                },
+                fetcher: fetcher,
+                transport: realTransportResilience.get(requestId)
             });
         };
         return sender;

package/dist/esm-node/transport.mjs

@@ -24,9 +24,12 @@ const createTimeoutError = (timeoutMs)=>{
     error.name = 'TimeoutError';
     return error;
 };
+const unrefTimer = (timer)=>{
+    if ('object' == typeof timer && null !== timer && 'unref' in timer && 'function' == typeof timer.unref) timer.unref();
+};
 const wait = (ms)=>new Promise((resolve)=>{
         const timer = setTimeout(()=>resolve(), ms);
-        if ('function' == typeof timer.unref) timer.unref();
+        unrefTimer(timer);
     });
 const toStatusCode = (error)=>{
     if (!error || 'object' != typeof error) return;
@@ -93,7 +96,7 @@ const withTimeout = async (promise, timeoutMs, signalBuilder)=>{
         if (controller) controller.abort();
         rejectTimeout?.(createTimeoutError(timeoutMs));
     }, timeoutMs);
-    if ('function' == typeof timer.unref) timer.unref();
+    unrefTimer(timer);
     try {
         const result = await Promise.race([
             promise,
@@ -121,9 +124,14 @@ const executeWithResilience = async ({ requestId, target, method, url, init, fet
         const canUseAbortController = "u" > typeof AbortController;
         let controller;
         if (timeoutMs && canUseAbortController) controller = new AbortController();
-        const nextInit = controller && !init.signal ? {
+        const callerSignal = init.signal;
+        const requestSignal = controller ? callerSignal && !callerSignal.aborted ? AbortSignal.any([
+            callerSignal,
+            controller.signal
+        ]) : callerSignal || controller.signal : callerSignal;
+        const nextInit = requestSignal ? {
             ...init,
-            signal: controller.signal
+            signal: requestSignal
         } : init;
         try {
             const { result } = await withTimeout(fetcher(url, nextInit), timeoutMs, ()=>controller);

package/dist/esm-node/utiles.mjs

@@ -4,7 +4,7 @@ const getUploadPayload = (args)=>{
     const files = payload.files;
     if (!files) throw new Error('no files');
     const formdata = new FormData();
-    for (const [key, value] of Object.entries(files))if (value instanceof FileList) for(let i = 0; i < value.length; i++){
+    for (const [key, value] of Object.entries(files))if ("u" > typeof FileList && value instanceof FileList) for(let i = 0; i < value.length; i++){
         const file = value.item(i);
         if (file) formdata.append(key, file);
     }

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.8.3-ultramodern.1",
+  "version": "3.8.3-ultramodern.3",
   "modern:source": "./src/node.ts",
   "types": "./dist/types/browser.d.ts",
   "main": "./dist/cjs/node.js",
@@ -28,17 +28,27 @@
   "exports": {
     ".": {
       "types": "./dist/types/browser.d.ts",
-      "node": "./dist/esm/node.mjs",
+      "node": {
+        "import": "./dist/esm-node/node.mjs",
+        "require": "./dist/cjs/node.js"
+      },
+      "import": "./dist/esm/browser.mjs",
+      "require": "./dist/cjs/browser.js",
       "default": "./dist/esm/browser.mjs"
     },
     "./client": {
       "types": "./dist/types/browser.d.ts",
+      "import": "./dist/esm/browser.mjs",
+      "require": "./dist/cjs/browser.js",
       "default": "./dist/esm/browser.mjs"
     },
     "./server": {
       "types": "./dist/types/node.d.ts",
-      "require": "./dist/cjs/node.js",
-      "default": "./dist/esm/node.mjs"
+      "node": {
+        "import": "./dist/esm-node/node.mjs",
+        "require": "./dist/cjs/node.js"
+      },
+      "default": "./dist/cjs/node.js"
     }
   },
   "typesVersions": {
@@ -55,15 +65,15 @@
     }
   },
   "dependencies": {
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.8.3-ultramodern.1",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.3-ultramodern.1",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.8.3-ultramodern.3",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.3-ultramodern.3",
     "@swc/helpers": "^0.5.23",
     "encoding": "^0.1.13",
     "path-to-regexp": "^8.4.2",
     "qs": "^6.15.3"
   },
   "devDependencies": {
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.3-ultramodern.1",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.3-ultramodern.3",
     "@rslib/core": "0.23.2",
     "@scripts/rstest-config": "2.66.0",
     "@types/node": "^26.2.0",
@@ -78,7 +88,7 @@
   },
   "scripts": {
     "dev": "rslib build --watch",
-    "build": "rslib build && pnpm -w tsgo:dts \"$PWD\"",
+    "build": "rslib build",
     "test": "rstest --passWithNoTests"
   }
 }