feat(server): minor version in events

altmp · Dec 28, 2023 · 7b6f192 · 7b6f192
1 parent 933f76c
commit 7b6f192
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/server/src/bindings/ConnectionInfo.cpp b/server/src/bindings/ConnectionInfo.cpp
@@ -55,10 +55,26 @@ static void BranchGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v
 }
 
 static void BuildGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info)
+{
+    V8_DEPRECATE("ConnectionInfo build", "versionMajor & versionMinor");
+
+    V8_GET_ISOLATE_CONTEXT_RESOURCE();
+    V8_GET_THIS_BASE_OBJECT(con, alt::IConnectionInfo);
+    V8_RETURN_UINT(con->GetVersionMajor());
+}
+
+static void VersionMajorGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info)
+{
+    V8_GET_ISOLATE_CONTEXT_RESOURCE();
+    V8_GET_THIS_BASE_OBJECT(con, alt::IConnectionInfo);
+    V8_RETURN_UINT(con->GetVersionMajor());
+}
+
+static void VersionMinorGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT_RESOURCE();
     V8_GET_THIS_BASE_OBJECT(con, alt::IConnectionInfo);
-    V8_RETURN_UINT(con->GetBuild());
+    V8_RETURN_UINT(con->GetVersionMinor());
 }
 
 static void CdnUrlGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ -216,6 +232,8 @@ extern V8Class v8ConnectionInfo("ConnectionInfo",
                                     V8Helpers::SetAccessor(isolate, tpl, "isDebug", &IsDebugGetter);
                                     V8Helpers::SetAccessor(isolate, tpl, "branch", &BranchGetter);
                                     V8Helpers::SetAccessor(isolate, tpl, "build", &BuildGetter);
+                                    V8Helpers::SetAccessor(isolate, tpl, "versionMajor", &VersionMajorGetter);
+                                    V8Helpers::SetAccessor(isolate, tpl, "versionMinor", &VersionMinorGetter);
                                     V8Helpers::SetAccessor(isolate, tpl, "cdnUrl", &CdnUrlGetter);
                                     V8Helpers::SetAccessor(isolate, tpl, "passwordHash", &PasswordHashGetter);
                                     V8Helpers::SetAccessor(isolate, tpl, "ip", &IpGetter);

diff --git a/server/src/events/Player.cpp b/server/src/events/Player.cpp
@@ -44,7 +44,8 @@ V8Helpers::LocalEventHandler playerConnectDenied(EventType::PLAYER_CONNECT_DENIE
                                                      args.push_back(V8Helpers::JSValue(ev->GetPasswordHash()));
                                                      args.push_back(V8Helpers::JSValue(ev->IsDebug()));
                                                      args.push_back(V8Helpers::JSValue(ev->GetBranch()));
-                                                     args.push_back(V8Helpers::JSValue(ev->GetMajorVersion()));
+                                                     args.push_back(V8Helpers::JSValue(ev->GetVersionMajor()));
+                                                     // TODO: no idea where to put version minor to not break backward compatibility, not sure it's needed at all
                                                      args.push_back(V8Helpers::JSValue(ev->GetCdnUrl()));
                                                      args.push_back(V8Helpers::JSValue(ev->GetDiscordId()));
                                                  });

diff --git a/shared/deps/cpp-sdk b/shared/deps/cpp-sdk
+6 −4		events/CPlayerConnectDeniedEvent.h
+2 −1		script-objects/IConnectionInfo.h