ableton-js 3.1.7 → 3.1.9

package/CHANGELOG.md

@@ -4,8 +4,23 @@ 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.1.9](https://github.com/leolabs/ableton.js/compare/v3.1.8...v3.1.9)
+
+- :bug: Fix issue that could block the main thread in Live sometimes when no client port file exists [`8990a5d`](https://github.com/leolabs/ableton.js/commit/8990a5d00e0ae3a314a385f6748be39dd87cde90)
+- :memo: Update the link to unofficial API docs [`7a32f90`](https://github.com/leolabs/ableton.js/commit/7a32f90d273a3ef05aac22105e253235b66a6c97)
+- :bug: Fix copying the scripts not working if the Remote Scripts folder doesn't exist yet [`71ecf44`](https://github.com/leolabs/ableton.js/commit/71ecf44aadb843509c4ad92b27ddd0b27badfda1)
+
+#### [v3.1.8](https://github.com/leolabs/ableton.js/compare/v3.1.7...v3.1.8)
+
+> 10 May 2023
+
+- :fire: Remove the postinstall hook [`d55efec`](https://github.com/leolabs/ableton.js/commit/d55efec00110398610d9f62457f5daa86293d985)
+- :bug: Fix type annotations which are unsupported in Live 10 [`b396684`](https://github.com/leolabs/ableton.js/commit/b3966844d1bf5f4d0f4c0d3b789b9386f82d7e72)
+
 #### [v3.1.7](https://github.com/leolabs/ableton.js/compare/v3.1.6...v3.1.7)
 
+> 27 April 2023
+
 - :mute: Don't clutter the logs by default [`333ff7b`](https://github.com/leolabs/ableton.js/commit/333ff7bf0a51bc3eace927a3b7ae0ff740ac616f)
 - :sparkles: Add the `appointed_device` property [`ae47bd2`](https://github.com/leolabs/ableton.js/commit/ae47bd2e0ed8b68f5bfab561709eab65238bce06)
 - :wrench: Copy the MIDI script into the User Library instead of into the app [`c4050d6`](https://github.com/leolabs/ableton.js/commit/c4050d664755fdae41152e9c376d91eea2071c94)

package/README.md

@@ -6,7 +6,7 @@ Ableton.js lets you control your instance or instances of Ableton using Node.js.
 It tries to cover as many functions as possible.
 
 This package is still a work-in-progress. My goal is to expose all of
-[Ableton's MIDI Remote Script](https://julienbayle.studio/PythonLiveAPI_documentation/Live10.0.2.xml)
+[Ableton's MIDI Remote Script](https://nsuspray.github.io/Live_API_Doc/11.0.0.xml)
 functions to TypeScript. If you'd like to contribute, please feel free to do so.
 
 ## Sponsored Message

package/midi-script/Interface.py

@@ -27,7 +27,7 @@ class Interface(object):
         self.socket = socket
         self.log_message = c_instance.log_message
 
-    def log_debug(self, message: str):
+    def log_debug(self, message):
         if DEBUG:
             self.log_message(message)
 

package/midi-script/Socket.py

@@ -37,6 +37,8 @@ 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()
@@ -46,6 +48,11 @@ class Socket(object):
                                           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 read_last_server_port(self):
         try:
             with open(server_port_path) as file:
@@ -60,6 +67,22 @@ class Socket(object):
 
     def read_remote_port(self):
         '''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
+        except Exception as e:
+            self.log_once("Couldn't stat remote port file: " + str(e.args))
+            return
+
         try:
             old_port = self._client_addr[1]
 
@@ -74,7 +97,7 @@ class Socket(object):
                     if self._socket:
                         self.send("connect", {"port": self._server_addr[1]})
         except Exception as e:
-            self.log_message("Couldn't read file: " + str(e.args))
+            self.log_once("Couldn't read remote port file: " + str(e.args))
 
     def shutdown(self):
         self.log_message("Shutting down...")
@@ -106,7 +129,7 @@ class Socket(object):
                     with open(server_port_path, "w") as file:
                         file.write(str(port))
             except Exception as e:
-                self.log_message("Couldn't save port in file: " + str(e.args))
+                self.log_once("Couldn't save port in file: " + str(e.args))
                 raise e
 
             try:
@@ -124,8 +147,8 @@ class Socket(object):
                 str(self._server_addr) + ': ' + \
                 str(e.args) + ', trying again. ' + \
                 'If this keeps happening, try restarting your computer.'
-            self.log_message(msg)
-            self.log_message("Client address: " + str(self._client_addr))
+            self.log_once(msg + "(Client address: " +
+                          str(self._client_addr) + ")")
             self.show_message(msg)
             t = Timer(5, self.init_socket)
             t.start()

package/midi-script/version.py

@@ -1 +1 @@
-version = "3.1.7"
+version = "3.1.9"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ableton-js",
-  "version": "3.1.7",
+  "version": "3.1.9",
   "description": "Control Ableton Live from Node",
   "main": "index.js",
   "author": "Leo Bernard <admin@leolabs.org>",
@@ -16,7 +16,7 @@
   ],
   "scripts": {
     "ableton:clean": "rm -f midi-script/AbletonJS/*.pyc",
-    "ableton:copy-script": "set -- ~/Music/Ableton/User\\ Library/Remote\\ Scripts && rm -rf \"$1/AbletonJS\" && cp -r \"$(pwd)/midi-script\" \"$1/AbletonJS\" && rm -rf \"$1/AbletonJS/_Framework\"",
+    "ableton:copy-script": "set -- ~/Music/Ableton/User\\ Library/Remote\\ Scripts && mkdir -p \"$1\" && rm -rf \"$1/AbletonJS\" && cp -r \"$(pwd)/midi-script\" \"$1/AbletonJS\" && rm -rf \"$1/AbletonJS/_Framework\"",
     "ableton10:launch": "set -- /Applications/Ableton*10* && open \"$1\"",
     "ableton11:launch": "set -- /Applications/Ableton*11* && open \"$1\"",
     "ableton:logs": "tail -n 50 -f ~/Library/Preferences/Ableton/*/Log.txt | grep -i -e RemoteScriptError -e RemoteScriptMessage",
@@ -24,7 +24,6 @@
     "ableton10:start": "yarn ableton:kill; yarn ableton:clean && yarn ableton:copy-script && yarn ableton10:launch && yarn ableton:logs",
     "ableton11:start": "yarn ableton:kill; yarn ableton:clean && yarn ableton:copy-script && yarn ableton11:launch && yarn ableton:logs",
     "prepublishOnly": "yarn build",
-    "postinstall": "node hooks/postinstall.js",
     "build:doc": "jsdoc2md --files src/**/*.ts --configure ./jsdoc2md.json > ./API.md",
     "version": "node hooks/prepublish.js && git add midi-script/version.py && auto-changelog -p -l 100 && git add CHANGELOG.md",
     "build": "tsc",
@@ -32,6 +31,7 @@
   },
   "devDependencies": {
     "@types/jest": "^26.0.23",
+    "@types/lodash": "^4.14.194",
     "@types/node": "^15.6.1",
     "@types/node-uuid": "^0.0.28",
     "@types/semver": "^7.3.6",
@@ -39,6 +39,7 @@
     "auto-changelog": "^2.3.0",
     "jest": "^27.0.3",
     "jest-extended": "^0.11.5",
+    "lodash": "^4.17.21",
     "p-all": "^3",
     "ts-jest": "^27.0.1",
     "ts-node": "^10.0.0",

package/hooks/postinstall.js

@@ -1,3 +0,0 @@
-console.warn(
-  "\x1b[33m🚨 Ableton.js changed the default ports from 9000 and 9001 to 9010 and 9011. Please update the Python plugin as well.\x1b[0m",
-);