ableton-js 3.1.5 → 3.1.7

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.1.7](https://github.com/leolabs/ableton.js/compare/v3.1.6...v3.1.7)
+
+- :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)
+
+#### [v3.1.6](https://github.com/leolabs/ableton.js/compare/v3.1.5...v3.1.6)
+
+> 6 April 2023
+
+- :bug: Fix an issue with Live 10 where umlauts in a cached response would throw an error [`f4f6a20`](https://github.com/leolabs/ableton.js/commit/f4f6a20e30d9a0c97e585a12799255cbd769c240)
+
 #### [v3.1.5](https://github.com/leolabs/ableton.js/compare/v3.1.4...v3.1.5)
 
+> 16 March 2023
+
 - :zap: Try binding to the last used port first to speed up the connection to Live [`b86bc5d`](https://github.com/leolabs/ableton.js/commit/b86bc5d2b2872b030978a87cc3b001e2e997722d)
 - :memo: Add logging to the example code [`7b5dfbf`](https://github.com/leolabs/ableton.js/commit/7b5dfbf5beb8140588211a4b54c970e48f9980c9)
 - :bug: Don't emit an error when a received message can't be assigned to any request [`3186bdb`](https://github.com/leolabs/ableton.js/commit/3186bdbdc6cb1190d9d2de1f29905fed6e5030dd)

package/midi-script/AbletonJS.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 from .version import version
+from .Config import DEBUG
 from .Socket import Socket
 from .Interface import Interface
 from .Application import Application
@@ -80,7 +81,7 @@ class AbletonJS(ControlSurface):
         namespace = payload["ns"]
 
         # Don't clutter the logs
-        if not (namespace == "internal" and payload["name"] == "get_prop" and payload["args"]["prop"] == "ping"):
+        if not (namespace == "internal" and payload["name"] == "get_prop" and payload["args"]["prop"] == "ping") and DEBUG:
             self.log_message("Received command: " + str(payload))
 
         if namespace in self.handlers:

package/midi-script/Config.py

@@ -0,0 +1 @@
+DEBUG = False

package/midi-script/Interface.py

@@ -1,6 +1,8 @@
 import hashlib
 import json
 
+from .Config import DEBUG
+
 
 class Interface(object):
     obj_ids = dict()
@@ -25,6 +27,10 @@ class Interface(object):
         self.socket = socket
         self.log_message = c_instance.log_message
 
+    def log_debug(self, message: str):
+        if DEBUG:
+            self.log_message(message)
+
     def get_ns(self, nsid):
         return Interface.obj_ids[nsid]
 
@@ -36,8 +42,8 @@ class Interface(object):
         def jsonReplace(o):
             return str(o)
 
-        hash = hashlib.md5(json.dumps(
-            result, default=jsonReplace, ensure_ascii=False).encode()).hexdigest()
+        response = json.dumps(result, default=jsonReplace, ensure_ascii=False)
+        hash = hashlib.md5(response.encode("utf-8", "replace")).hexdigest()
 
         if hash == etag:
             return self.socket.send("result", {"__cached": True}, uuid)
@@ -72,6 +78,7 @@ class Interface(object):
                 self.socket.send("error", "Function call failed: " + payload["name"] +
                                  " doesn't exist or isn't callable", uuid)
         except Exception as e:
+            self.log_message("Handler Error: " + str(e.args))
             self.socket.send("error", str(e.args[0]), uuid)
 
     def add_listener(self, ns, prop, eventId, nsid="Default"):
@@ -81,24 +88,25 @@ class Interface(object):
             raise Exception("Listener " + str(prop) + " does not exist.")
 
         key = str(nsid) + ":" + prop
-        self.log_message("Listener key: " + key)
+        self.log_debug("Listener key: " + key)
+
         if key in self.listeners:
-            self.log_message("Key already has a listener")
+            self.log_debug("Key already has a listener")
             return self.listeners[key]["id"]
 
         def fn():
             value = self.get_prop(ns, prop)
             return self.socket.send(eventId, value)
 
-        self.log_message("Attaching listener: " +
-                         key + ", event ID: " + eventId)
+        self.log_debug("Attaching listener: " +
+                       key + ", event ID: " + eventId)
         add_fn(fn)
         self.listeners[key] = {"id": eventId, "fn": fn}
         return eventId
 
     def remove_listener(self, ns, prop, nsid="Default"):
         key = str(nsid) + ":" + prop
-        self.log_message("Remove key: " + key)
+        self.log_debug("Remove key: " + key)
         if key not in self.listeners:
             raise Exception("Listener " + str(prop) + " does not exist.")
 

package/midi-script/Song.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 from .Interface import Interface
 from .CuePoint import CuePoint
+from .Device import Device
 from .Scene import Scene
 from .Track import Track
 
@@ -29,6 +30,9 @@ class Song(Interface):
         sorted_points = sorted(ns.cue_points, key=lambda cue: cue.time)
         return map(CuePoint.serialize_cue_point, sorted_points)
 
+    def get_appointed_device(self, ns):
+        return Device.serialize_device(ns.appointed_device)
+
     def get_master_track(self, ns):
         return Track.serialize_track(ns.master_track)
 
@@ -53,3 +57,6 @@ class Song(Interface):
     def get_current_smpte_song_time(self, ns, timeFormat):
         time = ns.get_current_smpte_song_time(timeFormat)
         return {'hours': time.hours, 'minutes': time.minutes, 'seconds': time.seconds, 'frames': time.frames}
+
+    def set_appointed_device(self, ns, device_id):
+        ns.appointed_device = Interface.get_obj(device_id)

package/midi-script/version.py

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

package/ns/song.d.ts

@@ -4,7 +4,9 @@ import { Track, RawTrack } from "./track";
 import { CuePoint, RawCuePoint } from "./cue-point";
 import { SongView } from "./song-view";
 import { Scene, RawScene } from "./scene";
+import { RawDevice } from "./device";
 export interface GettableProperties {
+    appointed_device: RawDevice;
     arrangement_overdub: boolean;
     back_to_arranger: number;
     can_capture_midi: boolean;
@@ -60,6 +62,7 @@ export interface TransformedProperties {
     scenes: Scene[];
 }
 export interface SettableProperties {
+    appointed_device: string;
     arrangement_overdub: boolean;
     back_to_arranger: number;
     clip_trigger_quantization: Quantization;
@@ -99,6 +102,7 @@ export interface SettableProperties {
     visible_tracks: number;
 }
 export interface ObservableProperties {
+    appointed_device: RawDevice;
     arrangement_overdub: boolean;
     back_to_arranger: number;
     can_capture_midi: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ableton-js",
-  "version": "3.1.5",
+  "version": "3.1.7",
   "description": "Control Ableton Live from Node",
   "main": "index.js",
   "author": "Leo Bernard <admin@leolabs.org>",
@@ -16,14 +16,13 @@
   ],
   "scripts": {
     "ableton:clean": "rm -f midi-script/AbletonJS/*.pyc",
-    "ableton10:copy-script": "set -- /Applications/Ableton*10*/Contents/App-Resources/MIDI\\ 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 && 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:copy-script": "set -- /Applications/Ableton*11*/Contents/App-Resources/MIDI\\ Remote\\ Scripts && rm -rf \"$1/AbletonJS\" && cp -r \"$(pwd)/midi-script\" \"$1/AbletonJS\" && rm -rf \"$1/AbletonJS/_Framework\"",
     "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",
     "ableton:kill": "pkill -KILL -f \"Ableton Live\"",
-    "ableton10:start": "yarn ableton:kill; yarn ableton:clean && yarn ableton10:copy-script && yarn ableton10:launch && yarn ableton:logs",
-    "ableton11:start": "yarn ableton:kill; yarn ableton:clean && yarn ableton11:copy-script && yarn ableton11:launch && yarn ableton:logs",
+    "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",