vsslctrl 0.1.11.dev1__py3-none-any.whl → 0.1.13.dev1__py3-none-any.whl

vsslctrl/__init__.py

@@ -1,4 +1,4 @@
-VSSL_VERSION = "0.1.11.dev1"
+VSSL_VERSION = "0.1.13.dev1"
 VSSL_NAME = "VSSL"
 
 from .core import Vssl

vsslctrl/api_alpha.py

@@ -39,6 +39,12 @@ class APIAlpha(APIBase):
         self.vssl = vssl_host
         self.zone = zone
 
+    #
+    # Send event on event bus
+    #
+    def _event_publish(self, event_type, data=None):
+        self.zone._event_publish(event_type, (self.zone.host, self.TCP_PORT))
+
     #
     # Send keep alive
     #
@@ -165,6 +171,23 @@ class APIAlpha(APIBase):
         self._log_debug("Requesting to factory reset device")
         self.send(bytearray([16, 43, 2, 8, 0]))
 
+    #
+    # Rename Functions
+    #
+    def _request_action_rename(self, name: str, command_byte: int, id_byte: int = 0):
+        """
+        General method to send a request to change a name.
+        :param name: The new name to set.
+        :param command_byte: The subcommand byte (e.g., 21 or 24).
+        :param id_byte: The ID byte to specify the target (default is 0).
+        """
+        name = name.strip()
+        command = bytearray([16, command_byte])
+        command.extend(struct.pack(">B", len(name) + 1))
+        command.extend([id_byte])
+        command.extend(name.encode("utf-8"))
+        self.send(command)
+
     #
     # 15 [21]
     # Set Analog Input Name / Rename Analog Input
@@ -172,27 +195,16 @@ class APIAlpha(APIBase):
     # TODO: Does this work on A.1(x)?
     #
     def request_action_15(self, name: str):
-        name = name.strip()
         self._log_debug(f"Requesting to change analog input name: {name}")
-        command = bytearray([16, 21])
-        command.extend(struct.pack(">B", len(name) + 1))
-        command.extend([0])  # zone id placeholder
-        command = self._add_zone_id_to_request(command)
-        command.extend(name.encode("utf-8"))
-        self.send(command)
+        self._request_action_rename(name, 21, self.zone.id)
 
     #
     # 15 [21]
     # Set Bus 1 Name
     #
     def request_action_15_10(self, name: str):
-        name = name.strip()
         self._log_debug(f"Requesting to change bus 1 name: {name}")
-        command = bytearray([16, 21])
-        command.extend(struct.pack(">B", len(name) + 1))
-        command.extend([10])
-        command.extend(name.encode("utf-8"))
-        self.send(command)
+        self._request_action_rename(name, 21, 10)
 
     #
     # 15 [21]
@@ -201,11 +213,7 @@ class APIAlpha(APIBase):
     def request_action_15_12(self, name: str):
         name = name.strip()
         self._log_debug(f"Requesting to change bus 2 name: {name}")
-        command = bytearray([16, 21])
-        command.extend(struct.pack(">B", len(name) + 1))
-        command.extend([12])
-        command.extend(name.encode("utf-8"))
-        self.send(command)
+        self._request_action_rename(name, 21, 12)
 
     #
     # 18 [24]
@@ -214,17 +222,13 @@ class APIAlpha(APIBase):
     def request_action_18(self, name: str):
         name = name.strip()
         self._log_debug(f"Requesting to change device name: {name}")
-        command = bytearray([16, 24])
-        command.extend(struct.pack(">B", len(name) + 1))
-        command.extend([7])
-        command.extend(name.encode("utf-8"))
-        self.send(command)
+        self._request_action_rename(name, 24, 7)
 
     #
     # 4F [79]
     # Adaptive Power
     #
-    def request_action_4F(self, state=True):
+    def request_action_4F(self, state: bool = True):
         self._log_debug(f"Requesting to set adaptive power state: {state}")
         # Device level command (dont need zone)
         command = bytearray([16, 79, 2, 8, int(state)])
@@ -665,10 +669,6 @@ class APIAlpha(APIBase):
     def response_action_00_00(self, metadata: list):
         self._log_debug(f"Received 00 Status: {metadata}")
 
-        # Guess device model
-        # TODO: remove?
-        self.vssl._infer_device_model(metadata)
-
         # Analog output source
         # TODO: this need to be global (on the core?)
         key = DeviceStatusExtKeys.add_zone_to_bus_key(self.zone.id)
@@ -868,7 +868,7 @@ class APIAlpha(APIBase):
             )
 
         # Analog Output Fix Volume
-        #  e.g BF1
+        # e.g BF1
         #
         # TODO, this not great for A1
         #
@@ -944,6 +944,8 @@ class APIAlpha(APIBase):
     # 16 [22]
     # Received Analog Input Name
     #
+    # Note: Only received on Zone 1
+    #
     # TODO, maybe this should be global with the analog outputs.
     #
     def response_action_16(self, hexl: list, response: bytes):
@@ -1223,6 +1225,8 @@ class APIAlpha(APIBase):
     # 50 [80]
     # Adaptive Power Feedback
     #
+    # Note: Only received on Zone 1
+    #
     @validate_response_length()
     @validate_response_zone_id()
     def response_action_50(self, hexl: list, response: bytes):

vsslctrl/api_base.py

@@ -45,6 +45,17 @@ class APIBase(ABC):
 
     FRIST_BYTE = 1
 
+    #
+    # API Events
+    #
+    class Events:
+        PREFIX = "zone.api."
+        CONNECTING = PREFIX + "connecting"
+        CONNECTED = PREFIX + "connected"
+        DISCONNECTING = PREFIX + "disconnecting"
+        DISCONNECTED = PREFIX + "disconnected"
+        RECONNECTING = PREFIX + "reconnecting"
+
     def __init__(self, host, port):
         self.host = host
         self.port = port
@@ -89,6 +100,7 @@ class APIBase(ABC):
             return self.connected
 
         self._connecting = True
+        self._event_publish(self.Events.CONNECTING)
 
         try:
             self._log_debug(f"Attemping connection to {self.host}:{self.port}")
@@ -98,6 +110,7 @@ class APIBase(ABC):
 
             # Connected
             self.connection_event.set()
+            self._event_publish(self.Events.CONNECTED)
 
             # cancel any reconnecting loops
             self._cancel_keep_connected()
