ableton-js 3.6.0 → 3.6.1

package/CHANGELOG.md

@@ -4,8 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v3.6.1](https://github.com/leolabs/ableton.js/compare/v3.6.0...v3.6.1)
+
+- :bug: Fix zlib expecting a string on Python 2 (Live 10) [`8480ab4`](https://github.com/leolabs/ableton.js/commit/8480ab4a5b6c253a905e1ba61de53d6728c68411)
+- :bug: Fix ableton-js not working with Live 10 anymore, due to syntax that Python 2 doesn't support [`04ba830`](https://github.com/leolabs/ableton.js/commit/04ba8309a4b7912c022aa604a90fed47a7a56ed9)
+
 #### [v3.6.0](https://github.com/leolabs/ableton.js/compare/v3.5.0...v3.6.0)
 
+> 16 January 2025
+
 - :label: Mark all raw object state as readonly [`ace0efd`](https://github.com/leolabs/ableton.js/commit/ace0efde39e5b598dd0a2878e0e29ecffedd495a)
 - :sparkles: Add options to override the caching mechanism [`85405d4`](https://github.com/leolabs/ableton.js/commit/85405d4be89bdc052f53bb862c5fe904620c554a)
 

package/midi-script/Session.py

@@ -21,7 +21,7 @@ class Session(Interface):
         """
         with self.controlSurface.component_guard():
             logger.info(
-                f"Setting up session box with {num_tracks} tracks and {num_scenes} scenes.")
+                "Setting up session box with " + str(num_tracks) + " tracks and " + str(num_scenes) + " scenes.")
             self.session = self.sessionComponent(num_tracks, num_scenes)
             self.session.set_offsets(0, 0)
             self.controlSurface.set_highlighting_session_component(
@@ -33,7 +33,7 @@ class Session(Interface):
         Sets the offset of the SessionComponent instance.
         """
         logger.info(
-            f"Moving session box offset to {track_offset} and {scene_offset}.")
+            "Moving session box offset to " + str(track_offset) + " and " + scene_offset + ".")
 
         if hasattr(self, 'session'):
             self.session.set_offsets(track_offset, scene_offset)

package/midi-script/Socket.py

@@ -4,6 +4,7 @@ import struct
 import zlib
 import os
 import tempfile
+import sys
 
 from .Logging import logger
 
@@ -87,7 +88,8 @@ class Socket(object):
                     if self._socket:
                         self.send("connect", {"port": self._server_addr[1]})
         except Exception as e:
-            self.log_error_once("Couldn't read remote port file: " + str(e.args))
+            self.log_error_once(
+                "Couldn't read remote port file: " + str(e.args))
 
     def shutdown(self):
         logger.info("Shutting down...")
@@ -125,13 +127,15 @@ class Socket(object):
                     with open(server_port_path, "w") as file:
                         file.write(str(port))
             except Exception as e:
-                self.log_error_once("Couldn't save port in file: " + str(e.args))
+                self.log_error_once(
+                    "Couldn't save port in file: " + str(e.args))
                 raise e
 
             try:
                 self.send("connect", {"port": self._server_addr[1]})
             except Exception as e:
-                logger.error("Couldn't send connect to " + str(self._client_addr) + ":")
+                logger.error("Couldn't send connect to " +
+                             str(self._client_addr) + ":")
                 logger.exception(e)
 
             self.show_message("Started server on port " + str(port))
@@ -143,7 +147,8 @@ class Socket(object):
                 str(self._server_addr) + ': ' + \
                 str(e.args) + ', trying again. ' + \
                 'If this keeps happening, try restarting your computer.'
-            self.log_error_once(msg + " (Client address: " + str(self._client_addr) + ")")
+            self.log_error_once(
+                msg + " (Client address: " + str(self._client_addr) + ")")
             self.show_message(msg)
             t = Live.Base.Timer(
                 callback=self.init_socket, interval=5000, repeat=False)
@@ -160,15 +165,18 @@ class Socket(object):
         message_id_byte = struct.pack("B", self._message_id)
 
         if len(compressed) < self._chunk_limit:
-            self._socket.sendto(message_id_byte + b'\x00\x01' + compressed, self._client_addr)
+            self._socket.sendto(
+                message_id_byte + b'\x00\x01' + compressed, self._client_addr)
         else:
             chunks = list(split_by_n(compressed, self._chunk_limit))
             count = len(chunks)
             count_byte = struct.pack("B", count)
             for i, chunk in enumerate(chunks):
-                logger.info("Sending packet " + str(self._message_id) + " - " + str(i) + "/" + str(count))
+                logger.info("Sending packet " + str(self._message_id) +
+                            " - " + str(i) + "/" + str(count))
                 packet_byte = struct.pack("B", i)
-                self._socket.sendto(message_id_byte + packet_byte + count_byte + chunk, self._client_addr)
+                self._socket.sendto(
+                    message_id_byte + packet_byte + count_byte + chunk, self._client_addr)
 
     def send(self, name, obj=None, uuid=None):
         def jsonReplace(o):
@@ -188,7 +196,8 @@ class Socket(object):
         except socket.error as e:
             logger.error("Socket error:")
             logger.exception(e)
-            logger.error("Server: " + str(self._server_addr) + ", client: " + str(self._client_addr) + ", socket: " + str(self._socket))
+            logger.error("Server: " + str(self._server_addr) + ", client: " +
+                         str(self._client_addr) + ", socket: " + str(self._socket))
             logger.error("Data:" + data)
         except Exception as e:
             logger.error("Error " + name + "(" + str(uuid) + "):")
@@ -205,7 +214,17 @@ class Socket(object):
                     if (data[0] == b'\xFF' or data[0] == 255):
                         packet = self._receive_buffer
                         self._receive_buffer = bytearray()
+
+                        # Handle Python 2/3 compatibility for zlib.decompress
+                        if sys.version_info[0] < 3:
+                            packet = str(packet)
+
                         unzipped = zlib.decompress(packet)
+
+                        # Handle bytes to string conversion for Python 3
+                        if sys.version_info[0] >= 3 and isinstance(unzipped, bytes):
+                            unzipped = unzipped.decode('utf-8')
+
                         payload = json.loads(unzipped)
                         self.input_handler(payload)
 

package/midi-script/version.py

@@ -1 +1 @@
-version = "3.6.0"
+version = "3.6.1"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ableton-js",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Control Ableton Live from Node",
   "main": "index.js",
   "author": "Leo Bernard <admin@leolabs.org>",