Skip to content
This repository has been archived by the owner on Mar 11, 2024. It is now read-only.

fix: fixed to compile on Electron 13 (re-opened the pull request on a feature branch) #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions src/AppWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ void uWS_App_ws(const FunctionCallbackInfo<Value> &args) {
behavior.message = [messagePf = std::move(messagePf), isolate](auto *ws, std::string_view message, uWS::OpCode opCode) {
HandleScope hs(isolate);

Local<ArrayBuffer> messageArrayBuffer = ArrayBuffer::New(isolate, (void *) message.data(), message.length());
std::unique_ptr<v8::BackingStore> backing = v8::ArrayBuffer::NewBackingStore(
(void *) message.data(), message.length(), [](void*, size_t, void*){}, nullptr);
Local<ArrayBuffer> messageArrayBuffer = v8::ArrayBuffer::New(isolate, std::move(backing));

PerSocketData *perSocketData = (PerSocketData *) ws->getUserData();
Local<Value> argv[3] = {Local<Object>::New(isolate, perSocketData->socketPf),
Expand Down Expand Up @@ -215,7 +217,9 @@ void uWS_App_ws(const FunctionCallbackInfo<Value> &args) {
behavior.close = [closePf = std::move(closePf), isolate](auto *ws, int code, std::string_view message) {
HandleScope hs(isolate);

Local<ArrayBuffer> messageArrayBuffer = ArrayBuffer::New(isolate, (void *) message.data(), message.length());
std::unique_ptr<v8::BackingStore> backing = v8::ArrayBuffer::NewBackingStore(
(void *) message.data(), message.length(), [](void*, size_t, void*){}, nullptr);
Local<ArrayBuffer> messageArrayBuffer = v8::ArrayBuffer::New(isolate, std::move(backing));
PerSocketData *perSocketData = (PerSocketData *) ws->getUserData();
Local<Object> wsObject = Local<Object>::New(isolate, perSocketData->socketPf);

Expand Down
22 changes: 17 additions & 5 deletions src/HttpResponseWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ struct HttpResponseWrapper {
res->onData([p = std::move(p), isolate](std::string_view data, bool last) {
HandleScope hs(isolate);

Local<ArrayBuffer> dataArrayBuffer = ArrayBuffer::New(isolate, (void *) data.data(), data.length());
std::unique_ptr<v8::BackingStore> backing = v8::ArrayBuffer::NewBackingStore(
(void *) data.data(), data.length(), [](void*, size_t, void*){}, nullptr);
Local<ArrayBuffer> dataArrayBuffer = v8::ArrayBuffer::New(isolate, std::move(backing));

Local<Value> argv[] = {dataArrayBuffer, Boolean::New(isolate, last)};
CallJS(isolate, Local<Function>::New(isolate, p), 2, argv);
Expand Down Expand Up @@ -107,7 +109,9 @@ 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*/));
std::unique_ptr<v8::BackingStore> backing = v8::ArrayBuffer::NewBackingStore(
(void *) ip.data(), ip.length(), [](void*, size_t, void*){}, nullptr);
args.GetReturnValue().Set(v8::ArrayBuffer::New(isolate, std::move(backing)/*, ArrayBufferCreationMode::kInternalized*/));
}
}

Expand All @@ -120,7 +124,10 @@ 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*/));
std::unique_ptr<v8::BackingStore> backing = v8::ArrayBuffer::NewBackingStore(
(void *) ip.data(), ip.length(), [](void*, size_t, void*){}, nullptr);

args.GetReturnValue().Set(v8::ArrayBuffer::New(isolate, std::move(backing)/*, ArrayBufferCreationMode::kInternalized*/));
}
}

Expand All @@ -133,7 +140,10 @@ 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*/));
std::unique_ptr<v8::BackingStore> backing = v8::ArrayBuffer::NewBackingStore(
(void *) ip.data(), ip.length(), [](void*, size_t, void*){}, nullptr);

args.GetReturnValue().Set(v8::ArrayBuffer::New(isolate, std::move(backing)/*, ArrayBufferCreationMode::kInternalized*/));
}
}

Expand All @@ -146,7 +156,9 @@ 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*/));
std::unique_ptr<v8::BackingStore> backing = v8::ArrayBuffer::NewBackingStore(
(void *) ip.data(), ip.length(), [](void*, size_t, void*){}, nullptr);
args.GetReturnValue().Set(v8::ArrayBuffer::New(isolate, std::move(backing)/*, ArrayBufferCreationMode::kInternalized*/));
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/Utilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ class NativeString {
length = utf8Value->length();
} else if (value->IsTypedArray()) {
Local<ArrayBufferView> arrayBufferView = Local<ArrayBufferView>::Cast(value);
ArrayBuffer::Contents contents = arrayBufferView->Buffer()->GetContents();
std::shared_ptr<v8::BackingStore> backing = arrayBufferView->Buffer()-> GetBackingStore();
length = arrayBufferView->ByteLength();
data = (char *) contents.Data() + arrayBufferView->ByteOffset();
data = (char *) backing->Data() + arrayBufferView->ByteOffset();
} else if (value->IsArrayBuffer()) {
Local<ArrayBuffer> arrayBuffer = Local<ArrayBuffer>::Cast(value);
ArrayBuffer::Contents contents = arrayBuffer->GetContents();
length = contents.ByteLength();
data = (char *) contents.Data();
std::shared_ptr<v8::BackingStore> backing = arrayBuffer-> GetBackingStore();
length = backing->ByteLength();
data = (char *) backing->Data();
} else {
invalid = true;
}
Expand Down
8 changes: 6 additions & 2 deletions src/WebSocketWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ 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*/));
std::unique_ptr<v8::BackingStore> backing = v8::ArrayBuffer::NewBackingStore(
(void *) ip.data(), ip.length(), [](void*, size_t, void*){}, nullptr);
args.GetReturnValue().Set(v8::ArrayBuffer::New(isolate, std::move(backing)/*, ArrayBufferCreationMode::kInternalized*/));
}
}

Expand All @@ -149,7 +151,9 @@ 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*/));
std::unique_ptr<v8::BackingStore> backing = v8::ArrayBuffer::NewBackingStore(
(void *) ip.data(), ip.length(), [](void*, size_t, void*){}, nullptr);
args.GetReturnValue().Set(v8::ArrayBuffer::New(isolate, std::move(backing)/*, ArrayBufferCreationMode::kInternalized*/));
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/addon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ void uWS_getParts(const FunctionCallbackInfo<Value> &args) {

std::string_view part = optionalPart.value();

Local<ArrayBuffer> partArrayBuffer = ArrayBuffer::New(isolate, (void *) part.data(), part.length());
std::unique_ptr<v8::BackingStore> backing = v8::ArrayBuffer::NewBackingStore(
(void *) part.data(), part.length(), [](void*, size_t, void*){}, nullptr);
Local<ArrayBuffer> partArrayBuffer = v8::ArrayBuffer::New(isolate, std::move(backing));
/* Map is 30% faster in this case, but a static Object could be faster still */
Local<Object> partMap = Object::New(isolate);
partMap->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "data", NewStringType::kNormal).ToLocalChecked(), partArrayBuffer).IsNothing();
Expand Down