@opendaw/studio-core 0.0.128 → 0.0.130

package/dist/ysync/YSync.d.ts

@@ -8,6 +8,7 @@ export type Construct<T> = {
 };
 export declare class YSync<T> implements Terminable {
     #private;
+    /** @internal */
     static isEmpty(doc: Y.Doc): boolean;
     static populateRoom<T>({ boxGraph, boxes }: Construct<T>): Promise<YSync<T>>;
     static joinRoom<T>({ boxGraph, boxes }: Construct<T>): Promise<YSync<T>>;

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,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACrB,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,YAAY,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;WAcnE,QAAQ,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAyBhE,EAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IAQrD,SAAS,IAAI,IAAI;CAkLpB"}
+{"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,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC/B,CAAA;AAED,qBAAa,KAAK,CAAC,CAAC,CAAE,YAAW,UAAU;;IACvC,gBAAgB;IAChB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,OAAO;WAItB,YAAY,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;WAcnE,QAAQ,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAqChE,EAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IASrD,SAAS,IAAI,IAAI;CA4LpB"}

package/dist/ysync/YSync.js

@@ -2,6 +2,7 @@ import { asDefined, asInstanceOf, assert, EmptyExec, isUndefined, Option, panic,
 import { YMapper } from "./YMapper";
 import * as Y from "yjs";
 export class YSync {
+    /** @internal */
     static isEmpty(doc) {
         return doc.getMap("boxes").size === 0;
     }
@@ -33,31 +34,44 @@ export class YSync {
         boxGraph.endTransaction();
         return sync;
     }
+    static #computePathPrefix(boxes) {
+        const prefix = [];
+        let item = boxes._item;
+        while (item !== null) {
+            prefix.unshift(item.parentSub);
+            const parent = item.parent;
+            item = parent._item;
+        }
+        return prefix;
+    }
     #terminator = new Terminator();
     #boxGraph;
     #conflict;
     #boxes;
     #updates;
+    #pathPrefix;
     #ignoreUpdates = false;
     constructor({ boxGraph, boxes, conflict }) {
         this.#boxGraph = boxGraph;
         this.#conflict = Option.wrap(conflict);
         this.#boxes = boxes;
         this.#updates = [];
+        this.#pathPrefix = YSync.#computePathPrefix(boxes);
         this.#terminator.ownAll(this.#setupYjs(), this.#setupOpenDAW());
     }
     terminate() { this.#terminator.terminate(); }
     #setupYjs() {
         const eventHandler = (events, { origin, local }) => {
             const originLabel = typeof origin === "string" ? origin : "WebsocketProvider";
-            console.debug(`got ${events.length} ${local ? "local" : "external"} updates from '${originLabel}'`);
+            const isOwnOrigin = typeof origin === "string" && origin.startsWith("[openDAW]");
             const isHistoryReplay = typeof origin === "string" && origin.startsWith("[history]");
-            if (local && !isHistoryReplay) {
+            console.debug(`got ${events.length} ${local ? "local" : "external"} updates from '${originLabel}', isHistoryReplay: ${isHistoryReplay}`);
+            if (isOwnOrigin || (local && !isHistoryReplay)) {
                 return;
             }
             this.#boxGraph.beginTransaction();
             for (const event of events) {
-                const path = event.path;
+                const path = this.#normalizePath(event.path);
                 const keys = event.changes.keys;
                 for (const [key, change] of keys.entries()) {
                     if (change.action === "add") {
@@ -110,6 +124,18 @@ export class YSync {
             YMapper.applyFromBoxMap(optBox.unwrap(), fields);
         }
     }
+    #normalizePath(path) {
+        const prefix = this.#pathPrefix;
+        if (prefix.length === 0 || path.length < prefix.length) {
+            return path;
+        }
+        for (let i = 0; i < prefix.length; i++) {
+            if (path[i] !== prefix[i]) {
+                return path;
+            }
+        }
+        return path.slice(prefix.length);
+    }
     #updateValue(path, key) {
         console.debug(`#updateValue`, path, key);
         const vertexOption = this.#boxGraph.findVertex(YMapper.pathToAddress(path, key));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendaw/studio-core",
-  "version": "0.0.128",
+  "version": "0.0.130",
   "license": "LGPL-3.0-or-later",
   "publishConfig": {
     "access": "public"
@@ -41,7 +41,7 @@
     "@opendaw/lib-runtime": "^0.0.75",
     "@opendaw/lib-std": "^0.0.74",
     "@opendaw/nam-wasm": "^1.0.3",
-    "@opendaw/studio-adapters": "^0.0.101",
+    "@opendaw/studio-adapters": "^0.0.102",
     "@opendaw/studio-boxes": "^0.0.85",
     "@opendaw/studio-enums": "^0.0.70",
     "dropbox": "^10.34.0",
@@ -57,10 +57,10 @@
     "@ffmpeg/ffmpeg": "^0.12.15",
     "@ffmpeg/util": "^0.12.2",
     "@opendaw/eslint-config": "^0.0.27",
-    "@opendaw/studio-core-processors": "^0.0.105",
-    "@opendaw/studio-core-workers": "^0.0.96",
+    "@opendaw/studio-core-processors": "^0.0.106",
+    "@opendaw/studio-core-workers": "^0.0.97",
     "@opendaw/studio-forge-boxes": "^0.0.85",
     "@opendaw/typescript-config": "^0.0.29"
   },
-  "gitHead": "7ccb6855109bc13274fd83ec5dc4ea2302d83b8e"
+  "gitHead": "8e46cba2c2aba3ebb2ff49c764d039e0f9b8b820"
 }