Skip to content

Commit 8568018

Browse files
Reduce duplicated logic.
1 parent 93dcc03 commit 8568018

File tree

1 file changed

+7
-20
lines changed

1 file changed

+7
-20
lines changed

src/connection.ts

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3182,8 +3182,8 @@ class Connection extends EventEmitter {
31823182
this.clearRequestTimer();
31833183
}
31843184

3185-
if (!request.canceled && request instanceof Request && request.paused) {
3186-
await new Promise<void>((resolve, _) => {
3185+
const onCancelOrResume = async () => {
3186+
return await new Promise<void>((resolve, _) => {
31873187
const onResume = () => {
31883188
request.removeListener('cancel', onCancel);
31893189
request.removeListener('resume', onResume);
@@ -3201,29 +3201,16 @@ class Connection extends EventEmitter {
32013201
request.on('cancel', onCancel);
32023202
request.on('resume', onResume);
32033203
});
3204+
};
3205+
3206+
if (!request.canceled && request instanceof Request && request.paused) {
3207+
await onCancelOrResume();
32043208
}
32053209

32063210
const handler = new RequestTokenHandler(this, request);
32073211
for await (const token of this.createTokenStreamParser(message)) {
32083212
if (!request.canceled && request instanceof Request && request.paused) {
3209-
await new Promise<void>((resolve, _) => {
3210-
const onResume = () => {
3211-
request.removeListener('cancel', onCancel);
3212-
request.removeListener('resume', onResume);
3213-
3214-
resolve();
3215-
};
3216-
3217-
const onCancel = () => {
3218-
request.removeListener('cancel', onCancel);
3219-
request.removeListener('resume', onResume);
3220-
3221-
resolve();
3222-
};
3223-
3224-
request.on('cancel', onCancel);
3225-
request.on('resume', onResume);
3226-
});
3213+
await onCancelOrResume();
32273214
}
32283215

32293216
handler[token.handlerName](token as any);

0 commit comments

Comments
 (0)