midi-audio-player 2.0.0 → 2.0.2

package/dist/index.js

@@ -7,11 +7,11 @@
 	██║ ╚═╝ ██║██║██████╔╝██║██║  ██║╚██████╔╝██████╔╝██║╚██████╔╝██║     ███████╗██║  ██║   ██║   ███████╗██║  ██║
 	╚═╝     ╚═╝╚═╝╚═════╝ ╚═╝╚═╝  ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═════╝ ╚═╝     ╚══════╝╚═╝  ╚═╝   ╚═╝   ╚══════╝╚═╝  ╚═╝
 
-	Version: 2.0.0
-	Build:   2026-05-29 17:16:44
+	Version: 2.0.2
+	Build:   2026-06-02 12:19:59
 	Author:  Maxime Larrivée-Roy <mlarriveeroy@gmail.com>
 	Github:  https://github.com/webaudiofonts/midi-audio-player/
-	Website: https://webaudiofonts.github.io/midi-audio-player/
+	Website: https://webaudiofonts.com/midiaudioplayer/
 
 */
 
@@ -1213,7 +1213,7 @@ var index = {
 };
 
 // node_modules/webaudiofontplayer/dist/index.js
-var WebAudioFontPlayer = class {
+var WebAudioFontPlayer = class _WebAudioFontPlayer {
   #audioCtx = null;
   #compressor = null;
   #preset = null;
@@ -1228,24 +1228,34 @@ var WebAudioFontPlayer = class {
   #sustain = false;
   #pitchBendValue = 8192;
   #notesWaitingForSustain = /* @__PURE__ */ new Set();
-  constructor(preset, audioCtx, compressor = null) {
+  constructor(preset, audioCtx, compressor = null, callback = null) {
     this.#audioCtx = audioCtx;
     this.#compressor = compressor;
-    this.#preset = preset;
     this.#mainGain = this.#audioCtx.createGain();
     this.#mainGain.gain.setValueAtTime(this.#volumeValue, this.#audioCtx.currentTime);
     this.#expressionGain = this.#audioCtx.createGain();
     this.#expressionGain.gain.setValueAtTime(this.#expressionValue, this.#audioCtx.currentTime);
     this.#mainGain.connect(this.#expressionGain);
     this.#expressionGain.connect(this.#compressor ? this.#compressor.input : this.#audioCtx.destination);
-    this.#preset.zones.map((zone) => this.#adjustZone(zone));
+    this.setPreset(preset).then(() => {
+      if (typeof callback === "function") callback();
+    });
   }
   get preset() {
     return this.#preset;
   }
   set preset(preset) {
+    this.setPreset(preset);
+  }
+  static load(preset, audioCtx, compressor = null) {
+    return new Promise((resolve) => {
+      const player = new _WebAudioFontPlayer(preset, audioCtx, compressor, () => resolve(player));
+    });
+  }
+  async setPreset(preset, nonblocking = false) {
     this.#preset = preset;
-    this.#preset.zones.map((zone) => this.#adjustZone(zone));
+    if (nonblocking) this.#preset.zones.map((zone) => this.#adjustZone(zone));
+    else await Promise.all(this.#preset.zones.map((zone) => this.#adjustZone(zone)));
   }
   close() {
     const now = this.#audioCtx.currentTime;
@@ -1380,30 +1390,24 @@ var WebAudioFontPlayer = class {
         break;
     }
   }
-  #adjustZone(zone) {
-    if (zone.buffer) return Promise.resolve(zone);
+  async #adjustZone(zone) {
+    if (zone.buffer) return zone;
     zone.delay = 0;
     if (zone.file) {
-      const decoded = atob(zone.file);
-      const uint8Array = new Uint8Array(decoded.length);
-      for (let i = 0; i < decoded.length; i++) uint8Array[i] = decoded.charCodeAt(i);
-      this.#audioCtx.decodeAudioData(
-        uint8Array.buffer,
-        (audioBuffer) => {
-          zone.buffer = audioBuffer;
-          this.#applyZoneParameters(zone);
-          return zone;
-        },
-        (error) => {
-          console.error("Audio decoding error:", error);
-          console.warn(this.#preset);
-          return false;
-        }
-      );
+      const binary = atob(zone.file);
+      const bytes = Uint8Array.from(binary, (c) => c.charCodeAt(0));
+      try {
+        zone.buffer = await this.#audioCtx.decodeAudioData(bytes.buffer);
+        this.#applyZoneParameters(zone);
+      } catch (error) {
+        console.error("Audio decoding error:", error);
+        console.warn(this.#preset);
+        return false;
+      }
     } else {
       this.#applyZoneParameters(zone);
-      return zone;
     }
+    return zone;
   }
   #applyZoneParameters(zone) {
     zone.loopStart = this.#numValue(zone.loopStart, 0);
@@ -1495,9 +1499,7 @@ var WebAudioFontPlayer = class {
     return envelope;
   }
   #findZone(pitch) {
-    const zone = this.#preset.zones.findLast((z) => pitch >= z.keyRangeLow && pitch <= z.keyRangeHigh + 1);
-    if (zone) this.#adjustZone(zone);
-    return zone;
+    return this.#preset.zones.findLast((z) => pitch >= z.keyRangeLow && pitch <= z.keyRangeHigh);
   }
   #limitVolume(v) {
     const requestedVolume = v ? 1 * v : 0.5;
@@ -1958,13 +1960,16 @@ var MidiAudioPlayer = class _MidiAudioPlayer extends index.Player {
       throw new Error("Invalid preset: ".concat(id));
     }
   }
-  async loadPreset(presetId, channel) {
+  async loadPreset(presetId, channel, nonblocking = false) {
     const presetInfo = await this.findPreset(presetId);
     if (!presetInfo) throw new Error("Invalid preset: ".concat(presetId));
     this.#presetMap[presetInfo.program] = presetInfo;
     const preset = await this.getPreset(presetId);
-    this.#players[channel].preset = preset;
-    this.#setupChange();
+    if (nonblocking) this.#players[channel].setPreset(preset, nonblocking).then(() => this.#setupChange());
+    else {
+      await this.#players[channel].setPreset(preset, nonblocking);
+      this.#setupChange();
+    }
   }
   async load(content, setup) {
     if (typeof content === "string") {
@@ -1992,6 +1997,15 @@ var MidiAudioPlayer = class _MidiAudioPlayer extends index.Player {
     } catch (e) {
       await this.loadArrayBuffer(await this.#repairMidi(content));
     }
+    if (this.#opts.karaoke) {
+      this.#log("Generating karaoke frames...");
+      this.#lyrics = null;
+      await this.#generateKaraokeFrames();
+      if (this.#title) this.#sendKaraokeFrame("title", this.#title);
+    }
+    this.#log("Trim midi events...");
+    this.#trimMidiEvents();
+    queueMicrotask(() => this.triggerPlayerEvent("computed"));
     this.#log("Loading instruments...");
     this.#channels = await this.#getInstruments();
     this.#channelStates = Object.keys(this.#channels).reduce((acc, key) => ({ ...acc, [key]: false }), {});
@@ -2002,8 +2016,8 @@ var MidiAudioPlayer = class _MidiAudioPlayer extends index.Player {
         this.#channelVolumes[channel] = setup.volumes[channel];
       }));
     }
-    const setupPrograms = /* @__PURE__ */ new Set();
     const setupPresets = {};
+    const setupPrograms = /* @__PURE__ */ new Set();
     if (setup?.presets !== void 0) {
       await Promise.all(Object.keys(setup.presets).map(async (channel) => {
         const presetInfo = await this.findPreset(setup.presets[channel]);
@@ -2014,7 +2028,7 @@ var MidiAudioPlayer = class _MidiAudioPlayer extends index.Player {
     }
     const uniqueInstruments = await this.#getUniqueInstruments();
     if (!Object.values(this.#channels).length) this.#log("Error: no instrument found");
-    const presets = Promise.all([...uniqueInstruments].map(async (program) => {
+    await Promise.all([...uniqueInstruments].map(async (program) => {
       if (setupPrograms.has(program)) return;
       let preset = null;
       if (this.#presetMap[program] !== void 0) preset = await this.getPreset(this.#presetMap[program].id);
@@ -2022,16 +2036,6 @@ var MidiAudioPlayer = class _MidiAudioPlayer extends index.Player {
       else preset = await this.#getAutoPreset(program);
       this.#instruments[program] = preset;
     }));
-    if (this.#opts.karaoke) {
-      this.#log("Generating karaoke frames...");
-      this.#lyrics = null;
-      await this.#generateKaraokeFrames();
-      if (this.#title) this.#sendKaraokeFrame("title", this.#title);
-    }
-    this.#log("Trim midi events...");
-    this.#trimMidiEvents();
-    queueMicrotask(() => this.triggerPlayerEvent("computed"));
-    await presets;
     await Promise.all(Object.keys(this.#channels).map(async (channel) => {
       if (this.#players[channel]) this.#players[channel].close();
       if (setupPresets[channel] !== void 0) this.#players[channel] = await this.#createPlayer(setupPresets[channel]);
@@ -2414,12 +2418,9 @@ var MidiAudioPlayer = class _MidiAudioPlayer extends index.Player {
             this.#players[channel].setPitchBend?.(event.value);
             break;
           case "Program Change":
-            if (
-              // (this.#opts.presetAuto || this.#opts.presetRandom) &&
-              event.value >= 0 && event.value <= 127 && this.#instruments[event.value + 1] !== void 0 && event.channel != 10
-            ) {
+            if (event.value >= 0 && event.value <= 127 && this.#instruments[event.value + 1] !== void 0 && event.channel != 10) {
               if (this.#players[channel].preset?.program !== event.value + 1) {
-                this.#players[channel].preset = this.#instruments[event.value + 1];
+                this.#players[channel].setPreset(this.#instruments[event.value + 1]);
               }
             }
             break;
@@ -2489,8 +2490,8 @@ var MidiAudioPlayer = class _MidiAudioPlayer extends index.Player {
     this.#presetMap[program] = preset;
     return await this.getPreset(preset.id);
   }
-  async #createPlayer(preset) {
-    return new index_default(preset, this.#audioCtx, this.#compressor);
+  #createPlayer(preset) {
+    return index_default.load(preset, this.#audioCtx, this.#compressor);
   }
   async #handleMidiPipeline(event) {
     if (!this.isPlaying()) return;
@@ -2525,7 +2526,7 @@ var MidiAudioPlayer = class _MidiAudioPlayer extends index.Player {
         if (!this.#players[event.channel]) return;
         if (event.channel == 10 || event.value > 127 || event.value < 0) break;
         if (this.#players[event.channel] !== void 0 && this.#players[event.channel].preset.program != event.value + 1)
-          this.#players[event.channel].preset = this.#instruments[event.value + 1];
+          this.#players[event.channel].setPreset(this.#instruments[event.value + 1]);
         break;
       case "Karaoke Event":
         if (event.tick < this.tick - this.secondsToTicks(10)) return;