smplr 0.25.0 → 1.0.0

package/dist/index.mjs

@@ -68,11 +68,12 @@ var HttpStorage = {
     return fetch(url);
   }
 };
-var _cache, _CacheStorageImpl_instances, tryFromCache_fn, saveResponse_fn;
+var _cache, _warned, _CacheStorageImpl_instances, tryFromCache_fn, saveResponse_fn;
 var CacheStorageImpl = class {
   constructor(name = "smplr") {
     __privateAdd(this, _CacheStorageImpl_instances);
     __privateAdd(this, _cache);
+    __privateAdd(this, _warned, false);
     if (typeof window === "undefined" || !("caches" in window)) {
       __privateSet(this, _cache, Promise.reject("CacheStorage not supported"));
       __privateGet(this, _cache).catch(() => {
@@ -95,6 +96,7 @@ var CacheStorageImpl = class {
   }
 };
 _cache = new WeakMap();
+_warned = new WeakMap();
 _CacheStorageImpl_instances = new WeakSet();
 tryFromCache_fn = function(request) {
   return __async(this, null, function* () {
@@ -110,6 +112,10 @@ saveResponse_fn = function(request, response) {
       const cache = yield __privateGet(this, _cache);
       yield cache.put(request, response.clone());
     } catch (err) {
+      if (!__privateGet(this, _warned)) {
+        __privateSet(this, _warned, true);
+        console.warn("smplr: failed to cache response", err);
+      }
     }
   });
 };
@@ -229,6 +235,15 @@ var Channel = class {
       __privateGet(this, _config).destination
     ]));
   }
+  /**
+   * Add a send effect on a parallel bus.
+   *
+   * The send is **post-fader**: it taps the channel signal after the volume
+   * gain (and after any inserts added via {@link addInsert}), before the
+   * panner. Lowering `volume` proportionally lowers the send level; `volume = 0`
+   * silences the send too. Inserts are upstream of the tap, so they are heard
+   * on the send.
+   */
   addEffect(name, effect, mixValue) {
     var _a;
     if (__privateGet(this, _disconnected)) {
@@ -318,7 +333,7 @@ function pickPlaybackParams(obj) {
   return result;
 }
 function resolveParams(defaults, group, region, midi, velocity, overrides) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const merged = __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, PARAM_DEFAULTS), defaults), pickPlaybackParams(group)), pickPlaybackParams(region));
   const pitch = (_b = (_a = region.pitch) != null ? _a : region.key) != null ? _b : midi;
   const semitones = midi - pitch;
@@ -335,9 +350,8 @@ function resolveParams(defaults, group, region, midi, velocity, overrides) {
     loop: (_e = overrides == null ? void 0 : overrides.loop) != null ? _e : merged.loop,
     loopStart: merged.loopStart,
     loopEnd: merged.loopEnd,
-    ampVelCurve: region.ampVelCurve,
     loopAuto: region.loopAuto,
-    reverse: overrides == null ? void 0 : overrides.reverse
+    reverse: (_f = overrides == null ? void 0 : overrides.reverse) != null ? _f : merged.reverse
   };
 }
 
@@ -515,14 +529,6 @@ var SampleLoaderImpl = class {
     __privateSet(this, _context, context);
     __privateSet(this, _storage, (_a = options == null ? void 0 : options.storage) != null ? _a : HttpStorage);
   }
