fc-server 0.7.2__tar.gz → 0.7.3__tar.gz

{fc-server-0.7.2 → fc-server-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fc-server
-Version: 0.7.2
+Version: 0.7.3
 Home-page: https://fc.readthedocs.io/
 Author: Larry Shen
 Author-email: larry.shen@nxp.com

{fc-server-0.7.2 → fc-server-0.7.3}/docker/fc_client/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-buster
+FROM python:3.9-bullseye
 
 WORKDIR /fc
 

{fc-server-0.7.2 → fc-server-0.7.3}/docker/fc_guarder/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-buster
+FROM python:3.9-bullseye
 
 WORKDIR /fc
 

{fc-server-0.7.2 → fc-server-0.7.3}/docker/fc_server/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-buster
+FROM python:3.9-bullseye
 
 WORKDIR /fc
 

{fc-server-0.7.2 → fc-server-0.7.3}/fc_client/client.py

@@ -516,6 +516,52 @@ class Client:
         else:
             sys.exit("No resource specified.")
 
+    @staticmethod
+    def monitor(args):
+        records = set()
+
+        async def subscribe(instance_meta):
+            fc_server_name = instance_meta[0]
+            fc_server = instance_meta[1].get("fc", None)
+            print(f"Subscribing to {fc_server} for events...")
+            records.add(fc_server)
+
+            try:
+                async with aiohttp.ClientSession() as session:
+                    async with session.ws_connect(
+                        f"{fc_server}/ws"
+                    ) as ws:  # pylint: disable=invalid-name
+                        async for msg in ws:
+                            if msg.type == aiohttp.WSMsgType.TEXT:
+                                print(f"{fc_server_name}({fc_server}) - {msg.data}")
+                                if "callback" in args and callable(args.callback):
+                                    if asyncio.iscoroutinefunction(args.callback):
+                                        await args.callback(msg.data)
+                                    else:
+                                        args.callback(msg.data)
+            except aiohttp.ClientError as exc:
+                print(f"Error connecting to {fc_server}: {exc}")
+
+            print(f"Unsubscribing from {fc_server}")
+            records.remove(fc_server)
+            await session.close()
+
+        async def start_monitor():
+            while True:
+                metadata = Client.fetch_metadata("all")
+                for instance_meta in metadata.items():
+                    fc_server = instance_meta[1]["fc"]
+                    if fc_server not in records:
+                        asyncio.create_task(subscribe(instance_meta))
+
+                await asyncio.sleep(60)
+
+        loop = asyncio.get_event_loop()
+        if loop.is_running():
+            asyncio.create_task(start_monitor())
+        else:
+            loop.run_until_complete(start_monitor())
+
 
 class VerbosityAction(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
@@ -567,6 +613,8 @@ def main():
             "c",
             "init",
             "i",
+            "monitor",
+            "m",
         ]
         or not args.resource
     ):
@@ -612,6 +660,11 @@ def main():
         subparser = subparsers.add_parser("init", aliases=("i",), help="init fc-client")
         subparser.set_defaults(func=Client.init)
 
+        subparser = subparsers.add_parser(
+            "monitor", aliases=("m",), help="monitor event"
+        )
+        subparser.set_defaults(func=Client.monitor)
+
         if len(extras) > 0 and extras[0] in ["init", "i"]:
             args, extras = parser.parse_known_args(extras, namespace=args)
             Client.action(args.func, extras)

fc-server-0.7.3/fc_common/VERSION

@@ -0,0 +1 @@
+0.7.3

{fc-server-0.7.2 → fc-server-0.7.3}/fc_server/core/api_svr.py

@@ -433,6 +433,8 @@ class ApiSvr(AsyncRunMixin):
             request.app["ws"].discard(ws_resp)
             logger.info(f"Subscriber {request.remote} leave")
 
+        return ws_resp
+
     async def publisher(self, app):
         logger = app["logger"]
 
@@ -442,7 +444,14 @@ class ApiSvr(AsyncRunMixin):
             candidates = []
             for ws_resp in set(app["ws"]):
                 logger.info(f"Send {msg} to subscriber")
-                candidates.append(ws_resp.send_str(msg))
+                msg_str = msg if isinstance(msg, str) else None
+                if msg_str is None:
+                    try:
+                        msg_str = json.dumps(msg)
+                    except (TypeError, ValueError) as exc:
+                        logger.error(f"Failed to serialize message: {exc}")
+                        continue
+                candidates.append(ws_resp.send_str(msg_str))
             await asyncio.gather(*candidates)
 
     async def on_startup(self, app):

{fc-server-0.7.2 → fc-server-0.7.3}/fc_server/core/coordinator.py

@@ -322,7 +322,7 @@ class Coordinator:
     def __set_resource_status(self, resource, status):
         self.__managed_resources_status[resource] = status
         self.logger.info("* %s now belongs to %s", resource, status)
-        asyncio.create_task(self.publisher_queue.put(resource + ":" + status))
+        asyncio.create_task(self.publisher_queue.put({resource: status}))
 
     async def return_resource(self, resource):
         if (

{fc-server-0.7.2 → fc-server-0.7.3}/fc_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fc-server
-Version: 0.7.2
+Version: 0.7.3
 Home-page: https://fc.readthedocs.io/
 Author: Larry Shen
 Author-email: larry.shen@nxp.com

fc-server-0.7.2/fc_common/VERSION

@@ -1 +0,0 @@
-0.7.2