@opendaw/studio-core 0.0.85 → 0.0.86

package/dist/project/Project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Project.d.ts","sourceRoot":"","sources":["../../src/project/Project.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Project.d.ts","sourceRoot":"","sources":["../../src/project/Project.ts"],"names":[],"mappings":"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"}

package/dist/project/Project.js

@@ -1,6 +1,6 @@
-import { Arrays, panic, safeExecute, Terminator } from "@opendaw/lib-std";
-import { BoxEditing } from "@opendaw/lib-box";
-import { AudioRegionBox } from "@opendaw/studio-boxes";
+import { Arrays, panic, safeExecute, Terminator, UUID } from "@opendaw/lib-std";
+import { BoxEditing, DeleteUpdate, NewUpdate } from "@opendaw/lib-box";
+import { AudioFileBox, AudioRegionBox } from "@opendaw/studio-boxes";
 import { BoxAdapters, ParameterFieldAdapters, ProjectSkeleton, RootBoxAdapter, TimelineBoxAdapter, UnionBoxTypes, UserEditingManager, VaryingTempoMap, VertexSelection } from "@opendaw/studio-adapters";
 import { LiveStreamReceiver } from "@opendaw/lib-fusion";
 import { Mixer } from "../Mixer";
@@ -10,14 +10,14 @@ import { CaptureDevices, Recording } from "../capture";
 import { EngineFacade } from "../EngineFacade";
 import { MidiDevices, MIDILearning } from "../midi";
 import { ProjectValidation } from "./ProjectValidation";
-import { Preferences } from "../Preferences";
 import { TimeBase } from "@opendaw/lib-dsp";
 import { MidiData } from "@opendaw/lib-midi";
+import { StudioPreferences } from "../StudioPreferences";
 // Main Entry Point for a Project
 export class Project {
     static new(env, options) {
         const createDefaultUser = options?.noDefaultUser !== true;
-        const createOutputCompressor = Preferences.values["auto-create-output-compressor"];
+        const createOutputCompressor = StudioPreferences.settings["auto-create-output-compressor"];
         const { boxGraph, mandatoryBoxes } = ProjectSkeleton.empty({
             createOutputCompressor,
             createDefaultUser
@@ -46,6 +46,7 @@ export class Project {
         return project;
     }
     #terminator = new Terminator();
+    #sampleRegistrations;
     #env;
     boxGraph;
     rootBox;
@@ -84,30 +85,42 @@ export class Project {
         this.midiLearning = this.#terminator.own(new MIDILearning(this));
         this.captureDevices = this.#terminator.own(new CaptureDevices(this));
         this.mixer = new Mixer(this.rootBoxAdapter.audioUnits);
-        // TODO We are probably doing that from the outside
-        if (this.userInterfaceBoxes.length === 1) {
-            this.follow(this.userInterfaceBoxes[0]);
-        }
         console.debug(`Project was created on ${this.rootBoxAdapter.created.toString()}`);
+        this.#sampleRegistrations = UUID.newSet(({ uuid }) => uuid);
+        for (const box of this.boxGraph.boxes()) {
+            if (box instanceof AudioFileBox) {
+                this.#registerSample(box.address.uuid);
+            }
+        }
+        this.#terminator.own(this.boxGraph.subscribeToAllUpdates({
+            onUpdate: (update) => {
+                if (update instanceof NewUpdate && update.name === AudioFileBox.ClassName) {
+                    this.#registerSample(update.uuid);
+                }
+                else if (update instanceof DeleteUpdate && update.name === AudioFileBox.ClassName) {
+                    this.#unregisterSample(update.uuid);
+                }
+            }
+        }));
     }
     startAudioWorklet(restart, options) {
         console.debug(`start AudioWorklet`);
         const lifecycle = this.#terminator.spawn();
-        const engine = lifecycle.own(this.#env.audioWorklets.createEngine({ project: this, options }));
+        const worklet = lifecycle.own(this.#env.audioWorklets.createEngine({ project: this, options }));
         const handler = async (event) => {
             console.warn(event);
             // we will only accept the first error
-            engine.removeEventListener("error", handler);
-            engine.removeEventListener("processorerror", handler);
+            worklet.removeEventListener("error", handler);
+            worklet.removeEventListener("processorerror", handler);
             lifecycle.terminate();
             await safeExecute(restart?.unload, event);
             safeExecute(restart?.load, this.startAudioWorklet(restart));
         };
-        engine.addEventListener("error", handler);
-        engine.addEventListener("processorerror", handler);
-        engine.connect(engine.context.destination);
-        this.engine.setWorklet(engine);
-        return engine;
+        worklet.addEventListener("error", handler);
+        worklet.addEventListener("processorerror", handler);
+        worklet.connect(worklet.context.destination);
+        this.engine.setWorklet(worklet);
+        return worklet;
     }
     startRecording(countIn = true) {
         this.engine.assertWorklet();
@@ -200,7 +213,15 @@ export class Project {
         }) ?? false);
     }
     terminate() {
-        console.debug("Project terminated");
+        this.#sampleRegistrations.forEach(({ terminable }) => terminable.terminate());
+        this.#sampleRegistrations.clear();
         this.#terminator.terminate();
     }
+    #registerSample(uuid) {
+        const terminable = this.sampleManager.register(uuid);
+        this.#sampleRegistrations.add({ uuid, terminable });
+    }
+    #unregisterSample(uuid) {
+        this.#sampleRegistrations.removeByKey(uuid).terminable.terminate();
+    }
 }