@@ -140,6 +153,7 @@ class APIBase(ABC):
     @final
     async def disconnect(self):
         self._disconnecting = True
+        self._event_publish(self.Events.DISCONNECTING)
 
         # cancel any reconnecting loops
         self._cancel_keep_connected()
@@ -176,6 +190,8 @@ class APIBase(ABC):
 
         self._disconnecting = False
 
+        self._event_publish(self.Events.DISCONNECTED)
+
         return not self.connected
 
     #
@@ -184,7 +200,9 @@ class APIBase(ABC):
     @final
     async def reconnect(self):
         if not self._reconnecting and not self._is_keep_connected_running():
+            self._event_publish(self.Events.RECONNECTING)
             await self.disconnect()
+            await asyncio.sleep(1)
             self._keep_connected()
 
     #
@@ -306,6 +324,13 @@ class APIBase(ABC):
     async def _read_byte_stream(self):
         pass
 
+    #
+    # Send event on event bus
+    #
+    @abstractmethod
+    def _event_publish(self, event_type, data=None):
+        pass
+
     #
     # Send a keep alive
     #

vsslctrl/api_bravo.py

@@ -23,6 +23,12 @@ class APIBravo(APIBase):
         self.vssl = vssl_host
         self.zone = zone
 
+    #
+    # Send event on event bus
+    #
+    def _event_publish(self, event_type, data=None):
+        self.zone._event_publish(event_type, (self.zone.host, self.TCP_PORT))
+
     #
     # Send keep alive
     #

vsslctrl/core.py

@@ -24,70 +24,51 @@ class Vssl:
     #
     class Events:
         PREFIX = "vssl."
+        INITIALISED = PREFIX + "initialised"
         MODEL_CHANGE = PREFIX + "model_changed"
         SW_VERSION_CHANGE = PREFIX + "sw_version_changed"
         SERIAL_CHANGE = PREFIX + "serial_changed"
-        ALL = EventBus.WILDCARD
 
-    def __init__(
-        self,
-        model: Models = None,
-        zones: Union[str, List[str]] = None,
-    ):
+    def __init__(self, model: Models):
         self.event_bus = EventBus()
+        self.initialisation = asyncio.Event()
         self.zones = {}
         self._sw_version = None
         self._serial = None
         self._model = None
+        self.model = model
         self.settings = VsslSettings(self)
 
-        if model is not None:
-            self.model = model
-
-        # Add zones if any are passed
-        if zones:
-            self.add_zones(zones)
+    @property
+    def initialised(self):
+        """Initialised Event"""
+        return self.initialisation.is_set()
 
     #
-    # Initialise the zones
-    #
-    # We init all the zones sequentially, so we can do some error checking
-    # and fail if any of the zones are in error
+    # Initialize the zones
     #
     async def initialise(self, init_timeout: int = 10):
         if len(self.zones) < 1:
-            raise VsslCtrlException("No zones were added to VSSL before calling run()")
+            raise VsslCtrlException("Add minimum one zone before initializing")
 
         zones_to_init = self.zones.copy()
 
         try:
             key, first_zone = zones_to_init.popitem()
 
-            # If we dont pass a model we will default to the zone count of the X series amps once we
-            # know some info about the device
-            if not self.model:
-                future_model = self.event_bus.future(
-                    self.Events.MODEL_CHANGE, self.ENTITY_ID
-                )
+            future_serial = self.event_bus.future(Zone.Events.SERIAL_RECEIVED)
+            future_sw_version = self.event_bus.future(self.Events.SW_VERSION_CHANGE)
+            future_name = self.event_bus.future(VsslSettings.Events.NAME_CHANGE)
 
-            # Lets make sure the zone is initialised, otherwsie we fail for all zones
             await first_zone.initialise()
 
-            # Only continue after we have a model
-            try:
-                if not self.model:
-                    await asyncio.wait_for(future_model, timeout=init_timeout)
-
-                if len(self.zones) > self.model.zone_count:
-                    raise VsslCtrlException("")
-
-            except asyncio.TimeoutError:
-                message = f"Timed out waiting for model infomation from zone {first_zone.id}, exiting!"
-                self._log_critical(message)
-                await first_zone.disconnect()
-                raise VsslCtrlException(message)
+            # Wait until we have some basic infomation
+            await self.event_bus.wait_future(future_serial, init_timeout)
+            await self.event_bus.wait_future(future_sw_version, init_timeout)
+            await self.event_bus.wait_future(future_name, init_timeout)
 
-            except VsslCtrlException:
+            # Check we haven't added too many zones
+            if len(self.zones) > self.model.zone_count:
                 message = f"Device model {self.model.name} only has {self.model.zone_count} zones not {len(self.zones)}."
                 self._log_critical(message)
                 await first_zone.disconnect()
@@ -95,21 +76,32 @@ class Vssl:
 
             # Output a bit of helpful info
             self._log_info(f"vsslctrl Version: {VSSL_VERSION}")
-            self._log_info(f"Device Model: {self.model.name}")
-            self._log_info(f"Device SW Version: {self.sw_version}")
             self._log_info(f"Device Serial: {self.serial}")
+            self._log_info(f"Device SW Version: {self.sw_version}")
+            self._log_info(f"Device Model: {self.model.name}")
 
-            # Now we can init the rest of the zones
+            # Initialise remaining zones
             initialisations = [zone.initialise() for zone in zones_to_init.values()]
             await asyncio.gather(*initialisations)
 
         except ZoneError as e:
-            message = f"Error occured while initialising zones {e}"
-            self._log_critical(e)
+            message = f"Zone initializing error: {e}"
+            self._log_critical(message)
             await self.disconnect()
             raise
 
-        return True
+        except asyncio.TimeoutError:
+            message = f"Timeout during VSSL initialization. Are any zones available?"
+            self._log_critical(message)
+            await first_zone.disconnect()
+            raise VsslCtrlException(message)
+
+        # Initialised
+        self.initialisation.set()
+        self.event_bus.publish(self.Events.INITIALISED, self.ENTITY_ID, self)
+        self._log_info(f"Core initialization complete")
+
+        return self
 
     #
     # Shutdown
@@ -121,20 +113,17 @@ class Vssl:
     #
     # Discover host on the network using zero_conf package
     #
