ableton-js 3.2.4 → 3.2.6

package/CHANGELOG.md

@@ -4,8 +4,22 @@ 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.2.6](https://github.com/leolabs/ableton.js/compare/v3.2.5...v3.2.6)
+
+- :bug: Fix Live 11.3.3 hanging in some scenarios [`f3933b1`](https://github.com/leolabs/ableton.js/commit/f3933b1b714d1d87a1e4952bc142d017d513242b)
+- :mute: Make logging less noisy when the heartbeat to Live fails [`2f46968`](https://github.com/leolabs/ableton.js/commit/2f46968db10ce82288fb221d5c6e22e5fb0c6972)
+- :loud_sound: Truncate arguments in the error message when a command times out [`8bd0a9c`](https://github.com/leolabs/ableton.js/commit/8bd0a9cd7f1b4864e163fd22d87997f0d1c3dc30)
+
+#### [v3.2.5](https://github.com/leolabs/ableton.js/compare/v3.2.4...v3.2.5)
+
+> 27 June 2023
+
+- :label: Add missing types for color_index props [`23e0edb`](https://github.com/leolabs/ableton.js/commit/23e0edb13e2972264b8748afa2bcb31a94d47348)
+
 #### [v3.2.4](https://github.com/leolabs/ableton.js/compare/v3.2.3...v3.2.4)
 
+> 27 June 2023
+
 - :sparkles: Add `color_index` to the raw props of clips and tracks [`fc6f38d`](https://github.com/leolabs/ableton.js/commit/fc6f38dbcf0a2293f1cd774656a42cdd2ca6f4fc)
 
 #### [v3.2.3](https://github.com/leolabs/ableton.js/compare/v3.2.2...v3.2.3)

package/index.js

@@ -7,6 +7,7 @@ exports.getPackageVersion = exports.Ableton = exports.TimeoutError = void 0;
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const dgram_1 = __importDefault(require("dgram"));
+const lodash_1 = require("lodash");
 const events_1 = require("events");
 const uuid_1 = require("uuid");
 const semver_1 = __importDefault(require("semver"));
@@ -114,23 +115,10 @@ class Ableton extends events_1.EventEmitter {
         this.client.addListener("listening", async () => {
             const port = this.client?.address().port;
             this.logger?.info("Client is bound and listening", { port });
-            // Write used port to a file so Live can read from it
+            // Write used port to a file so Live can read from it on startup
             await (0, promises_1.writeFile)(this.clientPortFile, String(port));
         });
-        try {
-            // Try binding to the port that was used last for better start performance
-            this.logger?.info("Checking if a stored port exists", {
-                file: this.clientPortFile,
-            });
-            const clientPort = await (0, promises_1.readFile)(this.clientPortFile);
-            const port = Number(clientPort.toString());
-            this.logger?.info("Trying to bind to the most recent port", { port });
-            this.client.bind(port, "127.0.0.1");
-        }
-        catch (error) {
-            this.logger?.info("Couldn't bind to last port, binding to any free port instead", { error });
-            this.client.bind(undefined, "127.0.0.1");
-        }
+        this.client.bind(undefined, "127.0.0.1");
         // Wait for the server port file to exist
         await new Promise(async (res) => {
             try {
@@ -139,7 +127,9 @@ class Ableton extends events_1.EventEmitter {
                 this.logger?.info("Server port:", { port: this.serverPort });
                 res();
             }
-            catch (e) { }
+            catch (e) {
+                this.logger?.info("Server doesn't seem to be online yet, waiting for it to go online...");
+            }
             // Set up a watcher in case the server port changes
             (0, fs_1.watchFile)(this.serverPortFile, async (curr) => {
                 if (curr.isFile()) {
@@ -153,6 +143,16 @@ class Ableton extends events_1.EventEmitter {
                 }
             });
         });
+        // Send used port to Live in case the plugin is already started
+        try {
+            const port = this.client.address().port;
+            this.logger?.info("Sending port to Live:", { port });
+            const result = await this.setProp("internal", "", "client_port", port);
+            this.logger?.info("Got response from Live:", { port, result });
+        }
+        catch (e) {
+            this.logger?.info("Live doesn't seem to be loaded yet, waiting...");
+        }
         this.logger?.info("Checking connection...");
         const connection = this.waitForConnection();
         if (timeoutMs) {
@@ -178,9 +178,9 @@ class Ableton extends events_1.EventEmitter {
                 this.handleConnect("heartbeat");
             }
             catch (e) {
-                this.logger?.warn("Heartbeat failed:", { error: e, canceled });
                 // If the heartbeat has been canceled, don't emit a disconnect event
-                if (!canceled) {
+                if (!canceled && this._isConnected) {
+                    this.logger?.warn("Heartbeat failed:", { error: e, canceled });
                     this.handleDisconnect("heartbeat");
                 }
             }
@@ -296,7 +296,7 @@ class Ableton extends events_1.EventEmitter {
             const msg = JSON.stringify(payload);
             const timeout = this.options?.commandTimeoutMs ?? 2000;
             const timeoutId = setTimeout(() => {
-                const arg = JSON.stringify(command.args);
+                const arg = (0, lodash_1.truncate)(JSON.stringify(command.args), { length: 100 });
                 const cls = command.nsid
                     ? `${command.ns}(${command.nsid})`
                     : command.ns;

package/midi-script/Internal.py

@@ -15,3 +15,7 @@ class Internal(Interface):
 
     def get_version(self, ns):
         return version
+
+    def set_client_port(self, nsid, port):
+        self.socket.set_client_port(port)
+        return True

package/midi-script/Socket.py

@@ -19,8 +19,8 @@ def split_by_n(seq, n):
 server_port_file = "ableton-js-server.port"
 client_port_file = "ableton-js-client.port"
 
-client_port_path = os.path.join(tempfile.gettempdir(), client_port_file)
 server_port_path = os.path.join(tempfile.gettempdir(), server_port_file)
+client_port_path = os.path.join(tempfile.gettempdir(), client_port_file)
 
 
 class Socket(object):
@@ -37,22 +37,22 @@ class Socket(object):
         self.input_handler = handler
         self._server_addr = ("127.0.0.1", 0)
         self._client_addr = ("127.0.0.1", 39031)
-        self._port_file_last_modified = 0
         self._last_error = ""
         self._socket = None
 
         self.read_remote_port()
         self.init_socket(True)
 
-        self.file_timer = Live.Base.Timer(callback=self.read_remote_port,
-                                          interval=1000, repeat=True)
-        self.file_timer.start()
-
     def log_once(self, msg):
         if self._last_error != msg:
             self._last_error = msg
             self.log_message(msg)
 
+    def set_client_port(self, port):
+        self.log_message("Setting client port: ", str(port))
+        self.show_message("Client connected on port " + str(port))
+        self._client_addr = ("127.0.0.1", int(port))
+
     def read_last_server_port(self):
         try:
             with open(server_port_path) as file:
@@ -69,16 +69,7 @@ class Socket(object):
         '''Reads the port our client is listening on'''
 
         try:
-            file = os.stat(client_port_path)
-
-            print("Client port file modified: " + str(file.st_mtime) +
-                  " – last: " + str(self._port_file_last_modified))
-
-            if file.st_mtime > self._port_file_last_modified:
-                self._port_file_last_modified = file.st_mtime
-            else:
-                # If the file hasn't changed, don't try to open it
-                return
+            os.stat(client_port_path)
         except Exception as e:
             self.log_once("Couldn't stat remote port file: " + str(e.args))
             return
@@ -101,7 +92,6 @@ class Socket(object):
 
     def shutdown(self):
         self.log_message("Shutting down...")
-        self.file_timer.stop()
         self._socket.close()
 
     def init_socket(self, try_stored=False):

package/midi-script/version.py

@@ -1 +1 @@
-version = "3.2.4"
+version = "3.2.6"

package/ns/clip.d.ts

@@ -138,6 +138,7 @@ export interface RawClip {
     id: string;
     name: string;
     color: number;
+    color_index: number;
     is_audio_clip: boolean;
     is_midi_clip: boolean;
     start_time: number;

package/ns/track.d.ts

@@ -143,6 +143,7 @@ export interface RawTrack {
     id: string;
     name: string;
     color: number;
+    color_index: number;
     is_foldable: boolean;
     is_grouped: boolean;
 }

package/package.json

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