package/dist/project/ProjectMigration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectMigration.d.ts","sourceRoot":"","sources":["../../src/project/ProjectMigration.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAC,eAAe,EAAC,MAAM,0BAA0B,CAAA;AAIxD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AASvC,qBAAa,gBAAgB;WACZ,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,EAAC,QAAQ,EAAE,cAAc,EAAC,EAAE,eAAe;CAuPpF"}
+{"version":3,"file":"ProjectMigration.d.ts","sourceRoot":"","sources":["../../src/project/ProjectMigration.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAC,eAAe,EAAC,MAAM,0BAA0B,CAAA;AAIxD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AASvC,qBAAa,gBAAgB;WACZ,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,EAAC,QAAQ,EAAE,cAAc,EAAC,EAAE,eAAe;CA8RpF"}

package/dist/project/ProjectMigration.js

@@ -1,5 +1,5 @@
 import { AudioFileBox, AudioPitchStretchBox, CaptureAudioBox, CaptureMidiBox, GrooveShuffleBox, MIDIOutputBox, ValueEventCollectionBox, ValueEventCurveBox } from "@opendaw/studio-boxes";
-import { asDefined, asInstanceOf, clamp, Float, UUID } from "@opendaw/lib-std";
+import { asDefined, asInstanceOf, clamp, Float, isDefined, UUID } from "@opendaw/lib-std";
 import { AudioPlayback, AudioUnitType } from "@opendaw/studio-enums";
 import { PPQN, TimeBase } from "@opendaw/lib-dsp";
 import { AudioContentHelpers } from "./audio/AudioContentHelpers";
@@ -254,6 +254,46 @@ export class ProjectMigration {
                     box.version.setValue(2);
                     boxGraph.endTransaction();
                 }
+            },
+            visitDelayDeviceBox: (box) => {
+                // Version 0: old descending array (17 values)
+                // Version 1: new ascending array with off (21 values)
+                if (box.version.getValue() !== 0) {
+                    return;
+                }
+                // Old descending: 1/1, 1/2, 1/3, 1/4, 3/16, 1/6, 1/8, 3/32, 1/12, 1/16, 3/64, 1/24, 1/32, 1/48, 1/64, 1/96, 1/128
+                // New ascending: off, 1/128, 1/96, 1/64, 1/48, 1/32, 1/24, 3/64, 1/16, 1/12, 3/32, 1/8, 1/6, 3/16, 1/4, 5/16, 1/3, 3/8, 7/16, 1/2, 1/1
+                // Mapping: old[i] fraction -> find the same fraction in the new array
+                const oldToNewIndex = [20, 19, 16, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1];
+                const oldMaxIndex = 16;
+                const newMaxIndex = 20;
+                const oldIndex = box.delayMusical.getValue();
+                const newIndex = oldToNewIndex[Math.round(clamp(oldIndex, 0, oldMaxIndex))];
+                console.debug(`Migrate 'DelayDeviceBox' delay index from ${oldIndex} to ${newIndex}`);
+                boxGraph.beginTransaction();
+                box.delayMusical.setValue(newIndex);
+                box.delayMillis.setValue(0);
+                box.preSyncTimeLeft.setValue(0);
+                box.preMillisTimeLeft.setValue(0);
+                box.preSyncTimeRight.setValue(0);
+                box.preMillisTimeRight.setValue(0);
+                box.version.setValue(1);
+                // Migrate automation events targeting the delay field
+                // Automation stores normalized values in [0, 1] range
+                box.delayMusical.pointerHub.incoming().forEach(pointer => {
+                    const eventBox = pointer.box.accept({
+                        visitValueEventBox: (event) => event
+                    });
+                    if (isDefined(eventBox)) {
+                        const oldNormalized = eventBox.value.getValue();
+                        const oldEventIndex = Math.round(oldNormalized * oldMaxIndex);
+                        const newEventIndex = oldToNewIndex[clamp(oldEventIndex, 0, oldMaxIndex)];
+                        const newNormalized = newEventIndex / newMaxIndex;
+                        console.debug(`  Migrate automation: ${oldNormalized.toFixed(4)} (idx ${oldEventIndex}) -> ${newNormalized.toFixed(4)} (idx ${newEventIndex})`);
+                        eventBox.value.setValue(newNormalized);
+                    }
+                });
+                boxGraph.endTransaction();
             }
         }));
     }

