@textbus/collaborate 4.3.11 → 4.3.13

package/bundles/index.esm.js

@@ -759,6 +759,9 @@ let Collaborate = class Collaborate {
      * @private
      */
     syncArray(sharedArray, localArray) {
+        function logError(type) {
+            console.error(collaborateErrorFn(`${type} error, length exceeded, path in ${localArray.__changeMarker__.getPaths().join('/')}`));
+        }
         const sub = localArray.__changeMarker__.onSelfChange.subscribe((actions) => {
             this.runLocalUpdate(sharedArray.doc, !localArray.__changeMarker__.irrevocableUpdate, () => {
                 let index = 0;
@@ -776,18 +779,35 @@ let Collaborate = class Collaborate {
                                 const data = ref.map(item => {
                                     return this.createSharedModelByLocalModel(item);
                                 });
-                                sharedArray.insert(index, data);
+                                if (index <= sharedArray.length) {
+                                    sharedArray.insert(index, data);
+                                }
+                                else {
+                                    sharedArray.insert(sharedArray.length, data);
+                                    logError('insert');
+                                }
                             }
                             break;
                         case 'delete':
                             if (action.count <= 0) {
                                 break;
                             }
-                            sharedArray.delete(index, action.count);
+                            if (index < sharedArray.length) {
+                                sharedArray.delete(index, action.count);
+                            }
+                            else {
+                                logError('delete');
+                            }
                             break;
                         case 'setIndex':
-                            sharedArray.delete(action.index, 1);
-                            sharedArray.insert(action.index, [this.createSharedModelByLocalModel(action.ref)]);
+                            if (action.index < sharedArray.length) {
+                                sharedArray.delete(action.index, 1);
+                                sharedArray.insert(action.index, [this.createSharedModelByLocalModel(action.ref)]);
+                            }
+                            else {
+                                sharedArray.insert(sharedArray.length, [this.createSharedModelByLocalModel(action.ref)]);
+                                logError('setIndex');
+                            }
                             break;
                     }
                 }

package/bundles/index.js

@@ -761,6 +761,9 @@ exports.Collaborate = class Collaborate {
      * @private
      */
     syncArray(sharedArray, localArray) {
+        function logError(type) {
+            console.error(collaborateErrorFn(`${type} error, length exceeded, path in ${localArray.__changeMarker__.getPaths().join('/')}`));
+        }
         const sub = localArray.__changeMarker__.onSelfChange.subscribe((actions) => {
             this.runLocalUpdate(sharedArray.doc, !localArray.__changeMarker__.irrevocableUpdate, () => {
                 let index = 0;
@@ -778,18 +781,35 @@ exports.Collaborate = class Collaborate {
                                 const data = ref.map(item => {
                                     return this.createSharedModelByLocalModel(item);
                                 });
-                                sharedArray.insert(index, data);
+                                if (index <= sharedArray.length) {
+                                    sharedArray.insert(index, data);
+                                }
+                                else {
+                                    sharedArray.insert(sharedArray.length, data);
+                                    logError('insert');
+                                }
                             }
                             break;
                         case 'delete':
                             if (action.count <= 0) {
                                 break;
                             }
-                            sharedArray.delete(index, action.count);
+                            if (index < sharedArray.length) {
+                                sharedArray.delete(index, action.count);
+                            }
+                            else {
+                                logError('delete');
+                            }
                             break;
                         case 'setIndex':
-                            sharedArray.delete(action.index, 1);
-                            sharedArray.insert(action.index, [this.createSharedModelByLocalModel(action.ref)]);
+                            if (action.index < sharedArray.length) {
+                                sharedArray.delete(action.index, 1);
+                                sharedArray.insert(action.index, [this.createSharedModelByLocalModel(action.ref)]);
+                            }
+                            else {
+                                sharedArray.insert(sharedArray.length, [this.createSharedModelByLocalModel(action.ref)]);
+                                logError('setIndex');
+                            }
                             break;
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "4.3.11",
+  "version": "4.3.13",
   "description": "Textbus is a rich text editor and framework that is highly customizable and extensible to achieve rich wysiwyg effects.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -29,7 +29,7 @@
     "@tanbo/stream": "^1.2.7",
     "@textbus/core": "^4.3.4",
     "@viewfly/core": "^1.1.10",
-    "y-websocket": "^1.5.4",
+    "y-websocket": "^2.1.0",
     "yjs": "^13.6.23"
   },
   "devDependencies": {
@@ -50,5 +50,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "ae81815d6997cae3c2a8e3a8cc83d539301a3192"
+  "gitHead": "cff6a20d9308efb3faba585af4c05846cf4124ab"
 }