Merge pull request #10 from realityking/node-6

Require Node.js 6.9, update dependencies, use modern JS syntax

Author: ctalkington

.travis.yml

@@ -4,6 +4,5 @@ node_js:
   - 10
   - 8
   - 6
-  - 4
 matrix:
   fast_finish: true

README.md

@@ -17,10 +17,10 @@ You can also use `npm install https://github.com/archiverjs/node-crc32-stream/ar
 Inherits [Transform Stream](http://nodejs.org/api/stream.html#stream_class_stream_transform) options and methods.
 
 ```js
-var CRC32Stream = require('crc32-stream');
+const {CRC32Stream} = require('crc32-stream');
 
-var source = fs.createReadStream('file.txt');
-var checksum = new CRC32Stream();
+const source = fs.createReadStream('file.txt');
+const checksum = new CRC32Stream();
 
 checksum.on('end', function(err) {
   // do something with checksum.digest() here
@@ -39,10 +39,10 @@ checksum.end();
 Inherits [zlib.DeflateRaw](http://nodejs.org/api/zlib.html#zlib_class_zlib_deflateraw) options and methods.
 
 ```js
-var DeflateCRC32Stream = require('crc32-stream').DeflateCRC32Stream;
+const {DeflateCRC32Stream} = require('crc32-stream');
 
-var source = fs.createReadStream('file.txt');
-var checksum = new DeflateCRC32Stream();
+const source = fs.createReadStream('file.txt');
+const checksum = new DeflateCRC32Stream();
 
 checksum.on('end', function(err) {
   // do something with checksum.digest() here

appveyor.yml

@@ -3,7 +3,6 @@ environment:
     - nodejs_version: '10'
     - nodejs_version: '8'
     - nodejs_version: '6'
-    - nodejs_version: '4'
 install:
   - ps: Install-Product node $env:nodejs_version
   - set CI=true

lib/crc32-stream.js

@@ -5,40 +5,44 @@
  * Licensed under the MIT license.
  * https://github.com/archiverjs/node-crc32-stream/blob/master/LICENSE-MIT
  */
-var inherits = require('util').inherits;
-var Transform = require('readable-stream').Transform;
 
-var crc32 = require('crc').crc32;
+ 'use strict';
 
-var CRC32Stream = module.exports = function CRC32Stream(options) {
-  Transform.call(this, options);
-  this.checksum = Buffer.allocUnsafe(4);
-  this.checksum.writeInt32BE(0, 0);
+const {Transform} = require('readable-stream');
 
-  this.rawSize = 0;
-};
+const {crc32} = require('crc');
 
-inherits(CRC32Stream, Transform);
+class CRC32Stream extends Transform {
+  constructor(options) {
+    super(options);
+    this.checksum = Buffer.allocUnsafe(4);
+    this.checksum.writeInt32BE(0, 0);
 
-CRC32Stream.prototype._transform = function(chunk, encoding, callback) {
-  if (chunk) {
-    this.checksum = crc32(chunk, this.checksum);
-    this.rawSize += chunk.length;
+    this.rawSize = 0;
   }
 
-  callback(null, chunk);
-};
+  _transform(chunk, encoding, callback) {
+    if (chunk) {
+      this.checksum = crc32(chunk, this.checksum);
+      this.rawSize += chunk.length;
+    }
 
-CRC32Stream.prototype.digest = function(encoding) {
-  var checksum = Buffer.allocUnsafe(4);
-  checksum.writeUInt32BE(this.checksum >>> 0, 0);
-  return encoding ? checksum.toString(encoding) : checksum;
-};
+    callback(null, chunk);
+  }
+
+  digest(encoding) {
+    const checksum = Buffer.allocUnsafe(4);
+    checksum.writeUInt32BE(this.checksum >>> 0, 0);
+    return encoding ? checksum.toString(encoding) : checksum;
+  }
 
-CRC32Stream.prototype.hex = function() {
-  return this.digest('hex').toUpperCase();
-};
+  hex() {
+    return this.digest('hex').toUpperCase();
+  }
+
+  size() {
+    return this.rawSize;
+  }
+}
 
-CRC32Stream.prototype.size = function() {
-  return this.rawSize;
-};
+module.exports = CRC32Stream;

lib/deflate-crc32-stream.js

@@ -5,65 +5,58 @@
  * Licensed under the MIT license.
  * https://github.com/archiverjs/node-crc32-stream/blob/master/LICENSE-MIT
  */
-var zlib = require('zlib');
-var inherits = require('util').inherits;
 
-var crc32 = require('crc').crc32;
+'use strict';
 
-var DeflateCRC32Stream = module.exports = function (options) {
-  zlib.DeflateRaw.call(this, options);
+const {DeflateRaw} = require('zlib');
 
-  this.checksum = Buffer.allocUnsafe(4);
-  this.checksum.writeInt32BE(0, 0);
+const {crc32} = require('crc');
 
-  this.rawSize = 0;
-  this.compressedSize = 0;
+class DeflateCRC32Stream extends DeflateRaw {
+  constructor(options) {
+    super(options);
 
-  // BC v0.8
-  if (typeof zlib.DeflateRaw.prototype.push !== 'function') {
-    this.on('data', function(chunk) {
-      if (chunk) {
-        this.compressedSize += chunk.length;
-      }
-    });
-  }
-};
-
-inherits(DeflateCRC32Stream, zlib.DeflateRaw);
+    this.checksum = Buffer.allocUnsafe(4);
+    this.checksum.writeInt32BE(0, 0);
 
-DeflateCRC32Stream.prototype.push = function(chunk, encoding) {
-  if (chunk) {
-    this.compressedSize += chunk.length;
+    this.rawSize = 0;
+    this.compressedSize = 0;
   }
 
-  return zlib.DeflateRaw.prototype.push.call(this, chunk, encoding);
-};
+  push(chunk, encoding) {
+    if (chunk) {
+      this.compressedSize += chunk.length;
+    }
 
-DeflateCRC32Stream.prototype.write = function(chunk, enc, cb) {
-  if (chunk) {
-    this.checksum = crc32(chunk, this.checksum);
-    this.rawSize += chunk.length;
+    return super.push(chunk, encoding);
   }
 
-  return zlib.DeflateRaw.prototype.write.call(this, chunk, enc, cb);
-};
+  write(chunk, enc, cb) {
+    if (chunk) {
+      this.checksum = crc32(chunk, this.checksum);
+      this.rawSize += chunk.length;
+    }
 
-DeflateCRC32Stream.prototype.digest = function(encoding) {
-  var checksum = Buffer.allocUnsafe(4);
-  checksum.writeUInt32BE(this.checksum >>> 0, 0);
-  return encoding ? checksum.toString(encoding) : checksum;
-};
+    return super.write(chunk, enc, cb);
+  }
 
-DeflateCRC32Stream.prototype.hex = function() {
-  return this.digest('hex').toUpperCase();
-};
+  digest(encoding) {
+    const checksum = Buffer.allocUnsafe(4);
+    checksum.writeUInt32BE(this.checksum >>> 0, 0);
+    return encoding ? checksum.toString(encoding) : checksum;
+  }
 
-DeflateCRC32Stream.prototype.size = function(compressed) {
-  compressed = compressed || false;
+  hex() {
+    return this.digest('hex').toUpperCase();
+  }
 
-  if (compressed) {
-    return this.compressedSize;
-  } else {
-    return this.rawSize;
+  size(compressed = false) {
+    if (compressed) {
+      return this.compressedSize;
+    } else {
+      return this.rawSize;
+    }
   }
-};
+}
+
+module.exports = DeflateCRC32Stream;

lib/index.js

@@ -5,6 +5,10 @@
  * Licensed under the MIT license.
  * https://github.com/archiverjs/node-crc32-stream/blob/master/LICENSE-MIT
  */
-exports = module.exports = require('./crc32-stream');
-exports.CRC32Stream = exports;
-exports.DeflateCRC32Stream = require('./deflate-crc32-stream');
+
+'use strict';
+
+module.exports = {
+  CRC32Stream: require('./crc32-stream'),
+  DeflateCRC32Stream: require('./deflate-crc32-stream')
+}

package.json

@@ -20,18 +20,18 @@
     "lib"
   ],
   "engines": {
-    "node": ">= 4.5.0"
+    "node": ">= 6.9.0"
   },
   "scripts": {
     "test": "mocha --reporter dot"
   },
   "dependencies": {
     "crc": "^3.4.4",
-    "readable-stream": "^2.0.0"
+    "readable-stream": "^3.2.0"
   },
   "devDependencies": {
     "chai": "^4.0.0",
-    "mocha": "^5.0.0"
+    "mocha": "^6.0.2"
   },
   "keywords": [
     "crc32-stream",

test/checksum.js

@@ -1,17 +1,18 @@
 /*global before,describe,it */
-var assert = require('chai').assert;
 
-var helpers = require('./helpers');
-var BinaryStream = helpers.BinaryStream;
-var DeadEndStream = helpers.DeadEndStream;
+'use strict';
 
-var CRC32Stream = require('../lib/crc32-stream.js');
+const {assert} = require('chai');
+
+const {BinaryStream, DeadEndStream} = require('./helpers');
+
+const CRC32Stream = require('../lib/crc32-stream.js');
 
 describe('CRC32Stream', function() {
   it('should checksum data while passing through data', function(done) {
-    var binary = new BinaryStream(1024 * 16);
-    var checksum = new CRC32Stream();
-    var deadend = new DeadEndStream();
+    const binary = new BinaryStream(1024 * 16);
+    const checksum = new CRC32Stream();
+    const deadend = new DeadEndStream();
 
     checksum.on('end', function() {
       assert.equal(checksum.digest().readUInt32BE(0), 3893830384);
@@ -26,8 +27,8 @@ describe('CRC32Stream', function() {
   });
 
   it('should gracefully handle having no data chunks passed to it', function(done) {
-    var checksum = new CRC32Stream();
-    var deadend = new DeadEndStream();
+    const checksum = new CRC32Stream();
+    const deadend = new DeadEndStream();
 
     checksum.on('end', function() {
       assert.equal(checksum.digest().readUInt32BE(0), 0);

test/deflate.js

@@ -1,17 +1,18 @@
 /*global before,describe,it */
-var assert = require('chai').assert;
 
-var helpers = require('./helpers');
-var BinaryStream = helpers.BinaryStream;
-var DeadEndStream = helpers.DeadEndStream;
+'use strict';
 
-var DeflateCRC32Stream = require('../lib/deflate-crc32-stream.js');
+const {assert} = require('chai');
+
+const {BinaryStream, DeadEndStream} = require('./helpers');
+
+const DeflateCRC32Stream = require('../lib/deflate-crc32-stream.js');
 
 describe('DeflateCRC32Stream', function() {
   it('should checksum data while passing through data', function(done) {
-    var binary = new BinaryStream(1024 * 16);
-    var checksum = new DeflateCRC32Stream();
-    var deadend = new DeadEndStream();
+    const binary = new BinaryStream(1024 * 16);
+    const checksum = new DeflateCRC32Stream();
+    const deadend = new DeadEndStream();
 
     checksum.on('end', function() {
       assert.equal(checksum.digest().readUInt32BE(0), 3893830384);
@@ -27,8 +28,8 @@ describe('DeflateCRC32Stream', function() {
   });
 
   it('should gracefully handle having no data chunks passed to it', function(done) {
-    var checksum = new DeflateCRC32Stream();
-    var deadend = new DeadEndStream();
+    const checksum = new DeflateCRC32Stream();
+    const deadend = new DeadEndStream();
 
     checksum.on('end', function() {
       assert.equal(checksum.digest().readUInt32BE(0), 0);