jprdonnelly/uWebSockets.js
1
0
Fork 0
mirror of https://github.com/uNetworking/uWebSockets.js.git synced 2026-04-06 20:00:24 -04:00
Code Issues Projects Releases Wiki Activity

Merge userData with wsObject

Browse Source
This commit is contained in:
Alex Hultman
2020-06-05 16:49:26 +02:00
parent b4df9ebf5f
commit d1a2556fba
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/HttpResponseWrapper.h
View File

@@ -248,26 +248,17 @@ struct HttpResponseWrapper {
}
}
/* Takes UserData, secKey, secProtocol, secExtensions, context. Returns nothing */
template <bool SSL>
static void res_upgrade(const FunctionCallbackInfo<Value> &args) {
Isolate *isolate = args.GetIsolate();
auto *res = getHttpResponse<SSL>(args);
if (res) {
printf("Calling upgrade!\n");
/* We require exactly 5 arguments */
if (args.Length() != 5) {
return;
}
/* We are being passed userData (wsObject) */
//Local<Object> wsObject = args[0];
//Local<String> secWebSocketKey = args[1];
//Local<String> secWebSocketProtocol = args[2];
//Local<String> secWebSocketExtensions = args[3];
//Local<External> context = args[4];
NativeString secWebSocketKey(args.GetIsolate(), args[1]);
if (secWebSocketKey.isInvalid(args)) {
return;
@@ -287,10 +278,11 @@ struct HttpResponseWrapper {
invalidateResObject(args);
/* This releases on return */
UniquePersistent<Object> userData;
userData.Reset(isolate, Local<Object>::Cast(args[0]));
printf("Upgrading now!\n");
/* Immediately calls open handler */
res->template upgrade<PerSocketData>({
.socketPf = &userData
}, secWebSocketKey.getString(), secWebSocketProtocol.getString(),