From c67fb7059ae05a24667c1dfd877faf1ff61ee5ce Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Fri, 19 May 2017 04:02:08 +0200 Subject: [PATCH] chore: use redis-parser dependency --- index.js | 3 --- lib/parser.js | 5 +++-- lib/parserError.js | 26 -------------------------- lib/redisError.js | 11 ----------- lib/replyError.js | 20 -------------------- package.json | 3 +++ test/errors.spec.js | 22 ---------------------- test/hiredis.js | 5 +++-- test/parsers.spec.js | 7 ++++--- 9 files changed, 13 insertions(+), 89 deletions(-) delete mode 100644 lib/parserError.js delete mode 100644 lib/redisError.js delete mode 100644 lib/replyError.js delete mode 100644 test/errors.spec.js diff --git a/index.js b/index.js index a0c777d..f5de376 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,3 @@ 'use strict' module.exports = require('./lib/parser') -module.exports.ReplyError = require('./lib/replyError') -module.exports.RedisError = require('./lib/redisError') -module.exports.ParserError = require('./lib/redisError') diff --git a/lib/parser.js b/lib/parser.js index 46378e3..3b7a84b 100644 --- a/lib/parser.js +++ b/lib/parser.js @@ -2,8 +2,9 @@ const StringDecoder = require('string_decoder').StringDecoder const decoder = new StringDecoder() -const ReplyError = require('./replyError') -const ParserError = require('./parserError') +const errors = require('redis-errors') +const ReplyError = errors.ReplyError +const ParserError = errors.ParserError var bufferPool = Buffer.allocUnsafe(32 * 1024) var bufferOffset = 0 var interval = null diff --git a/lib/parserError.js b/lib/parserError.js deleted file mode 100644 index ebdc8d9..0000000 --- a/lib/parserError.js +++ /dev/null @@ -1,26 +0,0 @@ -'use strict' - -const assert = require('assert') -const RedisError = require('./redisError') - -class ParserError extends RedisError { - constructor (message, buffer, offset) { - assert(buffer) - assert.strictEqual(typeof offset, 'number') - - const tmp = Error.stackTraceLimit - Error.stackTraceLimit = 2 - super(message) - Error.stackTraceLimit = tmp - this.offset = offset - this.buffer = buffer - } -} - -Object.defineProperty(ParserError.prototype, 'name', { - value: 'ParserError', - configurable: true, - writable: true -}) - -module.exports = ParserError diff --git a/lib/redisError.js b/lib/redisError.js deleted file mode 100644 index 96c2196..0000000 --- a/lib/redisError.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict' - -class RedisError extends Error {} - -Object.defineProperty(RedisError.prototype, 'name', { - value: 'RedisError', - configurable: true, - writable: true -}) - -module.exports = RedisError diff --git a/lib/replyError.js b/lib/replyError.js deleted file mode 100644 index d75ac4e..0000000 --- a/lib/replyError.js +++ /dev/null @@ -1,20 +0,0 @@ -'use strict' - -const RedisError = require('./redisError') - -class ReplyError extends RedisError { - constructor (message) { - const tmp = Error.stackTraceLimit - Error.stackTraceLimit = 2 - super(message) - Error.stackTraceLimit = tmp - } -} - -Object.defineProperty(ReplyError.prototype, 'name', { - value: 'ReplyError', - configurable: true, - writable: true -}) - -module.exports = ReplyError diff --git a/package.json b/package.json index ff278bf..0fa2c63 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,9 @@ "engines": { "node": ">=6" }, + "dependencies": { + "redis-errors": "^1.0.0" + }, "devDependencies": { "benchmark": "^2.1.0", "codeclimate-test-reporter": "^0.4.0", diff --git a/test/errors.spec.js b/test/errors.spec.js deleted file mode 100644 index 563413d..0000000 --- a/test/errors.spec.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict' - -/* eslint-env mocha */ - -const assert = require('assert') -const ReplyError = require('../lib/replyError') -const ParserError = require('../lib/parserError') -const RedisError = require('../lib/redisError') - -describe('errors', function () { - it('errors should have a stack trace with error message', function () { - const err1 = new RedisError('test') - const err2 = new ReplyError('test') - const err3 = new ParserError('test', Buffer.from(''), 0) - assert(err1.stack) - assert(err2.stack) - assert(err3.stack) - assert(/RedisError: test/.test(err1.stack)) - assert(/ReplyError: test/.test(err2.stack)) - assert(/ParserError: test/.test(err3.stack)) - }) -}) diff --git a/test/hiredis.js b/test/hiredis.js index 0d41b1f..ef92a2a 100644 --- a/test/hiredis.js +++ b/test/hiredis.js @@ -1,8 +1,9 @@ 'use strict' const hiredis = require('hiredis') -const ReplyError = require('../lib/replyError') -const ParserError = require('../lib/parserError') +const errors = require('redis-errors') +const ReplyError = errors.ReplyError +const ParserError = errors.ParserError /** * Parse data diff --git a/test/parsers.spec.js b/test/parsers.spec.js index 3365715..4cc9848 100644 --- a/test/parsers.spec.js +++ b/test/parsers.spec.js @@ -7,9 +7,10 @@ const assert = require('assert') const util = require('util') const JavascriptParser = require('../') const HiredisParser = require('./hiredis') -const ReplyError = JavascriptParser.ReplyError -const ParserError = JavascriptParser.ParserError -const RedisError = JavascriptParser.RedisError +const errors = require('redis-errors') +const ReplyError = errors.ReplyError +const ParserError = errors.ParserError +const RedisError = errors.RedisError const parsers = [HiredisParser, JavascriptParser] // Mock the not needed return functions