tool-db 2.0.1 → 2.0.2

package/dist/index.js

@@ -15,20 +15,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolDb = exports.handleSubscribe = exports.handleQuery = exports.handlePut = exports.handlePong = exports.handlePing = exports.handleGet = exports.handleCrdtPut = exports.handleCrdtGet = exports.handleCrdt = exports.toolDbWebrtc = exports.toolDbNetwork = exports.generateKeyFromPassword = exports.encryptWithPass = exports.decryptWithPass = exports.toBase64 = exports.uint8ArrayToHex = exports.uint8ToBase64 = exports.fromBase64 = exports.hexToUint8 = exports.hexToString = exports.hexToBase64 = exports.hexToArrayBuffer = exports.base64ToHex = exports.base64ToUint8 = exports.base64ToBinaryDocument = exports.base64ToBinaryChange = exports.base64ToArrayBuffer = exports.arrayBufferToHex = exports.arrayBufferToString = exports.arrayBufferToBase64 = exports.verifyPeer = exports.verifyMessage = exports.stringToArrayBuffer = exports.textRandom = exports.randomAnimal = exports.generateIv = exports.sha256 = exports.sha1 = exports.proofOfWork = void 0;
+exports.ToolDb = exports.handleSubscribe = exports.handleQuery = exports.handlePut = exports.handlePong = exports.handlePing = exports.handleGet = exports.handleCrdtPut = exports.handleCrdtGet = exports.toolDbWebrtc = exports.toolDbNetwork = exports.generateKeyFromPassword = exports.encryptWithPass = exports.decryptWithPass = exports.MapCrdt = exports.BaseCrdt = exports.hexToUint8 = exports.hexToString = exports.hexToArrayBuffer = exports.arrayBufferToHex = exports.arrayBufferToString = exports.verifyPeer = exports.verifyMessage = exports.stringToArrayBuffer = exports.textRandom = exports.randomAnimal = exports.generateIv = exports.sha256 = exports.sha1 = exports.proofOfWork = void 0;
 __exportStar(require("./types/tooldb"), exports);
 __exportStar(require("./types/message"), exports);
 global.Buffer = global.Buffer || require("buffer").Buffer;
-if (typeof btoa === "undefined") {
-    global.btoa = function (str) {
-        return Buffer.from(str, "binary").toString("base64");
-    };
-}
-if (typeof atob === "undefined") {
-    global.atob = function (b64Encoded) {
-        return Buffer.from(b64Encoded, "base64").toString("binary");
-    };
-}
 if (typeof window === "undefined") {
     global.crypto = require("crypto").webcrypto;
 }
@@ -50,38 +40,20 @@ var verifyMessage_1 = require("./utils/verifyMessage");
 Object.defineProperty(exports, "verifyMessage", { enumerable: true, get: function () { return __importDefault(verifyMessage_1).default; } });
 var verifyPeer_1 = require("./utils/verifyPeer");
 Object.defineProperty(exports, "verifyPeer", { enumerable: true, get: function () { return __importDefault(verifyPeer_1).default; } });
-var arrayBufferToBase64_1 = require("./utils/encoding/arrayBufferToBase64");
-Object.defineProperty(exports, "arrayBufferToBase64", { enumerable: true, get: function () { return __importDefault(arrayBufferToBase64_1).default; } });
 var arrayBufferToString_1 = require("./utils/encoding/arrayBufferToString");
 Object.defineProperty(exports, "arrayBufferToString", { enumerable: true, get: function () { return __importDefault(arrayBufferToString_1).default; } });
 var arrayBufferToHex_1 = require("./utils/encoding/arrayBufferToHex");
 Object.defineProperty(exports, "arrayBufferToHex", { enumerable: true, get: function () { return __importDefault(arrayBufferToHex_1).default; } });
-var base64ToArrayBuffer_1 = require("./utils/encoding/base64ToArrayBuffer");
-Object.defineProperty(exports, "base64ToArrayBuffer", { enumerable: true, get: function () { return __importDefault(base64ToArrayBuffer_1).default; } });
-var base64ToBinaryChange_1 = require("./utils/encoding/base64ToBinaryChange");
-Object.defineProperty(exports, "base64ToBinaryChange", { enumerable: true, get: function () { return __importDefault(base64ToBinaryChange_1).default; } });
-var base64ToBinaryDocument_1 = require("./utils/encoding/base64ToBinaryDocument");
-Object.defineProperty(exports, "base64ToBinaryDocument", { enumerable: true, get: function () { return __importDefault(base64ToBinaryDocument_1).default; } });
-var base64ToUint8_1 = require("./utils/encoding/base64ToUint8");
-Object.defineProperty(exports, "base64ToUint8", { enumerable: true, get: function () { return __importDefault(base64ToUint8_1).default; } });
-var base64ToHex_1 = require("./utils/encoding/base64ToHex");
-Object.defineProperty(exports, "base64ToHex", { enumerable: true, get: function () { return __importDefault(base64ToHex_1).default; } });
 var hexToArrayBuffer_1 = require("./utils/encoding/hexToArrayBuffer");
 Object.defineProperty(exports, "hexToArrayBuffer", { enumerable: true, get: function () { return __importDefault(hexToArrayBuffer_1).default; } });
-var hexToBase64_1 = require("./utils/encoding/hexToBase64");
-Object.defineProperty(exports, "hexToBase64", { enumerable: true, get: function () { return __importDefault(hexToBase64_1).default; } });
 var hexToString_1 = require("./utils/encoding/hexToString");
 Object.defineProperty(exports, "hexToString", { enumerable: true, get: function () { return __importDefault(hexToString_1).default; } });
 var hexToUint8_1 = require("./utils/encoding/hexToUint8");
 Object.defineProperty(exports, "hexToUint8", { enumerable: true, get: function () { return __importDefault(hexToUint8_1).default; } });
