Properly handle multiple releases

CHANGELOG.md

@@ -1,88 +0,0 @@
-# changelog
-
-NOTE: you can generate this with `node warm.js`. it might still not be perfectly sorted...
-
-## november 2025
-
-- 2025-11-27T22:03:53+01:00 [perf] in `noise`, let noiseMix do the disconnect when it exists by jeromew in: [#1783](https://codeberg.org/uzu/strudel/pulls/1783) 
-- 2025-11-27T22:01:01+01:00 Bug Fix: Retries for sounds tab by glossing in: [#1754](https://codeberg.org/uzu/strudel/pulls/1754) 
-- 2025-11-27T20:36:46+01:00 [hydra] return the hydra object when await initHydra(..) is called by jeromew in: [#1784](https://codeberg.org/uzu/strudel/pulls/1784) 
-- 2025-11-27T20:36:14+01:00 Use errorLogger for query and tonal errors by glossing in: [#1782](https://codeberg.org/uzu/strudel/pulls/1782) 
-- 2025-11-27T20:27:10+01:00 [perf] level 5 `connect-leak` on `vowel` by jeromew in: [#1779](https://codeberg.org/uzu/strudel/pulls/1779) 
-- 2025-11-26T08:23:38+01:00 feat: add prebake script import button for loading .strudel files by daslyfe in: [#1774](https://codeberg.org/uzu/strudel/pulls/1774) 
-- 2025-11-26T07:39:28+01:00 Fix Sampler port trampling by Dayglo in: [#1717](https://codeberg.org/uzu/strudel/pulls/1717) 
-- 2025-11-25T20:59:09+01:00 Feat: Hook up octave and fix example by glossing in: [#1773](https://codeberg.org/uzu/strudel/pulls/1773) 
-- 2025-11-25T20:48:09+01:00 [perf] fix `connect-leak` in `tremolo` param by jeromew in: [#1780](https://codeberg.org/uzu/strudel/pulls/1780) 
-- 2025-11-24T17:51:20+01:00 filter modulation improvements! by daslyfe in: [#1769](https://codeberg.org/uzu/strudel/pulls/1769) 
-- 2025-11-24T01:20:53+01:00 Add o as a synonym for orbit by daslyfe in: [#1766](https://codeberg.org/uzu/strudel/pulls/1766) 
-- 2025-11-23T22:23:26+01:00 [perf] fix `connect-leak` in `fm` modulation by jeromew in: [#1758](https://codeberg.org/uzu/strudel/pulls/1758) 
-- 2025-11-23T09:47:24+01:00 Fix interoperability issue between `all` and `await initHydra()` by jeromew in: [#1663](https://codeberg.org/uzu/strudel/pulls/1663) 
-- 2025-11-23T04:23:06+01:00 Bug fix: Swap l/r gains with temp variable by glossing in: [#1768](https://codeberg.org/uzu/strudel/pulls/1768) 
-- 2025-11-23T00:52:28+01:00 FIX: prevent LFO filter modulation from popping from negative values by daslyfe in: [#1767](https://codeberg.org/uzu/strudel/pulls/1767) 
-- 2025-11-21T01:56:11+01:00 Bug Fix: Use frac due to negative frequencies from FM by glossing in: [#1759](https://codeberg.org/uzu/strudel/pulls/1759) 
-- 2025-11-20T19:48:16+01:00 [perf] fix `connect-leak` added by #1742 when noise() is not used by jeromew in: [#1757](https://codeberg.org/uzu/strudel/pulls/1757) 
-- 2025-11-20T14:51:00+01:00 [perf] fix `connect-leak` in `delay` effect by jeromew in: [#1755](https://codeberg.org/uzu/strudel/pulls/1755) 
-- 2025-11-20T14:49:41+01:00 [perf] fix `connect leak` when .noise() is in the mix by jeromew in: [#1742](https://codeberg.org/uzu/strudel/pulls/1742) 
-- 2025-11-18T23:52:45+01:00 wchooseCycles has now notes in an example by scrappy_fiddler in: [#1748](https://codeberg.org/uzu/strudel/pulls/1748) 
-- 2025-11-17T05:31:54+01:00 Feature: Partials by glossing in: [#1659](https://codeberg.org/uzu/strudel/pulls/1659) 
-- 2025-11-16T22:06:14+01:00 README: update superdough documentation by TristanMlct in: [#1741](https://codeberg.org/uzu/strudel/pulls/1741) 
-- 2025-11-16T21:08:54+01:00 Worklet optimizations by glossing in: [#1730](https://codeberg.org/uzu/strudel/pulls/1730) 
-- 2025-11-15T14:59:30+01:00 [perf] disconnect Offline AudioNode connections in generateReverb by jeromew in: [#1740](https://codeberg.org/uzu/strudel/pulls/1740) 
-- 2025-11-15T14:57:47+01:00 [perf] disconnect `send` effect AudioNode when `room` is used by jeromew in: [#1736](https://codeberg.org/uzu/strudel/pulls/1736) 
-- 2025-11-12T21:22:34+01:00 [supradough] fix: unstable filter by froos in: [#1593](https://codeberg.org/uzu/strudel/pulls/1593) 
-- 2025-11-12T21:12:07+01:00 Fix link syntax in `project-start` by Kissaki in: [#1724](https://codeberg.org/uzu/strudel/pulls/1724) 
-- 2025-11-12T21:06:13+01:00 Fix web README sample code by Kissaki in: [#1725](https://codeberg.org/uzu/strudel/pulls/1725) 
-- 2025-11-12T20:59:39+01:00 Fix typo: 'studel' -> 'strudel' by drhayes in: [#1726](https://codeberg.org/uzu/strudel/pulls/1726) 
-- 2025-11-12T15:23:41+01:00 fix for node 24 support in tests - #1718 by ausav in: [#1719](https://codeberg.org/uzu/strudel/pulls/1719) 
-- 2025-11-11T09:00:49+01:00 soundAlias example fix by PepsiiMan in: [#1720](https://codeberg.org/uzu/strudel/pulls/1720)
-- 2025-11-10T08:18:36+01:00 fix: Make Supradough package build by munshkr in: [#1711](https://codeberg.org/uzu/strudel/pulls/1711) 
-- 2025-11-10T08:18:00+01:00 added docs for spaces in scale names by ondras in: [#1715](https://codeberg.org/uzu/strudel/pulls/1715) 
-- 2025-11-10T02:44:01+01:00 Feature: LFOs for Filters by glossing in: [#1636](https://codeberg.org/uzu/strudel/pulls/1636)
-- 2025-11-05T17:07:00+01:00 improvement: sync midi messages to audio context clock by daslyfe in: [#1708](https://codeberg.org/uzu/strudel/pulls/1708) 
-- 2025-11-04T19:36:14+01:00 Add stick button mappings to gamepad implementation and improve docs by kaosuryoko in: [#1696](https://codeberg.org/uzu/strudel/pulls/1696) 
-- 2025-11-04T19:29:35+01:00 Refactor sound stopping and triggering logic in SoundsTab component by IJOL in: [#1688](https://codeberg.org/uzu/strudel/pulls/1688) 
-- 2025-11-04T19:13:21+01:00 Add setting to toggle pattern auto-start on pattern change by moumar in: [#1690](https://codeberg.org/uzu/strudel/pulls/1690) 
-- 2025-11-04T18:58:50+01:00 Voicings JSDoc by sharkeys_lunchbox in: [#1686](https://codeberg.org/uzu/strudel/pulls/1686)
-- 2025-11-01T07:50:40+01:00 FIX: Loading local samples uses too much memory by daslyfe in: [#1706](https://codeberg.org/uzu/strudel/pulls/1706) 
-
- 
-## october 2025
-
-- 2025-10-28T22:58:24+01:00 Bug Fix: Handle scale-for-notes when n also supplied by glossing in: [#1625](https://codeberg.org/uzu/strudel/pulls/1625) 
-- 2025-10-28T22:51:16+01:00 Repurpose vim shortcuts for usability by dtricks in: [#1624](https://codeberg.org/uzu/strudel/pulls/1624) 
-- 2025-10-28T22:35:21+01:00 Add support for euclidian in mondo with `bd&3:8` by TristanCacqueray in: [#1630](https://codeberg.org/uzu/strudel/pulls/1630)
-- 2025-10-27T10:42:07+01:00 Use bunny cdn for all samples and json files by yaxu in: [#1701](https://codeberg.org/uzu/strudel/pulls/1701) 
-- 2025-10-26T22:52:54+01:00 degithub - switch some samples to bunnycdn by yaxu in: [#1697](https://codeberg.org/uzu/strudel/pulls/1697) 
-- 2025-10-26T17:09:22+01:00 Fix ZZFX example by moumar in: [#1685](https://codeberg.org/uzu/strudel/pulls/1685) 
-- 2025-10-23T15:56:04+02:00 Make osc port and host configurable. Changes dependencies. by yaxu in: [#1682](https://codeberg.org/uzu/strudel/pulls/1682) 
-- 2025-10-23T03:47:31+02:00 Adds back shape to superdough by glossing in: [#1672](https://codeberg.org/uzu/strudel/pulls/1672) 
-- 2025-10-22T22:15:19+02:00 Fix sampler.mjs githubPath by jeromew in: [#1684](https://codeberg.org/uzu/strudel/pulls/1684) 
-- 2025-10-22T16:20:50+02:00 Fix onPaint for widgets by yaxu in: [#1658](https://codeberg.org/uzu/strudel/pulls/1658) 
-- 2025-10-22T15:19:12+02:00 Fix a bug introduced by #4e17cfbdd6 by milliganf in: [#1679](https://codeberg.org/uzu/strudel/pulls/1679) 
-- 2025-10-18T04:29:20+02:00 Bug Fix: Wavetable: phase wrapping at 1 and detune by glossing in: [#1620](https://codeberg.org/uzu/strudel/pulls/1620) 
-- 2025-10-16T20:26:28+02:00 github samples: default to "samples" if repository is not specified by prezmop in: [#1644](https://codeberg.org/uzu/strudel/pulls/1644) 
-- 2025-10-16T17:33:39+02:00 Docs: add example of custom chained function by dariusk in: [#1642](https://codeberg.org/uzu/strudel/pulls/1642) 
-- 2025-10-14T12:39:48+02:00 textbox by yaxu in: [#1650](https://codeberg.org/uzu/strudel/pulls/1650) 
-- 2025-10-13T07:05:57+02:00 Feature: Wavetable FM by glossing in: [#1623](https://codeberg.org/uzu/strudel/pulls/1623) 
-- 2025-10-12T20:43:42+02:00 fix: repair REPL sample sources and URL concat (#1640) by erikfox in: [#1646](https://codeberg.org/uzu/strudel/pulls/1646)
-- 2025-10-10T11:25:02+02:00 Add control-metadata by yaxu in: [#1634](https://codeberg.org/uzu/strudel/pulls/1634) 
-- 2025-10-07T22:59:39+02:00 Fix MQTT: change the trigger handler to match new hap by jurrchen in: [#1629](https://codeberg.org/uzu/strudel/pulls/1629) 
-- 2025-10-05T21:42:19+02:00 Fix case sensitivity for synonym search by vvolhejn in: [#1618](https://codeberg.org/uzu/strudel/pulls/1618) 
-- 2025-10-01T08:56:35+02:00 Optimize wavetable synth by glossing in: [#1613](https://codeberg.org/uzu/strudel/pulls/1613) 
-- 2025-10-01T02:02:33+02:00 fix: pattern switching by daslyfe in: [#1616](https://codeberg.org/uzu/strudel/pulls/1616) 
-
-## September 2025
-
-- 2025-09-29T02:10:54+02:00 fix wavetable JSON by daslyfe in: [#1611](https://codeberg.org/uzu/strudel/pulls/1611) 
-- 2025-09-28T21:28:16+02:00 rename wavetable controls to match existing naming conventions by daslyfe in: [#1610](https://codeberg.org/uzu/strudel/pulls/1610) 
-- 2025-09-27T23:28:13+02:00 Feature: Wavetable synth improvements by glossing in: [#1607](https://codeberg.org/uzu/strudel/pulls/1607) 
-- 2025-09-27T21:43:10+02:00 wavetable improvements by daslyfe in: [#1608](https://codeberg.org/uzu/strudel/pulls/1608) 
-- 2025-09-26T08:48:46+02:00 create orbit based DJ filter by daslyfe in: [#1603](https://codeberg.org/uzu/strudel/pulls/1603) 
-- 2025-09-23T13:28:20+02:00 fix: time signal by daslyfe in: [#1583](https://codeberg.org/uzu/strudel/pulls/1583) 
-- 2025-09-21T16:16:06+02:00 mondo: fix all + setcpm + setcps by froos in: [#1600](https://codeberg.org/uzu/strudel/pulls/1600) 
-- 2025-09-19T21:59:43+02:00 fix: osc error message by froos in: [#1597](https://codeberg.org/uzu/strudel/pulls/1597) 
-- 2025-09-18T21:09:56+02:00 osc: --debug flag to see incoming messages by froos in: [#1595](https://codeberg.org/uzu/strudel/pulls/1595) 
-- 2025-09-17T14:12:10+02:00 simplify osc usage by froos in: [#1588](https://codeberg.org/uzu/strudel/pulls/1588) 
-- 2025-09-16T16:59:58+02:00 dev: logger errors to console in dev mode by daslyfe in: [#1585](https://codeberg.org/uzu/strudel/pulls/1585) 
-- 2025-09-15T22:52:14+02:00 add tic80 font by froos in: [#1579](https://codeberg.org/uzu/strudel/pulls/1579) 
-- 2025-09-15T00:00:19+02:00 supradough: fix delay + add some jsdoc types by froos in: [#1578](https://codeberg.org/uzu/strudel/pulls/1578) 

packages/core/controls.mjs

@@ -72,27 +72,6 @@ export function registerControl(names, ...aliases) {
   return bag;
 }
 
-export function registerMultiControl(names, maxControls, ...aliases) {
-  names = Array.isArray(names) ? names : [names];
-  let bag = {};
-  for (let i = 1; i <= maxControls; i++) {
-    let theseAliases = [...aliases];
-    let theseNames = [...names];
-    if (i === 1) {
-      // adds e.g. fm1 as an alias for fm
-      const aliases1 = theseAliases.map((a) => `${a}1`);
-      const names1 = theseNames.map((n) => `${n}1`);
-      theseAliases = theseAliases.concat(aliases1).concat(names1);
-    } else {
-      theseAliases = theseAliases.map((a) => `${a}${i}`);
-      theseNames = theseNames.map((n) => `${n}${i}`);
-    }
-    const subBag = registerControl(theseNames, ...theseAliases);
-    bag = { ...bag, ...subBag };
-  }
-  return bag;
-}
-
 /**
  * Select a sound / sample by name. When using mininotation, you can also optionally supply 'n' and 'gain' parameters
  * separated by ':'.
@@ -401,13 +380,12 @@ export const { accelerate } = registerControl('accelerate');
  * Sets the velocity from 0 to 1. Is multiplied together with gain.
  *
  * @name velocity
- * @synonyms vel
  * @example
  * s("hh*8")
  * .gain(".4!2 1 .4!2 1 .4 1")
  * .velocity(".4 1")
  */
-export const { velocity, vel } = registerControl('velocity', 'vel');
+export const { velocity } = registerControl('velocity');
 /**
  * Controls the gain by an exponential amount.
  *
@@ -457,9 +435,6 @@ export const { attack, att } = registerControl('attack', 'att');
  * Whole numbers and simple ratios sound more natural,
  * while decimal numbers and complex ratios sound metallic.
  *
- * A number may be added afterwards to control the harmonicity of
- * any of the 8 individual FMs (e.g. `fmh2`)
- *
  * @name fmh
  * @param {number | Pattern} harmonicity
  * @example
@@ -469,40 +444,25 @@ export const { attack, att } = registerControl('attack', 'att');
  * ._scope()
  *
  */
-export const { fmh, fmh1, fmh2, fmh3, fmh4, fmh5, fmh6, fmh7, fmh8 } = registerMultiControl(['fmh', 'fmi'], 8, 'fmh');
-
+export const { fmh } = registerControl(['fmh', 'fmi'], 'fmh');
 /**
  * Sets the Frequency Modulation of the synth.
  * Controls the modulation index, which defines the brightness of the sound.
  *
- * A number may be added afterwards to control the modulation index of
- * any of the 8 individual FMs (e.g. `fm3`). Also, FMs may be routed into
- * each other with matrix commands like `fm13`, which would send `fm1` back into
- * `fm3`
- *
- * @name fmi
+ * @name fm
  * @param {number | Pattern} brightness modulation index
- * @synonyms fm
+ * @synonyms fmi
  * @example
  * note("c e g b g e")
  * .fm("<0 1 2 8 32>")
  * ._scope()
- * @example
- * s("sine").note("F1").seg(8)
- *  .fm(4).fm2(rand.mul(4)).fm3(saw.mul(8).slow(8))
- *  .fmh(1.06).fmh2(10).fmh3(0.1)
  *
  */
-export const { fmi, fmi1, fmi2, fmi3, fmi4, fmi5, fmi6, fmi7, fmi8, fm, fm1, fm2, fm3, fm4, fm5, fm6, fm7, fm8 } =
-  registerMultiControl(['fmi', 'fmh'], 8, 'fm');
-
+export const { fmi, fm } = registerControl(['fmi', 'fmh'], 'fm');
 // fm envelope
 /**
  * Ramp type of fm envelope. Exp might be a bit broken..
  *
- * A number may be added afterwards to control the envelope of
- * any of the 8 individual FMs (e.g. `fmenv4`)
- *
  * @name fmenv
  * @param {number | Pattern} type lin | exp
  * @example
@@ -514,19 +474,11 @@ export const { fmi, fmi1, fmi2, fmi3, fmi4, fmi5, fmi6, fmi7, fmi8, fm, fm1, fm2
  * ._scope()
  *
  */
-export const { fmenv, fmenv1, fmenv2, fmenv3, fmenv4, fmenv5, fmenv6, fmenv7, fmenv8 } = registerMultiControl(
-  'fmenv',
-  8,
-);
-
+export const { fmenv } = registerControl('fmenv');
 /**
  * Attack time for the FM envelope: time it takes to reach maximum modulation
  *
- * A number may be added afterwards to control the attack of the envelope of
- * any of the 8 individual FMs (e.g. `fmatt5`)
- *
  * @name fmattack
- * @synonyms fmatt
  * @param {number | Pattern} time attack time
  * @example
  * note("c e g b g e")
@@ -535,33 +487,11 @@ export const { fmenv, fmenv1, fmenv2, fmenv3, fmenv4, fmenv5, fmenv6, fmenv7, fm
  * ._scope()
  *
  */
-export const {
-  fmattack,
-  fmattack1,
-  fmattack2,
-  fmattack3,
-  fmattack4,
-  fmattack5,
-  fmattack6,
-  fmattack7,
-  fmattack8,
-  fmatt,
-  fmatt1,
-  fmatt2,
-  fmatt3,
-  fmatt4,
-  fmatt5,
-  fmatt6,
-  fmatt7,
-  fmatt8,
-} = registerMultiControl('fmattack', 8, 'fmatt');
+export const { fmattack } = registerControl('fmattack');
 
 /**
  * Waveform of the fm modulator
  *
- * A number may be added afterwards to control the waveform
- * any of the 8 individual FMs (e.g. `fmwave6`)
- *
  * @name fmwave
  * @param {number | Pattern} wave waveform
  * @example
@@ -570,19 +500,12 @@ export const {
  * n("0 1 2 3".fast(4)).chord("<Dm Am F G>").voicing().s("sawtooth").fmwave("brown").fm(.6)
  *
  */
-export const { fmwave, fmwave1, fmwave2, fmwave3, fmwave4, fmwave5, fmwave6, fmwave7, fmwave8 } = registerMultiControl(
-  'fmwave',
-  8,
-);
+export const { fmwave } = registerControl('fmwave');
 
 /**
  * Decay time for the FM envelope: seconds until the sustain level is reached after the attack phase.
  *
- * A number may be added afterwards to control the decay of the envelope of
- * any of the 8 individual FMs (e.g. `fmdec6`)
- *
  * @name fmdecay
- * @synonyms fmdec
  * @param {number | Pattern} time decay time
  * @example
  * note("c e g b g e")
@@ -592,35 +515,11 @@ export const { fmwave, fmwave1, fmwave2, fmwave3, fmwave4, fmwave5, fmwave6, fmw
  * ._scope()
  *
  */
-export const {
-  fmdecay,
-  fmdecay1,
-  fmdecay2,
-  fmdecay3,
-  fmdecay4,
-  fmdecay5,
-  fmdecay6,
-  fmdecay7,
-  fmdecay8,
-  fmdec,
-  fmdec1,
-  fmdec2,
-  fmdec3,
-  fmdec4,
-  fmdec5,
-  fmdec6,
-  fmdec7,
-  fmdec8,
-} = registerMultiControl('fmdecay', 8, 'fmdec');
-
+export const { fmdecay } = registerControl('fmdecay');
 /**
  * Sustain level for the FM envelope: how much modulation is applied after the decay phase
  *
- * A number may be added afterwards to control the sustain of the envelope of
- * any of the 8 individual FMs (e.g. `fmsus7`)
- *
  * @name fmsustain
- * @synonyms fmsus
  * @param {number | Pattern} level sustain level
  * @example
  * note("c e g b g e")
@@ -630,69 +529,10 @@ export const {
  * ._scope()
  *
  */
-export const {
-  fmsustain,
-  fmsustain1,
-  fmsustain2,
-  fmsustain3,
-  fmsustain4,
-  fmsustain5,
-  fmsustain6,
-  fmsustain7,
-  fmsustain8,
-  fmsus,
-  fmsus1,
-  fmsus2,
-  fmsus3,
-  fmsus4,
-  fmsus5,
-  fmsus6,
-  fmsus7,
-  fmsus8,
-} = registerMultiControl('fmsustain', 8, 'fmsus');
-
-/**
- * Release time for the FM envelope: how much modulation is applied after the note is released
- *
- * A number may be added afterwards to control the release of the envelope of
- * any of the 8 individual FMs (e.g. `fmrel8`)
- *
- * @name fmrelease
- * @synonyms fmrel
- * @param {number | Pattern} time release time
- *
- */
-export const {
-  fmrelease,
-  fmrelease1,
-  fmrelease2,
-  fmrelease3,
-  fmrelease4,
-  fmrelease5,
-  fmrelease6,
-  fmrelease7,
-  fmrelease8,
-  fmrel,
-  fmrel1,
-  fmrel2,
-  fmrel3,
-  fmrel4,
-  fmrel5,
-  fmrel6,
-  fmrel7,
-  fmrel8,
-} = registerMultiControl('fmrelease', 8, 'fmrel');
-
-// FM Matrix
-// Note: we do not declare top-level exports here since it would add
-// ~162 more explicit exports. This is likely fine as the most common use-case would be to at least
-// declare one other FM prior to utilizing the matrix functionality, but if we ever decide we need it,
-// TODO to add it explicitly / go with the globalThis approach
-for (let i = 0; i <= 8; i++) {
-  for (let j = 0; j <= 8; j++) {
-    registerControl(`fmi${i}${j}`, `fm${i}${j}`);
-  }
-}
+export const { fmsustain } = registerControl('fmsustain');
+// these are not really useful... skipping for now
+export const { fmrelease } = registerControl('fmrelease');
+export const { fmvelocity } = registerControl('fmvelocity');
 
 /**
  * Select the sound bank to use. To be used together with `s`. The bank name (+ "_") will be prepended to the value of `s`.
@@ -1454,8 +1294,6 @@ 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');
 
@@ -1464,8 +1302,6 @@ 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');
 
@@ -1474,22 +1310,8 @@ 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 lpdepthfreq
- * @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, lpdepthfreq } = registerControl('lpdepthfrequency', 'lpdepthfreq');
 
 /**
  * Shape of the LFO for the lowpass filter
@@ -1539,18 +1361,6 @@ export const { bpsync } = registerControl('bpsync');
  */
 export const { bpdepth } = registerControl('bpdepth');
 
-/**
- * Depth of the LFO for the bandpass filter, in HZ
- *
- * @name bpdepthfrequency
- * @synonyms bpdepthfreq
- * @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, bpdepthfreq } = registerControl('bpdepthfrequency', 'bpdepthfreq');
-
 /**
  * Shape of the LFO for the bandpass filter
  *
@@ -1599,18 +1409,6 @@ export const { hpsync } = registerControl('hpsync');
  */
 export const { hpdepth } = registerControl('hpdepth');
 
-/**
- * Depth of the LFO for the hipass filter, in hz
- *
- * @name hpdepthfrequency
- * @synonyms hpdepthfreq
- * @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, hpdepthfreq } = registerControl('hpdepthfrequency', 'hpdepthfreq');
-
 /**
  * Shape of the LFO for the highpass filter
  *
@@ -2022,12 +1820,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").scale("F:minor").s('supersaw').octave("<0 1 2 3>")
+ * n("0,4,7").s('supersquare').octave("<3 4 5 6>").osc()
+ * @superDirtOnly
  */
-export const { octave, oct } = registerControl('octave', 'oct');
+export const { octave } = registerControl('octave');
 
 // ['ophatdecay'],
 // TODO: example
@@ -2035,7 +1833,6 @@ export const { octave, oct } = registerControl('octave', 'oct');
  * 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(
@@ -2043,7 +1840,7 @@ export const { octave, oct } = registerControl('octave', 'oct');
  *   s("~ sd ~ sd").delay(.5).delaytime(.125).orbit(2)
  * )
  */
-export const { orbit } = registerControl('orbit', 'o');
+export const { orbit } = registerControl('orbit');
 // 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
@@ -2786,17 +2583,3 @@ export const scrub = register(
   },
   false,
 );
-
-/**
- * Transient shaper. Gives independent control over the emphasis on transients
- * and sustains
- *
- * @name transient
- * @param {number | Pattern} attack Emphasis on transients; between -1 (deaccentuate) and 1 (accentuate)
- * @param {number | Pattern} sustain Emphasis on the sustains; between -1 (deaccentuate) and 1 (accentuate)
- * @example
- * s("bd").transient("<-1 -0.5 0 0.5 1>")
- * @example
- * s("hh*16").bank("tr909").transient("<-1:1 1:-1>")
- */
-export const { transient } = registerControl(['transient', 'transsustain']);

packages/core/pattern.mjs

@@ -25,7 +25,7 @@ import {
   stringifyValues,
 } from './util.mjs';
 import drawLine from './drawLine.mjs';
-import { errorLogger, logger } from './logger.mjs';
+import { 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) {
-      errorLogger(err, 'query');
+      logger(`[query]: ${err.message}`, 'error');
       return [];
     }
   }
@@ -574,8 +574,7 @@ export class Pattern {
    * Returns a new Pattern, which only returns haps that meet the given test.
    * @param {Function} hap_test - a function which returns false for haps to be removed from the pattern
    * @returns Pattern
-   * @example
-   * s("bd*8").velocity(rand).filterHaps((h) => (h.whole.begin % 1) < h.value.velocity)
+   * @noAutocomplete
    */
   filterHaps(hap_test) {
     return new Pattern((state) => this.query(state).filter(hap_test));
@@ -586,11 +585,7 @@ export class Pattern {
    * inside haps.
    * @param {Function} value_test
    * @returns Pattern
-   * @example
-   * const drums = s("bd sd bd sd")
-   * kick: drums.filterValues((v) => v.s === 'bd').duck(2)
-   * snare: drums.filterValues((v) => v.s === 'sd')
-   * bass: s("saw!4").note("G#1").lpf(80).lpenv(4).orbit(2)
+   * @noAutocomplete
    */
   filterValues(value_test) {
     return new Pattern((state) => this.query(state).filter((hap) => value_test(hap.value))).setSteps(this._steps);
@@ -1592,13 +1587,7 @@ export const func = curry((a, b) => reify(b).func(a));
  *
  * @param {string | string[]} name name of the function, or an array of names to be used as synonyms
  * @param {function} func function with 1 or more params, where last is the current pattern
- * @param {bool} patternify defaults to true; if set to false, you will have more control over the arguments to `func` as they will be
- *   in their raw form and it will be up to you to patternify them and/or query them for values
- * @example
- * const vlpf = register('vlpf', (freq, pat) => {
- *   return pat.fmap((v) => ({...v, cutoff: freq * (v.velocity ?? 1) }));
- * })
- * s("saw").seg(8).velocity(rand).vlpf(800)
+ * @noAutocomplete
  *
  */
 export function register(name, func, patternify = true, preserveSteps = false, join = (x) => x.innerJoin()) {
@@ -2245,7 +2234,7 @@ export const brak = register('brak', function (pat) {
 });
 
 /**
- * Reverse all cycles in a pattern. See also `revv` for reversing a whole pattern.
+ * Reverse all haps in a pattern
  *
  * @name rev
  * @memberof Pattern
@@ -2277,23 +2266,6 @@ 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.
@@ -2687,13 +2659,8 @@ export const hsl = register('hsl', (h, s, l, pat) => {
 /**
  * Tags each Hap with an identifier. Good for filtering. The function populates Hap.context.tags (Array).
  * @name tag
+ * @noAutocomplete
  * @param {string} tag anything unique
- * @example
- * s("saw!16").note("F1")
- *   .lpf(tri.range(40, 80).slow(4)).lpenv(5).lpq(4).lpd(0.15)
- *   .when(rand.late(0.1).gte(0.5), x => x.transpose("12").tag('altered'))
- *   .when(rand.late(0.2).gte(0.5), x => x.s("square").tag('altered'))
- *   .when("<0 1>", x => x.filter((hap) => hap.hasTag('altered')))
  */
 Pattern.prototype.tag = function (tag) {
   return this.withContext((ctx) => ({ ...ctx, tags: (ctx.tags || []).concat([tag]) }));
@@ -2704,16 +2671,15 @@ Pattern.prototype.tag = function (tag) {
  * @name filter
  * @param {Function} test function to test Hap
  * @example
- * s("hh!7 oh").filter(hap => hap.value.s === 'hh')
+ * s("hh!7 oh").filter(hap => hap.value.s==='hh')
  */
 export const filter = register('filter', (test, pat) => pat.withHaps((haps) => haps.filter(test)));
 
 /**
  * Filters haps by their begin time
  * @name filterWhen
+ * @noAutocomplete
  * @param {Function} test function to test Hap.whole.begin
- * @example
- * oneCycle: s("bd*4").filterWhen((t) => t < 1)
  */
 export const filterWhen = register('filterWhen', (test, pat) => pat.filter((h) => test(h.whole.begin)));
 
@@ -3721,3 +3687,26 @@ Pattern.prototype.phases = function (list) {
 export const phases = (list) => {
   return _ensureListPattern(list).as('phases');
 };
+
+/**
+ * Establishes a signal chain. Can be called in sequence like pat.chain(...).chain(...) and so forth
+ * and/or in a single .chain(..., ..., etc) call. The arguments to `chain` are _patterns_ which each act like
+ * a self-contained pattern and follow the normal [signal chain](https://strudel.cc/learn/effects/).
+ *
+ * If multiple sound generators are present within the chain, they will be mixed in at the location where
+ * they are declared.
+ *
+ * @name chain
+ * @memberof Pattern
+ * @param {Pattern | Pattern[]} patterns Patterns to combine into a single chain
+ * @returns Pattern
+ */
+Pattern.prototype.chain = function (...pats) {
+  pats = pats.map(reify);
+  return this.withValue((v) => (vEff) => {
+    const currChain = v.chain ?? [];
+    return { ...v, chain: currChain.concat(vEff) };
+  }).appLeft(parray(pats));
+};
+
+export const chain = (pats) => pure({}).chain(pats);

packages/core/repl.mjs

@@ -152,9 +152,9 @@ export function repl({
         // allows muting a pattern x with x_ or _x
         return silence;
       }
-      if (id.includes('$')) {
+      if (id === '$') {
         // allows adding anonymous patterns with $:
-        id = `${id}${anonymousIndex}`;
+        id = `$${anonymousIndex}`;
         anonymousIndex++;
       }
       pPatterns[id] = this;
@@ -215,19 +215,8 @@ 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)) {
-          // 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);
-          }
+          patterns.push(value.withState((state) => state.setControls({ id: key })));
         }
         if (eachTransform) {
           // Explicit lambda so only element (not index and array) are passed
@@ -238,13 +227,14 @@ export function repl({
         pattern = eachTransform(pattern);
       }
       if (allTransforms.length) {
-        for (const transform of allTransforms) {
-          pattern = transform(pattern);
+        for (let i in allTransforms) {
+          pattern = allTransforms[i](pattern);
         }
       }
 
       if (!isPattern(pattern)) {
-        pattern = silence;
+        const message = `got "${typeof evaluated}" instead of pattern`;
+        throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
       }
       logger(`[eval] code updated`);
       pattern = await setPattern(pattern, autostart);

packages/core/signal.mjs

@@ -524,7 +524,7 @@ export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
  * @example
  * wchooseCycles(["bd",10], ["hh",1], ["sd",1]).s().fast(8)
  * @example
- * wchooseCycles(["c c c",5], ["a a a",3], ["f f f",1]).fast(4).note()
+ * wchooseCycles(["bd bd bd",5], ["hh hh hh",3], ["sd sd sd",1]).fast(4).s()
  * @example
  * // The probability can itself be a pattern
  * wchooseCycles(["bd(3,8)","<5 0>"], ["hh hh hh",3]).fast(4).s()

packages/core/test/pattern.test.mjs

@@ -586,18 +586,6 @@ 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', () => {

packages/hydra/hydra.mjs

@@ -35,7 +35,6 @@ export async function initHydra(options = {}) {
       hydra.synth.s0.init({ src: canvas });
     }
   }
-  return hydra;
 }
 
 export function clearHydra() {

packages/midi/midi.mjs

@@ -479,24 +479,14 @@ Pattern.prototype.midi = function (midiport, options = {}) {
 
 let listeners = {};
 const refs = {};
-const refsByChan = {};
 
 /**
  * MIDI input: Opens a MIDI input port to receive MIDI control change messages.
- *
- * The output is a function that accepts a midi cc value to query as well as (optionally) a midi channel
  * @param {string | number} input MIDI device name or index defaulting to 0
- * @returns {function(number, number=): Pattern} A function from (cc, channel?) to a pattern.
- *   When queried, the pattern will produces the most recently received midi value (normalized to 0 to 1)
- *   that came through that cc number (and channel, if provided)
+ * @returns {Function}
  * @example
- * const cc = await midin('IAC Driver Bus 1')
+ * let cc = await midin('IAC Driver Bus 1')
  * note("c a f e").lpf(cc(0).range(0, 1000)).lpq(cc(1).range(0, 10)).sound("sawtooth")
- * @example
- * const allCC = await midin('IAC Driver Bus 1')
- * const cc = (ccNum) => allCC(ccNum, 2) // just channel 2
- * note("c a f e").s("saw")
- *   .when(cc(0).gt(0), x => x.postgain(0))
  */
 export async function midin(input) {
   if (isPattern(input)) {
@@ -521,24 +511,17 @@ export async function midin(input) {
       }`,
     );
   }
-  refs[input] ??= {};
-  refsByChan[input] ??= {};
-  const cc = (cc, chan) => {
-    if (chan !== undefined) {
-      return ref(() => refsByChan[input][cc]?.[chan] || 0);
-    }
-    return ref(() => refs[input][cc] || 0);
-  };
+  // ensure refs for this input are initialized
+  if (!refs[input]) {
+    refs[input] = {};
+  }
+  const cc = (cc) => ref(() => refs[input][cc] || 0);
 
   listeners[input] && device.removeListener('midimessage', listeners[input]);
   listeners[input] = (e) => {
-    const ccNum = e.dataBytes[0];
+    const cc = e.dataBytes[0];
     const v = e.dataBytes[1];
-    const chan = e.message.channel;
-    const scaled = v / 127;
-    refsByChan[input][ccNum] ??= {};
-    refsByChan[input][ccNum][chan] = scaled;
-    refs[input][ccNum] = scaled;
+    refs[input] && (refs[input][cc] = v / 127);
   };
   device.addListener('midimessage', listeners[input]);
   return cc;

packages/sampler/sample-server.mjs

@@ -9,7 +9,6 @@ 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) => {
@@ -55,6 +54,7 @@ async function getBanks(directory, flat = false) {
     banks[bank].push(subDir);
     return subDir;
   });
+  banks._base = `http://localhost:5432`;
   return { banks, files };
 }
 
@@ -134,6 +134,8 @@ 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();

packages/soundfonts/fontloader.mjs

@@ -1,12 +1,12 @@
 import { noteToMidi, freqToMidi, getSoundIndex } from '@strudel/core';
 import {
+  cleanupNodes,
   getAudioContext,
   registerSound,
   getParamADSR,
   getADSRValues,
   getPitchEnvelope,
   getVibratoOscillator,
-  onceEnded,
 } from '@strudel/webaudio';
 import gm from './gm.mjs';
 
@@ -162,22 +162,17 @@ export function registerSoundfonts() {
         const node = bufferSource.connect(envGain);
         const holdEnd = time + duration;
         getParamADSR(node.gain, attack, decay, sustain, release, 0, 0.3, time, holdEnd, 'linear');
-        let envEnd = holdEnd + release + 0.01;
-
         // vibrato
         let vibratoOscillator = getVibratoOscillator(bufferSource.detune, value, time);
         // pitch envelope
         getPitchEnvelope(bufferSource.detune, value, time, holdEnd);
-
-        bufferSource.stop(envEnd);
-        const stop = (releaseTime) => {};
-        onceEnded(bufferSource, () => {
-          bufferSource.disconnect();
-          vibratoOscillator?.stop();
-          node.disconnect();
+        bufferSource.onended = () => {
+          cleanupNodes([bufferSource, vibratoOscillator, node]);
           onended();
-        });
-        return { node, stop };
+        };
+        const envEnd = holdEnd + release + 0.01;
+        bufferSource.stop(envEnd);
+        return { node, stop: bufferSource.stop };
       },
       { type: 'soundfont', prebake: true, fonts },
     );

packages/superdough/helpers.mjs

@@ -1,7 +1,7 @@
 import { getAudioContext } from './audioContext.mjs';
-import { logger } from './logger.mjs';
-import { getNoiseBuffer } from './noise.mjs';
 import { clamp, nanFallback, midiToFreq, noteToMidi } from './util.mjs';
+import { getNoiseBuffer } from './noise.mjs';
+import { logger } from './logger.mjs';
 
 export const noises = ['pink', 'white', 'brown', 'crackle'];
 
@@ -191,7 +191,8 @@ 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, cycle) {
+
+export function createFilter(context, start, end, params, cps) {
   let {
     frequency,
     anchor,
@@ -201,14 +202,12 @@ export function createFilter(context, start, end, params, cps, cycle) {
     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 });
@@ -239,27 +238,9 @@ export function createFilter(context, start, end, params, cps, cycle) {
   if (sync != null) {
     rate = cps * sync;
   }
-  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 };
+  const lfoValues = { depth, dcoffset, skew, shape, frequency: rate };
+  getParamLfo(context, frequencyParam, start, end, lfoValues);
+  return filter;
 }
 
 // stays 1 until .5, then fades out
@@ -281,15 +262,7 @@ export function drywet(dry, wet, wetAmount = 0) {
   let mix = ac.createGain();
   dry_gain.connect(mix);
   wet_gain.connect(mix);
-  return {
-    node: mix,
-    onended: () => {
-      dry_gain.disconnect(mix);
-      wet_gain.disconnect(mix);
-      dry.disconnect(dry_gain);
-      wet.disconnect(wet_gain);
-    },
-  };
+  return mix;
 }
 
 let curves = ['linear', 'exponential'];
@@ -324,10 +297,6 @@ 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;
   }
@@ -349,17 +318,25 @@ export function webAudioTimeout(audioContext, onComplete, startTime, stopTime) {
   constantNode.connect(zeroGain);
 
   // Schedule the `onComplete` callback to occur at `stopTime`
-  onceEnded(constantNode, () => {
-    releaseAudioNode(zeroGain);
-    releaseAudioNode(constantNode);
+  constantNode.onended = () => {
+    // Ensure garbage collection
+    try {
+      zeroGain.disconnect();
+    } catch {
+      // pass
+    }
+    try {
+      constantNode.disconnect();
+    } catch {
+      // pass
+    }
     onComplete();
-  });
+  };
   constantNode.start(startTime);
   constantNode.stop(stopTime);
   return constantNode;
 }
-
-const mod = (freq, type = 'sine') => {
+const mod = (freq, range = 1, type = 'sine') => {
   const ctx = getAudioContext();
   let osc;
   if (noises.includes(type)) {
@@ -371,89 +348,64 @@ const mod = (freq, type = 'sine') => {
     osc.type = type;
     osc.frequency.value = freq;
   }
-  osc.start();
-  return osc;
-};
 
-const fm = (frequencyparam, harmonicityRatio, wave = 'sine') => {
+  osc.start();
+  const g = new GainNode(ctx, { gain: range });
+  osc.connect(g); // -range, range
+  return { node: g, stop: (t) => osc.stop(t) };
+};
+const fm = (frequencyparam, harmonicityRatio, modulationIndex, wave = 'sine') => {
   const carrfreq = frequencyparam.value;
   const modfreq = carrfreq * harmonicityRatio;
-  return { osc: mod(modfreq, wave), freq: modfreq };
+  const modgain = modfreq * modulationIndex;
+  return mod(modfreq, modgain, wave);
 };
-
 export function applyFM(param, value, begin) {
-  const ac = getAudioContext();
-  const toStop = []; // fm oscillators we will expose `stop` for
-  const fms = {};
-  // Matrix
-  for (let i = 1; i <= 8; i++) {
-    for (let j = 0; j <= 8; j++) {
-      let control;
-      if (i === j + 1) {
-        // Standard fm3 -> fm2 -> fm1 -> param usage
-        const iS = i === 1 ? '' : i;
-        control = `fmi${iS}`;
-      } else {
-        control = `fmi${i}${j}`;
-      }
-      const amt = value[control];
-      if (!amt) continue;
-      let io = [];
-      for (let [isMod, idx] of [
-        [true, i], // source
-        [false, j], // target
-      ]) {
-        if (idx === 0) {
-          io.push(param);
-          continue;
-        }
-        if (!fms[idx]) {
-          const idxS = idx === 1 ? '' : idx;
-          const { osc, freq } = fm(param, value[`fmh${idxS}`] ?? 1, value[`fmwave${idxS}`] ?? 'sine');
-          toStop.push(osc);
-          const toCleanup = [osc]; // nodes we want to cleanup after oscillator `stop`
-          const adsr = ['attack', 'decay', 'sustain', 'release'].map((s) => value[`fm${s}${idxS}`]);
-          let output = osc;
-          if (adsr.some((v) => v !== undefined)) {
-            const envGain = ac.createGain();
-            const [attack, decay, sustain, release] = getADSRValues(adsr);
-            const holdEnd = begin + value.duration;
-            const fmEnvelopeType = value[`fmenv${idxS}`] ?? 'exp';
-            getParamADSR(
-              envGain.gain,
-              attack,
-              decay,
-              sustain,
-              release,
-              0,
-              1,
-              begin,
-              holdEnd,
-              fmEnvelopeType === 'exp' ? 'exponential' : 'linear',
-            );
-            toCleanup.push(envGain);
-            output = osc.connect(envGain);
-          }
-          fms[idx] = { input: osc.frequency, output, freq, osc, toCleanup };
-        }
-        const { input, output, freq, osc, toCleanup } = fms[idx];
-        const g = gainNode(amt * freq);
-        io.push(isMod ? output.connect(g) : input);
-        cleanupOnEnd(osc, [...toCleanup, g]);
-      }
-      if (!io[1]) {
-        logger(
-          `[superdough] control ${control} failed to connect FM ${i} to target ${j} due to missing frequency parameter (likely because fm${j} is noise)`,
-          'warning',
-        );
-        continue;
-      }
-      io[0].connect(io[1]);
+  const {
+    fmh: fmHarmonicity = 1,
+    fmi: fmModulationIndex,
+    fmenv: fmEnvelopeType = 'exp',
+    fmattack: fmAttack,
+    fmdecay: fmDecay,
+    fmsustain: fmSustain,
+    fmrelease: fmRelease,
+    fmvelocity: fmVelocity,
+    fmwave: fmWaveform = 'sine',
+    duration,
+  } = value;
+  let modulator;
+  let stop = () => {};
+
+  if (fmModulationIndex) {
+    const ac = getAudioContext();
+    const envGain = ac.createGain();
+    const fmmod = fm(param, fmHarmonicity, fmModulationIndex, fmWaveform);
+
+    modulator = fmmod.node;
+    stop = fmmod.stop;
+    if (![fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity].some((v) => v !== undefined)) {
+      // no envelope by default
+      modulator.connect(param);
+    } else {
+      const [attack, decay, sustain, release] = getADSRValues([fmAttack, fmDecay, fmSustain, fmRelease]);
+      const holdEnd = begin + duration;
+      getParamADSR(
+        envGain.gain,
+        attack,
+        decay,
+        sustain,
+        release,
+        0,
+        1,
+        begin,
+        holdEnd,
+        fmEnvelopeType === 'exp' ? 'exponential' : 'linear',
+      );
+      modulator.connect(envGain);
+      envGain.connect(param);
     }
   }
-  return {
-    stop: (t) => toStop.forEach((m) => m?.stop(t)),
-  };
+  return { stop };
 }
 
 // Saturation curves
@@ -553,7 +505,7 @@ export const getDistortion = (distort, postgain, algorithm) => {
 };
 
 export const getFrequencyFromValue = (value, defaultNote = 36) => {
-  let { note, freq, octave = 0 } = value;
+  let { note, freq } = value;
   note = note || defaultNote;
   if (typeof note === 'string') {
     note = noteToMidi(note); // e.g. c3 => 48
@@ -562,62 +514,17 @@ export const getFrequencyFromValue = (value, defaultNote = 36) => {
   if (!freq && typeof note === 'number') {
     freq = midiToFreq(note); // + 48);
   }
-  freq *= Math.pow(2, octave);
+
   return Number(freq);
 };
 
-// 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) => {
-  const onended = callback;
-  node.onended = function cleanup() {
-    onended && onended();
-    this.onended = null;
-  };
-};
-
-export const releaseAudioNode = (node) => {
+export const cleanupNode = (node, time) => {
   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();
-
-  // 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);
-  }
+  node.disconnect?.();
+  node.parameters?.get('end')?.setValueAtTime(0, 0);
+  node.stop?.(time);
 };
 
-// Once the `anchor` node has ended, release all nodes in `toCleanup`
-export const cleanupOnEnd = (anchor, toCleanup) => {
-  onceEnded(anchor, () => toCleanup.forEach((n) => releaseAudioNode(n)));
+export const cleanupNodes = (nodes, time) => {
+  nodes.forEach((n) => cleanupNode(n, time));
 };

packages/superdough/noise.mjs

@@ -65,9 +65,8 @@ 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,
+    node: noiseMix,
     stop: (time) => noiseOscillator?.stop(time),
   };
 }

packages/superdough/sampler.mjs

@@ -1,14 +1,7 @@
-import { getBaseURL, getCommonSampleInfo } from './util.mjs';
+import { getCommonSampleInfo } from './util.mjs';
 import { registerSound, registerWaveTable } from './index.mjs';
 import { getAudioContext } from './audioContext.mjs';
-import {
-  getADSRValues,
-  getParamADSR,
-  getPitchEnvelope,
-  getVibratoOscillator,
-  onceEnded,
-  releaseAudioNode,
-} from './helpers.mjs';
+import { getADSRValues, cleanupNodes, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
 import { logger } from './logger.mjs';
 
 const bufferCache = {}; // string: Promise<ArrayBuffer>
@@ -218,7 +211,7 @@ export async function fetchSampleMap(url) {
     // not a browser
     return;
   }
-  const base = getBaseURL(url);
+  const base = url.split('/').slice(0, -1).join('/');
   if (typeof fetch === 'undefined') {
     // skip fetch when in node / testing
     return;
@@ -243,6 +236,12 @@ export async function fetchSampleMap(url) {
  *  sd: '808sd/SD0010.WAV'
  *  }, 'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/');
  * s("[bd ~]*2, [~ hh]*2, ~ sd")
+ * @example
+ * samples('shabda:noise,chimp:2')
+ * s("noise <chimp:0*2 chimp:1>")
+ * @example
+ * samples('shabda/speech/fr-FR/f:chocolat')
+ * s("chocolat*4")
  */
 
 export const samples = async (sampleMap, baseUrl = sampleMap._base || '', options = {}) => {
@@ -287,16 +286,14 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
 
   const { bufferSource, sliceDuration, offset } = await getSampleBufferSource(value, bank, resolveUrl);
 
-  if (!bufferSource) {
-    logger(`[sampler] could not load "${s}:${n}"`, 'error');
+  // 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;
   }
-
-  // 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);
+  if (!bufferSource) {
+    logger(`[sampler] could not load "${s}:${n}"`, 'error');
     return;
   }
 
@@ -322,19 +319,11 @@ 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);
-  onceEnded(bufferSource, function () {
-    bufferSource.disconnect();
-    vibratoOscillator?.stop();
-    node.disconnect();
-    out.disconnect();
+  const stop = () => {
+    cleanupNodes([bufferSource, vibratoOscillator, node]);
     onended();
-  });
-  let envEnd = holdEnd + release + 0.01;
-  bufferSource.stop(envEnd);
-  const stop = (endTime) => {
-    bufferSource.stop(endTime);
   };
-  const handle = { node: out, bufferSource, stop };
+  const handle = { node: out, stop };
 
   // cut groups
   if (cut !== undefined) {

packages/superdough/superdough.mjs

@@ -7,9 +7,22 @@ This program is free software: you can redistribute it and/or modify it under th
 import './feedbackdelay.mjs';
 import './reverb.mjs';
 import './vowel.mjs';
-import { nanFallback, _mod, cycleToSeconds, pickAndRename } from './util.mjs';
+import { _mod, clamp, cycleToSeconds, pickAndRename } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
-import { createFilter, gainNode, getCompressor, getDistortion, getLfo, getWorklet, effectSend } from './helpers.mjs';
+import {
+  cleanupNode,
+  cleanupNodes,
+  createFilter,
+  gainNode,
+  getADSRValues,
+  getCompressor,
+  getDistortion,
+  getLfo,
+  getParamADSR,
+  getWorklet,
+  effectSend,
+  webAudioTimeout,
+} from './helpers.mjs';
 import { map } from 'nanostores';
 import { logger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
@@ -159,6 +172,9 @@ let defaultDefaultValues = {
   i: 1,
   velocity: 1,
   fft: 8,
+  tremolodepth: 1,
+  tremolophase: 0,
+  drive: 0.69,
 };
 
 const defaultDefaultDefaultValues = Object.freeze({ ...defaultDefaultValues });
@@ -263,8 +279,8 @@ let audioReady;
 export async function initAudioOnFirstClick(options) {
   if (!audioReady) {
     audioReady = new Promise((resolve) => {
-      document.addEventListener('mousedown', async function listener() {
-        document.removeEventListener('mousedown', listener);
+      document.addEventListener('click', async function listener() {
+        document.removeEventListener('click', listener);
         await initAudio(options);
         resolve();
       });
@@ -274,7 +290,7 @@ export async function initAudioOnFirstClick(options) {
 }
 
 let controller;
-export function getSuperdoughAudioController() {
+function getSuperdoughAudioController() {
   if (controller == null) {
     controller = new SuperdoughAudioController(getAudioContext());
   }
@@ -287,11 +303,11 @@ export function connectToDestination(input, channels) {
 
 function getPhaser(time, end, frequency = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
   const ac = getAudioContext();
-  const lfo = getLfo(ac, time, end, { frequency, depth: sweep * 2 });
+  const lfoGain = getLfo(ac, time, end, { frequency, depth: sweep * 2 });
 
   //filters
-  const numStages = 1; //num of filters in series
-  let fOffset = 282; //for backward compat in #1800
+  const numStages = 2; //num of filters in series
+  let fOffset = 0;
   const filterChain = [];
   for (let i = 0; i < numStages; i++) {
     const filter = ac.createBiquadFilter();
@@ -300,11 +316,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);
 
-    lfo.connect(filter.detune);
+    lfoGain.connect(filter.detune);
     fOffset += 282;
+    if (i > 0) {
+      filterChain[i - 1].connect(filter);
+    }
     filterChain.push(filter);
   }
-  return { filterChain, lfo };
+  return filterChain[filterChain.length - 1];
 }
 
 function getFilterType(ftype) {
@@ -388,44 +407,17 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   }
   // destructure
   let {
-    tremolo,
-    tremolosync,
-    tremolodepth = 1,
-    tremoloskew,
-    tremolophase = 0,
-    tremoloshape,
     s = getDefaultValue('s'),
     bank,
     source,
-    gain = getDefaultValue('gain'),
     postgain = getDefaultValue('postgain'),
-    density = getDefaultValue('density'),
     duckorbit,
     duckonset,
     duckattack,
     duckdepth,
     djf,
-    // filters
-    fanchor = getDefaultValue('fanchor'),
     release = 0,
-
-    //phaser
-    phaserrate,
-    phaserdepth = getDefaultValue('phaserdepth'),
-    phasersweep,
-    phasercenter,
-    //
-    coarse,
-
-    crush,
     dry,
-    shape,
-    shapevol = getDefaultValue('shapevol'),
-    distort,
-    distortvol = getDefaultValue('distortvol'),
-    distorttype = getDefaultValue('distorttype'),
-    pan,
-    vowel,
     delay = getDefaultValue('delay'),
     delayfeedback = getDefaultValue('delayfeedback'),
     delaysync = getDefaultValue('delaysync'),
@@ -440,20 +432,21 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     irspeed,
     irbegin,
     i = getDefaultValue('i'),
-    velocity = getDefaultValue('velocity'),
     analyze, // analyser wet
     fft = getDefaultValue('fft'), // fftSize 0 - 10
-    compressor: compressorThreshold,
-    compressorRatio,
-    compressorKnee,
-    compressorAttack,
-    compressorRelease,
-    transient,
-    transsustain,
+    chain: subChains = [],
   } = value;
 
   delaytime = delaytime ?? cycleToSeconds(delaysync, cps);
 
+  if (value.wtPosSynced != null) {
+    value.wtPosRate /= cps;
+  }
+
+  if (value.wtWarpSynced != null) {
+    value.wtWarpRate /= cps;
+  }
+
   const orbitChannels = mapChannelNumbers(
     multiChannelOrbits && orbit > 0 ? [orbit * 2 - 1, orbit * 2] : getDefaultValue('channels'),
   );
@@ -464,18 +457,8 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     audioController.duck(duckorbit, t, duckonset, duckattack, duckdepth);
   }
 
-  gain = applyGainCurve(nanFallback(gain, 1));
   postgain = applyGainCurve(postgain);
-  shapevol = applyGainCurve(shapevol);
-  distortvol = applyGainCurve(distortvol);
   delay = applyGainCurve(delay);
-  velocity = applyGainCurve(velocity);
-  tremolodepth = applyGainCurve(tremolodepth);
-  gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
-
-  const end = t + hapDuration;
-  const endWithRelease = end + release;
-  const chainID = Math.round(Math.random() * 1000000);
 
   // oldest audio nodes will be destroyed if maximum polyphony is exceeded
   for (let i = 0; i <= activeSoundSources.size - maxPolyphony; i++) {
@@ -488,8 +471,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     activeSoundSources.delete(chainID);
   }
 
-  let audioNodes = [];
-
   if (['-', '~', '_'].includes(s)) {
     return;
   }
@@ -497,236 +478,318 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     s = `${bank}_${s}`;
     value.s = s;
   }
-
-  // get source AudioNode
-  let sourceNode;
-  if (source) {
-    sourceNode = source(t, value, hapDuration, cps);
-  } else if (getSound(s)) {
-    const { onTrigger } = getSound(s);
-    const onEnded = () => {
-      audioNodes.forEach((n) => n?.disconnect());
-      activeSoundSources.delete(chainID);
-    };
-    const soundHandle = await onTrigger(t, value, onEnded, cps);
-
-    if (soundHandle) {
-      sourceNode = soundHandle.node;
-      activeSoundSources.set(chainID, new WeakRef(soundHandle)); // allow GC
+  const end = t + hapDuration;
+  let fullRelease = release;
+  for (const ch of subChains) {
+    fullRelease = Math.max(fullRelease, ch.release ?? 0);
+  }
+  const fullEndWithRelease = end + fullRelease + 0.02;
+  // The following ensures we run through the value once as normal _and then_ through all the subchains
+  subChains = [value, ...subChains];
+  let prev;
+  for (const ch of subChains) {
+    const audioNodes = [];
+    const chain = [];
+    ch.duration = hapDuration;
+    const endWithRelease = end + Math.max(release, ch.release ?? 0);
+    const chainID = Math.round(Math.random() * 1000000);
+    // get source AudioNode
+    let sourceNode;
+    if (source) {
+      sourceNode = source(t, ch, hapDuration, cps);
+      chain.push(sourceNode);
+    } else if (ch.s !== undefined && getSound(ch.s)) {
+      const { onTrigger } = getSound(ch.s);
+      const soundHandle = await onTrigger(t, ch, () => {}, cps);
+      if (soundHandle) {
+        sourceNode = soundHandle.node;
+        activeSoundSources.set(chainID, new WeakRef(soundHandle)); // allow GC
+      }
+      chain.push(sourceNode);
+    } else if (ch.s !== undefined) {
+      throw new Error(`sound ${ch.s} not found! Is it loaded?`);
     }
-  } else {
-    throw new Error(`sound ${s} not found! Is it loaded?`);
-  }
-  if (!sourceNode) {
-    // if onTrigger does not return anything, we will just silently skip
-    // this can be used for things like speed(0) in the sampler
-    return;
-  }
-
-  if (ac.currentTime > t) {
-    logger('[webaudio] skip hap: still loading', ac.currentTime - t);
-    return;
-  }
-  const chain = []; // audio nodes that will be connected to each other sequentially
-  chain.push(sourceNode);
-  stretch !== undefined && chain.push(getWorklet(ac, 'phase-vocoder-processor', { pitchFactor: stretch }));
-
-  transient !== undefined &&
-    chain.push(
-      getWorklet(
-        ac,
-        'transient-processor',
-        {},
-        {
-          processorOptions: {
-            attack: transient,
-            sustain: transsustain,
-            begin: t,
-            end: endWithRelease,
-          },
-        },
-      ),
+    if (ac.currentTime > t) {
+      logger('[webaudio] skip hap: still loading', ac.currentTime - t);
+      return;
+    }
+    const prevExists = prev !== undefined;
+    const sourceExists = sourceNode !== undefined;
+    if (!prevExists && !sourceExists) {
+      // if there are no signals, we will just silently continue
+      // this can be used for things like speed(0) in the sampler
+      continue;
+    } else if (prevExists && !sourceExists) {
+      // just FX -- apply ADSR now
+      const adsrParams = [ch.attack, ch.decay, ch.sustain, ch.release];
+      if (adsrParams.some((v) => v != null)) {
+        const [attack, decay, sustain, release] = getADSRValues(adsrParams, 'linear', [0.001, 0.05, 0.6, 0.01]);
+        const adsrNode = gainNode(1);
+        chain.push(adsrNode);
+        getParamADSR(adsrNode.gain, attack, decay, sustain, release, 0, 1, t, t + hapDuration, 'linear');
+      }
+    }
+    webAudioTimeout(
+      ac,
+      () => {
+        audioNodes.forEach((n) => n?.disconnect());
+        activeSoundSources.delete(chainID);
+      },
+      0,
+      fullEndWithRelease,
     );
+    let {
+      gain = getDefaultValue('gain'),
+      velocity = getDefaultValue('velocity'),
+      shapevol = getDefaultValue('shapevol'),
+      distorttype = getDefaultValue('distorttype'),
+      distortvol = getDefaultValue('distortvol'),
+      tremolodepth = getDefaultValue('tremolodepth'),
+      phaserdepth = getDefaultValue('phaserdepth'),
+      delay = getDefaultValue('delay'),
+      delayfeedback = getDefaultValue('delayfeedback'),
+      delaysync = getDefaultValue('delaysync'),
+      delaytime,
+    } = ch;
+    delaytime = delaytime ?? cycleToSeconds(delaysync, cps);
+    gain = applyGainCurve(gain);
+    velocity = applyGainCurve(velocity);
+    gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
+    shapevol = applyGainCurve(shapevol);
+    distortvol = applyGainCurve(distortvol);
+    tremolodepth = applyGainCurve(tremolodepth);
+    ch.drive = ch.drive ?? getDefaultValue('drive');
+    ch.fanchor = ch.fanchor ?? getDefaultValue('fanchor');
+    ch.stretch !== undefined && chain.push(getWorklet(ac, 'phase-vocoder-processor', { pitchFactor: ch.stretch }));
 
-  // gain stage
-  chain.push(gainNode(gain));
+    // gain stage
+    chain.push(gainNode(gain));
 
-  // filter
-  const ftype = getFilterType(value.ftype);
-
-  if (value.cutoff !== undefined) {
-    const lpMap = {
-      frequency: 'cutoff',
-      q: 'resonance',
-      attack: 'lpattack',
-      decay: 'lpdecay',
-      sustain: 'lpsustain',
-      release: 'lprelease',
-      env: 'lpenv',
-      anchor: 'fanchor',
-      model: 'ftype',
-      drive: 'drive',
-      rate: 'lprate',
-      sync: 'lpsync',
-      depth: 'lpdepth',
-      depthfrequency: 'lpdepthfrequency',
-      shape: 'lpshape',
-      dcoffset: 'lpdc',
-      skew: 'lpskew',
-    };
-    const lpParams = pickAndRename(value, lpMap);
-    lpParams.type = 'lowpass';
-    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') {
-      const { filter: lpf2, lfo: lfo2 } = lp();
-      chain.push(lpf2);
-      lfo2 && audioNodes.push(lfo2);
+    //filter
+    const ftype = getFilterType(ch.ftype);
+    if (ch.cutoff !== undefined) {
+      const lpMap = {
+        frequency: 'cutoff',
+        q: 'resonance',
+        attack: 'lpattack',
+        decay: 'lpdecay',
+        sustain: 'lpsustain',
+        release: 'lprelease',
+        env: 'lpenv',
+        anchor: 'fanchor',
+        model: 'ftype',
+        drive: 'drive',
+        rate: 'lprate',
+        sync: 'lpsync',
+        depth: 'lpdepth',
+        shape: 'lpshape',
+        dcoffset: 'lpdc',
+        skew: 'lpskew',
+      };
+      const lpParams = pickAndRename(ch, lpMap);
+      lpParams.type = 'lowpass';
+      let lp = () => createFilter(ac, t, end, lpParams, cps);
+      chain.push(lp());
+      if (ch.ftype === '24db') {
+        chain.push(lp());
+      }
     }
-  }
 
-  if (value.hcutoff !== undefined) {
-    const hpMap = {
-      frequency: 'hcutoff',
-      q: 'hresonance',
-      attack: 'hpattack',
-      decay: 'hpdecay',
-      sustain: 'hpsustain',
-      release: 'hprelease',
-      env: 'hpenv',
-      anchor: 'fanchor',
-      model: 'ftype',
-      drive: 'drive',
-      rate: 'hprate',
-      sync: 'hpsync',
-      depth: 'hpdepth',
-      depthfrequency: 'hpdepthfrequency',
-      shape: 'hpshape',
-      dcoffset: 'hpdc',
-      skew: 'hpskew',
-    };
-    const hpParams = pickAndRename(value, hpMap);
-    hpParams.type = 'highpass';
-    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') {
-      const { filter: hpf2, lfo: lfo2 } = hp();
-      chain.push(hpf2);
-      lfo2 && audioNodes.push(lfo2);
+    if (ch.hcutoff !== undefined) {
+      const hpMap = {
+        frequency: 'hcutoff',
+        q: 'hresonance',
+        attack: 'hpattack',
+        decay: 'hpdecay',
+        sustain: 'hpsustain',
+        release: 'hprelease',
+        env: 'hpenv',
+        anchor: 'fanchor',
+        model: 'ftype',
+        drive: 'drive',
+        rate: 'hprate',
+        sync: 'hpsync',
+        depth: 'hpdepth',
+        shape: 'hpshape',
+        dcoffset: 'hpdc',
+        skew: 'hpskew',
+      };
+      const hpParams = pickAndRename(ch, hpMap);
+      hpParams.type = 'highpass';
+      let hp = () => createFilter(ac, t, end, hpParams, cps);
+      chain.push(hp());
+      if (ch.ftype === '24db') {
+        chain.push(hp());
+      }
     }
-  }
 
-  if (value.bandf !== undefined) {
-    const bpMap = {
-      frequency: 'bandf',
-      q: 'bandq',
-      attack: 'bpattack',
-      decay: 'bpdecay',
-      sustain: 'bpsustain',
-      release: 'bprelease',
-      env: 'bpenv',
-      anchor: 'fanchor',
-      model: 'ftype',
-      drive: 'drive',
-      rate: 'bprate',
-      sync: 'bpsync',
-      depth: 'bpdepth',
-      depthfrequency: 'bpdepthfrequency',
-      shape: 'bpshape',
-      dcoffset: 'bpdc',
-      skew: 'bpskew',
-    };
-    const bpParams = pickAndRename(value, bpMap);
-    bpParams.type = 'bandpass';
-    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') {
-      const { filter: bpf2, lfo: lfo2 } = bp();
-      chain.push(bpf2);
-      lfo2 && audioNodes.push(lfo2);
+    if (ch.bandf !== undefined) {
+      const bpMap = {
+        frequency: 'bandf',
+        q: 'bandq',
+        attack: 'bpattack',
+        decay: 'bpdecay',
+        sustain: 'bpsustain',
+        release: 'bprelease',
+        env: 'bpenv',
+        anchor: 'fanchor',
+        model: 'ftype',
+        drive: 'drive',
+        rate: 'bprate',
+        sync: 'bpsync',
+        depth: 'bpdepth',
+        shape: 'bpshape',
+        dcoffset: 'bpdc',
+        skew: 'bpskew',
+      };
+      const bpParams = pickAndRename(ch, bpMap);
+      bpParams.type = 'bandpass';
+      let bp = () => createFilter(ac, t, end, bpParams, cps);
+      chain.push(bp());
+      if (ftype === '24db') {
+        chain.push(bp());
+      }
     }
+
+    if (ch.vowel !== undefined) {
+      const vowelFilter = ac.createVowelFilter(ch.vowel);
+      chain.push(vowelFilter);
+    }
+
+    // effects
+    ch.coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse: ch.coarse }));
+    ch.crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush: ch.crush }));
+    ch.shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape: ch.shape, postgain: shapevol }));
+    ch.distort !== undefined && chain.push(getDistortion(ch.distort, distortvol, distorttype));
+
+    let tremolo = ch.tremolo;
+    if (ch.tremolosync != null) {
+      tremolo = cps * ch.tremolosync;
+    }
+
+    if (tremolo !== undefined) {
+      // Allow clipping of modulator for more dynamic possiblities, and to prevent speaker overload
+      // EX:  a triangle waveform will clip like this /-\ when the depth is above 1
+      const gain = Math.max(1 - tremolodepth, 0);
+      const amGain = new GainNode(ac, { gain });
+
+      const time = cycle / cps;
+      const lfo = getLfo(ac, t, endWithRelease, {
+        skew: ch.tremoloskew ?? (ch.tremoloshape != null ? 0.5 : 1),
+        frequency: tremolo,
+        depth: tremolodepth,
+        time,
+        dcoffset: 0,
+        shape: ch.tremoloshape,
+        phaseoffset: ch.tremolophase,
+        min: 0,
+        max: 1,
+        curve: 1.5,
+      });
+      lfo.connect(amGain.gain);
+      chain.push(amGain);
+    }
+
+    ch.compressor !== undefined &&
+      chain.push(
+        getCompressor(
+          ac,
+          ch.compressor,
+          ch.compressorRatio,
+          ch.compressorKnee,
+          ch.compressorAttack,
+          ch.compressorRelease,
+        ),
+      );
+
+    // panning
+    if (ch.pan !== undefined) {
+      const panner = ac.createStereoPanner();
+      panner.pan.value = 2 * ch.pan - 1;
+      chain.push(panner);
+    }
+    // phaser
+    if (ch.phaserrate !== undefined && phaserdepth > 0) {
+      const phaserFX = getPhaser(t, endWithRelease, ch.phaserrate, phaserdepth, ch.phasercenter, ch.phasersweep);
+      chain.push(phaserFX);
+    }
+    // delay
+    if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
+      const dry = gainNode(1);
+      delayfeedback = clamp(delayfeedback, 0, 0.98);
+      const delayNode = ac.createFeedbackDelay(1, delaytime, delayfeedback);
+      const wetDelay = gainNode(delay);
+      const dryDelay = gainNode(ch.dry ?? 1);
+      const sum = new GainNode(ac, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+      dry.connect(dryDelay).connect(sum);
+      dry.connect(delayNode).connect(wetDelay).connect(sum);
+      const stop = () => cleanupNodes([dryDelay, delayNode, dry, wetDelay]);
+      chain.push({ input: dry, output: sum, disconnect: stop });
+    }
+    // reverb
+    if (ch.room > 0) {
+      let roomIR;
+      if (ch.ir !== undefined) {
+        let url;
+        let sample = getSound(ch.ir);
+        if (Array.isArray(sample)) {
+          url = sample.data.samples[ch.i % sample.data.samples.length];
+        } else if (typeof sample === 'object') {
+          url = Object.values(sample.data.samples).flat()[ch.i % Object.values(sample.data.samples).length];
+        }
+        roomIR = await loadBuffer(url, ac, ch.ir, 0);
+      }
+      const dry = gainNode(1);
+      const reverbNode = ac.createReverb(
+        ch.roomsize,
+        ch.roomfade,
+        ch.roomlp,
+        ch.roomdim,
+        roomIR,
+        ch.irspeed,
+        ch.irbegin,
+      );
+      const wetReverb = gainNode(ch.room);
+      const dryReverb = gainNode(ch.dry ?? 1);
+      const sum = new GainNode(ac, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+      dry.connect(dryReverb).connect(sum);
+      dry.connect(reverbNode).connect(wetReverb).connect(sum);
+      const stop = () => cleanupNodes([dryReverb, reverbNode, dry, wetReverb]);
+      chain.push({ input: dry, output: sum, disconnect: stop });
+    }
+    if (prevExists) {
+      const prevOut = prev.output ?? prev;
+      if (sourceExists) {
+        // mix with the previous output
+        const mixer = new GainNode(ac, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+        prevOut.connect(mixer);
+        chain.push(mixer);
+      } else {
+        prevOut.connect(chain[0]);
+      }
+    }
+    // connect chain elements together
+    chain.slice(1).reduce((last, current) => {
+      const lastC = last.output ?? last;
+      const currentC = current.input ?? current;
+      lastC.connect(currentC);
+      return current.output ?? current;
+    }, chain[0]);
+    audioNodes.push(...chain);
+    prev = chain[chain.length - 1];
   }
-
-  if (vowel !== undefined) {
-    const vowelFilter = ac.createVowelFilter(vowel);
-    chain.push(vowelFilter);
-  }
-
-  // effects
-  coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse }));
-  crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush }));
-  shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape, postgain: shapevol }));
-  distort !== undefined && chain.push(getDistortion(distort, distortvol, distorttype));
-
-  if (tremolosync != null) {
-    tremolo = cps * tremolosync;
-  }
-
-  if (value.wtPosSynced != null) {
-    value.wtPosRate /= cps;
-  }
-
-  if (value.wtWarpSynced != null) {
-    value.wtWarpRate /= cps;
-  }
-
-  if (tremolo !== undefined) {
-    // Allow clipping of modulator for more dynamic possiblities, and to prevent speaker overload
-    // EX:  a triangle waveform will clip like this /-\ when the depth is above 1
-    const gain = Math.max(1 - tremolodepth, 0);
-    const amGain = new GainNode(ac, { gain });
-
-    const time = cycle / cps;
-    const lfo = getLfo(ac, t, endWithRelease, {
-      skew: tremoloskew ?? (tremoloshape != null ? 0.5 : 1),
-      frequency: tremolo,
-      depth: tremolodepth,
-      time,
-      dcoffset: 0,
-      shape: tremoloshape,
-      phaseoffset: tremolophase,
-      min: 0,
-      max: 1,
-      curve: 1.5,
-    });
-    lfo.connect(amGain.gain);
-    audioNodes.push(lfo);
-    chain.push(amGain);
-  }
-
-  compressorThreshold !== undefined &&
-    chain.push(
-      getCompressor(ac, compressorThreshold, compressorRatio, compressorKnee, compressorAttack, compressorRelease),
-    );
-
-  // panning
-  if (pan !== undefined) {
-    const panner = ac.createStereoPanner();
-    panner.pan.value = 2 * pan - 1;
-    chain.push(panner);
-  }
-  // phaser
-  if (phaserrate !== undefined && phaserdepth > 0) {
-    const { filterChain, lfo } = getPhaser(t, endWithRelease, phaserrate, phaserdepth, phasercenter, phasersweep);
-    audioNodes.push(lfo);
-    chain.push(...filterChain);
-  }
+  const outerAudioNodes = [];
+  const outerChain = [prev];
 
   // last gain
   const post = new GainNode(ac, { gain: postgain });
-  chain.push(post);
+  outerChain.push(post);
 
   // delay
   if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
     orbitBus.getDelay(delaytime, delayfeedback, t);
     const send = orbitBus.sendDelay(post, delay);
-    audioNodes.push(send);
+    outerAudioNodes.push(send);
   }
   // reverb
   if (room > 0) {
@@ -743,7 +806,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     }
     orbitBus.getReverb(roomsize, roomfade, roomlp, roomdim, roomIR, irspeed, irbegin);
     const send = orbitBus.sendReverb(post, room);
-    audioNodes.push(send);
+    outerAudioNodes.push(send);
   }
 
   if (djf != null) {
@@ -754,20 +817,32 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   if (analyze) {
     const analyserNode = getAnalyserById(analyze, 2 ** (fft + 5));
     const analyserSend = effectSend(post, analyserNode, 1);
-    audioNodes.push(analyserSend);
+    outerAudioNodes.push(analyserSend);
   }
   if (dry != null) {
     dry = applyGainCurve(dry);
     const dryGain = new GainNode(ac, { gain: dry });
-    chain.push(dryGain);
+    outerChain.push(dryGain);
     orbitBus.connectToOutput(dryGain);
   } else {
     orbitBus.connectToOutput(post);
   }
-
   // connect chain elements together
-  chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);
-  audioNodes = audioNodes.concat(chain);
+  outerChain.slice(1).reduce((last, current) => {
+    const lastC = last.output ?? last;
+    const currentC = current.input ?? current;
+    lastC.connect(currentC);
+    return current.output ?? current;
+  }, outerChain[0]);
+  outerAudioNodes.push(...outerChain);
+  webAudioTimeout(
+    ac,
+    () => {
+      outerAudioNodes.forEach((n) => n?.disconnect?.());
+    },
+    0,
+    fullEndWithRelease,
+  );
 };
 
 export const superdoughTrigger = (t, hap, ct, cps) => {

packages/superdough/synth.mjs

@@ -3,6 +3,7 @@ import { registerSound, soundMap } from './superdough.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import {
   applyFM,
+  cleanupNodes,
   gainNode,
   getADSRValues,
   getFrequencyFromValue,
@@ -12,7 +13,6 @@ import {
   getVibratoOscillator,
   getWorklet,
   noises,
-  releaseAudioNode,
   webAudioTimeout,
 } from './helpers.mjs';
 import { logger } from './logger.mjs';
@@ -47,31 +47,21 @@ export function registerSynthSounds() {
           'linear',
           [0.001, 0.05, 0.6, 0.01],
         );
-
+        const { node: o, stop } = getOscillator(s, t, value);
         // turn down
         const g = gainNode(0.3);
-
-        let sound = getOscillator(s, t, value, () => {
-          g.disconnect();
+        o.onended = () => {
+          cleanupNodes([o, g]);
           onended();
-        });
-
-        let { node: o, stop, triggerRelease } = sound;
-
-        const { duration } = value;
-
-        const envGain = gainNode(1);
-        let node = o.connect(g).connect(envGain);
-        const holdEnd = t + duration;
+        };
+        const node = o.connect(g).connect(gainNode(1));
+        const holdEnd = t + value.duration;
         getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');
         const envEnd = holdEnd + release + 0.01;
-        triggerRelease?.(envEnd);
         stop(envEnd);
         return {
           node,
-          stop: (endTime) => {
-            stop(endTime);
-          },
+          stop,
         };
       },
       { type: 'synth', prebake: true },
@@ -111,12 +101,7 @@ export function registerSynthSounds() {
       const mix = gainNode(mixGain);
 
       o.onended = () => {
-        o.disconnect();
-        g.disconnect();
-        sat.disconnect();
-        noise.node.disconnect();
-        noiseGain.disconnect();
-        mix.disconnect();
+        cleanupNodes([o, g, sat, noise.node, noiseGain]);
         onended();
       };
 
@@ -134,13 +119,10 @@ export function registerSynthSounds() {
       mix.gain.linearRampToValueAtTime(0, end);
 
       o.stop(end);
-      noise.stop(end);
 
       return {
         node,
-        stop: (endTime) => {
-          o.stop(endTime);
-        },
+        stop: o.stop,
       };
     },
     { type: 'synth', prebake: true },
@@ -184,28 +166,22 @@ export function registerSynthSounds() {
       getPitchEnvelope(o.parameters.get('detune'), value, begin, holdend);
       const vibratoOscillator = getVibratoOscillator(o.parameters.get('detune'), value, begin);
       const fm = applyFM(o.parameters.get('frequency'), value, begin);
-      let envGain = gainNode(1);
-      envGain = o.connect(envGain);
+      const node = o.connect(gainNode(1));
 
-      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 0.3 * gainAdjustment, begin, holdend, 'linear');
+      getParamADSR(node.gain, attack, decay, sustain, release, 0, 0.3 * gainAdjustment, begin, holdend, 'linear');
 
-      let timeoutNode = webAudioTimeout(
+      const timeoutNode = webAudioTimeout(
         ac,
         () => {
-          releaseAudioNode(o);
+          cleanupNodes([o, fm, vibratoOscillator]);
           onended();
-          fm?.stop();
-          vibratoOscillator?.stop();
         },
         begin,
         end,
       );
-
       return {
-        node: envGain,
-        stop: (time) => {
-          timeoutNode.stop(time);
-        },
+        node,
+        stop: timeoutNode.stop,
       };
     },
     { prebake: true, type: 'synth' },
@@ -258,29 +234,21 @@ export function registerSynthSounds() {
           outputChannelCount: [2],
         },
       );
-
       o.port.postMessage({ codeText: byteBeatExpression, byteBeatStartTime, frequency });
-
-      let envGain = gainNode(1);
-      envGain = o.connect(envGain);
-
-      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
-
-      let timeoutNode = webAudioTimeout(
+      const node = o.connect(gainNode(1));
+      getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
+      const timeoutNode = webAudioTimeout(
         ac,
         () => {
-          releaseAudioNode(o);
+          cleanupNodes([node, o]);
           onended();
         },
         begin,
         end,
       );
-
       return {
-        node: envGain,
-        stop: (time) => {
-          timeoutNode.stop(time);
-        },
+        node,
+        stop: timeoutNode.stop,
       };
     },
     { prebake: true, type: 'synth' },
@@ -330,33 +298,26 @@ export function registerSynthSounds() {
       getPitchEnvelope(o.parameters.get('detune'), value, begin, holdend);
       const vibratoOscillator = getVibratoOscillator(o.parameters.get('detune'), value, begin);
       const fm = applyFM(o.parameters.get('frequency'), value, begin);
-      let envGain = gainNode(1);
-      envGain = o.connect(envGain);
+      const node = o.connect(gainNode(1));
 
-      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
+      getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
       let lfo;
       if (pwsweep != 0) {
         lfo = getLfo(ac, begin, end, { frequency: pwrate, depth: pwsweep });
         lfo.connect(o.parameters.get('pulsewidth'));
       }
-      let timeoutNode = webAudioTimeout(
+      const timeoutNode = webAudioTimeout(
         ac,
         () => {
-          releaseAudioNode(o);
-          releaseAudioNode(lfo);
+          cleanupNodes([node, o, lfo, fm, vibratoOscillator]);
           onended();
-          fm?.stop();
-          vibratoOscillator?.stop();
         },
         begin,
         end,
       );
-
       return {
-        node: envGain,
-        stop: (time) => {
-          timeoutNode.stop(time);
-        },
+        node,
+        stop: timeoutNode.stop,
       };
     },
     { prebake: true, type: 'synth' },
@@ -377,31 +338,26 @@ export function registerSynthSounds() {
         let { density } = value;
         sound = getNoiseOscillator(s, t, density);
 
-        let { node: o, stop, triggerRelease } = sound;
+        let { node: o, stop } = sound;
 
         // turn down
         const g = gainNode(0.3);
 
         const { duration } = value;
 
-        o.onended = () => {
-          o.disconnect();
-          g.disconnect();
-          onended();
-        };
-
         const envGain = gainNode(1);
         let node = o.connect(g).connect(envGain);
         const holdEnd = t + duration;
         getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');
+        o.onended = () => {
+          cleanupNodes([node, o, g]);
+          onended();
+        };
         const envEnd = holdEnd + release + 0.01;
-        triggerRelease?.(envEnd);
         stop(envEnd);
         return {
           node,
-          stop: (endTime) => {
-            stop(endTime);
-          },
+          stop,
         };
       },
       { type: 'synth', prebake: true },
@@ -455,7 +411,7 @@ export function waveformN(partials, phases, type) {
 }
 
 // expects one of waveforms as s
-export function getOscillator(s, t, value, onended) {
+export function getOscillator(s, t, value) {
   const { duration, noise = 0 } = value;
   const partials = value.partials ?? value.n;
   let o;
@@ -477,6 +433,7 @@ export function getOscillator(s, t, value, onended) {
   }
   // set frequency
   o.frequency.value = getFrequencyFromValue(value);
+  o.start(t);
 
   let vibratoOscillator = getVibratoOscillator(o.detune, value, t);
 
@@ -488,24 +445,14 @@ export function getOscillator(s, t, value, onended) {
   if (noise) {
     noiseMix = getNoiseMix(o, noise, t);
   }
-
-  o.onended = () => {
-    noiseMix || o.disconnect();
-    noiseMix?.node.disconnect();
-    onended();
+  const stop = (time) => {
+    fmModulator.stop(time);
+    vibratoOscillator?.stop(time);
+    noiseMix?.stop(time);
+    o.stop(time);
   };
-  o.start(t);
-
   return {
     node: noiseMix?.node || o,
-    stop: (time) => {
-      fmModulator.stop(time);
-      vibratoOscillator?.stop(time);
-      noiseMix?.stop(time);
-      o.stop(time);
-    },
-    triggerRelease: (time) => {
-      // envGain?.stop(time);
-    },
+    stop,
   };
 }

packages/superdough/util.mjs

@@ -114,13 +114,3 @@ 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('/');
-  }
-};

packages/superdough/vowel.mjs

@@ -45,8 +45,7 @@ if (typeof GainNode !== 'undefined') {
         throw new Error('vowel: unknown vowel ' + letter);
       }
       const { gains, qs, freqs } = vowelFormant[letter];
-      this.makeupGain = ac.createGain();
-      this.audioNodes = [];
+      const makeupGain = ac.createGain();
       for (let i = 0; i < 5; i++) {
         const gain = ac.createGain();
         gain.gain.value = gains[i];
@@ -54,25 +53,14 @@ if (typeof GainNode !== 'undefined') {
         filter.type = 'bandpass';
         filter.Q.value = qs[i];
         filter.frequency.value = freqs[i];
-        super.connect(filter);
+        this.connect(filter);
         filter.connect(gain);
-        this.audioNodes.push(filter);
-        gain.connect(this.makeupGain);
-        this.audioNodes.push(gain);
+        gain.connect(makeupGain);
       }
-      this.makeupGain.gain.value = 8; // how much makeup gain to add?
+      makeupGain.gain.value = 8; // how much makeup gain to add?
+      this.connect = (target) => makeupGain.connect(target);
       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) {

packages/superdough/wavetable.mjs

@@ -1,15 +1,15 @@
 import { getAudioContext, registerSound } from './index.mjs';
-import { getBaseURL, getCommonSampleInfo } from './util.mjs';
+import { getCommonSampleInfo } from './util.mjs';
 import {
   applyFM,
   applyParameterModulators,
+  cleanupNodes,
   getADSRValues,
   getFrequencyFromValue,
   getParamADSR,
   getPitchEnvelope,
   getVibratoOscillator,
   getWorklet,
-  releaseAudioNode,
   webAudioTimeout,
 } from './helpers.mjs';
 import { logger } from './logger.mjs';
@@ -190,7 +190,6 @@ 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;
@@ -201,7 +200,7 @@ export const tables = async (url, frameLen, json, options = {}) => {
   }
   return fetch(url)
     .then((res) => res.json())
-    .then((json) => _processTables(json, base, frameLen, options))
+    .then((json) => _processTables(json, url, frameLen, options))
     .catch((error) => {
       console.error(error);
       throw new Error(`error loading "${url}"`);
@@ -319,18 +318,12 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
   const timeoutNode = webAudioTimeout(
     ac,
     () => {
-      releaseAudioNode(source);
-      vibratoOscillator?.stop();
-      fm?.stop();
-      wtPosModulators?.disconnect();
-      wtWarpModulators?.disconnect();
+      cleanupNodes([source, vibratoOscillator, fm, node, wtPosModulators, wtWarpModulators]);
       onended();
     },
     t,
     envEnd,
   );
-  handle.stop = (time) => {
-    timeoutNode.stop(time);
-  };
+  handle.stop = timeoutNode.stop;
   return handle;
 }

packages/superdough/worklets.mjs

@@ -11,9 +11,6 @@ const PI = Math.PI;
 const TWO_PI = 2 * PI;
 const INVSR = 1 / sampleRate;
 
-const timeToCoeff = (t) => 1 - Math.exp(-INVSR / t);
-const dbToLin = (db) => Math.pow(10, db / 20);
-
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const mod = (n, m) => ((n % m) + m) % m;
 const lerp = (a, b, n) => n * (b - a) + a;
@@ -511,14 +508,13 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
     ];
   }
   process(_input, outputs, params) {
-    if (currentTime >= params.end[0]) {
-      // should terminate
-      return false;
-    }
     if (currentTime <= params.begin[0]) {
-      // keep alive
       return true;
     }
+    if (currentTime >= params.end[0]) {
+      // this.port.postMessage({ type: 'onended' });
+      return false;
+    }
     const output = outputs[0];
     const voices = params.voices[0]; // k-rate
     for (let i = 0; i < output[0].length; i++) {
@@ -536,7 +532,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 = frac(freqVoice * INVSR);
+        const dt = ffrac(freqVoice * INVSR);
         this.phase[n] = this.phase[n] ?? Math.random();
         const v = waveshapes.sawblep(this.phase[n], dt);
 
@@ -547,9 +543,8 @@ 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 = tmp;
+        gainR = gainL;
       }
     }
     return true;
@@ -1343,7 +1338,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 interpT = idx - fIdx;
+      const frac = 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);
@@ -1373,13 +1368,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 = lerp(s0, s1, interpT);
+        let s = s0 + (s1 - s0) * frac;
         if (warpMode === WarpMode.FLIP && this.phase[n] < warpAmount) {
           s = -s;
         }
         outL[i] += s * gainL * normalizer;
         outR[i] += s * gainR * normalizer;
-        this.phase[n] = frac(this.phase[n] + dPhase);
+        this.phase[n] = ffrac(this.phase[n] + dPhase);
       }
     }
     return true;
@@ -1387,82 +1382,3 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
 }
 
 registerProcessor('wavetable-oscillator-processor', WavetableOscillatorProcessor);
-
-class TransientProcessor extends AudioWorkletProcessor {
-  static get parameterDescriptors() {
-    return [];
-  }
-
-  constructor(options) {
-    super();
-    this.gainCoeff = timeToCoeff(0.2);
-    this.avgGain = 1;
-    let {
-      attackTime = 0.003,
-      sustainTime = 0.08,
-      attack = 0,
-      sustain = 0,
-      sensitivity = 0.1,
-      mix = 1,
-      begin = 0,
-      end = 0,
-    } = options.processorOptions;
-    attackTime = clamp(attackTime, 0.0005, 0.05);
-    sustainTime = clamp(sustainTime, 0.01, 0.5);
-    this.attackCoeff = timeToCoeff(attackTime);
-    this.sustainCoeff = timeToCoeff(sustainTime);
-    this.attackAmt = clamp(attack, -1, 1);
-    this.sustainAmt = clamp(sustain, -1, 1);
-    this.scaling = 0.5 + 5 * clamp(sensitivity, 0, 1);
-    this.mix = clamp(mix, 0, 1);
-    this.begin = begin;
-    this.end = end;
-    this.attackEnv = new Float32Array(2); // assume stereo
-    this.sustainEnv = new Float32Array(2);
-  }
-
-  process(inputs, outputs, _params) {
-    const input = inputs[0];
-    const output = outputs[0];
-    if (currentTime >= this.end) {
-      return false;
-    }
-    if (currentTime <= this.begin) {
-      return true;
-    }
-    const channels = input.length;
-    if (channels > this.attackEnv.length) {
-      this.attackEnv = new Float32Array(channels);
-      this.sustainEnv = new Float32Array(channels);
-    }
-    let avgGain = this.avgGain;
-    for (let ch = 0; ch < channels; ch++) {
-      let attEnv = this.attackEnv[ch];
-      let susEnv = this.sustainEnv[ch];
-      for (let n = 0; n < blockSize; n++) {
-        const sample = input[ch][n];
-        const x = Math.abs(sample);
-        attEnv = lerp(attEnv, x, this.attackCoeff);
-        susEnv = lerp(susEnv, x, this.sustainCoeff);
-        const peakiness = clamp((this.scaling * (attEnv - susEnv)) / (susEnv + 1e-6), -1.5, 1.5);
-        const attScale = peakiness > 0 ? peakiness : 0;
-        const susScale = peakiness < 0 ? -peakiness : 0;
-        const attackGain = dbToLin(this.attackAmt * attScale * 18);
-        const sustainGain = dbToLin(this.sustainAmt * susScale * 36);
-        const gain = clamp(attackGain * sustainGain, 0, 8);
-        avgGain = lerp(avgGain, gain, this.gainCoeff);
-        const makeup = avgGain > 1e-3 ? 1 / avgGain : 1;
-        const wet = sample * gain * makeup;
-        let y = lerp(sample, wet, this.mix);
-        y /= 1 + Math.abs(y); // soft clip
-        output[ch][n] = y;
-      }
-      this.attackEnv[ch] = attEnv;
-      this.sustainEnv[ch] = susEnv;
-    }
-    this.avgGain = avgGain;
-    return true;
-  }
-}
-
-registerProcessor('transient-processor', TransientProcessor);

packages/superdough/zzfx.mjs

@@ -3,7 +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';
+import { cleanupNode } from './helpers.mjs';
 
 export const getZZFX = (value, t) => {
   let {
@@ -84,10 +84,10 @@ export function registerZZFXSounds() {
       wave,
       (t, value, onended) => {
         const { node: o } = getZZFX({ s: wave, ...value }, t);
-        onceEnded(o, () => {
-          releaseAudioNode(o);
+        o.onended = () => {
+          cleanupNode(o);
           onended();
-        });
+        };
         return {
           node: o,
           stop: () => {},

packages/tonal/tonal.mjs

@@ -5,16 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import { Note, Interval, Scale } from '@tonaljs/tonal';
-import {
-  _mod,
-  errorLogger,
-  getAccidentalsOffset,
-  isNote,
-  logger,
-  noteToMidi,
-  register,
-  removeUndefineds,
-} from '@strudel/core';
+import { register, _mod, logger, isNote, noteToMidi, removeUndefineds, getAccidentalsOffset } from '@strudel/core';
 import { stepInNamedScale, nearestNumberIndex } from './tonleiter.mjs';
 
 const octavesInterval = (octaves) => (octaves <= 0 ? -1 : 1) + octaves * 7 + 'P';
@@ -303,7 +294,7 @@ export const scale = register(
             }
             if (offset != 0) scaleNote = Note.transpose(scaleNote, Interval.fromSemitones(offset));
           } catch (err) {
-            errorLogger(err, 'tonal');
+            logger(`[tonal] ${err.message}`, 'error');
             return; // will be removed
           }
         }

tools/dbpatch/package.json

@@ -1,5 +1,4 @@
 {
-  "name": "dbpatch",
   "dependencies": {
     "csv": "^6.3.11"
   },

warm.js

@@ -1,14 +0,0 @@
-fetch('https://codeberg.org/api/v1/repos/uzu/strudel/pulls?state=closed&page=1')
-  .then((res) => res.json())
-  .then((pulls) => {
-    const r = pulls
-      .filter((pull) => pull.merged)
-      .sort((a, b) => new Date(b.closed_at) - new Date(a.closed_at))
-      .map((pull) => `${pull.closed_at} ${pull.title} by ${pull.user.login || '?'} in: [#${pull.number}](${pull.url}) `)
-      .join('\n');
-    console.log(r);
-  });
-
-/*
-
-  */

website/src/repl/components/button/action-button.jsx

@@ -8,34 +8,3 @@ export function ActionButton({ children, label, labelIsHidden, className, ...but
     </button>
   );
 }
-
-export function SpecialActionButton(props) {
-  const { className, ...buttonProps } = props;
-
-  return (
-    <ActionButton
-      {...buttonProps}
-      className={cx('bg-background p-2 max-w-[300px] rounded-md hover:opacity-50', className)}
-    />
-  );
-}
-
-export function ActionInput({ label, className, ...props }) {
-  return (
-    <label className={cx('inline-flex items-center cursor-pointer', className)}>
-      <input {...props} className="sr-only peer" />
-
-      <span className="inline-flex items-center peer-hover:opacity-50">{label}</span>
-    </label>
-  );
-}
-
-export function SpecialActionInput({ className, ...props }) {
-  return (
-    <ActionInput
-      {...props}
-      className={className}
-      label={<span className="bg-background p-2 max-w-[300px] rounded-md">{props.label}</span>}
-    />
-  );
-}

website/src/repl/components/panel/ImportPrebakeScriptButton.jsx

@@ -1,29 +0,0 @@
-import { errorLogger } from '@strudel/core';
-import { useSettings, storePrebakeScript } from '../../../settings.mjs';
-import { SpecialActionInput } from '../button/action-button';
-
-async function importScript(script) {
-  const reader = new FileReader();
-  reader.readAsText(script);
-
-  reader.onload = () => {
-    const text = reader.result;
-    storePrebakeScript(text);
-  };
-
-  reader.onerror = () => {
-    errorLogger(new Error('failed to import prebake script'), 'importScript');
-  };
-}
-export function ImportPrebakeScriptButton() {
-  const settings = useSettings();
-
-  return (
-    <SpecialActionInput
-      type="file"
-      label="import prebake script"
-      accept=".strudel"
-      onChange={(e) => importScript(e.target.files[0])}
-    />
-  );
-}

website/src/repl/components/panel/SettingsTab.jsx

@@ -7,8 +7,6 @@ import { AudioDeviceSelector } from './AudioDeviceSelector.jsx';
 import { AudioEngineTargetSelector } from './AudioEngineTargetSelector.jsx';
 import { confirmDialog } from '../../util.mjs';
 import { DEFAULT_MAX_POLYPHONY, setMaxPolyphony, setMultiChannelOrbits } from '@strudel/webaudio';
-import { ActionButton, SpecialActionButton } from '../button/action-button.jsx';
-import { ImportPrebakeScriptButton } from './ImportPrebakeScriptButton.jsx';
 
 function Checkbox({ label, value, onChange, disabled = false }) {
   return (
@@ -115,7 +113,6 @@ export function SettingsTab({ started }) {
     isTabIndentationEnabled,
     isMultiCursorEnabled,
     patternAutoStart,
-    includePrebakeScriptInShare,
   } = useSettings();
   const shouldAlwaysSync = isUdels();
   const canChangeAudioDevice = AudioContext.prototype.setSinkId != null;
@@ -207,15 +204,6 @@ export function SettingsTab({ started }) {
           />
         </FormItem>
       </div>
-      <FormItem label="Prebake">
-        <ImportPrebakeScriptButton />
-        <Checkbox
-          label="Include prebake script in share"
-          onChange={(cbEvent) => settingsMap.setKey('includePrebakeScriptInShare', cbEvent.target.checked)}
-          value={includePrebakeScriptInShare}
-        />
-      </FormItem>
-
       <FormItem label="Keybindings">
         <ButtonGroup
           value={keybindings}
@@ -325,7 +313,8 @@ export function SettingsTab({ started }) {
       </FormItem>
       <FormItem label="Zen Mode">Try clicking the logo in the top left!</FormItem>
       <FormItem label="Reset Settings">
-        <SpecialActionButton
+        <button
+          className="bg-background p-2 max-w-[300px] rounded-md hover:opacity-50"
           onClick={() => {
             confirmDialog('Sure?').then((r) => {
               if (r) {
@@ -336,7 +325,7 @@ export function SettingsTab({ started }) {
           }}
         >
           restore default settings
-        </SpecialActionButton>
+        </button>
       </FormItem>
     </div>
   );

website/src/repl/components/panel/SoundsTab.jsx

@@ -14,10 +14,6 @@ import { prebake } from '@src/repl/prebake.mjs';
 const getSamples = (samples) =>
   Array.isArray(samples) ? samples.length : typeof samples === 'object' ? Object.values(samples).length : 1;
 
-function wait(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 export function SoundsTab() {
   const sounds = useStore(soundMap);
 
@@ -60,7 +56,9 @@ export function SoundsTab() {
 
   // holds mutable ref to current triggered sound
   const trigRef = useRef();
-  const numRef = useRef(0);
+
+  // Used to cycle through sound previews on banks with multiple sounds
+  let soundPreviewIdx = 0;
 
   // stop current sound on mouseup
   useEvent('mouseup', () => {
@@ -68,14 +66,6 @@ export function SoundsTab() {
     trigRef.current = undefined;
     ref?.stop?.(getAudioContext().currentTime + 0.01);
   });
-  useEvent('keydown', (e) => {
-    if (!isNaN(Number(e.key))) {
-      numRef.current = Number(e.key);
-    }
-  });
-  useEvent('keyup', (e) => {
-    numRef.current = 0;
-  });
   return (
     <div id="sounds-tab" className="px-4 flex gap-2 flex-col w-full h-full text-foreground">
       <Textbox placeholder="Search" value={search} onChange={(v) => setSearch(v)} />
@@ -125,34 +115,25 @@ export function SoundsTab() {
                 const params = {
                   note: ['synth', 'soundfont'].includes(data.type) ? 'a3' : undefined,
                   s: name,
-                  n: numRef.current,
+                  n: soundPreviewIdx,
                   clip: 1,
                   release: 0.5,
                   sustain: 1,
                   duration: 0.5,
                 };
+                soundPreviewIdx++;
                 const onended = () => trigRef.current?.node?.disconnect();
-                // Attempt to play the sample and retry every 200ms until 10 attempts have been reached
-                let errMsg;
-                for (let attempt = 0; attempt < 10; attempt++) {
-                  try {
-                    // Pre-load the sample by calling onTrigger with a future time
-                    // This triggers the loading but schedules playback for later
-                    const time = ctx.currentTime + 0.05; // Give 50ms for loading
-                    const ref = await onTrigger(time, params, onended);
-                    trigRef.current = ref;
-                    if (ref?.node) {
-                      connectToDestination(ref.node);
-                      break;
-                    }
-                  } catch (err) {
-                    errMsg = err;
-                  }
-                  if (attempt == 9) {
-                    console.warn('Failed to trigger sound after 10 attempts' + (errMsg ? `: ${errMsg}` : ''));
-                  } else {
-                    await wait(200);
+                try {
+                  // Pre-load the sample by calling onTrigger with a future time
+                  // This triggers the loading but schedules playback for later
+                  const time = ctx.currentTime + 0.5; // Give 500ms for loading
+                  const ref = await onTrigger(time, params, onended);
+                  trigRef.current = ref;
+                  if (ref?.node) {
+                    connectToDestination(ref.node);
                   }
+                } catch (err) {
+                  console.warn('Failed to trigger sound:', err);
                 }
               }}
             >

website/src/repl/prebake.mjs

@@ -3,8 +3,6 @@ import { aliasBank, registerSynthSounds, registerZZFXSounds, samples } from '@st
 import { registerSamplesFromDB } from './idbutils.mjs';
 import './piano.mjs';
 import './files.mjs';
-import { settingsMap } from '@src/settings.mjs';
-import { evaluate } from '@strudel/transpiler';
 
 const { BASE_URL } = import.meta.env;
 const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL;

website/src/repl/useReplContext.jsx

@@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import { code2hash, getPerformanceTimeSeconds, logger, silence } from '@strudel/core';
 import { getDrawContext } from '@strudel/draw';
-import { evaluate, transpiler } from '@strudel/transpiler';
+import { transpiler } from '@strudel/transpiler';
 import {
   getAudioContextCurrentTime,
   webaudioOutput,
@@ -63,10 +63,11 @@ async function getModule(name) {
 const initialCode = `// LOADING`;
 
 export function useReplContext() {
-  const { isSyncEnabled, audioEngineTarget, prebakeScript, includePrebakeScriptInShare } = useSettings();
+  const { isSyncEnabled, audioEngineTarget } = useSettings();
   const shouldUseWebaudio = audioEngineTarget !== audioEngineTargets.osc;
   const defaultOutput = shouldUseWebaudio ? webaudioOutput : superdirtOutput;
   const getTime = shouldUseWebaudio ? getAudioContextCurrentTime : getPerformanceTimeSeconds;
+
   const init = useCallback(() => {
     const drawTime = [-2, 2];
     const drawContext = getDrawContext();
@@ -83,12 +84,7 @@ export function useReplContext() {
       pattern: silence,
       drawTime,
       drawContext,
-      prebake: async () =>
-        Promise.all([modulesLoading, presets]).then(() => {
-          if (prebakeScript?.length) {
-            return evaluate(prebakeScript ?? '');
-          }
-        }),
+      prebake: async () => Promise.all([modulesLoading, presets]),
       onUpdateState: (state) => {
         setReplState({ ...state });
       },
@@ -218,13 +214,7 @@ export function useReplContext() {
     editorRef.current.repl.evaluate(code);
   };
 
-  const handleShare = async () => {
-    let code = replState.code;
-    if (includePrebakeScriptInShare) {
-      code = prebakeScript + '\n' + code;
-    }
-    shareCode(code);
-  };
+  const handleShare = async () => shareCode(replState.code);
   const context = {
     started,
     pending,

website/src/repl/util.mjs

@@ -1,10 +1,11 @@
-import { code2hash, evalScope, hash2code, logger } from '@strudel/core';
+import { evalScope, hash2code, logger } from '@strudel/core';
 import { settingPatterns } from '../settings.mjs';
 import { setVersionDefaults } from '@strudel/webaudio';
 import { getMetadata } from '../metadata_parser';
 import { isTauri } from '../tauri.mjs';
 import './Repl.css';
 import { createClient } from '@supabase/supabase-js';
+import { nanoid } from 'nanoid';
 import { writeText } from '@tauri-apps/plugin-clipboard-manager';
 import { $featuredPatterns /* , loadDBPatterns */ } from '@src/user_pattern_utils.mjs';
 
@@ -108,8 +109,9 @@ export function confirmDialog(msg) {
   });
 }
 
+let lastShared;
+
 //RIP due to SPAM
-// let lastShared;
 // export async function shareCode(codeToShare) {
 //   // const codeToShare = activeCode || code;
 //   if (lastShared === codeToShare) {
@@ -144,10 +146,9 @@ export function confirmDialog(msg) {
 //   });
 // }
 
-export async function shareCode(codeToShare) {
+export async function shareCode() {
   try {
-    const hash = '#' + code2hash(codeToShare);
-    const shareUrl = window.location.origin + window.location.pathname + hash;
+    const shareUrl = window.location.href;
     if (isTauri()) {
       await writeText(shareUrl);
     } else {

website/src/settings.mjs

@@ -45,13 +45,11 @@ export const defaultSettings = {
   isPanelOpen: true,
   togglePanelTrigger: 'click', //click | hover
   userPatterns: '{}',
-  prebakeScript: '',
   audioEngineTarget: audioEngineTargets.webaudio,
   isButtonRowHidden: false,
   isCSSAnimationDisabled: false,
   maxPolyphony: 128,
   multiChannelOrbits: false,
-  includePrebakeScriptInShare: true,
 };
 
 let search = null;
@@ -98,7 +96,6 @@ export function useSettings() {
     isPanelOpen: parseBoolean(state.isPanelOpen),
     userPatterns: userPatterns,
     multiChannelOrbits: parseBoolean(state.multiChannelOrbits),
-    includePrebakeScriptInShare: parseBoolean(state.includePrebakeScriptInShare),
     patternAutoStart: isUdels()
       ? false
       : state.patternAutoStart === undefined
@@ -111,8 +108,6 @@ export const setActiveFooter = (tab) => settingsMap.setKey('activeFooter', tab);
 export const setPanelPinned = (bool) => settingsMap.setKey('isPanelPinned', bool);
 export const setIsPanelOpened = (bool) => settingsMap.setKey('isPanelOpen', bool);
 
-export const storePrebakeScript = (script) => settingsMap.setKey('prebakeScript', script);
-
 export const setIsZen = (active) => settingsMap.setKey('isZen', !!active);
 
 const patternSetting = (key) =>