vsslctrl 0.1.3.dev1__py3-none-any.whl → 0.1.5.dev1__py3-none-any.whl

vsslctrl/__init__.py

@@ -1,4 +1,6 @@
 from .core import Vssl
 from .zone import Zone
+from .data_structure import ZoneIDs
+from .device import Models as DeviceModels
 
 VSSL_NAME = "VSSL"

vsslctrl/api_alpha.py

@@ -558,8 +558,8 @@ class APIAlpha(APIBase):
     def response_action_00_00(self, metadata: list):
         self._log_debug(f"Received 00 Status: {metadata}")
 
-        # Workout how many zones we have
-        self.vssl._infer_model_zone_qty(metadata)
+        # Guess device model
+        self.vssl._infer_device_model(metadata)
 
         # Analog output source
         key = DeviceStatusExtKeys.add_zone_to_bus_key(self.zone.id)

vsslctrl/api_base.py

@@ -158,6 +158,19 @@ class APIBase(ABC):
 
             except asyncio.CancelledError:
                 self._log_debug(f"writer close timeout")
+            except asyncio.TimeoutError as e:
+                self._log_error(f"Timeout while closing connection: {e}")
+                # Handle the timeout: log, retry, or take other actions
+            except ConnectionResetError as e:
+                self._log_error(f"Connection reset by peer: {e}")
+                # Handle the error: log, retry, or take other actions
+            except Exception as e:
+                self._log_error(f"Unexpected error occurred while disconnecting: {e}")
+                # Handle unexpected errors
+            finally:
+                self._writer = None
+
+        self._reader = None
 
         self._log_info(f"{self.host}:{self.port}: disconnected")
 

vsslctrl/core.py

@@ -10,7 +10,8 @@ from .event_bus import EventBus
 from .settings import VsslSettings
 from .decorators import logging_helpers
 from .discovery import check_zeroconf_availability, fetch_zone_id_serial
-from .data_structure import DeviceModels
+from .device import Models
+from .data_structure import ZoneIDs
 
 
 @logging_helpers("VSSL:")
@@ -23,14 +24,13 @@ class Vssl:
     class Events:
         PREFIX = "vssl."
         MODEL_CHANGE = PREFIX + "model_changed"
-        MODEL_ZONE_QTY_CHANGE = PREFIX + "model_zone_qty_changed"
         SW_VERSION_CHANGE = PREFIX + "sw_version_changed"
         SERIAL_CHANGE = PREFIX + "serial_changed"
         ALL = EventBus.WILDCARD
 
     def __init__(
         self,
-        model: DeviceModels = None,
+        model: Models = None,
         zones: Union[str, List[str]] = None,
     ):
         self.event_bus = EventBus()
@@ -38,10 +38,10 @@ class Vssl:
         self._sw_version = None
         self._serial = None
         self._model = None
-        self._model_zone_qty = 0
         self.settings = VsslSettings(self)
 
-        self.model = model
+        if model is not None:
+            self.model = model
 
         # Add zones if any are passed
         if zones:
@@ -62,22 +62,22 @@ class Vssl:
         try:
             key, first_zone = zones_to_init.popitem()
 
-            # If we pass a model to the zone, the zone count will be worked out from that,
-            # otherwise we will try and work it out once we receive some info about he device
-            if not self.model_zone_qty:
-                future_model_zone_qty = self.event_bus.future(
-                    self.Events.MODEL_ZONE_QTY_CHANGE, self.ENTITY_ID
+            # 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
                 )
 
             # Lets make sure the zone is initialised, otherwsie we fail all
             await first_zone.initialise()
 
-            # Only continue after we now how many zones the device supports
+            # Only continue after we have a model
             try:
-                if not self.model_zone_qty:
-                    await asyncio.wait_for(future_model_zone_qty, timeout=init_timeout)
+                if not self.model:
+                    await asyncio.wait_for(future_model, timeout=init_timeout)
 
-                if len(self.zones) > self.model_zone_qty:
+                if len(self.zones) > self.model.zone_count:
                     raise VsslCtrlException("")
 
             except asyncio.TimeoutError:
@@ -87,7 +87,8 @@ class Vssl:
                 raise VsslCtrlException(message)
 
             except VsslCtrlException:
-                message = f"Device model only has {self.model_zone_qty} zones instead of {len(self.zones)}"
+                zone_count = self.model.zone_count
+                message = f"Device model only has {zone_count} zones instead of {len(self.zones)}"
                 self._log_critical(message)
                 await first_zone.disconnect()
                 raise VsslCtrlException(message)
@@ -173,47 +174,32 @@ class Vssl:
         return self._model
 
     @model.setter
