github/diceware
1
0
Fork 0
mirror of https://github.com/dmuth/diceware.git synced 2024-11-24 17:56:35 -05:00
Code Issues Projects Releases Packages Wiki Activity

Tweaked how some errors were returned so that the functions could be unit tested.

Browse source
This commit is contained in:
Douglas Muth 2017-11-09 22:05:35 -05:00
parent a97b733444
commit eda37b2da0
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/lib.js
View file

@ -10,10 +10,23 @@ var randomNumber = require("random-number-csprng");
*/ */
module.exports.iCanHasGoodCrypto = iCanHasGoodCrypto = function() { module.exports.iCanHasGoodCrypto = iCanHasGoodCrypto = function() {
//return(false); // Debugging //
// If we don't have a Window variable, we're in Node.js, probably doing unit tests, so
// return true.
//
// Even if I screw this up and there exists a web browser that doesn't have window defined
// worst case is that a non-existant crypto.getRandomValues() function is called, and I'd rather
// have some sort of error versus a user accidentally using weak crypto.
//
if (typeof(window) == "undefined") {
return(true);
}
if (typeof(window) != "undefined") {
if (window.crypto && window.crypto.getRandomValues) { if (window.crypto && window.crypto.getRandomValues) {
return(true); return(true);
} }
}
return(false); return(false);
@ -26,8 +39,9 @@ module.exports.iCanHasGoodCrypto = iCanHasGoodCrypto = function() {
module.exports.getRandomValue = getRandomValue = function(max) { module.exports.getRandomValue = getRandomValue = function(max) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
if (max <= 0){ if (max <= 0) {
resolve(NaN); reject("max can't be less or equal to zero!");
return(null);
} }
if (iCanHasGoodCrypto()) { if (iCanHasGoodCrypto()) {
@ -40,7 +54,7 @@ module.exports.getRandomValue = getRandomValue = function(max) {
resolve(retval); resolve(retval);
}).catch({code: "RandomGenerationError"}, function(err) { }).catch({code: "RandomGenerationError"}, function(err) {
console.log("randomNumber(): Something went wrong!"); reject(err);
}); });
@ -75,11 +89,11 @@ module.exports.getBase6 = getBase6 = function(roll, num_dice) {
// //
var max_dice_roll = Math.pow(6, num_dice) - 1; var max_dice_roll = Math.pow(6, num_dice) - 1;
if (roll > max_dice_roll) { if (roll > max_dice_roll) {
throw("Value too large!"); throw(new Error("Value too large!"));
} }
if (roll < 0) { if (roll < 0) {
throw("Value cannot be negative!"); throw(new Error("Value cannot be negative!"));
} }
// //