CU-3nv249z - Add memory and storage details in the node info.

Author: fred-yu-2013

requirements.txt

@@ -14,6 +14,7 @@ google-api-python-client
 google-auth
 google-auth-oauthlib
 google-auth-httplib2
+psutil==5.9.2
 pyftpdlib==1.5.6
 PyOpenSSL==22.0.0
 pysendfile==2.0.1

src/modules/about/about.py

@@ -31,12 +31,21 @@ def get_commit_id(self):
         }
 
     def get_node_info(self):
+        import shutil
+        import psutil
+
         from src.modules.auth.user import UserManager
         from src.modules.subscription.vault import VaultManager
         from src.modules.backup.backup import BackupManager
 
+        def get_last_access_time():
+            vaults = VaultManager().get_all_vaults()
+            return max(list(map(lambda v: v.get_latest_access_time(), vaults)))
+
         owner_did, credential = Provider.get_verified_owner_did()
         auth = Auth()
+        memory, storage = psutil.virtual_memory(), shutil.disk_usage("/")
+
         return {
             "service_did": auth.did_str,
             "owner_did": owner_did,
@@ -49,4 +58,9 @@ def get_node_info(self):
             "user_count": UserManager().get_user_count(),
             "vault_count": VaultManager().get_vault_count(),
             "backup_count": BackupManager().get_backup_count(),
+            "latest_access_time": get_last_access_time(),
+            "memory_used": memory.available,
+            "memory_total": memory.total,
+            "storage_used": storage.used,
+            "storage_total": storage.total
         }

src/modules/subscription/vault.py

@@ -62,7 +62,7 @@ def get_end_time(self):
         return self.end_time
 
     def get_latest_access_time(self):
-        return int(self.latest_access_time) if hasattr(self, VAULT_SERVICE_LATEST_ACCESS_TIME) else -1
+        return int(self.latest_access_time) if hasattr(self, VAULT_SERVICE_LATEST_ACCESS_TIME) and self.latest_access_time else -1
 
 
 class AppSpaceDetector:

src/view/about.py

@@ -107,6 +107,11 @@ def get(self):
                 "user_count": <int>,
                 "vault_count": <int>,
                 "backup_count": <int>,
+                "latest_access_time": <int>,
+                "memory_used": <int>,
+                "memory_total": <int>,
+                "storage_used": <int>,
+                "storage_total": <int>
             }
 
         **Response Error**: