tool-db 2.1.2 → 2.3.1

package/dist/messageHandlers/handleCrdtGet.js

@@ -2,30 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 function handleCrdtGet(message, remotePeerId) {
     var _this = this;
-    this.emit("crdtget", message);
-    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 = {
-                    type: "crdtPut",
-                    data: JSON.parse(data),
-                    to: [],
-                    id: message.id,
-                };
-                _this.network.sendToClientId(remotePeerId, oldData);
-            }
-            catch (e) {
-                // socket.send(data);
-                // do nothing
-            }
+    this.store
+        .get(message.key)
+        .then(function (data) {
+        try {
+            // Use the id of the get so the other client knows we are replying
+            var oldData = {
+                type: "crdtPut",
+                data: JSON.parse(data),
+                to: [],
+                id: message.id,
+            };
+            _this.network.sendToClientId(remotePeerId, oldData);
         }
-        else {
-            if (_this.options.debug) {
-                console.log("Local key not found, relay", JSON.stringify(message));
-            }
-            _this.network.sendToAll(message, false, true);
+        catch (e) {
+            // socket.send(data);
+            // do nothing
         }
+    })
+        .catch(function (e) {
+        _this.logger("Local key not found, relay", JSON.stringify(message));
+        _this.network.sendToAll(message, false);
     });
 }
 exports.default = handleCrdtGet;

package/dist/messageHandlers/handleCrdtGet.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleCrdtGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtGet.ts"],"names":[],"mappings":";;AAGA,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,iBA4BC;IAvBC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9B,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;oBACf,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;oBACtB,EAAE,EAAE,EAAE;oBACN,EAAE,EAAE,OAAO,CAAC,EAAE;iBACG,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;AA5BD,gCA4BC"}
+{"version":3,"file":"handleCrdtGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtGet.ts"],"names":[],"mappings":";;AAEA,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,iBA0BC;IArBC,IAAI,CAAC,KAAK;SACP,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,IAAI,CAAC,UAAC,IAAI;QACT,IAAI;YACF,kEAAkE;YAClE,IAAM,OAAO,GAAG;gBACd,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACtB,EAAE,EAAE,EAAE;gBACN,EAAE,EAAE,OAAO,CAAC,EAAE;aACG,CAAC;YACpB,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;SACpD;QAAC,OAAO,CAAC,EAAE;YACV,qBAAqB;YACrB,aAAa;SACd;IACH,CAAC,CAAC;SACD,KAAK,CAAC,UAAC,CAAC;QACP,KAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACnE,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC;AA1BD,gCA0BC"}

package/dist/messageHandlers/handleCrdtPut.d.ts

@@ -1,3 +1,2 @@
-import { ToolDb } from "..";
-import { CrdtPutMessage } from "../types/message";
+import { ToolDb, CrdtPutMessage } from "..";
 export default function handleCrdtPut(this: ToolDb, message: CrdtPutMessage, remotePeerId: string): void;

package/dist/messageHandlers/handleCrdtPut.js

@@ -14,37 +14,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var message_1 = require("../types/message");
+var __1 = require("..");
 var toolDbVerificationWrapper_1 = __importDefault(require("../toolDbVerificationWrapper"));
