Update WebSocketWrapper.h

uNetworkingAB · web-flow · commit fbafa7aa1ce7 · 2025-05-07T23:43:28.000+02:00
diff --git a/src/WebSocketWrapper.h b/src/WebSocketWrapper.h
@@ -28,21 +28,21 @@ struct WebSocketWrapper {
     template <bool SSL>
     static inline uWS::WebSocket<SSL, true, PerSocketData> *getWebSocket(const FunctionCallbackInfo<Value> &args) {
         Isolate *isolate = args.GetIsolate();
-        auto *ws = (uWS::WebSocket<SSL, true, PerSocketData> *) args.Holder()->GetAlignedPointerFromInternalField(0);
+        auto *ws = (uWS::WebSocket<SSL, true, PerSocketData> *) args.This()->GetAlignedPointerFromInternalField(0);
         if (!ws) {
             args.GetReturnValue().Set(isolate->ThrowException(v8::Exception::Error(String::NewFromUtf8(isolate, "Invalid access of closed uWS.WebSocket/SSLWebSocket.", NewStringType::kNormal).ToLocalChecked())));
         }
         return ws;
     }
 
     static inline void invalidateWsObject(const FunctionCallbackInfo<Value> &args) {
-        args.Holder()->SetAlignedPointerInInternalField(0, nullptr);
+        args.This()->SetAlignedPointerInInternalField(0, nullptr);
     }
 
     /* Takes nothing returns holder (only used to fool TypeScript, as a conversion from WS to UserData) */
     template <bool SSL>
     static void uWS_WebSocket_getUserData(const FunctionCallbackInfo<Value> &args) {
-        args.GetReturnValue().Set(args.Holder());
+        args.GetReturnValue().Set(args.This());
     }
 
     /* Takes string topic */
@@ -285,7 +285,7 @@ struct WebSocketWrapper {
                 cb->Call(isolate->GetCurrentContext(), isolate->GetCurrentContext()->Global(), 0, nullptr).IsEmpty();
             });
 
-            args.GetReturnValue().Set(args.Holder());
+            args.GetReturnValue().Set(args.This());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -28,21 +28,21 @@ struct WebSocketWrapper {`
`28`	`28`	`template <bool SSL>`
`29`	`29`	`static inline uWS::WebSocket<SSL, true, PerSocketData> *getWebSocket(const FunctionCallbackInfo<Value> &args) {`
`30`	`30`	`Isolate *isolate = args.GetIsolate();`
`31`		`- auto ws = (uWS::WebSocket<SSL, true, PerSocketData> ) args.Holder()->GetAlignedPointerFromInternalField(0);`
	`31`	`+ auto ws = (uWS::WebSocket<SSL, true, PerSocketData> ) args.This()->GetAlignedPointerFromInternalField(0);`
`32`	`32`	`if (!ws) {`
`33`	`33`	`args.GetReturnValue().Set(isolate->ThrowException(v8::Exception::Error(String::NewFromUtf8(isolate, "Invalid access of closed uWS.WebSocket/SSLWebSocket.", NewStringType::kNormal).ToLocalChecked())));`
`34`	`34`	`}`
`35`	`35`	`return ws;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`static inline void invalidateWsObject(const FunctionCallbackInfo<Value> &args) {`
`39`		`- args.Holder()->SetAlignedPointerInInternalField(0, nullptr);`
	`39`	`+ args.This()->SetAlignedPointerInInternalField(0, nullptr);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/* Takes nothing returns holder (only used to fool TypeScript, as a conversion from WS to UserData) */`
`43`	`43`	`template <bool SSL>`
`44`	`44`	`static void uWS_WebSocket_getUserData(const FunctionCallbackInfo<Value> &args) {`
`45`		`- args.GetReturnValue().Set(args.Holder());`
	`45`	`+ args.GetReturnValue().Set(args.This());`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/* Takes string topic */`
`@@ -285,7 +285,7 @@ struct WebSocketWrapper {`
`285`	`285`	`cb->Call(isolate->GetCurrentContext(), isolate->GetCurrentContext()->Global(), 0, nullptr).IsEmpty();`
`286`	`286`	`});`
`287`	`287`
`288`		`- args.GetReturnValue().Set(args.Holder());`
	`288`	`+ args.GetReturnValue().Set(args.This());`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`