From ecc1d6b620e296985b7d700a00e0d374b86cd02c Mon Sep 17 00:00:00 2001
From: DedInc <visitanimation@gmail.com>
Date: Sat, 29 Apr 2023 15:25:28 +0600
Subject: [PATCH] v1.0.2

---
 iphub/iphub.py | 32 ++++++++++++++------------------
 setup.py       |  2 +-
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/iphub/iphub.py b/iphub/iphub.py
index 91e0b67..2a6978c 100644
--- a/iphub/iphub.py
+++ b/iphub/iphub.py
@@ -21,35 +21,31 @@ def _get_session(self):
     def get_keys(self):
         keys = []
         r = self.session.get('https://iphub.info/account')
+        self.ctoken = r.text.split('token" content="')[1].split('"')[0]
         dem = r.text.split('/apiKey/')
         for line in dem:
             try:
                 if dem.index(line) != 0:
-                    keys.append(line.split('"')[0])
+                    keys.append(line.split('"')[0])                
             except:
-                self.regenerate_key()
-                return self.get_keys()
-        return keys
+                pass
+        if len(keys) == 0:
+            self.generate_key()
+            return self.get_keys()
+        return keys 
 
     def get_key(self, id):
-        try:
-            return 'MT' + self.session.get(f'https://iphub.info/apiKey/{id}').text.split('"MT')[1].split('"')[0]
-        except:
-            return None
+        return self.session.get(f'https://iphub.info/apiKey/{id}').text.split('readonly value="')[1].split('"')[0]
 
     def regenerate_key(self, id):
-        try:
-            self.session.post(f'https://iphub.info/apiKey/regenerateApiKey/{id}', data={'_token': self.ctoken})
-            return self.get_key(id)
-        except:
-            return None
+        r = self.session.post(f'https://iphub.info/apiKey/regenerateApiKey/{id}', data={'_token': self.ctoken})            
+        self.ctoken = r.text.split('token" content="')[1].split('"')[0]
+        return self.get_key(id)
 
     def generate_key(self):
-        try:
-            self.session.post('https://iphub.info/apiKey/newFree', data={'_token': self.ctoken})
-            return self.get_key(self.get_keys()[0])
-        except:
-            return None
+        r = self.session.post('https://iphub.info/apiKey/newFree', data={'_token': self.ctoken})
+        self.ctoken = r.text.split('token" content="')[1].split('"')[0]
+        return self.get_key(self.get_keys()[0])
 
     def check_ip(self, ip):
         r = get(url=f'http://v2.api.iphub.info/ip/{ip}', headers={'X-Key': self.api_key}).json()
diff --git a/setup.py b/setup.py
index 861c77b..e8408bc 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='iphub',
-    version='1.0.1',
+    version='1.0.2',
     author='Maehdakvan',
     author_email='visitanimation@google.com',
     description='IPhub.info API wrapper.',