restart server on client update

Author: 7ka-Hiira

fcitx5-hazkey/src/CMakeLists.txt

@@ -52,6 +52,8 @@ else()
     message(FATAL_ERROR "protobuf 3.12+ required for proto3 optional support. Current version: ${Protobuf_VERSION}")
 endif()
 
+configure_file(hazkey_constants.h.in hazkey_constants.h @ONLY)
+
 target_include_directories(fcitx5-hazkey PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${Protobuf_INCLUDE_DIRS})
 target_link_libraries(fcitx5-hazkey PRIVATE Fcitx5::Core Fcitx5::Config ${Protobuf_LITE_LIBRARIES})
 

fcitx5-hazkey/src/hazkey_config.h

@@ -7,11 +7,15 @@
 #include <fcitx-utils/library.h>
 #include <fcitx/menu.h>
 
+#include "hazkey_constants.h"
+
 namespace fcitx {
 
 /// Config
 
 FCITX_CONFIGURATION(HazkeyEngineConfig,
+                    HiddenOption<std::string> lastVersion{
+                        this, "LastVersion", "", ""};
                     Option<bool> showTabToSelect{
                         this, "showTabToSelect",
                         _("Show [Press Tab to Select] indicator"), true};

fcitx5-hazkey/src/hazkey_constants.h.in

@@ -0,0 +1,8 @@
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
+
+#include <string>
+
+const std::string HAZKEY_VERSION = "@PROJECT_VERSION@";
+
+#endif

fcitx5-hazkey/src/hazkey_engine.cpp

@@ -4,6 +4,7 @@
 
 #include "hazkey_server_connector.h"
 #include "hazkey_state.h"
+#include "hazkey_constants.h"
 
 namespace fcitx {
 
@@ -14,7 +15,7 @@ HazkeyEngine::HazkeyEngine(Instance *instance)
     server_ = HazkeyServerConnector();
 
     instance->inputContextManager().registerProperty("hazkeyState", &factory_);
-    // reloadConfig();
+    reloadConfig();
 }
 
 void HazkeyEngine::keyEvent([[maybe_unused]] const InputMethodEntry &entry,
@@ -56,17 +57,18 @@ void HazkeyEngine::setConfig(const RawConfig &config) {
 }
 
 void HazkeyEngine::reloadConfig() {
-    // server will directly read config
-    //
     readAsIni(config_, "conf/hazkey.conf");
-    // server_.setServerConfig(
-    //     *config().zenzaiEnabled, *config().zenzaiInferenceLimit,
-    //     static_cast<int>(*config().numberStyle),
-    //     static_cast<int>(*config().symbolStyle),
-    //     static_cast<int>(*config().periodStyle),
-    //     static_cast<int>(*config().commaStyle),
-    //     static_cast<int>(*config().spaceStyle),
-    //     static_cast<int>(*config().diacriticStyle), *config().zenzaiProfile);
+
+    std::string lastVersion = config_.lastVersion.value();
+
+    if (lastVersion != HAZKEY_VERSION) {
+        FCITX_DEBUG() << "Update detected. restarting server..";
+        // server automatically restarts if current server is newer than running server.
+        server_.start_hazkey_server();
+
+        config_.lastVersion.setValue(HAZKEY_VERSION);
+        safeSaveAsIni(config_, "conf/hazkey.conf");
+    }
 }
 
 void HazkeyEngine::save() {

fcitx5-hazkey/src/hazkey_server_connector.h

@@ -26,6 +26,8 @@ class HazkeyServerConnector {
 
     void connect_server();
 
+    void start_hazkey_server();
+
     std::optional<hazkey::ResponseEnvelope> transact(
         const hazkey::RequestEnvelope& send_data);
 
@@ -70,7 +72,6 @@ class HazkeyServerConnector {
 
    private:
     bool retry_connect();
-    void start_hazkey_server();
     bool is_hazkey_server_running();
     bool requestSuccess(hazkey::ResponseEnvelope);
     int sock_ = -1;

hazkey-server/Sources/hazkey-server/processManager.swift

@@ -34,7 +34,8 @@ class ProcessManager {
                 return versionString != hazkeyVersion
             }
         }
-        return false
+        // restart if file does not exists
+        return true
     }
 
     func checkExistingServer() throws {