vsslctrl 0.1.4.dev1__tar.gz → 0.1.5.dev1__tar.gz

{vsslctrl-0.1.4.dev1 → vsslctrl-0.1.5.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vsslctrl
-Version: 0.1.4.dev1
+Version: 0.1.5.dev1
 Summary: Package for controlling VSSL amplifiers
 Author-email: vsslctrl <vsslcontrolled@proton.me>
 Classifier: Development Status :: 4 - Beta
@@ -32,6 +32,8 @@ 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
@@ -225,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 		| 
 | ---------------------- | ----------- | ----------- |----------- |
@@ -379,7 +381,7 @@ 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 ant network tool) on port `50002`.
+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 |
 | ---------------------- 	| ----------- |
@@ -435,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

{vsslctrl-0.1.4.dev1 → vsslctrl-0.1.5.dev1}/README.md

@@ -11,6 +11,8 @@ 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
@@ -204,7 +206,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 		| 
 | ---------------------- | ----------- | ----------- |----------- |
@@ -358,7 +360,7 @@ 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 ant network tool) on port `50002`.
+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 |
 | ---------------------- 	| ----------- |
@@ -414,6 +416,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

{vsslctrl-0.1.4.dev1 → vsslctrl-0.1.5.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vsslctrl"
-version = "0.1.4.dev1"
+version = "0.1.5.dev1"
 description = "Package for controlling VSSL amplifiers"
 authors = [
   { name="vsslctrl", email="vsslcontrolled@proton.me" },

{vsslctrl-0.1.4.dev1 → vsslctrl-0.1.5.dev1}/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-0.1.4.dev1 → vsslctrl-0.1.5.dev1}/vsslctrl/data_structure.py

@@ -43,12 +43,35 @@ class ZoneIDs(VsslIntEnum):
     ZONE_6 = 6
 
 
-""" 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"
+}
 """
 
 
@@ -69,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"
+}
 """
 
 
@@ -91,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"
+}
 """
 
 
@@ -116,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"
+}
 """
 
 
@@ -142,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-0.1.4.dev1 → vsslctrl-0.1.5.dev1}/vsslctrl/io.py

@@ -139,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

{vsslctrl-0.1.4.dev1 → vsslctrl-0.1.5.dev1}/vsslctrl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vsslctrl
-Version: 0.1.4.dev1
+Version: 0.1.5.dev1
 Summary: Package for controlling VSSL amplifiers
 Author-email: vsslctrl <vsslcontrolled@proton.me>
 Classifier: Development Status :: 4 - Beta
@@ -32,6 +32,8 @@ 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
@@ -225,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 		| 
 | ---------------------- | ----------- | ----------- |----------- |
@@ -379,7 +381,7 @@ 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 ant network tool) on port `50002`.
+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 |
 | ---------------------- 	| ----------- |
@@ -435,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