From 8976c766031b306fd82eddfbfdbdceb9053c2f3a Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 24 Jun 2019 12:43:26 +0200 Subject: [PATCH] update all deps, fix standard linting --- client.js | 3 ++- leveldown.js | 2 +- package.json | 15 ++++++++------- server.js | 22 +++++++++++++++------- streams.js | 3 ++- test/basic.js | 40 +++++++++++++++++++--------------------- test/concurrent.js | 7 +++---- test/retry.js | 27 ++++++++++++++------------- test/streams.js | 7 +++---- 9 files changed, 67 insertions(+), 59 deletions(-) diff --git a/client.js b/client.js index dd49b33..4d7e781 100644 --- a/client.js +++ b/client.js @@ -1,6 +1,7 @@ var levelup = require('levelup') var duplexify = require('duplexify') var leveldown = require('./leveldown') +var encoding = require('encoding-down') module.exports = function (opts) { if (!opts) opts = {} @@ -8,7 +9,7 @@ module.exports = function (opts) { var down opts.db = createLeveldown opts.onflush = onflush - var db = levelup('multileveldown', opts) + var db = levelup(encoding(createLeveldown('multileveldown'), opts), opts) db.createRpcStream = db.connect = connect return db diff --git a/leveldown.js b/leveldown.js index 209e6f6..4bd4e4b 100644 --- a/leveldown.js +++ b/leveldown.js @@ -206,7 +206,7 @@ Multilevel.prototype._batch = function (batch, opts, cb) { Multilevel.prototype._write = function (req) { if (this._requests.length + this._iterators.length === 1) ref(this._ref) var enc = ENCODERS[req.tag] - var buf = new Buffer(enc.encodingLength(req) + 1) + var buf = Buffer.alloc(enc.encodingLength(req) + 1) buf[0] = req.tag enc.encode(req, buf, 1) this._encode.write(buf) diff --git a/package.json b/package.json index c276257..a2ac019 100644 --- a/package.json +++ b/package.json @@ -4,19 +4,20 @@ "description": "multilevel implemented using leveldowns with reconnect support", "main": "index.js", "dependencies": { - "abstract-leveldown": "^2.4.1", - "duplexify": "^3.4.2", + "abstract-leveldown": "^6.0.3", + "duplexify": "^4.1.1", + "encoding-down": "^6.0.2", "end-of-stream": "^1.1.0", - "length-prefixed-stream": "^1.4.0", - "levelup": "^1.3.1", + "length-prefixed-stream": "^2.0.0", + "levelup": "^4.0.2", "numeric-id-map": "^1.1.0", "protocol-buffers-encodings": "^1.1.0" }, "devDependencies": { - "concat-stream": "^1.5.1", - "memdown": "^1.1.0", + "concat-stream": "^2.0.0", + "level-mem": "^4.0.0", "protocol-buffers": "^4.0.2", - "standard": "^5.4.1", + "standard": "^12.0.1", "tape": "^4.4.0" }, "scripts": { diff --git a/server.js b/server.js index f8775d3..c02fc0f 100644 --- a/server.js +++ b/server.js @@ -71,8 +71,8 @@ module.exports = function (db, opts) { }) function callback (id, err, value) { - var msg = {id: id, error: err && err.message, value: value} - var buf = new Buffer(messages.Callback.encodingLength(msg) + 1) + var msg = { id: id, error: err && err.message, value: value } + var buf = Buffer.alloc(messages.Callback.encodingLength(msg) + 1) buf[0] = 0 messages.Callback.encode(msg, buf, 1) encode.write(buf) @@ -138,10 +138,18 @@ function Iterator (down, req, encode) { this.batch = req.batch || 0 if (req.options) { - if (req.options.gt === null) req.options.gt = undefined - if (req.options.gte === null) req.options.gte = undefined - if (req.options.lt === null) req.options.lt = undefined - if (req.options.lte === null) req.options.lte = undefined + if (!req.options.gt) { + delete req.options.gt + } + if (!req.options.gte) { + delete req.options.gte + } + if (!req.options.lt) { + delete req.options.lt + } + if (!req.options.lte) { + delete req.options.lte + } } this._iterator = down.iterator(req.options) @@ -163,7 +171,7 @@ function Iterator (down, req, encode) { self._data.key = key self._data.value = value self.batch-- - var buf = new Buffer(messages.IteratorData.encodingLength(self._data) + 1) + var buf = Buffer.alloc(messages.IteratorData.encodingLength(self._data) + 1) buf[0] = 1 messages.IteratorData.encode(self._data, buf, 1) encode.write(buf) diff --git a/streams.js b/streams.js index 716d57d..9b275ab 100644 --- a/streams.js +++ b/streams.js @@ -1,4 +1,5 @@ var pbs = require('pbs') var fs = require('fs') +var path = require('path') -module.exports = pbs(fs.readFileSync(__dirname + '/schema.proto')) +module.exports = pbs(fs.readFileSync(path.join(__dirname, 'schema.proto'))) diff --git a/test/basic.js b/test/basic.js index 0ef4661..2ba3bc0 100644 --- a/test/basic.js +++ b/test/basic.js @@ -1,11 +1,10 @@ var tape = require('tape') -var memdown = require('memdown') var concat = require('concat-stream') -var levelup = require('levelup') +var level = require('level-mem') var multileveldown = require('../') tape('get', function (t) { - var db = levelup('no-location', {db: mem}) + var db = level() var stream = multileveldown.server(db) var client = multileveldown.client() @@ -21,7 +20,7 @@ tape('get', function (t) { }) tape('put', function (t) { - var db = levelup('no-location', {db: mem}) + var db = level() var stream = multileveldown.server(db) var client = multileveldown.client() @@ -38,11 +37,11 @@ tape('put', function (t) { }) tape('readonly', function (t) { - var db = levelup('no-location', {db: mem}) + var db = level() db.put('hello', 'verden') - var stream = multileveldown.server(db, {readonly: true}) + var stream = multileveldown.server(db, { readonly: true }) var client = multileveldown.client() stream.pipe(client.createRpcStream()).pipe(stream) @@ -58,7 +57,7 @@ tape('readonly', function (t) { }) tape('del', function (t) { - var db = levelup('no-location', {db: mem}) + var db = level() var stream = multileveldown.server(db) var client = multileveldown.client() @@ -78,13 +77,13 @@ tape('del', function (t) { }) tape('batch', function (t) { - var db = levelup('no-location', {db: mem}) + var db = level() var stream = multileveldown.server(db) var client = multileveldown.client() stream.pipe(client.createRpcStream()).pipe(stream) - client.batch([{type: 'put', key: 'hello', value: 'world'}, {type: 'put', key: 'hej', value: 'verden'}], function (err) { + client.batch([{ type: 'put', key: 'hello', value: 'world' }, { type: 'put', key: 'hej', value: 'verden' }], function (err) { t.error(err, 'no err') client.get('hello', function (err, value) { t.error(err, 'no err') @@ -99,42 +98,41 @@ tape('batch', function (t) { }) tape('read stream', function (t) { - var db = levelup('no-location', {db: mem}) + var db = level() var stream = multileveldown.server(db) var client = multileveldown.client() stream.pipe(client.createRpcStream()).pipe(stream) - client.batch([{type: 'put', key: 'hello', value: 'world'}, {type: 'put', key: 'hej', value: 'verden'}], function (err) { + client.batch([{ type: 'put', key: 'hello', value: 'world' }, { type: 'put', key: 'hej', value: 'verden' }], function (err) { t.error(err, 'no err') + var rs = client.createReadStream() rs.pipe(concat(function (datas) { t.same(datas.length, 2) - t.same(datas[0], {key: 'hej', value: 'verden'}) - t.same(datas[1], {key: 'hello', value: 'world'}) + t.same(datas[0], { key: 'hej', value: 'verden' }) + t.same(datas[1], { key: 'hello', value: 'world' }) t.end() })) }) }) tape('read stream (gt)', function (t) { - var db = levelup('no-location', {db: mem}) + var db = level() var stream = multileveldown.server(db) var client = multileveldown.client() stream.pipe(client.createRpcStream()).pipe(stream) - client.batch([{type: 'put', key: 'hello', value: 'world'}, {type: 'put', key: 'hej', value: 'verden'}], function (err) { + client.batch([{ type: 'put', key: 'hello', value: 'world' }, { type: 'put', key: 'hej', value: 'verden' }], function (err) { t.error(err, 'no err') - var rs = client.createReadStream({gt: 'hej'}) + var rs = client.createReadStream({ + gt: 'hej' + }) rs.pipe(concat(function (datas) { t.same(datas.length, 1) - t.same(datas[0], {key: 'hello', value: 'world'}) + t.same(datas[0], { key: 'hello', value: 'world' }) t.end() })) }) }) - -function mem () { - return memdown() -} diff --git a/test/concurrent.js b/test/concurrent.js index 50afaa2..9be2311 100644 --- a/test/concurrent.js +++ b/test/concurrent.js @@ -1,18 +1,17 @@ var tape = require('tape') -var memdown = require('memdown') -var levelup = require('levelup') +var level = require('level-mem') var concat = require('concat-stream') var multileveldown = require('../') tape('two concurrent iterators', function (t) { - var db = levelup('', {db: memdown}) + var db = level() var server = multileveldown.server(db) var client = multileveldown.client() server.pipe(client.connect()).pipe(server) var batch = [] - for (var i = 0; i < 100; i++) batch.push({type: 'put', key: 'key-' + i, value: 'value-' + i}) + for (var i = 0; i < 100; i++) batch.push({ type: 'put', key: 'key-' + i, value: 'value-' + i }) client.batch(batch, function (err) { t.error(err) diff --git a/test/retry.js b/test/retry.js index 18e641a..96a6ccc 100644 --- a/test/retry.js +++ b/test/retry.js @@ -1,12 +1,11 @@ var tape = require('tape') -var memdown = require('memdown') -var levelup = require('levelup') +var level = require('level-mem') var multileveldown = require('../') tape('retry get', function (t) { - var db = levelup('no-location', {db: memdown}) + var db = level() var stream = multileveldown.server(db) - var client = multileveldown.client({retry: true}) + var client = multileveldown.client({ retry: true }) db.put('hello', 'world', function () { client.get('hello', function (err, value) { @@ -20,9 +19,9 @@ tape('retry get', function (t) { }) tape('no retry get', function (t) { - var db = levelup('no-location', {db: memdown}) + var db = level() var stream = multileveldown.server(db) - var client = multileveldown.client({retry: false}) + var client = multileveldown.client({ retry: false }) client.open(function () { db.put('hello', 'world', function () { @@ -44,9 +43,9 @@ tape('no retry get', function (t) { }) tape('retry get', function (t) { - var db = levelup('no-location', {db: memdown}) + var db = level() var stream = multileveldown.server(db) - var client = multileveldown.client({retry: true}) + var client = multileveldown.client({ retry: true }) client.open(function () { db.put('hello', 'world', function () { @@ -69,8 +68,8 @@ tape('retry get', function (t) { }) tape('retry read stream', function (t) { - var db = levelup('no-location', {db: memdown}) - var client = multileveldown.client({retry: true}) + var db = level() + var client = multileveldown.client({ retry: true }) client.open(function () { db.batch([{ @@ -124,8 +123,8 @@ tape('retry read stream', function (t) { }) tape('retry read stream and limit', function (t) { - var db = levelup('no-location', {db: memdown}) - var client = multileveldown.client({retry: true}) + var db = level() + var client = multileveldown.client({ retry: true }) client.open(function () { db.batch([{ @@ -141,7 +140,9 @@ tape('retry read stream and limit', function (t) { key: 'hola', value: 'mundo' }], function () { - var rs = client.createReadStream({limit: 2}) + var rs = client.createReadStream({ + limit: 2 + }) var expected = [{ key: 'hej', value: 'verden' diff --git a/test/streams.js b/test/streams.js index 50afaa2..9be2311 100644 --- a/test/streams.js +++ b/test/streams.js @@ -1,18 +1,17 @@ var tape = require('tape') -var memdown = require('memdown') -var levelup = require('levelup') +var level = require('level-mem') var concat = require('concat-stream') var multileveldown = require('../') tape('two concurrent iterators', function (t) { - var db = levelup('', {db: memdown}) + var db = level() var server = multileveldown.server(db) var client = multileveldown.client() server.pipe(client.connect()).pipe(server) var batch = [] - for (var i = 0; i < 100; i++) batch.push({type: 'put', key: 'key-' + i, value: 'value-' + i}) + for (var i = 0; i < 100; i++) batch.push({ type: 'put', key: 'key-' + i, value: 'value-' + i }) client.batch(batch, function (err) { t.error(err)