@cocreate/crdt 1.22.3 → 1.23.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.23.0](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.22.4...v1.23.0) (2023-10-14)
+
+
+### Bug Fixes
+
+* bump dependencies ([65ce3b5](https://github.com/CoCreate-app/CoCreate-crdt/commit/65ce3b55b9a0d60f4d1dd3f1af13736f1a2eddb3))
+* set $filter.limit ([c4d0d81](https://github.com/CoCreate-app/CoCreate-crdt/commit/c4d0d8138cc8a922890146ee079ec606c4b646c8))
+* text.length ([fa80d0d](https://github.com/CoCreate-app/CoCreate-crdt/commit/fa80d0d6e9181957417c6fd66fc3006a0395cbf6))
+
+
+### Features
+
+* frameId to manage frames ([e6a8776](https://github.com/CoCreate-app/CoCreate-crdt/commit/e6a8776db0b4731a3b10502b6451df0d794ae235))
+
+## [1.22.4](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.22.3...v1.22.4) (2023-10-09)
+
+
+### Bug Fixes
+
+* bump dependencies ([681896d](https://github.com/CoCreate-app/CoCreate-crdt/commit/681896dd17ad849ff19b7bd676fcb00a2b1b16d0))
+
 ## [1.22.3](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.22.2...v1.22.3) (2023-10-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crdt",
-  "version": "1.22.3",
+  "version": "1.23.0",
   "description": "CoCreate crdt",
   "author": "CoCreate LLC",
   "license": "AGPL-3.0",
@@ -40,9 +40,9 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/crud-client": "^1.28.2",
-    "@cocreate/local-storage": "^1.10.3",
-    "@cocreate/message-client": "^1.8.1",
-    "@cocreate/utils": "^1.25.1"
+    "@cocreate/crud-client": "^1.28.4",
+    "@cocreate/local-storage": "^1.10.5",
+    "@cocreate/message-client": "^1.8.3",
+    "@cocreate/utils": "^1.25.3"
   }
 }

package/src/index.js

@@ -27,7 +27,7 @@ import uuid from '@cocreate/uuid';
 import localStorage from '@cocreate/local-storage';
 
 const docs = new Map();
-const clientId = crud.socket.clientId || uuid.generate(12);
+const frameId = crud.socket.frameId || uuid.generate(12);
 const checkedDb = new Map();
 const isInit = new Map();
 
@@ -35,7 +35,7 @@ function init(data) {
     getText(data).then(value => {
         data.value = value;
         data.start = 0;
-        data['clientId'] = clientId;
+        data['frameId'] = frameId;
         localChange(data);
     });
 }
@@ -68,7 +68,8 @@ async function getDoc(data) {
                                     key: 'docName',
                                     operator: "$eq",
                                     value: docName
-                                }]
+                                }],
+                                limit: 1
                             }
                         }
                     });
@@ -79,13 +80,11 @@ async function getDoc(data) {
                 doc.set('changeLog', changeLog);
                 await generateText(data, true);
             }
-        }
-        else if (!doc.has('text')) {
+        } else if (!doc.has('text')) {
             await generateText(data, false);
         }
         return doc;
-    }
-    catch (e) {
+    } catch (e) {
         console.log('Invalid param', e);
     }
 }
@@ -101,17 +100,18 @@ async function generateText(data, flag) {
         let string = '';
         let changeLog = doc.get('changeLog');
         for (let change of changeLog) {
-            if (change || change !== null) {
+            if (change) {
                 string = string.customSplice(change.start, change.length, change.value);
             }
         }
+
         if (string === '' && data.read !== 'false') {
-            string = await checkDb(data, flag);
+            string = await checkDb(data, flag) || ''
         }
+
         doc.set('text', string);
-        return;
-    }
-    catch (e) {
+        return string;
+    } catch (e) {
         console.error(e);
     }
 }
@@ -128,15 +128,17 @@ async function checkDb(data, flag) {
         let response = await crud.send({ method: 'read.object', array, object: { _id: object, key } });
         string = crud.getValueFromObject(response.object[0], key);
     }
+
     if (string && typeof string !== 'string')
         string = ""
     if (string && typeof string === 'string' && flag != false) {
         data.value = string;
         data.start = 0;
-        data.clientId = clientId;
+        data.frameId = frameId;
         insertChange(data);
     }
