adding identifier to descriptor & various fixes

webaudiomodules · Feb 24, 2024 · 294d520 · 294d520
1 parent 2a7a756
commit 294d520
Show file tree

Hide file tree

Showing 44 changed files with 125 additions and 48 deletions.
diff --git a/packages/BigMuff/descriptor.json b/packages/BigMuff/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.faust-bigmuff",
     "name": "Faust BigMuff",
     "vendor": "Michel Buffa",
     "description": "",

diff --git a/packages/GuitarAmpSim60s/descriptor.json b/packages/GuitarAmpSim60s/descriptor.json
@@ -1,10 +1,11 @@
 {
-    "name": "GuitarAmpSim60s",
-    "vendor": "Michel Buffa",
-    "description": "TODO",
-    "version": "1.0.0",
-    "apiVersion": "2.0.0",
-    "keywords": ["faust"],
-    "isInstrument": false,
-    "website": ""
-  }
+  "identifier": "com.webaudiomodules.wam-examples.guitarampsim60s",
+  "name": "GuitarAmpSim60s",
+  "vendor": "Michel Buffa",
+  "description": "TODO",
+  "version": "1.0.0",
+  "apiVersion": "2.0.0",
+  "keywords": ["faust"],
+  "isInstrument": false,
+  "website": ""
+}
diff --git a/packages/StonePhaserStereo/descriptor.json b/packages/StonePhaserStereo/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.stonephaser",
     "name": "StonePhaser",
     "vendor": "WebAudioModule",
     "description": "StonePhaser Stereo written in Faust",

diff --git a/packages/TS9_OverdriveFaustGenerated/descriptor.json b/packages/TS9_OverdriveFaustGenerated/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.ts9overdrive",
     "name": "TS9 Overdrive",
     "vendor": "WebAudioModule",
     "description": "Overdrive written in Faust",

diff --git a/packages/VirtualMidiKeyboardNoSound/src/descriptor.json b/packages/VirtualMidiKeyboardNoSound/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.virtual-midi-keyboard",
     "name": "VirtualMidiKeyboardNoSound",
     "vendor": "WebAudioModule",
     "description": "Midi Virtual keyboard",

diff --git a/packages/WamExample/src/WamExampleProcessor.js b/packages/WamExample/src/WamExampleProcessor.js
@@ -287,7 +287,7 @@ const getWamExampleProcessor = (moduleId) => {
 		}
 	}
 	try {
-		registerProcessor('WebAudioModuleWamExample', WamExampleProcessor);
+		registerProcessor(moduleId, WamExampleProcessor);
 	} catch (error) {
 		console.warn(error);
 	}

diff --git a/packages/WamExample/src/descriptor.json b/packages/WamExample/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.wam-example",
     "name": "WamExample",
     "vendor": "WebAudioModule",
     "description": "Simple example using WebAudioModule, WamNode, and WamProcessor classes.",

diff --git a/packages/WamExampleTemplate/src/WamExampleTemplateProcessor.js b/packages/WamExampleTemplate/src/WamExampleTemplateProcessor.js
@@ -163,7 +163,7 @@
 		}
 	}
 	try {
-		registerProcessor('WebAudioModuleWamExampleTemplate', WamExampleTemplateProcessor);
+		registerProcessor(moduleId, WamExampleTemplateProcessor);
 	} catch (error) {
 		console.warn(error);
 	}

diff --git a/packages/WamExampleTemplate/src/descriptor.json b/packages/WamExampleTemplate/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.template",
     "name": "WamExampleTemplate",
     "vendor": "WebAudioModule",
     "description": "Simple example template for WebAudioModule, WamNode, and WamProcessor classes.",

diff --git a/packages/csoundPitchShifter/src/descriptor.json b/packages/csoundPitchShifter/src/descriptor.json
@@ -1,11 +1,12 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.csound-pitchshifter",
     "name": "Csound PitchShifter",
     "vendor": "Steven Yi",
     "description": "",
     "version": "1.0.0",
     "apiVersion": "2.0.0",
     "thumbnail": "screenshot.png",
-    "keywords": ["faust"],
+    "keywords": ["csound"],
     "isInstrument": false,
     "website": ""
 }
diff --git a/packages/disto_machine/src/descriptor.json b/packages/disto_machine/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.distomachine-nobuilder",
     "name": "DistoMachine (No builder)",
     "vendor": "WebAudioModule",
     "description": "DistoMachine written in native WebAudio nodes",

