X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmystery-box.js;h=55d1c3827746ccbc35b2e2e64ce30e9df692888f;hb=bb961eddde4819cb9ac0a75151a99ea8e6e5ba53;hp=5dcf1b1fe4dbc8486c62de6e0cf3cbd3be96f2a6;hpb=2ef5f9c74d92c8eb8cc0bd03fecc9d1a1d306489;p=squeep-mystery-box

diff --git a/lib/mystery-box.js b/lib/mystery-box.js
index 5dcf1b1..55d1c38 100644
--- a/lib/mystery-box.js
+++ b/lib/mystery-box.js
@@ -4,7 +4,7 @@ const { EventEmitter } = require('events');
 const crypto = require('crypto');
 const zlib = require('zlib');
 const { promisify } = require('util');
-const common = require('./common');
+const { MysteryBoxError } = require('./errors');
 const allVersions = require('./version-parameters');
 const { performance } = require('perf_hooks');
 const { name: packageName, version: packageVersion } = require('../package.json');
@@ -19,6 +19,7 @@ const brotliDecompressAsync = promisify(zlib.brotliDecompress);
 const deflateRawAsync = promisify(zlib.deflateRaw);
 const inflateRawAsync = promisify(zlib.inflateRaw);
 const scryptAsync = promisify(crypto.scrypt);
+const randomBytesAsync = promisify(crypto.randomBytes);
 
 /**
  * Only you will know what's inside your...
@@ -62,7 +63,6 @@ const compressionFlagsShift = 0;
 const payloadFlagsMask = (availableFlags.BufferPayload);
 const payloadFlagsShift = 7;
 
-
 class MysteryBox extends EventEmitter {
   /**
    * @param {Object} options
@@ -71,9 +71,9 @@ class MysteryBox extends EventEmitter {
    */
   constructor(options = {}, ...args) {
     super(...args);
-    this.secrets = common.ensureArray(options.encryptionSecret);
+    this.secrets = MysteryBox._ensureArray(options.encryptionSecret);
     if (!this.secrets.length) {
-      throw new Error('missing encryption secret');
+      throw new MysteryBoxError('missing encryption secret');
     }
 
     // Filter any unavailable algorithms
@@ -93,17 +93,32 @@ class MysteryBox extends EventEmitter {
     // Default to highest
     this.bestVersion = Number(Object.keys(this.versionParameters).sort().pop());
     if (Number.isNaN(this.bestVersion)) {
-      throw new Error('no supported versions available');
+      throw new MysteryBoxError('no supported versions available');
     }
 
     this.Flags = availableFlags;
     this.defaultFlags = 'defaultFlags' in options ? options.defaultFlags : availableFlags.Flate;
     if (this.defaultFlags < 0 || this.defaultFlags > 255) {
-      throw new RangeError('Invalid default flag value');
+      throw new MysteryBoxError('Invalid default flag value');
     }
   }
 
 
+  /**
+   * Return an array containing x if x is something and not an array
+   * @param {*} x
+   */
+  static _ensureArray(x) {
+    if (x === undefined) {
+      return [];
+    }
+    if (!Array.isArray(x)) {
+      return Array(x);
+    }
+    return x;
+  }
+
+
   /**
    * Parse the bits out of the flags.
    */
@@ -142,7 +157,7 @@ class MysteryBox extends EventEmitter {
         return scryptAsync(secret, salt, keyBytes);
 
       default:
-        throw new RangeError('unsupported key deriver');
+        throw new MysteryBoxError('unsupported key deriver');
     }
   }
 
@@ -187,7 +202,7 @@ class MysteryBox extends EventEmitter {
       }
     }
     // Nine bytes would be an extravagence.
-    throw new RangeError(`unsupported version header (0x${firstByte.toString(16)})`);
+    throw new MysteryBoxError(`unsupported version header (0x${firstByte.toString(16)})`);
   }
 
 
@@ -211,7 +226,7 @@ class MysteryBox extends EventEmitter {
     }
 
     if (versionBytes > 6) {
-      throw new RangeError(`unsupported version (${versionBytes} bytes)`);
+      throw new MysteryBoxError(`unsupported version (${versionBytes} bytes)`);
     }
 
     // Otherwise, update the masked first byte and parse the rest of the buffer.
