iio/DEFENDER
1
0
Fork 0
mirror of https://github.com/iio612/DEFENDER.git synced 2026-02-13 19:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update module load and reload./update also mod_jsonrpc

Browse Source
This commit is contained in:
adator
2025-08-20 17:17:25 +02:00
parent 4c327940dd
commit 0a4e185fe8
3 changed files with 103 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/irc.py
View File

@@ -536,14 +536,12 @@ class Irc:
module_folder = module_name.split('_')[1].lower() # ==> voice module_folder = module_name.split('_')[1].lower() # ==> voice
class_name = module_name.split('_')[1].capitalize() # ==> Voice class_name = module_name.split('_')[1].capitalize() # ==> Voice
# print(self.loaded_classes) # Check if the module is already loaded.
if 'mods.' + module_folder + '.' + module_name in sys.modules:
# Si le module est déja chargé self.Logs.debug(f"Module [{module_folder}.{module_name}] already loaded!")
if 'mods.' + module_name in sys.modules:
self.Logs.info("Module déja chargé ...")
self.Logs.info('module name = ' + module_name)
if class_name in self.loaded_classes: if class_name in self.loaded_classes:
# Si le module existe dans la variable globale retourne False # Si le module existe dans la variable globale retourne False
self.Logs.debug(f"Module [{module_folder}.{module_name}] exist in the local variable!")
self.Protocol.send_priv_msg( self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME, nick_from=self.Config.SERVICE_NICKNAME,
msg=f"Le module {module_name} est déja chargé ! si vous souhaiter le recharge tapez {self.Config.SERVICE_PREFIX}reload {module_name}", msg=f"Le module {module_name} est déja chargé ! si vous souhaiter le recharge tapez {self.Config.SERVICE_PREFIX}reload {module_name}",
@@ -566,11 +564,11 @@ class Irc:
msg=f"Module {module_name} chargé", msg=f"Module {module_name} chargé",
channel=self.Config.SERVICE_CHANLOG channel=self.Config.SERVICE_CHANLOG
) )
return False self.Logs.debug(f"Module [{module_folder}.{module_name}] reloaded!")
return True
# Charger le module # Charger le module
loaded_module = importlib.import_module(f'mods.{module_folder}.{module_name}') loaded_module = importlib.import_module(f'mods.{module_folder}.{module_name}')
my_class = getattr(loaded_module, class_name, None) # Récuperer le nom de classe my_class = getattr(loaded_module, class_name, None) # Récuperer le nom de classe
create_instance_of_the_class = my_class(self.ircObject) # Créer une nouvelle instance de la classe create_instance_of_the_class = my_class(self.ircObject) # Créer une nouvelle instance de la classe
@@ -597,7 +595,7 @@ class Irc:
channel=self.Config.SERVICE_CHANLOG channel=self.Config.SERVICE_CHANLOG
) )
self.Logs.info(f"Module {class_name} has been loaded") self.Logs.debug(f"Module {class_name} has been loaded")
return True return True
@@ -605,19 +603,21 @@ class Irc:
self.Logs.error(f"MODULE_NOT_FOUND: {moduleNotFound}") self.Logs.error(f"MODULE_NOT_FOUND: {moduleNotFound}")
self.Protocol.send_priv_msg( self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME, nick_from=self.Config.SERVICE_NICKNAME,
msg=f"[ {self.Config.COLORS.red}MODULE_NOT_FOUND{self.Config.COLORS.black} ]: {moduleNotFound}", msg=f"[ {self.Config.COLORS.red}MODULE ERROR{self.Config.COLORS.black} ]: {moduleNotFound}",
channel=self.Config.SERVICE_CHANLOG channel=self.Config.SERVICE_CHANLOG
) )
self.Base.db_delete_module(module_name) self.Base.db_delete_module(module_name)
return False
except Exception as err: except Exception as err:
self.Logs.error(f"Something went wrong with a module you want to load : {err}") self.Logs.error(f"[LOAD MODULE ERROR]: {err}", exc_info=True)
self.Protocol.send_priv_msg( self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME, nick_from=self.Config.SERVICE_NICKNAME,
msg=f"[ {self.Config.COLORS.red}ERROR{self.Config.COLORS.black} ]: {err}", msg=f"[ {self.Config.COLORS.red}MODULE ERROR{self.Config.COLORS.black} ]: {err}",
channel=self.Config.SERVICE_CHANLOG channel=self.Config.SERVICE_CHANLOG
) )
self.Base.db_delete_module(module_name) self.Base.db_delete_module(module_name)
traceback.print_exc() return False
def unload_module(self, mod_name: str) -> bool: def unload_module(self, mod_name: str) -> bool:
"""Unload a module """Unload a module
@@ -629,21 +629,28 @@ class Irc:
bool: True if success bool: True if success
""" """
try: try:
module_name = mod_name.lower() # Le nom du module. exemple: mod_defender # Le nom du module. exemple: mod_defender
module_name = mod_name.lower()
module_folder = module_name.split('_')[1].lower() # ==> defender
class_name = module_name.split('_')[1].capitalize() # Nom de la class. exemple: Defender class_name = module_name.split('_')[1].capitalize() # Nom de la class. exemple: Defender
if class_name in self.loaded_classes: if class_name in self.loaded_classes:
self.loaded_classes[class_name].unload() self.loaded_classes[class_name].unload()
del self.loaded_classes[class_name] del self.loaded_classes[class_name]
# Delete from the sys.
if sys.modules.get(f'{module_folder}.{module_name}'):
del sys.modules[f"{module_folder}.{module_name}"]
# Supprimer le module de la base de données # Supprimer le module de la base de données
self.Base.db_delete_module(module_name) self.Base.db_delete_module(module_name)
self.Protocol.send_priv_msg( self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME, nick_from=self.Config.SERVICE_NICKNAME,
msg=f"Module {module_name} supprimé", msg=f"[ MODULE INFO ] Module {module_name} has been deleted!",
channel=self.Config.SERVICE_CHANLOG channel=self.Config.SERVICE_CHANLOG
) )
self.Logs.debug(f"[ MODULE ] {module_name} has been deleted!")
return True return True
except Exception as err: except Exception as err:

120
mods/jsonrpc/mod_jsonrpc.py
View File

@@ -1,9 +1,11 @@
import gc import gc
import logging import logging
import asyncio
from time import sleep from time import sleep
from types import SimpleNamespace
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from dataclasses import dataclass from dataclasses import dataclass
from unrealircd_rpc_py.Live import LiveWebsocket from unrealircd_rpc_py.Live import LiveWebsocket, LiveUnixSocket
from unrealircd_rpc_py.Loader import Loader from unrealircd_rpc_py.Loader import Loader
if TYPE_CHECKING: if TYPE_CHECKING:
@@ -43,6 +45,12 @@ class Jsonrpc():
# Add Channel object to the module (Mandatory) # Add Channel object to the module (Mandatory)
self.Channel = ircInstance.Channel self.Channel = ircInstance.Channel
# Is RPC Active?
self.is_streaming = False
# Run Garbage collector.
self.Base.create_timer(10, gc.collect)
# Create module commands (Mandatory) # Create module commands (Mandatory)
self.Irc.build_command(1, self.module_name, 'jsonrpc', 'Activate the JSON RPC Live connection [ON|OFF]') self.Irc.build_command(1, self.module_name, 'jsonrpc', 'Activate the JSON RPC Live connection [ON|OFF]')
self.Irc.build_command(1, self.module_name, 'jruser', 'Get Information about a user using JSON RPC') self.Irc.build_command(1, self.module_name, 'jruser', 'Get Information about a user using JSON RPC')
@@ -60,7 +68,8 @@ class Jsonrpc():
def __init_module(self) -> None: def __init_module(self) -> None:
logging.getLogger('websockets').setLevel(logging.WARNING) logging.getLogger('websockets').setLevel(logging.WARNING)
logging.getLogger('unrealircd-rpc-py').setLevel(logging.DEBUG) logging.getLogger('unrealircd-rpc-py').setLevel(logging.CRITICAL)
logging.getLogger('unrealircd-liverpc-py').setLevel(logging.CRITICAL)
# Create you own tables (Mandatory) # Create you own tables (Mandatory)
# self.__create_tables() # self.__create_tables()
@@ -85,7 +94,7 @@ class Jsonrpc():
msg=f"[{self.Config.COLORS.red}ERROR{self.Config.COLORS.nogc}] {self.UnrealIrcdRpcLive.get_error.message}", msg=f"[{self.Config.COLORS.red}ERROR{self.Config.COLORS.nogc}] {self.UnrealIrcdRpcLive.get_error.message}",
channel=self.Config.SERVICE_CHANLOG channel=self.Config.SERVICE_CHANLOG
) )
return raise Exception(f"[LIVE-JSONRPC ERROR] {self.UnrealIrcdRpcLive.get_error.message}")
self.Rpc: Loader = Loader( self.Rpc: Loader = Loader(
req_method=self.Config.JSONRPC_METHOD, req_method=self.Config.JSONRPC_METHOD,
@@ -95,15 +104,13 @@ class Jsonrpc():
) )
if self.Rpc.get_error.code != 0: if self.Rpc.get_error.code != 0:
self.Logs.error(f"{self.Rpc.get_error.message} ({self.Rpc.get_error.code})") self.Logs.error(f"{self.Rpc.get_error.message} ({self.Rpc.get_error.code})")
self.Protocol.send_priv_msg( self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME, nick_from=self.Config.SERVICE_NICKNAME,
msg=f"[{self.Config.COLORS.red}ERROR{self.Config.COLORS.nogc}] {self.Rpc.get_error.message}", msg=f"[{self.Config.COLORS.red}JSONRPC ERROR{self.Config.COLORS.nogc}] {self.Rpc.get_error.message}",
channel=self.Config.SERVICE_CHANLOG channel=self.Config.SERVICE_CHANLOG
) )
raise Exception(f"[JSONRPC ERROR] {self.Rpc.get_error.message}")
self.subscribed = False
if self.ModConfig.jsonrpc == 1: if self.ModConfig.jsonrpc == 1:
self.Base.create_thread(self.thread_start_jsonrpc, run_once=True) self.Base.create_thread(self.thread_start_jsonrpc, run_once=True)
@@ -130,7 +137,7 @@ class Jsonrpc():
self.Base.db_execute_query(table_logs) self.Base.db_execute_query(table_logs)
return None return None
def callback_sent_to_irc(self, response): def callback_sent_to_irc(self, response: SimpleNamespace) -> None:
dnickname = self.Config.SERVICE_NICKNAME dnickname = self.Config.SERVICE_NICKNAME
dchanlog = self.Config.SERVICE_CHANLOG dchanlog = self.Config.SERVICE_CHANLOG
@@ -139,12 +146,24 @@ class Jsonrpc():
bold = self.Config.COLORS.bold bold = self.Config.COLORS.bold
red = self.Config.COLORS.red red = self.Config.COLORS.red
if hasattr(response, 'result'): if self.UnrealIrcdRpcLive.get_error.code != 0:
if response.method == 'log.unsubscribe': self.Protocol.send_priv_msg(nick_from=dnickname,
print(f">>>>>>>>>>>>>>>>> {response}") msg=f"[{bold}{red}JSONRPC ERROR{nogc}{bold}] {self.UnrealIrcdRpcLive.get_error.message}",
channel=dchanlog)
return None return None
if isinstance(response.result, bool) and response.result: if hasattr(response, 'error'):
if response.error.code != 0:
self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME,
msg=f"[{bold}{red}JSONRPC{nogc}{bold}] JSONRPC Event activated on {self.Config.JSONRPC_URL}",
channel=dchanlog)
return None
if hasattr(response, 'result'):
if isinstance(response.result, bool):
if response.result:
self.Protocol.send_priv_msg( self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME, nick_from=self.Config.SERVICE_NICKNAME,
msg=f"[{bold}{green}JSONRPC{nogc}{bold}] JSONRPC Event activated on {self.Config.JSONRPC_URL}", msg=f"[{bold}{green}JSONRPC{nogc}{bold}] JSONRPC Event activated on {self.Config.JSONRPC_URL}",
@@ -158,21 +177,16 @@ class Jsonrpc():
msg = response.result.msg if hasattr(response.result, 'msg') else '' msg = response.result.msg if hasattr(response.result, 'msg') else ''
build_msg = f"{green}{log_source}{nogc}: [{bold}{level}{bold}] {subsystem}.{event_id} - {msg}" build_msg = f"{green}{log_source}{nogc}: [{bold}{level}{bold}] {subsystem}.{event_id} - {msg}"
# Check if there is an error
if self.UnrealIrcdRpcLive.get_error.code != 0:
self.Logs.error(f"RpcLiveError: {self.UnrealIrcdRpcLive.get_error.message}")
self.Protocol.send_priv_msg(nick_from=dnickname, msg=build_msg, channel=dchanlog) self.Protocol.send_priv_msg(nick_from=dnickname, msg=build_msg, channel=dchanlog)
def thread_start_jsonrpc(self):
if not hasattr(self, 'UnrealIrcdRpcLive'):
return None return None
def thread_start_jsonrpc(self):
response: dict[str, dict] = {}
if self.UnrealIrcdRpcLive.get_error.code == 0: if self.UnrealIrcdRpcLive.get_error.code == 0:
self.subscribed = True self.is_streaming = True
self.UnrealIrcdRpcLive.subscribe(["all"]) response = asyncio.run(self.UnrealIrcdRpcLive.subscribe(["all"]))
else: else:
self.Protocol.send_priv_msg( self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME, nick_from=self.Config.SERVICE_NICKNAME,
@@ -180,7 +194,13 @@ class Jsonrpc():
channel=self.Config.SERVICE_CHANLOG channel=self.Config.SERVICE_CHANLOG
) )
if not self.subscribed: if response is None:
return
code = response.get('error', {}).get('code', 0)
message = response.get('error', {}).get('message', None)
if code == 0:
self.Protocol.send_priv_msg( self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME, nick_from=self.Config.SERVICE_NICKNAME,
msg=f"[{self.Config.COLORS.green}JSONRPC{self.Config.COLORS.nogc}] Stream is OFF", msg=f"[{self.Config.COLORS.green}JSONRPC{self.Config.COLORS.nogc}] Stream is OFF",
@@ -189,16 +209,31 @@ class Jsonrpc():
else: else:
self.Protocol.send_priv_msg( self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME, nick_from=self.Config.SERVICE_NICKNAME,
msg=f"[{self.Config.COLORS.red}JSONRPC{self.Config.COLORS.nogc}] Stream has crashed!", msg=f"[{self.Config.COLORS.red}JSONRPC{self.Config.COLORS.nogc}] Stream has crashed! {code} - {message}",
channel=self.Config.SERVICE_CHANLOG channel=self.Config.SERVICE_CHANLOG
) )
def thread_stop_jsonrpc(self) -> None: def thread_stop_jsonrpc(self) -> None:
self.subscribed = False
self.UnrealIrcdRpcLive.unsubscribe() response: dict[str, dict] = asyncio.run(self.UnrealIrcdRpcLive.unsubscribe())
self.Logs.debug("[JSONRPC UNLOAD] Unsubscribe from the stream!") self.Logs.debug("[JSONRPC UNLOAD] Unsubscribe from the stream!")
self.is_streaming = False
self.__update_configuration('jsonrpc', 0) self.__update_configuration('jsonrpc', 0)
if response is None:
print(f"... Response is None ?! {response}")
return None
code = response.get('error', {}).get('code', 0)
message = response.get('error', {}).get('message', None)
if code != 0:
self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME,
msg=f"[{self.Config.COLORS.red}JSONRPC ERROR{self.Config.COLORS.nogc}] {message} ({code})",
channel=self.Config.SERVICE_CHANLOG
)
def __load_module_configuration(self) -> None: def __load_module_configuration(self) -> None:
"""### Load Module Configuration """### Load Module Configuration
""" """
@@ -223,34 +258,19 @@ class Jsonrpc():
""" """
self.Base.db_update_core_config(self.module_name, self.ModConfig, param_key, param_value) self.Base.db_update_core_config(self.module_name, self.ModConfig, param_key, param_value)
def restart_jsonrpc(self) -> None:
self.Logs.debug("[JSONRPC THREAD] Rescue the connection of JSONRPC")
you_can_run_jsonrpc = False
limit = 10
inc = 0
for thread in self.Base.running_threads:
if thread.name == 'thread_start_jsonrpc':
while thread.is_alive():
sleep(2)
inc += 1
if inc > limit:
break
if not thread.is_alive():
you_can_run_jsonrpc = True
break
if you_can_run_jsonrpc:
self.Logs.debug("[JSONRPC THREAD] Success re run jsonrpc")
self.Base.create_thread(self.thread_start_jsonrpc, run_once=True)
def unload(self) -> None: def unload(self) -> None:
if self.is_streaming:
self.Protocol.send_priv_msg(
nick_from=self.Config.SERVICE_NICKNAME,
msg=f"[{self.Config.COLORS.green}JSONRPC INFO{self.Config.COLORS.nogc}] Shutting down RPC system!",
channel=self.Config.SERVICE_CHANLOG
)
self.Base.create_thread(func=self.thread_stop_jsonrpc, run_once=True) self.Base.create_thread(func=self.thread_stop_jsonrpc, run_once=True)
self.__update_configuration('jsonrpc', 0)
self.Logs.debug(f"Unloading {self.module_name}") self.Logs.debug(f"Unloading {self.module_name}")
return None return None
def cmd(self, data:list) -> None: def cmd(self, data: list) -> None:
return None return None
@@ -299,7 +319,6 @@ class Jsonrpc():
self.__update_configuration('jsonrpc', 1) self.__update_configuration('jsonrpc', 1)
case 'off': case 'off':
self.subscribed = False
self.Base.create_thread(func=self.thread_stop_jsonrpc, run_once=True) self.Base.create_thread(func=self.thread_stop_jsonrpc, run_once=True)
self.__update_configuration('jsonrpc', 0) self.__update_configuration('jsonrpc', 0)
@@ -361,6 +380,7 @@ class Jsonrpc():
try: try:
self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"GC Collect: {gc.collect()}") self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"GC Collect: {gc.collect()}")
self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre d'instance LiveWebsock: {self.compter_instances(LiveWebsocket)}") self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre d'instance LiveWebsock: {self.compter_instances(LiveWebsocket)}")
self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre d'instance LiveUnixSocket: {self.compter_instances(LiveUnixSocket)}")
self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre d'instance Loader: {self.compter_instances(Loader)}") self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre d'instance Loader: {self.compter_instances(Loader)}")
self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre de toute les instances: {len(gc.get_objects())}") self.Protocol.send_notice(nick_from=dnickname, nick_to=fromuser, msg=f"Nombre de toute les instances: {len(gc.get_objects())}")
except Exception as err: except Exception as err:

2
version.json
View File

@@ -3,7 +3,7 @@
"requests": "2.32.3", "requests": "2.32.3",
"psutil": "6.0.0", "psutil": "6.0.0",
"unrealircd_rpc_py": "2.0.2", "unrealircd_rpc_py": "2.0.4",
"sqlalchemy": "2.0.35", "sqlalchemy": "2.0.35",
"faker": "30.1.0" "faker": "30.1.0"
} }