-    def model(self, model: str):
-        if self.model != model:
-            if DeviceModels.is_valid(model):
-                self._set_property("model", DeviceModels(model))
-            else:
-                message = f"DeviceModels {model} doesnt exist"
-                self._log_error(message)
-                raise VsslCtrlException(message)
-
-    #
-    # The amount of zones this VSSL has. This is not how many zones have been initialised
-    # but how many zones the model has in total. We can have 1, 3 or 6 zones.
-    #
-    @property
-    def model_zone_qty(self):
-        if not self._model_zone_qty and self.model is not None:
-            self._model_zone_qty = DeviceModels.zone_count(self.model.value)
-
-        return self._model_zone_qty
-
-    @model_zone_qty.setter
-    def model_zone_qty(self, model_zone_qty: int):
-        pass  # read-only
+    def model(self, model):
+        if Models.is_valid(model):
+            self._set_property("model", Models(model).value)
+        elif isinstance(model, str):
+            model = model.upper()
+            if hasattr(Models, model):
+                self._set_property("model", getattr(Models, model).value)
+        else:
+            message = f"Model {model} doesnt exist"
+            self._log_error(message)
+            raise VsslCtrlException(message)
 
     #
-    # Work out the model_zone_qty given device info
+    # Work out the a model given some device info
     #
-    def _infer_model_zone_qty(self, data: Dict[str, int]):
-        if not self.model_zone_qty:
+    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_zone_qty = zone_count
+                self.model = f"A{zone_count}X"
             else:
-                self._model_zone_qty = 1
-
-            self.event_bus.publish(
-                self.Events.MODEL_ZONE_QTY_CHANGE, self.ENTITY_ID, self.model_zone_qty
-            )
+                self.model = Models.A1X
 
     #
     # Disconnect / Shutdown
@@ -234,9 +220,9 @@ class Vssl:
     #
     # Add a Zone
     #
-    def add_zone(self, zone_index: "Zone.IDs", host: str):
-        if Zone.IDs.is_not_valid(zone_index):
-            error = f"Zone.IDs {zone_index} doesnt exist"
+    def add_zone(self, zone_index: ZoneIDs, host: str):
+        if ZoneIDs.is_not_valid(zone_index):
+            error = f"ZoneIDs {zone_index} doesnt exist"
             self._log_error(error)
             raise ZoneError(error)
             return None
@@ -262,7 +248,7 @@ class Vssl:
     #
     # Get a Zone by ID
     #
-    def get_zone(self, zone_index: "Zone.IDs"):
+    def get_zone(self, zone_index: ZoneIDs):
         if zone_index in self.zones:
             return self.zones[zone_index]
         else:

vsslctrl/data_structure.py

@@ -29,33 +29,50 @@ class VsslIntEnum(VsslEnum, IntEnum):
     """IntEnum"""
 
 
-class DeviceModels(VsslEnum):
-    A1 = "a1"
-    A3 = "a3"
-    A6 = "a6"
-    A1X = "a1x"
-    A3X = "a3x"
-    A6X = "a6x"
+#
+# Zones IDs
+#
+# Moved here to help with circular imports
+#
+class ZoneIDs(VsslIntEnum):
+    ZONE_1 = 1
+    ZONE_2 = 2
+    ZONE_3 = 3
+    ZONE_4 = 4
+    ZONE_5 = 5
+    ZONE_6 = 6
 
-    @staticmethod
-    # Get the amount of zones the model has by pulling out the number in the model
-    def zone_count(model: str):
-        if DeviceModels.is_valid(model.lower()):
-            pattern = r"\d+"
-            match = re.search(pattern, model)
-            if match:
-                number = int(match.group())
-                return number
-        return 1
-
-
-""" JSON Structure
-
- DO NOT CHANGE - VSSL Defined
-
- {'B1Src': '3', 'B2Src': '4', 'B3Src': '5', 'B1Nm': '', 'B2Nm': 'Optical In', 'dev': 'Device Name', 'ver': 'p15305.016.3701'}
 
 """
+JSON Structure
+
+DO NOT CHANGE - VSSL Defined
+
+A3.x
+{
+    "B1Src": "3",
+    "B2Src": "4",
+    "B3Src": "5",
+    "B1Nm": "",
+    "B2Nm": "Optical In",
+    "dev": "Device Name",
+    "ver": "p15305.016.3701"
+}
+
+A6.x
+{
+    "B1Src": "3",
+    "B2Src": "4",
+    "B3Src": "5",
+    "B4Src": "6",
+    "B5Src": "7",
+    "B6Src": "8",
+    "B1Nm": "",
+    "B2Nm": "",
+    "dev": "VSSL A.6x",
+    "ver": "p15305.017.3701"
+}
+"""
 
 
 class DeviceStatusExtKeys:
@@ -75,13 +92,50 @@ class DeviceStatusExtKeys:
         return f"B{zone_id}Src"
 
 
-""" JSON Structure
-
- DO NOT CHANGE - VSSL Defined
-
- {'id': '1', 'ac': '0', 'mc': 'XXXXXXXXXXXX', 'vol': '20', 'mt': '0', 'pa': '0', 'rm': '0', 'ts': '14',
-     'alex': '14', 'nmd': '0', 'ird': '14', 'lb': '24', 'tp': '13', 'wr': '0', 'as': '0', 'rg': '0'}
-
+"""
+JSON Structure
+
+DO NOT CHANGE - VSSL Defined
+
+A3.x
+{
+    "id": "1",
+    "ac": "0",
+    "mc": "XXXXXXXXXXXX",
+    "vol": "20",
+    "mt": "0",
+    "pa": "0",
+    "rm": "0",
+    "ts": "14",
+    "alex": "14",
+    "nmd": "0",
+    "ird": "14",
+    "lb": "24",
+    "tp": "13",
+    "wr": "0",
+    "as": "0",
+    "rg": "0"
+}
+
+A6.x
+{
+    "id": "1",
+    "ac": "0",
+    "mc": "XXXXXXXXXXXX",
+    "vol": "50",
+    "mt": "0",
+    "pa": "0",
+    "rm": "0",
+    "ts": "0",
+    "alex": "126",
+    "nmd": "0",
+    "ird": "255",
+    "lb": "17",
+    "tp": "16",
+    "wr": "0",
+    "as": "0",
+    "rg": "0"
+}
 """
 
 
