From 738a7dfc1866b344bf61ccd13766e98eb464587d Mon Sep 17 00:00:00 2001 From: "Matt Morgis (ELS-PHI)" Date: Tue, 28 May 2019 10:43:13 -0400 Subject: [PATCH 1/7] chore: adding gitignore --- .gitignore | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1a10c37 --- /dev/null +++ b/.gitignore @@ -0,0 +1,92 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ +package-lock.json + +# macOS BS +.DS_Store \ No newline at end of file From 8d368a78e67d501cd196bea67bfe403f6e114e3e Mon Sep 17 00:00:00 2001 From: "Matt Morgis (ELS-PHI)" Date: Tue, 28 May 2019 10:43:26 -0400 Subject: [PATCH 2/7] chore: banishing package-lock file --- .npmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..43c97e7 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +package-lock=false From 813e46ea856e9b6272eb520e9e0b91a3229926da Mon Sep 17 00:00:00 2001 From: "Matt Morgis (ELS-PHI)" Date: Wed, 29 May 2019 12:35:55 -0400 Subject: [PATCH 3/7] chore: add .vscode dir to .gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1a10c37..2150739 100644 --- a/.gitignore +++ b/.gitignore @@ -89,4 +89,6 @@ typings/ package-lock.json # macOS BS -.DS_Store \ No newline at end of file +.DS_Store + +.vscode \ No newline at end of file From d466341479f2cc79423f3060b3cf8abcd7db3439 Mon Sep 17 00:00:00 2001 From: "Matt Morgis (ELS-PHI)" Date: Mon, 3 Jun 2019 15:45:33 -0400 Subject: [PATCH 4/7] feat: working on Nodejs v10 --- index.js | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index e21ca0b..cd60ae1 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -var level = require('level'); +var level = require('@mattmorgis/level'); var has = require('has'); var pump = require('pump'); var fs = require('fs'); diff --git a/package.json b/package.json index c4784f9..4a7bf30 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "level-party", - "version": "3.0.4", + "version": "3.1.0", "description": "open a leveldb handle multiple times", "main": "index.js", "dependencies": { + "@mattmorgis/level": "^1.8.0", "has": "^1.0.0", - "level": "^1.4.0", "multileveldown": "^2.1.1", "pump": "^1.0.0" }, From e35352e2095a42d0447ed34d50703235638032e8 Mon Sep 17 00:00:00 2001 From: "Matt Morgis (ELS-PHI)" Date: Tue, 4 Jun 2019 14:24:51 -0400 Subject: [PATCH 5/7] chore: try @vweevers's multileveldown fork --- index.js | 14 +++++++++----- package.json | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index cd60ae1..077aa5e 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -var level = require('@mattmorgis/level'); +var level = require('level'); var has = require('has'); var pump = require('pump'); var fs = require('fs'); @@ -32,7 +32,11 @@ module.exports = function (dir, opts) { pump(socket, client.createRpcStream({ref: socket}), socket, function () { if (!client.isOpen()) return; - var db = level(dir, opts); + var db = level(dir, opts, function(err) { + if (err) { + onerror(err); + } + }); db.on('error', onerror); db.on('open', onopen); @@ -65,7 +69,7 @@ module.exports = function (dir, opts) { client.db = db.db; client.close = shutdown; client.emit('leader'); - down.forward(db.db); + down.db.forward(db.db); server.listen(sockPath, onlistening); @@ -81,10 +85,10 @@ module.exports = function (dir, opts) { function onlistening () { if (server.unref) server.unref(); - if (down.isFlushed()) return; + if (down.db.isFlushed()) return; var sock = net.connect(sockPath); - pump(sock, down.createRpcStream(), sock); + pump(sock, down.db.createRpcStream(), sock); client.once('flush', function () { sock.destroy(); }); diff --git a/package.json b/package.json index 4a7bf30..5e70760 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,9 @@ "description": "open a leveldb handle multiple times", "main": "index.js", "dependencies": { - "@mattmorgis/level": "^1.8.0", "has": "^1.0.0", - "multileveldown": "^2.1.1", + "level": "^5.0.1", + "multileveldown": "git+https://github.com/vweevers/multileveldown.git#wip-upgrade", "pump": "^1.0.0" }, "devDependencies": { From 7e726b0644640dff41acc6fc34812f06ec57ec0b Mon Sep 17 00:00:00 2001 From: "Matt Morgis (ELS-PHI)" Date: Wed, 5 Jun 2019 11:08:12 -0400 Subject: [PATCH 6/7] Revert "chore: try @vweevers's multileveldown fork" This reverts commit e35352e2095a42d0447ed34d50703235638032e8. --- index.js | 14 +++++--------- package.json | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/index.js b/index.js index 077aa5e..cd60ae1 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -var level = require('level'); +var level = require('@mattmorgis/level'); var has = require('has'); var pump = require('pump'); var fs = require('fs'); @@ -32,11 +32,7 @@ module.exports = function (dir, opts) { pump(socket, client.createRpcStream({ref: socket}), socket, function () { if (!client.isOpen()) return; - var db = level(dir, opts, function(err) { - if (err) { - onerror(err); - } - }); + var db = level(dir, opts); db.on('error', onerror); db.on('open', onopen); @@ -69,7 +65,7 @@ module.exports = function (dir, opts) { client.db = db.db; client.close = shutdown; client.emit('leader'); - down.db.forward(db.db); + down.forward(db.db); server.listen(sockPath, onlistening); @@ -85,10 +81,10 @@ module.exports = function (dir, opts) { function onlistening () { if (server.unref) server.unref(); - if (down.db.isFlushed()) return; + if (down.isFlushed()) return; var sock = net.connect(sockPath); - pump(sock, down.db.createRpcStream(), sock); + pump(sock, down.createRpcStream(), sock); client.once('flush', function () { sock.destroy(); }); diff --git a/package.json b/package.json index 5e70760..4a7bf30 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,9 @@ "description": "open a leveldb handle multiple times", "main": "index.js", "dependencies": { + "@mattmorgis/level": "^1.8.0", "has": "^1.0.0", - "level": "^5.0.1", - "multileveldown": "git+https://github.com/vweevers/multileveldown.git#wip-upgrade", + "multileveldown": "^2.1.1", "pump": "^1.0.0" }, "devDependencies": { From f04dbb4112c323e73b9b9f6cdbfea9264758631d Mon Sep 17 00:00:00 2001 From: "Matt Morgis (ELS-PHI)" Date: Wed, 5 Jun 2019 11:11:02 -0400 Subject: [PATCH 7/7] chore: lock in v1.8.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a7bf30..2eef8df 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "open a leveldb handle multiple times", "main": "index.js", "dependencies": { - "@mattmorgis/level": "^1.8.0", + "@mattmorgis/level": "1.8.0", "has": "^1.0.0", "multileveldown": "^2.1.1", "pump": "^1.0.0"