-    async def discover(self, *args):
-        try:
-            check_zeroconf_availability()
+    @staticmethod
+    async def discover(*args):
+        check_zeroconf_availability()
 
-            from .discovery import VsslDiscovery
+        from .discovery import VsslDiscovery
 
-            service = VsslDiscovery(*args)
-            return await service.discover()
-        except ZeroConfNotInstalled as e:
-            self._log_error(e)
-            raise
+        service = VsslDiscovery(*args)
+        return await service.discover()
 
     #
-    # Update a property and fire the event
+    # Update a property and fire an event
     #
     #
     # TODO, use the ZoneDataClass here too? Needs some reconfig
@@ -188,34 +177,10 @@ class Vssl:
             if hasattr(Models, model):
                 self._set_property("model", getattr(Models, model).value)
         else:
-            message = f"Model {model} doesnt exist"
+            message = f"VSSL model {model} doesnt exist"
             self._log_error(message)
             raise VsslCtrlException(message)
 
-    #
-    # Work out the a model given some device info
-    #
-    #
-    #
-    # THIS WONT WORK FOR ORIGINAL A SERIES! TODO!
-    # Maybe we can just use the ID of the zone because 7 will be an A1(x) otherwise
-    # we will need to count the zones.
-    #
-    # Or we just require a model to be passed?
-    #
-    #
-    def _infer_device_model(self, data: Dict[str, int]):
-        # if we dont have a model, default to x series
-        if not self.model:
-            zone_count = sum(
-                1 for key in data if key.startswith("B") and key.endswith("Src")
-            )
-
-            if zone_count in (1, 3, 6):
-                self.model = f"A{zone_count}X"
-            else:
-                self.model = Models.A1X
-
     #
     # Disconnect / Shutdown
     #
@@ -224,42 +189,60 @@ class Vssl:
             await zone.disconnect()
 
     #
-    # Add a Zones using a List, index emplys the zone ID
+    # Add a Zone
     #
-    def add_zones(self, zones=Union[str, List[str]]):
-        zones_list = [zones] if isinstance(zones, str) else zones
+    def add_zone(self, host: str, zone_index: ZoneIDs = ZoneIDs.A1):
+        # Check if VSSL is already initialised
+        if self.initialised:
+            error = f"Zones can not be added after VSSL is initialised. Error trying to add Zone {zone_index}"
+            self._log_error(error)
+            raise ZoneError(error)
 
-        for index, ip in enumerate(zones_list):
-            self.add_zone(index + 1, ip)
+        # Check the ZoneID is valid for the model
+        if zone_index not in self.model.zones:
+            error = f"ZoneIDs {zone_index} is not supported on device model {self.model.name}. Did you select the correct model?"
+            self._log_error(error)
+            raise ZoneError(error)
 
-    #
-    # Add a Zone
-    #
-    def add_zone(self, zone_index: ZoneIDs, host: str):
+        # Double check ZoneID is valid
         if ZoneIDs.is_not_valid(zone_index):
             error = f"ZoneIDs {zone_index} doesnt exist"
             self._log_error(error)
             raise ZoneError(error)
-            return None
 
+        # Check ZoneID is unique
         if zone_index in self.zones:
-            error = f"Zone {zone_index} already exists"
+            error = f"Zone {zone_index} already exists on this instance"
             self._log_error(error)
             raise ZoneError(error)
-            return None
 
-        # Check if any object in the dictionary has the specified value for the
-        # property
+        # Check IPs are unique
         if any(zone.host == host for zone in self.zones.values()):
             error = f"Zone with IP {host} already exists"
             self._log_error(error)
             raise ZoneError(error)
-            return None
 
         self.zones[zone_index] = Zone(self, zone_index, host)
 
         return self.zones[zone_index]
 
+    #
+    # Add a Zones using a list.
+    #
+    async def add_zones(self, zones=Union[str, List[str]]):
+        zones_list = [zones] if isinstance(zones, str) else zones
+
+        # A.1(x)
+        if not self.model.is_multizone:
+            return self.add_zone(zones_list[0], ZoneIDs.A1)
+        else:
+            # Fetch the ZoneID from the device
+            for host in zones_list:
+                zone_id, serial = await fetch_zone_id_serial(host)
+                self.add_zone(host, ZoneIDs(int(zone_id)))
+
+        return self.zones
+
     #
     # Get a Zone by ID
     #
@@ -270,19 +253,7 @@ class Vssl:
             return None
 
     #
-    # Get a Zone by group index
-    #
-    def get_zones_by_group_index(self, group_index: int):
-        zones = {}
-        if self.zones:
-            for zone_id in self.zones:
-                zone = self.zones[zone_id]
-                if zone.group.index == group_index:
-                    zones[zone_id] = zone
-        return zones
-
-    #
-    # Get a Zone that is connected to its APIs
+    # Get a zone that is connected
     #
     def get_connected_zone(self):
         if self.zones:
@@ -290,6 +261,14 @@ class Vssl:
                 zone = self.zones[zone_id]
                 if zone.connected:
                     return zone
+        self._log_error("There are no connected zones.")
+
+    #
+    # Has a connected zone
+    #
+    @property
+    def connected(self):
+        return True if self.get_connected_zone() else False
 
     #
     # Get the device name
@@ -315,6 +294,18 @@ class Vssl:
         if zone:
             zone.api_alpha.request_action_2B()
 
+    #
+    # Get a Zone by group index
+    #
+    def get_zones_by_group_index(self, group_index: int):
+        zones = {}
+        if self.zones:
+            for zone_id in self.zones:
+                zone = self.zones[zone_id]
+                if zone.group.index == group_index:
+                    zones[zone_id] = zone
+        return zones
+
     #
     # Zones Groups. Build a dict of zone according to group membership
     #

vsslctrl/data_structure.py

@@ -489,7 +489,8 @@ class ZoneRouterStatusExtKeys:
 
     @staticmethod
     def add_zone_to_ao_fixed_volume_key(zone_id: int):
-        zone_id = 1 if zone_id > 6 else zone_id  # TODO - test A1 workaround
+        # TODO - Does this work on the A.1(x)?
+        zone_id = ZoneIDs.ZONE_1 if zone_id > ZoneIDs.ZONE_6 else zone_id
         return f"BF{zone_id}"
 
 

vsslctrl/event_bus.py

@@ -1,14 +1,11 @@
 import asyncio
 import traceback