@@ -97,13 +151,42 @@ class ZoneStatusExtKeys:
     DISABLED = "wr"
 
 
-""" JSON Structure
-
- DO NOT CHANGE - VSSL Defined
-
- {'mono': '0', 'AiNm': 'Analog In 1', 'eq1': '100', 'eq2': '100', 'eq3': '100', 'eq4': '100',
-     'eq5': '100', 'eq6': '100', 'eq7': '100', 'voll': '75', 'volr': '75', 'vold': '0'}
-
+"""
+JSON Structure
+
+DO NOT CHANGE - VSSL Defined
+
+A3.x
+{
+    "mono": "0",
+    "AiNm": "Analog In 1",
+    "eq1": "100",
+    "eq2": "100",
+    "eq3": "100",
+    "eq4": "100",
+    "eq5": "100",
+    "eq6": "100",
+    "eq7": "100",
+    "voll": "75",
+    "volr": "75",
+    "vold": "0"
+}
+
+A6.x
+{
+    "mono": "0",
+    "AiNm": "",
+    "eq1": "100",
+    "eq2": "100",
+    "eq3": "100",
+    "eq4": "100",
+    "eq5": "100",
+    "eq6": "100",
+    "eq7": "100",
+    "voll": "75",
+    "volr": "75",
+    "vold": "0"
+}
 """
 
 
@@ -122,13 +205,47 @@ class ZoneEQStatusExtKeys:
     VOL_DEFAULT_ON = "vold"
 
 
-""" JSON Structure
-
- DO NOT CHANGE - VSSL Defined
-
- {'ECO': '0', 'eqsw': '1', 'inSrc': '0', 'SP': '0', 'BF1': '0', 'BF2': '0', 'BF3': '0',
-    'GRM': '0', 'GRS': '255', 'Pwr': '0', 'Bvr': '1', 'fxv': '24', 'AtPwr': '1'}
-
+"""
+JSON Structure
+
+DO NOT CHANGE - VSSL Defined
+
+A3.x
+{
+    "ECO": "0",
+    "eqsw": "1",
+    "inSrc": "0",
+    "SP": "0",
+    "BF1": "0",
+    "BF2": "0",
+    "BF3": "0",
+    "GRM": "0",
+    "GRS": "255",
+    "Pwr": "0",
+    "Bvr": "1",
+    "fxv": "24",
+    "AtPwr": "1"
+}
+
+A6.x
+{
+    "ECO": "0",
+    "eqsw": "1",
+    "inSrc": "0",
+    "SP": "0",
+    "BF1": "0",
+    "BF2": "0",
+    "BF3": "0",
+    "BF4": "0",
+    "BF5": "0",
+    "BF6": "0",
+    "GRM": "0",
+    "GRS": "255",
+    "Pwr": "0",
+    "Bvr": "2",
+    "fxv": "25",
+    "AtPwr": "1"
+}
 """
 
 
@@ -148,17 +265,37 @@ class ZoneRouterStatusExtKeys:
         return f"BF{zone_id}"
 
 