-  /**
-   * Load all samples referenced in `json`. Returns a Map of sample name →
-   * AudioBuffer. Progress is reported via `onProgress` callback or via
-   * options object.
-   *
-   * - `buffers` in options: pre-loaded buffers — skips fetch for these names.
-   * - All samples load in parallel. Failed samples are silently omitted.
-   */
   load(json, onProgressOrOptions) {
     return __async(this, null, function* () {
       var _a, _b;
@@ -642,14 +648,6 @@ var SchedulerImpl = class {
     __privateSet(this, _intervalMs, (_b = options == null ? void 0 : options.intervalMs) != null ? _b : INTERVAL_MS_DEFAULT);
     __privateSet(this, _queue, new SortedQueue((a, b) => a.time - b.time));
   }
-  /**
-   * Schedule a callback for a NoteEvent.
-   *
-   * - If the event's time falls within the lookahead window (or has no time), the
-   *   callback is called synchronously and a no-op StopFn is returned.
-   * - Otherwise the event is queued, the interval is started if needed, and a StopFn
-   *   is returned that removes the event from the queue before it is dispatched.
-   */
   schedule(event, callback) {
     var _a;
     const now = __privateGet(this, _context2).currentTime;
@@ -665,10 +663,6 @@ var SchedulerImpl = class {
       __privateGet(this, _queue).removeAll((q) => q === item);
     };
   }
-  /**
-   * Clear all queued (not-yet-dispatched) events and stop the interval.
-   * Does not affect voices that are already playing.
-   */
   stop() {
     __privateGet(this, _queue).clear();
     if (__privateGet(this, _intervalId) !== void 0) {
@@ -758,7 +752,7 @@ var Voice = class {
     __privateSet(this, _startAt, startAt);
     let offsetSec = 0;
     if (params.offset > 0) {
-      offsetSec = params.reverse ? (buffer.length - params.offset) / buffer.sampleRate : params.offset / buffer.sampleRate;
+      offsetSec = params.reverse ? buffer.duration - params.offset : params.offset;
     }
     source.start(startAt, offsetSec);
     __privateSet(this, _source, source);
@@ -941,10 +935,12 @@ var SmplrImpl = class {
     __privateSet(this, _voices2, new VoiceManager());
     this.loader = (_c = options == null ? void 0 : options.loader) != null ? _c : SampleLoader(context, { storage: options == null ? void 0 : options.storage });
     if (json) {
-      this.ready = this.loader.load(json, (loaded, total) => {
-        var _a2;
-        __privateSet(this, _loadProgress, { loaded, total });
-        (_a2 = __privateGet(this, _onLoadProgress)) == null ? void 0 : _a2.call(this, { loaded, total });
+      this.ready = this.loader.load(json, {
+        onProgress: (loaded, total) => {
+          var _a2;
+          __privateSet(this, _loadProgress, { loaded, total });
+          (_a2 = __privateGet(this, _onLoadProgress)) == null ? void 0 : _a2.call(this, { loaded, total });
+        }
       }).then((buffers) => {
         __privateSet(this, _buffers, buffers);
       });
@@ -1683,6 +1679,9 @@ function fetchJSON(url, storage) {
       return r.json();
     });
     jsonCache.set(url, p);
+    p.catch(() => {
+      if (jsonCache.get(url) === p) jsonCache.delete(url);
+    });
   }
   return p;
 }
@@ -2503,6 +2502,7 @@ var SequencerImpl = class {
     this._clock.stop();
     this._stopLoop();
     this._endScheduled = false;
+    for (const stopFn of this._activeVoices.values()) stopFn();
     this._activeVoices.clear();
     this._emitStateChange("stopped");
     return this;
@@ -3006,8 +3006,6 @@ function buildRegion(props, pathFromSampleName) {
   if (tune !== void 0) region.tune = tune / 100;
   const ampRelease = num(props, "ampeg_release");
   if (ampRelease !== void 0) region.ampRelease = ampRelease;
-  const ampVelcurve = numArr(props, "amp_velcurve");
-  if (ampVelcurve) region.ampVelCurve = ampVelcurve;
   return region;
 }
 function resolveDefines(sfz) {
@@ -3085,16 +3083,18 @@ function str(props, key) {
   if (typeof v === "string") return v;
   return void 0;
 }
-function numArr(props, _prefix) {
-  for (const [k, v] of Object.entries(props)) {
-    if (k.startsWith("amp_velcurve_")) {
-      const vel = Number(k.slice("amp_velcurve_".length));
-      if (!isNaN(vel) && typeof v === "number") {
-        return [vel, v];
-      }
+
+// src/fetch-ok.ts
+function fetchOk(url) {
+  return __async(this, null, function* () {
+    const res = yield fetch(url);
+    if (!res.ok) {
+      throw new Error(
+        `smplr: failed to fetch ${url} (${res.status} ${res.statusText})`
+      );
     }
-  }
-  return void 0;
+    return res;
+  });
 }
 
 // src/tremolo.ts
@@ -3140,8 +3140,10 @@ function createTremolo(context, depth) {
     splitter.disconnect(ampR, 1);
     ampL.disconnect(merger, 0, 0);
     ampR.disconnect(merger, 0, 1);
-    lfoL.disconnect(ampL);
-    lfoR.disconnect(ampR);
+    lfoL.disconnect(lfoLAmp);
+    lfoLAmp.disconnect(ampL.gain);
+    lfoR.disconnect(lfoRAmp);
+    lfoRAmp.disconnect(ampR.gain);
     merger.disconnect(output);
   };
   return { input, output };
@@ -3194,7 +3196,7 @@ var ElectricPiano = Instrument(
     };
     const tremoloNode = createTremolo(ctx, depth.subscribe);
     smplr.output.addInsert(tremoloNode);
-    const ready = fetch(config.sfzUrl).then((r) => r.text()).then(
+    const ready = fetchOk(config.sfzUrl).then((r) => r.text()).then(
       (sfzText) => {
         var _a;
         return smplr.loadInstrument(
@@ -3212,15 +3214,11 @@ var ElectricPiano = Instrument(
 
 // src/versilian.ts
 var VCSL_BASE_URL = "https://smpldsnds.github.io/sgossner-vcsl";
-var instruments = [];
+var instrumentsPromise;
 function getVersilianInstruments() {
-  return __async(this, null, function* () {
-    if (instruments.length) return instruments;
-    instruments = yield fetch(VCSL_BASE_URL + "/sfz_files.json").then(
-      (res) => res.json()
-    );
-    return instruments;
-  });
+  return instrumentsPromise != null ? instrumentsPromise : instrumentsPromise = fetchOk(
+    VCSL_BASE_URL + "/sfz_files.json"
+  ).then((res) => res.json());
 }
 var Versilian = Instrument(
   (ctx, options = {}, smplr) => loadVersilianInstrument(smplr, options)
@@ -3231,7 +3229,7 @@ function loadVersilianInstrument(smplr, options) {
   const sfzUrl = `${VCSL_BASE_URL}/${instrument}.sfz`;
   const base = instrument.slice(0, instrument.lastIndexOf("/") + 1);
   const sampleBaseUrl2 = `${VCSL_BASE_URL}/${base}`;
-  return fetch(sfzUrl).then((r) => r.text()).then(
+  return fetchOk(sfzUrl).then((r) => r.text()).then(
     (sfzText) => smplr.loadInstrument(
       sfzToPreset(sfzText, {
         baseUrl: sampleBaseUrl2,
@@ -3336,7 +3334,7 @@ var Mellotron = Instrument(
     const variation = INSTRUMENT_VARIATIONS[instrument];
     const instrumentName = variation ? variation[0] : instrument;
     const baseUrl = `https://smpldsnds.github.io/archiveorg-mellotron/${instrumentName}/`;
-    return fetch(baseUrl + "files.json").then((r) => r.json()).then(
+    return fetchOk(baseUrl + "files.json").then((r) => r.json()).then(
       (names) => smplr.loadInstrument(
         mellotronToPreset(names, {
           instrument: instrumentName,
@@ -3352,7 +3350,7 @@ function mellotronToPreset(sampleNames, config) {
   for (const sampleName of sampleNames) {
     if (config.variation && !sampleName.includes(config.variation)) continue;
     const midi = toMidi((_a = sampleName.split(" ")[0]) != null ? _a : "");
-    if (!midi) continue;
+    if (midi === void 0) continue;
     entries.push([midi, sampleName]);
   }
   const spread = spreadKeyRanges(entries);
@@ -3405,7 +3403,7 @@ function createDattorroReverbEffect(context) {
     if (!ready) {
       const blob = new Blob([PROCESSOR], { type: "application/javascript" });
       const url = URL.createObjectURL(blob);
-      ready = context.audioWorklet.addModule(url);
+      ready = context.audioWorklet.addModule(url).finally(() => URL.revokeObjectURL(url));
       init.set(context, ready);
     }
     yield ready;
@@ -3437,7 +3435,7 @@ var ReverbImpl = class {
   }
   getParam(name) {
     var _a;
-    return (_a = __privateGet(this, _effect)) == null ? void 0 : _a.parameters.get("preDelay");
+    return (_a = __privateGet(this, _effect)) == null ? void 0 : _a.parameters.get(name);
   }
   get isReady() {
     return __privateGet(this, _effect) !== void 0;
@@ -3446,11 +3444,13 @@ var ReverbImpl = class {
     return __privateGet(this, _ready);
   }
   connect(output) {
-    if (__privateGet(this, _effect)) {
-      __privateGet(this, _effect).disconnect(__privateGet(this, _output));
-      __privateGet(this, _effect).connect(output);
-    }
     __privateSet(this, _output, output);
+    __privateGet(this, _ready).then(() => {
+      if (__privateGet(this, _effect)) {
+        __privateGet(this, _effect).disconnect();
+        __privateGet(this, _effect).connect(__privateGet(this, _output));
+      }
+    });
   }
 };
 _effect = new WeakMap();
@@ -3597,7 +3597,7 @@ var Smolken = Instrument(
   (ctx, options = {}, smplr) => {
     var _a;
     const sfzUrl = getSmolkenUrl((_a = options.instrument) != null ? _a : "Arco");
-    return fetch(sfzUrl).then((r) => r.text()).then(
+    return fetchOk(sfzUrl).then((r) => r.text()).then(
       (sfzText) => smplr.loadInstrument(
         sfzToPreset(sfzText, {
           baseUrl: SMOLKEN_BASE_URL,
@@ -3758,16 +3758,14 @@ function fetchSoundfontLoopData(url, sampleRate = 44100) {
   return __async(this, null, function* () {
     if (!url) return void 0;
     try {
-      const req = yield fetch(url);
-      if (req.status !== 200) return;
+      const req = yield fetchOk(url);
       const raw = yield req.json();
       const loopData = {};
       Object.keys(raw).forEach((key) => {
         const midi = toMidi(key);
-        if (midi) {
-          const offsets = raw[key];
-          loopData[midi] = [offsets[0] / sampleRate, offsets[1] / sampleRate];
-        }
+        if (midi === void 0) return;
+        const offsets = raw[key];
+        loopData[midi] = [offsets[0] / sampleRate, offsets[1] / sampleRate];
       });
       return loopData;
     } catch (err) {
@@ -3812,7 +3810,7 @@ function decodeSoundfontFile(context, config) {
     yield Promise.all(
       noteNames.map((noteName) => __async(null, null, function* () {
         const midi = toMidi(noteName);
-        if (!midi) return;
+        if (midi === void 0) return;
         try {
           const audioData = base64ToArrayBuffer(
             removeBase64Prefix(json[noteName])
@@ -3913,7 +3911,7 @@ function removeBase64Prefix(audioBase64) {
   return audioBase64.slice(audioBase64.indexOf(",") + 1);
 }
 function base64ToArrayBuffer(base64) {
-  const decoded = window.atob(base64);
+  const decoded = atob(base64);
   const len = decoded.length;
   const bytes = new Uint8Array(len);
   for (let i = 0; i < len; i++) {
@@ -3970,7 +3968,11 @@ var Soundfont2 = Instrument(
         const sf2inst = soundfont == null ? void 0 : soundfont.instruments.find(
           (inst) => inst.header.name === instrumentName
         );
-        if (!sf2inst) return void 0;
+        if (!sf2inst) {
+          throw new Error(
+            `Soundfont2: instrument "${instrumentName}" not found`
+          );
+        }
         const { json, buffers } = sf2InstrumentToPreset(sf2inst, ctx);
         return baseLoadInstrument(json, buffers);
       }