fix: update version to 0.2.8 and add timeout and capcha retry parameters in MBBank classes from pull requests #14

Author: thedtvn

mbbank/__init__.py

@@ -3,4 +3,4 @@
 from .wasm_helper import wasm_encrypt
 from .capcha_ocr import CapchaProcessing, CapchaOCR
 
-__version__ = '0.2.7'
+__version__ = '0.2.8'

mbbank/main.py

@@ -46,11 +46,16 @@ class MBBank:
         password (str): MBBank Account Password
         proxy (str, optional): Proxy url. Example: "http://127.0.0.1:8080". Defaults to None.
         ocr_class (CapchaProcessing, optional): instance of CapchaProcessing class. Defaults to CapchaOCR().
+        retry_times (int, optional): number of retry times for capcha processing. Defaults to 30 ( worst case ).
+        timeout (Union[float, Tuple[float, float]], optional): request timeout in seconds or (connect timeout, read timeout) or None for no timeout. Defaults to None.
     """
 
     FPR = "c7a1beebb9400375bb187daa33de9659"
 
-    def __init__(self, *, username: str, password: str, proxy: typing.Optional[str] = None, ocr_class: typing.Optional[CapchaProcessing] = None):
+    def __init__(self, *, username: str, password: str, proxy: typing.Optional[str] = None,
+                 ocr_class: typing.Optional[CapchaProcessing] = None,
+                 retry_times: int = 30,
+                 timeout: typing.Union[float, typing.Tuple[float, float], None] = None):
         self._userid = username
         self._password = password
         self._wasm_cache = None
@@ -68,6 +73,8 @@ def __init__(self, *, username: str, password: str, proxy: typing.Optional[str]
         self._userinfo = None
         self._temp = {}
         self.deviceIdCommon = f'abi2jojr-mbib-0000-0000-{self._get_now_time()}'
+        self.retry_times = retry_times
+        self.timeout = timeout
 
     def _get_now_time(self):
         now = datetime.datetime.now()
@@ -93,10 +100,9 @@ def _req(self, url, *, json=None, headers=None):
             headers["X-Request-Id"] = rid
             headers["RefNo"] = rid
             headers["DeviceId"] = self.deviceIdCommon
-            with requests.Session() as s:
-                with s.post(url, headers=headers, json=json_data,
-                            proxies=self.proxy) as r:
-                    data_out = r.json()
+            with requests.post(url, headers=headers, json=json_data,
+                               proxies=self.proxy) as r:
+                data_out = r.json()
             if data_out["result"] is None:
                 self.getBalance()
             elif data_out["result"]["ok"]:
@@ -112,7 +118,7 @@ def _get_wasm_file(self):
         if self._wasm_cache is not None:
             return self._wasm_cache
         file_data = requests.get("https://online.mbbank.com.vn/assets/wasm/main.wasm",
-                                 proxies=self.proxy).content
+                                 proxies=self.proxy, timeout=self.timeout).content
         self._wasm_cache = file_data
         return file_data
 
@@ -134,8 +140,8 @@ def get_capcha_image(self) -> bytes:
         headers["Deviceid"] = self.deviceIdCommon
         headers["Refno"] = rid
         with requests.post("https://online.mbbank.com.vn/api/retail-internetbankingms/getCaptchaImage",
-                        headers=headers, json=json_data,
-                        proxies=self.proxy) as r:
+                           headers=headers, json=json_data,
+                           proxies=self.proxy, timeout=self.timeout) as r:
             data_out = r.json()
             return base64.b64decode(data_out["imageString"])
 
@@ -161,8 +167,8 @@ def login(self, captcha_text: str):
         wasm_bytes = self._get_wasm_file()
         data_encrypt = wasm_encrypt(wasm_bytes, payload)
         with requests.post("https://online.mbbank.com.vn/api/retail_web/internetbanking/v2.0/doLogin",
-                        headers=headers_default, json={"dataEnc": data_encrypt},
-                        proxies=self.proxy) as r:
+                           headers=headers_default, json={"dataEnc": data_encrypt},
+                           proxies=self.proxy, timeout=self.timeout) as r:
             data_out = r.json()
         if data_out["result"]["ok"]:
             self.sessionId = data_out["sessionId"]
@@ -186,7 +192,7 @@ def _authenticate(self):
                 if e.code == "GW283":
                     continue  # capcha error, try again
                 raise e
-            
+
     def _verify_biometric_check(self):
         self._req("https://online.mbbank.com.vn/api/retail-go-ekycms/v1.0/verify-biometric-nfc-transaction")
 

mbbank/mbasync.py

@@ -11,9 +11,13 @@
 from .main import MBBankError, MBBank
 from .wasm_helper import wasm_encrypt
 from .main import headers_default
-from .modals import BalanceResponseModal, BalanceLoyaltyResponseModal, BankListResponseModal, BeneficiaryListResponseModal, CardListResponseModal, AccountByPhoneResponseModal, UserInfoResponseModal, LoanListResponseModal, SavingListResponseModal, InterestRateResponseModal, TransactionHistoryResponseModal, CardTransactionsResponseModal, SavingDetailResponseModal
+from .modals import BalanceResponseModal, BalanceLoyaltyResponseModal, BankListResponseModal, \
+    BeneficiaryListResponseModal, CardListResponseModal, AccountByPhoneResponseModal, UserInfoResponseModal, \
+    LoanListResponseModal, SavingListResponseModal, InterestRateResponseModal, TransactionHistoryResponseModal, \
+    CardTransactionsResponseModal, SavingDetailResponseModal
+
+pool = concurrent.futures.ThreadPoolExecutor()  # thread pool for blocking tasks like OCR and wasm
 
-pool = concurrent.futures.ThreadPoolExecutor() # thread pool for blocking tasks like OCR and wasm
 
 class MBBankAsync(MBBank):
     """Core Async class
