promises: refactor rejection handling#18207

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

Closed
apapirovski wants to merge 1 commit into from
Closed

promises: refactor rejection handling #18207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 4 additions & 29 deletions lib/internal/process/next_tick.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ function setupNextTick() {
const async_hooks = require('internal/async_hooks');
const promises = require('internal/process/promises');
const errors = require('internal/errors');
const emitPendingUnhandledRejections = promises.setup(scheduleMicrotasks);
const { emitPromiseRejectionWarnings } = promises;
const getDefaultTriggerAsyncId = async_hooks.getDefaultTriggerAsyncId;
// Two arrays that share state between C++ and JS.
const { async_hook_fields, async_id_fields } = async_wrap;
Expand All@@ -30,6 +30,7 @@ function setupNextTick() {

// *Must* match Environment::TickInfo::Fields in src/env.h.
const kHasScheduled = 0;
const kHasPromiseRejections = 1;

const nextTickQueue = {
head: null,
Expand DownExpand Up@@ -58,39 +59,13 @@ function setupNextTick() {
}
};

var microtasksScheduled = false;

process.nextTick = nextTick;
// Needs to be accessible from beyond this scope.
process._tickCallback = _tickCallback;

// Set the nextTick() function for internal usage.
exports.nextTick = internalNextTick;

const microTasksTickObject = {
callback: runMicrotasksCallback,
args: undefined,
[async_id_symbol]: 0,
[trigger_async_id_symbol]: 0
};
function scheduleMicrotasks() {
if (microtasksScheduled)
return;

// For the moment all microtasks come from the void until the PromiseHook
// API is implemented.
nextTickQueue.push(microTasksTickObject);
microtasksScheduled = true;
}

function runMicrotasksCallback() {
microtasksScheduled = false;
runMicrotasks();

if (nextTickQueue.head !== null || emitPendingUnhandledRejections())
scheduleMicrotasks();
}

function _tickCallback() {
let tock;
do {
Expand DownExpand Up@@ -118,8 +93,8 @@ function setupNextTick() {
emitAfter(asyncId);
}
runMicrotasks();
emitPendingUnhandledRejections();
} while (nextTickQueue.head !== null);
} while (nextTickQueue.head !== null || emitPromiseRejectionWarnings());
tickInfo[kHasPromiseRejections] = 0;
}