-var mapCrdt_1 = __importDefault(require("../crdt/mapCrdt"));
-var baseCrdt_1 = require("../crdt/baseCrdt");
-var listCrdt_1 = __importDefault(require("../crdt/listCrdt"));
-var counterCrdt_1 = __importDefault(require("../crdt/counterCrdt"));
 function handleCrdtPut(message, remotePeerId) {
     var _this = this;
     toolDbVerificationWrapper_1.default.call(this, message.data).then(function (value) {
-        // console.log("Verification wrapper result: ", value, message.k);
-        if (value === message_1.VerifyResult.Verified) {
+        // this.logger("Verification wrapper result: ", value, message.k);
+        if (value === __1.VerifyResult.Verified) {
             _this.emit("crdtput", message);
             _this.emit("data", message.data);
             _this.emit("verified", message);
             // relay to other servers !!!
             _this.network.sendToAll(message, true);
-            _this.store.get(message.data.k, function (err, oldData) {
-                if (oldData) {
+            _this.store
+                .get(message.data.k)
+                .then(function (oldData) {
+                try {
                     var parsedOldData = 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
                     var oldDoc = void 0;
-                    if (parsedOldData.c === baseCrdt_1.CRDT_MAP) {
-                        oldDoc = new mapCrdt_1.default(_this.getAddress() || "", parsedOldData.v);
+                    if (parsedOldData.c === __1.CRDT_MAP) {
+                        oldDoc = new __1.MapCrdt(_this.userAccount.getAddress() || "", parsedOldData.v);
                     }
-                    if (parsedOldData.c === baseCrdt_1.CRDT_LIST) {
-                        oldDoc = new listCrdt_1.default(_this.getAddress() || "", parsedOldData.v);
+                    if (parsedOldData.c === __1.CRDT_LIST) {
+                        oldDoc = new __1.ListCrdt(_this.userAccount.getAddress() || "", parsedOldData.v);
                     }
-                    if (parsedOldData.c === baseCrdt_1.CRDT_COUNTER) {
-                        oldDoc = new counterCrdt_1.default(_this.getAddress() || "", parsedOldData.v);
+                    if (parsedOldData.c === __1.CRDT_COUNTER) {
+                        oldDoc = new __1.CounterCrdt(_this.userAccount.getAddress() || "", parsedOldData.v);
                     }
                     var changesMerged = [];
                     if (oldDoc) {
@@ -56,31 +54,38 @@ function handleCrdtPut(message, remotePeerId) {
                     if (parsedOldData.t < message.data.t) {
                         var key = newMessage.data.k;
                         _this.triggerKeyListener(key, newMessage.data);
-                        _this.store.put(newMessage.data.k, JSON.stringify(newMessage.data), function (err, data) {
-                            //
+                        _this.store
+                            .put(newMessage.data.k, JSON.stringify(newMessage.data))
+                            .catch(function (e) {
+                            // do nothing
                         });
                     }
                     else {
                         var key = message.data.k;
                         _this.triggerKeyListener(key, parsedOldData);
                     }
-                    // } else if (this.options.debug) {
-                    //   console.log(
+                    // } else {
+                    //   this.logger(
                     //     `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
                     //   );
                     // }
                 }
-                else {
-                    var key = message.data.k;
-                    _this.triggerKeyListener(key, message.data);
-                    _this.store.put(message.data.k, JSON.stringify(message.data), function (err, data) {
-                        //
-                    });
+                catch (e) {
+                    _this.logger("Couldnt parse crdt data", oldData, e);
                 }
+            })
+                .catch(function (e) {
+                var key = message.data.k;
+                _this.triggerKeyListener(key, message.data);
+                _this.store
+                    .put(message.data.k, JSON.stringify(message.data))
+                    .catch(function (e) {
+                    // do nothing
+                });
             });
         }
         else {
-            console.warn("unverified message: ", value, message);
+            _this.logger("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":"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"}

package/dist/messageHandlers/handleGet.d.ts

@@ -1,3 +1,2 @@
-import { ToolDb } from "..";
-import { GetMessage } from "../types/message";
+import { ToolDb, GetMessage } from "..";
 export default function handleGet(this: ToolDb, message: GetMessage, remotePeerId: string): void;

package/dist/messageHandlers/handleGet.js

@@ -2,29 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 function handleGet(message, remotePeerId) {
     var _this = this;
-    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 = {
-                    type: "put",
-                    data: JSON.parse(data),
-                    to: [],
-                    id: message.id,
-                };
-                _this.network.sendToClientId(remotePeerId, oldData);
-            }
-            catch (e) {
-                // socket.send(data);
-                // do nothing
-            }
+    this.store
+        .get(message.key)
+        .then(function (data) {
+        try {
+            // Use the id of the get so the other client knows we are replying
+            var oldData = {
+                type: "put",
+                data: JSON.parse(data),
+                to: [],
+                id: message.id,
+            };
+            _this.network.sendToClientId(remotePeerId, oldData);
         }
-        else {
-            if (_this.options.debug) {
-                console.log("Local key not found, relay", JSON.stringify(message));
-            }
-            _this.network.sendToAll(message, false, true);
+        catch (e) {
+            // socket.send(data);
+            // do nothing
         }
+    })
+        .catch(function (e) {
+        _this.logger("Local key not found, relay", JSON.stringify(message));
+        _this.network.sendToAll(message, false);
     });
 }
 exports.default = handleGet;

package/dist/messageHandlers/handleGet.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleGet.ts"],"names":[],"mappings":";;AAGA,SAAwB,SAAS,CAE/B,OAAmB,EACnB,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,KAAK;oBACX,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;oBACtB,EAAE,EAAE,EAAE;oBACN,EAAE,EAAE,OAAO,CAAC,EAAE;iBACD,CAAC;gBAChB,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,4BA2BC"}
+{"version":3,"file":"handleGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleGet.ts"],"names":[],"mappings":";;AAEA,SAAwB,SAAS,CAE/B,OAAmB,EACnB,YAAoB;IAHtB,iBA0BC;IArBC,IAAI,CAAC,KAAK;SACP,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,IAAI,CAAC,UAAC,IAAI;QACT,IAAI;YACF,kEAAkE;YAClE,IAAM,OAAO,GAAG;gBACd,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACtB,EAAE,EAAE,EAAE;gBACN,EAAE,EAAE,OAAO,CAAC,EAAE;aACD,CAAC;YAChB,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;SACpD;QAAC,OAAO,CAAC,EAAE;YACV,qBAAqB;YACrB,aAAa;SACd;IACH,CAAC,CAAC;SACD,KAAK,CAAC,UAAC,CAAC;QACP,KAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACnE,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC;AA1BD,4BA0BC"}

package/dist/messageHandlers/handleJoin.d.ts

@@ -1,3 +1,2 @@
-import { ToolDb } from "..";
-import { JoinMessage } from "../types/message";
+import { JoinMessage, ToolDb } from "..";
 export default function handleJoin(this: ToolDb, message: JoinMessage, remotePeerId: string): void;

package/dist/messageHandlers/handleJoin.js

@@ -5,28 +5,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var verifyPeer_1 = __importDefault(require("../utils/verifyPeer"));
 function handleJoin(message, remotePeerId) {
-    var verified = (0, verifyPeer_1.default)(this, message.peer);
-    // Add this peer to our list of peers
-    if (verified) {
-        var filteredPeers = this.peers.filter(function (p) { return p.adress !== message.peer.adress; });
-        if (filteredPeers.length === 0 && message.peer.host && message.peer.port) {
-            // Add this peer to the list
-            this.peers.push(message.peer);
-            // Reply with our servers list
-            this.network.sendToClientId(remotePeerId, {
-                type: "servers",
-                servers: this.peers.filter(function (p) { return p.topic === message.peer.topic; }),
-                id: message.id,
-            });
-            // If we are a server ourselves we broadcast this message
-            if (this.options.server) {
-                this.network.sendToAll(message, true);
+    var _this = this;
+    (0, verifyPeer_1.default)(message.peer).then(function (verified) {
+        // Add this peer to our list of peers
+        if (verified) {
+            var filteredPeers = _this.peers.filter(function (p) { return p.pubkey !== message.peer.pubkey; });
+            if (filteredPeers.length === 0 &&
+                message.peer.host &&
+                message.peer.port) {
+                // Add this peer to the list
+                _this.peers.push(message.peer);
+                // Reply with our servers list
+                _this.network.sendToClientId(remotePeerId, {
+                    type: "servers",
+                    servers: _this.peers.filter(function (p) { return p.topic === message.peer.topic; }),
+                    id: message.id,
+                });
+                // If we are a server ourselves we broadcast this message
+                if (_this.options.server) {
+                    _this.network.sendToAll(message, true);
+                }
             }
         }
-    }
-    else {
-        console.warn("Blocked a remote peer from joining; ", message);
-    }
+        else {
+            console.warn("Blocked a remote peer from joining; ", message);
+        }
+    });
 }
 exports.default = handleJoin;
 //# sourceMappingURL=handleJoin.js.map

package/dist/messageHandlers/handleJoin.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleJoin.js","sourceRoot":"","sources":["../../src/messageHandlers/handleJoin.ts"],"names":[],"mappings":";;;;;AAEA,mEAA6C;AAE7C,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAEpB,IAAM,QAAQ,GAAG,IAAA,oBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,qCAAqC;IACrC,IAAI,QAAQ,EAAE;QACZ,IAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CACrC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,MAAM,EAAhC,CAAgC,CACxC,CAAC;QACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;YACxE,4BAA4B;YAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC9B,8BAA8B;YAC9B,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;gBACxC,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,EAA9B,CAA8B,CAAC;gBACjE,EAAE,EAAE,OAAO,CAAC,EAAE;aACG,CAAC,CAAC;YAErB,yDAAyD;YACzD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACvB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;aACvC;SACF;KACF;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;KAC/D;AACH,CAAC;AA7BD,6BA6BC"}
+{"version":3,"file":"handleJoin.js","sourceRoot":"","sources":["../../src/messageHandlers/handleJoin.ts"],"names":[],"mappings":";;;;;AACA,mEAA6C;AAE7C,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAHtB,iBAkCC;IA7BC,IAAA,oBAAU,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;QACrC,qCAAqC;QACrC,IAAI,QAAQ,EAAE;YACZ,IAAM,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,MAAM,CACrC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,MAAM,EAAhC,CAAgC,CACxC,CAAC;YACF,IACE,aAAa,CAAC,MAAM,KAAK,CAAC;gBAC1B,OAAO,CAAC,IAAI,CAAC,IAAI;gBACjB,OAAO,CAAC,IAAI,CAAC,IAAI,EACjB;gBACA,4BAA4B;gBAC5B,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC9B,8BAA8B;gBAC9B,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;oBACxC,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,KAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,EAA9B,CAA8B,CAAC;oBACjE,EAAE,EAAE,OAAO,CAAC,EAAE;iBACG,CAAC,CAAC;gBAErB,yDAAyD;gBACzD,IAAI,KAAI,CAAC,OAAO,CAAC,MAAM,EAAE;oBACvB,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;iBACvC;aACF;SACF;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;SAC/D;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAlCD,6BAkCC"}

package/dist/messageHandlers/handlePing.d.ts

@@ -1,3 +1,2 @@
-import { ToolDb } from "..";
-import { PingMessage } from "../types/message";
+import { ToolDb, PingMessage } from "..";
 export default function handlePing(this: ToolDb, message: PingMessage, remotePeerId: string): void;

package/dist/messageHandlers/handlePing.js

@@ -1,26 +1,35 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var textRandom_1 = __importDefault(require("../utils/textRandom"));
+var __1 = require("..");
 function handlePing(message, remotePeerId) {
+    var _this = this;
     if (!this.isConnected) {
         this.isConnected = true;
         this.onConnect();
     }
-    this.network.sendToClientId(remotePeerId, {
-        type: "pong",
-        isServer: this.options.server,
-        clientId: this.options.peerAccount.address,
-        to: [],
-        id: message.id,
-    });
-    this.network.sendToClientId(remotePeerId, {
-        type: "servers",
-        servers: this.peers,
-        to: [],
-        id: (0, textRandom_1.default)(10),
+    (0, __1.verifyPeer)(this, message.peer).then(function (verified) {
+        // Verify integrity and topic
+        if (verified && message.peer.topic === _this.options.topic) {
+            // Add this peer to our list of peers
+            var filteredPeers = _this.serverPeers.filter(function (p) { return p.address === message.peer.address; });
+            if (filteredPeers.length === 0 && message.isServer) {
+                // Add this peer to the list
+                _this.serverPeers.push(message.peer);
+            }
+            _this.network.sendToClientId(remotePeerId, {
+                type: "pong",
+                isServer: _this.options.server,
+                clientId: _this.network.getClientAddress(),
+                to: [],
+                servers: _this.serverPeers,
+                id: message.id,
+            });
+            _this.onPeerConnect(_this.peerAccount.getAddress() || "");
+        }
+        else {
+            _this.logger("Blocked a remote peer from joining; ", message);
+            // Drop connection here!
+        }
     });
 }
 exports.default = handlePing;

package/dist/messageHandlers/handlePing.js.map

@@ -1 +1 @@
-{"version":3,"file":"handlePing.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePing.ts"],"names":[],"mappings":";;;;;AAEA,mEAA6C;AAE7C,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAEpB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;KAClB;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;QACxC,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;QAC7B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO;QAC1C,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,OAAO,CAAC,EAAE;KACA,CAAC,CAAC;IAElB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;QACxC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI,CAAC,KAAK;QACnB,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,IAAA,oBAAU,EAAC,EAAE,CAAC;KACD,CAAC,CAAC;AACvB,CAAC;AAxBD,6BAwBC"}
+{"version":3,"file":"handlePing.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePing.ts"],"names":[],"mappings":";;AAAA,wBAAkE;AAElE,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAHtB,iBAqCC;IAhCC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;KAClB;IAED,IAAA,cAAU,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;QAC3C,6BAA6B;QAC7B,IAAI,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACzD,qCAAqC;YACrC,IAAM,aAAa,GAAG,KAAI,CAAC,WAAW,CAAC,MAAM,CAC3C,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,OAAO,EAAlC,CAAkC,CAC1C,CAAC;YACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE;gBAClD,4BAA4B;gBAC5B,KAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aACrC;YAED,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;gBACxC,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,KAAI,CAAC,OAAO,CAAC,MAAM;gBAC7B,QAAQ,EAAE,KAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE;gBACzC,EAAE,EAAE,EAAE;gBACN,OAAO,EAAE,KAAI,CAAC,WAAW;gBACzB,EAAE,EAAE,OAAO,CAAC,EAAE;aACA,CAAC,CAAC;YAElB,KAAI,CAAC,aAAa,CAAC,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;SACzD;aAAM;YACL,KAAI,CAAC,MAAM,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;YAC7D,wBAAwB;SACzB;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AArCD,6BAqCC"}

package/dist/messageHandlers/handlePong.d.ts

@@ -1,3 +1,2 @@
-import { ToolDb } from "..";
-import { PongMessage } from "../types/message";
+import { ToolDb, PongMessage } from "..";
 export default function handlePong(this: ToolDb, message: PongMessage, remotePeerId: string): void;

package/dist/messageHandlers/handlePong.js

@@ -1,34 +1,26 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var getPeerSignature_1 = __importDefault(require("../utils/getPeerSignature"));
-var textRandom_1 = __importDefault(require("../utils/textRandom"));
+var __1 = require("..");
 function handlePong(message, remotePeerId) {
+    var _this = this;
     if (!this.isConnected) {
         this.isConnected = true;
         this.onConnect();
     }
-    this.onPeerConnect(this.options.peerAccount.address);
-    if (this.options.server && this.options.peerAccount.address) {
-        var timestamp = new Date().getTime();
-        var signature = (0, getPeerSignature_1.default)(this.options.peerAccount, this.options.topic, timestamp, this.options.host, this.options.port);
-        var meAsPeer = {
-            topic: this.options.topic,
-            timestamp: timestamp,
-            host: this.options.host,
-            port: this.options.port,
-            adress: this.options.peerAccount.address,
-            sig: signature.signature,
-        };
-        this.network.sendToClientId(remotePeerId, {
-            type: "join",
-            peer: meAsPeer,
-            to: [],
-            id: (0, textRandom_1.default)(10),
+    message.servers.forEach(function (peer) {
+        (0, __1.verifyPeer)(_this, peer).then(function (verified) {
+            // Verify integrity and topic
+            if (verified && peer.topic === _this.options.topic) {
+                // Add this peer to our list of peers
+                var filteredPeers = _this.serverPeers.filter(function (p) { return p.address === peer.address; });
+                if (filteredPeers.length === 0 && peer.host && peer.port) {
+                    // Add this peer to the list
+                    _this.serverPeers.push(peer);
+                }
+            }
         });
-    }
+    });
+    this.onPeerConnect(this.peerAccount.getAddress() || "");
 }
 exports.default = handlePong;
 //# sourceMappingURL=handlePong.js.map

package/dist/messageHandlers/handlePong.js.map

@@ -1 +1 @@
-{"version":3,"file":"handlePong.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePong.ts"],"names":[],"mappings":";;;;;AAEA,+EAAyD;AAEzD,mEAA6C;AAE7C,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAEpB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;KAClB;IACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAErD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE;QAC3D,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAM,SAAS,GAAG,IAAA,0BAAgB,EAChC,IAAI,CAAC,OAAO,CAAC,WAAW,EACxB,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,SAAS,EACT,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAClB,CAAC;QAEF,IAAM,QAAQ,GAAS;YACrB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO;YACxC,GAAG,EAAE,SAAS,CAAC,SAAS;SACzB,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;YACxC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,EAAE;YACN,EAAE,EAAE,IAAA,oBAAU,EAAC,EAAE,CAAC;SACJ,CAAC,CAAC;KACnB;AACH,CAAC;AAtCD,6BAsCC"}
+{"version":3,"file":"handlePong.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePong.ts"],"names":[],"mappings":";;AAAA,wBAAqD;AAErD,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAHtB,iBA2BC;IAtBC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;KAClB;IAED,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,IAAI;QAC3B,IAAA,cAAU,EAAC,KAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;YACnC,6BAA6B;YAC7B,IAAI,QAAQ,IAAI,IAAI,CAAC,KAAK,KAAK,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACjD,qCAAqC;gBACrC,IAAM,aAAa,GAAG,KAAI,CAAC,WAAW,CAAC,MAAM,CAC3C,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAA1B,CAA0B,CAClC,CAAC;gBACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;oBACxD,4BAA4B;oBAC5B,KAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC7B;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AAC1D,CAAC;AA3BD,6BA2BC"}

package/dist/messageHandlers/handlePut.d.ts

@@ -1,3 +1,2 @@
-import { ToolDb } from "..";
-import { PutMessage } from "../types/message";
+import { ToolDb, PutMessage } from "..";
 export default function handlePut(this: ToolDb, message: PutMessage, remotePeerId: string): void;

package/dist/messageHandlers/handlePut.js

@@ -3,49 +3,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var __1 = require("..");
 var toolDbVerificationWrapper_1 = __importDefault(require("../toolDbVerificationWrapper"));
-var message_1 = require("../types/message");
 function handlePut(message, remotePeerId) {
     var _this = this;
     toolDbVerificationWrapper_1.default.call(this, message.data).then(function (value) {
-        // console.log("Verification wrapper result: ", value, message.k);
-        if (value === message_1.VerifyResult.Verified) {
+        // this.logger("Verification wrapper result: ", value, message.k);
+        if (value === __1.VerifyResult.Verified) {
             _this.emit("put", message);
             _this.emit("data", message.data);
             _this.emit("verified", message);
             // relay to other servers !!!
             _this.network.sendToAll(message, true);
-            _this.store.get(message.data.k, function (err, oldData) {
-                if (oldData) {
-                    var parsedOldData = JSON.parse(oldData);
-                    if (parsedOldData.t < message.data.t) {
-                        var key = message.data.k;
-                        _this.triggerKeyListener(key, message.data);
-                        _this.store.put(message.data.k, JSON.stringify(message.data), function (err, data) {
-                            //
-                        });
-                    }
-                    else {
-                        var key = message.data.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 {
+            _this.store
+                .get(message.data.k)
+                .then(function (oldData) {
+                var parsedOldData = JSON.parse(oldData);
+                if (parsedOldData.t < message.data.t) {
                     var key = message.data.k;
                     _this.triggerKeyListener(key, message.data);
-                    _this.store.put(message.data.k, JSON.stringify(message.data), function (err, data) {
-                        //
+                    _this.store
+                        .put(message.data.k, JSON.stringify(message.data))
+                        .catch(function (e) {
+                        // do nothing
                     });
                 }
+                else {
+                    var key = message.data.k;
+                    _this.triggerKeyListener(key, parsedOldData);
+                }
+                // } else {
+                //   this.logger(
+                //     `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
+                //   );
+                // }
+            })
+                .catch(function (e) {
+                var key = message.data.k;
+                _this.triggerKeyListener(key, message.data);
+                _this.store
+                    .put(message.data.k, JSON.stringify(message.data))
+                    .catch(function (e) {
+                    //
+                });
             });
         }
         else {
-            console.warn("unverified message: ", value, message);
+            _this.logger("unverified message: ", value, message);
         }
     });
 }

package/dist/messageHandlers/handlePut.js.map

@@ -1 +1 @@
-{"version":3,"file":"handlePut.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePut.ts"],"names":[],"mappings":";;;;;AACA,2FAAqE;AACrE,4CAA4D;AAE5D,SAAwB,SAAS,CAE/B,OAAmB,EACnB,YAAoB;IAHtB,iBAoDC;IA/CC,mCAAyB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,KAAK;QAC5D,kEAAkE;QAClE,IAAI,KAAK,KAAK,sBAAY,CAAC,QAAQ,EAAE;YACnC,KAAI,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC1B,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YAChC,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,IAAI,CAAC,CAAC,EAAE,UAAC,GAAG,EAAE,OAAgB;gBACnD,IAAI,OAAO,EAAE;oBACX,IAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC1C,IAAI,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE;wBACpC,IAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;wBAC3B,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;wBAC3C,KAAI,CAAC,KAAK,CAAC,GAAG,CACZ,OAAO,CAAC,IAAI,CAAC,CAAC,EACd,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAC5B,UAAC,GAAG,EAAE,IAAI;4BACR,EAAE;wBACJ,CAAC,CACF,CAAC;qBACH;yBAAM;wBACL,IAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;wBAC3B,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,IAAI,CAAC,CAAC,CAAC;oBAC3B,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;oBAC3C,KAAI,CAAC,KAAK,CAAC,GAAG,CACZ,OAAO,CAAC,IAAI,CAAC,CAAC,EACd,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAC5B,UAAC,GAAG,EAAE,IAAI;wBACR,EAAE;oBACJ,CAAC,CACF,CAAC;iBACH;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;AApDD,4BAoDC"}
+{"version":3,"file":"handlePut.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePut.ts"],"names":[],"mappings":";;;;;AAAA,wBAAsD;AAEtD,2FAAqE;AAErE,SAAwB,SAAS,CAE/B,OAAmB,EACnB,YAAoB;IAHtB,iBAiDC;IA5CC,mCAAyB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,KAAK;QAC5D,kEAAkE;QAClE,IAAI,KAAK,KAAK,gBAAY,CAAC,QAAQ,EAAE;YACnC,KAAI,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC1B,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YAChC,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;iBACP,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;iBACnB,IAAI,CAAC,UAAC,OAAO;gBACZ,IAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC1C,IAAI,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE;oBACpC,IAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC3B,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;oBAC3C,KAAI,CAAC,KAAK;yBACP,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;yBACjD,KAAK,CAAC,UAAC,CAAC;wBACP,aAAa;oBACf,CAAC,CAAC,CAAC;iBACN;qBAAM;oBACL,IAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC3B,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;iBAC7C;gBACD,WAAW;gBACX,iBAAiB;gBACjB,4FAA4F;gBAC5F,OAAO;gBACP,IAAI;YACN,CAAC,CAAC;iBACD,KAAK,CAAC,UAAC,CAAC;gBACP,IAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC3B,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC3C,KAAI,CAAC,KAAK;qBACP,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;qBACjD,KAAK,CAAC,UAAC,CAAC;oBACP,EAAE;gBACJ,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;aAAM;YACL,KAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SACrD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAjDD,4BAiDC"}

package/dist/messageHandlers/handleQuery.d.ts

@@ -1,3 +1,2 @@
-import { ToolDb } from "..";
-import { QueryMessage } from "../types/message";
+import { ToolDb, QueryMessage } from "..";
 export default function handleQuery(this: ToolDb, message: QueryMessage, remotePeerId: string): void;

package/dist/messageHandlers/handleQuery.js

@@ -2,16 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 function handleQuery(message, remotePeerId) {
     var _this = this;
-    this.store.query(message.key).then(function (keys) {
+    this.store
+        .query(message.key)
+        .then(function (keys) {
         _this.network.sendToClientId(remotePeerId, {
             type: "queryAck",
             id: message.id,
             to: [],
             keys: keys,
         });
+    })
+        .catch(function (e) {
+        // do nothing
     });
     if (this.options.server) {
-        this.network.sendToAll(message, true, true);
+        this.network.sendToAll(message, true);
     }
 }
 exports.default = handleQuery;

package/dist/messageHandlers/handleQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleQuery.js","sourceRoot":"","sources":["../../src/messageHandlers/handleQuery.ts"],"names":[],"mappings":";;AAGA,SAAwB,WAAW,CAEjC,OAAqB,EACrB,YAAoB;IAHtB,iBAiBC;IAZC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAC,IAAI;QACtC,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;YACxC,IAAI,EAAE,UAAU;YAChB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,EAAE,EAAE,EAAE;YACN,IAAI,MAAA;SACc,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACvB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;KAC7C;AACH,CAAC;AAjBD,8BAiBC"}
+{"version":3,"file":"handleQuery.js","sourceRoot":"","sources":["../../src/messageHandlers/handleQuery.ts"],"names":[],"mappings":";;AAEA,SAAwB,WAAW,CAEjC,OAAqB,EACrB,YAAoB;IAHtB,iBAsBC;IAjBC,IAAI,CAAC,KAAK;SACP,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;SAClB,IAAI,CAAC,UAAC,IAAI;QACT,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;YACxC,IAAI,EAAE,UAAU;YAChB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,EAAE,EAAE,EAAE;YACN,IAAI,MAAA;SACc,CAAC,CAAC;IACxB,CAAC,CAAC;SACD,KAAK,CAAC,UAAC,CAAC;QACP,aAAa;IACf,CAAC,CAAC,CAAC;IAEL,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACvB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;KACvC;AACH,CAAC;AAtBD,8BAsBC"}

package/dist/messageHandlers/handleServers.d.ts

@@ -1,3 +1,2 @@
-import { ToolDb } from "..";
-import { ServersMessage } from "../types/message";
+import { ServersMessage, ToolDb } from "..";
 export default function handleServers(this: ToolDb, message: ServersMessage, remotePeerId: string): void;