sciveo 0.1.6__tar.gz → 0.1.7__tar.gz

{sciveo-0.1.6 → sciveo-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.6
+Version: 0.1.7
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

{sciveo-0.1.6 → sciveo-0.1.7}/sciveo/monitoring/monitor.py

@@ -46,13 +46,17 @@ class BaseMonitor(DaemonBase):
   def __init__(self, period=5):
     super().__init__(period=period)
 
-    self.data = HardwareInfo()()
-    self.data.setdefault("CPU", {})
-    self.data.setdefault("DISK", {})
-    self.data.setdefault("NET", {})
-    self.data.setdefault("TEMP", {})
-    self.data["RAM"] = {}
-    self.data["LOG"] = {}
+    self.data = {
+      "CPU": {},
+      "RAM": {},
+      "DISK": {},
+      "NET": {},
+      "TEMP": {},
+      "LOG": {},
+      "INFO": {},
+    }
+    self.data["INFO"] = HardwareInfo()()
+    self.data["INFO"].setdefault("CPU", {})
     self.list_logs = []
 
     self.api = APIRemoteClient()
@@ -116,7 +120,7 @@ class BaseMonitor(DaemonBase):
       self.data["RAM"]["total"] = memory.total
       self.data["RAM"]["free"] = memory.free
       # self.data["RAM"]["installed"] = format_memory_size(memory.total)
-      self.data["RAM"]["print"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
+      self.data["INFO"]["RAM"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
     except Exception:
       pass
 
@@ -156,7 +160,7 @@ class BaseMonitor(DaemonBase):
       self.get_io_metrics("DISK", list_metrics, disk_io_counters)
 
       disk_usage = psutil.disk_usage('/')._asdict()
-      self.data["DISK"]["print"] = f"{disk_usage['percent']}% ({round(disk_usage['used'] / (1024 * 1024 * 1024), 1)} GB / {round(disk_usage['total'] / (1024 * 1024 * 1024), 1)} GB)"
+      self.data["INFO"]["DISK"] = f"{disk_usage['percent']}% ({round(disk_usage['used'] / (1024 * 1024 * 1024), 1)} GB / {round(disk_usage['total'] / (1024 * 1024 * 1024), 1)} GB)"
     except Exception as e:
       pass
 

{sciveo-0.1.6 → sciveo-0.1.7}/sciveo/monitoring/network.py

@@ -10,11 +10,41 @@
 #
 
 import socket
+import asyncio
 
 from sciveo.common.tools.logger import *
 from sciveo.common.tools.timers import Timer
 
 
+class NetworkScanner:
+  def __init__(self, timeout=1.0):
+    self.timeout = timeout
+
+  async def scan_port(self, ip, port):
+    try:
+      reader, writer = await asyncio.wait_for(asyncio.open_connection(ip, port), timeout=self.timeout)
+      writer.close()
+      await writer.wait_closed()
+      return (ip, port)
+    except Exception as e:
+      # print("Exception", e)
+      return None
+
+  async def scan_all_ports(self, ip, ports):
+    tasks = [self.scan_port(ip, port) for port in ports]
+    return await asyncio.gather(*tasks)
+
+  async def scan_async(self, ips, ports):
+    results = []
+    for ip in ips:
+      results.extend(await self.scan_all_ports(ip, ports))
+    results = [x for x in results if x is not None]
+    return results
+
+  def scan(self, ips, ports):
+    return asyncio.run(self.scan_async(ips, ports))
+
+
 class NetworkTools:
   def __init__(self, **kwargs):
     self.default_arguments = {
@@ -81,6 +111,20 @@ class NetworkTools:
 
 
 if __name__ == "__main__":
-  net = NetworkTools(timeout=0.01, localhost=True)
-  list_hosts = net.scan_port(port=22)
-  print(list_hosts)
+  t1 = Timer()
+  net = NetworkTools(timeout=0.5, localhost=True)
+  result = net.scan_port(port=22)
+  t1 = t1.stop()
+  print(result, "elapsed", t1)
+
+  t2 = Timer()
+  list_local_ips = net.get_local_nets()
+  list_scan_ips = []
+  for local_ip in list_local_ips:
+    list_scan_ips += net.generate_ip_list(local_ip)
+  # print(list_scan_ips)
+  ns = NetworkScanner(timeout=0.5)
+  result = ns.scan(list_scan_ips, [22])
+  t2 = t2.stop()
+  print(result, "elapsed", t2)
+  print("elapsed", t1, t2, t1 - t2)

sciveo-0.1.7/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.1.7'

{sciveo-0.1.6 → sciveo-0.1.7}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.6
+Version: 0.1.7
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

sciveo-0.1.6/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.1.6'