class TickObject {
Expand Down
186 changes: 86 additions & 100 deletions lib/internal/process/promises.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,123 +2,109 @@

const { safeToString } = process.binding('util');

const promiseRejectEvent = process._promiseRejectEvent;
const hasBeenNotifiedProperty = new WeakMap();
const promiseToGuidProperty = new WeakMap();
const maybeUnhandledPromises = new WeakMap();
const pendingUnhandledRejections = [];
let lastPromiseId = 1;
const asyncHandledRejections = [];
let lastPromiseId = 0;

exports.setup = setupPromises;
module.exports = {
emitPromiseRejectionWarnings
};

function getAsynchronousRejectionWarningObject(uid) {
return new Error('Promise rejection was handled ' +
`asynchronously (rejection id: ${uid})`);
}

function setupPromises(scheduleMicrotasks) {
let deprecationWarned = false;
process._setupPromises(unhandledRejection, handledRejection);

process._setupPromises(function(event, promise, reason) {
if (event === promiseRejectEvent.unhandled)
unhandledRejection(promise, reason);
else if (event === promiseRejectEvent.handled)
rejectionHandled(promise);
else
require('assert').fail(null, null, 'unexpected PromiseRejectEvent');
function unhandledRejection(promise, reason) {
maybeUnhandledPromises.set(promise, {
reason,
uid: ++lastPromiseId,
warned: false
});
pendingUnhandledRejections.push(promise);
return true;
}

function unhandledRejection(promise, reason) {
hasBeenNotifiedProperty.set(promise, false);
promiseToGuidProperty.set(promise, lastPromiseId++);
addPendingUnhandledRejection(promise, reason);
function handledRejection(promise) {
const promiseInfo = maybeUnhandledPromises.get(promise);
if (promiseInfo !== undefined) {
maybeUnhandledPromises.delete(promise);
if (promiseInfo.warned) {
const { uid } = promiseInfo;
// Generate the warning object early to get a good stack trace.
const warning = new Error('Promise rejection was handled ' +
`asynchronously (rejection id: ${uid})`);
warning.name = 'PromiseRejectionHandledWarning';
warning.id = uid;
asyncHandledRejections.push({ promise, warning });
return true;
}
}
return false;
}

function rejectionHandled(promise) {
const hasBeenNotified = hasBeenNotifiedProperty.get(promise);
if (hasBeenNotified !== undefined) {
hasBeenNotifiedProperty.delete(promise);
const uid = promiseToGuidProperty.get(promise);
promiseToGuidProperty.delete(promise);
if (hasBeenNotified === true) {
let warning = null;
if (!process.listenerCount('rejectionHandled')) {
// Generate the warning object early to get a good stack trace.
warning = getAsynchronousRejectionWarningObject(uid);
}
process.nextTick(function() {
if (!process.emit('rejectionHandled', promise)) {
if (warning === null)
warning = getAsynchronousRejectionWarningObject(uid);
warning.name = 'PromiseRejectionHandledWarning';
warning.id = uid;
process.emitWarning(warning);
}
});
}

const unhandledRejectionErrName = 'UnhandledPromiseRejectionWarning';
function emitWarning(uid, reason) {
try {
if (reason instanceof Error) {
process.emitWarning(reason.stack, unhandledRejectionErrName);
} else {
process.emitWarning(safeToString(reason), unhandledRejectionErrName);
}
} catch (e) {
// ignored
}

function emitWarning(uid, reason) {
try {
if (reason instanceof Error) {
process.emitWarning(reason.stack, 'UnhandledPromiseRejectionWarning');
} else {
process.emitWarning(
safeToString(reason), 'UnhandledPromiseRejectionWarning'
);
}
} catch (e) {
// ignored
const warning = new Error(
'Unhandled promise rejection. This error originated either by ' +
'throwing inside of an async function without a catch block, ' +
'or by rejecting a promise which was not handled with .catch(). ' +
`(rejection id: ${uid})`
);
warning.name = unhandledRejectionErrName;
try {
if (reason instanceof Error) {
warning.stack = reason.stack;
}
} catch (err) {
// ignored
}
process.emitWarning(warning);
emitDeprecationWarning();
}

const warning = new Error(
'Unhandled promise rejection. This error originated either by ' +
'throwing inside of an async function without a catch block, ' +
'or by rejecting a promise which was not handled with .catch(). ' +
`(rejection id: ${uid})`
);
warning.name = 'UnhandledPromiseRejectionWarning';
try {
if (reason instanceof Error) {
warning.stack = reason.stack;
}
} catch (err) {
// ignored
}
process.emitWarning(warning);
if (!deprecationWarned) {
deprecationWarned = true;
process.emitWarning(
'Unhandled promise rejections are deprecated. In the future, ' +
'promise rejections that are not handled will terminate the ' +
'Node.js process with a non-zero exit code.',
'DeprecationWarning', 'DEP0018');
}
let deprecationWarned = false;
function emitDeprecationWarning() {
if (!deprecationWarned) {
deprecationWarned = true;
process.emitWarning(
'Unhandled promise rejections are deprecated. In the future, ' +
'promise rejections that are not handled will terminate the ' +
'Node.js process with a non-zero exit code.',
'DeprecationWarning', 'DEP0018');
}
}

function emitPendingUnhandledRejections() {
let hadListeners = false;
while (pendingUnhandledRejections.length > 0) {
const promise = pendingUnhandledRejections.shift();
const reason = pendingUnhandledRejections.shift();
if (hasBeenNotifiedProperty.get(promise) === false) {
hasBeenNotifiedProperty.set(promise, true);
const uid = promiseToGuidProperty.get(promise);
if (!process.emit('unhandledRejection', reason, promise)) {
emitWarning(uid, reason);
} else {
hadListeners = true;
}
}
function emitPromiseRejectionWarnings() {
while (asyncHandledRejections.length > 0) {
const { promise, warning } = asyncHandledRejections.shift();
if (!process.emit('rejectionHandled', promise)) {
process.emitWarning(warning);
}
return hadListeners;
}

function addPendingUnhandledRejection(promise, reason) {
pendingUnhandledRejections.push(promise, reason);
scheduleMicrotasks();
let hadListeners = false;
let len = pendingUnhandledRejections.length;
while (len--) {
const promise = pendingUnhandledRejections.shift();
const promiseInfo = maybeUnhandledPromises.get(promise);
if (promiseInfo !== undefined) {
promiseInfo.warned = true;
const { reason, uid } = promiseInfo;
if (!process.emit('unhandledRejection', reason, promise)) {
emitWarning(uid, reason);
} else {
hadListeners = true;
}
}
}

return emitPendingUnhandledRejections;
return hadListeners || pendingUnhandledRejections.length !== 0;
}
8 changes: 8 additions & 0 deletions src/env-inl.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,14 @@ inline bool Environment::TickInfo::has_scheduled() const {
return fields_[kHasScheduled] == 1;
}

inline bool Environment::TickInfo::has_promise_rejections() const {
return fields_[kHasPromiseRejections] == 1;
}

inline void Environment::TickInfo::promise_rejections_toggle_on() {
fields_[kHasPromiseRejections] = 1;
}

inline void Environment::AssignToContext(v8::Local<v8::Context> context,
const ContextInfo& info) {
context->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex, this);
Expand Down
7 changes: 6 additions & 1 deletion src/env.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,7 +293,8 @@ class ModuleWrap;
V(performance_entry_callback, v8::Function) \
V(performance_entry_template, v8::Function) \
V(process_object, v8::Object) \
V(promise_reject_function, v8::Function) \
V(promise_reject_handled_function, v8::Function) \
V(promise_reject_unhandled_function, v8::Function) \
V(promise_wrap_template, v8::ObjectTemplate) \
V(push_values_to_array_function, v8::Function) \
V(randombytes_constructor_template, v8::ObjectTemplate) \
Expand DownExpand Up@@ -482,13 +483,17 @@ class Environment {
public:
inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();
inline bool has_scheduled() const;
inline bool has_promise_rejections() const;

inline void promise_rejections_toggle_on();

private:
friend class Environment; // So we can call the constructor.
inline explicit TickInfo(v8::Isolate* isolate);

enum Fields {
kHasScheduled,
kHasPromiseRejections,
kFieldsCount
};

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
promises: refactor rejection handling#18207

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

 Closed

apapirovski
wants to merge
1
commit into

from

 Closed


promises: refactor rejection handling
#18207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


33 changes: 4 additions & 29 deletions
lib/internal/process/next_tick.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ function setupNextTick() {
 const async_hooks = require('internal/async_hooks');
 const promises = require('internal/process/promises');
 const errors = require('internal/errors');
 const emitPendingUnhandledRejections = promises.setup(scheduleMicrotasks);
 const { emitPromiseRejectionWarnings } = promises;
 const getDefaultTriggerAsyncId = async_hooks.getDefaultTriggerAsyncId;
 // Two arrays that share state between C++ and JS.
 const { async_hook_fields, async_id_fields } = async_wrap;
Expand All@@ -30,6 +30,7 @@ function setupNextTick() {

 // *Must* match Environment::TickInfo::Fields in src/env.h.
 const kHasScheduled = 0;
 const kHasPromiseRejections = 1;

 const nextTickQueue = {
 head: null,
Expand DownExpand Up@@ -58,39 +59,13 @@ function setupNextTick() {
 }
 };

 var microtasksScheduled = false;

 process.nextTick = nextTick;
 // Needs to be accessible from beyond this scope.
 process._tickCallback = _tickCallback;

 // Set the nextTick() function for internal usage.
 exports.nextTick = internalNextTick;

 const microTasksTickObject = {
 callback: runMicrotasksCallback,
 args: undefined,
 [async_id_symbol]: 0,
 [trigger_async_id_symbol]: 0
 };
 function scheduleMicrotasks() {
 if (microtasksScheduled)
 return;

 // For the moment all microtasks come from the void until the PromiseHook
 // API is implemented.
 nextTickQueue.push(microTasksTickObject);
 microtasksScheduled = true;
 }

 function runMicrotasksCallback() {
 microtasksScheduled = false;
 runMicrotasks();

 if (nextTickQueue.head !== null || emitPendingUnhandledRejections())
 scheduleMicrotasks();
 }

 function _tickCallback() {
 let tock;
 do {
Expand DownExpand Up@@ -118,8 +93,8 @@ function setupNextTick() {
 emitAfter(asyncId);
 }
 runMicrotasks();
 emitPendingUnhandledRejections();
} while (nextTickQueue.head !== null);
} while (nextTickQueue.head !== null || emitPromiseRejectionWarnings());
tickInfo[kHasPromiseRejections] = 0;
 }

 class TickObject {
Expand Down

186 changes: 86 additions & 100 deletions
lib/internal/process/promises.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,123 +2,109 @@

const { safeToString } = process.binding('util');

const promiseRejectEvent = process._promiseRejectEvent;
const hasBeenNotifiedProperty = new WeakMap();
const promiseToGuidProperty = new WeakMap();
const maybeUnhandledPromises = new WeakMap();
const pendingUnhandledRejections = [];
let lastPromiseId = 1;
const asyncHandledRejections = [];
let lastPromiseId = 0;

exports.setup = setupPromises;
module.exports = {
 emitPromiseRejectionWarnings
};

function getAsynchronousRejectionWarningObject(uid) {
 return new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
}

function setupPromises(scheduleMicrotasks) {
 let deprecationWarned = false;
process._setupPromises(unhandledRejection, handledRejection);

 process._setupPromises(function(event, promise, reason) {
 if (event === promiseRejectEvent.unhandled)
 unhandledRejection(promise, reason);
 else if (event === promiseRejectEvent.handled)
 rejectionHandled(promise);
 else
 require('assert').fail(null, null, 'unexpected PromiseRejectEvent');
function unhandledRejection(promise, reason) {
 maybeUnhandledPromises.set(promise, {
 reason,
 uid: ++lastPromiseId,
 warned: false
 });
 pendingUnhandledRejections.push(promise);
 return true;
}

 function unhandledRejection(promise, reason) {
 hasBeenNotifiedProperty.set(promise, false);
 promiseToGuidProperty.set(promise, lastPromiseId++);
 addPendingUnhandledRejection(promise, reason);
function handledRejection(promise) {
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 maybeUnhandledPromises.delete(promise);
 if (promiseInfo.warned) {
 const { uid } = promiseInfo;
 // Generate the warning object early to get a good stack trace.
 const warning = new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 asyncHandledRejections.push({ promise, warning });
 return true;
 }
 }
 return false;
}

 function rejectionHandled(promise) {
 const hasBeenNotified = hasBeenNotifiedProperty.get(promise);
 if (hasBeenNotified !== undefined) {
 hasBeenNotifiedProperty.delete(promise);
 const uid = promiseToGuidProperty.get(promise);
 promiseToGuidProperty.delete(promise);
 if (hasBeenNotified === true) {
 let warning = null;
 if (!process.listenerCount('rejectionHandled')) {
 // Generate the warning object early to get a good stack trace.
 warning = getAsynchronousRejectionWarningObject(uid);
 }
 process.nextTick(function() {
 if (!process.emit('rejectionHandled', promise)) {
 if (warning === null)
 warning = getAsynchronousRejectionWarningObject(uid);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 process.emitWarning(warning);
 }
 });
 }

const unhandledRejectionErrName = 'UnhandledPromiseRejectionWarning';
function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, unhandledRejectionErrName);
 } else {
 process.emitWarning(safeToString(reason), unhandledRejectionErrName);
 }
 } catch (e) {
 // ignored
 }

 function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, 'UnhandledPromiseRejectionWarning');
 } else {
 process.emitWarning(
 safeToString(reason), 'UnhandledPromiseRejectionWarning'
 );
 }
 } catch (e) {
 // ignored
 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = unhandledRejectionErrName;
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 emitDeprecationWarning();
}

 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = 'UnhandledPromiseRejectionWarning';
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
let deprecationWarned = false;
function emitDeprecationWarning() {
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
}

 function emitPendingUnhandledRejections() {
 let hadListeners = false;
 while (pendingUnhandledRejections.length > 0) {
 const promise = pendingUnhandledRejections.shift();
 const reason = pendingUnhandledRejections.shift();
 if (hasBeenNotifiedProperty.get(promise) === false) {
 hasBeenNotifiedProperty.set(promise, true);
 const uid = promiseToGuidProperty.get(promise);
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
function emitPromiseRejectionWarnings() {
 while (asyncHandledRejections.length > 0) {
 const { promise, warning } = asyncHandledRejections.shift();
 if (!process.emit('rejectionHandled', promise)) {
 process.emitWarning(warning);
 }
 return hadListeners;
 }

 function addPendingUnhandledRejection(promise, reason) {
 pendingUnhandledRejections.push(promise, reason);
 scheduleMicrotasks();
 let hadListeners = false;
 let len = pendingUnhandledRejections.length;
 while (len--) {
 const promise = pendingUnhandledRejections.shift();
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 promiseInfo.warned = true;
 const { reason, uid } = promiseInfo;
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
 }

 return emitPendingUnhandledRejections;
 return hadListeners || pendingUnhandledRejections.length !== 0;
}

8 changes: 8 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,14 @@ inline bool Environment::TickInfo::has_scheduled() const {
 return fields_[kHasScheduled] == 1;
}

inline bool Environment::TickInfo::has_promise_rejections() const {
 return fields_[kHasPromiseRejections] == 1;
}

inline void Environment::TickInfo::promise_rejections_toggle_on() {
 fields_[kHasPromiseRejections] = 1;
}

inline void Environment::AssignToContext(v8::Local<v8::Context> context,
 const ContextInfo& info) {
 context->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex, this);
Expand Down

7 changes: 6 additions & 1 deletion
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -293,7 +293,8 @@ class ModuleWrap;
 V(performance_entry_callback, v8::Function) \
 V(performance_entry_template, v8::Function) \
 V(process_object, v8::Object) \
 V(promise_reject_function, v8::Function) \
 V(promise_reject_handled_function, v8::Function) \
 V(promise_reject_unhandled_function, v8::Function) \
 V(promise_wrap_template, v8::ObjectTemplate) \
 V(push_values_to_array_function, v8::Function) \
 V(randombytes_constructor_template, v8::ObjectTemplate) \
Expand DownExpand Up@@ -482,13 +483,17 @@ class Environment {
 public:
 inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();
 inline bool has_scheduled() const;
 inline bool has_promise_rejections() const;

 inline void promise_rejections_toggle_on();

 private:
 friend class Environment; // So we can call the constructor.
 inline explicit TickInfo(v8::Isolate* isolate);

 enum Fields {
 kHasScheduled,
 kHasPromiseRejections,
 kFieldsCount
 };

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
promises: refactor rejection handling#18207

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

 Closed

apapirovski
wants to merge
1
commit into

from

 Closed


promises: refactor rejection handling
#18207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


33 changes: 4 additions & 29 deletions
lib/internal/process/next_tick.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ function setupNextTick() {
 const async_hooks = require('internal/async_hooks');
 const promises = require('internal/process/promises');
 const errors = require('internal/errors');
 const emitPendingUnhandledRejections = promises.setup(scheduleMicrotasks);
 const { emitPromiseRejectionWarnings } = promises;
 const getDefaultTriggerAsyncId = async_hooks.getDefaultTriggerAsyncId;
 // Two arrays that share state between C++ and JS.
 const { async_hook_fields, async_id_fields } = async_wrap;
Expand All@@ -30,6 +30,7 @@ function setupNextTick() {

 // *Must* match Environment::TickInfo::Fields in src/env.h.
 const kHasScheduled = 0;
 const kHasPromiseRejections = 1;

 const nextTickQueue = {
 head: null,
Expand DownExpand Up@@ -58,39 +59,13 @@ function setupNextTick() {
 }
 };

 var microtasksScheduled = false;

 process.nextTick = nextTick;
 // Needs to be accessible from beyond this scope.
 process._tickCallback = _tickCallback;

 // Set the nextTick() function for internal usage.
 exports.nextTick = internalNextTick;

 const microTasksTickObject = {
 callback: runMicrotasksCallback,
 args: undefined,
 [async_id_symbol]: 0,
 [trigger_async_id_symbol]: 0
 };
 function scheduleMicrotasks() {
 if (microtasksScheduled)
 return;

 // For the moment all microtasks come from the void until the PromiseHook
 // API is implemented.
 nextTickQueue.push(microTasksTickObject);
 microtasksScheduled = true;
 }

 function runMicrotasksCallback() {
 microtasksScheduled = false;
 runMicrotasks();

 if (nextTickQueue.head !== null || emitPendingUnhandledRejections())
 scheduleMicrotasks();
 }

 function _tickCallback() {
 let tock;
 do {
Expand DownExpand Up@@ -118,8 +93,8 @@ function setupNextTick() {
 emitAfter(asyncId);
 }
 runMicrotasks();
 emitPendingUnhandledRejections();
} while (nextTickQueue.head !== null);
} while (nextTickQueue.head !== null || emitPromiseRejectionWarnings());
tickInfo[kHasPromiseRejections] = 0;
 }

 class TickObject {
Expand Down

186 changes: 86 additions & 100 deletions
lib/internal/process/promises.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,123 +2,109 @@

const { safeToString } = process.binding('util');

const promiseRejectEvent = process._promiseRejectEvent;
const hasBeenNotifiedProperty = new WeakMap();
const promiseToGuidProperty = new WeakMap();
const maybeUnhandledPromises = new WeakMap();
const pendingUnhandledRejections = [];
let lastPromiseId = 1;
const asyncHandledRejections = [];
let lastPromiseId = 0;

exports.setup = setupPromises;
module.exports = {
 emitPromiseRejectionWarnings
};

function getAsynchronousRejectionWarningObject(uid) {
 return new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
}

function setupPromises(scheduleMicrotasks) {
 let deprecationWarned = false;
process._setupPromises(unhandledRejection, handledRejection);

 process._setupPromises(function(event, promise, reason) {
 if (event === promiseRejectEvent.unhandled)
 unhandledRejection(promise, reason);
 else if (event === promiseRejectEvent.handled)
 rejectionHandled(promise);
 else
 require('assert').fail(null, null, 'unexpected PromiseRejectEvent');
function unhandledRejection(promise, reason) {
 maybeUnhandledPromises.set(promise, {
 reason,
 uid: ++lastPromiseId,
 warned: false
 });
 pendingUnhandledRejections.push(promise);
 return true;
}

 function unhandledRejection(promise, reason) {
 hasBeenNotifiedProperty.set(promise, false);
 promiseToGuidProperty.set(promise, lastPromiseId++);
 addPendingUnhandledRejection(promise, reason);
function handledRejection(promise) {
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 maybeUnhandledPromises.delete(promise);
 if (promiseInfo.warned) {
 const { uid } = promiseInfo;
 // Generate the warning object early to get a good stack trace.
 const warning = new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 asyncHandledRejections.push({ promise, warning });
 return true;
 }
 }
 return false;
}

 function rejectionHandled(promise) {
 const hasBeenNotified = hasBeenNotifiedProperty.get(promise);
 if (hasBeenNotified !== undefined) {
 hasBeenNotifiedProperty.delete(promise);
 const uid = promiseToGuidProperty.get(promise);
 promiseToGuidProperty.delete(promise);
 if (hasBeenNotified === true) {
 let warning = null;
 if (!process.listenerCount('rejectionHandled')) {
 // Generate the warning object early to get a good stack trace.
 warning = getAsynchronousRejectionWarningObject(uid);
 }
 process.nextTick(function() {
 if (!process.emit('rejectionHandled', promise)) {
 if (warning === null)
 warning = getAsynchronousRejectionWarningObject(uid);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 process.emitWarning(warning);
 }
 });
 }

const unhandledRejectionErrName = 'UnhandledPromiseRejectionWarning';
function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, unhandledRejectionErrName);
 } else {
 process.emitWarning(safeToString(reason), unhandledRejectionErrName);
 }
 } catch (e) {
 // ignored
 }

 function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, 'UnhandledPromiseRejectionWarning');
 } else {
 process.emitWarning(
 safeToString(reason), 'UnhandledPromiseRejectionWarning'
 );
 }
 } catch (e) {
 // ignored
 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = unhandledRejectionErrName;
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 emitDeprecationWarning();
}

 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = 'UnhandledPromiseRejectionWarning';
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
let deprecationWarned = false;
function emitDeprecationWarning() {
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
}

 function emitPendingUnhandledRejections() {
 let hadListeners = false;
 while (pendingUnhandledRejections.length > 0) {
 const promise = pendingUnhandledRejections.shift();
 const reason = pendingUnhandledRejections.shift();
 if (hasBeenNotifiedProperty.get(promise) === false) {
 hasBeenNotifiedProperty.set(promise, true);
 const uid = promiseToGuidProperty.get(promise);
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
function emitPromiseRejectionWarnings() {
 while (asyncHandledRejections.length > 0) {
 const { promise, warning } = asyncHandledRejections.shift();
 if (!process.emit('rejectionHandled', promise)) {
 process.emitWarning(warning);
 }
 return hadListeners;
 }

 function addPendingUnhandledRejection(promise, reason) {
 pendingUnhandledRejections.push(promise, reason);
 scheduleMicrotasks();
 let hadListeners = false;
 let len = pendingUnhandledRejections.length;
 while (len--) {
 const promise = pendingUnhandledRejections.shift();
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 promiseInfo.warned = true;
 const { reason, uid } = promiseInfo;
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
 }

 return emitPendingUnhandledRejections;
 return hadListeners || pendingUnhandledRejections.length !== 0;
}

8 changes: 8 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,14 @@ inline bool Environment::TickInfo::has_scheduled() const {
 return fields_[kHasScheduled] == 1;
}

inline bool Environment::TickInfo::has_promise_rejections() const {
 return fields_[kHasPromiseRejections] == 1;
}

inline void Environment::TickInfo::promise_rejections_toggle_on() {
 fields_[kHasPromiseRejections] = 1;
}

inline void Environment::AssignToContext(v8::Local<v8::Context> context,
 const ContextInfo& info) {
 context->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex, this);
Expand Down

7 changes: 6 additions & 1 deletion
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -293,7 +293,8 @@ class ModuleWrap;
 V(performance_entry_callback, v8::Function) \
 V(performance_entry_template, v8::Function) \
 V(process_object, v8::Object) \
 V(promise_reject_function, v8::Function) \
 V(promise_reject_handled_function, v8::Function) \
 V(promise_reject_unhandled_function, v8::Function) \
 V(promise_wrap_template, v8::ObjectTemplate) \
 V(push_values_to_array_function, v8::Function) \
 V(randombytes_constructor_template, v8::ObjectTemplate) \
Expand DownExpand Up@@ -482,13 +483,17 @@ class Environment {
 public:
 inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();
 inline bool has_scheduled() const;
 inline bool has_promise_rejections() const;

 inline void promise_rejections_toggle_on();

 private:
 friend class Environment; // So we can call the constructor.
 inline explicit TickInfo(v8::Isolate* isolate);

 enum Fields {
 kHasScheduled,
 kHasPromiseRejections,
 kFieldsCount
 };

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
promises: refactor rejection handling#18207

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

 Closed

apapirovski
wants to merge
1
commit into

from

 Closed


promises: refactor rejection handling
#18207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


33 changes: 4 additions & 29 deletions
lib/internal/process/next_tick.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ function setupNextTick() {
 const async_hooks = require('internal/async_hooks');
 const promises = require('internal/process/promises');
 const errors = require('internal/errors');
 const emitPendingUnhandledRejections = promises.setup(scheduleMicrotasks);
 const { emitPromiseRejectionWarnings } = promises;
 const getDefaultTriggerAsyncId = async_hooks.getDefaultTriggerAsyncId;
 // Two arrays that share state between C++ and JS.
 const { async_hook_fields, async_id_fields } = async_wrap;
Expand All@@ -30,6 +30,7 @@ function setupNextTick() {

 // *Must* match Environment::TickInfo::Fields in src/env.h.
 const kHasScheduled = 0;
 const kHasPromiseRejections = 1;

 const nextTickQueue = {
 head: null,
Expand DownExpand Up@@ -58,39 +59,13 @@ function setupNextTick() {
 }
 };

 var microtasksScheduled = false;

 process.nextTick = nextTick;
 // Needs to be accessible from beyond this scope.
 process._tickCallback = _tickCallback;

 // Set the nextTick() function for internal usage.
 exports.nextTick = internalNextTick;

 const microTasksTickObject = {
 callback: runMicrotasksCallback,
 args: undefined,
 [async_id_symbol]: 0,
 [trigger_async_id_symbol]: 0
 };
 function scheduleMicrotasks() {
 if (microtasksScheduled)
 return;

 // For the moment all microtasks come from the void until the PromiseHook
 // API is implemented.
 nextTickQueue.push(microTasksTickObject);
 microtasksScheduled = true;
 }

 function runMicrotasksCallback() {
 microtasksScheduled = false;
 runMicrotasks();

 if (nextTickQueue.head !== null || emitPendingUnhandledRejections())
 scheduleMicrotasks();
 }

 function _tickCallback() {
 let tock;
 do {
Expand DownExpand Up@@ -118,8 +93,8 @@ function setupNextTick() {
 emitAfter(asyncId);
 }
 runMicrotasks();
 emitPendingUnhandledRejections();
} while (nextTickQueue.head !== null);
} while (nextTickQueue.head !== null || emitPromiseRejectionWarnings());
tickInfo[kHasPromiseRejections] = 0;
 }

 class TickObject {
Expand Down

186 changes: 86 additions & 100 deletions
lib/internal/process/promises.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,123 +2,109 @@

const { safeToString } = process.binding('util');

const promiseRejectEvent = process._promiseRejectEvent;
const hasBeenNotifiedProperty = new WeakMap();
const promiseToGuidProperty = new WeakMap();
const maybeUnhandledPromises = new WeakMap();
const pendingUnhandledRejections = [];
let lastPromiseId = 1;
const asyncHandledRejections = [];
let lastPromiseId = 0;

exports.setup = setupPromises;
module.exports = {
 emitPromiseRejectionWarnings
};

function getAsynchronousRejectionWarningObject(uid) {
 return new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
}

function setupPromises(scheduleMicrotasks) {
 let deprecationWarned = false;
process._setupPromises(unhandledRejection, handledRejection);

 process._setupPromises(function(event, promise, reason) {
 if (event === promiseRejectEvent.unhandled)
 unhandledRejection(promise, reason);
 else if (event === promiseRejectEvent.handled)
 rejectionHandled(promise);
 else
 require('assert').fail(null, null, 'unexpected PromiseRejectEvent');
function unhandledRejection(promise, reason) {
 maybeUnhandledPromises.set(promise, {
 reason,
 uid: ++lastPromiseId,
 warned: false
 });
 pendingUnhandledRejections.push(promise);
 return true;
}

 function unhandledRejection(promise, reason) {
 hasBeenNotifiedProperty.set(promise, false);
 promiseToGuidProperty.set(promise, lastPromiseId++);
 addPendingUnhandledRejection(promise, reason);
function handledRejection(promise) {
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 maybeUnhandledPromises.delete(promise);
 if (promiseInfo.warned) {
 const { uid } = promiseInfo;
 // Generate the warning object early to get a good stack trace.
 const warning = new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 asyncHandledRejections.push({ promise, warning });
 return true;
 }
 }
 return false;
}

 function rejectionHandled(promise) {
 const hasBeenNotified = hasBeenNotifiedProperty.get(promise);
 if (hasBeenNotified !== undefined) {
 hasBeenNotifiedProperty.delete(promise);
 const uid = promiseToGuidProperty.get(promise);
 promiseToGuidProperty.delete(promise);
 if (hasBeenNotified === true) {
 let warning = null;
 if (!process.listenerCount('rejectionHandled')) {
 // Generate the warning object early to get a good stack trace.
 warning = getAsynchronousRejectionWarningObject(uid);
 }
 process.nextTick(function() {
 if (!process.emit('rejectionHandled', promise)) {
 if (warning === null)
 warning = getAsynchronousRejectionWarningObject(uid);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 process.emitWarning(warning);
 }
 });
 }

const unhandledRejectionErrName = 'UnhandledPromiseRejectionWarning';
function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, unhandledRejectionErrName);
 } else {
 process.emitWarning(safeToString(reason), unhandledRejectionErrName);
 }
 } catch (e) {
 // ignored
 }

 function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, 'UnhandledPromiseRejectionWarning');
 } else {
 process.emitWarning(
 safeToString(reason), 'UnhandledPromiseRejectionWarning'
 );
 }
 } catch (e) {
 // ignored
 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = unhandledRejectionErrName;
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 emitDeprecationWarning();
}

 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = 'UnhandledPromiseRejectionWarning';
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
let deprecationWarned = false;
function emitDeprecationWarning() {
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
}

 function emitPendingUnhandledRejections() {
 let hadListeners = false;
 while (pendingUnhandledRejections.length > 0) {
 const promise = pendingUnhandledRejections.shift();
 const reason = pendingUnhandledRejections.shift();
 if (hasBeenNotifiedProperty.get(promise) === false) {
 hasBeenNotifiedProperty.set(promise, true);
 const uid = promiseToGuidProperty.get(promise);
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
function emitPromiseRejectionWarnings() {
 while (asyncHandledRejections.length > 0) {
 const { promise, warning } = asyncHandledRejections.shift();
 if (!process.emit('rejectionHandled', promise)) {
 process.emitWarning(warning);
 }
 return hadListeners;
 }

 function addPendingUnhandledRejection(promise, reason) {
 pendingUnhandledRejections.push(promise, reason);
 scheduleMicrotasks();
 let hadListeners = false;
 let len = pendingUnhandledRejections.length;
 while (len--) {
 const promise = pendingUnhandledRejections.shift();
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 promiseInfo.warned = true;
 const { reason, uid } = promiseInfo;
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
 }

 return emitPendingUnhandledRejections;
 return hadListeners || pendingUnhandledRejections.length !== 0;
}

8 changes: 8 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,14 @@ inline bool Environment::TickInfo::has_scheduled() const {
 return fields_[kHasScheduled] == 1;
}

inline bool Environment::TickInfo::has_promise_rejections() const {
 return fields_[kHasPromiseRejections] == 1;
}

inline void Environment::TickInfo::promise_rejections_toggle_on() {
 fields_[kHasPromiseRejections] = 1;
}

inline void Environment::AssignToContext(v8::Local<v8::Context> context,
 const ContextInfo& info) {
 context->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex, this);
Expand Down

7 changes: 6 additions & 1 deletion
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -293,7 +293,8 @@ class ModuleWrap;
 V(performance_entry_callback, v8::Function) \
 V(performance_entry_template, v8::Function) \
 V(process_object, v8::Object) \
 V(promise_reject_function, v8::Function) \
 V(promise_reject_handled_function, v8::Function) \
 V(promise_reject_unhandled_function, v8::Function) \
 V(promise_wrap_template, v8::ObjectTemplate) \
 V(push_values_to_array_function, v8::Function) \
 V(randombytes_constructor_template, v8::ObjectTemplate) \
Expand DownExpand Up@@ -482,13 +483,17 @@ class Environment {
 public:
 inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();
 inline bool has_scheduled() const;
 inline bool has_promise_rejections() const;

 inline void promise_rejections_toggle_on();

 private:
 friend class Environment; // So we can call the constructor.
 inline explicit TickInfo(v8::Isolate* isolate);

 enum Fields {
 kHasScheduled,
 kHasPromiseRejections,
 kFieldsCount
 };

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
promises: refactor rejection handling#18207

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

 Closed

apapirovski
wants to merge
1
commit into

from

 Closed


promises: refactor rejection handling
#18207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


33 changes: 4 additions & 29 deletions
lib/internal/process/next_tick.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ function setupNextTick() {
 const async_hooks = require('internal/async_hooks');
 const promises = require('internal/process/promises');
 const errors = require('internal/errors');
 const emitPendingUnhandledRejections = promises.setup(scheduleMicrotasks);
 const { emitPromiseRejectionWarnings } = promises;
 const getDefaultTriggerAsyncId = async_hooks.getDefaultTriggerAsyncId;
 // Two arrays that share state between C++ and JS.
 const { async_hook_fields, async_id_fields } = async_wrap;
Expand All@@ -30,6 +30,7 @@ function setupNextTick() {

 // *Must* match Environment::TickInfo::Fields in src/env.h.
 const kHasScheduled = 0;
 const kHasPromiseRejections = 1;

 const nextTickQueue = {
 head: null,
Expand DownExpand Up@@ -58,39 +59,13 @@ function setupNextTick() {
 }
 };

 var microtasksScheduled = false;

 process.nextTick = nextTick;
 // Needs to be accessible from beyond this scope.
 process._tickCallback = _tickCallback;

 // Set the nextTick() function for internal usage.
 exports.nextTick = internalNextTick;

 const microTasksTickObject = {
 callback: runMicrotasksCallback,
 args: undefined,
 [async_id_symbol]: 0,
 [trigger_async_id_symbol]: 0
 };
 function scheduleMicrotasks() {
 if (microtasksScheduled)
 return;

 // For the moment all microtasks come from the void until the PromiseHook
 // API is implemented.
 nextTickQueue.push(microTasksTickObject);
 microtasksScheduled = true;
 }

 function runMicrotasksCallback() {
 microtasksScheduled = false;
 runMicrotasks();

 if (nextTickQueue.head !== null || emitPendingUnhandledRejections())
 scheduleMicrotasks();
 }

 function _tickCallback() {
 let tock;
 do {
Expand DownExpand Up@@ -118,8 +93,8 @@ function setupNextTick() {
 emitAfter(asyncId);
 }
 runMicrotasks();
 emitPendingUnhandledRejections();
} while (nextTickQueue.head !== null);
} while (nextTickQueue.head !== null || emitPromiseRejectionWarnings());
tickInfo[kHasPromiseRejections] = 0;
 }

 class TickObject {
Expand Down

186 changes: 86 additions & 100 deletions
lib/internal/process/promises.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,123 +2,109 @@

const { safeToString } = process.binding('util');

const promiseRejectEvent = process._promiseRejectEvent;
const hasBeenNotifiedProperty = new WeakMap();
const promiseToGuidProperty = new WeakMap();
const maybeUnhandledPromises = new WeakMap();
const pendingUnhandledRejections = [];
let lastPromiseId = 1;
const asyncHandledRejections = [];
let lastPromiseId = 0;

exports.setup = setupPromises;
module.exports = {
 emitPromiseRejectionWarnings
};

function getAsynchronousRejectionWarningObject(uid) {
 return new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
}

function setupPromises(scheduleMicrotasks) {
 let deprecationWarned = false;
process._setupPromises(unhandledRejection, handledRejection);

 process._setupPromises(function(event, promise, reason) {
 if (event === promiseRejectEvent.unhandled)
 unhandledRejection(promise, reason);
 else if (event === promiseRejectEvent.handled)
 rejectionHandled(promise);
 else
 require('assert').fail(null, null, 'unexpected PromiseRejectEvent');
function unhandledRejection(promise, reason) {
 maybeUnhandledPromises.set(promise, {
 reason,
 uid: ++lastPromiseId,
 warned: false
 });
 pendingUnhandledRejections.push(promise);
 return true;
}

 function unhandledRejection(promise, reason) {
 hasBeenNotifiedProperty.set(promise, false);
 promiseToGuidProperty.set(promise, lastPromiseId++);
 addPendingUnhandledRejection(promise, reason);
function handledRejection(promise) {
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 maybeUnhandledPromises.delete(promise);
 if (promiseInfo.warned) {
 const { uid } = promiseInfo;
 // Generate the warning object early to get a good stack trace.
 const warning = new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 asyncHandledRejections.push({ promise, warning });
 return true;
 }
 }
 return false;
}

 function rejectionHandled(promise) {
 const hasBeenNotified = hasBeenNotifiedProperty.get(promise);
 if (hasBeenNotified !== undefined) {
 hasBeenNotifiedProperty.delete(promise);
 const uid = promiseToGuidProperty.get(promise);
 promiseToGuidProperty.delete(promise);
 if (hasBeenNotified === true) {
 let warning = null;
 if (!process.listenerCount('rejectionHandled')) {
 // Generate the warning object early to get a good stack trace.
 warning = getAsynchronousRejectionWarningObject(uid);
 }
 process.nextTick(function() {
 if (!process.emit('rejectionHandled', promise)) {
 if (warning === null)
 warning = getAsynchronousRejectionWarningObject(uid);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 process.emitWarning(warning);
 }
 });
 }

const unhandledRejectionErrName = 'UnhandledPromiseRejectionWarning';
function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, unhandledRejectionErrName);
 } else {
 process.emitWarning(safeToString(reason), unhandledRejectionErrName);
 }
 } catch (e) {
 // ignored
 }

 function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, 'UnhandledPromiseRejectionWarning');
 } else {
 process.emitWarning(
 safeToString(reason), 'UnhandledPromiseRejectionWarning'
 );
 }
 } catch (e) {
 // ignored
 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = unhandledRejectionErrName;
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 emitDeprecationWarning();
}

 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = 'UnhandledPromiseRejectionWarning';
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
let deprecationWarned = false;
function emitDeprecationWarning() {
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
}

 function emitPendingUnhandledRejections() {
 let hadListeners = false;
 while (pendingUnhandledRejections.length > 0) {
 const promise = pendingUnhandledRejections.shift();
 const reason = pendingUnhandledRejections.shift();
 if (hasBeenNotifiedProperty.get(promise) === false) {
 hasBeenNotifiedProperty.set(promise, true);
 const uid = promiseToGuidProperty.get(promise);
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
function emitPromiseRejectionWarnings() {
 while (asyncHandledRejections.length > 0) {
 const { promise, warning } = asyncHandledRejections.shift();
 if (!process.emit('rejectionHandled', promise)) {
 process.emitWarning(warning);
 }
 return hadListeners;
 }

 function addPendingUnhandledRejection(promise, reason) {
 pendingUnhandledRejections.push(promise, reason);
 scheduleMicrotasks();
 let hadListeners = false;
 let len = pendingUnhandledRejections.length;
 while (len--) {
 const promise = pendingUnhandledRejections.shift();
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 promiseInfo.warned = true;
 const { reason, uid } = promiseInfo;
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
 }

 return emitPendingUnhandledRejections;
 return hadListeners || pendingUnhandledRejections.length !== 0;
}

8 changes: 8 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,14 @@ inline bool Environment::TickInfo::has_scheduled() const {
 return fields_[kHasScheduled] == 1;
}

inline bool Environment::TickInfo::has_promise_rejections() const {
 return fields_[kHasPromiseRejections] == 1;
}

inline void Environment::TickInfo::promise_rejections_toggle_on() {
 fields_[kHasPromiseRejections] = 1;
}

inline void Environment::AssignToContext(v8::Local<v8::Context> context,
 const ContextInfo& info) {
 context->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex, this);
Expand Down

7 changes: 6 additions & 1 deletion
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -293,7 +293,8 @@ class ModuleWrap;
 V(performance_entry_callback, v8::Function) \
 V(performance_entry_template, v8::Function) \
 V(process_object, v8::Object) \
 V(promise_reject_function, v8::Function) \
 V(promise_reject_handled_function, v8::Function) \
 V(promise_reject_unhandled_function, v8::Function) \
 V(promise_wrap_template, v8::ObjectTemplate) \
 V(push_values_to_array_function, v8::Function) \
 V(randombytes_constructor_template, v8::ObjectTemplate) \
Expand DownExpand Up@@ -482,13 +483,17 @@ class Environment {
 public:
 inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();
 inline bool has_scheduled() const;
 inline bool has_promise_rejections() const;

 inline void promise_rejections_toggle_on();

 private:
 friend class Environment; // So we can call the constructor.
 inline explicit TickInfo(v8::Isolate* isolate);

 enum Fields {
 kHasScheduled,
 kHasPromiseRejections,
 kFieldsCount
 };

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
promises: refactor rejection handling#18207

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

 Closed

apapirovski
wants to merge
1
commit into

from

 Closed


promises: refactor rejection handling
#18207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


33 changes: 4 additions & 29 deletions
lib/internal/process/next_tick.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ function setupNextTick() {
 const async_hooks = require('internal/async_hooks');
 const promises = require('internal/process/promises');
 const errors = require('internal/errors');
 const emitPendingUnhandledRejections = promises.setup(scheduleMicrotasks);
 const { emitPromiseRejectionWarnings } = promises;
 const getDefaultTriggerAsyncId = async_hooks.getDefaultTriggerAsyncId;
 // Two arrays that share state between C++ and JS.
 const { async_hook_fields, async_id_fields } = async_wrap;
Expand All@@ -30,6 +30,7 @@ function setupNextTick() {

 // *Must* match Environment::TickInfo::Fields in src/env.h.
 const kHasScheduled = 0;
 const kHasPromiseRejections = 1;

 const nextTickQueue = {
 head: null,
Expand DownExpand Up@@ -58,39 +59,13 @@ function setupNextTick() {
 }
 };

 var microtasksScheduled = false;

 process.nextTick = nextTick;
 // Needs to be accessible from beyond this scope.
 process._tickCallback = _tickCallback;

 // Set the nextTick() function for internal usage.
 exports.nextTick = internalNextTick;

 const microTasksTickObject = {
 callback: runMicrotasksCallback,
 args: undefined,
 [async_id_symbol]: 0,
 [trigger_async_id_symbol]: 0
 };
 function scheduleMicrotasks() {
 if (microtasksScheduled)
 return;

 // For the moment all microtasks come from the void until the PromiseHook
 // API is implemented.
 nextTickQueue.push(microTasksTickObject);
 microtasksScheduled = true;
 }

 function runMicrotasksCallback() {
 microtasksScheduled = false;
 runMicrotasks();

 if (nextTickQueue.head !== null || emitPendingUnhandledRejections())
 scheduleMicrotasks();
 }

 function _tickCallback() {
 let tock;
 do {
Expand DownExpand Up@@ -118,8 +93,8 @@ function setupNextTick() {
 emitAfter(asyncId);
 }
 runMicrotasks();
 emitPendingUnhandledRejections();
} while (nextTickQueue.head !== null);
} while (nextTickQueue.head !== null || emitPromiseRejectionWarnings());
tickInfo[kHasPromiseRejections] = 0;
 }

 class TickObject {
Expand Down

186 changes: 86 additions & 100 deletions
lib/internal/process/promises.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,123 +2,109 @@

const { safeToString } = process.binding('util');

const promiseRejectEvent = process._promiseRejectEvent;
const hasBeenNotifiedProperty = new WeakMap();
const promiseToGuidProperty = new WeakMap();
const maybeUnhandledPromises = new WeakMap();
const pendingUnhandledRejections = [];
let lastPromiseId = 1;
const asyncHandledRejections = [];
let lastPromiseId = 0;

exports.setup = setupPromises;
module.exports = {
 emitPromiseRejectionWarnings
};

function getAsynchronousRejectionWarningObject(uid) {
 return new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
}

function setupPromises(scheduleMicrotasks) {
 let deprecationWarned = false;
process._setupPromises(unhandledRejection, handledRejection);

 process._setupPromises(function(event, promise, reason) {
 if (event === promiseRejectEvent.unhandled)
 unhandledRejection(promise, reason);
 else if (event === promiseRejectEvent.handled)
 rejectionHandled(promise);
 else
 require('assert').fail(null, null, 'unexpected PromiseRejectEvent');
function unhandledRejection(promise, reason) {
 maybeUnhandledPromises.set(promise, {
 reason,
 uid: ++lastPromiseId,
 warned: false
 });
 pendingUnhandledRejections.push(promise);
 return true;
}

 function unhandledRejection(promise, reason) {
 hasBeenNotifiedProperty.set(promise, false);
 promiseToGuidProperty.set(promise, lastPromiseId++);
 addPendingUnhandledRejection(promise, reason);
function handledRejection(promise) {
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 maybeUnhandledPromises.delete(promise);
 if (promiseInfo.warned) {
 const { uid } = promiseInfo;
 // Generate the warning object early to get a good stack trace.
 const warning = new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 asyncHandledRejections.push({ promise, warning });
 return true;
 }
 }
 return false;
}

 function rejectionHandled(promise) {
 const hasBeenNotified = hasBeenNotifiedProperty.get(promise);
 if (hasBeenNotified !== undefined) {
 hasBeenNotifiedProperty.delete(promise);
 const uid = promiseToGuidProperty.get(promise);
 promiseToGuidProperty.delete(promise);
 if (hasBeenNotified === true) {
 let warning = null;
 if (!process.listenerCount('rejectionHandled')) {
 // Generate the warning object early to get a good stack trace.
 warning = getAsynchronousRejectionWarningObject(uid);
 }
 process.nextTick(function() {
 if (!process.emit('rejectionHandled', promise)) {
 if (warning === null)
 warning = getAsynchronousRejectionWarningObject(uid);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 process.emitWarning(warning);
 }
 });
 }

const unhandledRejectionErrName = 'UnhandledPromiseRejectionWarning';
function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, unhandledRejectionErrName);
 } else {
 process.emitWarning(safeToString(reason), unhandledRejectionErrName);
 }
 } catch (e) {
 // ignored
 }

 function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, 'UnhandledPromiseRejectionWarning');
 } else {
 process.emitWarning(
 safeToString(reason), 'UnhandledPromiseRejectionWarning'
 );
 }
 } catch (e) {
 // ignored
 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = unhandledRejectionErrName;
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 emitDeprecationWarning();
}

 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = 'UnhandledPromiseRejectionWarning';
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
let deprecationWarned = false;
function emitDeprecationWarning() {
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
}

 function emitPendingUnhandledRejections() {
 let hadListeners = false;
 while (pendingUnhandledRejections.length > 0) {
 const promise = pendingUnhandledRejections.shift();
 const reason = pendingUnhandledRejections.shift();
 if (hasBeenNotifiedProperty.get(promise) === false) {
 hasBeenNotifiedProperty.set(promise, true);
 const uid = promiseToGuidProperty.get(promise);
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
function emitPromiseRejectionWarnings() {
 while (asyncHandledRejections.length > 0) {
 const { promise, warning } = asyncHandledRejections.shift();
 if (!process.emit('rejectionHandled', promise)) {
 process.emitWarning(warning);
 }
 return hadListeners;
 }

 function addPendingUnhandledRejection(promise, reason) {
 pendingUnhandledRejections.push(promise, reason);
 scheduleMicrotasks();
 let hadListeners = false;
 let len = pendingUnhandledRejections.length;
 while (len--) {
 const promise = pendingUnhandledRejections.shift();
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 promiseInfo.warned = true;
 const { reason, uid } = promiseInfo;
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
 }

 return emitPendingUnhandledRejections;
 return hadListeners || pendingUnhandledRejections.length !== 0;
}

8 changes: 8 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,14 @@ inline bool Environment::TickInfo::has_scheduled() const {
 return fields_[kHasScheduled] == 1;
}

inline bool Environment::TickInfo::has_promise_rejections() const {
 return fields_[kHasPromiseRejections] == 1;
}

inline void Environment::TickInfo::promise_rejections_toggle_on() {
 fields_[kHasPromiseRejections] = 1;
}

inline void Environment::AssignToContext(v8::Local<v8::Context> context,
 const ContextInfo& info) {
 context->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex, this);
Expand Down

7 changes: 6 additions & 1 deletion
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -293,7 +293,8 @@ class ModuleWrap;
 V(performance_entry_callback, v8::Function) \
 V(performance_entry_template, v8::Function) \
 V(process_object, v8::Object) \
 V(promise_reject_function, v8::Function) \
 V(promise_reject_handled_function, v8::Function) \
 V(promise_reject_unhandled_function, v8::Function) \
 V(promise_wrap_template, v8::ObjectTemplate) \
 V(push_values_to_array_function, v8::Function) \
 V(randombytes_constructor_template, v8::ObjectTemplate) \
Expand DownExpand Up@@ -482,13 +483,17 @@ class Environment {
 public:
 inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();
 inline bool has_scheduled() const;
 inline bool has_promise_rejections() const;

 inline void promise_rejections_toggle_on();

 private:
 friend class Environment; // So we can call the constructor.
 inline explicit TickInfo(v8::Isolate* isolate);

 enum Fields {
 kHasScheduled,
 kHasPromiseRejections,
 kFieldsCount
 };

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
promises: refactor rejection handling#18207

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

 Closed

apapirovski
wants to merge
1
commit into

from

 Closed


promises: refactor rejection handling
#18207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


33 changes: 4 additions & 29 deletions
lib/internal/process/next_tick.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ function setupNextTick() {
 const async_hooks = require('internal/async_hooks');
 const promises = require('internal/process/promises');
 const errors = require('internal/errors');
 const emitPendingUnhandledRejections = promises.setup(scheduleMicrotasks);
 const { emitPromiseRejectionWarnings } = promises;
 const getDefaultTriggerAsyncId = async_hooks.getDefaultTriggerAsyncId;
 // Two arrays that share state between C++ and JS.
 const { async_hook_fields, async_id_fields } = async_wrap;
Expand All@@ -30,6 +30,7 @@ function setupNextTick() {

 // *Must* match Environment::TickInfo::Fields in src/env.h.
 const kHasScheduled = 0;
 const kHasPromiseRejections = 1;

 const nextTickQueue = {
 head: null,
Expand DownExpand Up@@ -58,39 +59,13 @@ function setupNextTick() {
 }
 };

 var microtasksScheduled = false;

 process.nextTick = nextTick;
 // Needs to be accessible from beyond this scope.
 process._tickCallback = _tickCallback;

 // Set the nextTick() function for internal usage.
 exports.nextTick = internalNextTick;

 const microTasksTickObject = {
 callback: runMicrotasksCallback,
 args: undefined,
 [async_id_symbol]: 0,
 [trigger_async_id_symbol]: 0
 };
 function scheduleMicrotasks() {
 if (microtasksScheduled)
 return;

 // For the moment all microtasks come from the void until the PromiseHook
 // API is implemented.
 nextTickQueue.push(microTasksTickObject);
 microtasksScheduled = true;
 }

 function runMicrotasksCallback() {
 microtasksScheduled = false;
 runMicrotasks();

 if (nextTickQueue.head !== null || emitPendingUnhandledRejections())
 scheduleMicrotasks();
 }

 function _tickCallback() {
 let tock;
 do {
Expand DownExpand Up@@ -118,8 +93,8 @@ function setupNextTick() {
 emitAfter(asyncId);
 }
 runMicrotasks();
 emitPendingUnhandledRejections();
} while (nextTickQueue.head !== null);
} while (nextTickQueue.head !== null || emitPromiseRejectionWarnings());
tickInfo[kHasPromiseRejections] = 0;
 }

 class TickObject {
Expand Down

186 changes: 86 additions & 100 deletions
lib/internal/process/promises.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,123 +2,109 @@

const { safeToString } = process.binding('util');

const promiseRejectEvent = process._promiseRejectEvent;
const hasBeenNotifiedProperty = new WeakMap();
const promiseToGuidProperty = new WeakMap();
const maybeUnhandledPromises = new WeakMap();
const pendingUnhandledRejections = [];
let lastPromiseId = 1;
const asyncHandledRejections = [];
let lastPromiseId = 0;

exports.setup = setupPromises;
module.exports = {
 emitPromiseRejectionWarnings
};

function getAsynchronousRejectionWarningObject(uid) {
 return new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
}

function setupPromises(scheduleMicrotasks) {
 let deprecationWarned = false;
process._setupPromises(unhandledRejection, handledRejection);

 process._setupPromises(function(event, promise, reason) {
 if (event === promiseRejectEvent.unhandled)
 unhandledRejection(promise, reason);
 else if (event === promiseRejectEvent.handled)
 rejectionHandled(promise);
 else
 require('assert').fail(null, null, 'unexpected PromiseRejectEvent');
function unhandledRejection(promise, reason) {
 maybeUnhandledPromises.set(promise, {
 reason,
 uid: ++lastPromiseId,
 warned: false
 });
 pendingUnhandledRejections.push(promise);
 return true;
}

 function unhandledRejection(promise, reason) {
 hasBeenNotifiedProperty.set(promise, false);
 promiseToGuidProperty.set(promise, lastPromiseId++);
 addPendingUnhandledRejection(promise, reason);
function handledRejection(promise) {
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 maybeUnhandledPromises.delete(promise);
 if (promiseInfo.warned) {
 const { uid } = promiseInfo;
 // Generate the warning object early to get a good stack trace.
 const warning = new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 asyncHandledRejections.push({ promise, warning });
 return true;
 }
 }
 return false;
}

 function rejectionHandled(promise) {
 const hasBeenNotified = hasBeenNotifiedProperty.get(promise);
 if (hasBeenNotified !== undefined) {
 hasBeenNotifiedProperty.delete(promise);
 const uid = promiseToGuidProperty.get(promise);
 promiseToGuidProperty.delete(promise);
 if (hasBeenNotified === true) {
 let warning = null;
 if (!process.listenerCount('rejectionHandled')) {
 // Generate the warning object early to get a good stack trace.
 warning = getAsynchronousRejectionWarningObject(uid);
 }
 process.nextTick(function() {
 if (!process.emit('rejectionHandled', promise)) {
 if (warning === null)
 warning = getAsynchronousRejectionWarningObject(uid);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 process.emitWarning(warning);
 }
 });
 }

const unhandledRejectionErrName = 'UnhandledPromiseRejectionWarning';
function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, unhandledRejectionErrName);
 } else {
 process.emitWarning(safeToString(reason), unhandledRejectionErrName);
 }
 } catch (e) {
 // ignored
 }

 function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, 'UnhandledPromiseRejectionWarning');
 } else {
 process.emitWarning(
 safeToString(reason), 'UnhandledPromiseRejectionWarning'
 );
 }
 } catch (e) {
 // ignored
 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = unhandledRejectionErrName;
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 emitDeprecationWarning();
}

 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = 'UnhandledPromiseRejectionWarning';
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
let deprecationWarned = false;
function emitDeprecationWarning() {
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
}

 function emitPendingUnhandledRejections() {
 let hadListeners = false;
 while (pendingUnhandledRejections.length > 0) {
 const promise = pendingUnhandledRejections.shift();
 const reason = pendingUnhandledRejections.shift();
 if (hasBeenNotifiedProperty.get(promise) === false) {
 hasBeenNotifiedProperty.set(promise, true);
 const uid = promiseToGuidProperty.get(promise);
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
function emitPromiseRejectionWarnings() {
 while (asyncHandledRejections.length > 0) {
 const { promise, warning } = asyncHandledRejections.shift();
 if (!process.emit('rejectionHandled', promise)) {
 process.emitWarning(warning);
 }
 return hadListeners;
 }

 function addPendingUnhandledRejection(promise, reason) {
 pendingUnhandledRejections.push(promise, reason);
 scheduleMicrotasks();
 let hadListeners = false;
 let len = pendingUnhandledRejections.length;
 while (len--) {
 const promise = pendingUnhandledRejections.shift();
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 promiseInfo.warned = true;
 const { reason, uid } = promiseInfo;
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
 }

 return emitPendingUnhandledRejections;
 return hadListeners || pendingUnhandledRejections.length !== 0;
}

8 changes: 8 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,14 @@ inline bool Environment::TickInfo::has_scheduled() const {
 return fields_[kHasScheduled] == 1;
}

inline bool Environment::TickInfo::has_promise_rejections() const {
 return fields_[kHasPromiseRejections] == 1;
}

inline void Environment::TickInfo::promise_rejections_toggle_on() {
 fields_[kHasPromiseRejections] = 1;
}

inline void Environment::AssignToContext(v8::Local<v8::Context> context,
 const ContextInfo& info) {
 context->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex, this);
Expand Down

7 changes: 6 additions & 1 deletion
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -293,7 +293,8 @@ class ModuleWrap;
 V(performance_entry_callback, v8::Function) \
 V(performance_entry_template, v8::Function) \
 V(process_object, v8::Object) \
 V(promise_reject_function, v8::Function) \
 V(promise_reject_handled_function, v8::Function) \
 V(promise_reject_unhandled_function, v8::Function) \
 V(promise_wrap_template, v8::ObjectTemplate) \
 V(push_values_to_array_function, v8::Function) \
 V(randombytes_constructor_template, v8::ObjectTemplate) \
Expand DownExpand Up@@ -482,13 +483,17 @@ class Environment {
 public:
 inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();
 inline bool has_scheduled() const;
 inline bool has_promise_rejections() const;

 inline void promise_rejections_toggle_on();

 private:
 friend class Environment; // So we can call the constructor.
 inline explicit TickInfo(v8::Isolate* isolate);

 enum Fields {
 kHasScheduled,
 kHasPromiseRejections,
 kFieldsCount
 };

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
promises: refactor rejection handling#18207

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

 Closed

apapirovski
wants to merge
1
commit into

from

 Closed


promises: refactor rejection handling
#18207
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


33 changes: 4 additions & 29 deletions
lib/internal/process/next_tick.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ function setupNextTick() {
 const async_hooks = require('internal/async_hooks');
 const promises = require('internal/process/promises');
 const errors = require('internal/errors');
 const emitPendingUnhandledRejections = promises.setup(scheduleMicrotasks);
 const { emitPromiseRejectionWarnings } = promises;
 const getDefaultTriggerAsyncId = async_hooks.getDefaultTriggerAsyncId;
 // Two arrays that share state between C++ and JS.
 const { async_hook_fields, async_id_fields } = async_wrap;
Expand All@@ -30,6 +30,7 @@ function setupNextTick() {

 // *Must* match Environment::TickInfo::Fields in src/env.h.
 const kHasScheduled = 0;
 const kHasPromiseRejections = 1;

 const nextTickQueue = {
 head: null,
Expand DownExpand Up@@ -58,39 +59,13 @@ function setupNextTick() {
 }
 };

 var microtasksScheduled = false;

 process.nextTick = nextTick;
 // Needs to be accessible from beyond this scope.
 process._tickCallback = _tickCallback;

 // Set the nextTick() function for internal usage.
 exports.nextTick = internalNextTick;

 const microTasksTickObject = {
 callback: runMicrotasksCallback,
 args: undefined,
 [async_id_symbol]: 0,
 [trigger_async_id_symbol]: 0
 };
 function scheduleMicrotasks() {
 if (microtasksScheduled)
 return;

 // For the moment all microtasks come from the void until the PromiseHook
 // API is implemented.
 nextTickQueue.push(microTasksTickObject);
 microtasksScheduled = true;
 }

 function runMicrotasksCallback() {
 microtasksScheduled = false;
 runMicrotasks();

 if (nextTickQueue.head !== null || emitPendingUnhandledRejections())
 scheduleMicrotasks();
 }

 function _tickCallback() {
 let tock;
 do {
Expand DownExpand Up@@ -118,8 +93,8 @@ function setupNextTick() {
 emitAfter(asyncId);
 }
 runMicrotasks();
 emitPendingUnhandledRejections();
} while (nextTickQueue.head !== null);
} while (nextTickQueue.head !== null || emitPromiseRejectionWarnings());
tickInfo[kHasPromiseRejections] = 0;
 }

 class TickObject {
Expand Down

186 changes: 86 additions & 100 deletions
lib/internal/process/promises.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,123 +2,109 @@

const { safeToString } = process.binding('util');

const promiseRejectEvent = process._promiseRejectEvent;
const hasBeenNotifiedProperty = new WeakMap();
const promiseToGuidProperty = new WeakMap();
const maybeUnhandledPromises = new WeakMap();
const pendingUnhandledRejections = [];
let lastPromiseId = 1;
const asyncHandledRejections = [];
let lastPromiseId = 0;

exports.setup = setupPromises;
module.exports = {
 emitPromiseRejectionWarnings
};

function getAsynchronousRejectionWarningObject(uid) {
 return new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
}

function setupPromises(scheduleMicrotasks) {
 let deprecationWarned = false;
process._setupPromises(unhandledRejection, handledRejection);

 process._setupPromises(function(event, promise, reason) {
 if (event === promiseRejectEvent.unhandled)
 unhandledRejection(promise, reason);
 else if (event === promiseRejectEvent.handled)
 rejectionHandled(promise);
 else
 require('assert').fail(null, null, 'unexpected PromiseRejectEvent');
function unhandledRejection(promise, reason) {
 maybeUnhandledPromises.set(promise, {
 reason,
 uid: ++lastPromiseId,
 warned: false
 });
 pendingUnhandledRejections.push(promise);
 return true;
}

 function unhandledRejection(promise, reason) {
 hasBeenNotifiedProperty.set(promise, false);
 promiseToGuidProperty.set(promise, lastPromiseId++);
 addPendingUnhandledRejection(promise, reason);
function handledRejection(promise) {
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 maybeUnhandledPromises.delete(promise);
 if (promiseInfo.warned) {
 const { uid } = promiseInfo;
 // Generate the warning object early to get a good stack trace.
 const warning = new Error('Promise rejection was handled ' +
 `asynchronously (rejection id: ${uid})`);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 asyncHandledRejections.push({ promise, warning });
 return true;
 }
 }
 return false;
}

 function rejectionHandled(promise) {
 const hasBeenNotified = hasBeenNotifiedProperty.get(promise);
 if (hasBeenNotified !== undefined) {
 hasBeenNotifiedProperty.delete(promise);
 const uid = promiseToGuidProperty.get(promise);
 promiseToGuidProperty.delete(promise);
 if (hasBeenNotified === true) {
 let warning = null;
 if (!process.listenerCount('rejectionHandled')) {
 // Generate the warning object early to get a good stack trace.
 warning = getAsynchronousRejectionWarningObject(uid);
 }
 process.nextTick(function() {
 if (!process.emit('rejectionHandled', promise)) {
 if (warning === null)
 warning = getAsynchronousRejectionWarningObject(uid);
 warning.name = 'PromiseRejectionHandledWarning';
 warning.id = uid;
 process.emitWarning(warning);
 }
 });
 }

const unhandledRejectionErrName = 'UnhandledPromiseRejectionWarning';
function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, unhandledRejectionErrName);
 } else {
 process.emitWarning(safeToString(reason), unhandledRejectionErrName);
 }
 } catch (e) {
 // ignored
 }

 function emitWarning(uid, reason) {
 try {
 if (reason instanceof Error) {
 process.emitWarning(reason.stack, 'UnhandledPromiseRejectionWarning');
 } else {
 process.emitWarning(
 safeToString(reason), 'UnhandledPromiseRejectionWarning'
 );
 }
 } catch (e) {
 // ignored
 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = unhandledRejectionErrName;
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 emitDeprecationWarning();
}

 const warning = new Error(
 'Unhandled promise rejection. This error originated either by ' +
 'throwing inside of an async function without a catch block, ' +
 'or by rejecting a promise which was not handled with .catch(). ' +
 `(rejection id: ${uid})`
 );
 warning.name = 'UnhandledPromiseRejectionWarning';
 try {
 if (reason instanceof Error) {
 warning.stack = reason.stack;
 }
 } catch (err) {
 // ignored
 }
 process.emitWarning(warning);
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
let deprecationWarned = false;
function emitDeprecationWarning() {
 if (!deprecationWarned) {
 deprecationWarned = true;
 process.emitWarning(
 'Unhandled promise rejections are deprecated. In the future, ' +
 'promise rejections that are not handled will terminate the ' +
 'Node.js process with a non-zero exit code.',
 'DeprecationWarning', 'DEP0018');
 }
}

 function emitPendingUnhandledRejections() {
 let hadListeners = false;
 while (pendingUnhandledRejections.length > 0) {
 const promise = pendingUnhandledRejections.shift();
 const reason = pendingUnhandledRejections.shift();
 if (hasBeenNotifiedProperty.get(promise) === false) {
 hasBeenNotifiedProperty.set(promise, true);
 const uid = promiseToGuidProperty.get(promise);
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
function emitPromiseRejectionWarnings() {
 while (asyncHandledRejections.length > 0) {
 const { promise, warning } = asyncHandledRejections.shift();
 if (!process.emit('rejectionHandled', promise)) {
 process.emitWarning(warning);
 }
 return hadListeners;
 }

 function addPendingUnhandledRejection(promise, reason) {
 pendingUnhandledRejections.push(promise, reason);
 scheduleMicrotasks();
 let hadListeners = false;
 let len = pendingUnhandledRejections.length;
 while (len--) {
 const promise = pendingUnhandledRejections.shift();
 const promiseInfo = maybeUnhandledPromises.get(promise);
 if (promiseInfo !== undefined) {
 promiseInfo.warned = true;
 const { reason, uid } = promiseInfo;
 if (!process.emit('unhandledRejection', reason, promise)) {
 emitWarning(uid, reason);
 } else {
 hadListeners = true;
 }
 }
 }

 return emitPendingUnhandledRejections;
 return hadListeners || pendingUnhandledRejections.length !== 0;
}

8 changes: 8 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,14 @@ inline bool Environment::TickInfo::has_scheduled() const {
 return fields_[kHasScheduled] == 1;
}

inline bool Environment::TickInfo::has_promise_rejections() const {
 return fields_[kHasPromiseRejections] == 1;
}

inline void Environment::TickInfo::promise_rejections_toggle_on() {
 fields_[kHasPromiseRejections] = 1;
}

inline void Environment::AssignToContext(v8::Local<v8::Context> context,
 const ContextInfo& info) {
 context->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex, this);
Expand Down

7 changes: 6 additions & 1 deletion
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -293,7 +293,8 @@ class ModuleWrap;
 V(performance_entry_callback, v8::Function) \
 V(performance_entry_template, v8::Function) \
 V(process_object, v8::Object) \
 V(promise_reject_function, v8::Function) \
 V(promise_reject_handled_function, v8::Function) \
 V(promise_reject_unhandled_function, v8::Function) \
 V(promise_wrap_template, v8::ObjectTemplate) \
 V(push_values_to_array_function, v8::Function) \
 V(randombytes_constructor_template, v8::ObjectTemplate) \
Expand DownExpand Up@@ -482,13 +483,17 @@ class Environment {
 public:
 inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();
 inline bool has_scheduled() const;
 inline bool has_promise_rejections() const;

 inline void promise_rejections_toggle_on();

 private:
 friend class Environment; // So we can call the constructor.
 inline explicit TickInfo(v8::Isolate* isolate);

 enum Fields {
 kHasScheduled,
 kHasPromiseRejections,
 kFieldsCount
 };

Expand Down
Loading