spessasynth_lib 3.21.13 → 3.22.1

package/@types/soundfont/basic_soundfont/basic_soundfont.d.ts

@@ -81,6 +81,10 @@ export class BasicSoundFont {
      * @returns {BasicPreset}
      */
     getPresetByName(presetName: string): BasicPreset;
+    /**
+     * @param error {string}
+     */
+    parsingError(error: string): void;
     write: typeof write;
 }
 import { Modulator } from "./modulator.js";

package/@types/synthetizer/synthetizer.d.ts

@@ -72,6 +72,10 @@ export class Synthetizer {
      * @type {boolean}
      */
     _highPerformanceMode: boolean;
+    /**
+     * @type {EffectsConfig}
+     */
+    effectsConfig: EffectsConfig;
     worklet: AudioWorkletNode;
     /**
      * The synth's soundfont manager

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.21.13",
+  "version": "3.22.1",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "browser": "index.js",
   "types": "@types/index.d.ts",

package/sequencer/sequencer.js

@@ -459,7 +459,7 @@ export class Sequencer
                 }
                 else
                 {
-                    throw new Error(messageData);
+                    throw new Error("Sequencer error: " + messageData);
                 }
                 return;
             

package/sequencer/worklet_sequencer/song_control.js

@@ -49,7 +49,7 @@ export function loadNewSequence(parsedMidi, autoPlay = true)
     this.stop();
     if (!parsedMidi.tracks)
     {
-        throw "No tracks supplied!";
+        throw new Error("This MIDI has no tracks!");
     }
     
     this.oneTickToSeconds = 60 / (120 * parsedMidi.timeDivision);

package/soundfont/basic_soundfont/basic_soundfont.js

@@ -225,6 +225,14 @@ class BasicSoundFont
         }
         return preset;
     }
+    
+    /**
+     * @param error {string}
+     */
+    parsingError(error)
+    {
+        throw new Error(`SF parsing error: ${error} The file may be corrupted.`);
+    }
 }
 
 BasicSoundFont.prototype.write = write;

package/soundfont/dls/articulator_converter.js

@@ -71,7 +71,7 @@ function getSF2SourceFromDLS(source)
     }
     if (sourceEnum === undefined)
     {
-        throw `not known?? ${source}`;
+        throw new Error(`Unknown DLS Source: ${source}`);
     }
     return { enum: sourceEnum, isCC: isCC };
 }

package/soundfont/dls/dls_sample.js

@@ -58,7 +58,7 @@ export class DLSSample extends BasicSample
         {
             if (!this.compressedData)
             {
-                throw new Error("Compressed but no data??");
+                throw new Error("Compressed but no data?? This shouldn't happen!!");
             }
             return this.compressedData;
         }

package/soundfont/dls/dls_soundfont.js

@@ -25,7 +25,7 @@ class DLSSoundFont extends BasicSoundFont
         if (!this.dataArray)
         {
             SpessaSynthGroupEnd();
-            throw new TypeError("No data!");
+            this.parsingError("No data provided!");
         }
         
         // read the main chunk
@@ -85,7 +85,7 @@ class DLSSoundFont extends BasicSoundFont
         if (!colhChunk)
         {
             SpessaSynthGroupEnd();
-            throw new Error("No colh chunk!");
+            this.parsingError("No colh chunk!");
         }
         this.instrumentAmount = readLittleEndian(colhChunk.chunkData, 4);
         SpessaSynthInfo(
@@ -96,6 +96,11 @@ class DLSSoundFont extends BasicSoundFont
         
         // read wave list
         let waveListChunk = findRIFFListType(chunks, "wvpl");
+        if (!waveListChunk)
+        {
+            SpessaSynthGroupEnd();
+            this.parsingError("No wvpl chunk!");
+        }
         this.readDLSSamples(waveListChunk);
         
         // read instrument list
@@ -103,7 +108,7 @@ class DLSSoundFont extends BasicSoundFont
         if (!instrumentListChunk)
         {
             SpessaSynthGroupEnd();
-            throw new Error("No lins chunk!");
+            this.parsingError("No lins chunk!");
         }
         this.readDLSInstrumentList(instrumentListChunk);
         
@@ -135,7 +140,7 @@ class DLSSoundFont extends BasicSoundFont
         if (chunk.header.toLowerCase() !== expected.toLowerCase())
         {
             SpessaSynthGroupEnd();
-            throw new SyntaxError(`Invalid DLS chunk header! Expected "${expected.toLowerCase()}" got "${chunk.header.toLowerCase()}"`);
+            this.parsingError(`Invalid DLS chunk header! Expected "${expected.toLowerCase()}" got "${chunk.header.toLowerCase()}"`);
         }
     }
     
