Merge pull request #1092 from stratosphereips/alya/fix_the_starting_of_abstract_class

remove duplicate AsyncModule class from module.py

Author: AlyaGomaa

modules/ip_info/ip_info.py

@@ -20,7 +20,7 @@
 from slips_files.common.flow_classifier import FlowClassifier
 from slips_files.core.helpers.whitelist.whitelist import Whitelist
 from .asn_info import ASN
-from slips_files.common.abstracts.module import AsyncModule
+from slips_files.common.abstracts.async_module import AsyncModule
 from slips_files.common.slips_utils import utils
 from slips_files.core.structures.evidence import (
     Evidence,

slips_files/common/abstracts/async_module.py

@@ -24,7 +24,8 @@ async def shutdown_gracefully(self):
     async def run_main(self):
         return await self.main()
 
-    def run_async_function(self, func: Callable):
+    @staticmethod
+    def run_async_function(func: Callable):
         loop = asyncio.get_event_loop()
         return loop.run_until_complete(func())
 
@@ -44,7 +45,6 @@ def run(self):
             self.print_traceback()
             return
 
-        keyboard_int_ctr = 0
         while True:
             try:
                 if self.should_stop():
@@ -59,10 +59,10 @@ def run(self):
                     return
 
             except KeyboardInterrupt:
-                keyboard_int_ctr += 1
-                if keyboard_int_ctr >= 2:
+                self.keyboard_int_ctr += 1
+                if self.keyboard_int_ctr >= 2:
                     # on the second ctrl+c Slips immediately stop
-                    return
+                    return True
                 # on the first ctrl + C keep looping until the should_stop()
                 # returns true
                 continue

slips_files/common/abstracts/module.py

@@ -1,4 +1,3 @@
-import asyncio
 import sys
 import traceback
 import warnings
@@ -7,7 +6,6 @@
 from typing import (
     Dict,
     Optional,
-    Callable,
 )
 from slips_files.common.printer import Printer
 from slips_files.core.output import Output
@@ -180,68 +178,3 @@ def run(self):
             except Exception:
                 self.print_traceback()
                 return
-
-
-class AsyncModule(IModule, ABC, Process):
-    """
-    An abstract class for asynchronous slips modules
-    """
-
-    name = "abstract class"
-
-    def __init__(self, *args, **kwargs):
-        IModule.__init__(self, *args, **kwargs)
-
-    def init(self, **kwargs): ...
-
-    async def main(self): ...
-
-    async def shutdown_gracefully(self):
-        """Implement the async shutdown logic here"""
-        pass
-
-    async def run_main(self):
-        return await self.main()
-
-    @staticmethod
-    def run_async_function(func: Callable):
-        loop = asyncio.get_event_loop()
-        return loop.run_until_complete(func())
-
-    def run(self):
-        try:
-            error: bool = self.pre_main()
-            if error or self.should_stop():
-                self.run_async_function(self.shutdown_gracefully)
-                return
-        except KeyboardInterrupt:
-            self.run_async_function(self.shutdown_gracefully)
-            return
-        except Exception:
-            self.print_traceback()
-            return
-
-        while True:
-            try:
-                if self.should_stop():
-                    self.run_async_function(self.shutdown_gracefully)
-                    return
-
-                # if a module's main() returns 1, it means there's an
-                # error and it needs to stop immediately
-                error: bool = self.run_async_function(self.run_main)
-                if error:
-                    self.run_async_function(self.shutdown_gracefully)
-                    return
-
-            except KeyboardInterrupt:
-                self.keyboard_int_ctr += 1
-                if self.keyboard_int_ctr >= 2:
-                    # on the second ctrl+c Slips immediately stop
-                    return True
-                # on the first ctrl + C keep looping until the should_stop()
-                # returns true
-                continue
-            except Exception:
-                self.print_traceback()
-                return