-    return string || '';
+
+    return string;
 }
 
 function insertChange(data, flag) {
@@ -157,7 +159,7 @@ function insertChange(data, flag) {
         start: data.start,
         end: data.end,
         length: data.length || 0,
-        clientId: data.clientId || clientId,
+        frameId: data.frameId || frameId,
         user_id: data.user_id || localStorage.getItem("user_id"),
         type
     };
@@ -205,23 +207,21 @@ function insertChange(data, flag) {
     doc.set('text', string.customSplice(change.start, change.length, change.value));
     string = doc.get('text');
 
-    if (!data.clientId) {
+    if (!data.frameId) {
         data['datetime'] = change.datetime;
-        data['clientId'] = change.clientId;
+        data['frameId'] = change.frameId;
 
         broadcastChange(data);
         localChange(data, string);
-    }
-    else
+    } else
         localChange(data, string);
 
-    if (data.clientId == clientId && data.save != "false")
+    if (data.frameId == frameId && data.save != "false")
         persistChange(data);
 }
 
 function broadcastChange(data) {
     message.send({
-        room: "",
         broadcastSender: false,
         broadcastBrowser: true,
         message: "crdt",
@@ -260,6 +260,7 @@ function persistChange(data) {
         room: data.room,
         broadcast: data.broadcast,
         broadcastSender: data.broadcastSender,
+        broadcastBrowser: false,
         metadata: 'crdt-change'
     }
 
@@ -272,7 +273,7 @@ message.listen('crdt', function (response) {
     let doc = docs.get(docName);
 
     if (doc) {
-        if (data.clientId !== clientId) {
+        if (data.frameId !== frameId) {
             insertChange(data);
         }
     }
@@ -282,12 +283,21 @@ crud.listen('update.object', (data) => sync(data))
 crud.listen('delete.object', (data) => sync(data))
 
 function sync(data) {
+    if (data.frameId === frameId)
+        return
     if (data.array.includes('crdt-transactions')) {
         if (data.object && data.object[0]) {
             let Data = data.object[0];
             let docName = Data.docName;
             let doc = docs.get(docName);
             if (doc && Data.crud) {
+                // let text = doc.get('text')
+                // if (!text && text !== '') {
+                //     setTimeout(function () {
+                //         console.log("text empty timout set");
+                //         sync(data)
+                //     }, 1000); // Delayed action after 2 seconds
+                // } else {
                 Data.crud.value = Data.text
                 Data.crud.start = 0
                 Data.crud.length = doc.get('text').length
@@ -297,6 +307,7 @@ function sync(data) {
                 // TODO: compare modified dates to check if arrays need to merged and orderd by date or if we just use server
                 localChange(Data.crud, Data.text)
                 console.log('crdtSync')
+                // }
             }
         }
     }
@@ -316,12 +327,10 @@ async function getText(data) {
         if (doc) {
             let value = doc.get('text')
             return value;
-        }
-        else {
+        } else {
             console.log('undefined')
         }
-    }
-    catch (e) {
+    } catch (e) {
         console.error(e);
         return "";
     }
@@ -352,8 +361,7 @@ async function replaceText(data) {
             data.start = 0;
             updateText(data, 'replace');
         }
-    }
-    catch (e) {
+    } catch (e) {
         console.error(e);
     }
 }
@@ -407,9 +415,9 @@ function createChange(data, change) {
         change.type = 'insert';
     }
     data = { ...data, ...change };
-    delete data.clientId
+    delete data.frameId
     delete data.datetime
-    delete change.clientId
+    delete change.frameId
     delete change.datetime
     return { data, change }
 }
@@ -422,7 +430,7 @@ function undoText(data) {
 
     for (let index = changeLog.length - 1; index >= 0; index--) {
         let change = Object.assign({}, changeLog[index]);
-        if (change && change.clientId == clientId) {
+        if (change && change.frameId == frameId) {
             let log = undoLog.get(index)
             if (!log) {
                 if (log != 'undo') {
@@ -475,8 +483,7 @@ async function viewVersion(data) {
             }
         }
         return { ...data, ...string }
-    }
-    catch (e) {
+    } catch (e) {
         console.error(e);
     }
 }