@@ -244,7 +259,7 @@ class MysteryBox extends EventEmitter {
     } else if (version <= 0x03ffffffffff) { // 34359738368-4398046511103
       versionBytes = 6;
     } else {
-      throw new RangeError('version too large to encode');
+      throw new MysteryBoxError(`version too large to encode (${version})`);
     }
 
     const buffer = Buffer.alloc(versionBytes);
@@ -290,13 +305,13 @@ class MysteryBox extends EventEmitter {
    * @param {Object|Buffer} contents
    * @param {Number=} version
    * @param {Number=} flags
-   * @returns {String}
+   * @returns {Promise<String>}
    */
   async pack(contents, version = this.bestVersion, flags = this.defaultFlags) {
     const { stats, timingsMs } = MysteryBox._newStats('pack');
 
     if (!(version in this.versionParameters)) {
-      throw new RangeError(`MysteryBox format version ${version} not supported`);
+      throw new MysteryBoxError(`MysteryBox format version ${version} not supported`);
     }
     // eslint-disable-next-line security/detect-object-injection
     const v = this.versionParameters[version];
@@ -320,13 +335,13 @@ class MysteryBox extends EventEmitter {
 
     const { buffer: versionBuffer, versionBytes } = MysteryBox._versionEncode(v.version);
     if (versionBytes !== v.versionBytes) {
-      throw new Error('internal inconsistency, mismatched version byte length');
+      throw new MysteryBoxError('internal inconsistency, mismatched version byte length');
     }
 
     const [iv, salt] = await Promise.all([
       v.ivBytes,
       v.saltBytes,
-    ].map((b) => common.randomBytesAsync(b)));
+    ].map((b) => randomBytesAsync(b)));
 
     timingsMs.preCompress = performance.now();
     let compressedContents;
@@ -384,13 +399,13 @@ class MysteryBox extends EventEmitter {
   /**
    * Take contents out of a mysterious box.
    * @param {String} box - Base64URL encoded payload
-   * @returns {Object}
+   * @returns {Promise<Object>}
    */
   async unpack(box) {
     const { stats, timingsMs } = MysteryBox._newStats('unpack');
 
     if (!box) {
-      throw new RangeError('nothing to unpack');
+      throw new MysteryBoxError('nothing to unpack');
     }
 
     const raw = Buffer.from(box, 'base64url');
@@ -398,20 +413,20 @@ class MysteryBox extends EventEmitter {
 
     const { version, versionBytes } = MysteryBox._versionDecode(raw);
     if (!(version in this.versionParameters)) {
-      throw new RangeError('unsupported version');
+      throw new MysteryBoxError(`unsupported version (${version})`);
     }
     // eslint-disable-next-line security/detect-object-injection
     const v = this.versionParameters[version];
 
     if (v.versionBytes !== versionBytes) {
-      throw new Error('internal inconsistency, mismatched version byte length');
+      throw new MysteryBoxError('internal inconsistency, mismatched version byte length');
     }
     offset += v.versionBytes;
     stats.version = version;
 
     const minBytes = v.versionBytes + v.flagsBytes + v.ivBytes + v.saltBytes + v.tagBytes;
     if (raw.length < minBytes) {
-      throw new RangeError('not enough to unpack');
+      throw new MysteryBoxError('not enough to unpack');
     }
 
     const flags = raw.subarray(offset, offset + v.flagsBytes).readUInt8(0);
@@ -507,7 +522,7 @@ class MysteryBox extends EventEmitter {
   /**
    * Everyone loves numbers.
    * @param {Object} timingsMs
-   * @returns 
+   * @returns {Object}
    */
   static _timingsLog({ start, preCompress, postCompress, preCrypt, postCrypt, end }) {
     return {
@@ -519,4 +534,4 @@ class MysteryBox extends EventEmitter {
 
 }
 
-module.exports = MysteryBox;
\ No newline at end of file
+module.exports = MysteryBox;