Merge branch 'main' into glossing/fmsss

2026-08-18 10:18:20 -04:00 · 2025-12-03 10:42:35 -06:00
parent 654c1a86f0 eb18648a2a
commit d28c8dac8e
32 changed files with 1065 additions and 210 deletions
@@ -1366,6 +1366,8 @@ export const { fanchor } = registerControl('fanchor');
 *
 * @name lprate
 * @param {number | Pattern} rate rate in hertz
+ * @example
+ * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lprate("<4 8 2 1>")
 */
 export const { lprate } = registerControl('lprate');

@@ -1374,6 +1376,8 @@ export const { lprate } = registerControl('lprate');
 *
 * @name lpsync
 * @param {number | Pattern} rate rate in cycles
+ * @example
+ * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lpsync("<4 8 2 1>")
 */
 export const { lpsync } = registerControl('lpsync');

@@ -1382,8 +1386,23 @@ export const { lpsync } = registerControl('lpsync');
 *
 * @name lpdepth
 * @param {number | Pattern} depth depth of modulation
+ * @example
+ * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lpdepth("<1 .5 1.8 0>")
 */
+
 export const { lpdepth } = registerControl('lpdepth');
+/**
+ * Depth of the LFO for the lowpass filter, in HZ
+ *
+ * @name lpdepthfrequency
+ * @synonyms
+ * lpdethfreq
+ * @param {number | Pattern} depth depth of modulation
+ * @example
+ * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lpdepthfrequency("<200 500 100 0>")
+ */
+
+export const { lpdepthfrequency } = registerControl('lpdepthfrequency', 'lpdepthfreq');

 /**
 * Shape of the LFO for the lowpass filter
@@ -1433,6 +1452,19 @@ export const { bpsync } = registerControl('bpsync');
 */
 export const { bpdepth } = registerControl('bpdepth');

+/**
+ * Depth of the LFO for the bandpass filter, in HZ
+ *
+ * @name bpdepthfrequency
+ * @synonyms
+ * bpdethfreq
+ * @param {number | Pattern} depth depth of modulation
+ * @example
+ * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).bpdepthfrequency("<200 500 100 0>")
+ */
+
+export const { bpdepthfrequency } = registerControl('bpdepthfrequency', 'bpdepthfreq');
+
 /**
 * Shape of the LFO for the bandpass filter
 *
@@ -1479,7 +1511,20 @@ export const { hpsync } = registerControl('hpsync');
 * @name hpdepth
 * @param {number | Pattern} depth depth of modulation
 */
-export const { hpdepth } = registerControl('hpdepth');
+export const { hpdepth, hpdepthfreq } = registerControl('hpdepth');
+
+/**
+ * Depth of the LFO for the hipass filter, in hz
+ *
+ * @name hpdepthfrequency
+ * @synonyms
+ * hpdethfreq
+ * @param {number | Pattern} depth depth of modulation
+ * @example
+ * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).hpdepthfrequency("<200 500 100 0>")
+ */
+
+export const { hpdepthfrequency } = registerControl('hpdepthfrequency', 'hpdepthfreq');

 /**
 * Shape of the LFO for the highpass filter
@@ -1892,12 +1937,12 @@ export const { nudge } = registerControl('nudge');
 * Sets the default octave of a synth.
 *
 * @name octave
+ * @synonyms oct
 * @param {number | Pattern} octave octave number
 * @example
- * n("0,4,7").s('supersquare').octave("<3 4 5 6>").osc()
- * @superDirtOnly
+ * n("0,4,7").scale("F:minor").s('supersaw').octave("<0 1 2 3>")
 */
-export const { octave } = registerControl('octave');
+export const { octave, oct } = registerControl('octave', 'oct');

 // ['ophatdecay'],
 // TODO: example
@@ -1905,6 +1950,7 @@ export const { octave } = registerControl('octave');
 * An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share the same global effects.
 *
 * @name orbit
+ * @synonyms o
 * @param {number | Pattern} number
 * @example
 * stack(
@@ -1912,7 +1958,7 @@ export const { octave } = registerControl('octave');
 *   s("~ sd ~ sd").delay(.5).delaytime(.125).orbit(2)
 * )
 */
-export const { orbit } = registerControl('orbit');
+export const { orbit } = registerControl('orbit', 'o');
 // TODO: what is this? not found in tidal doc Answer: gain is limited to maximum of 2. This allows you to go over that
 export const { overgain } = registerControl('overgain');
 // TODO: what is this? not found in tidal doc. Similar to above, but limited to 1
@@ -25,7 +25,7 @@ import {
  stringifyValues,
 } from './util.mjs';
 import drawLine from './drawLine.mjs';
-import { logger } from './logger.mjs';
+import { errorLogger, logger } from './logger.mjs';

 let stringParser;