-var fromBase64_1 = require("./utils/encoding/fromBase64");
-Object.defineProperty(exports, "fromBase64", { enumerable: true, get: function () { return __importDefault(fromBase64_1).default; } });
-var uint8ToBase64_1 = require("./utils/encoding/uint8ToBase64");
-Object.defineProperty(exports, "uint8ToBase64", { enumerable: true, get: function () { return __importDefault(uint8ToBase64_1).default; } });
-var uint8ArrayToHex_1 = require("./utils/encoding/uint8ArrayToHex");
-Object.defineProperty(exports, "uint8ArrayToHex", { enumerable: true, get: function () { return __importDefault(uint8ArrayToHex_1).default; } });
-var toBase64_1 = require("./utils/encoding/toBase64");
-Object.defineProperty(exports, "toBase64", { enumerable: true, get: function () { return __importDefault(toBase64_1).default; } });
+var baseCrdt_1 = require("./crdt/baseCrdt");
+Object.defineProperty(exports, "BaseCrdt", { enumerable: true, get: function () { return __importDefault(baseCrdt_1).default; } });
+var mapCrdt_1 = require("./crdt/mapCrdt");
+Object.defineProperty(exports, "MapCrdt", { enumerable: true, get: function () { return __importDefault(mapCrdt_1).default; } });
 var decryptWithPass_1 = require("./utils/crypto/decryptWithPass");
 Object.defineProperty(exports, "decryptWithPass", { enumerable: true, get: function () { return __importDefault(decryptWithPass_1).default; } });
 var encryptWithPass_1 = require("./utils/crypto/encryptWithPass");
@@ -92,8 +64,6 @@ var toolDbNetwork_1 = require("./toolDbNetwork");
 Object.defineProperty(exports, "toolDbNetwork", { enumerable: true, get: function () { return __importDefault(toolDbNetwork_1).default; } });
 var toolDbWebrtc_1 = require("./toolDbWebrtc");
 Object.defineProperty(exports, "toolDbWebrtc", { enumerable: true, get: function () { return __importDefault(toolDbWebrtc_1).default; } });
-var handleCrdt_1 = require("./messageHandlers/handleCrdt");
-Object.defineProperty(exports, "handleCrdt", { enumerable: true, get: function () { return __importDefault(handleCrdt_1).default; } });
 var handleCrdtGet_1 = require("./messageHandlers/handleCrdtGet");
 Object.defineProperty(exports, "handleCrdtGet", { enumerable: true, get: function () { return __importDefault(handleCrdtGet_1).default; } });
 var handleCrdtPut_1 = require("./messageHandlers/handleCrdtPut");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,mCAAmC;;;;;;;;;;;;;;;;AAEnC,iDAA+B;AAC/B,kDAAgC;AAEhC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;AAE1D,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC;CAC7C;AAED,mDAA6D;AAApD,2HAAA,OAAO,OAAe;AAC/B,qCAA+C;AAAtC,6GAAA,OAAO,OAAQ;AACxB,yCAAmD;AAA1C,iHAAA,OAAO,OAAU;AAE1B,iDAA2D;AAAlD,yHAAA,OAAO,OAAc;AAC9B,qDAA+D;AAAtD,6HAAA,OAAO,OAAgB;AAChC,iDAA2D;AAAlD,yHAAA,OAAO,OAAc;AAC9B,4EAAsF;AAA7E,2IAAA,OAAO,OAAuB;AACvC,uDAAiE;AAAxD,+HAAA,OAAO,OAAiB;AACjC,iDAA2D;AAAlD,yHAAA,OAAO,OAAc;AAE9B,4EAAsF;AAA7E,2IAAA,OAAO,OAAuB;AACvC,sEAAgF;AAAvE,qIAAA,OAAO,OAAoB;AACpC,sEAAgF;AAAvE,qIAAA,OAAO,OAAoB;AACpC,4DAAsE;AAA7D,2HAAA,OAAO,OAAe;AAC/B,0DAAoE;AAA3D,yHAAA,OAAO,OAAc;AAE9B,4CAAsD;AAA7C,qHAAA,OAAO,OAAY;AAC5B,0CAAoD;AAA3C,mHAAA,OAAO,OAAW;AAE3B,kEAA4E;AAAnE,mIAAA,OAAO,OAAmB;AACnC,kEAA4E;AAAnE,mIAAA,OAAO,OAAmB;AACnC,kFAA4F;AAAnF,mJAAA,OAAO,OAA2B;AAE3C,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,+CAAyD;AAAhD,6HAAA,OAAO,OAAgB;AAEhC,iEAA2E;AAAlE,+HAAA,OAAO,OAAiB;AACjC,iEAA2E;AAAlE,+HAAA,OAAO,OAAiB;AACjC,yDAAmE;AAA1D,uHAAA,OAAO,OAAa;AAC7B,2DAAqE;AAA5D,yHAAA,OAAO,OAAc;AAC9B,2DAAqE;AAA5D,yHAAA,OAAO,OAAc;AAC9B,yDAAmE;AAA1D,uHAAA,OAAO,OAAa;AAC7B,6DAAuE;AAA9D,2HAAA,OAAO,OAAe;AAC/B,qEAA+E;AAAtE,mIAAA,OAAO,OAAmB;AAEnC,mCAA6C;AAApC,iHAAA,OAAO,OAAU"}

package/dist/messageHandlers/handleCrdtGet.js

