@fluex/fluexgl-dsp 0.1.2 → 0.1.3

package/lib/src/core/classes/Channel.ts

@@ -20,11 +20,17 @@ export class Channel {
 
     public gainNode: GainNode | null = null;
     public stereoPannerNode: StereoPannerNode | null = null;
+    public analyserNode: AnalyserNode | null = null;
+    public channelSplitterNode: ChannelSplitterNode | null = null;
+
+    public analyserFloatArrayBuffer = new Float32Array();
+    public analyserByteArrayBuffer = new Uint8Array();
 
     public audioClipsInputGainNode: GainNode | null = null;
 
-    constructor(public options: Partial<ChannelOptions> = { maxAudioNodes: 8, maxEffects: 8 }) {
+    public analyserOptions: AnalyserOptions = { fftSize: 32 };
 
+    constructor(public options: Partial<ChannelOptions> = { maxAudioNodes: 8, maxEffects: 8 }) {
         this.label = options.label ?? null;
     }
 
@@ -42,7 +48,7 @@ export class Channel {
             effect.audioWorkletNode?.disconnect();
         }
 
-        const activeEffects = this.effects.filter(e => !!e.audioWorkletNode /* && e.enabled !== false */);
+        const activeEffects = this.effects.filter(e => !!e.audioWorkletNode);
 
         if (activeEffects.length === 0) {
 
@@ -53,7 +59,7 @@ export class Channel {
             this.audioClipsInputGainNode.connect(firstEffectGain);
 
             for (let i = 0; i < activeEffects.length - 1; i++) {
-                
+
                 const current = activeEffects[i].audioWorkletNode!;
                 const next = activeEffects[i + 1].audioWorkletNode!;
 
@@ -78,12 +84,17 @@ export class Channel {
 
         this.gainNode = new GainNode(this.parentialContext);
         this.stereoPannerNode = new StereoPannerNode(this.parentialContext);
+        this.analyserNode = new AnalyserNode(this.parentialContext, this.analyserOptions);
+
+        this.analyserFloatArrayBuffer = new Float32Array(this.analyserNode.fftSize);
+        this.analyserByteArrayBuffer = new Uint8Array(this.analyserNode.fftSize);
 
         this.audioClipsInputGainNode = new GainNode(this.parentialContext);
 
         this.audioClipsInputGainNode.connect(this.stereoPannerNode);
         this.stereoPannerNode.connect(this.gainNode);
-        this.gainNode.connect(this.parentialMasterChannel.gainNode);
+        this.gainNode.connect(this.analyserNode);
+        this.analyserNode.connect(this.parentialMasterChannel.gainNode);
     }
 
     public SetLabel(label: string): void {
@@ -131,6 +142,15 @@ export class Channel {
         });
     }
 
+    public HasAudioClip(clip: AudioClip): boolean {
+
+        for (let _clip of this.audioClips) {
+            if (_clip.id === clip.id) return true;
+        }
+
+        return false;
+    }
+
     public SetVolume(volume: number): void {
 
         if (!this.gainNode) return Debug.Error("Could not set channel volume because the channel is not attached to a master channel.", [
@@ -167,6 +187,10 @@ export class Channel {
         this.rebuildEffectChain();
     }
 
+    public AttachEffect(effect: Effector): void {
+        return this.AddEffect(effect);
+    }
+
     public RemoveEffect(effect: Effector): void {
 
         if (!this.effects.includes(effect)) return Debug.Error("Could not remove effect, because it is not part of this channel.", [
@@ -183,6 +207,72 @@ export class Channel {
         this.rebuildEffectChain();
     }
 
+    public DetachEffect(effect: Effector): void {
+        return this.RemoveEffect(effect);
+    }
+
+    public SetAnalyserFftSize(value: number): number | null {
+
+        if (!this.analyserNode) {
+            Debug.Error("Could not set FFT size on analyser because the analyser has not been defined.");
+            return null;
+        }
+
+        this.analyserNode.fftSize = value;
+
+        this.analyserFloatArrayBuffer = new Float32Array(this.analyserNode.fftSize);
+        this.analyserByteArrayBuffer = new Uint8Array(this.analyserNode.fftSize);
+
+        return this.analyserNode.fftSize;
+    }
+
+    public GetWaveformFloatData(): Float32Array | null {
+
+        if (!this.analyserNode) {
+            Debug.Error("Could not get waveform float data, because the analyser has not been defined.");
+            return null;
+        }
+
+        if (this.analyserFloatArrayBuffer.length !== this.analyserNode.fftSize) {
+            this.analyserFloatArrayBuffer = new Float32Array(this.analyserNode.fftSize);
+        }
+
+        this.analyserNode.getFloatTimeDomainData(this.analyserFloatArrayBuffer);
+        return this.analyserFloatArrayBuffer;
+    }
+
+    public GetWaveformByteData(): Uint8Array | null {
+
+        if (!this.analyserNode) {
+            Debug.Error("Could not get waveform byte data, because the analyser has not been defined.");
+            return null;
+        }
+
+        if (this.analyserByteArrayBuffer.length !== this.analyserNode.fftSize) {
+            this.analyserByteArrayBuffer = new Uint8Array(this.analyserNode.fftSize);
+        }
+
+        this.analyserNode.getByteTimeDomainData(this.analyserByteArrayBuffer);
+        return this.analyserByteArrayBuffer;
+    }
+
+    public SetAnalyserOptions(options: AnalyserOptions): Channel | null {
+
+        this.analyserOptions = {...options};
+
+        if (!this.analyserNode) return null;
+
+        this.analyserNode.minDecibels = options.minDecibels ?? this.analyserNode.minDecibels;
+        this.analyserNode.maxDecibels = options.maxDecibels ?? this.analyserNode.maxDecibels;
+        this.analyserNode.fftSize = options.fftSize ?? 32;
+        this.analyserNode.smoothingTimeConstant = options.smoothingTimeConstant ?? this.analyserNode.smoothingTimeConstant;
+
+        this.analyserByteArrayBuffer = new Uint8Array(this.analyserNode.fftSize);
+        this.analyserFloatArrayBuffer = new Float32Array(this.analyserNode.fftSize);
+
+        return this;
+    }
+
     // Public getters and setters
 
     public get volume(): number | null {

package/lib/src/core/classes/Effector.ts

@@ -7,5 +7,7 @@ export abstract class Effector {
     public audioWorkletNode: AudioWorkletNode | null = null;
     public parentialContext: AudioContext | null = null;
 
+    static name: string = "Effector";
+
     public abstract InitializeOnAttachment(parentialContext: AudioContext): Promise<void>;
 }

package/lib/src/effects/classes/Chorus.ts

@@ -5,6 +5,9 @@ import { ChorusEffectOptions } from "../../typings";
 
 export class Chorus extends Effector {
 
+    public label: string | null = "Chorus";
+    static name: string = "Chorus";
+
     public baseDelayMs: number = 15;
     public depthMs: number = 8;
     public rateHz: number = 1.5;

package/lib/src/effects/classes/Distortion.ts

@@ -1 +1,14 @@
-export class Distortion {}
+import { Effector } from "../../core/classes/Effector";
+
+export class Distortion extends Effector {
+
+    static name: string = "Distortion";
+
+    constructor() {
+        super();
+    }
+
+    public async InitializeOnAttachment(parentialContext: AudioContext): Promise<void> {
+        
+    }
+}

package/lib/src/effects/classes/Saturation.ts

@@ -1 +1,3 @@
-export class Saturation {}
+export class Saturation {
+    
+}

package/lib/src/effects/classes/SoftClip.ts

@@ -4,6 +4,9 @@ import { Debug } from "../../utilities/debugger";
 
 export class SoftClip extends Effector {
 
+    public label: string | null = "SoftClip";
+    static name: string = "SoftClip";
+
     constructor(public drive: number = 1) {
         super();
     }

package/lib/src/effects/classes/StereoPanner.ts

@@ -1 +1,3 @@
-export class StereoPanner {}
+export class StereoPanner {
+    static name: string = "StereoPanner";
+}

package/lib/src/index.ts

@@ -63,6 +63,7 @@ export {
     ResolveDefaultAudioInputDevice,
     ResolveDefaultAudioOutputDevice,
     LoadAudioSource,
+    LoadAudioSourceFromBlob,
     LoadWorkletOnMasterChannel,
 } from "./utilities/helpers";
 

package/lib/src/utilities/helpers.ts

@@ -3,6 +3,7 @@ import { v4 } from "uuid";
 
 import { AudioDevice } from "../core/classes/AudioDevice";
 import { Master } from "../core/classes/Master";
+import { Effector } from "../core/classes/Effector";
 
 import { Debug } from "./debugger";
 import { SUPPORTED_FILE_TYPES } from "./constants";
@@ -10,6 +11,10 @@ import { SUPPORTED_FILE_TYPES } from "./constants";
 import { LoadWebAssemblyModule } from "./web-assembly";
 import { ErrorCodes, WarningCodes } from "../console-codes";
 
+import { Chorus, SoftClip } from "../effects/exports";
+
+import * as Effects from "../effects/exports";
+
 import { LoadAudioSourceOptions, AudioSourceData, DspPipelineInitializationOptions, DspPipelineInitializationState } from "../typings";
 
 /**
@@ -99,7 +104,7 @@ export async function ResolveAudioInputDevices(): Promise<AudioDevice[]> {
  */
 export async function ResolveDefaultAudioOutputDevice(init: DspPipelineInitializationState): Promise<AudioDevice | null> {
     Debug.Log("Attempting to resolve default audio output device...");
-    
+
     const audioDeviceInfos: MediaDeviceInfo[] = [];
     const devices = await navigator.mediaDevices.enumerateDevices();
 
@@ -111,7 +116,7 @@ export async function ResolveDefaultAudioOutputDevice(init: DspPipelineInitializ
 
     const defaultAudioDevice = devices.length === 0 ? null : new AudioDevice(audioDeviceInfos[0]);
 
-    if(!defaultAudioDevice) return null;
+    if (!defaultAudioDevice) return null;
 
     await LoadWorkletOnMasterChannel(defaultAudioDevice.masterChannel, init.workletBlobUrl);
 
@@ -124,7 +129,7 @@ export async function ResolveDefaultAudioOutputDevice(init: DspPipelineInitializ
  */
 export async function ResolveDefaultAudioInputDevice(init: DspPipelineInitializationState): Promise<AudioDevice | null> {
     Debug.Log("Attempting to resolve default audio output device...");
-    
+
     const audioDeviceInfos: MediaDeviceInfo[] = [];
     const devices = await navigator.mediaDevices.enumerateDevices();
 
@@ -136,7 +141,7 @@ export async function ResolveDefaultAudioInputDevice(init: DspPipelineInitializa
 
     const defaultAudioDevice = devices.length === 0 ? null : new AudioDevice(audioDeviceInfos[0]);
 
-    if(!defaultAudioDevice) return null;
+    if (!defaultAudioDevice) return null;
 
     await LoadWorkletOnMasterChannel(defaultAudioDevice.masterChannel, init.workletBlobUrl);
 
@@ -187,6 +192,23 @@ export async function LoadAudioSource(path: string, options: Partial<LoadAudioSo
     }
 }
 
+/**
+ * Loads an audio file from a blob.
+ */
+export async function LoadAudioSourceFromBlob(blob: Blob): Promise<AudioSourceData | null> {
+
+    const tempContext: AudioContext = new AudioContext(),
+        arrayBuffer: ArrayBuffer = await blob.arrayBuffer();
+
+    const audioBuffer: AudioBuffer = await tempContext.decodeAudioData(arrayBuffer);
+
+    return {
+        id: v4(),
+        timestamp: Date.now(),
+        audioBuffer, arrayBuffer
+    };
+}
+
 export function ConstructProcessorWorklet(code: string): string {
 
     const blob = new Blob([code], {
@@ -197,7 +219,7 @@ export function ConstructProcessorWorklet(code: string): string {
 }
 
 export async function LoadWorkletOnMasterChannel(master: Master, workletBlobUrl: string) {
-    Debug.Log("Loading worklet modules on master channel...", [ `Channel ID: ${master.id}` ]);
+    Debug.Log("Loading worklet modules on master channel...", [`Channel ID: ${master.id}`]);
 
     const context: AudioContext = master.context,
         start: number = Date.now();
@@ -212,4 +234,4 @@ export async function LoadWorkletOnMasterChannel(master: Master, workletBlobUrl:
     ]);
 
     return true;
-}
+}

package/lib/src/utilities/web-assembly.ts

@@ -2,13 +2,12 @@ export let hasInitializedWasm: boolean = false;
 export let compiledWebAssemblyModule: WebAssembly.Module | null = null;
 
 export async function LoadWebAssemblyModule(path: string): Promise<WebAssembly.Module> {
-
-    return new Promise(function(resolve, reject) {
-        WebAssembly.compileStreaming(fetch(path)).then(function(module: WebAssembly.Module) {
+    return new Promise(function (resolve, reject) {
+        WebAssembly.compileStreaming(fetch(path)).then(function (module: WebAssembly.Module) {
             compiledWebAssemblyModule = module;
             resolve(module);
-        }).catch(function(error: Error) {
+        }).catch(function (error: Error) {
             reject(error);
         });
-    })
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fluex/fluexgl-dsp",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "description": "An open-source, web-based DSP library developed alongside FluexGL, designed for creating and manipulating sounds in various contexts.",
     "main": "lib/dist/index.js",
     "types": "lib/dist/index.d.ts",