@@ -414,7 +414,7 @@ export class Pattern {
    try {
      return this.query(new State(new TimeSpan(begin, end), controls));
    } catch (err) {
-      logger(`[query]: ${err.message}`, 'error');
+      errorLogger(err, 'query');
      return [];
    }
  }
@@ -2234,7 +2234,7 @@ export const brak = register('brak', function (pat) {
 });

 /**
- * Reverse all haps in a pattern
+ * Reverse all cycles in a pattern. See also `revv` for reversing a whole pattern.
 *
 * @name rev
 * @memberof Pattern
@@ -2266,6 +2266,23 @@ export const rev = register(
  true,
 );

+/**
+ * Reverse a whole pattern. See also `rev` for reversing each cycle.
+ *
+ * @name revv
+ * @memberof Pattern
+ * @returns Pattern
+ * @example
+ * // This is the same as `<[g e] [d c]>`. If `rev()` is used, you get
+ * // the same as `<[d c] [g e]>`, where each cycle reverses, but the order of
+ * // cycles stays the same.
+ * note("<[c d] [e g]>").revv()
+ */
+export const revv = register('revv', function (pat) {
+  const negateSpan = (span) => new TimeSpan(Fraction(0).sub(span.end), Fraction(0).sub(span.begin));
+  return pat.withQuerySpan(negateSpan).withHapSpan(negateSpan);
+});
+
 /** Like press, but allows you to specify the amount by which each
 * event is shifted. pressBy(0.5) is the same as press, while
 * pressBy(1/3) shifts each event by a third of its timespan.
@@ -152,9 +152,9 @@ export function repl({
        // allows muting a pattern x with x_ or _x
        return silence;
      }
-      if (id === '$') {
+      if (id.includes('$')) {
        // allows adding anonymous patterns with $:
-        id = `$${anonymousIndex}`;
+        id = `${id}${anonymousIndex}`;
        anonymousIndex++;
      }
      pPatterns[id] = this;
@@ -215,8 +215,19 @@ export function repl({
      let { pattern, meta } = await _evaluate(code, transpiler, transpilerOptions);
      if (Object.keys(pPatterns).length) {
        let patterns = [];
+        let soloActive = false;
        for (const [key, value] of Object.entries(pPatterns)) {
-          patterns.push(value.withState((state) => state.setControls({ id: key })));
+          // handle soloed patterns ex: S$: s("bd!4")
+          const isSolod = key.length > 1 && key.startsWith('S');
+          if (isSolod && soloActive === false) {
+            // first time we see a soloed pattern, clear existing patterns
+            patterns = [];
+            soloActive = true;
+          }
+          if (!soloActive || (soloActive && isSolod)) {
+            const valWithState = value.withState((state) => state.setControls({ id: key }));
+            patterns.push(valWithState);
+          }
        }
        if (eachTransform) {
          // Explicit lambda so only element (not index and array) are passed
@@ -227,14 +238,13 @@ export function repl({
        pattern = eachTransform(pattern);
      }
      if (allTransforms.length) {
-        for (let i in allTransforms) {
-          pattern = allTransforms[i](pattern);
+        for (const transform of allTransforms) {
+          pattern = transform(pattern);
        }
      }

      if (!isPattern(pattern)) {
-        const message = `got "${typeof evaluated}" instead of pattern`;
-        throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
+        pattern = silence;
      }
      logger(`[eval] code updated`);
      pattern = await setPattern(pattern, autostart);
@@ -524,7 +524,7 @@ export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
 * @example
 * wchooseCycles(["bd",10], ["hh",1], ["sd",1]).s().fast(8)
 * @example
- * wchooseCycles(["bd bd bd",5], ["hh hh hh",3], ["sd sd sd",1]).fast(4).s()
+ * wchooseCycles(["c c c",5], ["a a a",3], ["f f f",1]).fast(4).note()
 * @example
 * // The probability can itself be a pattern
 * wchooseCycles(["bd(3,8)","<5 0>"], ["hh hh hh",3]).fast(4).s()
@@ -586,6 +586,18 @@ describe('Pattern', () => {
          .map((a) => a.value),
      ).toStrictEqual(['c', 'b', 'a']);
    });
+    it('Does not reverse the order of cycles', () => {
+      expect(fastcat('a', 'b', 'c', 'd').slow(2).rev().fast(2).sortHapsByPart().firstCycle()).toStrictEqual(
+        fastcat('b', 'a', 'd', 'c').firstCycle(),
+      );
+    });
+  });
+  describe('revv()', () => {
+    it('Does reverse the order of cycles', () => {
+      expect(fastcat('a', 'b', 'c', 'd').slow(2).revv().fast(2).sortHapsByPart().firstCycle()).toStrictEqual(
+        fastcat('d', 'c', 'b', 'a').firstCycle(),
+      );
+    });
  });
  describe('sequence()', () => {
    it('Can work like fastcat', () => {
@@ -35,6 +35,7 @@ export async function initHydra(options = {}) {
      hydra.synth.s0.init({ src: canvas });
    }
  }
+  return hydra;
 }

 export function clearHydra() {
@@ -9,6 +9,7 @@ import readline from 'readline';
 import os from 'os';

 const LOG = !!process.env.LOG || false;
+const PORT = process.env.PORT || 5432;
 const VALID_AUDIO_EXTENSIONS = ['wav', 'mp3', 'ogg'];

 const isAudioFile = (f) => {
@@ -54,7 +55,6 @@ async function getBanks(directory, flat = false) {
    banks[bank].push(subDir);
    return subDir;
  });
-  banks._base = `http://localhost:5432`;
  return { banks, files };
 }

@@ -134,8 +134,6 @@ const server = http.createServer(async (req, res) => {
  readStream.pipe(res);
 });

-// eslint-disable-next-line
-const PORT = process.env.PORT || 5432;
 const IP_ADDRESS = '0.0.0.0';
 let IP;
 const networkInterfaces = os.networkInterfaces();
@@ -6,6 +6,7 @@ import {
  getADSRValues,
  getPitchEnvelope,
  getVibratoOscillator,
+  onceEnded,
 } from '@strudel/webaudio';
 import gm from './gm.mjs';

@@ -170,12 +171,12 @@ export function registerSoundfonts() {

        bufferSource.stop(envEnd);
        const stop = (releaseTime) => {};
-        bufferSource.onended = () => {
+        onceEnded(bufferSource, () => {
          bufferSource.disconnect();
          vibratoOscillator?.stop();
          node.disconnect();
          onended();
-        };
+        });
        return { node, stop };
      },
      { type: 'soundfont', prebake: true, fonts },
@@ -191,8 +191,7 @@ export function applyParameterModulators(audioContext, param, start, end, envelo
  const lfo = getParamLfo(audioContext, param, start, end, lfoValues);
  return { lfo, disconnect: () => lfo?.disconnect() };
 }
-
-export function createFilter(context, start, end, params, cps) {
+export function createFilter(context, start, end, params, cps, cycle) {
  let {
    frequency,
    anchor,
@@ -202,12 +201,14 @@ export function createFilter(context, start, end, params, cps) {
    q = 1,
    drive = 0.69,
    depth,
+    depthfrequency,
    dcoffset = -0.5,
    skew,
    shape,
    rate,
    sync,
  } = params;
+
  let frequencyParam, filter;
  if (model === 'ladder') {
    filter = getWorklet(context, 'ladder-processor', { frequency, q, drive });
@@ -238,9 +239,27 @@ export function createFilter(context, start, end, params, cps) {
  if (sync != null) {
    rate = cps * sync;
  }
-  const lfoValues = { depth, dcoffset, skew, shape, frequency: rate };
-  getParamLfo(context, frequencyParam, start, end, lfoValues);
-  return filter;
+  const hasLFO = [depth, depthfrequency, skew, shape, rate].some((v) => v !== undefined);
+  let lfo;
+  if (hasLFO) {
+    depth = depth ?? 1;
+    const time = cycle / cps;
+    const modDepth = depthfrequency ?? (depth ?? 1) * frequency;
+    const lfoValues = {
+      depth: modDepth,
+      dcoffset,
+      skew,
+      shape,
+      frequency: rate ?? cps,
+      min: -frequency + 30,
+      max: 20000 - frequency,
+      time,
+      curve: 1,
+    };
+    lfo = getParamLfo(context, frequencyParam, start, end, lfoValues);
+  }
+
+  return { filter, lfo };
 }

 // stays 1 until .5, then fades out
@@ -262,7 +281,15 @@ export function drywet(dry, wet, wetAmount = 0) {
  let mix = ac.createGain();
  dry_gain.connect(mix);
  wet_gain.connect(mix);
-  return mix;
+  return {
+    node: mix,
+    onended: () => {
+      dry_gain.disconnect(mix);
+      wet_gain.disconnect(mix);
+      dry.disconnect(dry_gain);
+      wet.disconnect(wet_gain);
+    },
+  };
 }

 let curves = ['linear', 'exponential'];
@@ -297,6 +324,10 @@ export function getVibratoOscillator(param, value, t) {
    gain.gain.value = vibmod * 100;
    vibratoOscillator.connect(gain);
    gain.connect(param);
+    vibratoOscillator.onended = () => {
+      gain.disconnect(param);
+      vibratoOscillator.disconnect(gain);
+    };
    vibratoOscillator.start(t);
    return vibratoOscillator;
  }
@@ -318,20 +349,11 @@ export function webAudioTimeout(audioContext, onComplete, startTime, stopTime) {
  constantNode.connect(zeroGain);

  // Schedule the `onComplete` callback to occur at `stopTime`
-  constantNode.onended = () => {
-    // Ensure garbage collection
-    try {
-      zeroGain.disconnect();
-    } catch {
-      // pass
-    }
-    try {
-      constantNode.disconnect();
-    } catch {
-      // pass
-    }
+  onceEnded(constantNode, () => {
+    releaseAudioNode(zeroGain);
+    releaseAudioNode(constantNode);
    onComplete();
-  };
+  });
  constantNode.start(startTime);
  constantNode.stop(stopTime);
  return constantNode;
@@ -429,6 +451,11 @@ export function applyFM(param, value, begin) {
      }
      io[0].connect(io[1]);
    }
+    fmmod.osc.onended = () => {
+      envGain.disconnect();
+      modulator.disconnect();
+      fmmod.osc.disconnect();
+    };
  }
  return {
    stop: (t) => toStop.forEach((m) => m?.stop(t)),
@@ -532,7 +559,7 @@ export const getDistortion = (distort, postgain, algorithm) => {
 };

 export const getFrequencyFromValue = (value, defaultNote = 36) => {
-  let { note, freq } = value;
+  let { note, freq, octave = 0 } = value;
  note = note || defaultNote;
  if (typeof note === 'string') {
    note = noteToMidi(note); // e.g. c3 => 48
@@ -541,16 +568,60 @@ export const getFrequencyFromValue = (value, defaultNote = 36) => {
  if (!freq && typeof note === 'number') {
    freq = midiToFreq(note); // + 48);
  }
-
+  freq *= Math.pow(2, octave);
  return Number(freq);
 };

-export const destroyAudioWorkletNode = (node) => {
-  if (node == null) {
-    return;
+// This helper should be used instead of the `node.onended = callback` pattern
+// It adds a mechanism to help minimize gc retention
+export const onceEnded = (node, callback) => {
+  let onended = callback;
+  node.onended = function cleanup() {
+    onended && onended();
+    onended = null;
+    this.onended = null;
+  };
+};
+
+export const releaseAudioNode = (node) => {
+  if (node == null) return;
+
+  // check we received an AudioNode
+  if (!(node instanceof AudioNode)) {
+    throw new Error('releaseAudioNode can only release an AudioNode');
  }
+
+  // https://developer.mozilla.org/en-US/docs/Web/API/AudioNode/disconnect
  node.disconnect();
-  node.parameters.get('end')?.setValueAtTime(0, 0);
+
+  // make sure all AudioScheduledSourceNodes are in a stopped state
+  // https://developer.mozilla.org/en-US/docs/Web/API/AudioScheduledSourceNode
+  if (node instanceof AudioScheduledSourceNode) {
+    if (node.onended && node.onended.name !== 'cleanup') {
+      logger(
+        `[superdough] Deprecation warning: it seems your code path is setting 'node.onended = callback' instead of using the onceEnded helper`,
+      );
+    }
+    try {
+      node.stop();
+    } catch (e) {
+      // At the stage, `start` was not called on the node
+      // but an `onended` callback releasing resources may exist
+      // and we want it to fire :
+      // - we force a start/stop cycle so that `onended` gets called
+      // - we `lock` the node so that no-one can start it
+      node.start(node.context.currentTime + 5); // will never happen
+      node.stop();
+    }
+  }
+
+  // https://www.w3.org/TR/webaudio-1.1/#AudioNode-actively-processing
+  // An AudioWorkletNode is actively processing when its AudioWorkletProcessor's [[callable process]]
+  // returns true and either its active source flag is true or
+  // any AudioNode connected to one of its inputs is actively processing.
+  if (node instanceof AudioWorkletNode) {
+    node.parameters.get('end')?.setValueAtTime(0, 0);
+  }
 };

 export const cleanupNode = (node, time) => {
@@ -65,8 +65,9 @@ export function getNoiseOscillator(type = 'white', t, density = 0.02) {
 export function getNoiseMix(inputNode, wet, t) {
  const noiseOscillator = getNoiseOscillator('pink', t);
  const noiseMix = drywet(inputNode, noiseOscillator.node, wet);
+  noiseOscillator.node.onended = () => noiseMix.onended();
  return {
-    node: noiseMix,
+    node: noiseMix.node,
    stop: (time) => noiseOscillator?.stop(time),
  };
 }
@@ -1,7 +1,14 @@
-import { getCommonSampleInfo } from './util.mjs';
+import { getBaseURL, getCommonSampleInfo } from './util.mjs';
 import { registerSound, registerWaveTable } from './index.mjs';
 import { getAudioContext } from './audioContext.mjs';
-import { getADSRValues, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
+import {
+  getADSRValues,
+  getParamADSR,
+  getPitchEnvelope,
+  getVibratoOscillator,
+  onceEnded,
+  releaseAudioNode,
+} from './helpers.mjs';
 import { logger } from './logger.mjs';

 const bufferCache = {}; // string: Promise<ArrayBuffer>
@@ -211,7 +218,7 @@ export async function fetchSampleMap(url) {
    // not a browser
    return;
  }
-  const base = url.split('/').slice(0, -1).join('/');
+  const base = getBaseURL(url);
  if (typeof fetch === 'undefined') {
    // skip fetch when in node / testing
    return;
@@ -286,17 +293,19 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {

  const { bufferSource, sliceDuration, offset } = await getSampleBufferSource(value, bank, resolveUrl);

-  // asny stuff above took too long?
-  if (ac.currentTime > t) {
-    logger(`[sampler] still loading sound "${s}:${n}"`, 'highlight');
-    // console.warn('sample still loading:', s, n);
-    return;
-  }
  if (!bufferSource) {
    logger(`[sampler] could not load "${s}:${n}"`, 'error');
    return;
  }

+  // async stuff above took too long?
+  if (ac.currentTime > t) {
+    logger(`[sampler] loading sound "${s}:${n}" took too long`, 'highlight');
+    // AudioBufferSourceNode will never be used. discard it
+    releaseAudioNode(bufferSource);
+    return;
+  }
+
  // vibrato
  let vibratoOscillator = getVibratoOscillator(bufferSource.detune, value, t);

@@ -319,13 +328,13 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {

  const out = ac.createGain(); // we need a separate gain for the cutgroups because firefox...
  node.connect(out);
-  bufferSource.onended = function () {
+  onceEnded(bufferSource, function () {
    bufferSource.disconnect();
    vibratoOscillator?.stop();
    node.disconnect();
    out.disconnect();
    onended();
-  };
+  });
  let envEnd = holdEnd + release + 0.01;
  bufferSource.stop(envEnd);
  const stop = (endTime) => {
@@ -263,8 +263,8 @@ let audioReady;
 export async function initAudioOnFirstClick(options) {
  if (!audioReady) {
    audioReady = new Promise((resolve) => {
-      document.addEventListener('click', async function listener() {
-        document.removeEventListener('click', listener);
+      document.addEventListener('mousedown', async function listener() {
+        document.removeEventListener('mousedown', listener);
        await initAudio(options);
        resolve();
      });
@@ -274,7 +274,7 @@ export async function initAudioOnFirstClick(options) {
 }

 let controller;
-function getSuperdoughAudioController() {
+export function getSuperdoughAudioController() {
  if (controller == null) {
    controller = new SuperdoughAudioController(getAudioContext());
  }
@@ -287,7 +287,7 @@ export function connectToDestination(input, channels) {

 function getPhaser(time, end, frequency = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
  const ac = getAudioContext();
-  const lfoGain = getLfo(ac, time, end, { frequency, depth: sweep * 2 });
+  const lfo = getLfo(ac, time, end, { frequency, depth: sweep * 2 });

  //filters
  const numStages = 2; //num of filters in series
@@ -300,14 +300,14 @@ function getPhaser(time, end, frequency = 1, depth = 0.5, centerFrequency = 1000
    filter.frequency.value = centerFrequency + fOffset;
    filter.Q.value = 2 - Math.min(Math.max(depth * 2, 0), 1.9);

-    lfoGain.connect(filter.detune);
+    lfo.connect(filter.detune);
    fOffset += 282;
    if (i > 0) {
      filterChain[i - 1].connect(filter);
    }
    filterChain.push(filter);
  }
-  return filterChain[filterChain.length - 1];
+  return { phaser: filterChain[filterChain.length - 1], lfo };
 }

 function getFilterType(ftype) {
@@ -413,7 +413,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
    release = 0,

    //phaser
-    phaserrate: phaser,
+    phaserrate,
    phaserdepth = getDefaultValue('phaserdepth'),
    phasersweep,
    phasercenter,
@@ -553,16 +553,21 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
      rate: 'lprate',
      sync: 'lpsync',
      depth: 'lpdepth',
+      depthfrequency: 'lpdepthfrequency',
      shape: 'lpshape',
      dcoffset: 'lpdc',
      skew: 'lpskew',
    };
    const lpParams = pickAndRename(value, lpMap);
    lpParams.type = 'lowpass';
-    let lp = () => createFilter(ac, t, end, lpParams, cps);
-    chain.push(lp());
+    const lp = () => createFilter(ac, t, end, lpParams, cps, cycle);
+    const { filter: lpf1, lfo: lfo1 } = lp();
+    chain.push(lpf1);
+    lfo1 && audioNodes.push(lfo1);
    if (ftype === '24db') {
-      chain.push(lp());
+      const { filter: lpf2, lfo: lfo2 } = lp();
+      chain.push(lpf2);
+      lfo2 && audioNodes.push(lfo2);
    }
  }

@@ -581,16 +586,21 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
      rate: 'hprate',
      sync: 'hpsync',
      depth: 'hpdepth',
+      depthfrequency: 'hpdepthfrequency',
      shape: 'hpshape',
      dcoffset: 'hpdc',
      skew: 'hpskew',
    };
    const hpParams = pickAndRename(value, hpMap);
    hpParams.type = 'highpass';
-    let hp = () => createFilter(ac, t, end, hpParams, cps);
-    chain.push(hp());
+    const hp = () => createFilter(ac, t, end, hpParams, cps, cycle);
+    const { filter: hpf1, lfo: lfo1 } = hp();
+    chain.push(hpf1);
+    lfo1 && audioNodes.push(lfo1);
    if (ftype === '24db') {
-      chain.push(hp());
+      const { filter: hpf2, lfo: lfo2 } = hp();
+      chain.push(hpf2);
+      lfo2 && audioNodes.push(lfo2);
    }
  }

@@ -609,16 +619,21 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
      rate: 'bprate',
      sync: 'bpsync',
      depth: 'bpdepth',
+      depthfrequency: 'bpdepthfrequency',
      shape: 'bpshape',
      dcoffset: 'bpdc',
      skew: 'bpskew',
    };
    const bpParams = pickAndRename(value, bpMap);
    bpParams.type = 'bandpass';
-    let bp = () => createFilter(ac, t, end, bpParams, cps);
-    chain.push(bp());
+    const bp = () => createFilter(ac, t, end, bpParams, cps, cycle);
+    const { filter: bpf1, lfo: lfo1 } = bp();
+    chain.push(bpf1);
+    lfo1 && audioNodes.push(lfo1);
    if (ftype === '24db') {
-      chain.push(bp());
+      const { filter: bpf2, lfo: lfo2 } = bp();
+      chain.push(bpf2);
+      lfo2 && audioNodes.push(lfo2);
    }
  }

@@ -665,6 +680,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
      curve: 1.5,
    });
    lfo.connect(amGain.gain);
+    audioNodes.push(lfo);
    chain.push(amGain);
  }

@@ -680,9 +696,10 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
    chain.push(panner);
  }
  // phaser
-  if (phaser !== undefined && phaserdepth > 0) {
-    const phaserFX = getPhaser(t, endWithRelease, phaser, phaserdepth, phasercenter, phasersweep);
-    chain.push(phaserFX);
+  if (phaserrate !== undefined && phaserdepth > 0) {
+    const { phaser, lfo } = getPhaser(t, endWithRelease, phaserrate, phaserdepth, phasercenter, phasersweep);
+    audioNodes.push(lfo);
+    chain.push(phaser);
  }

  // last gain
@@ -692,7 +709,8 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
  // delay
  if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
    orbitBus.getDelay(delaytime, delayfeedback, t);
-    orbitBus.sendDelay(post, delay);
+    const send = orbitBus.sendDelay(post, delay);
+    audioNodes.push(send);
  }
  // reverb
  if (room > 0) {
@@ -82,7 +82,7 @@ export class Orbit {
  }

  sendDelay(node, amount) {
-    effectSend(node, this.delayNode, amount);
+    return effectSend(node, this.delayNode, amount);
  }

  duck(t, onsettime = 0, attacktime = 0.1, depth = 1) {
@@ -3,7 +3,6 @@ import { registerSound, soundMap } from './superdough.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import {
  applyFM,
-  destroyAudioWorkletNode,
  gainNode,
  getADSRValues,
  getFrequencyFromValue,
@@ -13,6 +12,7 @@ import {
  getVibratoOscillator,
  getWorklet,
  noises,
+  releaseAudioNode,
  webAudioTimeout,
 } from './helpers.mjs';
 import { logger } from './logger.mjs';
@@ -48,19 +48,17 @@ export function registerSynthSounds() {
          [0.001, 0.05, 0.6, 0.01],
        );

-        let sound = getOscillator(s, t, value);
-        let { node: o, stop, triggerRelease } = sound;
-
        // turn down
        const g = gainNode(0.3);

-        const { duration } = value;
-
-        o.onended = () => {
-          o.disconnect();
+        let sound = getOscillator(s, t, value, () => {
          g.disconnect();
          onended();
-        };
+        });
+
+        let { node: o, stop, triggerRelease } = sound;
+
+        const { duration } = value;

        const envGain = gainNode(1);
        let node = o.connect(g).connect(envGain);
@@ -194,8 +192,7 @@ export function registerSynthSounds() {
      let timeoutNode = webAudioTimeout(
        ac,
        () => {
-          destroyAudioWorkletNode(o);
-          envGain.disconnect();
+          releaseAudioNode(o);
          onended();
          fm?.stop();
          vibratoOscillator?.stop();
@@ -272,8 +269,7 @@ export function registerSynthSounds() {
      let timeoutNode = webAudioTimeout(
        ac,
        () => {
-          destroyAudioWorkletNode(o);
-          envGain.disconnect();
+          releaseAudioNode(o);
          onended();
        },
        begin,
@@ -346,9 +342,8 @@ export function registerSynthSounds() {
      let timeoutNode = webAudioTimeout(
        ac,
        () => {
-          destroyAudioWorkletNode(o);
-          destroyAudioWorkletNode(lfo);
-          envGain.disconnect();
+          releaseAudioNode(o);
+          releaseAudioNode(lfo);
          onended();
          fm?.stop();
          vibratoOscillator?.stop();
@@ -460,7 +455,7 @@ export function waveformN(partials, phases, type) {
 }

 // expects one of waveforms as s
-export function getOscillator(s, t, value) {
+export function getOscillator(s, t, value, onended) {
  const { duration, noise = 0 } = value;
  const partials = value.partials ?? value.n;
  let o;
@@ -482,7 +477,6 @@ export function getOscillator(s, t, value) {
  }
  // set frequency
  o.frequency.value = getFrequencyFromValue(value);
-  o.start(t);

  let vibratoOscillator = getVibratoOscillator(o.detune, value, t);

@@ -495,6 +489,13 @@ export function getOscillator(s, t, value) {
    noiseMix = getNoiseMix(o, noise, t);
  }

+  o.onended = () => {
+    noiseMix || o.disconnect();
+    noiseMix?.node.disconnect();
+    onended();
+  };
+  o.start(t);
+
  return {
    node: noiseMix?.node || o,
    stop: (time) => {
@@ -114,3 +114,13 @@ export function getCommonSampleInfo(hapValue, bank) {
 export const pickAndRename = (source, map) => {
  return Object.fromEntries(Object.entries(map).map(([newKey, oldKey]) => [newKey, source[oldKey]]));
 };
+
+export const getBaseURL = (url) => {
+  try {
+    // For real URLs
+    return new URL('.', new URL(url)).href.replace(/\/$/, ''); // removes trailing slash
+  } catch {
+    // For pseudo URLS
+    return url.split('/').slice(0, -1).join('/');
+  }
+};
@@ -45,7 +45,8 @@ if (typeof GainNode !== 'undefined') {
        throw new Error('vowel: unknown vowel ' + letter);
      }
      const { gains, qs, freqs } = vowelFormant[letter];
-      const makeupGain = ac.createGain();
+      this.makeupGain = ac.createGain();
+      this.audioNodes = [];
      for (let i = 0; i < 5; i++) {
        const gain = ac.createGain();
        gain.gain.value = gains[i];
@@ -53,14 +54,25 @@ if (typeof GainNode !== 'undefined') {
        filter.type = 'bandpass';
        filter.Q.value = qs[i];
        filter.frequency.value = freqs[i];
-        this.connect(filter);
+        super.connect(filter);
        filter.connect(gain);
-        gain.connect(makeupGain);
+        this.audioNodes.push(filter);
+        gain.connect(this.makeupGain);
+        this.audioNodes.push(gain);
      }
-      makeupGain.gain.value = 8; // how much makeup gain to add?
-      this.connect = (target) => makeupGain.connect(target);
+      this.makeupGain.gain.value = 8; // how much makeup gain to add?
      return this;
    }
+    connect(target) {
+      this.makeupGain.connect(target);
+    }
+    disconnect() {
+      this.makeupGain.disconnect();
+      this.audioNodes.forEach((n) => n.disconnect());
+      super.disconnect();
+      this.makeupGain = null;
+      this.audioNodes = null;
+    }
  }

  AudioContext.prototype.createVowelFilter = function (letter) {
@@ -1,15 +1,15 @@
 import { getAudioContext, registerSound } from './index.mjs';
-import { getCommonSampleInfo } from './util.mjs';
+import { getBaseURL, getCommonSampleInfo } from './util.mjs';
 import {
  applyFM,
  applyParameterModulators,
-  destroyAudioWorkletNode,
  getADSRValues,
  getFrequencyFromValue,
  getParamADSR,
  getPitchEnvelope,
  getVibratoOscillator,
  getWorklet,
+  releaseAudioNode,
  webAudioTimeout,
 } from './helpers.mjs';
 import { logger } from './logger.mjs';
@@ -190,6 +190,7 @@ export const tables = async (url, frameLen, json, options = {}) => {
  if (url.startsWith('local:')) {
    url = `http://localhost:5432`;
  }
+  const base = getBaseURL(url);
  if (typeof fetch !== 'function') {
    // not a browser
    return;
@@ -200,7 +201,7 @@ export const tables = async (url, frameLen, json, options = {}) => {
  }
  return fetch(url)
    .then((res) => res.json())
-    .then((json) => _processTables(json, url, frameLen, options))
+    .then((json) => _processTables(json, base, frameLen, options))
    .catch((error) => {
      console.error(error);
      throw new Error(`error loading "${url}"`);
@@ -318,10 +319,9 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
  const timeoutNode = webAudioTimeout(
    ac,
    () => {
-      destroyAudioWorkletNode(source);
+      releaseAudioNode(source);
      vibratoOscillator?.stop();
      fm?.stop();
-      node.disconnect();
      wtPosModulators?.disconnect();
      wtWarpModulators?.disconnect();
      onended();
@@ -508,13 +508,14 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
    ];
  }
  process(_input, outputs, params) {
-    if (currentTime <= params.begin[0]) {
-      return true;
-    }
    if (currentTime >= params.end[0]) {
-      // this.port.postMessage({ type: 'onended' });
+      // should terminate
      return false;
    }
+    if (currentTime <= params.begin[0]) {
+      // keep alive
+      return true;
+    }
    const output = outputs[0];
    const voices = params.voices[0]; // k-rate
    for (let i = 0; i < output[0].length; i++) {
@@ -532,7 +533,7 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
        const freqVoice = applySemitoneDetuneToFrequency(freq, detuner(n));
        // We must wrap this here because it is passed into sawblep below which
        // has domain [0, 1]
-        const dt = ffrac(freqVoice * INVSR);
+        const dt = frac(freqVoice * INVSR);
        this.phase[n] = this.phase[n] ?? Math.random();
        const v = waveshapes.sawblep(this.phase[n], dt);

@@ -543,8 +544,9 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
        if (pn >= 1.0) pn -= 1.0;
        this.phase[n] = pn;
        // invert right and left gain
+        const tmp = gainL;
        gainL = gainR;
-        gainR = gainL;
+        gainR = tmp;
      }
    }
    return true;
@@ -1338,7 +1340,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
      const tablePos = clamp(pv(parameters.position, i), 0, 1);
      const idx = tablePos * (this.numFrames - 1);
      const fIdx = idx | 0;
-      const frac = idx - fIdx;
+      const interpT = idx - fIdx;
      const warpAmount = clamp(pv(parameters.warp, i), 0, 1);
      const warpMode = pv(parameters.warpMode, i);
      const phaseRand = clamp(pv(parameters.phaserand, i), 0, 1);
@@ -1368,13 +1370,13 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
        const ph = this._warpPhase(this.phase[n], warpAmount, warpMode);
        const s0 = this._sampleFrame(table[fIdx], ph);
        const s1 = this._sampleFrame(table[Math.min(this.numFrames - 1, fIdx + 1)], ph);
-        let s = s0 + (s1 - s0) * frac;
+        let s = lerp(s0, s1, interpT);
        if (warpMode === WarpMode.FLIP && this.phase[n] < warpAmount) {
          s = -s;
        }
        outL[i] += s * gainL * normalizer;
        outR[i] += s * gainR * normalizer;
-        this.phase[n] = ffrac(this.phase[n] + dPhase);
+        this.phase[n] = frac(this.phase[n] + dPhase);
      }
    }
    return true;
@@ -3,6 +3,7 @@ import { midiToFreq, noteToMidi } from './util.mjs';
 import { registerSound } from './superdough.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import { buildSamples } from './zzfx_fork.mjs';
+import { onceEnded, releaseAudioNode } from './helpers.mjs';

 export const getZZFX = (value, t) => {
  let {
@@ -83,10 +84,10 @@ export function registerZZFXSounds() {
      wave,
      (t, value, onended) => {
        const { node: o } = getZZFX({ s: wave, ...value }, t);
-        o.onended = () => {
-          o.disconnect();
+        onceEnded(o, () => {
+          releaseAudioNode(o);
          onended();
-        };
+        });
        return {
          node: o,
          stop: () => {},
@@ -5,7 +5,16 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import { Note, Interval, Scale } from '@tonaljs/tonal';
-import { register, _mod, logger, isNote, noteToMidi, removeUndefineds, getAccidentalsOffset } from '@strudel/core';
+import {
+  _mod,
+  errorLogger,
+  getAccidentalsOffset,
+  isNote,
+  logger,
+  noteToMidi,
+  register,
+  removeUndefineds,
+} from '@strudel/core';
 import { stepInNamedScale, nearestNumberIndex } from './tonleiter.mjs';

 const octavesInterval = (octaves) => (octaves <= 0 ? -1 : 1) + octaves * 7 + 'P';
@@ -294,7 +303,7 @@ export const scale = register(
            }
            if (offset != 0) scaleNote = Note.transpose(scaleNote, Interval.fromSemitones(offset));
          } catch (err) {
-            logger(`[tonal] ${err.message}`, 'error');
+            errorLogger(err, 'tonal');
            return; // will be removed
          }
        }