diff --git a/packages/faustFlute/descriptor.json b/packages/faustFlute/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.faust-flute",
     "name": "Faust Flute MIDI",
     "vendor": "Grame",
     "description": "Faust MIDI Instrument",

diff --git a/packages/faustPingPongDelay/plugin/descriptor.json b/packages/faustPingPongDelay/plugin/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.faust-pingpongdelay",
     "name": "Faust PingPongDelay",
     "vendor": "Shihong Ren",
     "description": "A PingPongDelay written in Faust with its default UI",

diff --git a/packages/faustPingPongDelayDefaultUI/descriptor.json b/packages/faustPingPongDelayDefaultUI/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.faust-pingpongdelay-default-ui",
     "name": "Faust PingPongDelay (DefaultUI)",
     "vendor": "Shihong Ren",
     "description": "A PingPongDelay written in Faust with its default UI",

diff --git a/packages/graphicEqualizer/descriptor.json b/packages/graphicEqualizer/descriptor.json
@@ -1,11 +1,12 @@
 {
-    "name": "Equalizer",
-    "vendor": "Wasabi",
-    "description": "TODO",
-    "version": "1.0.0",
-    "apiVersion": "2.0.0",
-    "thumbnail": "assets/equal.png",
-    "keywords": ["equalizer", "mixing"],
-    "isInstrument": false,
-    "website": ""
-  }
+  "identifier": "com.webaudiomodules.wam-examples.graphic-equalizer",
+  "name": "Equalizer",
+  "vendor": "Wasabi",
+  "description": "TODO",
+  "version": "1.0.0",
+  "apiVersion": "2.0.0",
+  "thumbnail": "assets/equal.png",
+  "keywords": ["equalizer", "mixing"],
+  "isInstrument": false,
+  "website": ""
+}
diff --git a/packages/livegain/src/livegain/descriptor.json b/packages/livegain/src/livegain/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.livegain",
     "name": "LiveGain",
     "vendor": "Shihong Ren",
     "description": "TypeScript/React LiveGain WebAudioModule",

diff --git a/packages/livegain/src/livegain/index.tsx b/packages/livegain/src/livegain/index.tsx
@@ -5,13 +5,19 @@ import { createElement, destroyElement } from "../gui";
 import Node from "./LiveGainNode";
 import UI from "./LiveGainUI";
 
