harperdb 3.2.0 → 3.3.0

package/node_modules/lmdb-store/index.mjs

@@ -1,3 +1,3 @@
-import lmdbModule from './index.js'
-const { Env, Cursor, Compression, getLastVersion, setLastVersion, open, compareKey, getLastEntrySize } = lmdbModule
-export { Env, Cursor, Compression, getLastVersion, setLastVersion, open, compareKey, getLastEntrySize }
+import lmdbModule from './index.js'
+const { Env, Cursor, Compression, getLastVersion, setLastVersion, open, compareKey, getLastEntrySize } = lmdbModule
+export { Env, Cursor, Compression, getLastVersion, setLastVersion, open, compareKey, getLastEntrySize }

package/node_modules/lmdb-store/package.json

@@ -1,31 +1,31 @@
 {
   "_args": [
     [
-      "lmdb-store@1.5.5",
+      "lmdb-store@1.5.6",
       "/home/ubuntu/buildAgent/work/20f715f46c2b009e"
     ]
   ],
-  "_from": "lmdb-store@1.5.5",
-  "_id": "lmdb-store@1.5.5",
+  "_from": "lmdb-store@1.5.6",
+  "_id": "lmdb-store@1.5.6",
   "_inBundle": false,
-  "_integrity": "sha512-EwCn+eSGH1XD35qaDzbHTYMig+Aj+kBbCpxWHzhtrIBJpFYq5uoBo4zWG4JRFxsbfonFELhuiyX0QokISIxzsQ==",
+  "_integrity": "sha512-elaTwWRrN/fLv9Q9+aQn2cuHwoOm+E+8kuO2xrW77z7f4g4hUnT67YYlQtgJLU8cJoCWuzUivmDtorO8/dr4qw==",
   "_location": "/lmdb-store",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "lmdb-store@1.5.5",
+    "raw": "lmdb-store@1.5.6",
     "name": "lmdb-store",
     "escapedName": "lmdb-store",
-    "rawSpec": "1.5.5",
+    "rawSpec": "1.5.6",
     "saveSpec": null,
-    "fetchSpec": "1.5.5"
+    "fetchSpec": "1.5.6"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/lmdb-store/-/lmdb-store-1.5.5.tgz",
-  "_spec": "1.5.5",
+  "_resolved": "https://registry.npmjs.org/lmdb-store/-/lmdb-store-1.5.6.tgz",
+  "_spec": "1.5.6",
   "_where": "/home/ubuntu/buildAgent/work/20f715f46c2b009e",
   "author": {
     "name": "Kris Zyp"
@@ -48,7 +48,8 @@
     "fs-extra": "^9.0.1",
     "jshint": "^2.12.0",
     "mocha": "^8.3.2",
-    "node-gyp": "^8.0.0",
+    "prebuildify": "^5.0.0",
+    "prebuildify-ci": "^1.0.5",
     "rimraf": "^3.0.2",
     "tsd": "^0.14.0"
   },
@@ -75,9 +76,13 @@
     "url": "git+ssh://git@github.com/DoctorEvidence/lmdb-store.git"
   },
   "scripts": {
+    "before-publish": "prebuildify --target 16.9.0 && prebuildify --target 14.17.6 && prebuildify --target electron@15.2.0",
     "benchmark": "node --turbo-fast-api-calls ./benchmark/index.js",
     "benchmark-ll": "node ./benchmark/low-level.js",
     "install": "node-gyp-build",
+    "prebuild": "prebuildify --target 16.9.0 && prebuildify --target 14.17.6 && prebuildify --target electron@15.2.0",
+    "prebuild-arm64": "prebuildify --arch=arm64 --target 16.9.0 && prebuildify --arch=arm64 --target 14.17.6 && prebuildify --arch=arm64 --target electron@15.2.0",
+    "prebuild-musl": "prebuildify --target 16.9.0 --libc musl --tag-libc && prebuildify --target 14.17.6 --libc musl --tag-libc",
     "recompile": "node-gyp configure && node-gyp build",
     "test": "mocha test/**.test.js --recursive && npm run test:types",
     "test2": "mocha tests -u tdd",
@@ -88,5 +93,5 @@
   },
   "type": "commonjs",
   "types": "./index.d.ts",
