YellWOWpages API - distribute contacts to WS clients

wowlet_backend/utils.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2020, The Monero Project.
-# Copyright (c) 2020, dsc@xmr.pm
+# Copyright (c) 2022, The Monero Project.
+# Copyright (c) 2022, dsc@xmr.pm
 
 import re
 import json
@@ -41,19 +41,6 @@ def print_banner():
     """.strip())
 
 
-def collect_websocket(func):
-    @wraps(func)
-    async def wrapper(*args, **kwargs):
-        from wowlet_backend.factory import connected_websockets
-        queue = asyncio.Queue()
-        connected_websockets.add(queue)
-        try:
-            return await func(queue, *args, **kwargs)
-        finally:
-            connected_websockets.remove(queue)
-    return wrapper
-
-
 async def httpget(url: str, json=True, timeout: int = 5, socks5: str = None, raise_for_status=True, verify_tls=True):
     headers = {"User-Agent": random_agent()}
     opts = {"timeout": aiohttp.ClientTimeout(total=timeout)}
@@ -76,23 +63,30 @@ def random_agent():
     return random.choice(user_agents)
 
 
-async def feather_data():
-    """A collection of data collected by
-    `FeatherTask`, for Feather wallet clients."""
+async def wowlet_data():
+    """A collection of data collected by the various wowlet tasks"""
     from wowlet_backend.factory import cache, now
     data = await cache.get("data")
     if data:
         data = json.loads(data)
         return data
 
-    keys = ["blockheights", "funding_proposals", "crypto_rates", "fiat_rates", "reddit", "rpc_nodes", "xmrig", "xmrto_rates", "suchwow", "forum", "wowlet_releases"]
+    keys = [
+        "blockheights",
+        "funding_proposals",
+        "crypto_rates",
+        "fiat_rates",
+        "reddit",
+        "rpc_nodes",
+        "xmrig",
+        "xmrto_rates",
+        "suchwow",
+        "forum",
+        "wowlet_releases",
+        "yellwow"
+    ]
     data = {keys[i]: json.loads(val) if val else None for i, val in enumerate(await cache.mget(*keys))}
 
-    # @TODO: for backward-compat reasons we're including some legacy keys which can be removed after 1.0 release
-    data['nodes'] = data['rpc_nodes']
-    data['ccs'] = data['funding_proposals']
-    data['wfs'] = data['funding_proposals']
-
     # start caching when application lifetime is more than 20 seconds
     if (datetime.now() - now).total_seconds() > 20:
         await cache.setex("data", 30, json.dumps(data))
@@ -110,34 +104,6 @@ def popularity_contest(lst: List[int]) -> Union[int, None]:
     return Counter(lst).most_common(1)[0][0]
 
 
-def current_worker_thread_is_primary() -> bool:
-    """
-    ASGI server (Hypercorn) may start multiple
-    worker threads, but we only want one feather-ws
-    instance to schedule `FeatherTask` tasks at an
-    interval. Therefor this function determines if the
-    current instance is responsible for the
-    recurring Feather tasks.
-    """
-    from wowlet_backend.factory import app
-
-    current_pid = os.getpid()
-    parent_pid = os.getppid()
-    app.logger.debug(f"current_pid: {current_pid}, "
-                     f"parent_pid: {parent_pid}")
-
-    if parent_pid == 0:
-        return True
-
-    parent = psutil.Process(parent_pid)
-    if parent.name() != "hypercorn":
-        return True
-
-    lowest_pid = min(c.pid for c in parent.children(recursive=True) if c.name() == "hypercorn")
-    if current_pid == lowest_pid:
-        return True
-
-
 async def image_resize(buffer: bytes, max_bounding_box: int = 512, quality: int = 70) -> bytes:
     """
     - Resize if the image is too large