package/dist/samples/DefaultSampleLoader.d.ts

@@ -1,18 +1,20 @@
 import { Observer, Option, Subscription, UUID } from "@opendaw/lib-std";
 import { Peaks } from "@opendaw/lib-fusion";
 import { SampleLoader, SampleLoaderState, SampleMetaData } from "@opendaw/studio-adapters";
-import { DefaultSampleLoaderManager } from "./DefaultSampleLoaderManager";
 import { AudioData } from "@opendaw/lib-dsp";
 export declare class DefaultSampleLoader implements SampleLoader {
     #private;
-    constructor(manager: DefaultSampleLoaderManager, uuid: UUID.Bytes);
-    invalidate(): void;
+    constructor(uuid: UUID.Bytes);
     subscribe(observer: Observer<SampleLoaderState>): Subscription;
     get uuid(): UUID.Bytes;
     get data(): Option<AudioData>;
     get meta(): Option<SampleMetaData>;
     get peaks(): Option<Peaks>;
     get state(): SampleLoaderState;
+    setLoaded(data: AudioData, peaks: Peaks, meta: SampleMetaData): void;
+    setProgress(progress: number): void;
+    setError(reason: string): void;
+    invalidate(): void;
     toString(): string;
 }
 //# sourceMappingURL=DefaultSampleLoader.d.ts.map