-""" JSON Structure
-
- DO NOT CHANGE - VSSL Defined
-
- {'Album': 'International Skankers', 'Artist': 'Ashkabad', 'BitDepth': 16,
-    'BitRate': '320000', 'CoverArtUrl': 'https://i.scdn.co/image/ab67616d0000b2730cbb03a339c6ffd18d10eab2',
-    'Current Source': 4, 'Current_time': -1, 'DSDType': '', 'Fav': False, 'FileSize': 0, 'Genre': '',
-    'Index': 0, 'Mime': 'Ogg', 'Next': False, 'PlayState': 0, 'PlayUrl': 'spotify:track:0IHTiLO5qBYhf7Hmn0UDBN',
-    'Prev': False, 'Repeat': 0, 'SampleRate': '44100', 'Seek': False, 'Shuffle': 0, 'SinglePlay': False,
-    'TotalTime': 203087, 'TrackName': 'Beijing'}
-
+"""
+JSON Structure
+
+DO NOT CHANGE - VSSL Defined
+
+{
+    "Album": "International Skankers",
+    "Artist": "Ashkabad",
+    "BitDepth": 16,
+    "BitRate": "320000",
+    "CoverArtUrl": "https://i.scdn.co/image/ab67616d0000b2730cbb03a339c6ffd18d10eab2",
+    "Current Source": 4,
+    "Current_time": -1,
+    "DSDType": "",
+    "Fav": False,
+    "FileSize": 0,
+    "Genre": "",
+    "Index": 0,
+    "Mime": "Ogg",
+    "Next": False,
+    "PlayState": 0,
+    "PlayUrl": "spotify:track:0IHTiLO5qBYhf7Hmn0UDBN",
+    "Prev": False,
+    "Repeat": 0,
+    "SampleRate": "44100",
+    "Seek": False,
+    "Shuffle": 0,
+    "SinglePlay": False,
+    "TotalTime": 203087,
+    "TrackName": "Beijing"
+}
 """
 
 

vsslctrl/device.py

@@ -0,0 +1,115 @@
+from .data_structure import VsslEnum, VsslIntEnum, ZoneIDs
+from .io import AnalogOutput, InputRouter
+
+SINGLE_ZONE = [ZoneIDs.ZONE_1]
+THREE_ZONES = [ZoneIDs.ZONE_1, ZoneIDs.ZONE_2, ZoneIDs.ZONE_3]
+SIX_ZONES = list(ZoneIDs)
+
+INPUT_SOURCES_FOR_1_ZONE_DEVICE = [
+    InputRouter.Sources.STREAM,
+    InputRouter.Sources.ANALOG_IN_1,
+    InputRouter.Sources.OPTICAL_IN,
+]
+
+INPUT_SOURCES_FOR_3_ZONE_DEVICE = INPUT_SOURCES_FOR_1_ZONE_DEVICE + [
+    InputRouter.Sources.ANALOG_IN_2,
+    InputRouter.Sources.ANALOG_IN_3,
+]
+
+INPUT_SOURCES_FOR_6_ZONE_DEVICE = list(InputRouter.Sources)
+
+ANALOG_OUTPUT_SOURCES_FOR_1_ZONE_DEVICE = [
+    AnalogOutput.Sources.OFF,
+    AnalogOutput.Sources.ZONE_1,
+    AnalogOutput.Sources.OPTICAL_IN,
+]
+
+ANALOG_OUTPUT_SOURCES_FOR_3_ZONE_DEVICE = ANALOG_OUTPUT_SOURCES_FOR_1_ZONE_DEVICE + [
+    AnalogOutput.Sources.ZONE_2,
+    AnalogOutput.Sources.ZONE_3,
+]
+
+ANALOG_OUTPUT_SOURCES_FOR_6_ZONE_DEVICE = list(AnalogOutput.Sources)
+
+
+class Features(VsslIntEnum):
+    GROUPING = 1000
+    BLUETOOTH = 1001
+    PARTY_MODE = 1002
+
+
+class Model:
+    def __init__(self, model: dict):
+        self.name = model.get("name")
+        self.zones = model.get("zones", [])
+        self.input_sources = model.get("input_sources", [])
+        self.analog_output_sources = model.get("analog_output_sources", [])
+        self.features = model.get("features", [])
+
+    @property
+    def zone_count(self):
+        return len(self.zones)
+
+    @property
+    def is_multizone(self):
+        return self.zone_count > 1
+
+    def supports_feature(self, feature: Features):
+        return feature in self.features
+
+
+class Models(VsslEnum):
+    A1 = Model(
+        {
+            "name": "A1",
+            "zones": SINGLE_ZONE,
+            "input_sources": INPUT_SOURCES_FOR_1_ZONE_DEVICE,
+            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_1_ZONE_DEVICE,
+            "features": [Features.BLUETOOTH],
+        }
+    )
+    A3 = Model(
+        {
+            "name": "A3",
+            "zones": THREE_ZONES,
+            "input_sources": INPUT_SOURCES_FOR_3_ZONE_DEVICE,
+            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_3_ZONE_DEVICE,
+            "features": [Features.GROUPING, Features.PARTY_MODE],
+        }
+    )
+    A6 = Model(
+        {
+            "name": "A6",
+            "zones": SIX_ZONES,
+            "input_sources": INPUT_SOURCES_FOR_6_ZONE_DEVICE,
+            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_6_ZONE_DEVICE,
+            "features": [Features.GROUPING, Features.PARTY_MODE],
+        }
+    )
+    A1X = Model(
+        {
+            "name": "A.1x",
+            "zones": SINGLE_ZONE,
+            "input_sources": INPUT_SOURCES_FOR_1_ZONE_DEVICE,
+            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_1_ZONE_DEVICE,
+            "features": [Features.GROUPING, Features.BLUETOOTH],
+        }
+    )
+    A3X = Model(
+        {
+            "name": "A.3x",
+            "zones": THREE_ZONES,
+            "input_sources": INPUT_SOURCES_FOR_3_ZONE_DEVICE,
+            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_3_ZONE_DEVICE,
+            "features": [Features.GROUPING],
+        }
+    )
+    A6X = Model(
+        {
+            "name": "A.6x",
+            "zones": SIX_ZONES,
+            "input_sources": INPUT_SOURCES_FOR_6_ZONE_DEVICE,
+            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_6_ZONE_DEVICE,
+            "features": [Features.GROUPING],
+        }
+    )

vsslctrl/group.py

@@ -1,7 +1,8 @@
 import logging
 from . import zone
 from typing import Dict, Union
-from .data_structure import ZoneDataClass
+from .data_structure import ZoneDataClass, ZoneIDs
+from .device import Features as DeviceFeatures
 
 
 """
