ableton-js 3.4.2 → 3.4.3

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.4.3](https://github.com/leolabs/ableton.js/compare/v3.4.2...v3.4.3)
+
+- :loud_sound: Improve error logging [`5c35106`](https://github.com/leolabs/ableton.js/commit/5c35106a2702fab9bc97ba377478cbc884041c93)
+- :bug: Fix issues with converting iterables to arrays in Live 10 [`2af2f25`](https://github.com/leolabs/ableton.js/commit/2af2f25453edabbc2a685f7358aa491eb1f79cfc)
+
 #### [v3.4.2](https://github.com/leolabs/ableton.js/compare/v3.4.1...v3.4.2)
 
+> 6 February 2024
+
 - :bug: Fix buffer size limit being too high on Windows [`0c6bc7d`](https://github.com/leolabs/ableton.js/commit/0c6bc7d4dbb6ff1972f210d6d4bc6a168e8d2ce1)
 - :bug: Mark `is_active` device property as read-only [`316f510`](https://github.com/leolabs/ableton.js/commit/316f51079e4fb7f407414485fd8b3cc47a0e9f1e)
 

package/midi-script/Interface.py

@@ -78,7 +78,8 @@ class Interface(object):
                 self.socket.send("error", "Function call failed: " + payload["name"] +
                                  " doesn't exist or isn't callable", uuid)
         except Exception as e:
-            logger.error("Handler Error: " + str(e.args))
+            logger.error("Handler Error:")
+            logger.exception(e)
             self.socket.send("error", str(e.args[0]), uuid)
 
     def add_listener(self, ns, prop, eventId, nsid="Default"):

package/midi-script/Socket.py

@@ -58,8 +58,8 @@ class Socket(object):
             logger.info("Stored server port: " + str(port))
             return port
         except Exception as e:
-            logger.info(
-                "Couldn't read stored server port: " + str(e.args))
+            logger.error("Couldn't read stored server port:")
+            logger.exception(e)
             return None
 
     def read_remote_port(self):
@@ -68,8 +68,7 @@ class Socket(object):
         try:
             os.stat(client_port_path)
         except Exception as e:
-            self.log_error_once(
-                "Couldn't stat remote port file: " + str(e.args))
+            self.log_error_once("Couldn't stat remote port file:")
             return
 
         try:
@@ -86,8 +85,7 @@ 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,15 +123,14 @@ 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.info("Couldn't send connect to " +
-                            str(self._client_addr) + ": " + str(e.args))
+                logger.error("Couldn't send connect to " + str(self._client_addr) + ":")
+                logger.exception(e)
 
             self.show_message("Started server on port " + str(port))
 
@@ -144,8 +141,7 @@ 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)
@@ -169,8 +165,11 @@ class Socket(object):
 
     def send(self, name, obj=None, uuid=None):
         def jsonReplace(o):
-            if isinstance(o, (map, Live.Base.FloatVector, Live.Base.IntVector, Live.Base.ObjectVector, Live.Base.StringVector, Live.Base.Vector)):
+            try:
                 return list(o)
+            except:
+                pass
+
             return str(o)
 
         data = None
@@ -180,12 +179,13 @@ class Socket(object):
                 {"event": name, "data": obj, "uuid": uuid}, default=jsonReplace, ensure_ascii=False)
             self._sendto(data)
         except socket.error as e:
-            logger.info("Socket error: " + str(e.args) + ", server: " + str(self._server_addr) +
-                        ", client: " + str(self._client_addr) + ", socket: " + str(self._socket))
-            logger.info("Data:" + data)
+            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("Data:" + data)
         except Exception as e:
-            error = str(type(e).__name__) + ': ' + str(e.args)
-            logger.info("Error " + name + "(" + str(uuid) + "): " + error)
+            logger.error("Error " + name + "(" + str(uuid) + "):")
+            logger.exception(e)
 
     def process(self):
         try:
@@ -204,9 +204,12 @@ class Socket(object):
                         self.input_handler(payload)
                         buffer = bytes()
                         num_messages = 0
+
         except socket.error as e:
             if (e.errno != 35 and e.errno != 10035 and e.errno != 10054):
-                logger.info("Socket error: " + str(e.args))
+                logger.error("Socket error:")
+                logger.exception(e)
             return
         except Exception as e:
-            logger.info("Error while processing: " + str(e.args))
+            logger.error("Error processing request:")
+            logger.exception(e)

package/midi-script/version.py

@@ -1 +1 @@
-version = "3.4.2"
+version = "3.4.3"

package/package.json

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