Merge pull request #59 from AIAmber/master

v0.8.3 bug fix: ping endpoint

VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

src/wechaty_puppet_service/puppet.py

@@ -34,7 +34,6 @@
 from grpclib.client import Channel
 # pylint: disable=E0401
 from pyee import AsyncIOEventEmitter  # type: ignore
-from ping3 import ping  # type: ignore
 from wechaty_puppet.schemas.types import PayloadType    # type: ignore
 
 from wechaty_puppet import (  # type: ignore
@@ -82,7 +81,10 @@
     get_endpoint,
     get_token,
 )
-from wechaty_puppet_service.utils import extract_host_and_port
+from wechaty_puppet_service.utils import (
+    extract_host_and_port,
+    test_endpoint
+)
 
 log = get_logger('HostiePuppet')
 
@@ -898,7 +900,7 @@ def _init_puppet(self):
             log.debug('get puppet ip address : <%s>', data)
             self.options.end_point = '{ip}:{port}'.format(**data)
 
-        if ping(self.options.end_point) is False:
+        if test_endpoint(self.options.end_point, log) is False:
             raise WechatyPuppetConfigurationError(
                 f"can't not ping endpoint: {self.options.end_point}"
             )

src/wechaty_puppet_service/utils.py

@@ -20,8 +20,13 @@
 """
 from __future__ import annotations
 
+from telnetlib import Telnet
+
+import socket
+from logging import Logger
 from typing import Optional, Tuple
-from wechaty_puppet.exceptions import WechatyPuppetConfigurationError   # type: ignore
+from ping3 import ping  # type: ignore
+from wechaty_puppet.exceptions import WechatyPuppetConfigurationError  # type: ignore
 
 
 def extract_host_and_port(url: str) -> Tuple[str, Optional[int]]:
@@ -40,3 +45,25 @@ def extract_host_and_port(url: str) -> Tuple[str, Optional[int]]:
         return host, int(port)
 
     return url, None
+
+
+def test_endpoint(end_point: str, log: Logger) -> int:
+    """
+        test_endpoint:
+        1.If there is port: telnet
+        2.If there is host/domain: ping or
+    """
+    tn = Telnet()
+    host, port = extract_host_and_port(end_point)
+
+    res = True
+    if port is None:
+        if ping(host) is False:
+            res = False
+    else:
+        try:
+            tn.open(host, port=port)
+        except socket.error as e:
+            log.error(e)
+            res = False
+    return res