[futurepress#95] Windows: Implements getActiveServerId()

Author: birdofpreyru

windows/ReactNativeStaticServer/ReactNativeModule.cpp

@@ -12,7 +12,6 @@ using namespace std::chrono_literals;
 using namespace winrt::ReactNativeStaticServer;
 using namespace winrt::Windows::Networking::Connectivity;
 
-double activeServerId;
 ReactNativeModule* mod;
 React::ReactPromise<std::string>* pendingResult;
 Server *server;
@@ -37,17 +36,26 @@ void unlock_sem() {
 }
 
 void OnSignal(std::string signal, std::string details) {
-    if (signal == CRASHED || signal == TERMINATED) {
-        delete server;
-        server = NULL;
-    }
     if (pendingResult) {
         if (signal == CRASHED) RNException("Server crashed").reject(*pendingResult);
         else pendingResult->Resolve(details);
-        delete pendingResult;
-        pendingResult = NULL;
-        unlock_sem();
-    } else mod->sendEvent(signal, details);
+    }
+    else {
+      // CAREFUL: sendEvent() depends on server object to get it ID,
+      // thus MUST BE called before the server instance is dropped below.
+      mod->sendEvent(signal, details);
+    }
+
+    if (signal == CRASHED || signal == TERMINATED) {
+      delete server;
+      server = NULL;
+    }
+
+    if (pendingResult) {
+      delete pendingResult;
+      pendingResult = NULL;
+      unlock_sem();
+    }
 }
 
 ReactNativeStaticServerSpec_Constants ReactNativeModule::GetConstants() noexcept {
@@ -59,6 +67,10 @@ ReactNativeStaticServerSpec_Constants ReactNativeModule::GetConstants() noexcept
     return res;
 }
 
