pymammotion 0.4.23__tar.gz → 0.4.26__tar.gz

{pymammotion-0.4.23 → pymammotion-0.4.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.23
+Version: 0.4.26
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.4.23 → pymammotion-0.4.26}/pymammotion/aliyun/cloud_gateway.py

@@ -11,7 +11,7 @@ import string
 import time
 import uuid
 
-from aiohttp import ClientSession
+from aiohttp import ClientSession, ConnectionTimeoutError
 from alibabacloud_iot_api_gateway.models import CommonParams, Config, IoTApiRequest
 from alibabacloud_tea_util.client import Client as UtilClient
 from alibabacloud_tea_util.models import RuntimeOptions
@@ -24,6 +24,7 @@ from pymammotion.aliyun.model.dev_by_account_response import ListingDevByAccount
 from pymammotion.aliyun.model.login_by_oauth_response import LoginByOAuthResponse
 from pymammotion.aliyun.model.regions_response import RegionResponse
 from pymammotion.aliyun.model.session_by_authcode_response import SessionByAuthCodeResponse
+from pymammotion.aliyun.regions import region_mappings
 from pymammotion.const import ALIYUN_DOMAIN, APP_KEY, APP_SECRET, APP_VERSION
 from pymammotion.http.http import MammotionHTTP
 from pymammotion.utility.datatype_converter import DatatypeConverter
@@ -178,14 +179,28 @@ class CloudIOTGateway:
         )
 
         # send request
-        response = await client.async_do_request(
-            "/living/account/region/get", "https", "POST", None, body, RuntimeOptions()
-        )
-        logger.debug(response.status_message)
-        logger.debug(response.headers)
-        logger.debug(response.status_code)
-        logger.debug(response.body)
-
+        try:
+            response = await client.async_do_request(
+                "/living/account/region/get", "https", "POST", None, body, RuntimeOptions()
+            )
+            logger.debug(response.status_message)
+            logger.debug(response.headers)
+            logger.debug(response.status_code)
+            logger.debug(response.body)
+        except ConnectionTimeoutError:
+            body = {"data": {}, "code": 200}
+
+            region = region_mappings.get(country_code, "US")
+            body["data"]["shortRegionId"] = region
+            body["data"]["regionEnglishName"] = ""
+            body["data"]["oaApiGatewayEndpoint"] = f"living-account.{region}.aliyuncs.com"
+            body["data"]["regionId"] = region
+            body["data"]["mqttEndpoint"] = f"public.itls.{region}.aliyuncs.com:1883"
+            body["data"]["pushChannelEndpoint"] = f"living-accs.{region}.aliyuncs.com"
+            body["data"]["apiGatewayEndpoint"] = f"{region}.api-iot.aliyuncs.com"
+
+            RegionResponse.from_dict(body)
+            return body
         # Decode the response body
         response_body_str = response.body.decode("utf-8")
 

pymammotion-0.4.26/pymammotion/aliyun/regions.py

@@ -0,0 +1,62 @@
+region_mappings = {
+    # Asia Pacific
+    "CN": "cn-hongkong",  # China -> Hong Kong
+    "HK": "cn-hongkong",  # Hong Kong
+    "TW": "cn-hongkong",  # Taiwan -> Hong Kong
+    "MO": "cn-hongkong",  # Macau -> Hong Kong
+    # Southeast Asia
+    "SG": "ap-southeast-1",  # Singapore
+    "MY": "ap-southeast-3",  # Malaysia
+    "ID": "ap-southeast-5",  # Indonesia
+    "TH": "ap-southeast-1",  # Thailand -> Singapore
+    "VN": "ap-southeast-1",  # Vietnam -> Singapore
+    "PH": "ap-southeast-1",  # Philippines -> Singapore
+    "BN": "ap-southeast-1",  # Brunei -> Singapore
+    "KH": "ap-southeast-1",  # Cambodia -> Singapore
+    "LA": "ap-southeast-1",  # Laos -> Singapore
+    "MM": "ap-southeast-1",  # Myanmar -> Singapore
+    # Australia/Oceania
+    "AU": "ap-southeast-2",  # Australia
+    "NZ": "ap-southeast-2",  # New Zealand -> Australia
+    "FJ": "ap-southeast-2",  # Fiji -> Australia
+    "PG": "ap-southeast-2",  # Papua New Guinea -> Australia
+    # South Asia
+    "IN": "ap-south-1",  # India
+    "LK": "ap-south-1",  # Sri Lanka -> India
+    "PK": "ap-south-1",  # Pakistan -> India
+    "BD": "ap-south-1",  # Bangladesh -> India
+    "NP": "ap-south-1",  # Nepal -> India
+    "BT": "ap-south-1",  # Bhutan -> India
+    "MV": "ap-south-1",  # Maldives -> India
+    # Middle East
+    "AE": "me-east-1",  # UAE
+    "SA": "me-east-1",  # Saudi Arabia -> UAE
+    "QA": "me-east-1",  # Qatar -> UAE
+    "KW": "me-east-1",  # Kuwait -> UAE
+    "BH": "me-east-1",  # Bahrain -> UAE
+    "OM": "me-east-1",  # Oman -> UAE
+    "IL": "me-east-1",  # Israel -> UAE
+    "TR": "me-east-1",  # Turkey -> UAE
+    # Europe
+    "DE": "eu-central-1",  # Germany
+    "FR": "eu-central-1",  # France -> Germany
+    "IT": "eu-central-1",  # Italy -> Germany
+    "ES": "eu-central-1",  # Spain -> Germany
+    "GB": "eu-central-1",  # UK -> Germany
+    "IE": "eu-central-1",  # Ireland -> Germany
+    "NL": "eu-central-1",  # Netherlands -> Germany
+    "BE": "eu-central-1",  # Belgium -> Germany
+    "CH": "eu-central-1",  # Switzerland -> Germany
+    "AT": "eu-central-1",  # Austria -> Germany
+    "PL": "eu-central-1",  # poland -> Germany
+    # North America
+    "US": "us-east-1",  # USA
+    "CA": "us-east-1",  # Canada -> US East
+    "MX": "us-west-1",  # Mexico -> US West
+    # South America
+    "BR": "us-east-1",  # Brazil -> US East
+    "AR": "us-east-1",  # Argentina -> US East
+    "CL": "us-east-1",  # Chile -> US East
+    "CO": "us-east-1",  # Colombia -> US East
+    "PE": "us-east-1",  # Peru -> US East
+}

{pymammotion-0.4.23 → pymammotion-0.4.26}/pymammotion/aliyun/tea/core.py

@@ -1,6 +1,7 @@
 import asyncio
 import logging
 import os
+import socket
 import ssl
 import time
 from typing import Any
@@ -123,6 +124,7 @@ class TeaCore:
             await loop.run_in_executor(None, ssl_context.load_verify_locations, ca_cert)
             connector = aiohttp.TCPConnector(
                 ssl=ssl_context,
+                family=socket.AF_INET,
             )
         else:
             verify = False

{pymammotion-0.4.23 → pymammotion-0.4.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.23"
+version     = "0.4.26"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -66,7 +66,7 @@ autotyping = "^24.3.0"
 ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.4.23"
+current_version = "0.4.26"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true