Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions es6.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
'use strict';

var Promise = require('./lib/core.js');
require('./lib/es6-extensions.js');
require('./lib/rejection-handlers-node.js');
module.exports = Promise;
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,9 @@
},
"dependencies": {
"asap": "~2.0.3"
},
"browser": {
"./lib/rejection-handlers-node": "./lib/rejection-handlers-client",
"./lib/rejection-handlers-node.js": "./lib/rejection-handlers-client.js"
}
}
}
47 changes: 47 additions & 0 deletions src/rejection-handlers-client.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
'use strict';

let id = 1;
Promise._onHandle = function (promise) {
if (
promise._state === 2 // IS REJECTED
) {
if (promise._rejectionEmitted) {
if (global.onrejectionhandled) {
global.onrejectionhandled({promise: promise, reason: promise._value});
}
if (promise._loggingID) {
console.warn(
'Promise Rejection Handled (id: ' + promise._loggingID + '):'
);
console.warn(
' This means you can ignore any previous messages of the form ' +
'"Possible Unhandled Promise Rejection" with id ' +
promise._loggingID + '.'
);
}
} else {
clearTimeout(promise._rejectionEmitTimer);
}
}
};
Promise._onReject = function (promise, err) {
if (promise._deferredState === 0) { // not yet handled
promise._rejectionEmitTimer = setTimeout(function () {
promise._rejectionEmitted = true;
if (global.onunhandledrejection) {
global.onunhandledrejection({promise: promise, reason: err});
} else {
promise._loggingID = id++;
console.warn(
'Possible Unhandled Promise Rejection (id: ' +
promise._loggingID +
'):'
);
var errStr = (error && (error.stack || error)) + '';
errStr.split('\n').forEach(function (line) {
console.warn(' ' + line);
});
}
}, 0);
}
};
47 changes: 47 additions & 0 deletions src/rejection-handlers-node.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
'use strict';

let id = 1;
Promise._onHandle = function (promise) {
if (
promise._state === 2 // IS REJECTED
) {
if (promise._rejectionEmitted) {
promise.emit('rejectionHandled', promise);
if (promise._loggingID) {
console.warn(
'Promise Rejection Handled (id: ' + promise._loggingID + '):'
);
console.warn(
' This means you can ignore any previous messages of the form ' +
'"Possible Unhandled Promise Rejection" with id ' +
promise._loggingID + '.'
);
}
} else {
clearTimeout(promise._rejectionEmitTimer);
}
}
};
Promise._onReject = function (promise, err) {
if (promise._deferredState === 0) { // not yet handled
promise._rejectionEmitTimer = setTimeout(function () {
promise._rejectionEmitted = true;
process.emit('unhandledRejection', promise, err);
if (
process.listenerCount &&
process.listenerCount('unhandledRejection') === 0
) {
promise._loggingID = id++;
console.warn(
'Possible Unhandled Promise Rejection (id: ' +
promise._loggingID +
'):'
);
var errStr = (error && (error.stack || error)) + '';
errStr.split('\n').forEach(function (line) {
console.warn(' ' + line);
});
}
}, 0);
}
};