+const getBaseUrl = (relativeUrl: URL) => {
+	const baseUrl = relativeUrl.href.substring(0, relativeUrl.href.lastIndexOf("/"));
+	return baseUrl;
+};
+
 export type Parameters = "gain" | "frameRate" | "speedLim" | "min" | "max" | "step" | "orientation" | "metering";
 export class LiveGainModule extends WebAudioModule<Node> {
-    static descriptor = {
-        name: "LiveGain",
-        vendor: "WebAudioModule"
-    };
-
+	_baseUrl = getBaseUrl(new URL(".", import.meta.url));
+	_descriptorUrl = `${this._baseUrl}/descriptor.json`;
+	async initialize(state?: any) {
+		await this._loadDescriptor();
+		return super.initialize(state);
+	}
     async createAudioNode(initialState?: any) {
         const node = new Node(this.audioContext);
         const inputGainNode = this.audioContext.createGain();

diff --git a/packages/livegain/src/oscilloscope/descriptor.json b/packages/livegain/src/oscilloscope/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.oscilloscope",
     "name": "Oscilloscope",
     "vendor": "Shihong Ren",
     "description": "TypeScript/React Oscilloscope WebAudioModule",

diff --git a/packages/livegain/src/oscilloscope/index.tsx b/packages/livegain/src/oscilloscope/index.tsx
@@ -5,13 +5,19 @@ import SpectralAnalyserNode from "../worklets/SpectralAnalyser";
 import { createElement, destroyElement } from "../gui";
 import UI from "./OscilloscopeUI";
 
+const getBaseUrl = (relativeUrl: URL) => {
+	const baseUrl = relativeUrl.href.substring(0, relativeUrl.href.lastIndexOf("/"));
+	return baseUrl;
+};
+
 export type Parameters = "frameRate" | "windowSize" | "interleaved" | "showStats";
 export class OscilloscopeModule extends WebAudioModule<Node> {
-    static descriptor = {
-        name: "Oscilloscope",
-        vendor: "WebAudioModule"
-    };
-
+	_baseUrl = getBaseUrl(new URL(".", import.meta.url));
+	_descriptorUrl = `${this._baseUrl}/descriptor.json`;
+	async initialize(state?: any) {
+		await this._loadDescriptor();
+		return super.initialize(state);
+	}
     async createAudioNode(initialState?: any) {
         const node = new Node(this.audioContext);
         const outGainNode = this.audioContext.createGain();

diff --git a/packages/livegain/src/spectrogram/descriptor.json b/packages/livegain/src/spectrogram/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.spectrogram",
     "name": "Spectrogram",
     "vendor": "Shihong Ren",
     "description": "TypeScript/React Spectrogram WebAudioModule",

diff --git a/packages/livegain/src/spectrogram/index.tsx b/packages/livegain/src/spectrogram/index.tsx
@@ -5,13 +5,19 @@ import SpectralAnalyserNode from "../worklets/SpectralAnalyser";
 import { createElement, destroyElement } from "../gui";
 import UI from "./SpectrogramUI";
 
+const getBaseUrl = (relativeUrl: URL) => {
+	const baseUrl = relativeUrl.href.substring(0, relativeUrl.href.lastIndexOf("/"));
+	return baseUrl;
+};
+
 export type Parameters = "frameRate" | "windowSize" | "fftSize" | "fftOverlap" | "windowFunction";
 export class SpectrogramModule extends WebAudioModule<Node> {
-    static descriptor = {
-        name: "Spectrogram",
-        vendor: "WebAudioModule"
-    };
-
+	_baseUrl = getBaseUrl(new URL(".", import.meta.url));
+	_descriptorUrl = `${this._baseUrl}/descriptor.json`;
+	async initialize(state?: any) {
+		await this._loadDescriptor();
+		return super.initialize(state);
+	}
     async createAudioNode(initialState?: any) {
         const node = new Node(this.audioContext);
         const outGainNode = this.audioContext.createGain();

diff --git a/packages/livegain/src/spectroscope/descriptor.json b/packages/livegain/src/spectroscope/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.spectroscope",
     "name": "Spectroscope",
     "vendor": "Shihong Ren",
     "description": "TypeScript/React Spectroscope WebAudioModule",

diff --git a/packages/livegain/src/spectroscope/index.tsx b/packages/livegain/src/spectroscope/index.tsx
@@ -5,13 +5,19 @@ import SpectralAnalyserNode from "../worklets/SpectralAnalyser";
 import { createElement, destroyElement } from "../gui";
 import UI from "./SpectroscopeUI";
 
+const getBaseUrl = (relativeUrl: URL) => {
+	const baseUrl = relativeUrl.href.substring(0, relativeUrl.href.lastIndexOf("/"));
+	return baseUrl;
+};
+
 export type Parameters = "frameRate" | "windowSize" | "fftSize" | "fftOverlap" | "windowFunction";
 export class SpectroscopeModule extends WebAudioModule<Node> {
-    static descriptor = {
-        name: "Spectroscope",
-        vendor: "WebAudioModule"
-    };
-
+	_baseUrl = getBaseUrl(new URL(".", import.meta.url));
+	_descriptorUrl = `${this._baseUrl}/descriptor.json`;
+	async initialize(state?: any) {
+		await this._loadDescriptor();
+		return super.initialize(state);
+	}
     async createAudioNode(initialState?: any) {
         const node = new Node(this.audioContext);
         const outGainNode = this.audioContext.createGain();

diff --git a/packages/livegain/webpack.config.js b/packages/livegain/webpack.config.js
@@ -32,9 +32,16 @@ module.exports = (env, argv) => {
       path: path.resolve(__dirname, 'dist'),
       // library: 'JSPatcher',
       libraryTarget: 'module',
-      // chunkFilename: 'js/[chunkhash].js'
+      // chunkFilename: 'js/[chunkhash].js',
+      publicPath: "auto"
     },
     module: {
+      parser: {
+        javascript: {
+          importMeta: false,
+          url: false
+        }
+      },
       rules: [{
           test: /\.worklet\.(ts|js)$/,
           use: [{
@@ -50,7 +57,7 @@ module.exports = (env, argv) => {
             loader: 'esbuild-loader',
             options: {
               loader: 'tsx',
-              target: 'es2017'
+              target: 'es2020'
             }
           },
           exclude: /node_modules/

diff --git a/packages/midiOutput/src/descriptor.json b/packages/midiOutput/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.midi-output",
     "name": "MIDI Output",
     "vendor": "WebAudioModule",
     "description": "use WebMIDI API for output",

diff --git a/packages/midiOutput/src/index.js b/packages/midiOutput/src/index.js
@@ -19,6 +19,11 @@ class MidiOutput extends WebAudioModule {
 	_baseUrl = getBaseUrl(new URL('.', import.meta.url));
 	_descriptorUrl = `${this._baseUrl}/descriptor.json`;
 
+	async initialize(state) {
+		await this._loadDescriptor();
+		return super.initialize(state);
+	}
+
     /**
      * @param {any} initialState
      */

diff --git a/packages/midiSequencer/src/descriptor.json b/packages/midiSequencer/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.midi-sequencer",
     "name": "MIDI Sequencer",
     "vendor": "WebAudioModule",
     "description": "MIDI Sequencer (WAM events)",

diff --git a/packages/midiSequencer/src/index.ts b/packages/midiSequencer/src/index.ts
@@ -10,6 +10,10 @@ const getBaseUrl = (relativeUrl: URL) => {
 class MidiSequencer extends WebAudioModule<MidiSequencerNode> {
 	_baseUrl = getBaseUrl(new URL(".", import.meta.url));
 	_descriptorUrl = `${this._baseUrl}/descriptor.json`;
+	async initialize(state?: any) {
+		await this._loadDescriptor();
+		return super.initialize(state);
+	}
 	async createAudioNode(initialState: any) {
 		await MidiSequencerNode.addModules(this.audioContext, this.moduleId);
 		const node: MidiSequencerNode = new MidiSequencerNode(this, {});

diff --git a/packages/obxd/WasmProcessor.js b/packages/obxd/WasmProcessor.js
@@ -70,7 +70,7 @@
         for (var c=0; c<numChannels; c++) {
           let waaout = outputs[i][c];
           let wamout = this.audiobufs[1][i*numChannels+c];
-          waaout.set(this.WAM.HEAPF32.subarray(wamout, wamout + this.bufsize));
+          waaout?.set(this.WAM.HEAPF32.subarray(wamout, wamout + this.bufsize));
         }
       }
 

diff --git a/packages/obxd/descriptor.json b/packages/obxd/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.obxd",
     "name": "OBXD",
     "vendor": "Jari Kleimola 2017-2020 ([email protected])",
     "description": "",

diff --git a/packages/pedalboard/src/descriptor.json b/packages/pedalboard/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.pedalboard",
     "name": "Pedalboard",
     "vendor": "WebAudioModule",
     "description": "A rack to load multiple WAMs",

diff --git a/packages/pingpongdelay/src/descriptor.json b/packages/pingpongdelay/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.pingpongdelay",
     "name": "PingPongDelay",
     "vendor": "WebAudioModule",
     "description": "A PingPongDelay written in native WebAudio nodes",

diff --git a/packages/quadrafuzz/src/descriptor.json b/packages/quadrafuzz/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.quadrafuzz",
     "name": "Quadrafuzz",
     "vendor": "WebAudioModule",
     "description": "Quadrafuzz written in native WebAudio nodes",

diff --git a/packages/quadrafuzz_without_builder/src/descriptor.json b/packages/quadrafuzz_without_builder/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.quadrafuzz-nobuilder",
     "name": "Quadrafuzz (No builder)",
     "vendor": "WebAudioModule",
     "description": "Quadrafuzz written in native WebAudio nodes",

diff --git a/packages/randomnote/descriptor.json b/packages/randomnote/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.random-note-gen",
     "name": "Random Note Generator",
     "vendor": "WebAudioModule",
     "description": "Generate Random MIDI Notes",

diff --git a/packages/sdk-parammgr b/packages/sdk-parammgr
diff --git a/packages/simpleMidiKeyboard/descriptor.json b/packages/simpleMidiKeyboard/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.midi-keyboard",
     "name": "Virtual MIDI Keyboard",
     "vendor": "WebAudioModule",
     "description": "UI to Generate MIDI Notes",

diff --git a/packages/simpleTransport/src/descriptor.json b/packages/simpleTransport/src/descriptor.json
@@ -1,7 +1,8 @@
 {
-    "name": "Simple Tranport",
+    "identifier": "com.webaudiomodules.wam-examples.simple-transport",
+    "name": "Simple Transport",
     "vendor": "WebAudioModule",
-    "description": "wam-tranport event generator",
+    "description": "wam-transport event generator",
     "version": "1.0.0",
     "apiVersion": "2.0.0",
     "thumbnail": "screenshot.png",

diff --git a/packages/synth101/src/descriptor.json b/packages/synth101/src/descriptor.json
@@ -1,4 +1,5 @@
 {
+    "identifier": "com.webaudiomodules.wam-examples.synth101",
     "name": "Synth-101",
     "vendor": "Tom",
     "description": "Synth-101 WAM2 MIDI Instrument",