+import fnmatch
 from enum import IntEnum
 from typing import Callable
 from .exceptions import VsslCtrlException
 from .decorators import logging_helpers
 
-#
-# Event Bus
-#
-
 
 @logging_helpers("EventBus:")
 class EventBus:
@@ -23,6 +20,10 @@ class EventBus:
 
         self.process = asyncio.create_task(self.process_events())
 
+    # Helper for wildcard matching, so we can use partial wildcards. e.g zone.api.connected
+    def _matches_pattern(self, event_type, pattern):
+        return fnmatch.fnmatch(event_type, pattern)
+
     #
     # Stop
     #
@@ -34,7 +35,7 @@ class EventBus:
     #
     # Subscribe
     #
-    def subscribe(self, event_type, callback: Callable, entity="*", once=False):
+    def subscribe(self, event_type, callback: Callable, entity=WILDCARD, once=False):
         # Make sure we are using async callbacks
         if callback is not None and asyncio.iscoroutinefunction(callback):
             event_type = event_type.lower()
@@ -62,12 +63,13 @@ class EventBus:
     #
     # Get a future value from the event bus
     #
-    def future(self, event_type, entity=None) -> asyncio.Future:
+    def future(self, event_type, entity=WILDCARD) -> asyncio.Future:
         future = asyncio.Future()
 
         async def future_callback(data, *args):
             nonlocal future
-            future.set_result(data)
+            if not future.done():  # Ensure the future is not already resolved
+                future.set_result(data)
 
         self.subscribe(event_type, future_callback, entity, once=True)
 
@@ -81,7 +83,7 @@ class EventBus:
             try:
                 return await asyncio.wait_for(future, timeout)
             except asyncio.TimeoutError as error:
-                self._log_error(f"timeout waiting for future")
+                self._log_error(f"Timeout waiting for eventbus future")
                 raise error
         else:
             return await future
@@ -92,7 +94,7 @@ class EventBus:
     async def wait_for(
         self,
         event_type,
-        entity=None,
+        entity=WILDCARD,
         timeout: int = FUTURE_TIMEOUT,
         timeout_result=None,
     ):
@@ -115,12 +117,8 @@ class EventBus:
         event_type = event_type.lower()
         await self.event_queue.put((event_type, entity, data))
 
-    #
-    # Process Events
-    #
     async def process_events(self):
         self._log_debug(f"starting event processing")
-
         self.running = True
         while self.running:
             try:
@@ -136,23 +134,22 @@ class EventBus:
                         message += str(data)
                     self._log_debug(message)
 
-                for event in [event_type, self.WILDCARD]:
-                    if event in self.subscribers:
-                        for callback, subscribed_entity, once in self.subscribers[
-                            event
-                        ]:
-                            if entity is None or subscribed_entity in {
-                                entity,
-                                self.WILDCARD,
-                            }:
-                                await callback(data, entity, event_type)
-                                if once:
-                                    self.unsubscribe(event, callback)
+                # Check for matching subscribers, including wildcards.
+                # e.g "zone.*", "zone.api.*"
+                matched_subscribers = []
+                for pattern in self.subscribers:
+                    if self._matches_pattern(event_type, pattern):
+                        matched_subscribers.extend(self.subscribers[pattern])
+
+                for callback, subscribed_entity, once in matched_subscribers:
+                    if entity is None or subscribed_entity in {entity, self.WILDCARD}:
+                        await callback(data, entity, event_type)
+                        if once:
+                            self.unsubscribe(pattern, callback)
 
             except asyncio.CancelledError:
                 break
             except Exception as e:
-                # Capture the traceback as a string
                 traceback_str = traceback.format_exc()
                 self._log_error(
                     f"exception occurred processing event: {e}\n{traceback_str}"

vsslctrl/group.py

@@ -159,7 +159,6 @@ class ZoneGroup(ZoneDataClass):
     #
     # Group: This zone is a master for a group
     #
-    # TODO: propogate track meta to member zones.
     # Only play state is propgated by the VSSL device
     #
     @property
@@ -215,4 +214,4 @@ class ZoneGroup(ZoneDataClass):
         self.zone.api_alpha.request_action_0C(state)
 
     def is_party_zone_member_toggle(self):
-        self.is_party_zone_member = False if self.is_party_zone_member else True
+        self.is_party_zone_member = not self.is_party_zone_member

vsslctrl/track.py

@@ -102,7 +102,7 @@ class TrackMetadata(ZoneDataClass):
     # Doing this will fire the change events on the bus. Instead of conditionally
     # using the getter functions since we want the changes to be propogated
     #
-    # VSSL has a happit of caching the last song played, so we need to clear it
+    # VSSL has a habit of caching the last song played, so we need to clear it
     #
     def set_defaults(self):
         for key, default_value in self.DEFAULTS.items():
@@ -143,7 +143,7 @@ class TrackMetadata(ZoneDataClass):
     def _map_response_dict(self, track_data: Dict[str, int]) -> None:
         """Ignore the track data if zone is part of a group.
 
-        VSSL has a happit of caching old track meta when part of a group
+        VSSL has a habit of caching old track meta when part of a group
 
         """
         if not self.zone.group.is_member:
@@ -161,8 +161,7 @@ class TrackMetadata(ZoneDataClass):
         but generally it responds with a BrowseView when its a member of a group
 
         When a group is created, the child will get the group index first (generally this will be the same
-        as the index_id) then its transport state will be
-        updated on the VSSL side.
+        as the index_id) then its transport state will be updated on the VSSL side.
         When the transport state is changed, the zone will request the track meta. VSSL will respond
         with the last cached metadata from the zone and not the correct meta from the current zone master.
 

vsslctrl/transport.py

@@ -70,7 +70,7 @@ class ZoneTransport(ZoneDataClass):
         Doing this will fire the change events on the bus. Instead of conditionally
         using the getter functions since we want the changes to be propogated
 