-  "version": "1.5.5"
+  "version": "1.5.6"
 }

package/node_modules/lmdb-store/src/compression.cpp

@@ -1,181 +1,181 @@
-
-// This file is part of node-lmdb, the Node.js binding for lmdb
-// Copyright (c) 2013-2017 Timur Kristóf
-// Copyright (c) 2021 Kristopher Tate
-// Licensed to you under the terms of the MIT license
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "lz4.h"
-#include "node-lmdb.h"
-
-using namespace v8;
-using namespace node;
-
-thread_local LZ4_stream_t* Compression::stream = nullptr;
-Compression::Compression() {
-}
-Compression::~Compression() {
-    delete dictionary;
-}
-NAN_METHOD(Compression::ctor) {
-    unsigned int compressionThreshold = 1000;
-    char* dictionary = nullptr;
-    unsigned int dictSize = 0;
-    if (info[0]->IsObject()) {
-        Local<Value> dictionaryOption = Nan::To<v8::Object>(info[0]).ToLocalChecked()->Get(Nan::GetCurrentContext(), Nan::New<String>("dictionary").ToLocalChecked()).ToLocalChecked();
-        if (!dictionaryOption->IsUndefined()) {
-            if (!node::Buffer::HasInstance(dictionaryOption)) {
-                return Nan::ThrowError("Dictionary must be a buffer");
-            }
-            dictSize = node::Buffer::Length(dictionaryOption);
-            dictSize = (dictSize >> 3) << 3; // make sure it is word-aligned
-            unsigned int newTotalSize = dictSize + 4096;
-            dictionary = new char[newTotalSize];
-            memcpy(dictionary, node::Buffer::Data(dictionaryOption), dictSize);
-        }
-        Local<Value> thresholdOption = Nan::To<v8::Object>(info[0]).ToLocalChecked()->Get(Nan::GetCurrentContext(), Nan::New<String>("threshold").ToLocalChecked()).ToLocalChecked();
-        if (thresholdOption->IsNumber()) {
-            compressionThreshold = thresholdOption->IntegerValue(Nan::GetCurrentContext()).FromJust();
-        }
-    }
-    if (!dictionary) {
-        dictionary = new char[4096];
-    }
-    Compression* compression = new Compression();
-    compression->dictionary = dictionary;
-    compression->decompressTarget = dictionary + dictSize;
-    compression->decompressSize = 4096;
-    compression->acceleration = 1;
-    compression->compressionThreshold = compressionThreshold;
-    compression->Wrap(info.This());
-    compression->Ref();
-    compression->makeUnsafeBuffer();
-
-    return info.GetReturnValue().Set(info.This());
-}
-
-void Compression::makeUnsafeBuffer() {
-    Local<Object> newBuffer = Nan::NewBuffer(
-        decompressTarget,
-        decompressSize,
-        [](char*, void* data) {
-            // free the data once it is not used
-            //delete data;
-        },
-        dictionary
-    ).ToLocalChecked();
-    unsafeBuffer.Reset(Isolate::GetCurrent(), newBuffer);
-}
-
-void Compression::decompress(MDB_val& data, bool &isValid) {
-    uint32_t uncompressedLength;
-    int compressionHeaderSize;
-    unsigned char* charData = (unsigned char*) data.mv_data;
-
-    if (charData[0] == 254) {
-        uncompressedLength = ((uint32_t)charData[1] << 16) | ((uint32_t)charData[2] << 8) | (uint32_t)charData[3];
-        compressionHeaderSize = 4;
-    }
-    else if (charData[0] == 255) {
-        uncompressedLength = ((uint32_t)charData[4] << 24) | ((uint32_t)charData[5] << 16) | ((uint32_t)charData[6] << 8) | (uint32_t)charData[7];
-        compressionHeaderSize = 8;
-    }
-    else {
-        fprintf(stderr, "Unknown status byte %u\n", charData[0]);
-        Nan::ThrowError("Unknown status byte");
-        isValid = false;
-        return;
-    }
-    //TODO: For larger blocks with known encoding, it might make sense to allocate space for it and use an ExternalString
-    //fprintf(stdout, "compressed size %u uncompressedLength %u, first byte %u\n", data.mv_size, uncompressedLength, charData[compressionHeaderSize]);
-    if (uncompressedLength > decompressSize)
-        expand(uncompressedLength);
-    int written = LZ4_decompress_safe_usingDict(
-        (char*)charData + compressionHeaderSize, decompressTarget,
-        data.mv_size - compressionHeaderSize, uncompressedLength,
-        dictionary, decompressTarget - dictionary);
-    //fprintf(stdout, "first uncompressed byte %X %X %X %X %X %X\n", uncompressedData[0], uncompressedData[1], uncompressedData[2], uncompressedData[3], uncompressedData[4], uncompressedData[5]);
-    if (written < 0) {
-        //fprintf(stderr, "Failed to decompress data %u %u %u %u\n", charData[0], data.mv_size, compressionHeaderSize, uncompressedLength);
-        Nan::ThrowError("Failed to decompress data");
-        isValid = false;
-        return;
-    }
-    data.mv_data = decompressTarget;
-    data.mv_size = uncompressedLength;
-    isValid = true;
-}
-
-void Compression::expand(unsigned int size) {
-    unsigned int dictSize = decompressTarget - dictionary;
-    decompressSize = size * 2;
-    unsigned int newTotalSize = dictSize + decompressSize;
-    char* oldSpace = dictionary;
-    dictionary = new char[newTotalSize];
-    decompressTarget = dictionary + dictSize;
-    memcpy(dictionary, oldSpace, dictSize);
-    makeUnsafeBuffer();
-}
-
-argtokey_callback_t Compression::compress(MDB_val* value, argtokey_callback_t freeValue) {
-    size_t dataLength = value->mv_size;
-    char* data = (char*)value->mv_data;
-    if (value->mv_size < compressionThreshold && !(value->mv_size > 0 && ((uint8_t*)data)[0] >= 250))
-        return freeValue; // don't compress if less than threshold (but we must compress if the first byte is the compression indicator)
-    bool longSize = dataLength >= 0x1000000;
-    int prefixSize = (longSize ? 8 : 4);
-    int maxCompressedSize = LZ4_COMPRESSBOUND(dataLength);
-    char* compressed = new char[maxCompressedSize + prefixSize];
-    //fprintf(stdout, "compressing %u\n", dataLength);
-    if (!stream)
-        stream = LZ4_createStream();
-    LZ4_loadDict(stream, dictionary, decompressTarget - dictionary);
-    int compressedSize = LZ4_compress_fast_continue(stream, data, compressed + prefixSize, dataLength, maxCompressedSize, acceleration);
-    if (compressedSize > 0) {
-        if (freeValue)
-            freeValue(*value);
-        uint8_t* compressedData = (uint8_t*)compressed;
-        if (longSize) {
-            compressedData[0] = 255;
-            compressedData[2] = (uint8_t)(dataLength >> 40u);
-            compressedData[3] = (uint8_t)(dataLength >> 32u);
-            compressedData[4] = (uint8_t)(dataLength >> 24u);
-            compressedData[5] = (uint8_t)(dataLength >> 16u);
-            compressedData[6] = (uint8_t)(dataLength >> 8u);
-            compressedData[7] = (uint8_t)dataLength;
-        }
-        else {
-            compressedData[0] = 254;
-            compressedData[1] = (uint8_t)(dataLength >> 16u);
-            compressedData[2] = (uint8_t)(dataLength >> 8u);
-            compressedData[3] = (uint8_t)dataLength;
-        }
-        value->mv_data = compressed;
-        value->mv_size = compressedSize + prefixSize;
-        return ([](MDB_val &value) -> void {
-            delete[] (char*)value.mv_data;
-        });
-    }
-    else {
-        delete[] compressed;
-        return nullptr;
-    }
-}
-
+
+// This file is part of node-lmdb, the Node.js binding for lmdb
+// Copyright (c) 2013-2017 Timur Kristóf
+// Copyright (c) 2021 Kristopher Tate
+// Licensed to you under the terms of the MIT license
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include "lz4.h"
+#include "node-lmdb.h"
+
+using namespace v8;
+using namespace node;
+
+thread_local LZ4_stream_t* Compression::stream = nullptr;
+Compression::Compression() {
+}
+Compression::~Compression() {
+    delete dictionary;
+}
+NAN_METHOD(Compression::ctor) {
+    unsigned int compressionThreshold = 1000;
+    char* dictionary = nullptr;
+    unsigned int dictSize = 0;
+    if (info[0]->IsObject()) {
+        Local<Value> dictionaryOption = Nan::To<v8::Object>(info[0]).ToLocalChecked()->Get(Nan::GetCurrentContext(), Nan::New<String>("dictionary").ToLocalChecked()).ToLocalChecked();
+        if (!dictionaryOption->IsUndefined()) {
+            if (!node::Buffer::HasInstance(dictionaryOption)) {
+                return Nan::ThrowError("Dictionary must be a buffer");
+            }
+            dictSize = node::Buffer::Length(dictionaryOption);
+            dictSize = (dictSize >> 3) << 3; // make sure it is word-aligned
+            unsigned int newTotalSize = dictSize + 4096;
+            dictionary = new char[newTotalSize];
+            memcpy(dictionary, node::Buffer::Data(dictionaryOption), dictSize);
+        }
+        Local<Value> thresholdOption = Nan::To<v8::Object>(info[0]).ToLocalChecked()->Get(Nan::GetCurrentContext(), Nan::New<String>("threshold").ToLocalChecked()).ToLocalChecked();
+        if (thresholdOption->IsNumber()) {
+            compressionThreshold = thresholdOption->IntegerValue(Nan::GetCurrentContext()).FromJust();
+        }
+    }
+    if (!dictionary) {
+        dictionary = new char[4096];
+    }
+    Compression* compression = new Compression();
+    compression->dictionary = dictionary;
+    compression->decompressTarget = dictionary + dictSize;
+    compression->decompressSize = 4096;
+    compression->acceleration = 1;
+    compression->compressionThreshold = compressionThreshold;
+    compression->Wrap(info.This());
+    compression->Ref();
+    compression->makeUnsafeBuffer();
+
+    return info.GetReturnValue().Set(info.This());
+}
+
+void Compression::makeUnsafeBuffer() {
+    Local<Object> newBuffer = Nan::NewBuffer(
+        decompressTarget,
+        decompressSize,
+        [](char*, void* data) {
+            // free the data once it is not used
+            //delete data;
+        },
+        dictionary
+    ).ToLocalChecked();
+    unsafeBuffer.Reset(Isolate::GetCurrent(), newBuffer);
+}
+
+void Compression::decompress(MDB_val& data, bool &isValid) {
+    uint32_t uncompressedLength;
+    int compressionHeaderSize;
+    unsigned char* charData = (unsigned char*) data.mv_data;
+
+    if (charData[0] == 254) {
+        uncompressedLength = ((uint32_t)charData[1] << 16) | ((uint32_t)charData[2] << 8) | (uint32_t)charData[3];
+        compressionHeaderSize = 4;
+    }
+    else if (charData[0] == 255) {
+        uncompressedLength = ((uint32_t)charData[4] << 24) | ((uint32_t)charData[5] << 16) | ((uint32_t)charData[6] << 8) | (uint32_t)charData[7];
+        compressionHeaderSize = 8;
+    }
+    else {
+        fprintf(stderr, "Unknown status byte %u\n", charData[0]);
+        Nan::ThrowError("Unknown status byte");
+        isValid = false;
+        return;
+    }
+    //TODO: For larger blocks with known encoding, it might make sense to allocate space for it and use an ExternalString
+    //fprintf(stdout, "compressed size %u uncompressedLength %u, first byte %u\n", data.mv_size, uncompressedLength, charData[compressionHeaderSize]);
+    if (uncompressedLength > decompressSize)
+        expand(uncompressedLength);
+    int written = LZ4_decompress_safe_usingDict(
+        (char*)charData + compressionHeaderSize, decompressTarget,
+        data.mv_size - compressionHeaderSize, uncompressedLength,
+        dictionary, decompressTarget - dictionary);
+    //fprintf(stdout, "first uncompressed byte %X %X %X %X %X %X\n", uncompressedData[0], uncompressedData[1], uncompressedData[2], uncompressedData[3], uncompressedData[4], uncompressedData[5]);
+    if (written < 0) {
+        //fprintf(stderr, "Failed to decompress data %u %u %u %u\n", charData[0], data.mv_size, compressionHeaderSize, uncompressedLength);
+        Nan::ThrowError("Failed to decompress data");
+        isValid = false;
+        return;
+    }
+    data.mv_data = decompressTarget;
+    data.mv_size = uncompressedLength;
+    isValid = true;
+}
+
+void Compression::expand(unsigned int size) {
+    unsigned int dictSize = decompressTarget - dictionary;
+    decompressSize = size * 2;
+    unsigned int newTotalSize = dictSize + decompressSize;
+    char* oldSpace = dictionary;
+    dictionary = new char[newTotalSize];
+    decompressTarget = dictionary + dictSize;
+    memcpy(dictionary, oldSpace, dictSize);
+    makeUnsafeBuffer();
+}
+
+argtokey_callback_t Compression::compress(MDB_val* value, argtokey_callback_t freeValue) {
+    size_t dataLength = value->mv_size;
+    char* data = (char*)value->mv_data;
+    if (value->mv_size < compressionThreshold && !(value->mv_size > 0 && ((uint8_t*)data)[0] >= 250))
+        return freeValue; // don't compress if less than threshold (but we must compress if the first byte is the compression indicator)
+    bool longSize = dataLength >= 0x1000000;
+    int prefixSize = (longSize ? 8 : 4);
+    int maxCompressedSize = LZ4_COMPRESSBOUND(dataLength);
+    char* compressed = new char[maxCompressedSize + prefixSize];
+    //fprintf(stdout, "compressing %u\n", dataLength);
+    if (!stream)
+        stream = LZ4_createStream();
+    LZ4_loadDict(stream, dictionary, decompressTarget - dictionary);
+    int compressedSize = LZ4_compress_fast_continue(stream, data, compressed + prefixSize, dataLength, maxCompressedSize, acceleration);
+    if (compressedSize > 0) {
+        if (freeValue)
+            freeValue(*value);
+        uint8_t* compressedData = (uint8_t*)compressed;
+        if (longSize) {
+            compressedData[0] = 255;
+            compressedData[2] = (uint8_t)(dataLength >> 40u);
+            compressedData[3] = (uint8_t)(dataLength >> 32u);
+            compressedData[4] = (uint8_t)(dataLength >> 24u);
+            compressedData[5] = (uint8_t)(dataLength >> 16u);
+            compressedData[6] = (uint8_t)(dataLength >> 8u);
+            compressedData[7] = (uint8_t)dataLength;
+        }
+        else {
+            compressedData[0] = 254;
+            compressedData[1] = (uint8_t)(dataLength >> 16u);
+            compressedData[2] = (uint8_t)(dataLength >> 8u);
+            compressedData[3] = (uint8_t)dataLength;
+        }
+        value->mv_data = compressed;
+        value->mv_size = compressedSize + prefixSize;
+        return ([](MDB_val &value) -> void {
+            delete[] (char*)value.mv_data;
+        });
+    }
+    else {
+        delete[] compressed;
+        return nullptr;
+    }
+}
+