+void ReactNativeModule::getActiveServerId(React::ReactPromise<std::optional<double>>&& result) noexcept {
+  result.Resolve(server ? std::optional(server->id()) : std::nullopt);
+}
+
 void ReactNativeModule::getLocalIpAddress(React::ReactPromise<std::string>&& result) noexcept {
     try {
         auto hosts = NetworkInformation::GetHostNames();
@@ -114,7 +126,7 @@ void ReactNativeModule::getOpenPort(
 
 void ReactNativeModule::sendEvent(std::string signal, std::string details) {
     JSValueObject obj = JSValueObject{
-            {"serverId", activeServerId},
+            {"serverId", server->id()},
             {"event", signal},
             {"details", details}
     };
@@ -142,9 +154,8 @@ void ReactNativeModule::start(
     }
 
     mod = this;
-    activeServerId = id;
     pendingResult = new React::ReactPromise<std::string>(result);
-    server = new Server(configPath, errlogPath, OnSignal);
+    server = new Server(id, configPath, errlogPath, OnSignal);
     server->launch();
 }
 

windows/ReactNativeStaticServer/ReactNativeModule.h

@@ -33,6 +33,9 @@ struct ReactNativeModule
 
     void sendEvent(std::string signal, std::string details);
 
+    REACT_METHOD(getActiveServerId)
+    void getActiveServerId(React::ReactPromise<std::optional<double>>&& result) noexcept;
+
     REACT_METHOD(getLocalIpAddress)
     void getLocalIpAddress(React::ReactPromise<std::string>&& result) noexcept;
 

windows/ReactNativeStaticServer/Server.cpp

@@ -51,10 +51,13 @@ void Server::OnLaunchedCallback() {
     Server::activeServer->_signalConsumer(LAUNCHED, "");
 }
 
-Server::Server(std::string configPath,
+Server::Server(
+    double id,
+    std::string configPath,
     std::string errlogPath,
     SignalConsumer signalConsumer
 ):
+    _id(id),
     _configPath(configPath),
     _errlogPath(errlogPath),
     _signalConsumer(signalConsumer)

windows/ReactNativeStaticServer/Server.h

@@ -13,13 +13,17 @@ namespace winrt::ReactNativeStaticServer {
 	class Server {
 	public:
 		Server(
+      double id,
 			std::string configPath,
 			std::string errlogPath,
 			SignalConsumer signalConsumer);
 
+    inline double id() { return _id; }
+
 		void launch();
 		void shutdown();
 	private:
+    double _id;
 		std::string _configPath;
 		std::string _errlogPath;
 		SignalConsumer _signalConsumer;

windows/ReactNativeStaticServer/codegen/NativeReactNativeStaticServerSpec.g.h

@@ -37,11 +37,12 @@ struct ReactNativeStaticServerSpec : winrt::Microsoft::ReactNative::TurboModuleS
   };
   static constexpr auto methods = std::tuple{
       Method<void(std::string) noexcept>{0, L"addListener"},
-      Method<void(double) noexcept>{1, L"removeListeners"},
-      Method<void(double, std::string, std::string, Promise<std::string>) noexcept>{2, L"start"},
-      Method<void(Promise<std::string>) noexcept>{3, L"getLocalIpAddress"},
-      Method<void(std::string, Promise<double>) noexcept>{4, L"getOpenPort"},
-      Method<void(Promise<std::string>) noexcept>{5, L"stop"},
+      Method<void(Promise<std::optional<double>>) noexcept>{1, L"getActiveServerId"},
+      Method<void(double) noexcept>{2, L"removeListeners"},
+      Method<void(double, std::string, std::string, Promise<std::string>) noexcept>{3, L"start"},
+      Method<void(Promise<std::string>) noexcept>{4, L"getLocalIpAddress"},
+      Method<void(std::string, Promise<double>) noexcept>{5, L"getOpenPort"},
+      Method<void(Promise<std::string>) noexcept>{6, L"stop"},
   };
 
   template <class TModule>
@@ -62,26 +63,31 @@ struct ReactNativeStaticServerSpec : winrt::Microsoft::ReactNative::TurboModuleS
           "    REACT_METHOD(addListener) static void addListener(std::string eventName) noexcept { /* implementation */ }\n");
     REACT_SHOW_METHOD_SPEC_ERRORS(
           1,
+          "getActiveServerId",
+          "    REACT_METHOD(getActiveServerId) void getActiveServerId(::React::ReactPromise<std::optional<double>> &&result) noexcept { /* implementation */ }\n"
+          "    REACT_METHOD(getActiveServerId) static void getActiveServerId(::React::ReactPromise<std::optional<double>> &&result) noexcept { /* implementation */ }\n");
+    REACT_SHOW_METHOD_SPEC_ERRORS(
+          2,
           "removeListeners",
           "    REACT_METHOD(removeListeners) void removeListeners(double count) noexcept { /* implementation */ }\n"
           "    REACT_METHOD(removeListeners) static void removeListeners(double count) noexcept { /* implementation */ }\n");
     REACT_SHOW_METHOD_SPEC_ERRORS(
-          2,
+          3,
           "start",
           "    REACT_METHOD(start) void start(double id, std::string configPath, std::string errlogPath, ::React::ReactPromise<std::string> &&result) noexcept { /* implementation */ }\n"
           "    REACT_METHOD(start) static void start(double id, std::string configPath, std::string errlogPath, ::React::ReactPromise<std::string> &&result) noexcept { /* implementation */ }\n");
     REACT_SHOW_METHOD_SPEC_ERRORS(
-          3,
+          4,
           "getLocalIpAddress",
           "    REACT_METHOD(getLocalIpAddress) void getLocalIpAddress(::React::ReactPromise<std::string> &&result) noexcept { /* implementation */ }\n"
           "    REACT_METHOD(getLocalIpAddress) static void getLocalIpAddress(::React::ReactPromise<std::string> &&result) noexcept { /* implementation */ }\n");
     REACT_SHOW_METHOD_SPEC_ERRORS(
-          4,
+          5,
           "getOpenPort",
           "    REACT_METHOD(getOpenPort) void getOpenPort(std::string address, ::React::ReactPromise<double> &&result) noexcept { /* implementation */ }\n"
           "    REACT_METHOD(getOpenPort) static void getOpenPort(std::string address, ::React::ReactPromise<double> &&result) noexcept { /* implementation */ }\n");
     REACT_SHOW_METHOD_SPEC_ERRORS(
-          5,
+          6,
           "stop",
           "    REACT_METHOD(stop) void stop(::React::ReactPromise<std::string> &&result) noexcept { /* implementation */ }\n"
           "    REACT_METHOD(stop) static void stop(::React::ReactPromise<std::string> &&result) noexcept { /* implementation */ }\n");