@opendaw/studio-core 0.0.42 → 0.0.43

package/dist/samples/SampleService.d.ts

@@ -1,18 +1,12 @@
-import { Procedure, Progress, UUID } from "@opendaw/lib-std";
+import { Procedure } from "@opendaw/lib-std";
 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;
     constructor(audioContext: AudioContext, onUpdate: Procedure<Sample>);
-    browseForSamples(multiple: boolean): Promise<void>;
-    importSample({ uuid, name, arrayBuffer, progressHandler }: SampleService.ImportArgs): Promise<Sample>;
+    browse(multiple: boolean): Promise<ReadonlyArray<Sample>>;
+    importFile({ uuid, name, arrayBuffer, progressHandler }: AssetService.ImportArgs): Promise<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,EAAsB,SAAS,EAAiB,MAAM,kBAAkB,CAAA;AAI/E,OAAO,EAAY,MAAM,EAAiB,MAAM,0BAA0B,CAAA;AAE1E,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAA;AAE5C,qBAAa,aAAc,SAAQ,YAAY,CAAC,MAAM,CAAC;IAIvC,QAAQ,CAAC,YAAY,EAAE,YAAY;IAH/C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAY;IACjD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAW;gBAE7B,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC;IAItE,MAAM,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAIzD,UAAU,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,eAAgC,EAAC,EACzD,YAAY,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;CAoC/D"}

package/dist/samples/SampleService.js

@@ -1,52 +1,21 @@
-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 { AssetService } from "../AssetService";
+export class SampleService extends AssetService {
     audioContext;
-    onUpdate;
+    namePlural = "Samples";
+    nameSingular = "Sample";
     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 browse(multiple) {
+        return this.browseFiles(multiple, FilePickerAcceptTypes.WavFiles);
     }
-    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 +38,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"

package/dist/soundfont/OpenSoundfontAPI.js

@@ -44,7 +44,7 @@ export class OpenSoundfontAPI {
                         else {
                             chunks.push(value);
                             loaded += value.length;
-                            progress(loaded / total);
+                            progress(Math.min(1.0, loaded / total));
                             reader.read().then(nextChunk, reject);
                         }
                     };

package/dist/soundfont/SoundfontService.d.ts

@@ -1,20 +1,14 @@
-import { Option, Procedure, Progress, UUID } from "@opendaw/lib-std";
+import { Option, Procedure } from "@opendaw/lib-std";
 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;
     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>;
+    browse(multiple?: boolean): Promise<ReadonlyArray<Soundfont>>;
+    importFile({ uuid, arrayBuffer }: AssetService.ImportArgs): Promise<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,MAAM,EAAS,SAAS,EAAkC,MAAM,kBAAkB,CAAA;AAClG,OAAO,EAAC,SAAS,EAAoB,MAAM,0BAA0B,CAAA;AAKrE,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;gBAKzC,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,MAAM,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAIpE,UAAU,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,YAAY,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;CAyCrF"}

package/dist/soundfont/SoundfontService.js

@@ -1,16 +1,17 @@
-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 { Arrays, Option, panic, RuntimeNotifier, tryCatch, UUID } from "@opendaw/lib-std";
 import { SoundFont2 } from "soundfont2";
 import { SoundfontStorage } from "./SoundfontStorage";
 import { FilePickerAcceptTypes } from "../FilePickerAcceptTypes";
 import { OpenSoundfontAPI } from "./OpenSoundfontAPI";
-export class SoundfontService {
-    onUpdate;
+import { AssetService } from "../AssetService";
+import { Wait } from "@opendaw/lib-runtime";
+export class SoundfontService extends AssetService {
+    namePlural = "Soundfonts";
+    nameSingular = "Soundfont";
     #local = Option.None;
     #remote = Option.None;
     constructor(onUpdate) {
-        this.onUpdate = onUpdate;
+        super(onUpdate);
         Promise.all([
             SoundfontStorage.get().list(),
             OpenSoundfontAPI.get().all()
@@ -21,62 +22,34 @@ 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 browse(multiple = false) {
+        return this.browseFiles(multiple, FilePickerAcceptTypes.SoundfontFiles);
     }
-    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 } = tryCatch(() => new SoundFont2(new Uint8Array(arrayBuffer)));
+        console.timeEnd("SoundFont2");
+        if (status === "failure") {
+            updater.terminate();
+            return panic(error);
+        }
         const meta = {
             name: soundFont2.metaData.name,
             url: "unknown",
@@ -85,14 +58,12 @@ export class SoundfontService {
         };
         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);
-    }
 }