move supradough to separate package

eslint.config.mjs

@@ -42,7 +42,7 @@ export default [
       '**/hydra.mjs',
       '**/jsdoc-synonyms.js',
       'packages/hs2js/src/hs2js.mjs',
-      'packages/superdough/dough-export.mjs',
+      'packages/supradough/dough-export.mjs',
       '**/samples',
     ],
   },

packages/superdough/package.json

@@ -33,8 +33,7 @@
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "devDependencies": {
     "vite": "^6.0.11",
-    "vite-plugin-bundle-audioworklet": "workspace:*",
-    "wav-encoder": "^1.3.0"
+    "vite-plugin-bundle-audioworklet": "workspace:*"
   },
   "dependencies": {
     "nanostores": "^0.11.3"

packages/superdough/superdough.mjs

@@ -190,11 +190,18 @@ export function getAudioContextCurrentTime() {
   return getAudioContext().currentTime;
 }
 
+let externalWorklets = [];
+export function registerWorklet(url) {
+  externalWorklets.push(url);
+}
+
 let workletsLoading;
 function loadWorklets() {
   if (!workletsLoading) {
     const audioCtx = getAudioContext();
-    workletsLoading = audioCtx.audioWorklet.addModule(workletsUrl);
+    const allWorkletURLs = externalWorklets.concat([workletsUrl]);
+    console.log('allWorkletURLs', allWorkletURLs);
+    workletsLoading = Promise.all(allWorkletURLs.map((workletURL) => audioCtx.audioWorklet.addModule(workletURL)));
   }
 
   return workletsLoading;

packages/superdough/synth.mjs

@@ -12,7 +12,7 @@ import {
 } from './helpers.mjs';
 import { getNoiseMix, getNoiseOscillator } from './noise.mjs';
 
-export const getFrequencyFromValue = (value) => {
+const getFrequencyFromValue = (value) => {
   let { note, freq } = value;
   note = note || 36;
   if (typeof note === 'string') {
@@ -25,7 +25,7 @@ export const getFrequencyFromValue = (value) => {
 
   return Number(freq);
 };
-export function destroyAudioWorkletNode(node) {
+function destroyAudioWorkletNode(node) {
   if (node == null) {
     return;
   }

packages/superdough/worklets.mjs

@@ -4,7 +4,6 @@
 
 import OLAProcessor from './ola-processor';
 import FFT from './fft.js';
-import { Dough } from './dough.mjs';
 
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const _mod = (n, m) => ((n % m) + m) % m;
@@ -896,27 +895,3 @@ class ByteBeatProcessor extends AudioWorkletProcessor {
 }
 
 registerProcessor('byte-beat-processor', ByteBeatProcessor);
-
-class DoughProcessor extends AudioWorkletProcessor {
-  constructor() {
-    super();
-    this.dough = new Dough(sampleRate, currentTime);
-    this.port.onmessage = (event) => this.dough.scheduleSpawn(event.data);
-  }
-  process(inputs, outputs, params) {
-    if (this.disconnected) {
-      return false;
-    }
-    const output = outputs[0];
-    for (let i = 0; i < output[0].length; i++) {
-      this.dough.update();
-      for (let c = 0; c < output.length; c++) {
-        //prevent speaker blowout via clipping if threshold exceeds
-        output[c][i] = clamp(this.dough.channels[c], -1, 1);
-      }
-    }
-    return true; // keep the audio processing going
-  }
-}
-
-registerProcessor('dough-processor', DoughProcessor);

packages/supradough/README.md

@@ -0,0 +1,3 @@
+# supradough
+
+platform agnostic synth and sampler intended for live coding. a reimplementation of superdough.

packages/supradough/dough-worklet.mjs

@@ -0,0 +1,27 @@
+import { Dough } from './dough.mjs';
+
+const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
+
+class DoughProcessor extends AudioWorkletProcessor {
+  constructor() {
+    super();
+    this.dough = new Dough(sampleRate, currentTime);
+    this.port.onmessage = (event) => this.dough.scheduleSpawn(event.data);
+  }
+  process(inputs, outputs, params) {
+    if (this.disconnected) {
+      return false;
+    }
+    const output = outputs[0];
+    for (let i = 0; i < output[0].length; i++) {
+      this.dough.update();
+      for (let c = 0; c < output.length; c++) {
+        //prevent speaker blowout via clipping if threshold exceeds
+        output[c][i] = clamp(this.dough.channels[c], -1, 1);
+      }
+    }
+    return true; // keep the audio processing going
+  }
+}
+
+registerProcessor('dough-processor', DoughProcessor);

packages/supradough/index.mjs

@@ -0,0 +1,4 @@
+import _workletUrl from './dough-worklet.mjs?audioworklet';
+
+export * from './dough.mjs';
+export const workletUrl = _workletUrl;

packages/supradough/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "supradough",
+  "version": "1.2.3",
+  "description": "platform agnostic synth and sampler intended for live coding. a reimplementation of superdough.",
+  "main": "index.mjs",
+  "type": "module",
+  "publishConfig": {
+    "main": "dist/index.mjs"
+  },
+  "scripts": {
+    "build": "vite build",
+    "prepublishOnly": "npm run build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tidalcycles/strudel.git"
+  },
+  "keywords": [
+    "tidalcycles",
+    "strudel",
+    "pattern",
+    "livecoding",
+    "algorave"
+  ],
+  "author": "Felix Roos <flix91@gmail.com>",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/tidalcycles/strudel/issues"
+  },
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
+  "devDependencies": {
+    "vite": "^6.0.11",
+    "vite-plugin-bundle-audioworklet": "workspace:*",
+    "wav-encoder": "^1.3.0"
+  },
+  "dependencies": {}
+}

packages/webaudio/package.json

@@ -35,7 +35,8 @@
   "dependencies": {
     "@strudel/core": "workspace:*",
     "@strudel/draw": "workspace:*",
-    "superdough": "workspace:*"
+    "superdough": "workspace:*",
+    "supradough": "workspace:*"
   },
   "devDependencies": {
     "vite": "^6.0.11"

packages/webaudio/webaudio.mjs

@@ -5,8 +5,12 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import * as strudel from '@strudel/core';
-import { superdough, getAudioContext, setLogger, doughTrigger } from 'superdough';
+import { superdough, getAudioContext, setLogger, doughTrigger, registerWorklet } from 'superdough';
 import './supradough.mjs';
+import { workletUrl } from 'supradough';
+
+registerWorklet(workletUrl);
+
 const { Pattern, logger, repl } = strudel;
 
 setLogger(logger);

pnpm-lock.yaml

@@ -485,6 +485,15 @@ importers:
       vite-plugin-bundle-audioworklet:
         specifier: workspace:*
         version: link:../vite-plugin-bundle-audioworklet
+
+  packages/supradough:
+    devDependencies:
+      vite:
+        specifier: ^6.0.11
+        version: 6.0.11(@types/node@22.10.10)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
+      vite-plugin-bundle-audioworklet:
+        specifier: workspace:*
+        version: link:../vite-plugin-bundle-audioworklet
       wav-encoder:
         specifier: ^1.3.0
         version: 1.3.0
@@ -597,6 +606,9 @@ importers:
       superdough:
         specifier: workspace:*
         version: link:../superdough
+      supradough:
+        specifier: workspace:*
+        version: link:../supradough
     devDependencies:
       vite:
         specifier: ^6.0.11