Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lib: add aborted() utility function #46494

Merged
merged 26 commits into from
Feb 7, 2023
Merged

lib: add aborted() utility function #46494

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6e797f5
lib: add aborted() utility function
debadree25 Feb 4, 2023
3834e9f
fixup! update param validation
debadree25 Feb 4, 2023
1cab0ca
fixup! make async func
debadree25 Feb 4, 2023
2e41a14
fixup! make resource compulsory
debadree25 Feb 4, 2023
0a58ffc
fixup! add doc
debadree25 Feb 4, 2023
f3621fd
fixup! doc fixup
debadree25 Feb 4, 2023
3bfeec0
fixup! doc fixup
debadree25 Feb 4, 2023
a2f2c56
fixup! doc
debadree25 Feb 4, 2023
f076729
Update doc/api/util.md
debadree25 Feb 5, 2023
6334317
Update doc/api/util.md
debadree25 Feb 5, 2023
7ff30c8
Update test/parallel/test-aborted-util.js
debadree25 Feb 5, 2023
f1ca1f7
Update test/parallel/test-aborted-util.js
debadree25 Feb 5, 2023
812c723
Update test/parallel/test-aborted-util.js
debadree25 Feb 5, 2023
b209fe1
fixup
debadree25 Feb 5, 2023
2f633c6
fixup
debadree25 Feb 5, 2023
b03ab4e
fixup! doc
debadree25 Feb 6, 2023
bae2765
fixup! doc
debadree25 Feb 6, 2023
b1a93a5
fixup! ordering
debadree25 Feb 6, 2023
8dfe5b7
fixup! ordering
debadree25 Feb 6, 2023
a5b43fe
fixup! ordering
debadree25 Feb 6, 2023
2401897
fixup! ordering
debadree25 Feb 6, 2023
347c252
fixup! ordering
debadree25 Feb 6, 2023
2446138
fixup! refactor function
debadree25 Feb 6, 2023
2b6929c
Update test/parallel/test-aborted-util.js
debadree25 Feb 6, 2023
a4a7bef
Update test/parallel/test-aborted-util.js
debadree25 Feb 6, 2023
f106f87
fixup! add undefined check
debadree25 Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions lib/internal/abort_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ const {
Symbol,
SymbolToStringTag,
WeakRef,
PromiseResolve,
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
PromiseReject,
} = primordials;

const {
Expand All @@ -22,11 +24,13 @@ const {
kTrustEvent,
kNewListener,
kRemoveListener,
kWeakHandler,
} = require('internal/event_target');
const {
customInspectSymbol,
kEnumerableProperty,
kEmptyObject,
createDeferredPromise,
debadree25 marked this conversation as resolved.
Show resolved Hide resolved
} = require('internal/util');
const { inspect } = require('internal/util/inspect');
const {
Expand All @@ -39,6 +43,7 @@ const {

const {
validateUint32,
validateAbortSignal: abortSignalValidator,
} = require('internal/validators');

const {
Expand Down Expand Up @@ -357,6 +362,24 @@ function transferableAbortController() {
return AbortController[kMakeTransferable]();
}

/**
* @param {AbortSignal} signal
* @param {any} resource
* @returns {Promise<void>}
*/
function aborted(signal, resource = null) {
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
try {
abortSignalValidator(signal, 'signal');
} catch (err) {
return PromiseReject(err);
}
if (signal.aborted)
return PromiseResolve();
const abortPromise = createDeferredPromise();
signal.addEventListener('abort', abortPromise.resolve, { [kWeakHandler]: resource, once: true });
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
return abortPromise.promise;
}

ObjectDefineProperties(AbortController.prototype, {
signal: kEnumerableProperty,
abort: kEnumerableProperty,
Expand All @@ -377,4 +400,5 @@ module.exports = {
ClonedAbortSignal,
transferableAbortSignal,
transferableAbortController,
aborted,
debadree25 marked this conversation as resolved.
Show resolved Hide resolved
};
3 changes: 3 additions & 0 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,9 @@ module.exports = {
get transferableAbortController() {
return lazyAbortController().transferableAbortController;
},
get aborted() {
return lazyAbortController().aborted;
},
types
};

Expand Down
45 changes: 45 additions & 0 deletions test/parallel/test-aborted-util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Flags: --expose-gc
'use strict';

const common = require('../common');
const { aborted } = require('util');
const assert = require('assert');
const { getEventListeners } = require('events');

{
// Test aborted works
const ac = new AbortController();
aborted(ac.signal).then(common.mustCall());
ac.abort();
assert.strictEqual(ac.signal.aborted, true);
assert.strictEqual(getEventListeners(ac.signal, 'abort').length, 0);
}

{
// Test aborted works when provided a resource
const ac = new AbortController();
aborted(ac.signal, {}).then(common.mustCall());
ac.abort();
assert.strictEqual(ac.signal.aborted, true);
assert.strictEqual(getEventListeners(ac.signal, 'abort').length, 0);
}

{
// Test aborted with gc cleanup
const ac = new AbortController();
aborted(ac.signal, {}).then(common.mustNotCall());
setImmediate(() => {
global.gc();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does GC accomplish here? That the aborted() promise is collected before abort() is called?

I don't know if that kind of GC observability is a good thing. Maybe it works now but GC changes can break such patterns. Looks fragile.

Copy link
Member Author

@debadree25 debadree25 Feb 4, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basically want to cleanup the empty object to check if the listener is removed when the resource is cleaned by the gc, unsure of any other ways to test this

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's just for testing, then it's probably fine. I mean, it could still break in the future but we can revisit if and when that happens.

I'd advise against documenting that behavior though. It's simply not very robust.

ac.abort();
assert.strictEqual(ac.signal.aborted, true);
assert.strictEqual(getEventListeners(ac.signal, 'abort').length, 0);
});
}

{
// Fails with error if not provided abort signal
const sig = new EventTarget();
assert.rejects(aborted(sig), {
name: 'TypeError',
});
}
debadree25 marked this conversation as resolved.
Show resolved Hide resolved