ableton-js 3.2.7 → 3.2.9

package/CHANGELOG.md

@@ -4,8 +4,21 @@ 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.9](https://github.com/leolabs/ableton.js/compare/v3.2.8...v3.2.9)
+
+- :sparkles: Only send the client port to Live once [`29e9443`](https://github.com/leolabs/ableton.js/commit/29e9443194294f5b55805df909d234b67e52eca2)
+- :sparkles: Send the current client port to Live every time the server port changes [`eb42ce3`](https://github.com/leolabs/ableton.js/commit/eb42ce32f4fa91bd57e4c026a7d29d961afa0a04)
+
+#### [v3.2.8](https://github.com/leolabs/ableton.js/compare/v3.2.7...v3.2.8)
+
+> 14 July 2023
+
+- :wrench: Make fast polling optional, in an attempt to fix flaky behavior in Live 11.3 [`17f1634`](https://github.com/leolabs/ableton.js/commit/17f16342896f5f1989ef7f5147a7b3fce1e924fa)
+
 #### [v3.2.7](https://github.com/leolabs/ableton.js/compare/v3.2.6...v3.2.7)
 
+> 6 July 2023
+
 - :white_check_mark: Switch from Jest to Vitest for faster testing [`d2af8b7`](https://github.com/leolabs/ableton.js/commit/d2af8b756ff9dfe2d76927d2695fba55226ab480)
 - :mute: Don't log the result of setting the client port [`2206ab7`](https://github.com/leolabs/ableton.js/commit/2206ab74afc9d2388059d88a863dc8e5eed5a32f)
 - :sparkles: When client is already starting or started, return a promise that waits for a connection [`97c2e1a`](https://github.com/leolabs/ableton.js/commit/97c2e1a81cbe3e8e7ee2f8ef7d349903b728e67e)

package/index.js

@@ -120,12 +120,12 @@ class Ableton extends events_1.EventEmitter {
         });
         this.client.bind(undefined, "127.0.0.1");
         // Wait for the server port file to exist
-        await new Promise(async (res) => {
+        const sentPort = await new Promise(async (res) => {
             try {
                 const serverPort = await (0, promises_1.readFile)(this.serverPortFile);
                 this.serverPort = Number(serverPort.toString());
                 this.logger?.info("Server port:", { port: this.serverPort });
-                res();
+                res(false);
             }
             catch (e) {
                 this.logger?.info("Server doesn't seem to be online yet, waiting for it to go online...");
@@ -138,19 +138,33 @@ class Ableton extends events_1.EventEmitter {
                     if (!isNaN(newPort) && newPort !== this.serverPort) {
                         this.logger?.info("Server port changed:", { port: newPort });
                         this.serverPort = Number(serverPort.toString());
+                        if (this.client) {
+                            try {
+                                const port = this.client.address().port;
+                                this.logger?.info("Sending port to Live:", { port });
+                                await this.setProp("internal", "", "client_port", port);
+                                res(true);
+                                return;
+                            }
+                            catch (e) {
+                                this.logger?.info("Sending port to Live failed", { e });
+                            }
+                        }
                     }
-                    res();
+                    res(false);
                 }
             });
         });
         // 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 });
-            await this.setProp("internal", "", "client_port", port);
-        }
-        catch (e) {
-            this.logger?.info("Live doesn't seem to be loaded yet, waiting...");
+        if (!sentPort) {
+            try {
+                const port = this.client.address().port;
+                this.logger?.info("Sending port to Live:", { port });
+                await this.setProp("internal", "", "client_port", port);
+            }
+            catch (e) {
+                this.logger?.info("Live doesn't seem to be loaded yet, waiting...");
+            }
         }
         this.logger?.info("Checking connection...");
         const connection = this.waitForConnection();

package/midi-script/AbletonJS.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from .version import version
-from .Config import DEBUG
+from .Config import DEBUG, FAST_POLLING
 from .Socket import Socket
 from .Interface import Interface
 from .Application import Application
@@ -51,12 +51,14 @@ class AbletonJS(ControlSurface):
             "clip": Clip(c_instance, self.socket),
         }
 
-        self.recv_loop = Live.Base.Timer(
-            callback=self.socket.process, interval=10, repeat=True)
-
-        self.recv_loop.start()
         self.tick()
 
+        if FAST_POLLING:
+            self.recv_loop = Live.Base.Timer(
+                callback=self.socket.process, interval=10, repeat=True)
+
+            self.recv_loop.start()
+
     def tick(self):
         self.socket.process()
         self.schedule_message(1, self.tick)
@@ -76,7 +78,8 @@ class AbletonJS(ControlSurface):
 
     def disconnect(self):
         self.log_message("Disconnecting")
-        self.recv_loop.stop()
+        if FAST_POLLING:
+            self.recv_loop.stop()
         self.socket.send("disconnect")
         self.socket.shutdown()
         Interface.listeners.clear()

package/midi-script/Config.py

@@ -1 +1,3 @@
 DEBUG = False
+
+FAST_POLLING = False

package/midi-script/version.py

@@ -1 +1 @@
-version = "3.2.7"
+version = "3.2.9"

package/package.json

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