diff --git a/build.c b/build.c index e9ddc57..9c24b0e 100644 --- a/build.c +++ b/build.c @@ -33,10 +33,10 @@ struct node_version { char *name; char *abi; } versions[] = { - {"v12.13.0", "72"}, {"v14.0.0", "83"}, {"v15.0.0", "88"}, - {"v16.0.0", "93"} + {"v16.0.0", "93"}, + {"v17.0.1", "102"} }; /* Downloads headers, creates folders */ @@ -55,8 +55,8 @@ void prepare() { /* Build for Unix systems */ void build(char *compiler, char *cpp_compiler, char *cpp_linker, char *os, char *arch) { - char *c_shared = "-DLIBUS_USE_LIBUV -DLIBUS_USE_OPENSSL -flto -O3 -c -fPIC -I uWebSockets/uSockets/src uWebSockets/uSockets/src/*.c uWebSockets/uSockets/src/eventing/*.c uWebSockets/uSockets/src/crypto/*.c"; - char *cpp_shared = "-DUWS_WITH_PROXY -DLIBUS_USE_LIBUV -DLIBUS_USE_OPENSSL -flto -O3 -c -fPIC -std=c++17 -I uWebSockets/uSockets/src -I uWebSockets/src src/addon.cpp uWebSockets/uSockets/src/crypto/sni_tree.cpp"; + char *c_shared = "-DOPENSSL_CONFIGURED_API=0x10100000L -DOPENSSL_API_COMPAT=0x10100000L -DLIBUS_USE_LIBUV -DLIBUS_USE_OPENSSL -flto -O3 -c -fPIC -I uWebSockets/uSockets/src uWebSockets/uSockets/src/*.c uWebSockets/uSockets/src/eventing/*.c uWebSockets/uSockets/src/crypto/*.c"; + char *cpp_shared = "-DOPENSSL_CONFIGURED_API=0x10100000L -DOPENSSL_API_COMPAT=0x10100000L -DUWS_WITH_PROXY -DLIBUS_USE_LIBUV -DLIBUS_USE_OPENSSL -flto -O3 -c -fPIC -std=c++17 -I uWebSockets/uSockets/src -I uWebSockets/src src/addon.cpp uWebSockets/uSockets/src/crypto/sni_tree.cpp"; for (unsigned int i = 0; i < sizeof(versions) / sizeof(struct node_version); i++) { run("%s %s -I targets/node-%s/include/node", compiler, c_shared, versions[i].name); diff --git a/src/AppWrapper.h b/src/AppWrapper.h index 2c92e77..d36a5d3 100644 --- a/src/AppWrapper.h +++ b/src/AppWrapper.h @@ -169,7 +169,7 @@ void uWS_App_ws(const FunctionCallbackInfo &args) { behavior.message = [messagePf = std::move(messagePf), isolate](auto *ws, std::string_view message, uWS::OpCode opCode) { HandleScope hs(isolate); - Local messageArrayBuffer = ArrayBuffer::New(isolate, (void *) message.data(), message.length()); + Local messageArrayBuffer = ArrayBuffer_New(isolate, (void *) message.data(), message.length()); PerSocketData *perSocketData = (PerSocketData *) ws->getUserData(); Local argv[3] = {Local::New(isolate, perSocketData->socketPf), @@ -221,7 +221,7 @@ void uWS_App_ws(const FunctionCallbackInfo &args) { behavior.close = [closePf = std::move(closePf), isolate](auto *ws, int code, std::string_view message) { HandleScope hs(isolate); - Local messageArrayBuffer = ArrayBuffer::New(isolate, (void *) message.data(), message.length()); + Local messageArrayBuffer = ArrayBuffer_New(isolate, (void *) message.data(), message.length()); PerSocketData *perSocketData = (PerSocketData *) ws->getUserData(); Local wsObject = Local::New(isolate, perSocketData->socketPf); diff --git a/src/HttpResponseWrapper.h b/src/HttpResponseWrapper.h index 8090b5c..4a7f7e5 100644 --- a/src/HttpResponseWrapper.h +++ b/src/HttpResponseWrapper.h @@ -61,7 +61,7 @@ struct HttpResponseWrapper { res->onData([p = std::move(p), isolate](std::string_view data, bool last) { HandleScope hs(isolate); - Local dataArrayBuffer = ArrayBuffer::New(isolate, (void *) data.data(), data.length()); + Local dataArrayBuffer = ArrayBuffer_New(isolate, (void *) data.data(), data.length()); Local argv[] = {dataArrayBuffer, Boolean::New(isolate, last)}; CallJS(isolate, Local::New(isolate, p), 2, argv); @@ -107,7 +107,7 @@ struct HttpResponseWrapper { std::string_view ip = res->getRemoteAddress(); /* Todo: we need to pass a copy here */ - args.GetReturnValue().Set(ArrayBuffer::New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); + args.GetReturnValue().Set(ArrayBuffer_New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); } } @@ -120,7 +120,7 @@ struct HttpResponseWrapper { std::string_view ip = res->getRemoteAddressAsText(); /* Todo: we need to pass a copy here */ - args.GetReturnValue().Set(ArrayBuffer::New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); + args.GetReturnValue().Set(ArrayBuffer_New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); } } @@ -133,7 +133,7 @@ struct HttpResponseWrapper { std::string_view ip = res->getProxiedRemoteAddress(); /* Todo: we need to pass a copy here */ - args.GetReturnValue().Set(ArrayBuffer::New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); + args.GetReturnValue().Set(ArrayBuffer_New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); } } @@ -146,7 +146,7 @@ struct HttpResponseWrapper { std::string_view ip = res->getProxiedRemoteAddressAsText(); /* Todo: we need to pass a copy here */ - args.GetReturnValue().Set(ArrayBuffer::New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); + args.GetReturnValue().Set(ArrayBuffer_New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); } } diff --git a/src/Utilities.h b/src/Utilities.h index 30af32a..1dd630e 100644 --- a/src/Utilities.h +++ b/src/Utilities.h @@ -29,6 +29,11 @@ MaybeLocal CallJS(Isolate *isolate, Local f, int argc, LocalGetCurrentContext()->Global(), f, argc, argv, {0, 0}); } +Local ArrayBuffer_New(Isolate *isolate, void *data, size_t length) { + std::unique_ptr backingStore = ArrayBuffer::NewBackingStore(data, length, [](void* data, size_t length, void* deleter_data) {}, nullptr); + return ArrayBuffer::New(isolate, std::shared_ptr(backingStore.release())); +} + struct PerSocketData { UniquePersistent socketPf; }; @@ -103,19 +108,19 @@ public: length = utf8Value->length(); } else if (value->IsTypedArray()) { Local arrayBufferView = Local::Cast(value); - ArrayBuffer::Contents contents = arrayBufferView->Buffer()->GetContents(); + auto contents = arrayBufferView->Buffer()->GetBackingStore(); length = arrayBufferView->ByteLength(); - data = (char *) contents.Data() + arrayBufferView->ByteOffset(); + data = (char *) contents->Data() + arrayBufferView->ByteOffset(); } else if (value->IsArrayBuffer()) { Local arrayBuffer = Local::Cast(value); - ArrayBuffer::Contents contents = arrayBuffer->GetContents(); - length = contents.ByteLength(); - data = (char *) contents.Data(); + auto contents = arrayBuffer->GetBackingStore(); + length = contents->ByteLength(); + data = (char *) contents->Data(); } else if (value->IsSharedArrayBuffer()) { Local arrayBuffer = Local::Cast(value); - SharedArrayBuffer::Contents contents = arrayBuffer->GetContents(); - length = contents.ByteLength(); - data = (char *) contents.Data(); + auto contents = arrayBuffer->GetBackingStore(); + length = contents->ByteLength(); + data = (char *) contents->Data(); } else { invalid = true; } diff --git a/src/WebSocketWrapper.h b/src/WebSocketWrapper.h index 954c8c3..d2d9850 100644 --- a/src/WebSocketWrapper.h +++ b/src/WebSocketWrapper.h @@ -137,7 +137,7 @@ struct WebSocketWrapper { std::string_view ip = ws->getRemoteAddress(); /* Todo: we need to pass a copy here */ - args.GetReturnValue().Set(ArrayBuffer::New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); + args.GetReturnValue().Set(ArrayBuffer_New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); } } @@ -150,7 +150,7 @@ struct WebSocketWrapper { std::string_view ip = ws->getRemoteAddressAsText(); /* Todo: we need to pass a copy here */ - args.GetReturnValue().Set(ArrayBuffer::New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); + args.GetReturnValue().Set(ArrayBuffer_New(isolate, (void *) ip.data(), ip.length()/*, ArrayBufferCreationMode::kInternalized*/)); } } diff --git a/src/addon.cpp b/src/addon.cpp index 80783f2..ec1e7e4 100644 --- a/src/addon.cpp +++ b/src/addon.cpp @@ -73,7 +73,7 @@ void uWS_getParts(const FunctionCallbackInfo &args) { std::string_view part = optionalPart.value(); - Local partArrayBuffer = ArrayBuffer::New(isolate, (void *) part.data(), part.length()); + Local partArrayBuffer = ArrayBuffer_New(isolate, (void *) part.data(), part.length()); /* Map is 30% faster in this case, but a static Object could be faster still */ Local partMap = Object::New(isolate); partMap->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "data", NewStringType::kNormal).ToLocalChecked(), partArrayBuffer).IsNothing(); diff --git a/uWebSockets b/uWebSockets index 02691e0..5d89839 160000 --- a/uWebSockets +++ b/uWebSockets @@ -1 +1 @@ -Subproject commit 02691e0cde03e72f9d670e0398be756ac97073e2 +Subproject commit 5d8983902690a0b93193d922d6239965bdca2f76