@opendaw/studio-core 0.0.42 → 0.0.44

package/dist/project/Project.d.ts

@@ -6,10 +6,10 @@ import { LiveStreamBroadcaster, LiveStreamReceiver } from "@opendaw/lib-fusion";
 import { ProjectEnv } from "./ProjectEnv";
 import { Mixer } from "../Mixer";
 import { ProjectApi } from "./ProjectApi";
-import { CaptureDevices } from "../capture/CaptureDevices";
+import { CaptureDevices } from "../capture";
 import { EngineFacade } from "../EngineFacade";
 import { EngineWorklet } from "../EngineWorklet";
-import { MIDILearning } from "../midi/MIDILearning";
+import { MIDILearning } from "../midi";
 export type RestartWorklet = {
     unload: Procedure<unknown>;
     load: Procedure<EngineWorklet>;

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

@@ -7,10 +7,9 @@ import { AudioUnitType } from "@opendaw/studio-enums";
 import { Mixer } from "../Mixer";
 import { ProjectApi } from "./ProjectApi";
 import { ProjectMigration } from "./ProjectMigration";
-import { CaptureDevices } from "../capture/CaptureDevices";
+import { CaptureDevices, Recording } from "../capture";
 import { EngineFacade } from "../EngineFacade";
-import { Recording } from "../capture/Recording";
-import { MIDILearning } from "../midi/MIDILearning";
+import { MIDILearning } from "../midi";
 import { ProjectValidation } from "./ProjectValidation";
 // Main Entry Point for a Project
 export class Project {

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,SAAS,EAAE,MAAM,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAA;AAI9C,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;IAED,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;IAsC/E,YAAY,IAAI,OAAO;CAC1B"}
+{"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,SAAS,EAAE,MAAM,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAA;AAK9C,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;IAED,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"}

package/dist/samples/OpenSampleAPI.js

@@ -9,7 +9,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { Arrays, 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";
 // Standard openDAW samples (considered to be non-removable)
 export class OpenSampleAPI {
     static ApiRoot = "https://api.opendaw.studio/samples";
@@ -25,13 +27,13 @@ export class OpenSampleAPI {
     }
     constructor() { }
     async all() {
-        return Promises.retry(() => fetch(`${OpenSampleAPI.ApiRoot}/list.php`, OpenDAWHeaders)
-            .then(x => x.json(), () => []));
+        return Promises.guardedRetry(() => fetch(`${OpenSampleAPI.ApiRoot}/list.php`, OpenDAWHeaders)
+            .then(x => x.json().then(x => z.array(Sample).parse(x)), () => []), (_error, count) => count < 10);
     }
     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 => x.json().then(x => Sample.parse(x))))
             .then(x => { if ("error" in x) {
             return panic(x.error);
         }

package/dist/samples/SampleService.d.ts

@@ -1,18 +1,15 @@
-import { Procedure, Progress, UUID } from "@opendaw/lib-std";
+import { Class, Procedure } from "@opendaw/lib-std";
+import { Box } from "@opendaw/lib-box";
 import { Sample } from "@opendaw/studio-adapters";
-export declare namespace SampleService {
-    type ImportArgs = {
-        uuid?: UUID.Bytes;
-        name: string;
-        arrayBuffer: ArrayBuffer;
-        progressHandler?: Progress.Handler;
-    };
-}
-export declare class SampleService {
+import { AssetService } from "../AssetService";
+export declare class SampleService extends AssetService<Sample> {
     readonly audioContext: AudioContext;
-    readonly onUpdate: Procedure<Sample>;
+    protected readonly namePlural: string;
+    protected readonly nameSingular: string;
+    protected readonly boxType: Class<Box>;
+    protected readonly filePickerOptions: FilePickerOptions;
     constructor(audioContext: AudioContext, onUpdate: Procedure<Sample>);
-    browseForSamples(multiple: boolean): Promise<void>;
-    importSample({ uuid, name, arrayBuffer, progressHandler }: SampleService.ImportArgs): Promise<Sample>;
+    importFile({ uuid, name, arrayBuffer, progressHandler }: AssetService.ImportArgs): Promise<Sample>;
+    protected collectAllFiles(): Promise<ReadonlyArray<Sample>>;
 }
 //# sourceMappingURL=SampleService.d.ts.map

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,EAKH,SAAS,EACT,QAAQ,EAER,IAAI,EACP,MAAM,kBAAkB,CAAA;AAKzB,OAAO,EAAY,MAAM,EAAiB,MAAM,0BAA0B,CAAA;AAG1E,yBAAiB,aAAa,CAAC;IAC3B,KAAY,UAAU,GAAG;QACrB,IAAI,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;QACzB,eAAe,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAA;KACrC,CAAA;CACJ;AAED,qBAAa,aAAa;IACV,QAAQ,CAAC,YAAY,EAAE,YAAY;IAAE,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC;gBAAhE,YAAY,EAAE,YAAY,EAAW,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC;IAE/E,gBAAgB,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAiClD,YAAY,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,eAAgC,EAAC,EACzD,aAAa,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;CAoClE"}
+{"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,EAAY,MAAM,EAAiB,MAAM,0BAA0B,CAAA;AAC1E,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"}

package/dist/samples/SampleService.js

@@ -1,52 +1,24 @@
-import { Arrays, DefaultObservableValue, Errors, panic, Progress, RuntimeNotifier, UUID } from "@opendaw/lib-std";
+import { Arrays, isUndefined, Progress, UUID } from "@opendaw/lib-std";
 import { estimateBpm } from "@opendaw/lib-dsp";
-import { Files } from "@opendaw/lib-dom";
 import { Promises } from "@opendaw/lib-runtime";
 import { SamplePeaks } from "@opendaw/lib-fusion";
-import { FilePickerAcceptTypes, SampleStorage, Workers } from "../index";
-export class SampleService {
+import { AudioFileBox } from "@opendaw/studio-boxes";
+import { AssetService } from "../AssetService";
+import { FilePickerAcceptTypes } from "../FilePickerAcceptTypes";
+import { Workers } from "../Workers";
+import { SampleStorage } from "./SampleStorage";
+import { OpenSampleAPI } from "./OpenSampleAPI";
+export class SampleService extends AssetService {
     audioContext;
-    onUpdate;
+    namePlural = "Samples";
+    nameSingular = "Sample";
+    boxType = AudioFileBox;
+    filePickerOptions = FilePickerAcceptTypes.WavFiles;
     constructor(audioContext, onUpdate) {
+        super(onUpdate);
         this.audioContext = audioContext;
-        this.onUpdate = onUpdate;
     }
-    async browseForSamples(multiple) {
-        const { error, status, value: files } = await Promises.tryCatch(Files.open({ ...FilePickerAcceptTypes.WavFiles, multiple }));
-        if (status === "rejected") {
-            if (Errors.isAbort(error)) {
-                return;
-            }
-            else {
-                return panic(String(error));
-            }
-        }
-        const progress = new DefaultObservableValue(0.0);
-        const dialog = RuntimeNotifier.progress({
-            headline: `Importing ${files.length === 1 ? "Sample" : "Samples"}...`, progress
-        });
-        const progressHandler = Progress.split(value => progress.setValue(value), files.length);
-        const rejected = [];
-        for (const [index, file] of files.entries()) {
-            const arrayBuffer = await file.arrayBuffer();
-            const { status, error } = await Promises.tryCatch(this.importSample({
-                name: file.name,
-                arrayBuffer: arrayBuffer,
-                progressHandler: progressHandler[index]
-            }));
-            if (status === "rejected") {
-                rejected.push(String(error));
-            }
-        }
-        dialog.terminate();
-        if (rejected.length > 0) {
-            await RuntimeNotifier.info({
-                headline: "Sample Import Issues",
-                message: `${rejected.join(", ")} could not be imported.`
-            });
-        }
-    }
-    async importSample({ uuid, name, arrayBuffer, progressHandler = Progress.Empty }) {
+    async importFile({ uuid, name, arrayBuffer, progressHandler = Progress.Empty }) {
         console.debug(`importSample '${name}' (${arrayBuffer.byteLength >> 10}kb)`);
         console.time("UUID.sha256");
         uuid ??= await UUID.sha256(arrayBuffer); // Must run before decodeAudioData laster, because it will detach the ArrayBuffer
@@ -69,7 +41,7 @@ export class SampleService {
         const peaks = await Workers.Peak.generateAsync(progressHandler, shifts, audioData.frames, audioData.numberOfFrames, audioData.numberOfChannels);
         const meta = {
             bpm: estimateBpm(audioBuffer.duration),
-            name: name.substring(0, name.lastIndexOf(".")),
+            name: isUndefined(name) ? "Unnnamed" : name.substring(0, name.lastIndexOf(".")),
             duration: audioBuffer.duration,
             sample_rate: audioBuffer.sampleRate,
             origin: "import"
@@ -79,4 +51,9 @@ export class SampleService {
         this.onUpdate(sample);
         return sample;
     }
+    async collectAllFiles() {
+        const stock = await OpenSampleAPI.get().all();
+        const local = await SampleStorage.get().list();
+        return Arrays.merge(stock, local, (sample, { uuid }) => sample.uuid === uuid);
+    }
 }

package/dist/samples/SampleStorage.d.ts

@@ -13,7 +13,7 @@ export declare namespace SampleStorage {
 export declare class SampleStorage extends Storage<Sample, SampleMetaData, SampleStorage.NewSample, [AudioData, Peaks, SampleMetaData]> {
     static readonly Folder = "samples/v2";
     static get(): SampleStorage;
-    static clean(): Promise<void>;
+    static cleanDeprecated(): Promise<void>;
     private constructor();
     save({ uuid, audio, peaks, meta }: SampleStorage.NewSample): Promise<void>;
     updateSampleMeta(uuid: UUID.Bytes, meta: SampleMetaData): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"SampleStorage.d.ts","sourceRoot":"","sources":["../../src/samples/SampleStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,IAAI,EAAC,MAAM,kBAAkB,CAAA;AACtE,OAAO,EAAC,KAAK,EAAc,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAG1E,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAA;AAElC,yBAAiB,aAAa,CAAC;IAC3B,KAAY,SAAS,GAAG;QACpB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC;QACjB,KAAK,EAAE,SAAS,CAAC;QACjB,KAAK,EAAE,WAAW,CAAC;QACnB,IAAI,EAAE,cAAc,CAAA;KACvB,CAAA;CACJ;AAED,qBAAa,aAAc,SAAQ,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IAC3H,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAe;IAGrC,MAAM,CAAC,GAAG,IAAI,aAAa;WAEd,KAAK;IAElB,OAAO;IAED,IAAI,CAAC,EAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAC,EAAE,aAAa,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAexE,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;CAgB5E"}
+{"version":3,"file":"SampleStorage.d.ts","sourceRoot":"","sources":["../../src/samples/SampleStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,IAAI,EAAC,MAAM,kBAAkB,CAAA;AACtE,OAAO,EAAC,KAAK,EAAc,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAG1E,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAA;AAElC,yBAAiB,aAAa,CAAC;IAC3B,KAAY,SAAS,GAAG;QACpB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC;QACjB,KAAK,EAAE,SAAS,CAAC;QACjB,KAAK,EAAE,WAAW,CAAC;QACnB,IAAI,EAAE,cAAc,CAAA;KACvB,CAAA;CACJ;AAED,qBAAa,aAAc,SAAQ,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IAC3H,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAe;IAGrC,MAAM,CAAC,GAAG,IAAI,aAAa;WAEd,eAAe;IAE5B,OAAO;IAED,IAAI,CAAC,EAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAC,EAAE,aAAa,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAexE,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;CAgB5E"}

package/dist/samples/SampleStorage.js

@@ -15,7 +15,7 @@ import { Storage } from "../Storage";
 export class SampleStorage extends Storage {
     static Folder = "samples/v2";
     static get() { return new SampleStorage(); }
-    static async clean() { Workers.Opfs.delete("samples/v1").catch(EmptyExec); }
+    static async cleanDeprecated() { Workers.Opfs.delete("samples/v1").catch(EmptyExec); }
     constructor() { super(SampleStorage.Folder); }
     async save({ uuid, audio, peaks, meta }) {
         const path = `${this.folder}/${UUID.toString(uuid)}`;

package/dist/soundfont/DefaultSoundfontLoader.d.ts

@@ -1,11 +1,12 @@
 import { Observer, Option, Subscription, UUID } from "@opendaw/lib-std";
 import { SoundfontLoader, SoundfontLoaderState, SoundfontMetaData } from "@opendaw/studio-adapters";
 import { DefaultSoundfontLoaderManager } from "./DefaultSoundfontLoaderManager";
-import { SoundFont2 } from "soundfont2";
+import type { SoundFont2 } from "soundfont2";
 export declare class DefaultSoundfontLoader implements SoundfontLoader {
     #private;
     constructor(manager: DefaultSoundfontLoaderManager, uuid: UUID.Bytes);
     subscribe(observer: Observer<SoundfontLoaderState>): Subscription;
+    invalidate(): void;
     get uuid(): UUID.Bytes;
     get soundfont(): Option<SoundFont2>;
     get meta(): Option<SoundfontMetaData>;

package/dist/soundfont/DefaultSoundfontLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultSoundfontLoader.d.ts","sourceRoot":"","sources":["../../src/soundfont/DefaultSoundfontLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAAE,MAAM,EAAY,YAAY,EAAc,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAErG,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAA;AACjG,OAAO,EAAC,6BAA6B,EAAC,MAAM,iCAAiC,CAAA;AAE7E,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAA;AAErC,qBAAa,sBAAuB,YAAW,eAAe;;gBAU9C,OAAO,EAAE,6BAA6B,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK;IAQpE,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,YAAY;IAQjE,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAoB;IAC1C,IAAI,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC,CAAyB;IAC5D,IAAI,IAAI,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAoB;IACzD,IAAI,KAAK,IAAI,oBAAoB,CAAqB;IAEtD,QAAQ,IAAI,MAAM;CA0CrB"}
+{"version":3,"file":"DefaultSoundfontLoader.d.ts","sourceRoot":"","sources":["../../src/soundfont/DefaultSoundfontLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAAE,MAAM,EAAY,YAAY,EAAc,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAErG,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAA;AACjG,OAAO,EAAC,6BAA6B,EAAC,MAAM,iCAAiC,CAAA;AAE7E,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,YAAY,CAAA;AAE1C,qBAAa,sBAAuB,YAAW,eAAe;;gBAY9C,OAAO,EAAE,6BAA6B,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK;IAQpE,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,YAAY;IAQjE,UAAU,IAAI,IAAI;IAOlB,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAoB;IAC1C,IAAI,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC,CAAyB;IAC5D,IAAI,IAAI,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAoB;IACzD,IAAI,KAAK,IAAI,oBAAoB,CAAqB;IAEtD,QAAQ,IAAI,MAAM;CA+CrB"}

package/dist/soundfont/DefaultSoundfontLoader.js

@@ -1,11 +1,11 @@
 import { Notifier, Option, Terminable, UUID } from "@opendaw/lib-std";
 import { Promises } from "@opendaw/lib-runtime";
 import { SoundfontStorage } from "./SoundfontStorage";
-import { SoundFont2 } from "soundfont2";
 export class DefaultSoundfontLoader {
     #manager;
     #uuid;
     #notifier;
+    #soundFont2 = Promises.memoizeAsync(() => import("soundfont2"));
     #meta = Option.None;
     #soundfont = Option.None;
     #state = { type: "progress", progress: 0.0 };
@@ -22,6 +22,12 @@ export class DefaultSoundfontLoader {
         }
         return this.#notifier.subscribe(observer);
     }
+    invalidate() {
+        this.#state = { type: "progress", progress: 0.0 };
+        this.#meta = Option.None;
+        this.#soundfont = Option.None;
+        this.#get();
+    }
     get uuid() { return this.#uuid; }
     get soundfont() { return this.#soundfont; }
     get meta() { return this.#meta; }
@@ -32,8 +38,8 @@ export class DefaultSoundfontLoader {
         this.#notifier.notify(this.#state);
     }
     #get() {
-        SoundfontStorage.get().load(this.#uuid).then(([file, meta]) => {
-            this.#soundfont = Option.wrap(new SoundFont2(new Uint8Array(file)));
+        SoundfontStorage.get().load(this.#uuid).then(async ([file, meta]) => {
+            this.#soundfont = Option.wrap(await this.#createSoundFont2(file));
             this.#meta = Option.wrap(meta);
             this.#setState({ type: "loaded" });
         }, (error) => {
@@ -57,7 +63,7 @@ export class DefaultSoundfontLoader {
         const [file, meta] = fetchResult.value;
         const storeResult = await Promises.tryCatch(SoundfontStorage.get().save({ uuid: this.#uuid, file, meta }));
         if (storeResult.status === "resolved") {
-            this.#soundfont = Option.wrap(new SoundFont2(new Uint8Array(file)));
+            this.#soundfont = Option.wrap(await this.#createSoundFont2(file));
             this.#meta = Option.wrap(meta);
             this.#setState({ type: "loaded" });
         }
@@ -66,4 +72,8 @@ export class DefaultSoundfontLoader {
             this.#setState({ type: "error", reason: "N/A" });
         }
     }
+    async #createSoundFont2(buffer) {
+        const { SoundFont2 } = await this.#soundFont2();
+        return new SoundFont2(new Uint8Array(buffer));
+    }
 }

package/dist/soundfont/DefaultSoundfontLoaderManager.d.ts

@@ -1,11 +1,12 @@
 import { Progress, UUID } from "@opendaw/lib-std";
-import { SoundfontProvider } from "./SoundfontProvider";
 import { SoundfontLoader, SoundfontLoaderManager, SoundfontMetaData } from "@opendaw/studio-adapters";
+import { SoundfontProvider } from "./SoundfontProvider";
 export declare class DefaultSoundfontLoaderManager implements SoundfontLoaderManager, SoundfontProvider {
     #private;
     constructor(provider: SoundfontProvider);
     fetch(uuid: UUID.Bytes, progress: Progress.Handler): Promise<[ArrayBuffer, SoundfontMetaData]>;
     remove(uuid: UUID.Bytes): void;
     getOrCreate(uuid: UUID.Bytes): SoundfontLoader;
+    invalidate(uuid: UUID.Bytes): void;
 }
 //# sourceMappingURL=DefaultSoundfontLoaderManager.d.ts.map

package/dist/soundfont/DefaultSoundfontLoaderManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultSoundfontLoaderManager.d.ts","sourceRoot":"","sources":["../../src/soundfont/DefaultSoundfontLoaderManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAa,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAE1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAC,eAAe,EAAE,sBAAsB,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAA;AAGnG,qBAAa,6BAA8B,YAAW,sBAAsB,EAAE,iBAAiB;;gBAI/E,QAAQ,EAAE,iBAAiB;IAKvC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAI9F,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK;IAEvB,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,eAAe;CAGjD"}
+{"version":3,"file":"DefaultSoundfontLoaderManager.d.ts","sourceRoot":"","sources":["../../src/soundfont/DefaultSoundfontLoaderManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAa,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAC,eAAe,EAAE,sBAAsB,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAA;AAEnG,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAA;AAErD,qBAAa,6BAA8B,YAAW,sBAAsB,EAAE,iBAAiB;;gBAI/E,QAAQ,EAAE,iBAAiB;IAKvC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAI9F,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK;IAEvB,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,eAAe;IAI9C,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK;CAC9B"}

package/dist/soundfont/DefaultSoundfontLoaderManager.js

@@ -14,4 +14,5 @@ export class DefaultSoundfontLoaderManager {
     getOrCreate(uuid) {
         return this.#loaders.getOrCreate(uuid, uuid => new DefaultSoundfontLoader(this, uuid));
     }
+    invalidate(uuid) { this.#loaders.opt(uuid).ifSome(loader => loader.invalidate()); }
 }

package/dist/soundfont/OpenSoundfontAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenSoundfontAPI.d.ts","sourceRoot":"","sources":["../../src/soundfont/OpenSoundfontAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAmB,SAAS,EAAE,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAC7F,OAAO,EAAC,SAAS,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAA;AAIrE,qBAAa,gBAAgB;;IACzB,MAAM,CAAC,QAAQ,CAAC,OAAO,2CAA0C;IACjE,MAAM,CAAC,QAAQ,CAAC,QAAQ,8CAA6C;IAGrE,MAAM,CAAC,GAAG,IAAI,gBAAgB;IAU9B,OAAO;IAED,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAExC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC;IAMzC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;CA0B1G"}
+{"version":3,"file":"OpenSoundfontAPI.d.ts","sourceRoot":"","sources":["../../src/soundfont/OpenSoundfontAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAmB,SAAS,EAAE,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAC7F,OAAO,EAAC,SAAS,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAA;AAKrE,qBAAa,gBAAgB;;IACzB,MAAM,CAAC,QAAQ,CAAC,OAAO,2CAA0C;IACjE,MAAM,CAAC,QAAQ,CAAC,QAAQ,8CAA6C;IAGrE,MAAM,CAAC,GAAG,IAAI,gBAAgB;IAW9B,OAAO;IAED,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAExC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC;IAMzC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;CAyB1G"}

package/dist/soundfont/OpenSoundfontAPI.js

@@ -8,18 +8,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { asDefined, Lazy, RuntimeNotifier, UUID } from "@opendaw/lib-std";
+import { Soundfont } from "@opendaw/studio-adapters";
 import { OpenDAWHeaders } from "../OpenDAWHeaders";
 import { Promises } from "@opendaw/lib-runtime";
+import { z } from "zod";
 export class OpenSoundfontAPI {
     static ApiRoot = "https://api.opendaw.studio/soundfonts";
     static FileRoot = "https://assets.opendaw.studio/soundfonts";
     static get() { return new OpenSoundfontAPI(); }
-    #memoized = Promises.memoizeAsync(() => Promises.retry(() => fetch(`${OpenSoundfontAPI.ApiRoot}/list.json`, OpenDAWHeaders)
+    #memoized = Promises.memoizeAsync(() => Promises.guardedRetry(() => fetch(`${OpenSoundfontAPI.ApiRoot}/list.json`, OpenDAWHeaders)
         .then(x => x.json())
+        .then(x => z.array(Soundfont).parse(x))
         .catch(reason => RuntimeNotifier.info({
         headline: "OpenSoundfont API",
         message: `Could not connect to OpenSoundfont API\nReason: '${reason}'`
-    }).then(() => []))));
+    }).then(() => [])), (_error, count) => count < 10));
     constructor() { }
     async all() { return this.#memoized(); }
     async get(uuid) {
@@ -32,7 +35,6 @@ export class OpenSoundfontAPI {
             const url = `${OpenSoundfontAPI.FileRoot}/${soundfont.uuid}`;
             return fetch(url, OpenDAWHeaders)
                 .then(response => {
-                const total = parseInt(response.headers.get("Content-Length") ?? "0");
                 let loaded = 0;
                 return new Promise((resolve, reject) => {
                     const reader = asDefined(response.body, "No body in response").getReader();
@@ -44,7 +46,7 @@ export class OpenSoundfontAPI {
                         else {
                             chunks.push(value);
                             loaded += value.length;
-                            progress(loaded / total);
+                            progress(loaded / soundfont.size);
                             reader.read().then(nextChunk, reject);
                         }
                     };

package/dist/soundfont/SoundfontService.d.ts

@@ -1,20 +1,17 @@
-import { Option, Procedure, Progress, UUID } from "@opendaw/lib-std";
+import { Class, Option, Procedure } from "@opendaw/lib-std";
+import { Box } from "@opendaw/lib-box";
 import { Soundfont } from "@opendaw/studio-adapters";
-export declare namespace SoundfontService {
-    type ImportArgs = {
-        uuid?: UUID.Bytes;
-        arrayBuffer: ArrayBuffer;
-        progressHandler?: Progress.Handler;
-    };
-}
-export declare class SoundfontService {
+import { AssetService } from "../AssetService";
+export declare class SoundfontService extends AssetService<Soundfont> {
     #private;
-    readonly onUpdate: Procedure<Soundfont>;
+    protected readonly namePlural: string;
+    protected readonly nameSingular: string;
+    protected readonly boxType: Class<Box>;
+    protected readonly filePickerOptions: FilePickerOptions;
     constructor(onUpdate: Procedure<Soundfont>);
     get local(): Option<ReadonlyArray<Soundfont>>;
     get remote(): Option<ReadonlyArray<Soundfont>>;
-    browseForSoundfont(multiple?: boolean): Promise<ReadonlyArray<Soundfont>>;
-    importSoundfont({ uuid, arrayBuffer }: SoundfontService.ImportArgs): Promise<Soundfont>;
-    deleteSoundfont(uuid: UUID.Bytes): Promise<void>;
+    importFile({ uuid, arrayBuffer }: AssetService.ImportArgs): Promise<Soundfont>;
+    protected collectAllFiles(): Promise<ReadonlyArray<Soundfont>>;
 }
 //# sourceMappingURL=SoundfontService.d.ts.map

package/dist/soundfont/SoundfontService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SoundfontService.d.ts","sourceRoot":"","sources":["../../src/soundfont/SoundfontService.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,MAAM,EAEN,SAAS,EACT,QAAQ,EAER,IAAI,EACP,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAC,SAAS,EAAoB,MAAM,0BAA0B,CAAA;AAMrE,yBAAiB,gBAAgB,CAAC;IAC9B,KAAY,UAAU,GAAG;QACrB,IAAI,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;QAClB,WAAW,EAAE,WAAW,CAAC;QACzB,eAAe,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAA;KACrC,CAAA;CACJ;AAED,qBAAa,gBAAgB;;IAIb,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC;gBAA9B,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC;IAUnD,IAAI,KAAK,IAAI,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAqB;IAClE,IAAI,MAAM,IAAI,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAsB;IAE9D,kBAAkB,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IA+BhF,eAAe,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;IAiCrF,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzD"}
+{"version":3,"file":"SoundfontService.d.ts","sourceRoot":"","sources":["../../src/soundfont/SoundfontService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,EAAE,MAAM,EAAS,SAAS,EAAwB,MAAM,kBAAkB,CAAA;AAC/F,OAAO,EAAC,GAAG,EAAC,MAAM,kBAAkB,CAAA;AAGpC,OAAO,EAAC,SAAS,EAAoB,MAAM,0BAA0B,CAAA;AAIrE,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAA;AAG5C,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,SAAS,CAAC;;IACzD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAe;IACpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAc;IACrD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAmB;IACzD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAuC;gBAOlF,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC;IAY1C,IAAI,KAAK,IAAI,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAqB;IAClE,IAAI,MAAM,IAAI,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAsB;IAE9D,UAAU,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,YAAY,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;cA2ClE,eAAe,IAAI,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAUvE"}

package/dist/soundfont/SoundfontService.js

@@ -1,16 +1,20 @@
-import { Arrays, DefaultObservableValue, Errors, Option, panic, Progress, RuntimeNotifier, UUID } from "@opendaw/lib-std";
-import { Files } from "@opendaw/lib-dom";
-import { Promises } from "@opendaw/lib-runtime";
-import { SoundFont2 } from "soundfont2";
+import { Arrays, Option, panic, RuntimeNotifier, UUID } from "@opendaw/lib-std";
+import { Promises, Wait } from "@opendaw/lib-runtime";
+import { SoundfontFileBox } from "@opendaw/studio-boxes";
 import { SoundfontStorage } from "./SoundfontStorage";
 import { FilePickerAcceptTypes } from "../FilePickerAcceptTypes";
 import { OpenSoundfontAPI } from "./OpenSoundfontAPI";
-export class SoundfontService {
-    onUpdate;
+import { AssetService } from "../AssetService";
+export class SoundfontService extends AssetService {
+    namePlural = "Soundfonts";
+    nameSingular = "Soundfont";
+    boxType = SoundfontFileBox;
+    filePickerOptions = FilePickerAcceptTypes.SoundfontFiles;
+    #soundFont2 = Promises.memoizeAsync(() => import("soundfont2"));
     #local = Option.None;
     #remote = Option.None;
     constructor(onUpdate) {
-        this.onUpdate = onUpdate;
+        super(onUpdate);
         Promise.all([
             SoundfontStorage.get().list(),
             OpenSoundfontAPI.get().all()
@@ -21,78 +25,55 @@ export class SoundfontService {
     }
     get local() { return this.#local; }
     get remote() { return this.#remote; }
-    async browseForSoundfont(multiple = false) {
-        const { error, status, value: files } = await Promises.tryCatch(Files.open({ ...FilePickerAcceptTypes.SoundfontFiles, multiple }));
-        if (status === "rejected") {
-            if (Errors.isAbort(error)) {
-                return [];
-            }
-            else {
-                return panic(String(error));
-            }
-        }
-        const progress = new DefaultObservableValue(0.0);
-        const dialog = RuntimeNotifier.progress({
-            headline: `Importing ${files.length === 1 ? "Soundfont" : "Soundfonts"}...`, progress
-        });
-        const progressHandler = Progress.split(value => progress.setValue(value), files.length);
-        const soundfonts = [];
-        const rejected = [];
-        for (const [index, file] of files.entries()) {
-            const arrayBuffer = await file.arrayBuffer();
-            const { status, value, error } = await Promises.tryCatch(this.importSoundfont({
-                arrayBuffer,
-                progressHandler: progressHandler[index]
-            }));
-            if (status === "rejected") {
-                rejected.push(String(error));
-            }
-            else {
-                soundfonts.push(value);
-            }
-        }
-        dialog.terminate();
-        if (rejected.length > 0) {
-            await RuntimeNotifier.info({
-                headline: "Soundfont Import Issues",
-                message: `${rejected.join(", ")} could not be imported.`
-            });
-        }
-        return soundfonts;
-    }
-    async importSoundfont({ uuid, arrayBuffer }) {
+    async importFile({ uuid, arrayBuffer }) {
         if (this.#local.isEmpty()) {
             return panic("Local soundfont storage has not been read.");
         }
         if (arrayBuffer.byteLength > (1 << 24)) {
             await RuntimeNotifier.approve({
                 headline: "Soundfont Import",
-                message: `The soundfont you are trying to import is ${(arrayBuffer.byteLength >> 20)}mb. This may cause memory issues. Do you want to continue?`,
+                message: `The soundfont you are trying to import is ${(arrayBuffer.byteLength >> 20)}mb. This may cause memory issues. Do you really want to continue?`,
                 approveText: "Import",
                 cancelText: "Cancel"
             });
         }
+        const updater = RuntimeNotifier.progress({ headline: `Import ${this.nameSingular}` });
+        await Wait.frame();
         console.debug(`importSoundfont (${arrayBuffer.byteLength >> 10}kb)`);
         console.time("UUID.sha256");
         uuid ??= await UUID.sha256(arrayBuffer);
         console.timeEnd("UUID.sha256");
-        const soundFont2 = new SoundFont2(new Uint8Array(arrayBuffer));
+        console.time("SoundFont2");
+        const { status, value: soundFont2, error } = await Promises.tryCatch(this.#createSoundFont2(arrayBuffer));
+        console.timeEnd("SoundFont2");
+        if (status === "rejected") {
+            updater.terminate();
+            return panic(error);
+        }
         const meta = {
             name: soundFont2.metaData.name,
+            size: arrayBuffer.byteLength,
             url: "unknown",
             license: soundFont2.metaData.copyright ?? "No license provided",
             origin: "import"
         };
         await SoundfontStorage.get().save({ uuid, file: arrayBuffer, meta });
         const soundfont = { uuid: UUID.toString(uuid), ...meta };
-        this.onUpdate(soundfont);
         const list = this.#local.unwrap();
         if (!list.some(other => other.uuid === soundfont.uuid)) {
             list.push(soundfont);
         }
+        this.onUpdate(soundfont);
+        updater.terminate();
         return soundfont;
     }
-    async deleteSoundfont(uuid) {
-        return SoundfontStorage.get().deleteItem(uuid);
+    async collectAllFiles() {
+        const stock = await OpenSoundfontAPI.get().all();
+        const local = await SoundfontStorage.get().list();
+        return Arrays.merge(stock, local, (a, b) => a.uuid === b.uuid);
+    }
+    async #createSoundFont2(buffer) {
+        const { SoundFont2 } = await this.#soundFont2();
+        return new SoundFont2(new Uint8Array(buffer));
     }
 }