Skip to content

Use modern v8 APIs #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgren merged 2 commits into from
Oct 2, 2019
Merged

Use modern v8 APIs #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b96184a
why is this still used anyway
mgren Sep 26, 2019
eea65fd
store context
mgren Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"name": "compress-buffer-crc32",
"description": "Synchronous Buffer compression library for Node.js",
"homepage" : "http://egorfine.github.com/node-compress-buffer",
"bugs" : { "url" : "http://github.com/egorFiNE/node-compress-buffer/issues" },
"version": "2.0.1",
"homepage": "http://egorfine.github.com/node-compress-buffer",
"bugs": {
"url": "http://github.com/egorFiNE/node-compress-buffer/issues"
},
"version": "3.0.0",
"author": "Egor Egorov",
"repository": {
"type": "git",
"url": "http://github.com/egorfine/node-compress-buffer.git"
},
"main" : "./index",
"main": "./index",
"devDependencies": {
"nodeunit": ">=0.5.4"
},
Expand Down
76 changes: 41 additions & 35 deletions src/compress-buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,10 @@ namespace node_compress_buffer {
}

v8::Local<v8::Value> bufferIn = info[0];
v8::Local<v8::Context> ctx = Nan::GetCurrentContext();

if (info.Length() > 1) {
compressionLevel = info[1]->IntegerValue();
compressionLevel = info[1]->IntegerValue(ctx).FromJust();
}

size_t bytesIn = node::Buffer::Length(bufferIn);
Expand Down Expand Up @@ -259,23 +260,23 @@ namespace node_compress_buffer {

v8::Local<v8::Object> result = Nan::New<v8::Object>();

result->Set(Nan::New(SYM_BODY), Nan::CopyBuffer(dataOut, bytesOut).ToLocalChecked());
result->Set(ctx, Nan::New(SYM_BODY), Nan::CopyBuffer(dataOut, bytesOut).ToLocalChecked());

result->Set(Nan::New(SYM_BOUNDARY), Nan::CopyBuffer(dataBoundary, bytesBoundary).ToLocalChecked());
result->Set(ctx, Nan::New(SYM_BOUNDARY), Nan::CopyBuffer(dataBoundary, bytesBoundary).ToLocalChecked());

v8::Local<v8::Object> dataOffsets = Nan::New<v8::Object>();
dataOffsets->Set(Nan::New(SYM_LEFT), Nan::New<v8::Integer>(HEADER_SIZE));
dataOffsets->Set(Nan::New(SYM_RIGHT), Nan::New<v8::Integer>(HEADER_SIZE + dataLength));
dataOffsets->Set(Nan::New(SYM_LAST_BLOCK), Nan::New<v8::Integer>(lastBlockPosition));
dataOffsets->Set(ctx, Nan::New(SYM_LEFT), Nan::New<v8::Integer>(HEADER_SIZE));
dataOffsets->Set(ctx, Nan::New(SYM_RIGHT), Nan::New<v8::Integer>(HEADER_SIZE + dataLength));
dataOffsets->Set(ctx, Nan::New(SYM_LAST_BLOCK), Nan::New<v8::Integer>(lastBlockPosition));

v8::Local<v8::Object> meta = Nan::New<v8::Object>();
meta->Set(Nan::New(SYM_OFFSETS), dataOffsets);
meta->Set(Nan::New(SYM_LENGTH), Nan::New<v8::Integer>(static_cast<uint32_t>(bytesIn)));
meta->Set(Nan::New(SYM_LAST_VALUE), Nan::New<v8::Integer>(lastBlockValue));
meta->Set(Nan::New(SYM_RAW_LENGTH), Nan::New<v8::Integer>(static_cast<uint32_t>(bytesOut - HEADER_SIZE - FOOTER_SIZE)));
meta->Set(Nan::New(SYM_CRC), Nan::CopyBuffer(dataOut + (bytesOut - FOOTER_SIZE), 4).ToLocalChecked());
meta->Set(ctx, Nan::New(SYM_OFFSETS), dataOffsets);
meta->Set(ctx, Nan::New(SYM_LENGTH), Nan::New<v8::Integer>(static_cast<uint32_t>(bytesIn)));
meta->Set(ctx, Nan::New(SYM_LAST_VALUE), Nan::New<v8::Integer>(lastBlockValue));
meta->Set(ctx, Nan::New(SYM_RAW_LENGTH), Nan::New<v8::Integer>(static_cast<uint32_t>(bytesOut - HEADER_SIZE - FOOTER_SIZE)));
meta->Set(ctx, Nan::New(SYM_CRC), Nan::CopyBuffer(dataOut + (bytesOut - FOOTER_SIZE), 4).ToLocalChecked());

result->Set(Nan::New(SYM_META), meta);
result->Set(ctx, Nan::New(SYM_META), meta);

free(dataOut);
free(dataBoundary);
Expand All @@ -298,10 +299,11 @@ namespace node_compress_buffer {
return;
}

v8::Local<v8::Object> bufferIn = info[0]->ToObject();
v8::Local<v8::Context> ctx = Nan::GetCurrentContext();
v8::Local<v8::Object> bufferIn = info[0]->ToObject(ctx).ToLocalChecked();

if (info.Length() > 1) {
compressionLevel = info[1]->IntegerValue();
compressionLevel = info[1]->IntegerValue(ctx).FromJust();
}

const char *dataIn = node::Buffer::Data(bufferIn);
Expand All @@ -320,39 +322,40 @@ namespace node_compress_buffer {
return;
}

v8::Handle<v8::Value> b = Nan::CopyBuffer(dataOut, bytesOut).ToLocalChecked();
v8::Local<v8::Value> b = Nan::CopyBuffer(dataOut, bytesOut).ToLocalChecked();
free(dataOut);
info.GetReturnValue().Set(b);
}