@@ -148,9 +153,17 @@ class DLSSoundFont extends BasicSoundFont
         if (text.toLowerCase() !== expected.toLowerCase())
         {
             SpessaSynthGroupEnd();
-            throw new SyntaxError(`Invalid DLS soundfont! Expected "${expected.toLowerCase()}" got "${text.toLowerCase()}"`);
+            this.parsingError(`FourCC error: Expected "${expected.toLowerCase()}" got "${text.toLowerCase()}"`);
         }
     }
+    
+    /**
+     * @param error {string}
+     */
+    parsingError(error)
+    {
+        throw new Error(`DLS parse error: ${error} The file may be corrupted.`);
+    }
 }
 
 DLSSoundFont.prototype.readDLSInstrumentList = readDLSInstrumentList;

package/soundfont/dls/read_instrument.js

@@ -85,7 +85,7 @@ export function readDLSInstrument(chunk)
         if (type !== "rgn " && type !== "rgn2")
         {
             SpessaSynthGroupEnd();
-            throw new SyntaxError(`Invalid DLS region! Expected "rgn " or "rgn2" got "${type}"`);
+            this.parsingError(`Invalid DLS region! Expected "rgn " or "rgn2" got "${type}"`);
         }
         
         

package/soundfont/dls/read_samples.js

@@ -41,15 +41,16 @@ export function readDLSSamples(waveListChunk)
         {
             throw new Error("No fmt chunk in the wave file!");
         }
+        // https://github.com/tpn/winsdk-10/blob/9b69fd26ac0c7d0b83d378dba01080e93349c2ed/Include/10.0.14393.0/shared/mmreg.h#L2108
         const waveFormat = readLittleEndian(fmtChunk.chunkData, 2);
         if (waveFormat !== 1)
         {
-            throw new Error("Only PCM format in WAVE is supported.");
+            throw new Error(`Only PCM format in WAVE is supported. Fmt reports ${waveFormat}`);
         }
         const channelsAmount = readLittleEndian(fmtChunk.chunkData, 2);
         if (channelsAmount !== 1)
         {
-            throw new Error("Only mono samples are supported.");
+            throw new Error(`Only mono samples are supported. Fmt reports ${channelsAmount} channels`);
         }
         const sampleRate = readLittleEndian(fmtChunk.chunkData, 4);
         // skip avg bytes
@@ -79,7 +80,7 @@ export function readDLSSamples(waveListChunk)
         const dataChunk = waveChunks.find(c => c.header === "data");
         if (!dataChunk)
         {
-            throw new Error("No data chunk in the wave chunk!");
+            this.parsingError("No data chunk in the WAVE chunk!");
         }
         const sampleLength = dataChunk.size / bytesPerSample;
         const sampleData = new Float32Array(sampleLength);

package/soundfont/read_sf2/samples.js

@@ -113,11 +113,18 @@ export class LoadedSample extends BasicSample
         const buff = smplArr.slice(this.sampleStartIndex / 2 + smplStart, this.sampleEndIndex / 2 + smplStart);
         // reset array and being decoding
         this.sampleData = new Float32Array(0);
