ableton-js 2.1.6 → 2.2.0

package/CHANGELOG.md

@@ -4,8 +4,29 @@ 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).
 
+#### [v2.2.0](https://github.com/leolabs/ableton.js/compare/v2.1.8...v2.2.0)
+
+- :memo: Fix details in readme [`#36`](https://github.com/leolabs/ableton.js/pull/36)
+- :bug: Fix errors on quick disconnect/connect [`#42`](https://github.com/leolabs/ableton.js/pull/42)
+- :bug: Fix connected status on load of Ableton class [`#40`](https://github.com/leolabs/ableton.js/pull/40)
+- :wrench: Add GitHub repo to NPM page [`#39`](https://github.com/leolabs/ableton.js/pull/39)
+
+#### [v2.1.8](https://github.com/leolabs/ableton.js/compare/v2.1.7...v2.1.8)
+
+> 18 February 2022
+
+- :sparkles: Add observable props for quantization [`ffd192d`](https://github.com/leolabs/ableton.js/commit/ffd192d1590f33cdd18c2e01dbf66a0bc67878e4)
+
+#### [v2.1.7](https://github.com/leolabs/ableton.js/compare/v2.1.6...v2.1.7)
+
+> 3 February 2022
+
+- :label: Improve types for Ableton's song namespace [`05d24fa`](https://github.com/leolabs/ableton.js/commit/05d24fa28512d206e3eee8d83ecdbfd2f77e4dd0)
+
 #### [v2.1.6](https://github.com/leolabs/ableton.js/compare/v2.1.5...v2.1.6)
 
+> 30 January 2022
+
 - :sparkles: Return the is_grouped state of tracks as well [`15d8bca`](https://github.com/leolabs/ableton.js/commit/15d8bcad49ab0c4ea5f59aa5288e9c2954f29357)
 
 #### [v2.1.5](https://github.com/leolabs/ableton.js/compare/v2.1.4...v2.1.5)

package/README.md

@@ -22,8 +22,7 @@ get an overview of the current of your set.
 
 To use this library, you'll need to install and activate the MIDI Remote Script
 in Ableton.js. To do that, copy the `midi-script` folder of this repo to
-Ableton's Remote Scripts folder. If you prefer, you can rename it to something
-like `AbletonJS` for better identification. The MIDI Remote Scripts folder is
+Ableton's Remote Scripts folder and rename it to `AbletonJS`. The MIDI Remote Scripts folder is
 usually located at:
 
 - **Windows:** {path to Ableton}\Resources\MIDI\Remote Scripts
@@ -55,8 +54,8 @@ const test = async () => {
   ableton.song.addListener("is_playing", (p) => console.log("Playing:", p));
   ableton.song.addListener("tempo", (t) => console.log("Tempo:", t));
 
-  const cues = await ableton.get("cue_points");
-  console.log(cues.map((c) => c.raw));
+  const tempo = await ableton.song.get("tempo");
+  console.log(tempo);
 };
 
 test();

package/index.js

@@ -92,7 +92,7 @@ var Ableton = /** @class */ (function (_super) {
         _this.listenPort = listenPort;
         _this.msgMap = new Map();
         _this.eventListeners = new Map();
-        _this._isConnected = true;
+        _this._isConnected = false;
         _this.cancelConnectionEvent = false;
         _this.buffer = [];
         _this.latency = 0;
@@ -123,6 +123,7 @@ var Ableton = /** @class */ (function (_super) {
                         if (this._isConnected && !this.cancelConnectionEvent) {
                             this._isConnected = false;
                             this.eventListeners.clear();
+                            this.msgMap.forEach(function (msg) { return msg.clearTimeout(); });
                             this.msgMap.clear();
                             this.emit("disconnect", "heartbeat");
                         }
@@ -188,8 +189,9 @@ var Ableton = /** @class */ (function (_super) {
             return functionCallback.rej(new Error(data.data));
         }
         if (data.event === "disconnect") {
-            this.msgMap.clear();
             this.eventListeners.clear();
+            this.msgMap.forEach(function (msg) { return msg.clearTimeout(); });
+            this.msgMap.clear();
             if (this._isConnected === true) {
                 this._isConnected = false;
                 this.cancelConnectionEvent = true;
@@ -236,7 +238,7 @@ var Ableton = /** @class */ (function (_super) {
                             rej(new TimeoutError([
                                 "The command " + cls + "." + name + "(" + arg + ") timed out after " + timeout + " ms.",
                                 "Please make sure that Ableton is running and that you have the latest",
-                                "version of AbletonJS' midi script installed, listening on port",
+                                "version of AbletonJS' midi script installed and renamed to \"AbletonJS\", listening on port",
                                 _this.sendPort + " and sending on port " + _this.listenPort + ".",
                             ].join(" "), payload));
                         }, timeout);
@@ -248,6 +250,9 @@ var Ableton = /** @class */ (function (_super) {
                                 res(data);
                             },
                             rej: rej,
+                            clearTimeout: function () {
+                                clearTimeout(timeoutId);
+                            },
                         });
                         _this.sendRaw(msg);
                     })];

package/midi-script/Internal.py

@@ -10,4 +10,4 @@ class Internal(Interface):
         return self
 
     def get_version(self, ns):
-        return "2.1.6"
+        return "2.2.0"

package/ns/song.d.ts

@@ -5,13 +5,13 @@ import { CuePoint, RawCuePoint } from "./cue-point";
 import { SongView } from "./song-view";
 import { Scene, RawScene } from "./scene";
 export interface GettableProperties {
-    arrangement_overdub: number;
+    arrangement_overdub: boolean;
     back_to_arranger: number;
-    can_capture_midi: number;
-    can_jump_to_next_cue: number;
-    can_jump_to_prev_cue: number;
-    can_redo: number;
-    can_undo: number;
+    can_capture_midi: boolean;
+    can_jump_to_next_cue: boolean;
+    can_jump_to_prev_cue: boolean;
+    can_redo: boolean;
+    can_undo: boolean;
     clip_trigger_quantization: Quantization;
     count_in_duration: number;
     cue_points: RawCuePoint[];
@@ -22,17 +22,17 @@ export interface GettableProperties {
     is_counting_in: boolean;
     is_playing: boolean;
     last_event_time: number;
-    loop: number;
+    loop: boolean;
     loop_length: number;
     loop_start: number;
     master_track: RawTrack;
     metronome: number;
     midi_recording_quantization: RecordingQuantization;
-    nudge_down: number;
-    nudge_up: number;
-    overdub: number;
-    punch_in: number;
-    punch_out: number;
+    nudge_down: boolean;
+    nudge_up: boolean;
+    overdub: boolean;
+    punch_in: boolean;
+    punch_out: boolean;
     re_enable_automation_enabled: number;
     record_mode: number;
     return_tracks: RawTrack[];
@@ -60,7 +60,7 @@ export interface TransformedProperties {
     scenes: Scene[];
 }
 export interface SettableProperties {
-    arrangement_overdub: number;
+    arrangement_overdub: boolean;
     back_to_arranger: number;
     clip_trigger_quantization: Quantization;
     count_in_duration: number;
@@ -71,17 +71,17 @@ export interface SettableProperties {
     is_counting_in: boolean;
     is_playing: boolean;
     last_event_time: number;
-    loop: number;
+    loop: boolean;
     loop_length: number;
     loop_start: number;
     master_track: number;
     metronome: number;
     midi_recording_quantization: RecordingQuantization;
-    nudge_down: number;
-    nudge_up: number;
-    overdub: number;
-    punch_in: number;
-    punch_out: number;
+    nudge_down: boolean;
+    nudge_up: boolean;
+    overdub: boolean;
+    punch_in: boolean;
+    punch_out: boolean;
     re_enable_automation_enabled: number;
     record_mode: number;
     return_tracks: number;
@@ -99,11 +99,12 @@ export interface SettableProperties {
     visible_tracks: number;
 }
 export interface ObservableProperties {
-    arrangement_overdub: number;
+    arrangement_overdub: boolean;
     back_to_arranger: number;
-    can_capture_midi: number;
-    can_jump_to_next_cue: number;
-    can_jump_to_prev_cue: number;
+    can_capture_midi: boolean;
+    can_jump_to_next_cue: boolean;
+    can_jump_to_prev_cue: boolean;
+    clip_trigger_quantization: Quantization;
     count_in_duration: number;
     cue_points: number;
     current_song_time: number;
@@ -113,14 +114,15 @@ export interface ObservableProperties {
     is_counting_in: boolean;
     is_playing: boolean;
     loop_length: number;
-    loop: number;
+    loop: boolean;
     loop_start: number;
     metronome: number;
-    nudge_down: number;
-    nudge_up: number;
-    overdub: number;
-    punch_in: number;
-    punch_out: number;
+    midi_recording_quantization: RecordingQuantization;
+    nudge_down: boolean;
+    nudge_up: boolean;
+    overdub: boolean;
+    punch_in: boolean;
+    punch_out: boolean;
     re_enable_automation_enabled: number;
     record_mode: number;
     return_tracks: RawTrack[];

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "ableton-js",
-  "version": "2.1.6",
+  "version": "2.2.0",
   "description": "Control Ableton Live from Node",
   "main": "index.js",
   "author": "Leo Bernard <admin@leolabs.org>",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/leolabs/ableton-js.git"
+  },
   "files": [
     "**/*.js",
     "**/*.d.ts",