Merge pull request #58 from adator85/V5.X.X

update websocket connection

core/installation.py

@@ -37,7 +37,6 @@ class Install:
         self.set_configuration()
 
         if self.skip_install:
-            self.check_packages_version()
             return None
 
         self.check_packages_version()
@@ -86,13 +85,11 @@ class Install:
 
         if not os.path.exists(os.path.join(self.config.defender_install_folder, 'core', 'configuration.json')):
             # If configuration file do not exist
-            exit("/!\\ Configuration file (core/configuration.json) doesn't exist! please create it /!\\")
+            exit("/!\\ Configuration file (core/configuration.json) doesn't exist /!\\")
 
         # Exclude Windows OS from the installation
         if os.name == 'nt':
-            # If windows, modify pip and python virtual environment executable
-            self.config.venv_pip_executable = f'{os.path.join(defender_install_folder, venv_folder, "Scripts")}{os.sep}pip.exe'
-            self.config.venv_python_executable = f'{os.path.join(defender_install_folder, venv_folder, "Scripts")}{os.sep}python.exe'
+            #print('/!\\ Skip installation /!\\')
             self.skip_install = True
             return False
 

core/irc.py

@@ -313,7 +313,7 @@ class Irc:
 
     def send_response(self, responses:list[bytes]) -> None:
         try:
-            # print(responses)
+            # print(data)
             for data in responses:
                 response = data.decode(self.CHARSET[0]).split()
                 self.cmd(response)
@@ -490,8 +490,7 @@ class Irc:
                 self.Base.db_record_module(fromuser, module_name)
             self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} :Module {module_name} chargé")
 
-            # self.Base.logs.info(self.loaded_classes)
-            self.Base.logs.info(f"Module {class_name} has been loaded")
+            self.Base.logs.info(self.loaded_classes)
             return True
 
         except ModuleNotFoundError as moduleNotFound:

mods/mod_command.py

@@ -150,7 +150,6 @@ class Command():
                 try:
                     message = ' '.join(cmd[3:])
                     self.Irc.send2socket(f":{dnickname} NOTICE {self.user_to_notice} :[{red}ERROR MSG{nogc}] {message}")
-                    self.Base.logs.error(f"{cmd[1]} - {message}")
                 except KeyError as ke:
                     self.Base.logs.error(ke)
                 except Exception as err:
@@ -213,7 +212,6 @@ class Command():
         dnickname = self.Config.SERVICE_NICKNAME
         service_id = self.Config.SERVICE_ID
         dchanlog = self.Config.SERVICE_CHANLOG
-        self.user_to_notice = user
         fromuser = user
         fromchannel = channel
 

mods/mod_jsonrpc.py

@@ -10,7 +10,8 @@ class Jsonrpc():
     class ModConfModel:
         """The Model containing the module parameters
         """
-        jsonrpc: int = 0
+        param_exemple1: str
+        param_exemple2: int
 
     def __init__(self, ircInstance:Irc) -> None:
 
@@ -71,8 +72,7 @@ class Jsonrpc():
                     username=self.Config.JSONRPC_USER,
                     password=self.Config.JSONRPC_PASSWORD,
                     callback_object_instance=self,
-                    callback_method_name='callback_sent_to_irc',
-                    debug_level=10
+                    callback_method_name='callback_sent_to_irc'
                     )
 
         self.Rpc: Loader = Loader(
@@ -90,9 +90,6 @@ class Jsonrpc():
         if self.UnrealIrcdRpcLive.Error.code != 0:
             self.Irc.sendPrivMsg(f"[{self.Config.COLORS.red}ERROR{self.Config.COLORS.nogc}] {self.UnrealIrcdRpcLive.Error.message}", self.Config.SERVICE_CHANLOG)
 
-        if self.ModConfig.jsonrpc == 1:
-            self.Base.create_thread(self.thread_start_jsonrpc, run_once=True)
-
         return None
 
     def __set_commands(self, commands:dict[int, list[str]]) -> None:
@@ -165,10 +162,10 @@ class Jsonrpc():
         """
         try:
             # Build the default configuration model (Mandatory)
-            self.ModConfig = self.ModConfModel(jsonrpc=0)
+            self.ModConfig = self.ModConfModel(param_exemple1='param value 1', param_exemple2=1)
 
             # Sync the configuration with core configuration (Mandatory)
-            self.Base.db_sync_core_config(self.module_name, self.ModConfig)
+            #self.Base.db_sync_core_config(self.module_name, self.ModConfig)
 
             return None
 
@@ -197,7 +194,6 @@ class Jsonrpc():
 
         command = str(cmd[0]).lower()
         dnickname = self.Config.SERVICE_NICKNAME
-        dchannel = self.Config.SERVICE_CHANLOG
         fromuser = user
         fromchannel = str(channel) if not channel is None else None
 
@@ -214,19 +210,10 @@ class Jsonrpc():
                     match option:
 
                         case 'on':
-                            for thread in self.Base.running_threads:
-                                if thread.getName() == 'thread_start_jsonrpc':
-                                    if thread.is_alive():
-                                        self.Irc.sendPrivMsg(f"Thread {thread.getName()} is running", dchannel)
-                                    else:
-                                        self.Irc.sendPrivMsg(f"Thread {thread.getName()} is not running, wait untill the process will be cleaned up", dchannel)
-
                             self.Base.create_thread(self.thread_start_jsonrpc, run_once=True)
-                            self.__update_configuration('jsonrpc', 1)
 
                         case 'off':
                             self.UnrealIrcdRpcLive.unsubscribe()
-                            self.__update_configuration('jsonrpc', 0)
 
                 except IndexError as ie:
                     self.Logs.error(ie)
@@ -275,9 +262,6 @@ class Jsonrpc():
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :VHOST                : {UserInfo.user.vhost}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CLIENT PORT          : {UserInfo.client_port}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :SERVER PORT          : {UserInfo.server_port}')
-                            
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CERTFP               : {UserInfo.tls.certfp}')
-                            self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CIPHER               : {UserInfo.tls.cipher}')
 
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :IDLE SINCE           : {UserInfo.idle_since}')
                             self.Irc.send2socket(f':{dnickname} NOTICE {fromuser} :CONNECTED SINCE      : {UserInfo.connected_since}')

version.json

@@ -1,9 +1,9 @@
 {
-    "version": "5.4.0",
+    "version": "5.3.8",
 
     "requests": "2.32.3",
     "psutil": "6.0.0",
-    "unrealircd_rpc_py": "1.0.6",
+    "unrealircd_rpc_py": "1.0.5",
     "sqlalchemy": "2.0.35",
     "faker": "30.1.0"
 }