ableton-js 2.5.3 → 2.5.4

package/CHANGELOG.md

@@ -4,8 +4,16 @@ 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).
 
+#### [v2.5.4](https://github.com/leolabs/ableton.js/compare/v2.5.3...v2.5.4)
+
+- :sparkles: Restart the socket when a message can't be sent due to a socket error [`91294c3`](https://github.com/leolabs/ableton.js/commit/91294c3cf195afacd22cbf1863e244bc231c9a33)
+- :sparkles: Send the UUID back with the error if a requested namespace handler doesn't exist [`8a96a99`](https://github.com/leolabs/ableton.js/commit/8a96a996b8b65c8485d90ac98293ccd605497784)
+- :memo: Add an example for setting a value [`f334983`](https://github.com/leolabs/ableton.js/commit/f334983a8755eab8415383aae7aff1ecff6e23e2)
+
 #### [v2.5.3](https://github.com/leolabs/ableton.js/compare/v2.5.2...v2.5.3)
 
+> 30 August 2022
+
 - :memo: Fix some typos in the readme [`10c8566`](https://github.com/leolabs/ableton.js/commit/10c8566758bc1a7e7ab6bc20fa269d38474e1d96)
 - :sparkles: Add support for observing the `muted` prop of clips [`ecb604a`](https://github.com/leolabs/ableton.js/commit/ecb604a2b25aa3a064ffe5d199d44cfca0c12144)
 

package/README.md

@@ -51,11 +51,16 @@ import { Ableton } from "ableton-js";
 const ableton = new Ableton();
 
 const test = async () => {
+  // Observe the current playback state and tempo
   ableton.song.addListener("is_playing", (p) => console.log("Playing:", p));
   ableton.song.addListener("tempo", (t) => console.log("Tempo:", t));
 
+  // Get the current tempo
   const tempo = await ableton.song.get("tempo");
   console.log(tempo);
+  
+  // Set the tempo
+  await ableton.song.set("tempo", 85);
 };
 
 test();

package/midi-script/AbletonJS.py

@@ -54,9 +54,11 @@ class AbletonJS(ControlSurface):
         script_handle = self._c_instance.handle()
         for midi in self.tracked_midi:
             if midi[0] == "cc":
-                Live.MidiMap.forward_midi_cc(script_handle, midi_map_handle, midi[1], midi[2])
+                Live.MidiMap.forward_midi_cc(
+                    script_handle, midi_map_handle, midi[1], midi[2])
             elif midi[0] == "note":
-                Live.MidiMap.forward_midi_note(script_handle, midi_map_handle, midi[1], midi[2])
+                Live.MidiMap.forward_midi_note(
+                    script_handle, midi_map_handle, midi[1], midi[2])
 
     def receive_midi(self, midi_bytes):
         self.handlers["midi"].send_midi(midi_bytes)
@@ -77,4 +79,5 @@ class AbletonJS(ControlSurface):
             handler = self.handlers[namespace]
             handler.handle(payload)
         else:
-            self.socket.send("error", "No handler for NS " + str(namespace))
+            self.socket.send("error", "No handler for namespace " +
+                             str(namespace), payload["uuid"])

package/midi-script/Internal.py

@@ -10,4 +10,4 @@ class Internal(Interface):
         return self
 
     def get_version(self, ns):
-        return "2.5.3"
+        return "2.5.4"

package/midi-script/Socket.py

@@ -24,16 +24,20 @@ class Socket(object):
 
     def __init__(self, handler, remotehost='127.0.0.1', remoteport=39031, localhost='127.0.0.1', localport=39041):
         self.input_handler = handler
+        self._local_addr = (localhost, localport)
+        self._remote_addr = (remotehost, remoteport)
+        self.init_socket()
 
+    def init_socket(self):
         self._socket = socket.socket(
             socket.AF_INET, socket.SOCK_DGRAM)
         self._socket.setblocking(0)
 
-        self._local_addr = (localhost, localport)
-        self._remote_addr = (remotehost, remoteport)
-
         self.bind()
 
+    def shutdown(self):
+        self._socket.close()
+
     def bind(self):
         try:
             self._socket.bind(self._local_addr)
@@ -70,15 +74,14 @@ class Socket(object):
         try:
             self._sendto(json.dumps(
                 {"event": name, "data": obj, "uuid": uuid}, default=jsonReplace, ensure_ascii=False))
+        except socket.error as e:
+            self.log_message("Socket error: " + str(e.args))
+            self.log_message("Restarting socket...")
+            self.shutdown()
+            self.init_socket()
         except Exception as e:
             error = str(type(e).__name__) + ': ' + str(e.args)
-            self._sendto(json.dumps(
-                {"event": "error", "data": error, "uuid": uuid}, default=jsonReplace, ensure_ascii=False))
-            self.log_message("Socket Error " + name +
-                             "(" + str(uuid) + "): " + str(e))
-
-    def shutdown(self):
-        self._socket.close()
+            self.log_message("Error " + name + "(" + str(uuid) + "): " + error)
 
     def process(self):
         try:
@@ -91,12 +94,9 @@ class Socket(object):
                     num_messages += 1
 
                     # \xFF for Live 10 (Python2) and 255 for Live 11 (Python3)
-                    if(data[0] == b'\xFF' or data[0] == 255):
+                    if (data[0] == b'\xFF' or data[0] == 255):
                         unzipped = zlib.decompress(buffer)
                         payload = json.loads(unzipped)
-
-                        self.log_message(
-                            "Receiving from " + str(num_messages) + " messages, " + str(len(buffer)) + " bytes: " + str(payload))
                         self.input_handler(payload)
                         buffer = bytes()
                         num_messages = 0

package/package.json

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