-        VSSL has a happit of caching the last song played, so we need to clear it
+        VSSL has a habit of caching the last song played, so we need to clear it
         """
         for key, default_value in self.DEFAULTS.items():
             set_func = f"_set_{key}"

vsslctrl/utils.py

@@ -1,4 +1,5 @@
 import asyncio
+import random
 
 
 #
@@ -51,6 +52,16 @@ def hex_to_bytearray_string(hex_string):
     return bytearray_str
 
 
+#
+# Generate a random INT excliding
+#
+def generate_number_excluding(excluded_number, lower: int = 1, upper: int = 100):
+    while True:
+        num = random.randint(lower, upper)
+        if num != excluded_number:
+            return num
+
+
 #
 # Repeat Timer
 #

vsslctrl/zone.py

@@ -29,7 +29,6 @@ class Zone:
     # Zone Events
     #
     class Events:
-        ALL = "*"
         PREFIX = "zone."
         INITIALISED = PREFIX + "initialised"
         ID_RECEIVED = PREFIX + "id_received"
@@ -79,8 +78,8 @@ class Zone:
         )
 
     # Initialise
-    async def initialise(self):
-        # ID and serial number futures
+    async def initialise(self, init_timeout: int = 10):
+        # Data we require from the device
         future_id = self.vssl.event_bus.future(self.Events.ID_RECEIVED, self.id)
         future_serial = self.vssl.event_bus.future(self.Events.SERIAL_RECEIVED, self.id)
         future_name = self.vssl.event_bus.future(
@@ -98,28 +97,35 @@ class Zone:
         )
 
         # Connect the APIs
-        # Wait until the zone is connected then continue
         await self.api_alpha.connect()
         await self.api_bravo.connect()
 
         # Start polling zone
         self._poller.start()
 
-        # Wait for the ID, serial and name to be returned from the device
-        received_id = await future_id
-        received_serial = await future_serial
-        await future_name
+        try:
+            # Wait for the ID, serial and name to be returned from the device
+            received_id = await self.vssl.event_bus.wait_future(future_id, init_timeout)
+            received_serial = await self.vssl.event_bus.wait_future(
+                future_serial, init_timeout
+            )
+            await self.vssl.event_bus.wait_future(future_name, init_timeout)
+        except asyncio.TimeoutError:
+            message = f"Zone {self.id}: initialization timeout. Is the zone available?"
+            self._log_critical(message)
+            await self.disconnect()
+            raise ZoneError(message)
 
-        # Confirm the zone id is matches returned ID
+        # Confirm the zone id is matches the returned zone ID
         if received_id != self.id:
-            message = f"Zone ID mismatch. {self.host} returned zone ID {received_id} instead of {self.id}"
+            message = f"Zone {self.id}: ID mismatch. {self.host} returned zone ID {received_id} instead of {self.id}"
             self._log_critical(message)
             await self.disconnect()
             raise ZoneError(message)
 
         # Confirm the zone and VSSL serial numbers match
         if self.vssl.serial != received_serial:
-            message = f"Zone ({received_serial}) and VSSL ({self.vssl.serial}) serial numbers do not match. Does this zone belong to this VSSL?"
+            message = f"Zone {self.id}: ({received_serial}) and VSSL ({self.vssl.serial}) serial numbers do not match. Does this zone belong to this VSSL?"
             self._log_critical(message)
             await self.disconnect()
             raise ZoneError(message)
@@ -162,7 +168,7 @@ class Zone:
         Doing this will fire the change events on the bus. Instead of conditionally
         using the getter functions since we want the changes to be propogated
 
-        VSSL has a happit of caching the last songs metadata
+        VSSL has a habit of caching the last songs metadata
 
         """
         if not self.transport.is_stopped:
@@ -356,6 +362,9 @@ class Zone:
     #
     # Mute
     #
+    # Note: Mute will still return true if volume is at 0
+    # so always use _mute when comparing
+    #
     @property
     def mute(self):
         return True if not self._volume else self._mute
@@ -365,7 +374,13 @@ class Zone:
         self.api_alpha.request_action_11(not not muted)
 
     def mute_toggle(self):
-        self.mute = False if self.mute else True
+        self.mute = False if self._mute else True
+
+    # Use self._mute since we are chcking volume in mute property
+    def _set_mute(self, state: bool):
+        if self._mute != state:
+            self._mute = state
+            return True
 
     #
     # Play a URL