static NAN_METHOD(estimate) {
v8::Local<v8::Array> arr = v8::Local<v8::Array>::Cast(info[0]);
v8::Local<v8::Context> ctx = Nan::GetCurrentContext();
int i = 0;
int l = arr->Length();
int sum = HEADER_SIZE + FOOTER_SIZE + ((l - 1) * SPACER_SIZE);

for(; i < l; i++) {
v8::Local<v8::Object> obj = arr->Get(i)->ToObject();
v8::Local<v8::Object> obj = arr->Get(ctx, i).ToLocalChecked()->ToObject(ctx).ToLocalChecked();

if (!obj->Has(Nan::New(SYM_META))) {
if (!obj->Has(ctx, Nan::New(SYM_META)).FromJust()) {
char msg[40];
sprintf(msg, "ESTIMATE wrong object (no meta key) at: %d", i);
Nan::ThrowError(msg);
info.GetReturnValue().Set(Nan::Undefined());
return;
}

v8::Local<v8::Object> meta = obj->Get(Nan::New(SYM_META))->ToObject();
v8::Local<v8::Object> meta = obj->Get(ctx, Nan::New(SYM_META)).ToLocalChecked()->ToObject(ctx).ToLocalChecked();

if (!meta->Has(Nan::New(SYM_RAW_LENGTH))) {
if (!meta->Has(ctx, Nan::New(SYM_RAW_LENGTH)).FromJust()) {
char msg[60];
sprintf(msg, "ESTIMATE wrong object (no rawLength key) at: %d", i);
Nan::ThrowError(msg);
info.GetReturnValue().Set(Nan::Undefined());
return;
}

sum += meta->Get(Nan::New(SYM_RAW_LENGTH))->Uint32Value();
sum += meta->Get(ctx, Nan::New(SYM_RAW_LENGTH)).ToLocalChecked()->Uint32Value(ctx).FromJust();
}

info.GetReturnValue().Set(Nan::New<v8::Integer>(sum));
Expand All @@ -375,32 +378,33 @@ namespace node_compress_buffer {
unsigned long tot = 0;

v8::Local<v8::Array> arr = v8::Local<v8::Array>::Cast(info[0]);
v8::Local<v8::Context> ctx = Nan::GetCurrentContext();

int l = arr->Length();
int i = 0;

for (; i < l; i++) {
v8::Local<v8::Object> obj = arr->Get(i)->ToObject();
v8::Local<v8::Object> obj = arr->Get(ctx, i).ToLocalChecked()->ToObject(ctx).ToLocalChecked();

if (!obj->Has(Nan::New(SYM_META))) {
if (!obj->Has(ctx, Nan::New(SYM_META)).FromJust()) {
char msg[40];
sprintf(msg, "CRC32 wrong object (no meta key) at: %d", i);
Nan::ThrowError(msg);
info.GetReturnValue().Set(Nan::Undefined());
return;
}

v8::Local<v8::Object> meta = obj->Get(Nan::New(SYM_META))->ToObject();
v8::Local<v8::Object> meta = obj->Get(ctx, Nan::New(SYM_META)).ToLocalChecked()->ToObject(ctx).ToLocalChecked();

if (!meta->Has(Nan::New(SYM_CRC))) {
if (!meta->Has(ctx, Nan::New(SYM_CRC)).FromJust()) {
char msg[40];
sprintf(msg, "CRC32 wrong object (no crc key) at: %d", i);
Nan::ThrowError(msg);
info.GetReturnValue().Set(Nan::Undefined());
return;
}

v8::Local<v8::Value> objCrc = meta->Get(Nan::New(SYM_CRC));
v8::Local<v8::Value> objCrc = meta->Get(ctx, Nan::New(SYM_CRC)).ToLocalChecked();
if (!node::Buffer::HasInstance(objCrc)) {
char msg[40];
sprintf(msg, "CRC32 is not a buffer at: %d", i);
Expand All @@ -409,7 +413,7 @@ namespace node_compress_buffer {
return;
}

v8::Local<v8::Object> bufCrc = objCrc->ToObject();
v8::Local<v8::Object> bufCrc = objCrc->ToObject(ctx).ToLocalChecked();

if (node::Buffer::Length(bufCrc) != 4) {
char msg[40];
Expand All @@ -420,15 +424,15 @@ namespace node_compress_buffer {
}

unsigned long tmpCrc = reverseBytes((unsigned char *) node::Buffer::Data(bufCrc));
unsigned long tmpLen = meta->Get(Nan::New(SYM_LENGTH))->Uint32Value();
unsigned long tmpLen = meta->Get(ctx, Nan::New(SYM_LENGTH)).ToLocalChecked()->Uint32Value(ctx).FromJust();

crc = crc32_combine(crc, tmpCrc, tmpLen);
tot += tmpLen;
}

v8::Local<v8::Object> data = Nan::New<v8::Object>();
data->Set(Nan::New(SYM_CRC), Nan::CopyBuffer((char *) &crc, 4).ToLocalChecked());
data->Set(Nan::New(SYM_LENGTH), Nan::CopyBuffer((char *) &tot, 4).ToLocalChecked());
data->Set(ctx, Nan::New(SYM_CRC), Nan::CopyBuffer((char *) &crc, 4).ToLocalChecked());
data->Set(ctx, Nan::New(SYM_LENGTH), Nan::CopyBuffer((char *) &tot, 4).ToLocalChecked());

info.GetReturnValue().Set(data);
}
Expand Down Expand Up @@ -462,7 +466,7 @@ namespace node_compress_buffer {
return;
}

v8::Local<v8::Object> bufferIn = info[0]->ToObject();
v8::Local<v8::Object> bufferIn = info[0]->ToObject(Nan::GetCurrentContext()).ToLocalChecked();

strmUncompress.next_in = (Bytef*) node::Buffer::Data(bufferIn);
strmUncompress.avail_in = node::Buffer::Length(bufferIn);
Expand Down Expand Up @@ -517,21 +521,23 @@ namespace node_compress_buffer {
return;
}

v8::Handle<v8::Value> b = Nan::CopyBuffer((char *)bufferOut, malloc_size).ToLocalChecked();
v8::Local<v8::Value> b = Nan::CopyBuffer((char *)bufferOut, malloc_size).ToLocalChecked();
free(bufferOut);
info.GetReturnValue().Set(b);
}

void init(v8::Handle<v8::Object> target) {
void init(v8::Local<v8::Object> target) {

tmpBody = (unsigned char *) malloc(CHUNK);

const unsigned char header[] = {0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff};

v8::Handle<v8::Object> buffers = Nan::New<v8::Object>();
buffers->Set(Nan::New(SYM_HEADER), Nan::CopyBuffer(reinterpret_cast<const char*>(header), 10).ToLocalChecked());
v8::Local<v8::Object> buffers = Nan::New<v8::Object>();
v8::Local<v8::Context> ctx = Nan::GetCurrentContext();

target->Set(Nan::New(SYM_BUFFERS), buffers);
buffers->Set(ctx, Nan::New(SYM_HEADER), Nan::CopyBuffer(reinterpret_cast<const char*>(header), 10).ToLocalChecked());

target->Set(ctx, Nan::New(SYM_BUFFERS), buffers);

Nan::SetMethod(target, "compress", compress);
Nan::SetMethod(target, "uncompress", uncompress);
Expand Down
10 changes: 5 additions & 5 deletions test/node-compress-buffer-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var loremIpsum="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do

exports['basic compress']= function(test) {
test.expect(2);
var uncompressed = new Buffer(loremIpsum);
var uncompressed = Buffer.from(loremIpsum);
var compressed = compress(uncompressed);
test.equal(compressed.length,282);
test.equal(md5(compressed), "6e31946d851b7cab51e058653a16b666");
Expand All @@ -23,7 +23,7 @@ exports['basic compress']= function(test) {

exports['basic uncompress']= function(test) {
test.expect(2);
var uncompressed = new Buffer(loremIpsum);
var uncompressed = Buffer.from(loremIpsum);
var compressed = compress(uncompressed);
uncompressed = uncompress(compressed);
test.equal(uncompressed.length,loremIpsum.length);
Expand Down Expand Up @@ -60,7 +60,7 @@ exports['compress short']= function(test) {
test.expect(2);
var buffer, compressed;

buffer = new Buffer("too short");
buffer = Buffer.from("too short");
compressed = compress(buffer);
test.notEqual(compressed,buffer);
test.notEqual(compressed.length,buffer.length);
Expand All @@ -70,10 +70,10 @@ exports['compress short']= function(test) {

exports['errors']= function(test) {
test.expect(2);
var compressed = compress(new Buffer(""));
var compressed = compress(Buffer.from(""));
test.ok(compressed.length>=0);

var nothing = uncompress(new Buffer(" sfsdcfgdfgsdgfdsgdgdsgdfgsdfgsdfgdfgfsfd "));
var nothing = uncompress(Buffer.from(" sfsdcfgdfgsdgfdsgdgdsgdfgsdfgsdfgdfgfsfd "));
test.ok(nothing==null);

test.done();
Expand Down