Enable using default ports for discovery and fix TZ (#189)

* Handle default ports

* Log confirmation

* Fix tzlocal for 3.9

* Lint

Author: alexyao2015

emulated_hue/__init__.py

@@ -22,10 +22,11 @@ def __init__(
         hass_token: str,
         http_port: int,
         https_port: int,
+        use_default_ports: bool,
     ) -> None:
         """Create an instance of HueEmulator."""
         self._loop = None
-        self._config = Config(self, data_path, http_port, https_port)
+        self._config = Config(self, data_path, http_port, https_port, use_default_ports)
         # the HA client is initialized in the async_start because it needs a running loop
         self._hass: Optional[HomeAssistantClient] = None
         self._hass_url = hass_url

emulated_hue/__main__.py

@@ -5,7 +5,7 @@
 
 from aiorun import run
 
-from emulated_hue import HueEmulator
+from emulated_hue import HueEmulator, const
 
 IS_SUPERVISOR = os.path.isfile("/data/options.json") and os.environ.get("HASSIO_TOKEN")
 
@@ -56,13 +56,19 @@
         "--http-port",
         type=int,
         help="Port to run the HTTP server (for use with reverse proxy, use with care)",
-        default=os.getenv("HTTP_PORT", 80),
+        default=os.getenv("HTTP_PORT", const.HUE_HTTP_PORT),
     )
     parser.add_argument(
         "--https-port",
         type=int,
         help="Port to run the HTTPS server (for use with reverse proxy, use with care)",
-        default=os.getenv("HTTPS_PORT", 443),
+        default=os.getenv("HTTPS_PORT", const.HUE_HTTPS_PORT),
+    )
+    parser.add_argument(
+        "--use-default-ports-for-discovery",
+        action="store_true",
+        help=f"Always use HTTP port {const.HUE_HTTP_PORT} and HTTPS port {const.HUE_HTTPS_PORT} for discovery "
+        f"regardless of actual exposed ports. Useful with reverse proxy.",
     )
 
     args = parser.parse_args()
@@ -71,10 +77,18 @@
     token = args.token
     if args.verbose or os.getenv("VERBOSE", "").strip() == "true":
         logger.setLevel(logging.DEBUG)
+    use_default_ports = False
+    if (
+        args.use_default_ports_for_discovery
+        or os.getenv("USE_DEFAULT_PORTS", "").strip() == "true"
+    ):
+        use_default_ports = True
     # turn down logging for hass-client
     logging.getLogger("hass_client").setLevel(logging.INFO)
 
-    hue = HueEmulator(datapath, url, token, args.http_port, args.https_port)
+    hue = HueEmulator(
+        datapath, url, token, args.http_port, args.https_port, use_default_ports
+    )
 
     def on_shutdown(loop):
         """Call on loop shutdown."""

emulated_hue/api.py

@@ -1119,7 +1119,7 @@ async def __async_get_bridge_config(self, full_details: bool = False) -> dict:
                     "UTC": datetime.datetime.utcnow().isoformat().split(".")[0],
                     "localtime": datetime.datetime.now().isoformat().split(".")[0],
                     "timezone": self.config.get_storage_value(
-                        "bridge_config", "timezone", tzlocal.get_localzone().zone
+                        "bridge_config", "timezone", tzlocal.get_localzone().key
                     ),
                     "whitelist": await self.__async_whitelist_to_bridge_config(),
                     "zigbeechannel": self.config.get_storage_value(

emulated_hue/config.py

@@ -27,7 +27,12 @@ class Config:
     """Hold configuration variables for the emulated hue bridge."""
 
     def __init__(
-        self, hue: HueEmulator, data_path: str, http_port: int, https_port: int
+        self,
+        hue: HueEmulator,
+        data_path: str,
+        http_port: int,
+        https_port: int,
+        use_default_ports: bool,
     ):
         """Initialize the instance."""
         self.hue = hue
@@ -48,10 +53,15 @@ def __init__(
         # so this is only usefull when running a reverse proxy on the same host
         self.http_port = http_port
         self.https_port = https_port
+        self.use_default_ports = use_default_ports
         if http_port != 80 or https_port != 443:
             LOGGER.warning(
                 "Non default http/https ports detected. Hue apps require the bridge at the default ports 80/443, use at your own risk."
             )
+            if self.use_default_ports:
+                LOGGER.warning(
+                    "Using default HTTP port for discovery with non default HTTP/S ports. Are you using a reverse proxy?"
+                )
 
         mac_addr = str(get_mac_address(ip=self.ip_addr))
         if not mac_addr or len(mac_addr) < 16:

emulated_hue/const.py

@@ -71,3 +71,6 @@
 
 HASS = "hass"
 HUE = "hue"
+
+HUE_HTTP_PORT = 80
+HUE_HTTPS_PORT = 443

emulated_hue/discovery.py

@@ -7,6 +7,8 @@
 
 from zeroconf import InterfaceChoice, ServiceInfo, Zeroconf
 
+from emulated_hue import const
+
 from .config import Config
 from .utils import get_ip_pton
 
@@ -59,7 +61,6 @@ def __init__(self, config: Config, bind_multicast: bool = True):
         self.daemon = True
 
         self.ip_addr = config.ip_addr
-        self.listen_port = config.http_port
         self.upnp_bind_multicast = bind_multicast
 
         # Note that the double newline at the end of
@@ -79,7 +80,9 @@ def __init__(self, config: Config, bind_multicast: bool = True):
             (
                 resp_template.format(
                     ip_addr=config.ip_addr,
-                    port_num=config.http_port,
+                    port_num=const.HUE_HTTP_PORT
+                    if config.use_default_ports
+                    else config.http_port,
                     bridge_id=config.bridge_id,
                     device_type="urn:schemas-upnp-org:device:basic:1",
                     bridge_uuid=f"uuid:{config.bridge_uid}",
@@ -93,7 +96,9 @@ def __init__(self, config: Config, bind_multicast: bool = True):
             (
                 resp_template.format(
                     ip_addr=config.ip_addr,
-                    port_num=config.http_port,
+                    port_num=const.HUE_HTTP_PORT
+                    if config.use_default_ports
+                    else config.http_port,
                     bridge_id=config.bridge_id,
                     device_type=f"uuid:{config.bridge_uid}",
                     bridge_uuid=f"uuid:{config.bridge_uid}",