{vsslctrl-0.1.11.dev1.dist-info → vsslctrl-0.1.13.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: vsslctrl
-Version: 0.1.11.dev1
+Version: 0.1.13.dev1
 Summary: Package for controlling VSSL's range of streaming amplifiers
 Author-email: vsslctrl <vsslcontrolled@proton.me>
 Classifier: Development Status :: 4 - Beta
@@ -21,32 +21,44 @@ Requires-Dist: zeroconf==0.132.2; extra == "optional"
 
 # vsslctrl
 
- Package for controlling [VSSL's](https://www.vssl.com/) range of streaming amplifiers.
+Package for controlling [VSSL's](https://www.vssl.com/) range of streaming amplifiers.
 
- **`vsslctrl` is not endorsed or affiliated with [VSSL](https://www.vssl.com/) in any manner.**
+## Coverage
 
-## Help
+Tested on:
 
-I am looking for testers with any VSSL amplifier models, please get in touch if you interested in helping. <vsslcontrolled@proton.me>
+| Model       | Software Version | Note |
+| ------------|---------  | -------------
+| A.3x       | p15305.016.3701     | 
 
-Tested on:
-- **A.3x** software version **p15305.016.3701**
 
 Home Assistant [integration](https://github.com/vsslctrl/integration.home-assistant) with basic functionality working on:
-- **A.1** software version **p15265.033.3703** (reported)
-- **A.3** software version **p12013.141.3703** (reported)
-- **A.3x** software version **p15305.016.3701**
-- **A.6x** software version **p15305.017.3701** (reported)
+
+| Model       | Software Version | User Reported |
+| ------------|---------  | -------------
+| A.1       | p15265.033.3703    | ✔️
+| A.3       | p12013.141.3703     | ✔️
+| A.3x       | p15305.016.3701     | 
+| A.6x       | p15305.017.3701     | ✔️
+
+
+## Testers Needed
+
+I am looking for testers with any VSSL amplifier models, please get in touch if you interested in helping. <vsslcontrolled@proton.me>
+
+
 
 ## Important
 
-There should not be any *[VSSL Agent's](https://vssl.gitbook.io/vssl-rest-api/getting-started/start)* running on the same network. If you dont know what this is, then you can ignore this notice.
+There should not be any *[VSSL Agent's](https://vssl.gitbook.io/vssl-rest-api/getting-started/start)* running on the network. If you dont know what this is, then you can ignore this notice.
+
+ **`vsslctrl` is not endorsed or affiliated with [VSSL](https://www.vssl.com/) in any manner.**
 
 ## TODOs
 
-* Correct IO mapping between models and versions
 * Better test coverage
-* A.1(x) testing
+* A.1(x) testing - e.g output settings
+* More controls - e.g IR Control
 
 ## Basic Usage
 
@@ -62,9 +74,9 @@ async def main():
   
   # Represents a physical VSSL amplifier
   vssl = Vssl(DeviceModels.A1)
-  a1 = vssl.add_zone(ZoneIDs.A1, '192.168.1.10')
+  a1 = vssl.add_zone('192.168.1.10')
 
-  # Connect and initiate zones.
+  # Connect and initialise zone.
   await vssl.initialise()
 
   """Control Examples"""
@@ -92,16 +104,15 @@ from vsslctrl import Vssl, DeviceModels, Zone, ZoneIDs
 async def main():
 	
   # Represents a physical VSSL amplifier
-  # If no DeviceModels is passed, vsslctrl will default to the feature set of the X series amps
   vssl = Vssl(DeviceModels.A3X)
 
   # Add each you wish to control
-  zone1 = vssl.add_zone(ZoneIDs.ZONE_1, '192.168.1.10')
-  zone2 = vssl.add_zone(ZoneIDs.ZONE_2, '192.168.1.11')
-  zone3 = vssl.add_zone(ZoneIDs.ZONE_3, '192.168.1.12')
-  #... up to 6 zones
+  zone1 = vssl.add_zone('192.168.1.10', ZoneIDs.ZONE_1)
+  zone2 = vssl.add_zone('192.168.1.11', ZoneIDs.ZONE_2)
+  zone3 = vssl.add_zone('192.168.1.12', ZoneIDs.ZONE_3)
+  #... up to 6 zones for A.6(x)
 
-  # Connect and initiate zones.
+  # Connect and initialise zones.
   await vssl.initialise()
 
   """Control Examples"""
@@ -123,24 +134,106 @@ async def main():
 asyncio.run(main())
 ```
 
-# API
+### Device Discovery Helper
+
+You can discover VSSL devices on the network using [mDNS](https://wikipedia.org/wiki/Multicast_DNS) / Bonjour if you have the [`zeroconf`](https://pypi.org/project/zeroconf/) package installed.
+
+This uses airplay service string `_airplay._tcp.local.`, therefore airplay needs to available and will not work across VLANs without other provisions.
 
-Most functionality is achived via `getters` and `setters` of the two main classes `Vssl`, `Zone`. 
+**Note:** This is designed to be a helper and its not recommended to be used for the initialization of the VSSL class.
+
+```python
+import asyncio
+from vsslctrl import Vssl
+
+async def main():
+  
+  print(await Vssl.discover())
+
+  """
+    {
+        'XXXXXXXXXXXX': [
+            {
+                'host': '192.168.168.25',
+                'name': 'Living Room',
+                'model': 'A1x',
+                'mac_addr': 'AA:BB:CC:DD:EE:FF',
+                'zone_id': '7',
+                'serial': 'XXXXXXXXXXXX'
+            }
+        ]
+    }
+
+  """
+
+asyncio.run(main())
+```
+
+
+# API Functionality
+
+Most functionality is achieved via `getters` and `setters` of the two main classes `Vssl`, `Zone`. 
 
 The classes will update the physical VSSL device when setting a property and once feedback has been received, the classes internal state will be updated. For example:
 
 ```python
-# Setting the zones name
+# Setting the zone name
 zone1.settings.name = 'Living Room'
->>> None
+>>> 'Old Zone Name'
 
 # Printing zone name
-zone_name = zone1.settings.name
-print(zone_name)
+print(zone1.settings.name)
 >>> 'Living Room'
 ```
 
-**Important** in the above example, `zone1.settings.name` wont be set to its new value until after the VSSL device has changed the name and the `Zone` class has received confirmation feedback. If you need to wait for the value change, you can await a `[property_name]_CHANGE` events.
+**Important** in the above example, `zone1.settings.name` won't be set to its new value until after the VSSL device has changed the name and the `Zone` class has received confirmation feedback. If you need to wait for the value change, you can await a `[property_name]_CHANGE` events as below:
+
+```python
+from vsslctrl.settings import ZoneSettings
+# Setting the zone name and wait for feedback
+future_name = vssl.event_bus.future(ZoneSettings.Events.NAME_CHANGE, zone1.id)
+zone1.settings.name = 'Bathroom' 
+# Helper to await a future with timeout
+new_name = await vssl.event_bus.wait_future(future_name)
+# Printing zone name
+print(new_name)
+>>> 'Bathroom'
+# or
+print(zone1.settings.name)
+>>> 'Bathroom'
+```
+
+# API Reference
+
+# `DeviceModels`
+
+A device model has to be passed to VSSL so it knows internally what features are supported by the device.
+This might be removed in the future if we can differentiate different models from the API.
+
+| Property        | Description |
+| ------------|---------  | 
+| `A1X`       | A.1x      | 
+| `A3X`       | A.3x      | 
+| `A6X`       | A.6x      | 
+| `A1`        | A1        | 
+| `A3`        | A3        | 
+| `A6`        | A6        | 
+
+# `ZoneIDs`
+
+A `ZoneIDs` must be passed to each `zone` you which to control and it must match the zone on the VSSL device.
+
+If you are unsure of your `ZoneIDs` you could use the discovery helper to find out the correct mapping.
+
+| Property        | Description | A.1(x) | A.3(x) | A.6(x)
+| ------------|---------  |--------  | --------  | --------  |  
+| `A1`        |       |✔️ | | |
+| `ZONE_1`    | Zone 1   | | ✔️| ✔️|
+| `ZONE_2`    | Zone 2    |  | ✔️| ✔️|
+| `ZONE_3`    | Zone 3  |  | ✔️| ✔️|
+| `ZONE_4`    | Zone 4     |  | | ✔️|
+| `ZONE_5`    | Zone 5       |  | | ✔️|
+| `ZONE_6`    | Zone 6       |  | | ✔️|
 
 
 # `Vssl`
@@ -164,7 +257,7 @@ vssl.factory_reset()
 
 ## `Vssl.settings`
 
-| Property      	| Description | Type 		| Notes / Defaults |
+| Property      	| Description | Type 		| Model: Default |
 | ---------------------- 	| ----------- | ----------- | ----------- |
 | `name`     			 	| Device name |	`str` |
 | `bus_1_name`   			| Name of Bus 1        |	`str` | <ul><li>A.1: Optical Input</li><li>A.3x/6x: Not Used</li></ul>
@@ -313,13 +406,13 @@ Input `InputRouter.Priorities` still apply.
 # Change zone 1 to listen to analog input 4
 zone1.input.source = InputRouter.Sources.ANALOG_IN_4
 
-# Change zone 1 to perfer analog input (local) over stream
+# Change zone 1 to perfer local inputs over stream
 zone1.input.priority = InputRouter.Priorities.LOCAL
 ```
 
 ## `Zone.group`
 
-Officially unsupported in X series amplifiers.
+Unsupported on X series amplifiers.
 
 | Property      	| Description | Type		| Values 		| 
 | ---------------------- 	| ----------- | ----------- |----------- |
@@ -458,55 +551,6 @@ zone1.settings.eq.khz1_db = -2
 zone1.settings.subwoofer.crossover = 100
 ```
 
-
-
-## Another (Lite) Way
-
-If you perfer to not run the complete intergration, you can send basic HEX commands to the VSSL device using [Netcat](https://nc110.sourceforge.io/) (or any network tool) on port `50002`.
-
-| HEX      	| Description |
-| ---------------------- 	| ----------- |
-| `\x10\x05\x03\x0{Zone Number}\xff\x03`   			| Volume Up     
-| `\x10\x05\x03\x0{Zone Number}\xfe\x03`   			| Volume Down    
-| `\x10\x11\x02\x0{Zone Number}\x01`   			| Mute
-| All commands can be found by looking [here](https://github.com/vsslctrl/vsslctrl/blob/2c43c2f2393b94bc0e062d2ab90144343eca16ef/vsslctrl/api_alpha.py)   			| 
-
-
-The `volume up` HEX command for `Zone 2` would be `\x10\x05\x03\x02\xff\x03`
-
-Now send the raw HEX using Netcat to the device using this syntax:
-
-`echo -e "{HEX Command}" | nc {IP Address} 50002`
-
-For example to send `volume up` to `Zone 2`:
-
-`echo -e "\x10\x05\x03\x02\xff\x03" | nc 192.168.1.11 50002`
-
-Home Assistant `Configuration.yaml` example:
-
-```ymal
-...
-
-shell_command:
-  #Zone 1
-  vssl_zone_1_volume_up: 'echo -e "\x10\x05\x03\x01\xff\x03" | nc 192.168.1.10 50002'
-  vssl_zone_1_volume_down: 'echo -e "\x10\x05\x03\x01\xfe\x03" | nc 192.168.1.10 50002'
-  vssl_zone_1_mute: 'echo -e "\x10\x11\x02\x01\x01" | nc 192.168.1.10 50002'
-  vssl_zone_1_unmute: 'echo -e "\x10\x11\x02\x01\x00" | nc 192.168.1.10 50002'
-  #Zone 2
-  vssl_zone_2_volume_up: 'echo -e "\x10\x05\x03\x02\xff\x03" | nc 192.168.1.11 50002'
-  vssl_zone_2_volume_down: 'echo -e "\x10\x05\x03\x02\xfe\x03" | nc 192.168.1.11 50002'
-  vssl_zone_2_mute: 'echo -e "\x10\x11\x02\x02\x01" | nc 192.168.1.11 50002'
-  vssl_zone_2_unmute: 'echo -e "\x10\x11\x02\x02\x00" | nc 192.168.1.11 50002'
-  #Zone 3
-  vssl_zone_3_volume_up: 'echo -e "\x10\x05\x03\x03\xff\x03" | nc 192.168.1.12 50002'
-  vssl_zone_3_volume_down: 'echo -e "\x10\x05\x03\x03\xfe\x03" | nc 192.168.1.12 50002'
-  vssl_zone_3_mute: 'echo -e "\x10\x11\x02\x03\x01" | nc 192.168.1.12 50002'
-  vssl_zone_3_unmute: 'echo -e "\x10\x11\x02\x03\x00" | nc 192.168.1.12 50002'
-
- ...
-```
-
 ## Credit
 
 Thanks to [@dj-jam](https://github.com/dj-jam) for the continued testing.
@@ -520,17 +564,9 @@ Motivation for this project was to integrate VSSLs amplifiers into [Home Assista
 * Not tested on A.1x or original A series range of amplifiers (testers welcome)
 * VSSL can not start a stream except for playing a URL directly. This is a limitation of the hardware itself.
 * Not all sources set the volume to 0 when the zone is muted
-* Grouping feedback is flaky on the X series amplifiers
 * Airplay `Zone.track.progress` is not available.
 * Cant stop a URL playback, feedback is worng at least
 * VSSL likes to cache old track metadata. For example when playing a URL after Spotify, often the device will respond with the previous (Spotify) tracks metadata
 * `stop()` is intended to disconnect the client and pause the stream. Doesn’t always function this way, depending on stream source
 * Occasionally a zones might stop responding to certain commands, issuing the `reboot` command generally corrects
 
-## Future
-
-* A.1(x) coverage i.e Bluetooth
-* REST API / Web App
-* Save and recall EQ
-* IR Control
-

vsslctrl-0.1.13.dev1.dist-info/RECORD

@@ -0,0 +1,23 @@
+vsslctrl/__init__.py,sha256=Gl9Q-q3nJi1hTjsCSXwJVY2r_zDmSvLBZ4yoKQjINTQ,174
+vsslctrl/api_alpha.py,sha256=UQsvFPYCbczrG74fbAWYxVeKLw7R1uT0evxprMyuev8,36984
+vsslctrl/api_base.py,sha256=g5rmjahkjyY_OB-2UjNbSwSUXVcWuL1RZZcElRmciTM,10366
+vsslctrl/api_bravo.py,sha256=xpOCCREHIe7dlLu3-PIaMqV2gqPUnX-gaE0MrZlo_YI,12457
+vsslctrl/core.py,sha256=tmWr4vxeQgrFryB-ELMDFtXs1qlwPzZ3tMVSQhHTKgY,9573
+vsslctrl/data_structure.py,sha256=3Tu8CIVM6ednmKVJE1fX6Ny-rKmlJLa2iJHsnjy7fvI,10884
+vsslctrl/decorators.py,sha256=_yQJ0MTXRX6LfvaXVgT2OwbYi9u83w4ciozIsnkxDdI,3406
+vsslctrl/device.py,sha256=JQK0k3N65uSLlYzfNMhUF5Pd7nfSgZj4WCT7o2-p_gs,7860
+vsslctrl/discovery.py,sha256=3z7z6YQUtvjFvRlQOZXIu6Wd4M896rMbi8SUkTub3AM,5568
+vsslctrl/event_bus.py,sha256=1MIUh8v_ukgqwbGzYkzqnwYPCtNyDcJwWpeB4oRk_uo,5282
+vsslctrl/exceptions.py,sha256=EEfNlu--9PMIidj3V3ZB8c7p3My8siqKw7YIOjPFaqE,419
+vsslctrl/group.py,sha256=hD46J-9oHk9EQhnBBlo4HiAA6XTSZ16bq0QMMR889NU,6227
+vsslctrl/io.py,sha256=xBOZjFyP7z_oaYRCxO56EwOJ1FesSphSWkHzGzBlgoU,8796
+vsslctrl/settings.py,sha256=aD-XUykRDe_EmTtSm1h8isHPDAs9DKIcLk5sz7g8PsQ,19507
+vsslctrl/track.py,sha256=tmEADTqQfW6Nk2fvmyNAajTLzuUEn3D71JHJWPYOhxY,10126
+vsslctrl/transport.py,sha256=hNo_gjVk2mCW_Z5cq-kj5xSMjWkXnGgZYpdwFel7K98,6992
+vsslctrl/utils.py,sha256=_bvsOIu3G5czdYhrtm_c0fM60t-UXcLxztnCduQoyvs,2340
+vsslctrl/zone.py,sha256=_uzwC7qJanUQ8GamYFSdJxAEj0qdtwZi9c_m7jnw05U,13696
+vsslctrl-0.1.13.dev1.dist-info/LICENSE,sha256=67Ekj8PIxjEvkPd7L3GYJ8dyvn1EC4sPM3q3FKtpN6w,1065
+vsslctrl-0.1.13.dev1.dist-info/METADATA,sha256=dW3xfOXA721g4uGZ29gLtVlfeSCD4YV8Y75QLP1ksL4,19617
+vsslctrl-0.1.13.dev1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+vsslctrl-0.1.13.dev1.dist-info/top_level.txt,sha256=MRycO_RKageNX27UZ2bLJDMlfeWTQzUZlsd3hS-0u3Y,9
+vsslctrl-0.1.13.dev1.dist-info/RECORD,,

{vsslctrl-0.1.11.dev1.dist-info → vsslctrl-0.1.13.dev1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

vsslctrl-0.1.11.dev1.dist-info/RECORD

@@ -1,23 +0,0 @@
-vsslctrl/__init__.py,sha256=o5Ku3L87_CKsTDJJ06OVmJnH9wVpILvzGxHeDh0UxDE,174
-vsslctrl/api_alpha.py,sha256=kPvT-v7CSvi1P2pDxKqPqmucwbTXiJsWj3A27h8zoc0,36902
-vsslctrl/api_base.py,sha256=a80CRtUkYK2OwXQOL8bP-YOvt4YE-ALd-VONza_gjK8,9623
-vsslctrl/api_bravo.py,sha256=pchZN16KIvdSrqkI1WU9PA9IEmxkyyP-XifxpRC0jDE,12283
-vsslctrl/core.py,sha256=uUNb8bU2JRZxDbzWgwrblXjKHYdeIWbuogSp9qQX3U8,9555
-vsslctrl/data_structure.py,sha256=kswH_GTtszeecwAxUc89ipJA1QbLQ8475A1jwcAZrro,10840
-vsslctrl/decorators.py,sha256=_yQJ0MTXRX6LfvaXVgT2OwbYi9u83w4ciozIsnkxDdI,3406
-vsslctrl/device.py,sha256=JQK0k3N65uSLlYzfNMhUF5Pd7nfSgZj4WCT7o2-p_gs,7860
-vsslctrl/discovery.py,sha256=3z7z6YQUtvjFvRlQOZXIu6Wd4M896rMbi8SUkTub3AM,5568
-vsslctrl/event_bus.py,sha256=9liAEJnZfthJwy5O-qc3pDIWRBv5AcV19PjMCwH_niU,5014
-vsslctrl/exceptions.py,sha256=EEfNlu--9PMIidj3V3ZB8c7p3My8siqKw7YIOjPFaqE,419
-vsslctrl/group.py,sha256=Lb-UJcU50PXOlIepz-1_yC9CazpkrhVPsf39GtyJwRM,6292
-vsslctrl/io.py,sha256=xBOZjFyP7z_oaYRCxO56EwOJ1FesSphSWkHzGzBlgoU,8796
-vsslctrl/settings.py,sha256=aD-XUykRDe_EmTtSm1h8isHPDAs9DKIcLk5sz7g8PsQ,19507
-vsslctrl/track.py,sha256=_lQNHYe8ZBm3v1lehFLjZruF5-Rz8PGWuQN-zISBgwc,10136
-vsslctrl/transport.py,sha256=XJFy0kl9y7hm3YV4_9ElBrq3u6--_k73UKJqKdO6Rqg,6993
-vsslctrl/utils.py,sha256=FWOMHM_sl1Cp1xab-V6b-A5B7qRmDN67hMMxV4ReWCk,2087
-vsslctrl/zone.py,sha256=teSk8oE3LKteidRnuVK3koUOqtN-90LclEx0-T4FhAE,12978
-vsslctrl-0.1.11.dev1.dist-info/LICENSE,sha256=67Ekj8PIxjEvkPd7L3GYJ8dyvn1EC4sPM3q3FKtpN6w,1065
-vsslctrl-0.1.11.dev1.dist-info/METADATA,sha256=3pI4VH-NpkWtFTXc2qtRTqq_kS-KwJXhV6XRoZSBC9w,19273
-vsslctrl-0.1.11.dev1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-vsslctrl-0.1.11.dev1.dist-info/top_level.txt,sha256=MRycO_RKageNX27UZ2bLJDMlfeWTQzUZlsd3hS-0u3Y,9
-vsslctrl-0.1.11.dev1.dist-info/RECORD,,