Skip to content

Commit 5de91b3

Browse files
committed
refactor(memu-js): support multiple signal
1 parent 19e934e commit 5de91b3

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

memu/sdk/javascript/src/client.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,6 @@ export class MemuClient {
475475
console.log(`Making ${config.method?.toUpperCase()} request to ${url} (attempt ${attempt + 1})`)
476476

477477
const response = await fetch(url, {
478-
signal: this.timeout ? AbortSignal.timeout(this.timeout) : undefined,
479478
...config,
480479
headers: {
481480
'Accept': 'application/json',
@@ -484,6 +483,12 @@ export class MemuClient {
484483
'User-Agent': 'MemU-JavaScript-SDK/0.1.11',
485484
...config.headers,
486485
},
486+
signal: this.timeout
487+
// eslint-disable-next-line sonarjs/no-nested-conditional
488+
? config.signal
489+
? AbortSignal.any([config.signal, AbortSignal.timeout(this.timeout)])
490+
: AbortSignal.timeout(this.timeout)
491+
: undefined,
487492
})
488493

489494
// Handle HTTP status codes

0 commit comments

Comments
 (0)