@@ -1,22 +1,29 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var automerge_1 = __importDefault(require("automerge"));
-var uint8ArrayToHex_1 = __importDefault(require("../utils/encoding/uint8ArrayToHex"));
 function handleCrdtGet(message, remotePeerId) {
     var _this = this;
-    this.loadCrdtDocument(message.key, false).then(function (currentDoc) {
-        if (currentDoc) {
-            var saved = automerge_1.default.save(currentDoc || automerge_1.default.init());
-            _this.network.sendToClientId(remotePeerId, {
-                type: "crdt",
-                id: message.id,
-                key: message.key,
-                to: [],
-                doc: (0, uint8ArrayToHex_1.default)(saved),
-            });
+    this.store.get(message.key, function (err, data) {
+        if (data) {
+            try {
+                // Use the id of the get so the other client knows we are replying
+                var oldData = __assign(__assign({ type: "putCrdt" }, JSON.parse(data)), { to: [], id: message.id });
+                _this.network.sendToClientId(remotePeerId, oldData);
+            }
+            catch (e) {
+                // socket.send(data);
+                // do nothing
+            }
         }
         else {
             if (_this.options.debug) {

package/dist/messageHandlers/handleCrdtGet.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleCrdtGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtGet.ts"],"names":[],"mappings":";;;;;AAAA,wDAAkC;AAGlC,sFAAgE;AAEhE,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,iBAsBC;IAjBC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,UAAC,UAAU;QACxD,IAAI,UAAU,EAAE;YACd,IAAM,KAAK,GAAG,mBAAS,CAAC,IAAI,CAAC,UAAU,IAAI,mBAAS,CAAC,IAAI,EAAE,CAAC,CAAC;YAC7D,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;gBACxC,IAAI,EAAE,MAAM;gBACZ,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,EAAE,EAAE,EAAE;gBACN,GAAG,EAAE,IAAA,yBAAe,EAAC,KAAK,CAAC;aACb,CAAC,CAAC;SACnB;aAAM;YACL,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;aACpE;YACD,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;SAC9C;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAtBD,gCAsBC"}
+{"version":3,"file":"handleCrdtGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtGet.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAGA,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,iBA2BC;IAtBC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAC,GAAG,EAAE,IAAI;QACpC,IAAI,IAAI,EAAE;YACR,IAAI;gBACF,kEAAkE;gBAClE,IAAM,OAAO,GAAG,oBACd,IAAI,EAAE,SAAS,IACZ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KACnB,EAAE,EAAE,EAAE,EACN,EAAE,EAAE,OAAO,CAAC,EAAE,GACG,CAAC;gBACpB,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;aACpD;YAAC,OAAO,CAAC,EAAE;gBACV,qBAAqB;gBACrB,aAAa;aACd;SACF;aAAM;YACL,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;aACpE;YACD,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;SAC9C;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA3BD,gCA2BC"}

package/dist/messageHandlers/handleCrdtPut.js

@@ -1,91 +1,70 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var automerge_1 = __importDefault(require("automerge"));
 var message_1 = require("../types/message");
 var toolDbVerificationWrapper_1 = __importDefault(require("../toolDbVerificationWrapper"));
-var hexToBase64_1 = __importDefault(require("../utils/encoding/hexToBase64"));
-var uint8ArrayToHex_1 = __importDefault(require("../utils/encoding/uint8ArrayToHex"));
-var base64ToBinaryChange_1 = __importDefault(require("../utils/encoding/base64ToBinaryChange"));
+var mapCrdt_1 = __importDefault(require("../crdt/mapCrdt"));
 function handleCrdtPut(message, remotePeerId) {
     var _this = this;
-    // key = aggregated, final value
-    // key.crdt = automerge doc with changes
-    var writeStart = new Date().getTime();
     toolDbVerificationWrapper_1.default.call(this, message).then(function (value) {
-        // console.log("CRDT verification: ", (new Date().getTime() - writeStart) / 1000);
-        // console.log("CRDT Verification wrapper result: ", value);
+        // console.log("Verification wrapper result: ", value, message.k);
         if (value === message_1.VerifyResult.Verified) {
-            var key_1 = message.k;
-            var data = [];
-            try {
-                data = JSON.parse(message.v);
-            }
-            catch (e) {
-                //
-            }
-            var changes_1 = data.map(hexToBase64_1.default).map(base64ToBinaryChange_1.default);
-            _this.loadCrdtDocument(key_1).then(function (currentDoc) {
-                // if (currentDoc) {
-                //   console.log(
-                //     "loaded",
-                //     key,
-                //     currentDoc,
-                //     Automerge.getHistory(currentDoc)
-                //   );
-                // }
-                var newDoc = automerge_1.default.init();
-                try {
-                    newDoc = automerge_1.default.applyChanges(currentDoc || automerge_1.default.init(), changes_1)[0];
-                }
-                catch (e) {
-                    try {
-                        newDoc = automerge_1.default.applyChanges(automerge_1.default.init(), changes_1)[0];
+            _this.emit("verified", message);
+            // relay to other servers !!!
+            _this.network.sendToAll(message, true);
+            _this.store.get(message.k, function (err, oldData) {
+                if (oldData) {
+                    var parsedOldData = __assign({ type: "crdtPut" }, JSON.parse(oldData));
+                    var newMessage = message;
+                    // Merge old document with new data incoming and save it
+                    // Add handles for all kinds of CRDT we add
+                    if (parsedOldData.crdt === "MAP") {
+                        var oldDoc = new mapCrdt_1.default(_this.getAddress() || "", parsedOldData.v);
+                        oldDoc.mergeChanges(message.v);
+                        var changesMerged = oldDoc.getChanges();
+                        newMessage = __assign(__assign({}, message), { v: changesMerged });
                     }
-                    catch (ee) {
-                        if (_this.options.debug) {
-                            console.warn(ee);
-                        }
+                    if (parsedOldData.t < message.t) {
+                        var key = newMessage.k;
+                        _this.triggerKeyListener(key, newMessage);
+                        _this.store.put(newMessage.k, JSON.stringify(newMessage), function (err, data) {
+                            //
+                        });
                     }
+                    else {
+                        var key = message.k;
+                        _this.triggerKeyListener(key, parsedOldData);
+                    }
+                    // } else if (this.options.debug) {
+                    //   console.log(
+                    //     `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
+                    //   );
+                    // }
+                }
+                else {
+                    var key = message.k;
+                    _this.triggerKeyListener(key, message);
+                    _this.store.put(message.k, JSON.stringify(message), function (err, data) {
+                        //
+                    });
                 }
-                // if (newDoc) {
-                //   console.log(
-                //     "new document changes:",
-                //     Automerge.getHistory(newDoc),
-                //     "final: ",
-                //     newDoc
-                //   );
-                // }
-                // persist
-                _this.documents[key_1] = newDoc;
-                // OOHH THE TYPECAST PAIN
-                // Convert the crdt document to hex before saving
-                var savedDoc = (0, uint8ArrayToHex_1.default)(automerge_1.default.save(newDoc));
-                _this.store.put(key_1 + ".crdt", savedDoc, function (err, data) {
-                    // const writeEnd = new Date().getTime();
-                    // console.log(
-                    //   "CRDT write: ",
-                    //   `${key}.crdt`,
-                    //   (writeEnd - writeStart) / 1000
-                    // );
-                });
-                var crdtMessage = {
-                    type: "crdt",
-                    key: key_1,
-                    id: message.id,
-                    to: [],
-                    doc: savedDoc,
-                };
-                _this.triggerKeyListener(key_1, crdtMessage);
-                // relay to other servers
-                // !!!
-                _this.network.sendToAll(crdtMessage, true);
             });
         }
         else {
-            console.log("unverified message", value, message);
+            console.warn("unverified message: ", value, message);
         }
     });
 }

package/dist/messageHandlers/handleCrdtPut.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleCrdtPut.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtPut.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handleCrdtPut.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtPut.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,4CAAgE;AAChE,2FAAqE;AACrE,4DAAsC;AAEtC,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,iBAmEC;IA9DC,mCAAyB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,UAAC,KAAK;QACvD,kEAAkE;QAClE,IAAI,KAAK,KAAK,sBAAY,CAAC,QAAQ,EAAE;YACnC,KAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC/B,6BAA6B;YAC7B,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAEtC,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,UAAC,GAAG,EAAE,OAAgB;gBAC9C,IAAI,OAAO,EAAE;oBACX,IAAM,aAAa,cACjB,IAAI,EAAE,SAAS,IACZ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CACvB,CAAC;oBAEF,IAAI,UAAU,GAAG,OAAO,CAAC;oBAEzB,wDAAwD;oBACxD,2CAA2C;oBAC3C,IAAI,aAAa,CAAC,IAAI,KAAK,KAAK,EAAE;wBAChC,IAAM,MAAM,GAAG,IAAI,iBAAO,CACxB,KAAI,CAAC,UAAU,EAAE,IAAI,EAAE,EACvB,aAAa,CAAC,CAAC,CAChB,CAAC;wBACF,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;wBAC/B,IAAM,aAAa,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;wBAC1C,UAAU,yBACL,OAAO,KACV,CAAC,EAAE,aAAa,GACjB,CAAC;qBACH;oBAED,IAAI,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE;wBAC/B,IAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC;wBACzB,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;wBACzC,KAAI,CAAC,KAAK,CAAC,GAAG,CACZ,UAAU,CAAC,CAAC,EACZ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAC1B,UAAC,GAAG,EAAE,IAAI;4BACR,EAAE;wBACJ,CAAC,CACF,CAAC;qBACH;yBAAM;wBACL,IAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC;wBACtB,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;qBAC7C;oBACD,mCAAmC;oBACnC,iBAAiB;oBACjB,4FAA4F;oBAC5F,OAAO;oBACP,IAAI;iBACL;qBAAM;oBACL,IAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC;oBACtB,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;oBACtC,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,UAAC,GAAG,EAAE,IAAI;wBAC3D,EAAE;oBACJ,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SACtD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAnED,gCAmEC"}

package/dist/messageHandlers/handleSubscribe.js

@@ -10,13 +10,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var automerge_1 = __importDefault(require("automerge"));
-var uint8ArrayToHex_1 = __importDefault(require("../utils/encoding/uint8ArrayToHex"));
-var textRandom_1 = __importDefault(require("../utils/textRandom"));
 function handleSubscribe(message, remotePeerId) {
     var _this = this;
     if (remotePeerId) {
@@ -24,7 +18,7 @@ function handleSubscribe(message, remotePeerId) {
         if (!this.subscriptions.includes(subId)) {
             this.subscriptions.push(subId);
             this.addKeyListener(message.key, function (msg) {
-                if ((msg.type === "put" || msg.type === "crdt") && remotePeerId) {
+                if ((msg.type === "put" || msg.type === "crdtPut") && remotePeerId) {
                     // We do not reply to the socket directly
                     // instead we use the client id, in case the socket reconnects
                     _this.network.sendToClientId(remotePeerId, msg);
@@ -44,20 +38,6 @@ function handleSubscribe(message, remotePeerId) {
             }
         }
     });
-    this.loadCrdtDocument(message.key, false).then(function (doc) {
-        // console.log("Load crdt from subscribe", message.key, doc);
-        if (doc) {
-            var savedDoc = automerge_1.default.save(doc);
-            var msg = {
-                type: "crdt",
-                key: message.key,
-                to: [],
-                id: (0, textRandom_1.default)(10),
-                doc: (0, uint8ArrayToHex_1.default)(savedDoc),
-            };
-            _this.network.sendToClientId(remotePeerId, msg);
-        }
-    });
 }
 exports.default = handleSubscribe;
 //# sourceMappingURL=handleSubscribe.js.map

package/dist/messageHandlers/handleSubscribe.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleSubscribe.js","sourceRoot":"","sources":["../../src/messageHandlers/handleSubscribe.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAkC;AAGlC,sFAAgE;AAChE,mEAA6C;AAE7C,SAAwB,eAAe,CAErC,OAAyB,EACzB,YAAoB;IAHtB,iBA8CC;IAzCC,IAAI,YAAY,EAAE;QAChB,IAAM,KAAK,GAAG,YAAY,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACvC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAE/B,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,UAAC,GAAG;gBACnC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE;oBAC/D,yCAAyC;oBACzC,8DAA8D;oBAC9D,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;SACJ;KACF;IAED,yCAAyC;IACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAC,GAAG,EAAE,IAAI;QACpC,IAAI,IAAI,EAAE;YACR,IAAI;gBACF,IAAM,OAAO,yBAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAE,EAAE,EAAE,OAAO,CAAC,EAAE,GAAE,CAAC;gBACxD,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;aACpD;YAAC,OAAO,CAAC,EAAE;gBACV,aAAa;aACd;SACF;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,UAAC,GAAG;QACjD,6DAA6D;QAC7D,IAAI,GAAG,EAAE;YACP,IAAM,QAAQ,GAAG,mBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrC,IAAM,GAAG,GAAgB;gBACvB,IAAI,EAAE,MAAM;gBACZ,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,EAAE,EAAE,EAAE;gBACN,EAAE,EAAE,IAAA,oBAAU,EAAC,EAAE,CAAC;gBAClB,GAAG,EAAE,IAAA,yBAAe,EAAC,QAAQ,CAAC;aAC/B,CAAC;YACF,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;SAChD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA9CD,kCA8CC"}
+{"version":3,"file":"handleSubscribe.js","sourceRoot":"","sources":["../../src/messageHandlers/handleSubscribe.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAGA,SAAwB,eAAe,CAErC,OAAyB,EACzB,YAAoB;IAHtB,iBA+BC;IA1BC,IAAI,YAAY,EAAE;QAChB,IAAM,KAAK,GAAG,YAAY,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACvC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAE/B,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,UAAC,GAAG;gBACnC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,YAAY,EAAE;oBAClE,yCAAyC;oBACzC,8DAA8D;oBAC9D,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;SACJ;KACF;IAED,yCAAyC;IACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAC,GAAG,EAAE,IAAI;QACpC,IAAI,IAAI,EAAE;YACR,IAAI;gBACF,IAAM,OAAO,yBAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAE,EAAE,EAAE,OAAO,CAAC,EAAE,GAAE,CAAC;gBACxD,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;aACpD;YAAC,OAAO,CAAC,EAAE;gBACV,aAAa;aACd;SACF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA/BD,kCA+BC"}

package/dist/toolDbClientOnMessage.js

@@ -52,9 +52,6 @@ function toolDbClientOnMessage(message, remotePeerId) {
         case "query":
             this.handleQuery(message, remotePeerId);
             break;
-        case "crdt":
-            this.handleCrdt(message, remotePeerId);
-            break;
         default:
             break;
     }

package/dist/toolDbClientOnMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbClientOnMessage.js","sourceRoot":"","sources":["../src/toolDbClientOnMessage.ts"],"names":[],"mappings":";;AAGA,SAAwB,qBAAqB,CAE3C,OAAsB,EACtB,YAAoB;IAEpB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;KACtC;IACD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACxD,OAAO,CAAC,IAAI,CACV,sCAAoC,OAAO,CAAC,IAAI,cAAS,YAAc,CACxE,CAAC;QACF,OAAO;KACR;IAED,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IAE5C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEjD,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;QACtB,OAAO,CAAC,IAAI,CAAC,iBAAe,OAAO,CAAC,IAAI,cAAS,YAAc,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACvB;IAED,wCAAwC;IACxC,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAM,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;YAClC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;SAC9B;KACF;IAED,IACE,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB;QACA,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,OAAO,EAAE,OAAO,OAAO,CAAC,CAAC;QAC7D,OAAO;KACR;IAED,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,MAAM;YACT,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACvC,MAAM;QAER,KAAK,MAAM;YACT,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACvC,MAAM;QAER,KAAK,WAAW;YACd,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC5C,MAAM;QAER,KAAK,KAAK;YACR,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACtC,MAAM;QAER,KAAK,KAAK;YACR,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACtC,MAAM;QAER,KAAK,SAAS;YACZ,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC1C,MAAM;QAER,KAAK,SAAS;YACZ,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC1C,MAAM;QAER,KAAK,OAAO;YACV,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACxC,MAAM;QAER,KAAK,MAAM;YACT,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACvC,MAAM;QAER;YACE,MAAM;KACT;AACH,CAAC;AAjFD,wCAiFC"}
+{"version":3,"file":"toolDbClientOnMessage.js","sourceRoot":"","sources":["../src/toolDbClientOnMessage.ts"],"names":[],"mappings":";;AAGA,SAAwB,qBAAqB,CAE3C,OAAsB,EACtB,YAAoB;IAEpB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;KACtC;IACD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACxD,OAAO,CAAC,IAAI,CACV,sCAAoC,OAAO,CAAC,IAAI,cAAS,YAAc,CACxE,CAAC;QACF,OAAO;KACR;IAED,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IAE5C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEjD,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;QACtB,OAAO,CAAC,IAAI,CAAC,iBAAe,OAAO,CAAC,IAAI,cAAS,YAAc,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACvB;IAED,wCAAwC;IACxC,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAM,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;YAClC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;SAC9B;KACF;IAED,IACE,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB;QACA,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,OAAO,EAAE,OAAO,OAAO,CAAC,CAAC;QAC7D,OAAO;KACR;IAED,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,MAAM;YACT,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACvC,MAAM;QAER,KAAK,MAAM;YACT,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACvC,MAAM;QAER,KAAK,WAAW;YACd,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC5C,MAAM;QAER,KAAK,KAAK;YACR,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACtC,MAAM;QAER,KAAK,KAAK;YACR,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACtC,MAAM;QAER,KAAK,SAAS;YACZ,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC1C,MAAM;QAER,KAAK,SAAS;YACZ,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC1C,MAAM;QAER,KAAK,OAAO;YACV,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACxC,MAAM;QAER;YACE,MAAM;KACT;AACH,CAAC;AA7ED,wCA6EC"}

package/dist/toolDbCrdtGet.d.ts

@@ -1,9 +1,11 @@
+import BaseCrdt from "./crdt/baseCrdt";
 import ToolDb from "./tooldb";
+import { CrdtPutMessage } from "./types/message";
 /**
  * Triggers a GET request to other peers. If the data is available locally it will return that instead.
  * @param key key of the data
- * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our public key and signatures.
+ * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our address and signatures.
  * @param timeout Max time to wait for remote.
  * @returns Promise<Data>
  */
-export default function toolDbCrdtGet(this: ToolDb, key: string, userNamespaced?: boolean, timeoutMs?: number): Promise<Uint8Array | null>;
+export default function toolDbCrdtGet<T = any>(this: ToolDb, key: string, crdt: BaseCrdt<T, any, any>, userNamespaced?: boolean, timeoutMs?: number): Promise<CrdtPutMessage<T> | null>;

package/dist/toolDbCrdtGet.js

@@ -1,41 +1,34 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var _1 = require(".");
-var hexToUint8_1 = __importDefault(require("./utils/encoding/hexToUint8"));
 /**
  * Triggers a GET request to other peers. If the data is available locally it will return that instead.
  * @param key key of the data
- * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our public key and signatures.
+ * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our address and signatures.
  * @param timeout Max time to wait for remote.
  * @returns Promise<Data>
  */
-function toolDbCrdtGet(key, userNamespaced, timeoutMs) {
+function toolDbCrdtGet(key, crdt, userNamespaced, timeoutMs) {
     var _this = this;
     if (userNamespaced === void 0) { userNamespaced = false; }
     if (timeoutMs === void 0) { timeoutMs = 1000; }
     return new Promise(function (resolve, reject) {
-        if (userNamespaced && _this.getPubKey() === undefined) {
+        if (userNamespaced && _this.getAddress() === undefined) {
             reject(new Error("You are not authorized yet!"));
             return;
         }
-        var finalKey = userNamespaced ? ":" + _this.getPubKey() + "." + key : key;
+        var finalKey = userNamespaced ? ":" + _this.getAddress() + "." + key : key;
         if (_this.options.debug) {
             console.log("CRDT GET > " + finalKey);
         }
         var msgId = (0, _1.textRandom)(10);
         var cancelTimeout = setTimeout(function () {
-            _this.loadCrdtDocument(finalKey).then(function (data) {
-                if (_this.options.debug) {
-                    console.log("CRDT DATA > ", data);
-                }
+            _this.store.get(finalKey, function (err, data) {
                 if (data) {
                     try {
-                        _this.removeIdListener(msgId);
-                        var document_1 = (0, hexToUint8_1.default)(data);
-                        resolve(document_1);
+                        var message = JSON.parse(data);
+                        crdt.mergeChanges(message.v);
+                        resolve(message);
                     }
                     catch (e) {
                         resolve(null);
@@ -48,12 +41,26 @@ function toolDbCrdtGet(key, userNamespaced, timeoutMs) {
         }, timeoutMs);
         _this.addIdListener(msgId, function (msg) {
             if (_this.options.debug) {
-                console.log("CRDT GET RECV  > " + finalKey, msg);
+                console.log("GET RECV  > " + finalKey, msg);
             }
             clearTimeout(cancelTimeout);
-            if (msg.type === "crdt") {
-                var document_2 = (0, hexToUint8_1.default)(msg.doc);
-                resolve(document_2);
+            if (msg.type === "crdtPut") {
+                crdt.mergeChanges(msg.v);
+                resolve(msg);
+            }
+        });
+        _this.store.get(finalKey, function (err, data) {
+            if (data) {
+                try {
+                    var msg = JSON.parse(data);
+                    clearTimeout(cancelTimeout);
+                    _this.removeIdListener(msgId);
+                    crdt.mergeChanges(msg.v);
+                    resolve(msg);
+                }
+                catch (e) {
+                    // do nothing
+                }
             }
         });
         // Do get

package/dist/toolDbCrdtGet.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbCrdtGet.js","sourceRoot":"","sources":["../src/toolDbCrdtGet.ts"],"names":[],"mappings":";;;;;AAAA,sBAA+B;AAE/B,2EAAqD;AAErD;;;;;;GAMG;AACH,SAAwB,aAAa,CAEnC,GAAW,EACX,cAAsB,EACtB,SAAgB;IAJlB,iBAyDC;IAtDC,+BAAA,EAAA,sBAAsB;IACtB,0BAAA,EAAA,gBAAgB;IAEhB,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,cAAc,IAAI,KAAI,CAAC,SAAS,EAAE,KAAK,SAAS,EAAE;YACpD,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;YACjD,OAAO;SACR;QACD,IAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,MAAI,KAAI,CAAC,SAAS,EAAE,SAAI,GAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACtE,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC;SACvC;QAED,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAE7B,IAAM,aAAa,GAAG,UAAU,CAAC;YAC/B,KAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAC,IAAS;gBAC7C,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBACtB,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;iBACnC;gBACD,IAAI,IAAI,EAAE;oBACR,IAAI;wBACF,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;wBAC7B,IAAM,UAAQ,GAAG,IAAA,oBAAU,EAAC,IAAI,CAAC,CAAC;wBAClC,OAAO,CAAC,UAAQ,CAAC,CAAC;qBACnB;oBAAC,OAAO,CAAC,EAAE;wBACV,OAAO,CAAC,IAAI,CAAC,CAAC;qBACf;iBACF;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,CAAC;iBACf;YACH,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC;aAClD;YAED,YAAY,CAAC,aAAa,CAAC,CAAC;YAC5B,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE;gBACvB,IAAM,UAAQ,GAAG,IAAA,oBAAU,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACrC,OAAO,CAAC,UAAQ,CAAC,CAAC;aACnB;QACH,CAAC,CAAC,CAAC;QAEH,SAAS;QACT,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,SAAS;YACf,EAAE,EAAE,EAAE;YACN,GAAG,EAAE,QAAQ;YACb,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAzDD,gCAyDC"}
+{"version":3,"file":"toolDbCrdtGet.js","sourceRoot":"","sources":["../src/toolDbCrdtGet.ts"],"names":[],"mappings":";;AAAA,sBAA+B;AAK/B;;;;;;GAMG;AACH,SAAwB,aAAa,CAEnC,GAAW,EACX,IAA2B,EAC3B,cAAsB,EACtB,SAAgB;IALlB,iBAqEC;IAjEC,+BAAA,EAAA,sBAAsB;IACtB,0BAAA,EAAA,gBAAgB;IAEhB,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,cAAc,IAAI,KAAI,CAAC,UAAU,EAAE,KAAK,SAAS,EAAE;YACrD,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;YACjD,OAAO;SACR;QACD,IAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,MAAI,KAAI,CAAC,UAAU,EAAE,SAAI,GAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACvE,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC;SACvC;QAED,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAE7B,IAAM,aAAa,GAAG,UAAU,CAAC;YAC/B,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI;gBACjC,IAAI,IAAI,EAAE;oBACR,IAAI;wBACF,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACjC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;wBAC7B,OAAO,CAAC,OAAO,CAAC,CAAC;qBAClB;oBAAC,OAAO,CAAC,EAAE;wBACV,OAAO,CAAC,IAAI,CAAC,CAAC;qBACf;iBACF;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,CAAC;iBACf;YACH,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC;aAC7C;YAED,YAAY,CAAC,aAAa,CAAC,CAAC;YAC5B,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC1B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACzB,OAAO,CAAC,GAAG,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;QAEH,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI;YACjC,IAAI,IAAI,EAAE;gBACR,IAAI;oBACF,IAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC7B,YAAY,CAAC,aAAa,CAAC,CAAC;oBAC5B,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;oBAC7B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBACzB,OAAO,CAAC,GAAG,CAAC,CAAC;iBACd;gBAAC,OAAO,CAAC,EAAE;oBACV,aAAa;iBACd;aACF;QACH,CAAC,CAAC,CAAC;QAEH,SAAS;QACT,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,SAAS;YACf,EAAE,EAAE,EAAE;YACN,GAAG,EAAE,QAAQ;YACb,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AArED,gCAqEC"}

package/dist/toolDbCrdtPut.d.ts

@@ -1,11 +1,11 @@
-import { BinaryChange } from "automerge";
 import { CrdtPutMessage } from ".";
 import ToolDb from "./tooldb";
+import BaseCrdt from "./crdt/baseCrdt";
 /**
  * Triggers a PUT request to other peers.
  * @param key key where we want to put the data at.
  * @param value Data we want to any (any type)
- * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our public key and signatures.
+ * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our address and signatures.
  * @returns Promise<Data | null>
  */
-export default function toolDbCrdtPut<T = any>(this: ToolDb, key: string, value: BinaryChange[], userNamespaced?: boolean): Promise<CrdtPutMessage | null>;
+export default function toolDbCrdtPut<T = any>(this: ToolDb, key: string, crdt: BaseCrdt<T, any, any>, userNamespaced?: boolean): Promise<CrdtPutMessage | null>;

package/dist/toolDbCrdtPut.js

@@ -16,15 +16,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var _1 = require(".");
 var proofOfWork_1 = __importDefault(require("./utils/proofOfWork"));
-var uint8ArrayToHex_1 = __importDefault(require("./utils/encoding/uint8ArrayToHex"));
 /**
  * Triggers a PUT request to other peers.
  * @param key key where we want to put the data at.
  * @param value Data we want to any (any type)
- * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our public key and signatures.
+ * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our address and signatures.
  * @returns Promise<Data | null>
  */
-function toolDbCrdtPut(key, value, userNamespaced) {
+function toolDbCrdtPut(key, crdt, userNamespaced) {
     var _this = this;
     if (userNamespaced === void 0) { userNamespaced = false; }
     return new Promise(function (resolve, reject) {
@@ -33,33 +32,34 @@ function toolDbCrdtPut(key, value, userNamespaced) {
             reject(new Error("Key cannot include dots!; " + key));
             return;
         }
-        if (!_this.getPubKey()) {
+        if (!_this.getAddress()) {
             reject(new Error("You need to log in before you can PUT."));
             return;
         }
         var timestamp = new Date().getTime();
-        var encodedData = JSON.stringify(value.map(uint8ArrayToHex_1.default));
-        var dataString = "" + encodedData + _this.getPubKey() + timestamp;
+        var crdtChanges = crdt.getChanges();
+        var encodedData = JSON.stringify(crdtChanges);
+        var dataString = "" + encodedData + _this.getAddress() + timestamp;
         // WORK
         (0, proofOfWork_1.default)(dataString, _this.options.pow)
             .then(function (_a) {
             var hash = _a.hash, nonce = _a.nonce;
             var signature = _this.signData(hash);
-            if (signature && _this.getPubKey()) {
+            if (signature && _this.getAddress()) {
                 // Compose the message
                 var data = {
-                    k: userNamespaced ? ":" + _this.getPubKey() + "." + key : key,
-                    a: _this.getPubKey() || "",
+                    k: userNamespaced ? ":" + _this.getAddress() + "." + key : key,
+                    a: _this.getAddress() || "",
                     n: nonce,
                     t: timestamp,
                     h: hash,
                     s: signature.signature,
-                    v: encodedData,
+                    v: crdtChanges,
                 };
                 if (_this.options.debug) {
                     console.log("PUT CRDT > " + key, data);
                 }
-                var finalMessage = __assign({ type: "crdtPut", id: (0, _1.textRandom)(10), to: [] }, data);
+                var finalMessage = __assign({ type: "crdtPut", crdt: crdt.type, id: (0, _1.textRandom)(10), to: [] }, data);
                 _this.network.sendToAll(finalMessage);
                 resolve(finalMessage);
             }

package/dist/toolDbCrdtPut.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbCrdtPut.js","sourceRoot":"","sources":["../src/toolDbCrdtPut.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,sBAAiE;AAGjE,oEAA8C;AAE9C,qFAA+D;AAE/D;;;;;;GAMG;AACH,SAAwB,aAAa,CAEnC,GAAW,EACX,KAAqB,EACrB,cAAsB;IAJxB,iBAwDC;IApDC,+BAAA,EAAA,sBAAsB;IAEtB,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACrB,8FAA8F;YAC9F,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA6B,GAAK,CAAC,CAAC,CAAC;YACtD,OAAO;SACR;QAED,IAAI,CAAC,KAAI,CAAC,SAAS,EAAE,EAAE;YACrB,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;YAC5D,OAAO;SACR;QAED,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAe,CAAC,CAAC,CAAC;QAE/D,IAAM,UAAU,GAAG,KAAG,WAAW,GAAG,KAAI,CAAC,SAAS,EAAE,GAAG,SAAW,CAAC;QAEnE,OAAO;QACP,IAAA,qBAAW,EAAC,UAAU,EAAE,KAAI,CAAC,OAAO,CAAC,GAAG,CAAC;aACtC,IAAI,CAAC,UAAC,EAAe;gBAAb,IAAI,UAAA,EAAE,KAAK,WAAA;YAClB,IAAM,SAAS,GAAG,KAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,SAAS,IAAI,KAAI,CAAC,SAAS,EAAE,EAAE;gBACjC,sBAAsB;gBACtB,IAAM,IAAI,GAAqB;oBAC7B,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,MAAI,KAAI,CAAC,SAAS,EAAE,SAAI,GAAK,CAAC,CAAC,CAAC,GAAG;oBACvD,CAAC,EAAE,KAAI,CAAC,SAAS,EAAE,IAAI,EAAE;oBACzB,CAAC,EAAE,KAAK;oBACR,CAAC,EAAE,SAAS;oBACZ,CAAC,EAAE,IAAI;oBACP,CAAC,EAAE,SAAS,CAAC,SAAS;oBACtB,CAAC,EAAE,WAAW;iBACf,CAAC;gBAEF,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBACtB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;iBACxC;gBAED,IAAM,YAAY,cAChB,IAAI,EAAE,SAAS,EACf,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC,EAClB,EAAE,EAAE,EAAE,IACH,IAAI,CACR,CAAC;gBACF,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBACrC,OAAO,CAAC,YAAY,CAAC,CAAC;aACvB;QACH,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAxDD,gCAwDC"}
+{"version":3,"file":"toolDbCrdtPut.js","sourceRoot":"","sources":["../src/toolDbCrdtPut.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sBAAiE;AAGjE,oEAA8C;AAK9C;;;;;;GAMG;AACH,SAAwB,aAAa,CAEnC,GAAW,EACX,IAA2B,EAC3B,cAAsB;IAJxB,iBA2DC;IAvDC,+BAAA,EAAA,sBAAsB;IAEtB,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACrB,8FAA8F;YAC9F,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA6B,GAAK,CAAC,CAAC,CAAC;YACtD,OAAO;SACR;QAED,IAAI,CAAC,KAAI,CAAC,UAAU,EAAE,EAAE;YACtB,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;YAC5D,OAAO;SACR;QAED,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAEtC,IAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAEhD,IAAM,UAAU,GAAG,KAAG,WAAW,GAAG,KAAI,CAAC,UAAU,EAAE,GAAG,SAAW,CAAC;QAEpE,OAAO;QACP,IAAA,qBAAW,EAAC,UAAU,EAAE,KAAI,CAAC,OAAO,CAAC,GAAG,CAAC;aACtC,IAAI,CAAC,UAAC,EAAe;gBAAb,IAAI,UAAA,EAAE,KAAK,WAAA;YAClB,IAAM,SAAS,GAAG,KAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,SAAS,IAAI,KAAI,CAAC,UAAU,EAAE,EAAE;gBAClC,sBAAsB;gBACtB,IAAM,IAAI,GAAsC;oBAC9C,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,MAAI,KAAI,CAAC,UAAU,EAAE,SAAI,GAAK,CAAC,CAAC,CAAC,GAAG;oBACxD,CAAC,EAAE,KAAI,CAAC,UAAU,EAAE,IAAI,EAAE;oBAC1B,CAAC,EAAE,KAAK;oBACR,CAAC,EAAE,SAAS;oBACZ,CAAC,EAAE,IAAI;oBACP,CAAC,EAAE,SAAS,CAAC,SAAS;oBACtB,CAAC,EAAE,WAAW;iBACf,CAAC;gBAEF,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBACtB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;iBACxC;gBAED,IAAM,YAAY,cAChB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC,EAClB,EAAE,EAAE,EAAE,IACH,IAAI,CACR,CAAC;gBACF,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBACrC,OAAO,CAAC,YAAY,CAAC,CAAC;aACvB;QACH,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AA3DD,gCA2DC"}

package/dist/toolDbGet.d.ts

@@ -2,7 +2,7 @@ import ToolDb from "./tooldb";
 /**
  * Triggers a GET request to other peers. If the data is available locally it will return that instead.
  * @param key key of the data
- * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our public key and signatures.
+ * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our address and signatures.
  * @param timeout Max time to wait for remote.
  * @returns Promise<Data>
  */

package/dist/toolDbGet.js

@@ -4,7 +4,7 @@ var _1 = require(".");
 /**
  * Triggers a GET request to other peers. If the data is available locally it will return that instead.
  * @param key key of the data
- * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our public key and signatures.
+ * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our address and signatures.
  * @param timeout Max time to wait for remote.
  * @returns Promise<Data>
  */
@@ -13,11 +13,11 @@ function toolDbGet(key, userNamespaced, timeoutMs) {
     if (userNamespaced === void 0) { userNamespaced = false; }
     if (timeoutMs === void 0) { timeoutMs = 1000; }
     return new Promise(function (resolve, reject) {
-        if (userNamespaced && _this.getPubKey() === undefined) {
+        if (userNamespaced && _this.getAddress() === undefined) {
             reject(new Error("You are not authorized yet!"));
             return;
         }
-        var finalKey = userNamespaced ? ":" + _this.getPubKey() + "." + key : key;
+        var finalKey = userNamespaced ? ":" + _this.getAddress() + "." + key : key;
         if (_this.options.debug) {
             console.log("GET > " + finalKey);
         }