@@ -27,23 +31,40 @@ class MBBankAsync(MBBank):
         password (str): MBBank Account Password
         proxy (str, optional): Proxy url. Example: "http://127.0.0.1:8080". Defaults to None.
         ocr_class (CapchaProcessing, optional): CapchaProcessing class. Defaults to CapchaOCR().
+        retry_times (int, optional): number of retry times for capcha processing. Defaults to 30 ( worst case ).
+        timeout (Union[float, Tuple[float, float]], optional): request timeout in seconds or (connect timeout, read timeout) or None for no timeout. Defaults to None.
     """
 
-    def __init__(self, *, username: str, password: str, proxy: typing.Optional[str] = None, ocr_class: typing.Optional[CapchaProcessing] =None):
-        super().__init__(username=username, password=password, proxy=proxy, ocr_class=ocr_class)
+    def __init__(self, *, username: str, password: str, proxy: typing.Optional[str] = None,
+                 ocr_class: typing.Optional[CapchaProcessing] = None,
+                 retry_times: int = 30,
+                 timeout: typing.Union[float, typing.Tuple[float, float], None] = None):
+        super().__init__(username=username, password=password, ocr_class=ocr_class, retry_times=retry_times)
         # convert proxy dict by requests to aiohttp format
         if proxy is not None:
             self.proxy = proxy
         else:
             self.proxy = None
+        if timeout is not None:
+            if isinstance(timeout, tuple) and len(timeout) == 2:
+                self.timeout = aiohttp.ClientTimeout(connect=timeout[0], sock_read=timeout[1])
+            else:
+                self.timeout = aiohttp.ClientTimeout(total=timeout)
+        else:
+            self.timeout = None
 
     def _create_session(self) -> aiohttp.ClientSession:
         ssl_ctx = ssl.create_default_context()
         ssl_ctx.set_ciphers("DEFAULT:@SECLEVEL=1")  # make it look like a normal browser request or requests
         connector = aiohttp.TCPConnector(
             ssl=ssl_ctx
         )
-        return aiohttp.ClientSession(connector=connector)
+        session_args = {
+            "connector": connector,
+        }
+        if self.timeout is not None:
+            session_args["timeout"] = self.timeout
+        return aiohttp.ClientSession(**session_args)
 
     async def _get_wasm_file(self):
         if self._wasm_cache is not None:
@@ -111,7 +132,7 @@ async def login(self, captcha_text: str):
             return
         else:
             raise MBBankError(data_out["result"])
-            
+
     async def _verify_biometric_check(self):
         await self._req("https://online.mbbank.com.vn/api/retail-go-ekycms/v1.0/verify-biometric-nfc-transaction")
 
@@ -128,7 +149,7 @@ async def _authenticate(self):
                 return await self.login(text)
             except MBBankError as e:
                 if e.code == "GW283":
-                    continue # capcha error, try again
+                    continue  # capcha error, try again
                 raise e
 
     async def _req(self, url, *, json=None, headers=None):
@@ -164,7 +185,8 @@ async def _req(self, url, *, json=None, headers=None):
                 raise MBBankError(data_out["result"])
         return data_out
 
-    async def getTransactionAccountHistory(self, *, accountNo: typing.Optional[str] = None, from_date: datetime.datetime,
+    async def getTransactionAccountHistory(self, *, accountNo: typing.Optional[str] = None,
+                                           from_date: datetime.datetime,
                                            to_date: datetime.datetime) -> TransactionHistoryResponseModal:
         """
         Get account transaction history
@@ -323,7 +345,8 @@ async def getLoanList(self) -> LoanListResponseModal:
         data_out = await self._req("https://online.mbbank.com.vn/api/retail-onlineloanms/loan/getList")
         return LoanListResponseModal.model_validate(data_out, strict=True)
 
-    async def getCardTransactionHistory(self, cardNo: str, from_date: datetime.datetime, to_date: datetime.datetime) -> CardTransactionsResponseModal:
+    async def getCardTransactionHistory(self, cardNo: str, from_date: datetime.datetime,
+                                        to_date: datetime.datetime) -> CardTransactionsResponseModal:
         """
         Get card transaction history