@@ -58,12 +59,19 @@ class ZoneGroup(ZoneDataClass):
     #
     # Group Add Zone
     #
-    def add_member(self, zone_id: "zone.Zone.IDs"):
+    def add_member(self, zone_id: ZoneIDs):
+        # Check this device is a multizone device
+        if not self.zone.vssl.model.supports_feature(DeviceFeatures.GROUPING):
+            self.zone._log_error(
+                f"VSSL {self.zone.vssl.model.name} doesnt support grouping"
+            )
+            return False
+
         if self.zone.id == zone_id:
             self.zone._log_error(f"Zone {zone_id} cant be parent and member")
             return False
 
-        if zone.Zone.IDs.is_not_valid(zone_id):
+        if ZoneIDs.is_not_valid(zone_id):
             self.zone._log_error(f"Zone {zone_id} doesnt exist")
             return False
 
@@ -84,7 +92,7 @@ class ZoneGroup(ZoneDataClass):
     #
     # Group Remove Child
     #
-    def remove_member(self, zone_id: "zone.Zone.IDs"):
+    def remove_member(self, zone_id: ZoneIDs):
         self.zone.api_alpha.request_action_4B_remove(zone_id)
 
     #
@@ -132,9 +140,7 @@ class ZoneGroup(ZoneDataClass):
         pass  # read-only
 
     def _set_source(self, grs: int):
-        new_source = (
-            zone.Zone.IDs(grs) if grs != 255 and zone.Zone.IDs.is_valid(grs) else None
-        )
+        new_source = ZoneIDs(grs) if grs != 255 and ZoneIDs.is_valid(grs) else None
 
         if self.source != new_source:
             self._source = new_source

vsslctrl/io.py

@@ -83,10 +83,14 @@ class InputRouter(ZoneDataClass):
 
     @source.setter
     def source(self, src: "InputRouter.Sources"):
-        if self.Sources.is_valid(src):
+        # if self.Sources.is_valid():
+        if src in self.zone.vssl.model.input_sources:
+            # check source is avaialbe on this device
             self.zone.api_alpha.request_action_03(src)
         else:
-            self.zone._log_error(f"InputRouter.Sources {src} doesnt exist")
+            self.zone._log_error(
+                f"InputRouter.Sources {src} doesnt exist in {list(self.zone.vssl.model.input_sources)}"
+            )
 
     def _set_source(self, src: int):
         if self.source != src:
@@ -135,7 +139,7 @@ class AnalogOutput(ZoneDataClass):
         self.zone = zone
 
         self._is_fixed_volume = False
-        self._source = self.Sources(zone.id + 3)
+        self._source = self.Sources(zone.id + 2)
 
     #
     # Analog Output Fix Volume. Output wont respond to volume control
@@ -160,10 +164,13 @@ class AnalogOutput(ZoneDataClass):
 
     @source.setter
     def source(self, src: "AnalogOutput.Sources"):
-        if self.Sources.is_valid(src):
+        # if self.Sources.is_valid(src):
+        if src in self.zone.vssl.model.analog_output_sources:
             self.zone.api_alpha.request_action_1D(src)
         else:
-            self.zone._log_error(f"AnalogOutput.Sources {src} doesnt exist")
+            self.zone._log_error(
+                f"AnalogOutput.Sources {src} doesnt exist in {list(self.zone.vssl.model.analog_output_sources)}"
+            )
 
     def _set_source(self, src: int):
         if self.source != src:

vsslctrl/settings.py

@@ -162,7 +162,7 @@ class ZoneSettings(ZoneDataClass):
 
         self._disabled = False
         self._name = f"Zone {zone.id}"
-        self._mono = False
+        self._mono = self.StereoMono.Stereo
 
         self.eq = EQSettings(zone)
         self.volume = VolumeSettings(zone)

vsslctrl/zone.py

@@ -13,7 +13,7 @@ from . import core
 from .api_alpha import APIAlpha
 from .api_bravo import APIBravo
 from .utils import RepeatTimer, clamp_volume
-from .data_structure import DeviceModels, VsslIntEnum
+from .data_structure import VsslIntEnum, ZoneIDs
 from .track import TrackMetadata
 from .io import AnalogOutput, InputRouter
 from .settings import ZoneSettings
