Merge pull request #5 from bms231/AddingStaticIPFunctionality

Wyze no longer returns local IP for pan cam v4, but it is required fo…

Author: bms231

app/wyzebridge/config.py

@@ -1,3 +1,5 @@
+import os, json
+from typing import Dict
 from os import environ, getenv
 
 from wyzebridge.build_config import BUILD_STR
@@ -23,6 +25,7 @@
 
 # TODO: change TOKEN_PATH  to /config for all:
 TOKEN_PATH: str = "/config/" if HASS_TOKEN else "/tokens/"
+IP_OVERRIDES_FILE = os.path.join(TOKEN_PATH, "ip_overrides.json")
 IMG_PATH: str = f'/{env_bool("IMG_DIR", r"/media/wyze/img").strip("/")}/'
 
 LATITUDE: float = float(getenv("LATITUDE", "0"))
@@ -93,3 +96,52 @@
         print(f"\n[!] WARNING: In {BUILD_STR}, {key} is deprecated! Please use {new_key} instead\n")
         environ.pop(key, None)
         environ[new_key] = value
+
+
+def _parse_overrides_text(text: str) -> Dict[str, str]:
+    """Accept nickname:ip or nickname=ip, separated by newlines/commas/semicolons."""
+    mapping: Dict[str, str] = {}
+    if not text:
+        return mapping
+    text = text.replace(",", "\n").replace(";", "\n")
+    for line in text.splitlines():
+        line = line.strip()
+        if not line:
+            continue
+        if ":" in line:
+            k, v = line.split(":", 1)
+        elif "=" in line:
+            k, v = line.split("=", 1)
+        else:
+            continue
+        k, v = k.strip(), v.strip()
+        if k and v:
+            mapping[k] = v
+    return mapping
+
+def load_ip_overrides() -> Dict[str, str]:
+    """
+    Return merged {nickname: ip} from file + env (env wins).
+    - File path: /config/ip_overrides.json (if present)
+    - Env var : WB_IP_OVERRIDES (from HA add-on Configuration)
+    """
+    file_map: Dict[str, str] = {}
+    try:
+        with open(IP_OVERRIDES_FILE, "r", encoding="utf-8") as f:
+            raw = json.load(f)
+            file_map = {str(k).strip(): str(v).strip() for k, v in raw.items()}
+    except Exception:
+        file_map = {}
+
+    env_map = _parse_overrides_text(os.getenv("WB_IP_OVERRIDES", ""))
+    return {**file_map, **env_map}
+
+def save_ip_overrides(mapping: Dict[str, str]) -> bool:
+    """Persist overrides from any UI path that writes to disk."""
+    try:
+        os.makedirs(TOKEN_PATH, exist_ok=True)
+        with open(IP_OVERRIDES_FILE, "w", encoding="utf-8") as f:
+            json.dump(mapping, f, indent=2, ensure_ascii=False)
+        return True
+    except Exception:
+        return False

app/wyzecam/api.py

@@ -7,6 +7,7 @@
 from hashlib import md5
 from os import getenv
 from typing import Any, Optional
+from wyzebridge.config import load_ip_overrides
 
 from requests import PreparedRequest, Response, get, post
 
@@ -225,6 +226,12 @@ def get_homepage_object_list(auth_info: WyzeCredential) -> dict[str, Any]:
 
 def get_camera_list(auth_info: WyzeCredential) -> list[WyzeCamera]:
     """Return a list of all cameras on the account."""
+    #ip_overrides = load_ip_overrides()
+    # load + normalize overrides once
+    _norm = lambda s: str(s).strip().casefold()
+    _ip_overrides_raw = load_ip_overrides()
+    _ip_overrides = {_norm(k): str(v).strip() for k, v in _ip_overrides_raw.items()}
+
     data = get_homepage_object_list(auth_info)
     result = []
     for device in data["device_list"]:
@@ -239,6 +246,7 @@ def get_camera_list(auth_info: WyzeCredential) -> list[WyzeCamera]:
         mac: Optional[str] = device.get("mac")
         product_model: Optional[str] = device.get("product_model")
         nickname: Optional[str] = device.get("nickname")
+        nn = _norm(nickname) if nickname else ""
         timezone_name: Optional[str] = device.get("timezone_name")
         firmware_ver: Optional[str] = device.get("firmware_ver")
         dtls: Optional[int] = device_params.get("dtls")
@@ -249,8 +257,22 @@ def get_camera_list(auth_info: WyzeCredential) -> list[WyzeCamera]:
             "thumbnails_url"
         )
 
-        if not p2p_type:
-            continue
+        #if not p2p_type:  #removing because the new pan cam v4 doesnt return p2p_type and it isn't required
+        #    continue
+        #if not ip and nickname:
+        #    ov = ip_overrides.get(str(nickname).strip())
+        #    if ov:
+        #        ip = ov
+        # if this camera is listed in overrides, allow it even if p2p_type is missing
+        # (and fill IP from override if cloud didn't provide one)
+        if nn in _ip_overrides:
+            if not ip:
+                ip = _ip_overrides[nn]
+        else:
+            # not listed in overrides → keep original p2p gate
+            if not p2p_type:
+                continue
+ 
         if not ip:
             continue
         if not enr:

home_assistant/config.yml

@@ -69,6 +69,7 @@ schema:
   WYZE_PASSWORD: password?
   API_ID: match(\s*[a-fA-F0-9-]{36}\s*)?
   API_KEY: match(\s*[a-zA-Z0-9]{60}\s*)?
+  WB_IP_OVERRIDES: str?
   WB_IP: str?
   REFRESH_TOKEN: str?
   ACCESS_TOKEN: str?

home_assistant/translations/en.yml

@@ -11,6 +11,9 @@ configuration:
   API_KEY:
     name: API Key
     description: Optional, but must be used in combination with the Key ID.
+  WB_IP_OVERRIDES:
+    name: Manual Camera IP Overrides
+    description: Some cams dont return local ips via Wyze IP and thus won't detect.  Put them here in nickname:ip format using - for spaces for manual addition to the bridge. example Garage-Cam:192.168.0.5
   WB_IP:
     name: Bridge IP
     description: Home Assistant IP for WebRTC ICE traffic.

unraid/docker-wyze-bridge.xml

@@ -130,4 +130,7 @@
   <Config Name="Stream Host Name" Target="DOMAIN" Default="" Mode="" Description="Specifies the hostname for the camera stream URLs. Defaults to the Home Assistant domain or localhost" Type="Variable" Display="advanced" Required="false" Mask="false"/>
   <Config Name="Local Latitude" Target="LATITUDE" Default="" Mode="" Description="Used to compute sunset/sunrise for snapshots" Type="Variable" Display="always" Required="false" Mask="false"/>
   <Config Name="Local Longitude" Target="LONGITUDE" Default="" Mode="" Description="Used to compute sunset/sunrise for snapshots" Type="Variable" Display="always" Required="false" Mask="false"/>
+  <Config Name="Manual camera IP overrides" Target="WB_IP_OVERRIDES" Default="" Description="Enter nickname-to-IP pairs. Format: Nickname:IP (or Nickname=IP). Separate multiple entries with newlines, semicolons, or commas. Example: Garage Cam:192.168.1.55; Driveway=192.168.1.101" Type="Variable" Display="always" Required="false" Mask="false">
+</Config>
+
 </Container>