package/dist/samples/DefaultSampleLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultSampleLoader.d.ts","sourceRoot":"","sources":["../../src/samples/DefaultSampleLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,QAAQ,EACR,MAAM,EAEN,YAAY,EAEZ,IAAI,EACP,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAC,KAAK,EAAc,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAC,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAExF,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAA;AAEvE,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAE1C,qBAAa,mBAAoB,YAAW,YAAY;;gBAYxC,OAAO,EAAE,0BAA0B,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK;IAQjE,UAAU,IAAI,IAAI;IASlB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,YAAY;IAQ9D,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAoB;IAC1C,IAAI,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,CAAoB;IACjD,IAAI,IAAI,IAAI,MAAM,CAAC,cAAc,CAAC,CAAoB;IACtD,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAqB;IAC/C,IAAI,KAAK,IAAI,iBAAiB,CAAqB;IAEnD,QAAQ,IAAI,MAAM;CAuErB"}
+{"version":3,"file":"DefaultSampleLoader.d.ts","sourceRoot":"","sources":["../../src/samples/DefaultSampleLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAc,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAC3F,OAAO,EAAC,KAAK,EAAC,MAAM,qBAAqB,CAAA;AACzC,OAAO,EAAC,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AACxF,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAE1C,qBAAa,mBAAoB,YAAW,YAAY;;gBASxC,IAAI,EAAE,IAAI,CAAC,KAAK;IAK5B,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,YAAY;IAQ9D,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAoB;IAC1C,IAAI,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,CAAoB;IACjD,IAAI,IAAI,IAAI,MAAM,CAAC,cAAc,CAAC,CAAoB;IACtD,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAqB;IAC/C,IAAI,KAAK,IAAI,iBAAiB,CAAqB;IAEnD,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI;IAQpE,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKnC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK9B,UAAU,IAAI,IAAI;IAQlB,QAAQ,IAAI,MAAM;CACrB"}

package/dist/samples/DefaultSampleLoader.js

@@ -1,30 +1,14 @@
-import { ByteArrayInput, Notifier, Option, Progress, Terminable, UUID } from "@opendaw/lib-std";
-import { Promises } from "@opendaw/lib-runtime";
-import { SamplePeaks } from "@opendaw/lib-fusion";
-import { Workers } from "../Workers";
-import { SampleStorage } from "./SampleStorage";
+import { Notifier, Option, Terminable, UUID } from "@opendaw/lib-std";
 export class DefaultSampleLoader {
-    #manager;
     #uuid;
     #notifier;
     #meta = Option.None;
     #data = Option.None;
     #peaks = Option.None;
     #state = { type: "progress", progress: 0.0 };
-    #version = 0;
-    constructor(manager, uuid) {
-        this.#manager = manager;
+    constructor(uuid) {
         this.#uuid = uuid;
         this.#notifier = new Notifier();
-        this.#get();
-    }
-    invalidate() {
-        this.#state = { type: "progress", progress: 0.0 };
-        this.#meta = Option.None;
-        this.#data = Option.None;
-        this.#peaks = Option.None;
-        this.#version++;
-        this.#get();
     }
     subscribe(observer) {
         if (this.#state.type === "loaded" || this.#state.type === "error") {
@@ -38,72 +22,27 @@ export class DefaultSampleLoader {
     get meta() { return this.#meta; }
     get peaks() { return this.#peaks; }
     get state() { return this.#state; }
-    toString() { return `{MainThreadSampleLoader}`; }
-    #setState(value) {
-        this.#state = value;
+    setLoaded(data, peaks, meta) {
+        this.#data = Option.wrap(data);
+        this.#peaks = Option.wrap(peaks);
+        this.#meta = Option.wrap(meta);
+        this.#state = { type: "loaded" };
         this.#notifier.notify(this.#state);
     }
-    #get() {
-        let version = this.#version;
-        SampleStorage.get().load(this.#uuid).then(([data, peaks, meta]) => {
-            if (this.#version !== version) {
-                console.warn(`Ignore obsolete version: ${this.#version} / ${version}`);
-                return;
-            }
-            this.#data = Option.wrap(data);
-            this.#meta = Option.wrap(meta);
-            this.#peaks = Option.wrap(peaks);
-            this.#setState({ type: "loaded" });
-        }, (error) => {
-            if (error instanceof Error && error.message.startsWith("timeoout")) {
-                this.#setState({ type: "error", reason: error.message });
-                return console.warn(`Sample ${UUID.toString(this.#uuid)} timed out.`);
-            }
-            else {
-                return this.#fetch();
-            }
-        });
+    setProgress(progress) {
+        this.#state = { type: "progress", progress };
+        this.#notifier.notify(this.#state);
     }
-    async #fetch() {
-        let version = this.#version;
-        const [fetchProgress, peakProgress] = Progress.split(progress => this.#setState({
-            type: "progress",
-            progress: 0.1 + 0.9 * progress
-        }), 2);
-        const fetchResult = await Promises.tryCatch(this.#manager.fetch(this.#uuid, fetchProgress));
-        if (this.#version !== version) {
-            return;
-        }
-        if (fetchResult.status === "rejected") {
-            const error = fetchResult.error;
-            console.warn(error);
-            const reason = error instanceof Error ? error.message : String(error);
-            this.#setState({ type: "error", reason });
-            return;
-        }
-        const [audio, meta] = fetchResult.value;
-        const shifts = SamplePeaks.findBestFit(audio.numberOfFrames);
-        const peaks = await Workers.Peak.generateAsync(peakProgress, shifts, audio.frames, audio.numberOfFrames, audio.numberOfChannels);
-        const storeResult = await Promises.tryCatch(SampleStorage.get().save({
-            uuid: this.#uuid,
-            audio: audio,
-            peaks: peaks,
-            meta: meta
-        }));
-        if (this.#version !== version) {
-            return;
-        }
-        if (storeResult.status === "resolved") {
-            this.#data = Option.wrap(audio);
-            this.#meta = Option.wrap(meta);
-            this.#peaks = Option.wrap(SamplePeaks.from(new ByteArrayInput(peaks)));
-            this.#setState({ type: "loaded" });
-        }
-        else {
-            const error = storeResult.error;
-            console.warn(error);
-            const reason = error instanceof Error ? error.message : String(error);
-            this.#setState({ type: "error", reason });
-        }
+    setError(reason) {
+        this.#state = { type: "error", reason };
+        this.#notifier.notify(this.#state);
+    }
+    invalidate() {
+        this.#state = { type: "progress", progress: 0.0 };
+        this.#meta = Option.None;
+        this.#data = Option.None;
+        this.#peaks = Option.None;
+        this.#notifier.notify(this.#state);
     }
+    toString() { return `{DefaultSampleLoader ${UUID.toString(this.#uuid)}}`; }
 }

package/dist/samples/{DefaultSampleLoaderManager.d.ts → GlobalSampleLoaderManager.d.ts}

@@ -1,15 +1,16 @@
-import { Progress, UUID } from "@opendaw/lib-std";
+import { Progress, Terminable, UUID } from "@opendaw/lib-std";
 import { SampleProvider } from "./SampleProvider";
 import { SampleLoader, SampleLoaderManager, SampleMetaData } from "@opendaw/studio-adapters";
 import { AudioData } from "@opendaw/lib-dsp";
-export declare class DefaultSampleLoaderManager implements SampleLoaderManager, SampleProvider {
+export declare class GlobalSampleLoaderManager implements SampleLoaderManager, SampleProvider {
     #private;
     constructor(provider: SampleProvider);
     fetch(uuid: UUID.Bytes, progress: Progress.Handler): Promise<[AudioData, SampleMetaData]>;
     remove(uuid: UUID.Bytes): void;
     invalidate(uuid: UUID.Bytes): void;
+    register(uuid: UUID.Bytes): Terminable;
     record(loader: SampleLoader): void;
     getOrCreate(uuid: UUID.Bytes): SampleLoader;
     getAudioData(uuid: UUID.Bytes): Promise<AudioData>;
 }
-//# sourceMappingURL=DefaultSampleLoaderManager.d.ts.map
+//# sourceMappingURL=GlobalSampleLoaderManager.d.ts.map

package/dist/samples/GlobalSampleLoaderManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GlobalSampleLoaderManager.d.ts","sourceRoot":"","sources":["../../src/samples/GlobalSampleLoaderManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,QAAQ,EAA2B,UAAU,EAAE,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAEzG,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAC1F,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAuB1C,qBAAa,yBAA0B,YAAW,mBAAmB,EAAE,cAAc;;gBAOrE,QAAQ,EAAE,cAAc;IAQpC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAIzF,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,IAAI;IAO9B,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,IAAI;IAWlC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,UAAU;IAuBtC,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAIlC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,YAAY;IAQrC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC;CA8E3D"}

package/dist/samples/GlobalSampleLoaderManager.js

@@ -0,0 +1,146 @@
+import { ByteArrayInput, Progress, UUID } from "@opendaw/lib-std";
+import { DefaultSampleLoader } from "./DefaultSampleLoader";
+import { SampleStorage } from "./SampleStorage";
+import { SamplePeaks } from "@opendaw/lib-fusion";
+import { Workers } from "../Workers";
+import { Promises } from "@opendaw/lib-runtime";
+export class GlobalSampleLoaderManager {
+    #provider;
+    #loaders;
+    #refCounts;
+    #cache;
+    #pending;
+    constructor(provider) {
+        this.#provider = provider;
+        this.#loaders = UUID.newSet(({ uuid }) => uuid);
+        this.#refCounts = UUID.newSet(({ uuid }) => uuid);
+        this.#cache = UUID.newSet(({ uuid }) => uuid);
+        this.#pending = UUID.newSet(({ uuid }) => uuid);
+    }
+    fetch(uuid, progress) {
+        return this.#provider.fetch(uuid, progress);
+    }
+    remove(uuid) {
+        this.#refCounts.removeByKeyIfExist(uuid);
+        this.#loaders.removeByKeyIfExist(uuid);
+        this.#cache.removeByKeyIfExist(uuid);
+        this.#pending.removeByKeyIfExist(uuid);
+    }
+    invalidate(uuid) {
+        this.#cache.removeByKey(uuid);
+        this.#pending.removeByKey(uuid);
+        this.#loaders.opt(uuid).ifSome(loader => {
+            loader.invalidate();
+            if (loader instanceof DefaultSampleLoader) {
+                this.#load(loader);
+            }
+        });
+    }
+    register(uuid) {
+        const current = this.#refCounts.opt(uuid);
+        if (current.nonEmpty()) {
+            current.unwrap().count++;
+        }
+        else {
+            this.#refCounts.add({ uuid, count: 1 });
+        }
+        return {
+            terminate: () => {
+                const ref = this.#refCounts.opt(uuid);
+                if (ref.isEmpty()) {
+                    return;
+                }
+                const { count } = ref.unwrap();
+                if (count <= 1) {
+                    this.#refCounts.removeByKey(uuid);
+                    this.#loaders.removeByKeyIfExist(uuid);
+                    this.#cache.removeByKeyIfExist(uuid);
+                }
+                else {
+                    ref.unwrap().count--;
+                }
+            }
+        };
+    }
+    record(loader) {
+        this.#loaders.add(loader);
+    }
+    getOrCreate(uuid) {
+        return this.#loaders.getOrCreate(uuid, uuid => {
+            const loader = new DefaultSampleLoader(uuid);
+            this.#load(loader);
+            return loader;
+        });
+    }
+    async getAudioData(uuid) {
+        const { promise, resolve, reject } = Promise.withResolvers();
+        const loader = this.getOrCreate(uuid);
+        let subscription;
+        subscription = loader.subscribe(state => {
+            if (state.type === "error") {
+                queueMicrotask(() => subscription.terminate());
+                reject(new Error(state.reason));
+            }
+            else if (loader.data.nonEmpty()) {
+                queueMicrotask(() => subscription.terminate());
+                resolve(loader.data.unwrap());
+            }
+        });
+        return promise;
+    }
+    #load(loader) {
+        const { uuid } = loader;
+        const cached = this.#cache.opt(uuid);
+        if (cached.nonEmpty()) {
+            const { data, peaks, meta } = cached.unwrap();
+            loader.setLoaded(data, peaks, meta);
+            return;
+        }
+        const pending = this.#pending.opt(uuid);
+        if (pending.nonEmpty()) {
+            pending.unwrap().promise.then(() => {
+                const cached = this.#cache.opt(uuid);
+                if (cached.nonEmpty()) {
+                    const { data, peaks, meta } = cached.unwrap();
+                    loader.setLoaded(data, peaks, meta);
+                }
+            });
+            return;
+        }
+        const promise = SampleStorage.get().load(uuid).then(([data, peaks, meta]) => {
+            this.#pending.removeByKey(uuid);
+            this.#cache.add({ uuid, data, peaks, meta });
+            loader.setLoaded(data, peaks, meta);
+        }, () => this.#fetchFromApi(loader).finally(() => this.#pending.removeByKey(uuid))).catch((error) => {
+            this.#pending.removeByKey(uuid);
+            console.warn("Unexpected error loading sample:", error);
+            loader.setError(error instanceof Error ? error.message : String(error));
+        });
+        this.#pending.add({ uuid, promise });
+    }
+    async #fetchFromApi(loader) {
+        const { uuid } = loader;
+        const [fetchProgress, peakProgress] = Progress.split(progress => loader.setProgress(0.1 + 0.9 * progress), 2);
+        const fetchResult = await Promises.tryCatch(this.#provider.fetch(uuid, fetchProgress));
+        if (fetchResult.status === "rejected") {
+            const error = fetchResult.error;
+            console.warn(error);
+            loader.setError(error instanceof Error ? error.message : String(error));
+            return;
+        }
+        const [audio, meta] = fetchResult.value;
+        const shifts = SamplePeaks.findBestFit(audio.numberOfFrames);
+        const peaksBuffer = await Workers.Peak.generateAsync(peakProgress, shifts, audio.frames, audio.numberOfFrames, audio.numberOfChannels);
+        const storeResult = await Promises.tryCatch(SampleStorage.get().save({ uuid, audio, peaks: peaksBuffer, meta }));
+        if (storeResult.status === "resolved") {
+            const peaks = SamplePeaks.from(new ByteArrayInput(peaksBuffer));
+            this.#cache.add({ uuid, data: audio, peaks, meta });
+            loader.setLoaded(audio, peaks, meta);
+        }
+        else {
+            const error = storeResult.error;
+            console.warn(error);
+            loader.setError(error instanceof Error ? error.message : String(error));
+        }
+    }
+}

package/dist/samples/OpenSampleAPI.d.ts

@@ -6,11 +6,10 @@ export declare class OpenSampleAPI implements SampleAPI {
     static readonly ApiRoot = "https://api.opendaw.studio/samples";
     static readonly FileRoot = "https://assets.opendaw.studio/samples";
     static get(): OpenSampleAPI;
-    static fromAudioBuffer(buffer: AudioBuffer): AudioData;
     private constructor();
     all(): Promise<ReadonlyArray<Sample>>;
     get(uuid: UUID.Bytes): Promise<Sample>;
-    load(context: AudioContext, uuid: UUID.Bytes, progress: Procedure<unitValue>): Promise<[AudioData, Sample]>;
+    load(uuid: UUID.Bytes, progress: Procedure<unitValue>): Promise<[AudioData, Sample]>;
     upload(arrayBuffer: ArrayBuffer, metaData: SampleMetaData): Promise<void>;
     allowsUpload(): boolean;
 }

package/dist/samples/OpenSampleAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenSampleAPI.d.ts","sourceRoot":"","sources":["../../src/samples/OpenSampleAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAMH,SAAS,EAGT,SAAS,EACT,IAAI,EACP,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAA;AAG9C,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAG1C,qBAAa,aAAc,YAAW,SAAS;IAC3C,MAAM,CAAC,QAAQ,CAAC,OAAO,wCAAuC;IAC9D,MAAM,CAAC,QAAQ,CAAC,QAAQ,2CAA0C;IAGlE,MAAM,CAAC,GAAG,IAAI,aAAa;IAE3B,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS;IAStD,OAAO;IAGD,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAKrC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAQtC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAmC3G,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC/E,YAAY,IAAI,OAAO;CAC1B"}
+{"version":3,"file":"OpenSampleAPI.d.ts","sourceRoot":"","sources":["../../src/samples/OpenSampleAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,SAAS,EAGT,SAAS,EACT,IAAI,EACP,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAA;AAG9C,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAI1C,qBAAa,aAAc,YAAW,SAAS;IAC3C,MAAM,CAAC,QAAQ,CAAC,OAAO,wCAAuC;IAC9D,MAAM,CAAC,QAAQ,CAAC,QAAQ,2CAA0C;IAGlE,MAAM,CAAC,GAAG,IAAI,aAAa;IAE3B,OAAO;IAGD,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAKrC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IActC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAqCpF,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC/E,YAAY,IAAI,OAAO;CAC1B"}

package/dist/samples/OpenSampleAPI.js

@@ -7,24 +7,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Arrays, asDefined, DefaultObservableValue, Lazy, panic, RuntimeNotifier, tryCatch, UUID } from "@opendaw/lib-std";
+import { asDefined, DefaultObservableValue, Lazy, panic, RuntimeNotifier, tryCatch, UUID } from "@opendaw/lib-std";
 import { network, Promises } from "@opendaw/lib-runtime";
 import { Sample } from "@opendaw/studio-adapters";
 import { base64Credentials, OpenDAWHeaders } from "../OpenDAWHeaders";
 import { z } from "zod";
+import { WavFile } from "../WavFile";
 // Standard openDAW samples (considered to be non-removable)
 export class OpenSampleAPI {
     static ApiRoot = "https://api.opendaw.studio/samples";
     static FileRoot = "https://assets.opendaw.studio/samples";
     static get() { return new OpenSampleAPI(); }
-    static fromAudioBuffer(buffer) {
-        return {
-            frames: Arrays.create(channel => buffer.getChannelData(channel), buffer.numberOfChannels),
-            sampleRate: buffer.sampleRate,
-            numberOfFrames: buffer.length,
-            numberOfChannels: buffer.numberOfChannels
-        };
-    }
     constructor() { }
     async all() {
         return network.defaultFetch(`${OpenSampleAPI.ApiRoot}/list.php`, OpenDAWHeaders)
@@ -32,17 +25,18 @@ export class OpenSampleAPI {
     }
     async get(uuid) {
         const url = `${OpenSampleAPI.ApiRoot}/get.php?uuid=${UUID.toString(uuid)}`;
-        const sample = await Promises.retry(() => network.limitFetch(url, OpenDAWHeaders)
-            .then(x => x.json().then(x => Sample.parse(x))))
-            .then(x => { if ("error" in x) {
-            return panic(x.error);
+        const response = await Promises.retry(() => network.limitFetch(url, OpenDAWHeaders));
+        if (!response.ok) {
+            return panic(`Sample not found: ${UUID.toString(uuid)}`);
+        }
+        const json = await response.json();
+        if ("error" in json) {
+            return panic(json.error);
         }
-        else {
-            return x;
-        } });
+        const sample = Sample.parse(json);
         return Object.freeze({ ...sample, origin: "openDAW" });
     }
-    async load(context, uuid, progress) {
+    async load(uuid, progress) {
         console.debug(`load ${UUID.toString(uuid)}`);
         return this.get(uuid)
             .then(({ uuid, name, bpm }) => Promises.retry(() => network
@@ -67,15 +61,17 @@ export class OpenSampleAPI {
                 reader.read().then(nextChunk, reject);
             });
         })
-            .then(arrayBuffer => context.decodeAudioData(arrayBuffer))
-            .then(audioBuffer => ([OpenSampleAPI.fromAudioBuffer(audioBuffer), {
-                uuid,
-                bpm,
-                name,
-                duration: audioBuffer.duration,
-                sample_rate: audioBuffer.sampleRate,
-                origin: "openDAW"
-            }])));
+            .then(arrayBuffer => {
+            const audioData = WavFile.decodeFloats(arrayBuffer);
+            return [audioData, {
+                    uuid,
+                    bpm,
+                    name,
+                    duration: audioData.numberOfFrames / audioData.sampleRate,
+                    sample_rate: audioData.sampleRate,
+                    origin: "openDAW"
+                }];
+        }));
     }
     async upload(arrayBuffer, metaData) {
         const progress = new DefaultObservableValue(0.0);

package/dist/samples/SampleAPI.d.ts

@@ -4,7 +4,7 @@ import { AudioData } from "@opendaw/lib-dsp";
 export interface SampleAPI {
     all(): Promise<ReadonlyArray<Sample>>;
     get(uuid: UUID.Bytes): Promise<Sample>;
-    load(context: AudioContext, uuid: UUID.Bytes, progress: Procedure<unitValue>): Promise<[AudioData, Sample]>;
+    load(uuid: UUID.Bytes, progress: Procedure<unitValue>): Promise<[AudioData, Sample]>;
     upload(arrayBuffer: ArrayBuffer, metaData: SampleMetaData): Promise<void>;
     allowsUpload(): boolean;
 }

package/dist/samples/SampleAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SampleAPI.d.ts","sourceRoot":"","sources":["../../src/samples/SampleAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAC3D,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAE1C,MAAM,WAAW,SAAS;IACtB,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACrC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACtC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;IAC3G,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACzE,YAAY,IAAI,OAAO,CAAA;CAC1B"}
+{"version":3,"file":"SampleAPI.d.ts","sourceRoot":"","sources":["../../src/samples/SampleAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAC3D,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAE1C,MAAM,WAAW,SAAS;IACtB,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACrC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACtC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;IACpF,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACzE,YAAY,IAAI,OAAO,CAAA;CAC1B"}

package/dist/samples/SampleService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SampleService.d.ts","sourceRoot":"","sources":["../../src/samples/SampleService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,EAAe,SAAS,EAAiB,MAAM,kBAAkB,CAAA;AACtF,OAAO,EAAC,GAAG,EAAC,MAAM,kBAAkB,CAAA;AAKpC,OAAO,EAAC,MAAM,EAAiB,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAA;AAM5C,qBAAa,aAAc,SAAQ,YAAY,CAAC,MAAM,CAAC;IAMvC,QAAQ,CAAC,YAAY,EAAE,YAAY;IAL/C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAY;IACjD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAW;IAClD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAe;IACrD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAiC;gBAEnE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC;IAItE,UAAU,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,eAAgC,EAAC,EACzD,YAAY,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;cAqC5C,eAAe,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;CAKpE"}
+{"version":3,"file":"SampleService.d.ts","sourceRoot":"","sources":["../../src/samples/SampleService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,EAAe,SAAS,EAAiB,MAAM,kBAAkB,CAAA;AACtF,OAAO,EAAC,GAAG,EAAC,MAAM,kBAAkB,CAAA;AAKpC,OAAO,EAAC,MAAM,EAAiB,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAA;AAM5C,qBAAa,aAAc,SAAQ,YAAY,CAAC,MAAM,CAAC;IAMvC,QAAQ,CAAC,YAAY,EAAE,YAAY;IAL/C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAY;IACjD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAW;IAClD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAe;IACrD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAiC;gBAEnE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC;IAItE,UAAU,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,eAAgC,EAAC,EACzD,YAAY,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;cAmC5C,eAAe,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;CAKpE"}