ableton-js 3.2.2 → 3.2.4

package/CHANGELOG.md

@@ -4,8 +4,20 @@ 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.4](https://github.com/leolabs/ableton.js/compare/v3.2.3...v3.2.4)
+
+- :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)
+
+> 25 June 2023
+
+- :bug: Fix stray heartbeats emitting a disconnect event [`6157a95`](https://github.com/leolabs/ableton.js/commit/6157a952b766f4c9548e8752c12bde599ccc1a07)
+
 #### [v3.2.2](https://github.com/leolabs/ableton.js/compare/v3.2.1...v3.2.2)
 
+> 23 June 2023
+
 - :sparkles: Add a fallback `schedule_message` in case the Timer doesn't work as expected [`b5fdbe1`](https://github.com/leolabs/ableton.js/commit/b5fdbe12726d3c76a2fe74ec0fe0a731367fcb4f)
 
 #### [v3.2.1](https://github.com/leolabs/ableton.js/compare/v3.2.0...v3.2.1)

package/index.d.ts

@@ -102,7 +102,7 @@ export declare class Ableton extends EventEmitter implements ConnectionEventEmit
     private serverPortFile;
     private logger;
     private clientState;
-    private cancelDisconnectEvent;
+    private cancelDisconnectEvents;
     constructor(options?: AbletonOptions | undefined);
     private handleConnect;
     private handleDisconnect;

package/index.js

@@ -51,7 +51,7 @@ class Ableton extends events_1.EventEmitter {
     serverPortFile;
     logger;
     clientState = "closed";
-    cancelDisconnectEvent = false;
+    cancelDisconnectEvents = [];
     constructor(options) {
         super();
         this.options = options;
@@ -166,17 +166,26 @@ class Ableton extends events_1.EventEmitter {
         this.clientState = "started";
         this.handleConnect("start");
         const heartbeat = async () => {
+            // Add a cancel function to the array of heartbeats
+            let canceled = false;
+            const cancel = () => {
+                canceled = true;
+                this.logger?.debug("Cancelled heartbeat");
+            };
+            this.cancelDisconnectEvents.push(cancel);
             try {
                 await this.internal.get("ping");
                 this.handleConnect("heartbeat");
             }
             catch (e) {
-                if (!this.cancelDisconnectEvent) {
+                this.logger?.warn("Heartbeat failed:", { error: e, canceled });
+                // If the heartbeat has been canceled, don't emit a disconnect event
+                if (!canceled) {
                     this.handleDisconnect("heartbeat");
                 }
             }
             finally {
-                this.cancelDisconnectEvent = false;
+                this.cancelDisconnectEvents = this.cancelDisconnectEvents.filter((e) => e !== cancel);
             }
         };
         this.heartbeatInterval = setInterval(heartbeat, this.options?.heartbeatInterval ?? 2000);
@@ -254,7 +263,7 @@ class Ableton extends events_1.EventEmitter {
         if (data.event === "connect") {
             // If some heartbeat ping from the old connection is still pending,
             // cancel it to prevent a double disconnect/connect event.
-            this.cancelDisconnectEvent = true;
+            this.cancelDisconnectEvents.forEach((cancel) => cancel());
             if (data.data?.port && data.data?.port !== this.serverPort) {
                 this.logger?.info("Got new server port via connect:", {
                     port: data.data.port,

package/midi-script/Clip.py

@@ -13,6 +13,7 @@ class Clip(Interface):
             "id": clip_id,
             "name": clip.name,
             "color": clip.color,
+            "color_index": clip.color_index,
             "is_audio_clip": clip.is_audio_clip,
             "is_midi_clip": clip.is_midi_clip,
             "start_time": clip.start_time,

package/midi-script/Track.py

@@ -14,7 +14,14 @@ class Track(Interface):
             return None
 
         track_id = Interface.save_obj(track)
-        return {"id": track_id, "name": track.name, "color": track.color, "is_foldable": track.is_foldable, "is_grouped": track.is_grouped}
+        return {
+            "id": track_id,
+            "name": track.name,
+            "color": track.color,
+            "color_index": track.color_index,
+            "is_foldable": track.is_foldable,
+            "is_grouped": track.is_grouped
+        }
 
     @staticmethod
     def serialize_routing_channel(channel):

package/midi-script/version.py

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

package/package.json

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