@opendaw/studio-core 0.0.42 → 0.0.44

package/dist/ysync/YService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"YService.d.ts","sourceRoot":"","sources":["../../src/ysync/YService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAmC,MAAM,kBAAkB,CAAA;AAQjF,OAAO,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,YAAY,CAAA;AAI9C,yBAAiB,QAAQ,CAAC;IAKf,MAAM,eAAe,GAAU,YAAY,MAAM,CAAC,OAAO,CAAC,EAC3B,KAAK,UAAU,EACf,UAAU,MAAM,KAAG,OAAO,CAAC,OAAO,CAiDvE,CAAA;CACJ"}
+{"version":3,"file":"YService.d.ts","sourceRoot":"","sources":["../../src/ysync/YService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAmC,MAAM,kBAAkB,CAAA;AAQjF,OAAO,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,YAAY,CAAA;AAI9C,yBAAiB,QAAQ,CAAC;IAMf,MAAM,eAAe,GAAU,YAAY,MAAM,CAAC,OAAO,CAAC,EAC3B,KAAK,UAAU,EACf,UAAU,MAAM,KAAG,OAAO,CAAC,OAAO,CAiDvE,CAAA;CACJ"}

package/dist/ysync/YService.js

@@ -10,9 +10,10 @@ import { Project } from "../project";
 // https://inspector.yjs.dev/
 export var YService;
 (function (YService) {
-    const { VITE_VJS_USE_LOCAL_SERVER, VITE_VJS_LOCAL_SERVER_URL, VITE_VJS_ONLINE_SERVER_URL } = import.meta.env;
-    const isDev = VITE_VJS_USE_LOCAL_SERVER === "true";
-    const serverUrl = isDev ? VITE_VJS_LOCAL_SERVER_URL : VITE_VJS_ONLINE_SERVER_URL;
+    const USE_LOCAL_SERVER = false;
+    const LOCAL_SERVER_URL = "wss://localhost:1234";
+    const ONLINE_SERVER_URL = "wss://live.opendaw.studio";
+    const serverUrl = USE_LOCAL_SERVER ? LOCAL_SERVER_URL : ONLINE_SERVER_URL;
     YService.getOrCreateRoom = async (optProject, env, roomName) => {
         if (roomName === "signaling") {
             return panic("Invalid room name: signaling");

package/dist/ysync/YSync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"YSync.d.ts","sourceRoot":"","sources":["../../src/ysync/YSync.ts"],"names":[],"mappings":"AAAA,OAAO,EASH,QAAQ,EAER,UAAU,EAGb,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAa,QAAQ,EAA2D,MAAM,kBAAkB,CAAA;AAE/G,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAIxB,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACvB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACtB,GAAG,EAAE,CAAC,CAAC,GAAG,CAAA;IACV,QAAQ,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC/B,CAAA;AAED,qBAAa,KAAK,CAAC,CAAC,CAAE,YAAW,UAAU;;IACvC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,OAAO;WAItB,QAAQ,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,GAAG,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;WAa7D,IAAI,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,GAAG,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBA4B1D,EAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IASnD,SAAS,IAAI,IAAI;CAkJpB"}
+{"version":3,"file":"YSync.d.ts","sourceRoot":"","sources":["../../src/ysync/YSync.ts"],"names":[],"mappings":"AAAA,OAAO,EASH,QAAQ,EAER,UAAU,EAGb,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAa,QAAQ,EAA2D,MAAM,kBAAkB,CAAA;AAE/G,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAIxB,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACvB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACtB,GAAG,EAAE,CAAC,CAAC,GAAG,CAAA;IACV,QAAQ,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC/B,CAAA;AAED,qBAAa,KAAK,CAAC,CAAC,CAAE,YAAW,UAAU;;IACvC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,OAAO;WAItB,QAAQ,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,GAAG,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;WAa7D,IAAI,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,GAAG,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBA4B1D,EAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IASnD,SAAS,IAAI,IAAI;CA0KpB"}

package/dist/ysync/YSync.js

@@ -1,4 +1,4 @@
-import { asDefined, assert, EmptyExec, isInstanceOf, isUndefined, Option, panic, Terminable, Terminator, UUID } from "@opendaw/lib-std";
+import { asDefined, asInstanceOf, assert, EmptyExec, isUndefined, Option, panic, Terminable, Terminator, UUID } from "@opendaw/lib-std";
 import { YMapper } from "./YMapper";
 import * as Y from "yjs";
 export class YSync {
@@ -14,7 +14,7 @@ export class YSync {
             const key = UUID.toString(box.address.uuid);
             const map = YMapper.createBoxMap(box);
             boxesMap.set(key, map);
-        }), "populate");
+        }), "[openDAW] populate");
         return sync;
     }
     static async join({ boxGraph, doc }) {
@@ -51,47 +51,44 @@ export class YSync {
     }
     terminate() { this.#terminator.terminate(); }
     #setupYjs() {
-        const eventHandler = (events, transaction) => {
-            console.debug("got updates", transaction.origin);
-            if (transaction.local) {
-                console.debug("Skip local update");
+        const eventHandler = (events, { origin, local }) => {
+            const originLabel = typeof origin === "string" ? origin : "WebsocketProvider";
+            console.debug(`got ${events.length} ${local ? "local" : "external"} updates from '${originLabel}'`);
+            if (local) {
                 return;
             }
             this.#boxGraph.beginTransaction();
-            events.forEach(event => {
+            for (const event of events) {
                 const path = event.path;
                 const keys = event.changes.keys;
-                keys.entries().forEach(([key, change]) => {
+                for (const [key, change] of keys.entries()) {
                     if (change.action === "add") {
                         assert(path.length === 0, "'Add' cannot have a path");
-                        const map = this.#boxesMap.get(key);
-                        const name = map.get("name");
-                        const fields = map.get("fields");
-                        const uuid = UUID.parse(key);
-                        this.#boxGraph.createBox(name, uuid, box => YMapper.applyFromBoxMap(box, fields));
+                        this.#createBox(key);
                     }
                     else if (change.action === "update") {
                         if (path.length === 0) {
-                            return;
+                            continue;
                         }
                         assert(path.length >= 2, "Invalid path: must have at least 2 elements (uuid, 'fields').");
                         this.#updateValue(path, key);
                     }
                     else if (change.action === "delete") {
                         assert(path.length === 0, "'Delete' cannot have a path");
-                        const box = this.#boxGraph.findBox(UUID.parse(key))
-                            .unwrap("Could not find box to delete");
-                        // It is possible that Yjs have swallowed the pointer updates since were are 'inside' the box.
-                        box.outgoingEdges().forEach(([pointer]) => pointer.defer());
-                        box.incomingEdges().forEach(pointer => pointer.defer());
-                        this.#boxGraph.unstageBox(box);
+                        this.#deleteBox(key);
                     }
-                });
-            });
-            this.#ignoreUpdates = true;
-            this.#boxGraph.endTransaction();
-            this.#boxGraph.verifyPointers();
-            this.#ignoreUpdates = false;
+                }
+            }
+            try {
+                this.#ignoreUpdates = true;
+                this.#boxGraph.endTransaction();
+                this.#ignoreUpdates = false;
+                this.#boxGraph.verifyPointers();
+            }
+            catch (reason) {
+                this.terminate();
+                return panic(reason);
+            }
             const highLevelConflict = this.#conflict.mapOr(check => check(), false);
             if (highLevelConflict) {
                 this.#rollbackTransaction(events);
@@ -100,13 +97,31 @@ export class YSync {
         this.#boxesMap.observeDeep(eventHandler);
         return { terminate: () => { this.#boxesMap.unobserveDeep(eventHandler); } };
     }
+    #createBox(key) {
+        const map = this.#boxesMap.get(key);
+        const name = map.get("name");
+        const fields = map.get("fields");
+        const uuid = UUID.parse(key);
+        const optBox = this.#boxGraph.findBox(UUID.parse(key));
+        if (optBox.isEmpty()) {
+            this.#boxGraph.createBox(name, uuid, box => YMapper.applyFromBoxMap(box, fields));
+        }
+        else {
+            console.debug(`Box '${key}' has already been created. Performing 'Upsert'.`);
+            YMapper.applyFromBoxMap(optBox.unwrap(), fields);
+        }
+    }
     #updateValue(path, key) {
+        const vertexOption = this.#boxGraph.findVertex(YMapper.pathToAddress(path, key));
+        if (vertexOption.isEmpty()) {
+            console.debug(`Vertex at '${path}' does not exist. Ignoring.`);
+            return;
+        }
+        const vertex = vertexOption.unwrap("Could not find field");
         const [uuidAsString, fieldsKey, ...fieldKeys] = path;
         const targetMap = YMapper.findMap(this.#boxesMap
             .get(String(uuidAsString))
             .get(String(fieldsKey)), fieldKeys);
-        const vertexOption = this.#boxGraph.findVertex(YMapper.pathToAddress(path, key));
-        const vertex = vertexOption.unwrap("Could not find field");
         assert(vertex.isField(), "Vertex must be either Primitive or Pointer");
         vertex.accept({
             visitField: (_) => panic("Vertex must be either Primitive or Pointer"),
@@ -116,33 +131,46 @@ export class YSync {
             visitPrimitiveField: (field) => field.fromJSON(targetMap.get(key))
         });
     }
+    #deleteBox(key) {
+        const optBox = this.#boxGraph.findBox(UUID.parse(key));
+        if (optBox.isEmpty()) {
+            console.debug(`Box '${key}' has already been deleted. Ignoring.`);
+        }
+        else {
+            const box = optBox.unwrap();
+            // It is possible that Yjs have swallowed the pointer releases since they were 'inside' the box.
+            box.outgoingEdges().forEach(([pointer]) => pointer.defer());
+            box.incomingEdges().forEach(pointer => pointer.defer());
+            this.#boxGraph.unstageBox(box);
+        }
+    }
     #rollbackTransaction(events) {
-        console.debug("rollbackTransaction", events.length);
-        for (let i = events.length - 1; i >= 0; i--) {
-            const event = events[i];
-            const target = event.target;
-            if (!isInstanceOf(target, Y.Map)) {
-                return panic("Only Y.Map events are supported");
-            }
-            Array.from(event.changes.keys.entries())
-                .reverse()
-                .forEach(([key, change]) => {
-                if (change.action === "add") {
-                    target.delete(key);
-                }
-                else if (change.action === "update") {
-                    if (isUndefined(change.oldValue)) {
+        console.debug(`rollback ${events.length} events...`);
+        this.#doc.transact(() => {
+            for (let i = events.length - 1; i >= 0; i--) {
+                const event = events[i];
+                const target = asInstanceOf(event.target, Y.Map);
+                Array.from(event.changes.keys.entries())
+                    .toReversed()
+                    .forEach(([key, change]) => {
+                    if (change.action === "add") {
                         target.delete(key);
                     }
-                    else {
+                    else if (change.action === "update") {
+                        if (isUndefined(change.oldValue)) {
+                            console.warn(`oldValue of ${change} is undefined`);
+                            target.delete(key);
+                        }
+                        else {
+                            target.set(key, change.oldValue);
+                        }
+                    }
+                    else if (change.action === "delete") {
                         target.set(key, change.oldValue);
                     }
-                }
-                else if (change.action === "delete") {
-                    target.set(key, change.oldValue);
-                }
-            });
-        }
+                });
+            }
+        }, "[openDAW] rollback");
     }
     #setupOpenDAW() {
         return Terminable.many(this.#boxGraph.subscribeTransaction({
@@ -185,7 +213,7 @@ export class YSync {
                     else if (update.type === "delete") {
                         this.#boxesMap.delete(UUID.toString(update.uuid));
                     }
-                }), "openDAW");
+                }), "[openDAW] updates");
                 this.#updates.length = 0;
             }
         }), this.#boxGraph.subscribeToAllUpdatesImmediate({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendaw/studio-core",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "license": "LGPL-3.0-or-later",
   "publishConfig": {
     "access": "public"
@@ -26,26 +26,27 @@
     "test": "vitest run --config vitest.config.ts"
   },
   "dependencies": {
-    "@opendaw/lib-box": "^0.0.33",
-    "@opendaw/lib-dawproject": "^0.0.19",
-    "@opendaw/lib-dom": "^0.0.33",
-    "@opendaw/lib-dsp": "^0.0.33",
-    "@opendaw/lib-fusion": "^0.0.33",
-    "@opendaw/lib-runtime": "^0.0.33",
-    "@opendaw/lib-std": "^0.0.33",
-    "@opendaw/studio-adapters": "^0.0.34",
-    "@opendaw/studio-boxes": "^0.0.33",
-    "@opendaw/studio-enums": "^0.0.24",
+    "@opendaw/lib-box": "^0.0.35",
+    "@opendaw/lib-dawproject": "^0.0.21",
+    "@opendaw/lib-dom": "^0.0.35",
+    "@opendaw/lib-dsp": "^0.0.35",
+    "@opendaw/lib-fusion": "^0.0.35",
+    "@opendaw/lib-runtime": "^0.0.35",
+    "@opendaw/lib-std": "^0.0.35",
+    "@opendaw/studio-adapters": "^0.0.36",
+    "@opendaw/studio-boxes": "^0.0.35",
+    "@opendaw/studio-enums": "^0.0.26",
     "dropbox": "^10.34.0",
     "y-websocket": "^1.4.5",
-    "yjs": "^13.6.27"
+    "yjs": "^13.6.27",
+    "zod": "^4.1.12"
   },
   "devDependencies": {
     "@opendaw/eslint-config": "^0.0.19",
-    "@opendaw/studio-core-processors": "^0.0.34",
-    "@opendaw/studio-core-workers": "^0.0.29",
-    "@opendaw/studio-forge-boxes": "^0.0.33",
+    "@opendaw/studio-core-processors": "^0.0.36",
+    "@opendaw/studio-core-workers": "^0.0.31",
+    "@opendaw/studio-forge-boxes": "^0.0.35",
     "@opendaw/typescript-config": "^0.0.20"
   },
-  "gitHead": "cae71a4fa8c78a8a37c48a120f25fc1b3767100a"
+  "gitHead": "7911c4037c03c3aa6d59cf6790dd86285d58dcf9"
 }

package/dist/cloud/CloudBackupSoundfont.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CloudBackupSoundfont.d.ts","sourceRoot":"","sources":["../../src/cloud/CloudBackupSoundfont.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,SAAS,EAAE,QAAQ,EAAmB,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAElG,OAAO,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAK3C,qBAAa,qBAAqB;;IAC9B,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAAe;IACzC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAkC;IACnE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,GAAI,aAAW,SAAS,EAAE,aAAW,SAAS,aAAY;IAE5F,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM;WAE5B,KAAK,CAAC,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAC1B,GAAG,EAAE,SAAS,CAAC,MAAM,CAAC;IAgBzC,OAAO;CA2GV"}