-        /**
-         * @type {{data: Float32Array[], error: (string|null), sampleRate: number, eof: boolean}}
-         */
-        const vorbis = stbvorbis.decode(buff.buffer);
-        this.sampleData = vorbis.data[0];
+        try
+        {
+            /**
+             * @type {{data: Float32Array[], error: (string|null), sampleRate: number, eof: boolean}}
+             */
+            const vorbis = stbvorbis.decode(buff.buffer);
+            this.sampleData = vorbis.data[0];
+        }
+        catch (e)
+        {
+            throw new Error(`Ogg Vorbis decode error: ${e}`);
+        }
     }
     
     /**

package/soundfont/read_sf2/soundfont.js

@@ -39,7 +39,7 @@ export class SoundFont2 extends BasicSoundFont
         if (!this.dataArray)
         {
             SpessaSynthGroupEnd();
-            throw new TypeError("No data!");
+            this.parsingError("No data provided!");
         }
         
         // read the main read
@@ -280,7 +280,7 @@ export class SoundFont2 extends BasicSoundFont
         if (chunk.header.toLowerCase() !== expected.toLowerCase())
         {
             SpessaSynthGroupEnd();
-            throw new SyntaxError(`Invalid chunk header! Expected "${expected.toLowerCase()}" got "${chunk.header.toLowerCase()}"`);
+            this.parsingError(`Invalid chunk header! Expected "${expected.toLowerCase()}" got "${chunk.header.toLowerCase()}"`);
         }
     }
     
@@ -293,7 +293,7 @@ export class SoundFont2 extends BasicSoundFont
         if (text.toLowerCase() !== expected.toLowerCase())
         {
             SpessaSynthGroupEnd();
-            throw new SyntaxError(`Invalid soundFont! Expected "${expected.toLowerCase()}" got "${text.toLowerCase()}"`);
+            this.parsingError(`Invalid FourCC: Expected "${expected.toLowerCase()}" got "${text.toLowerCase()}"\``);
         }
     }
 }

package/synthetizer/synthetizer.js

@@ -127,6 +127,24 @@ export class Synthetizer
             processorChannelCount = [32];
         }
         
+        // check for config data in snapshot
+        if (startRenderingData?.snapshot?.effectsConfig !== undefined)
+        {
+            /**
+             * @type {EffectsConfig}
+             */
+            this.effectsConfig = startRenderingData.snapshot.effectsConfig;
+            // remove from config as it can't be cloned
+            delete startRenderingData.snapshot.effectsConfig;
+        }
+        else
+        {
+            /**
+             * @type {EffectsConfig}
+             */
+            this.effectsConfig = effectsConfig;
+        }
+        
         // first two outputs: reverb, chorsu, the others are the channel outputs
         try
         {
@@ -143,6 +161,7 @@ export class Synthetizer
         }
         catch (e)
         {
+            console.error(e);
             throw new Error("Could not create the audioWorklet. Did you forget to addModule()?");
         }
         
@@ -175,18 +194,17 @@ export class Synthetizer
          * @type {function(WorkletSequencerReturnMessageType, any)}
          */
         this.sequencerCallbackFunction = undefined;
-        
         // add reverb
-        if (effectsConfig.reverbEnabled && !oneOutputMode)
+        if (this.effectsConfig.reverbEnabled && !oneOutputMode)
         {
-            this.reverbProcessor = getReverbProcessor(this.context, effectsConfig.reverbImpulseResponse);
+            this.reverbProcessor = getReverbProcessor(this.context, this.effectsConfig.reverbImpulseResponse);
             this.reverbProcessor.connect(targetNode);
             this.worklet.connect(this.reverbProcessor, 0);
         }
         
-        if (effectsConfig.chorusEnabled && !oneOutputMode)
+        if (this.effectsConfig.chorusEnabled && !oneOutputMode)
         {
-            this.chorusProcessor = new FancyChorus(targetNode, effectsConfig.chorusConfig);
+            this.chorusProcessor = new FancyChorus(targetNode, this.effectsConfig.chorusConfig);
             this.worklet.connect(this.chorusProcessor.input, 1);
         }
         
@@ -361,6 +379,7 @@ export class Synthetizer
             this._snapshotCallback = s =>
             {
                 this._snapshotCallback = undefined;
+                s.effectsConfig = this.effectsConfig;
                 resolve(s);
             };
             this.post({
@@ -821,6 +840,7 @@ export class Synthetizer
     setReverbResponse(buffer)
     {
         this.reverbProcessor.buffer = buffer;
+        this.effectsConfig.reverbImpulseResponse = buffer;
     }
     
     /**
@@ -829,12 +849,12 @@ export class Synthetizer
      */
     setChorusConfig(config)
     {
-        console.log(config);
         this.worklet.disconnect(this.chorusProcessor.input);
         this.chorusProcessor.delete();
         delete this.chorusProcessor;
         this.chorusProcessor = new FancyChorus(this.targetNode, config);
         this.worklet.connect(this.chorusProcessor.input, 1);
+        this.effectsConfig.chorusConfig = config;
     }
     
     reverbateEverythingBecauseWhyNot()