@@ -25,17 +25,6 @@ from .decorators import logging_helpers
 
 @logging_helpers()
 class Zone:
-    #
-    # Zones IDs
-    #
-    class IDs(VsslIntEnum):
-        ZONE_1 = 1
-        ZONE_2 = 2
-        ZONE_3 = 3
-        ZONE_4 = 4
-        ZONE_5 = 5
-        ZONE_6 = 6
-
     #
     # Zone Events
     #
@@ -49,7 +38,7 @@ class Zone:
         VOLUME_CHANGE = PREFIX + "volume_change"
         MUTE_CHANGE = PREFIX + "mute_change"
 
-    def __init__(self, vssl_host: "core.Vssl", zone_id: "Zone.IDs", host: str):
+    def __init__(self, vssl_host: "core.Vssl", zone_id: ZoneIDs, host: str):
         self._log_prefix = f"Zone {zone_id}:"
 
         self.vssl = vssl_host
@@ -57,7 +46,7 @@ class Zone:
 
         # Data / Cache
         self._host = host
-        self._id = self.IDs(zone_id)
+        self._id = ZoneIDs(zone_id)
         self._mac_addr = None
         self._serial = None
         self._volume = 0

{vsslctrl-0.1.3.dev1.dist-info → vsslctrl-0.1.5.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vsslctrl
-Version: 0.1.3.dev1
+Version: 0.1.5.dev1
 Summary: Package for controlling VSSL amplifiers
 Author-email: vsslctrl <vsslcontrolled@proton.me>
 Classifier: Development Status :: 4 - Beta
@@ -28,37 +28,45 @@ Requires-Dist: zeroconf ==0.132.2 ; extra == 'optional'
 
  I am looking for testers with any VSSL amplifier models, please get in touch if you interested in helping.
 
- Only tested on VSSL **A.3x** software version **p15305.016.3701**.
+Important
+-----------
+Only tested on a VSSL **A.3x** software version **p15305.016.3701**.
+
+**Notice:** VSSLs new iOS app titled `VSSL`can cause connection refused issues if running at the same time as `vsslctrl`. Best to not use the iOS app togeather. The `VSSL Legacy` app works fine
+
+**Warning:** no *[VSSL Agent](https://vssl.gitbook.io/vssl-rest-api/getting-started/start)* should be running on the same network. If you dont know what this is, then you can probably ignore this notice.
 
 ## TODOs
 
 * Test on other models (hardware needed)
 * Home Assistant integration. In progress, [here](https://github.com/vsslctrl/integration.home-assistant)
-* Function scoping to supported feature / models
+* ~~Function scoping to supported feature / models~~ (needs tests)
 * Better test coverage
 
-Important
------------
-**Warning:** no *[VSSL Agent](https://vssl.gitbook.io/vssl-rest-api/getting-started/start)* should be running on the same network. If you dont know what this is, then you can probably ignore this notice.
-
-
 Basic Usage
 -----------
 `vsslctrl` needs to be running inside a **[asyncio](https://docs.python.org/3/library/asyncio.html)** event loop.
 
 ```python
 import asyncio
-from vsslctrl import Vssl, Zone
+from vsslctrl import Vssl, DeviceModels, Zone, ZoneIDs
 
 async def main():
 	
 	# Represents a physical VSSL amplifier
 	vssl = Vssl()
 
+  """Optional to init Vssl with a device model
+
+    vssl = Vssl(DeviceModels.A3X)
+
+    If no DeviceModels is passed, vsslctrl will default to the feature set of the X series amps
+  """
+
 	# Add each you wish to control
-	zone1 = vssl.add_zone(Zone.IDs.ZONE_1, '192.168.1.10')
-	zone2 = vssl.add_zone(Zone.IDs.ZONE_2, '192.168.1.11')
-	zone3 = vssl.add_zone(Zone.IDs.ZONE_3, '192.168.1.12')
+	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
 
 	# Connect and initiate zones.
@@ -110,7 +118,7 @@ print(zone_name)
 | ---------------------- 	| ----------- | ----------- |
 | `sw_version`   			| Software version        |	`str` readonly
 | `serial`   			| Serial number        |	`str` readonly
-| `model_zone_qty`   			| Number of zones the device has        |	`int` readonly
+| `model`   			| Device Model        |	`int` readonly
 | `reboot()`   			| Reboot all zones        |	`func`  |
 
 ```python
@@ -152,7 +160,7 @@ vssl.settings.power.adaptive = True
 
 | Property      	| Description | Type		| Values 		| 
 | ---------------------- 	| ----------- | ----------- |----------- |
-| `id`     			 	| Zone number / ID |	`int` readonly	| `Zone.IDs`
+| `id`     			 	| Zone number / ID |	`int` readonly	| `ZoneIDs`
 | `host`   			| IP address        |	`str` readonly
 | `volume`   			| Volume        |	`int`  | `0...100`
 | `volume_raise([step=1])`   			| Raise volume by `step`       |	`func`  | step: `int` `1...100`
@@ -219,7 +227,7 @@ zone1.transport.state = ZoneTransport.States.PAUSE
 ## `Zone.track`
 
 * Not all sources have complete metadata - missing value will be set to defaults.
-* Airplay track position is not avaiable.
+* Airplay track `progress` is not avaiable.
 
 | Property      	| Description | Type		| Values 		| 
 | ---------------------- | ----------- | ----------- |----------- |
@@ -256,20 +264,20 @@ Working on A.3x but offically unsupported in x series amplifiers.
 
 | Property      	| Description | Type		| Values 		| 
 | ---------------------- 	| ----------- | ----------- |----------- |
-| `source`     			 	| Zone ID of group master / source |	`int` readonly	| `Zone.IDs`
+| `source`     			 	| Zone ID of group master / source |	`int` readonly	| `ZoneIDs`
 | `is_master`   			| This zone is the group master        |	`bool` readonly
-| `add_member()`   			| Add zone to group / create group |	`func`  | `Zone.IDs`
-| `remove_member()`   		| Remove zone from group      |	`func`  | `Zone.IDs`
+| `add_member()`   			| Add zone to group / create group |	`func`  | `ZoneIDs`
+| `remove_member()`   		| Remove zone from group      |	`func`  | `ZoneIDs`
 | `dissolve()`   			| Dissolve group / remove all members       |	`func`  |
 | `leave()`   				| Leave the group if a member       |	`func`  |
 
 ```python
 """Examples"""
 # Add group 2 to a group with zone 1 as master
-zone1.group.add_member(Zone.IDs.ZONE_2)
-# Remove zone 2 from group.
+zone1.group.add_member(ZoneIDs.ZONE_2)
+# Remove zone 2 from group
 zone2.group.leave() # or
-zone1.group.remove_member(Zone.IDs.ZONE_2)
+zone1.group.remove_member(ZoneIDs.ZONE_2)
 # If zone 1 is a master, remove all members
 zone1.group.dissolve()
 ```
@@ -371,6 +379,53 @@ EQ to be set in [decibel](https://en.wikipedia.org/wiki/Decibel) using a range `
 zone1.settings.eq.khz1_db = -2
 ```
 
+## 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
 
 The VSSL API was reverse engineered using Wireshark, VSSLs native "legacy" iOS app and their deprecated [vsslagent](https://vssl.gitbook.io/vssl-rest-api/getting-started/start).
@@ -382,6 +437,7 @@ The VSSL API was reverse engineered using Wireshark, VSSLs native "legacy" iOS a
 * 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 avaiable.
 * 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. Doesnt always function this way, depending on stream source
@@ -392,4 +448,5 @@ The VSSL API was reverse engineered using Wireshark, VSSLs native "legacy" iOS a
 * REST API / Web App
 * Save and recall EQ
 * A.1(x) coverage i.e Bluetooth
+* IR Control
 

vsslctrl-0.1.5.dev1.dist-info/RECORD

@@ -0,0 +1,23 @@
+vsslctrl/__init__.py,sha256=W7cljoE7L3DukAVr_TEqkxFycYrUbJiqaHrOlbPkmKU,145
+vsslctrl/api_alpha.py,sha256=wsrwc4owIlRZFJK40evdRDh-iY1ZOxuCjDfsy2xHlt8,33216
+vsslctrl/api_base.py,sha256=a80CRtUkYK2OwXQOL8bP-YOvt4YE-ALd-VONza_gjK8,9623
+vsslctrl/api_bravo.py,sha256=HW-toa38umSpKAij_zxyypsMoU8S_AXpAbBmAaRqgow,12196
+vsslctrl/core.py,sha256=cMMfrZzSDtIO2J3__EsA6aAWsGVuxSWkfkC8byXpQSY,8823
+vsslctrl/data_structure.py,sha256=RoOAB4VevWpiNJ-WdW3_s7onHTjLFenSzM2nLaV3vcA,7482
+vsslctrl/decorators.py,sha256=lG8cYSSA-fNvdcp_90lv58tj50bF6iPoigLKcucWSSI,1707
+vsslctrl/device.py,sha256=P4sYiibPPFp6iDuF93-OKIsWBL_9vtIxBPDc5uRwvbA,3418
+vsslctrl/discovery.py,sha256=81uA3rbm-X_CR0Q0LsCQJyCs7638Bb-mgqNZWqV_dq4,5572
+vsslctrl/event_bus.py,sha256=9liAEJnZfthJwy5O-qc3pDIWRBv5AcV19PjMCwH_niU,5014
+vsslctrl/exceptions.py,sha256=EEfNlu--9PMIidj3V3ZB8c7p3My8siqKw7YIOjPFaqE,419
+vsslctrl/group.py,sha256=B7lmJb6DIwXGnMyTKsp-JfRWVCVRFQYzlvS71tutfx4,5368
+vsslctrl/io.py,sha256=crzz5-vsdQfVFBL9a1Btle8mq5zx41SsVSt4N5cWPaE,6048
+vsslctrl/settings.py,sha256=6zZUf2y-JvmEz6aREMZqxjTptMtVJFO6dGkXdCxR1NU,16587
+vsslctrl/track.py,sha256=_lQNHYe8ZBm3v1lehFLjZruF5-Rz8PGWuQN-zISBgwc,10136
+vsslctrl/transport.py,sha256=XJFy0kl9y7hm3YV4_9ElBrq3u6--_k73UKJqKdO6Rqg,6993
+vsslctrl/utils.py,sha256=CqipPCffDjXCJ00NHAABOI886xRMyvnqkp4tr8i9uhg,1744
+vsslctrl/zone.py,sha256=5UOgIslYLxEnZ9cjQc5nCgJF1ENlLMsoKcbjORW3hQk,12721
+vsslctrl-0.1.5.dev1.dist-info/LICENSE,sha256=67Ekj8PIxjEvkPd7L3GYJ8dyvn1EC4sPM3q3FKtpN6w,1065
+vsslctrl-0.1.5.dev1.dist-info/METADATA,sha256=mB3khdgA1cwsCVMu1nr1L-RyA-38q-SiMOVWcPGzX6o,16557
+vsslctrl-0.1.5.dev1.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+vsslctrl-0.1.5.dev1.dist-info/top_level.txt,sha256=MRycO_RKageNX27UZ2bLJDMlfeWTQzUZlsd3hS-0u3Y,9
+vsslctrl-0.1.5.dev1.dist-info/RECORD,,

{vsslctrl-0.1.3.dev1.dist-info → vsslctrl-0.1.5.dev1.dist-info}/WHEEL

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

vsslctrl-0.1.3.dev1.dist-info/RECORD

@@ -1,22 +0,0 @@
-vsslctrl/__init__.py,sha256=8neULYocxQjushISE5_1ziZIWSxFWuf2vseXGcrEmmk,66
-vsslctrl/api_alpha.py,sha256=tgOG2vTth93HxAmtbDpXCOr1OcJ6dFsfyl3tSiqLMFU,33230
-vsslctrl/api_base.py,sha256=BpDjKTopnWr9UXTPxOywri_2ndfV7m0MYiFk1nz4514,8998
-vsslctrl/api_bravo.py,sha256=HW-toa38umSpKAij_zxyypsMoU8S_AXpAbBmAaRqgow,12196
-vsslctrl/core.py,sha256=_WoB5uiRwzP5vi27dWtRgcNcd0WsWIsCT7LoIrtMqfE,9443
-vsslctrl/data_structure.py,sha256=JYB8d96B49kj1XeSKisqCcBu723WcchlpC_-WDmOaaM,6557
-vsslctrl/decorators.py,sha256=lG8cYSSA-fNvdcp_90lv58tj50bF6iPoigLKcucWSSI,1707
-vsslctrl/discovery.py,sha256=81uA3rbm-X_CR0Q0LsCQJyCs7638Bb-mgqNZWqV_dq4,5572
-vsslctrl/event_bus.py,sha256=9liAEJnZfthJwy5O-qc3pDIWRBv5AcV19PjMCwH_niU,5014
-vsslctrl/exceptions.py,sha256=EEfNlu--9PMIidj3V3ZB8c7p3My8siqKw7YIOjPFaqE,419
-vsslctrl/group.py,sha256=xHCvKR7nEbZRkO-oE0xd9oAkA_Vv_gSMIRvzQ2t3v28,5091
-vsslctrl/io.py,sha256=UnuSNJeB8Mf1fy3GyrMVXaMhn7fIqnfVDtruwfxaC1M,5717
-vsslctrl/settings.py,sha256=nkW4SpsVhYL3Ep6T7z5j2yQ0viWXW7NIZ3anc2WfYpA,16570
-vsslctrl/track.py,sha256=_lQNHYe8ZBm3v1lehFLjZruF5-Rz8PGWuQN-zISBgwc,10136
-vsslctrl/transport.py,sha256=XJFy0kl9y7hm3YV4_9ElBrq3u6--_k73UKJqKdO6Rqg,6993
-vsslctrl/utils.py,sha256=CqipPCffDjXCJ00NHAABOI886xRMyvnqkp4tr8i9uhg,1744
-vsslctrl/zone.py,sha256=-Uqt0picOp9SEwZT0s4tM11kkmnvj3MkkYjOo7lqXtc,12901
-vsslctrl-0.1.3.dev1.dist-info/LICENSE,sha256=67Ekj8PIxjEvkPd7L3GYJ8dyvn1EC4sPM3q3FKtpN6w,1065
-vsslctrl-0.1.3.dev1.dist-info/METADATA,sha256=c6aeDgtbpFKzQGeSy-sa2mDS_9RKr4GiFFIx8I3cToY,14078
-vsslctrl-0.1.3.dev1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-vsslctrl-0.1.3.dev1.dist-info/top_level.txt,sha256=MRycO_RKageNX27UZ2bLJDMlfeWTQzUZlsd3hS-0u3Y,9
-vsslctrl-0.1.3.dev1.dist-info/RECORD,,