tool-db 2.1.1 → 2.3.0

package/dist/toolDbPut.js

@@ -21,47 +21,50 @@ function toolDbPut(key, value, userNamespaced) {
             reject(new Error("Key cannot include dots!; " + key));
             return;
         }
-        if (!_this.getAddress()) {
+        if (!_this.userAccount || !_this.userAccount.getAddress()) {
             reject(new Error("You need to log in before you can PUT."));
             return;
         }
         var timestamp = new Date().getTime();
-        var dataString = "" + JSON.stringify(value) + _this.getAddress() + timestamp;
+        var dataString = "" + JSON.stringify(value) + _this.userAccount.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.getAddress()) {
-                var finalKey = userNamespaced
-                    ? ":" + _this.getAddress() + "." + key
-                    : key;
-                // Compose the message
-                var data = {
-                    k: finalKey,
-                    a: _this.getAddress() || "",
-                    n: nonce,
-                    t: timestamp,
-                    h: hash,
-                    s: signature.signature,
-                    v: value,
-                    c: null,
-                };
-                _this.store.put(finalKey, JSON.stringify(data), function (err, data) {
-                    //
-                });
-                if (_this.options.debug) {
-                    console.log("PUT > " + key, data);
+            _this.userAccount.signData(hash).then(function (signature) {
+                if (signature && _this.userAccount.getAddress()) {
+                    var finalKey = userNamespaced
+                        ? ":" + _this.userAccount.getAddress() + "." + key
+                        : key;
+                    // Compose the message
+                    var data = {
+                        k: finalKey,
+                        a: _this.userAccount.getAddress() || "",
+                        n: nonce,
+                        t: timestamp,
+                        h: hash,
+                        s: signature,
+                        v: value,
+                        c: null,
+                    };
+                    _this.logger("PUT", key, data);
+                    var finalMessage_1 = {
+                        type: "put",
+                        id: (0, _1.textRandom)(10),
+                        to: [],
+                        data: data,
+                    };
+                    _this.network.sendToAll(finalMessage_1);
+                    _this.store
+                        .put(finalKey, JSON.stringify(data))
+                        .catch(function (e) {
+                        // do nothing
+                    })
+                        .finally(function () {
+                        resolve(finalMessage_1);
+                    });
                 }
-                var finalMessage = {
-                    type: "put",
-                    id: (0, _1.textRandom)(10),
-                    to: [],
-                    data: data,
-                };
-                _this.network.sendToAll(finalMessage);
-                resolve(finalMessage);
-            }
+            });
         })
             .catch(reject);
     });

package/dist/toolDbPut.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbPut.js","sourceRoot":"","sources":["../src/toolDbPut.ts"],"names":[],"mappings":";;;;;AAAA,sBAA6D;AAG7D,oEAA8C;AAE9C;;;;;;GAMG;AACH,SAAwB,SAAS,CAE/B,GAAW,EACX,KAAQ,EACR,cAAsB;IAJxB,iBAgEC;IA5DC,+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;QACvC,IAAM,UAAU,GAAG,KAAG,IAAI,CAAC,SAAS,CAClC,KAAK,CACN,GAAG,KAAI,CAAC,UAAU,EAAE,GAAG,SAAW,CAAC;QAEpC,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,IAAM,QAAQ,GAAG,cAAc;oBAC7B,CAAC,CAAC,MAAI,KAAI,CAAC,UAAU,EAAE,SAAI,GAAK;oBAChC,CAAC,CAAC,GAAG,CAAC;gBACR,sBAAsB;gBACtB,IAAM,IAAI,GAAqB;oBAC7B,CAAC,EAAE,QAAQ;oBACX,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,KAAK;oBACR,CAAC,EAAE,IAAI;iBACR,CAAC;gBAEF,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,UAAC,GAAG,EAAE,IAAI;oBACvD,EAAE;gBACJ,CAAC,CAAC,CAAC;gBAEH,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBACtB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;iBACnC;gBAED,IAAM,YAAY,GAAe;oBAC/B,IAAI,EAAE,KAAK;oBACX,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC;oBAClB,EAAE,EAAE,EAAE;oBACN,IAAI,MAAA;iBACL,CAAC;gBACF,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBAErC,OAAO,CAAC,YAAY,CAAC,CAAC;aACvB;QACH,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAhED,4BAgEC"}
+{"version":3,"file":"toolDbPut.js","sourceRoot":"","sources":["../src/toolDbPut.ts"],"names":[],"mappings":";;;;;AAAA,sBAA6D;AAG7D,oEAA8C;AAE9C;;;;;;GAMG;AACH,SAAwB,SAAS,CAE/B,GAAW,EACX,KAAQ,EACR,cAAsB;IAJxB,iBAmEC;IA/DC,+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,WAAW,IAAI,CAAC,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE;YACvD,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;YAC5D,OAAO;SACR;QAED,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACvC,IAAM,UAAU,GAAG,KAAG,IAAI,CAAC,SAAS,CAClC,KAAK,CACN,GAAG,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,SAAW,CAAC;QAEhD,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,KAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,SAAS;gBAC7C,IAAI,SAAS,IAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE;oBAC9C,IAAM,QAAQ,GAAG,cAAc;wBAC7B,CAAC,CAAC,MAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAI,GAAK;wBAC5C,CAAC,CAAC,GAAG,CAAC;oBAER,sBAAsB;oBACtB,IAAM,IAAI,GAAqB;wBAC7B,CAAC,EAAE,QAAQ;wBACX,CAAC,EAAE,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE;wBACtC,CAAC,EAAE,KAAK;wBACR,CAAC,EAAE,SAAS;wBACZ,CAAC,EAAE,IAAI;wBACP,CAAC,EAAE,SAAS;wBACZ,CAAC,EAAE,KAAK;wBACR,CAAC,EAAE,IAAI;qBACR,CAAC;oBAEF,KAAI,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;oBAE9B,IAAM,cAAY,GAAe;wBAC/B,IAAI,EAAE,KAAK;wBACX,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC;wBAClB,EAAE,EAAE,EAAE;wBACN,IAAI,MAAA;qBACL,CAAC;oBAEF,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,cAAY,CAAC,CAAC;oBACrC,KAAI,CAAC,KAAK;yBACP,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;yBACnC,KAAK,CAAC,UAAC,CAAC;wBACP,aAAa;oBACf,CAAC,CAAC;yBACD,OAAO,CAAC;wBACP,OAAO,CAAC,cAAY,CAAC,CAAC;oBACxB,CAAC,CAAC,CAAC;iBACN;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAnED,4BAmEC"}

package/dist/toolDbQueryKeys.js

@@ -24,29 +24,31 @@ function toolDbQueryKeys(key, userNamespaced, timeoutMs) {
     var _this = this;
     if (userNamespaced === void 0) { userNamespaced = false; }
     if (timeoutMs === void 0) { timeoutMs = 1000; }
+    var user = this.userAccount;
     return new Promise(function (resolve, reject) {
-        if (userNamespaced && _this.getAddress() === undefined) {
+        if (userNamespaced && user.getAddress() === undefined) {
             reject(new Error("You are not authorized yet!"));
             return;
         }
-        var finalKey = userNamespaced ? ":" + _this.getAddress() + "." + key : key;
-        if (_this.options.debug) {
-            console.log("QUERY > " + finalKey);
-        }
+        var finalKey = userNamespaced ? ":" + user.getAddress() + "." + key : key;
+        _this.logger("QUERY", finalKey);
         var msgId = (0, _1.textRandom)(10);
         var foundKeys = [];
         var timeout;
-        _this.store.query(finalKey).then(function (localKeys) {
+        _this.store
+            .query(finalKey)
+            .then(function (localKeys) {
             foundKeys = __spreadArray(__spreadArray([], foundKeys, true), localKeys, true);
             timeout = setTimeout(finishListening, timeoutMs);
+        })
+            .catch(function (e) {
+            // do nothing
         });
         var finishListening = function () {
             resolve(lodash_1.default.uniq(foundKeys));
         };
         _this.addIdListener(msgId, function (msg) {
-            if (_this.options.debug) {
-                console.log("QUERY RECV  > " + finalKey, msg);
-            }
+            _this.logger("QUERY RECV", finalKey);
             if (msg.type === "queryAck") {
                 foundKeys = __spreadArray(__spreadArray([], foundKeys, true), msg.keys, true);
                 if (timeout) {

package/dist/toolDbQueryKeys.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbQueryKeys.js","sourceRoot":"","sources":["../src/toolDbQueryKeys.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAAuB;AACvB,sBAA+B;AAG/B;;;;;GAKG;AACH,SAAwB,eAAe,CAErC,GAAW,EACX,cAAsB,EACtB,SAAgB;IAJlB,iBAmDC;IAhDC,+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,UAAU,GAAG,QAAQ,CAAC,CAAC;SACpC;QAED,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAC7B,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,IAAI,OAAmC,CAAC;QAExC,KAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAC,SAAS;YACxC,SAAS,mCAAO,SAAS,SAAK,SAAS,OAAC,CAAC;YACzC,OAAO,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,IAAM,eAAe,GAAG;YACtB,OAAO,CAAC,gBAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC;QAEF,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC;aAC/C;YACD,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC3B,SAAS,mCAAO,SAAS,SAAK,GAAG,CAAC,IAAI,OAAC,CAAC;gBAExC,IAAI,OAAO,EAAE;oBACX,YAAY,CAAC,OAAO,CAAC,CAAC;iBACvB;gBACD,OAAO,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;aAClD;QACH,CAAC,CAAC,CAAC;QAEH,SAAS;QACT,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,EAAE;YACN,GAAG,EAAE,QAAQ;YACb,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAnDD,kCAmDC"}
+{"version":3,"file":"toolDbQueryKeys.js","sourceRoot":"","sources":["../src/toolDbQueryKeys.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAAuB;AACvB,sBAA+B;AAG/B;;;;;GAKG;AACH,SAAwB,eAAe,CAErC,GAAW,EACX,cAAsB,EACtB,SAAgB;IAJlB,iBAuDC;IApDC,+BAAA,EAAA,sBAAsB;IACtB,0BAAA,EAAA,gBAAgB;IAEhB,IAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC;IAE9B,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,cAAc,IAAI,IAAI,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,IAAI,CAAC,UAAU,EAAE,SAAI,GAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACvE,KAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE/B,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAC7B,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,IAAI,OAAmC,CAAC;QAExC,KAAI,CAAC,KAAK;aACP,KAAK,CAAC,QAAQ,CAAC;aACf,IAAI,CAAC,UAAC,SAAS;YACd,SAAS,mCAAO,SAAS,SAAK,SAAS,OAAC,CAAC;YACzC,OAAO,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC,CAAC;aACD,KAAK,CAAC,UAAC,CAAC;YACP,aAAa;QACf,CAAC,CAAC,CAAC;QAEL,IAAM,eAAe,GAAG;YACtB,OAAO,CAAC,gBAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC;QAEF,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,KAAI,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAEpC,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC3B,SAAS,mCAAO,SAAS,SAAK,GAAG,CAAC,IAAI,OAAC,CAAC;gBAExC,IAAI,OAAO,EAAE;oBACX,YAAY,CAAC,OAAO,CAAC,CAAC;iBACvB;gBACD,OAAO,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;aAClD;QACH,CAAC,CAAC,CAAC;QAEH,SAAS;QACT,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,EAAE;YACN,GAAG,EAAE,QAAQ;YACb,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAvDD,kCAuDC"}

package/dist/toolDbSignIn.d.ts

@@ -1,3 +1,2 @@
 import ToolDb from "./tooldb";
-import { Account } from "web3-core";
-export default function toolDbSignIn(this: ToolDb, user: string, password: string): Promise<Account | undefined>;
+export default function toolDbSignIn(this: ToolDb, user: string, password: string): Promise<unknown | undefined>;

package/dist/toolDbSignIn.js

@@ -14,9 +14,12 @@ function toolDbSignIn(user, password) {
                 return;
             }
             try {
-                var newAccount = _this.decryptAccount(_user, (0, sha256_1.default)(password));
-                _this.setUser(newAccount, user || "Anonymous " + (0, randomAnimal_1.default)());
-                resolve(newAccount);
+                _this.userAccount
+                    .decryptAccount(_user, (0, sha256_1.default)(password))
+                    .then(function (newAccount) {
+                    _this.userAccount.setUser(newAccount, user || "Anonymous " + (0, randomAnimal_1.default)());
+                    resolve(_user);
+                });
             }
             catch (e) {
                 reject(e);

package/dist/toolDbSignIn.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbSignIn.js","sourceRoot":"","sources":["../src/toolDbSignIn.ts"],"names":[],"mappings":";;;;;AAIA,0DAAoC;AACpC,sEAAgD;AAEhD,SAAwB,YAAY,CAElC,IAAY,EACZ,QAAgB;IAHlB,iBAwBC;IAnBC,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,KAAI,CAAC,OAAO,CAA0B,OAAK,IAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAClE,UAAC,KAAK;YACJ,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,CAAC,qBAAqB,CAAC,CAAC;gBAC9B,OAAO;aACR;YAED,IAAI;gBACF,IAAM,UAAU,GAAG,KAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAA,gBAAM,EAAC,QAAQ,CAAC,CAAC,CAAC;gBAChE,KAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,IAAI,eAAa,IAAA,sBAAY,GAAI,CAAC,CAAC;gBAEhE,OAAO,CAAC,UAAU,CAAC,CAAC;aACrB;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAxBD,+BAwBC"}
+{"version":3,"file":"toolDbSignIn.js","sourceRoot":"","sources":["../src/toolDbSignIn.ts"],"names":[],"mappings":";;;;;AAEA,0DAAoC;AACpC,sEAAgD;AAEhD,SAAwB,YAAY,CAElC,IAAY,EACZ,QAAgB;IAHlB,iBA4BC;IAvBC,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,KAAI,CAAC,OAAO,CAAU,OAAK,IAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,KAAK;YACzD,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,CAAC,qBAAqB,CAAC,CAAC;gBAC9B,OAAO;aACR;YAED,IAAI;gBACF,KAAI,CAAC,WAAW;qBACb,cAAc,CAAC,KAAK,EAAE,IAAA,gBAAM,EAAC,QAAQ,CAAC,CAAC;qBACvC,IAAI,CAAC,UAAC,UAAU;oBACf,KAAI,CAAC,WAAW,CAAC,OAAO,CACtB,UAAU,EACV,IAAI,IAAI,eAAa,IAAA,sBAAY,GAAI,CACtC,CAAC;oBAEF,OAAO,CAAC,KAAK,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;aACN;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA5BD,+BA4BC"}

package/dist/toolDbSignUp.js

@@ -47,40 +47,44 @@ function toolDbSignUp(user, password) {
                     _this.getData(userRoot, false, 3000)
                         .then(function (data) {
                         if (data === null) {
-                            var account_1 = _this.createAccount();
-                            var userData_1 = _this.encryptAccount(account_1, (0, _1.sha256)(password));
-                            var timestamp_1 = new Date().getTime();
-                            var userDataString = "" + JSON.stringify(userData_1) + account_1.address + timestamp_1;
-                            (0, _1.proofOfWork)(userDataString, 0)
-                                .then(function (_a) {
-                                var hash = _a.hash, nonce = _a.nonce;
-                                var signature = _this.signData(hash, account_1.privateKey);
-                                var signupMessage = {
-                                    k: userRoot,
-                                    a: account_1.address,
-                                    n: nonce,
-                                    t: timestamp_1,
-                                    h: hash,
-                                    s: signature.signature,
-                                    v: userData_1,
-                                    c: null,
-                                };
-                                _this.store.put(userRoot, JSON.stringify(signupMessage), function (err, data) {
-                                    //
-                                });
-                                if (_this.options.debug) {
-                                    console.log("SIGNUP PUT > " + userRoot, signupMessage);
-                                }
-                                var finalMsg = {
-                                    type: "put",
-                                    id: (0, _1.textRandom)(10),
-                                    to: [],
-                                    data: signupMessage,
-                                };
-                                _this.network.sendToAll(finalMsg);
-                                resolve(finalMsg);
-                            })
-                                .catch(reject);
+                            var account_1 = new _this.options.userAdapter(_this);
+                            account_1.encryptAccount((0, _1.sha256)(password)).then(function (userData) {
+                                var timestamp = new Date().getTime();
+                                var userDataString = "" + JSON.stringify(userData) + account_1.getAddress() + timestamp;
+                                (0, _1.proofOfWork)(userDataString, 0)
+                                    .then(function (_a) {
+                                    var hash = _a.hash, nonce = _a.nonce;
+                                    account_1.signData(hash).then(function (signature) {
+                                        var signupMessage = {
+                                            k: userRoot,
+                                            a: account_1.getAddress() || "",
+                                            n: nonce,
+                                            t: timestamp,
+                                            h: hash,
+                                            s: signature,
+                                            v: userData,
+                                            c: null,
+                                        };
+                                        _this.logger("SIGNUP PUT", userRoot, signupMessage);
+                                        var finalMsg = {
+                                            type: "put",
+                                            id: (0, _1.textRandom)(10),
+                                            to: [],
+                                            data: signupMessage,
+                                        };
+                                        _this.network.sendToAll(finalMsg);
+                                        _this.store
+                                            .put(userRoot, JSON.stringify(signupMessage))
+                                            .catch(function (e) {
+                                            // do nothing
+                                        })
+                                            .finally(function () {
+                                            resolve(finalMsg);
+                                        });
+                                    });
+                                })
+                                    .catch(reject);
+                            });
                         }
                         else {
                             reject(new Error("User already exists!"));

package/dist/toolDbSignUp.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbSignUp.js","sourceRoot":"","sources":["../src/toolDbSignUp.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,sBAMW;AAEX,SAA8B,YAAY,CAExC,IAAY,EACZ,QAAgB;;;;;YAEV,QAAQ,GAAG,OAAK,IAAM,CAAC;YAC7B,sBAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;oBACjC,KAAI,CAAC,OAAO,CAA0B,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC;yBACzD,IAAI,CAAC,UAAC,IAAI;wBACT,IAAI,IAAI,KAAK,IAAI,EAAE;4BACjB,IAAM,SAAO,GAAG,KAAI,CAAC,aAAa,EAAE,CAAC;4BACrC,IAAM,UAAQ,GAAG,KAAI,CAAC,cAAc,CAAC,SAAO,EAAE,IAAA,SAAM,EAAC,QAAQ,CAAC,CAAC,CAAC;4BAEhE,IAAM,WAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;4BACvC,IAAM,cAAc,GAAG,KAAG,IAAI,CAAC,SAAS,CAAC,UAAQ,CAAC,GAChD,SAAO,CAAC,OAAO,GACd,WAAW,CAAC;4BAEf,IAAA,cAAW,EAAC,cAAc,EAAE,CAAC,CAAC;iCAC3B,IAAI,CAAC,UAAC,EAAe;oCAAb,IAAI,UAAA,EAAE,KAAK,WAAA;gCAClB,IAAM,SAAS,GAAG,KAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAO,CAAC,UAAU,CAAC,CAAC;gCAE1D,IAAM,aAAa,GAA8C;oCAC/D,CAAC,EAAE,QAAQ;oCACX,CAAC,EAAE,SAAO,CAAC,OAAO;oCAClB,CAAC,EAAE,KAAK;oCACR,CAAC,EAAE,WAAS;oCACZ,CAAC,EAAE,IAAI;oCACP,CAAC,EAAE,SAAS,CAAC,SAAS;oCACtB,CAAC,EAAE,UAAQ;oCACX,CAAC,EAAE,IAAI;iCACR,CAAC;gCAEF,KAAI,CAAC,KAAK,CAAC,GAAG,CACZ,QAAQ,EACR,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAC7B,UAAC,GAAG,EAAE,IAAI;oCACR,EAAE;gCACJ,CAAC,CACF,CAAC;gCAEF,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oCACtB,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,QAAQ,EAAE,aAAa,CAAC,CAAC;iCACxD;gCAED,IAAM,QAAQ,GAAG;oCACf,IAAI,EAAE,KAAK;oCACX,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC;oCAClB,EAAE,EAAE,EAAE;oCACN,IAAI,EAAE,aAAa;iCACN,CAAC;gCAEhB,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gCACjC,OAAO,CAAC,QAAQ,CAAC,CAAC;4BACpB,CAAC,CAAC;iCACD,KAAK,CAAC,MAAM,CAAC,CAAC;yBAClB;6BAAM;4BACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;yBAC3C;oBACH,CAAC,CAAC;yBACD,KAAK,CAAC;wBACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;oBAC5C,CAAC,CAAC,CAAC;gBACP,CAAC,CAAC,EAAC;;;CACJ;AAhED,+BAgEC"}
+{"version":3,"file":"toolDbSignUp.js","sourceRoot":"","sources":["../src/toolDbSignUp.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,sBAMW;AAEX,SAA8B,YAAY,CAExC,IAAY,EACZ,QAAgB;;;;;YAEV,QAAQ,GAAG,OAAK,IAAM,CAAC;YAC7B,sBAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;oBACjC,KAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC;yBAChC,IAAI,CAAC,UAAC,IAAI;wBACT,IAAI,IAAI,KAAK,IAAI,EAAE;4BACjB,IAAM,SAAO,GAAG,IAAI,KAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAI,CAAC,CAAC;4BACnD,SAAO,CAAC,cAAc,CAAC,IAAA,SAAM,EAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;gCACrD,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;gCACvC,IAAM,cAAc,GAAG,KAAG,IAAI,CAAC,SAAS,CACtC,QAAQ,CACT,GAAG,SAAO,CAAC,UAAU,EAAE,GAAG,SAAW,CAAC;gCAEvC,IAAA,cAAW,EAAC,cAAc,EAAE,CAAC,CAAC;qCAC3B,IAAI,CAAC,UAAC,EAAe;wCAAb,IAAI,UAAA,EAAE,KAAK,WAAA;oCAClB,SAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,SAAS;wCACpC,IAAM,aAAa,GAAqB;4CACtC,CAAC,EAAE,QAAQ;4CACX,CAAC,EAAE,SAAO,CAAC,UAAU,EAAE,IAAI,EAAE;4CAC7B,CAAC,EAAE,KAAK;4CACR,CAAC,EAAE,SAAS;4CACZ,CAAC,EAAE,IAAI;4CACP,CAAC,EAAE,SAAS;4CACZ,CAAC,EAAE,QAAQ;4CACX,CAAC,EAAE,IAAI;yCACR,CAAC;wCAEF,KAAI,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;wCAEnD,IAAM,QAAQ,GAAG;4CACf,IAAI,EAAE,KAAK;4CACX,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC;4CAClB,EAAE,EAAE,EAAE;4CACN,IAAI,EAAE,aAAa;yCACN,CAAC;wCAEhB,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;wCACjC,KAAI,CAAC,KAAK;6CACP,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;6CAC5C,KAAK,CAAC,UAAC,CAAC;4CACP,aAAa;wCACf,CAAC,CAAC;6CACD,OAAO,CAAC;4CACP,OAAO,CAAC,QAAQ,CAAC,CAAC;wCACpB,CAAC,CAAC,CAAC;oCACP,CAAC,CAAC,CAAC;gCACL,CAAC,CAAC;qCACD,KAAK,CAAC,MAAM,CAAC,CAAC;4BACnB,CAAC,CAAC,CAAC;yBACJ;6BAAM;4BACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;yBAC3C;oBACH,CAAC,CAAC;yBACD,KAAK,CAAC;wBACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;oBAC5C,CAAC,CAAC,CAAC;gBACP,CAAC,CAAC,EAAC;;;CACJ;AA7DD,+BA6DC"}

package/dist/toolDbSubscribe.d.ts

@@ -2,7 +2,8 @@ import ToolDb from "./tooldb";
 /**
  * Subscribe to all PUT updates for this key.
  * @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 address 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>
  */
 export default function toolDbSubscribe(this: ToolDb, key: string, userNamespaced?: boolean): Promise<void>;

package/dist/toolDbSubscribe.js

@@ -4,40 +4,46 @@ var _1 = require(".");
 /**
  * Subscribe to all PUT updates for this key.
  * @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 address 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>
  */
 function toolDbSubscribe(key, userNamespaced) {
     var _this = this;
     if (userNamespaced === void 0) { userNamespaced = false; }
     return new Promise(function (resolve, reject) {
-        if (userNamespaced && _this.getAddress() === undefined) {
+        if (userNamespaced && _this.userAccount.getAddress() === undefined) {
             reject(new Error("You are not authorized yet!"));
             return;
         }
-        var finalKey = userNamespaced ? ":" + _this.getAddress() + "." + key : key;
-        if (_this.options.debug) {
-            console.log("Subscribe > " + finalKey);
-        }
+        var finalKey = userNamespaced
+            ? ":" + _this.userAccount.getAddress() + "." + key
+            : key;
+        _this.logger("SUBSCRIBE", finalKey);
         var msgId = (0, _1.textRandom)(10);
-        _this.store.get(finalKey, function (err, data) {
-            if (data) {
-                try {
-                    var message = JSON.parse(data);
-                    _this.triggerKeyListener(finalKey, message);
-                }
-                catch (e) {
-                    // do nothing
-                }
-            }
-        });
         _this.network.sendToAll({
             type: "subscribe",
             key: finalKey,
             to: [],
             id: msgId,
         });
-        resolve();
+        _this.store
+            .get(finalKey)
+            .then(function (data) {
+            try {
+                var message = JSON.parse(data);
+                _this.triggerKeyListener(finalKey, message);
+            }
+            catch (e) {
+                // do nothing
+            }
+        })
+            .catch(function (e) {
+            // do nothing
+        })
+            .finally(function () {
+            resolve();
+        });
     });
 }
 exports.default = toolDbSubscribe;

package/dist/toolDbSubscribe.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbSubscribe.js","sourceRoot":"","sources":["../src/toolDbSubscribe.ts"],"names":[],"mappings":";;AAAA,sBAA+B;AAG/B;;;;;GAKG;AACH,SAAwB,eAAe,CAErC,GAAW,EACX,cAAsB;IAHxB,iBAqCC;IAlCC,+BAAA,EAAA,sBAAsB;IAEtB,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,cAAc,GAAG,QAAQ,CAAC,CAAC;SACxC;QAED,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAE7B,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI;YACjC,IAAI,IAAI,EAAE;gBACR,IAAI;oBACF,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACjC,KAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAC5C;gBAAC,OAAO,CAAC,EAAE;oBACV,aAAa;iBACd;aACF;QACH,CAAC,CAAC,CAAC;QAEH,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,QAAQ;YACb,EAAE,EAAE,EAAE;YACN,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;QAEH,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC;AArCD,kCAqCC"}
+{"version":3,"file":"toolDbSubscribe.js","sourceRoot":"","sources":["../src/toolDbSubscribe.ts"],"names":[],"mappings":";;AAAA,sBAA+B;AAG/B;;;;;;GAMG;AACH,SAAwB,eAAe,CAErC,GAAW,EACX,cAAsB;IAHxB,iBA2CC;IAxCC,+BAAA,EAAA,sBAAsB;IAEtB,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,cAAc,IAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,KAAK,SAAS,EAAE;YACjE,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;YACjD,OAAO;SACR;QAED,IAAM,QAAQ,GAAG,cAAc;YAC7B,CAAC,CAAC,MAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAI,GAAK;YAC5C,CAAC,CAAC,GAAG,CAAC;QAER,KAAI,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAEnC,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAE7B,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,QAAQ;YACb,EAAE,EAAE,EAAE;YACN,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;QAEH,KAAI,CAAC,KAAK;aACP,GAAG,CAAC,QAAQ,CAAC;aACb,IAAI,CAAC,UAAC,IAAI;YACT,IAAI;gBACF,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACjC,KAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;aAC5C;YAAC,OAAO,CAAC,EAAE;gBACV,aAAa;aACd;QACH,CAAC,CAAC;aACD,KAAK,CAAC,UAAC,CAAC;YACP,aAAa;QACf,CAAC,CAAC;aACD,OAAO,CAAC;YACP,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACL,CAAC;AA3CD,kCA2CC"}

package/dist/toolDbVerificationWrapper.js

@@ -50,19 +50,24 @@ function toolDbVerificationWrapper(data) {
                     this._customVerificator.forEach(function (listener) {
                         if (listener && data.k && data.k.startsWith(listener.key)) {
                             skipCustom_1 = false;
+                            var previousData_1 = undefined;
                             // Get the previously stored value of this key
-                            _this.store.get(data.k, function (err, prev) {
-                                var previousData = undefined;
-                                if (prev) {
-                                    try {
-                                        previousData = JSON.parse(prev);
-                                    }
-                                    catch (e) {
-                                        // do nothing
-                                    }
+                            _this.store
+                                .get(data.k)
+                                .then(function (prev) {
+                                try {
+                                    previousData_1 = JSON.parse(prev);
+                                }
+                                catch (e) {
+                                    // do nothing
                                 }
+                            })
+                                .catch(function (e) {
+                                // do nothing
+                            })
+                                .finally(function () {
                                 listener
-                                    .fn(data, previousData)
+                                    .fn(data, previousData_1)
                                     .then(function (verified) {
                                     if (verified) {
                                         resolve(_1.VerifyResult.Verified);

package/dist/toolDbVerificationWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbVerificationWrapper.js","sourceRoot":"","sources":["../src/toolDbVerificationWrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sBAA2D;AAE3D,SAAwB,yBAAyB,CAE/C,IAA2B;IAF7B,iBAgDC;IA5CC,gFAAgF;IAChF,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO;QACzB,KAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAO,QAAQ;;;;gBAC7D,IAAI,QAAQ,EAAE;oBACR,eAAa,IAAI,CAAC;oBACtB,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAC,QAAQ;wBACvC,IAAI,QAAQ,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;4BACzD,YAAU,GAAG,KAAK,CAAC;4BAEnB,8CAA8C;4BAC9C,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,UAAC,GAAG,EAAE,IAAI;gCAC/B,IAAI,YAAY,GAAG,SAAS,CAAC;gCAC7B,IAAI,IAAI,EAAE;oCACR,IAAI;wCACF,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;qCACjC;oCAAC,OAAO,CAAC,EAAE;wCACV,aAAa;qCACd;iCACF;gCAED,QAAQ;qCACL,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC;qCACtB,IAAI,CAAC,UAAC,QAAiB;oCACtB,IAAI,QAAQ,EAAE;wCACZ,OAAO,CAAC,eAAY,CAAC,QAAQ,CAAC,CAAC;qCAChC;yCAAM;wCACL,OAAO,CAAC,eAAY,CAAC,wBAAwB,CAAC,CAAC;qCAChD;gCACH,CAAC,CAAC;qCACD,KAAK,CAAC,UAAC,CAAC;oCACP,OAAO,CAAC,eAAY,CAAC,wBAAwB,CAAC,CAAC;gCACjD,CAAC,CAAC,CAAC;4BACP,CAAC,CAAC,CAAC;yBACJ;oBACH,CAAC,CAAC,CAAC;oBAEH,IAAI,YAAU,EAAE;wBACd,OAAO,CAAC,QAAQ,CAAC,CAAC;qBACnB;iBACF;qBAAM;oBACL,OAAO,CAAC,eAAY,CAAC,mBAAmB,CAAC,CAAC;iBAC3C;;;aACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAhDD,4CAgDC"}
+{"version":3,"file":"toolDbVerificationWrapper.js","sourceRoot":"","sources":["../src/toolDbVerificationWrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sBAA2D;AAE3D,SAAwB,yBAAyB,CAE/C,IAA2B;IAF7B,iBAoDC;IAhDC,gFAAgF;IAChF,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO;QACzB,KAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAO,QAAQ;;;;gBAC7D,IAAI,QAAQ,EAAE;oBACR,eAAa,IAAI,CAAC;oBACtB,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAC,QAAQ;wBACvC,IAAI,QAAQ,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;4BACzD,YAAU,GAAG,KAAK,CAAC;4BAEnB,IAAI,cAAY,GAAQ,SAAS,CAAC;4BAClC,8CAA8C;4BAC9C,KAAI,CAAC,KAAK;iCACP,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;iCACX,IAAI,CAAC,UAAC,IAAI;gCACT,IAAI;oCACF,cAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;iCACjC;gCAAC,OAAO,CAAC,EAAE;oCACV,aAAa;iCACd;4BACH,CAAC,CAAC;iCACD,KAAK,CAAC,UAAC,CAAC;gCACP,aAAa;4BACf,CAAC,CAAC;iCACD,OAAO,CAAC;gCACP,QAAQ;qCACL,EAAE,CAAC,IAAI,EAAE,cAAY,CAAC;qCACtB,IAAI,CAAC,UAAC,QAAiB;oCACtB,IAAI,QAAQ,EAAE;wCACZ,OAAO,CAAC,eAAY,CAAC,QAAQ,CAAC,CAAC;qCAChC;yCAAM;wCACL,OAAO,CAAC,eAAY,CAAC,wBAAwB,CAAC,CAAC;qCAChD;gCACH,CAAC,CAAC;qCACD,KAAK,CAAC,UAAC,CAAC;oCACP,OAAO,CAAC,eAAY,CAAC,wBAAwB,CAAC,CAAC;gCACjD,CAAC,CAAC,CAAC;4BACP,CAAC,CAAC,CAAC;yBACN;oBACH,CAAC,CAAC,CAAC;oBAEH,IAAI,YAAU,EAAE;wBACd,OAAO,CAAC,QAAQ,CAAC,CAAC;qBACnB;iBACF;qBAAM;oBACL,OAAO,CAAC,eAAY,CAAC,mBAAmB,CAAC,CAAC;iBAC3C;;;aACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AApDD,4CAoDC"}

package/dist/toolDbWeb3User.d.ts

@@ -0,0 +1,20 @@
+import w3 from "web3";
+import { EncryptedKeystoreV3Json, Account } from "web3-core";
+import ToolDb from "./tooldb";
+import { VerificationData } from "./types/message";
+import { ToolDbUserAdapter } from "./types/tooldb";
+export default class ToolDbWeb3User extends ToolDbUserAdapter {
+    web3: w3;
+    private _user;
+    private _userName;
+    constructor(db: ToolDb);
+    anonUser(): void;
+    setUser(account: Account, name: string): void;
+    signData(data: string): string;
+    verifySignature(message: Partial<VerificationData<any>>): boolean;
+    getAccountFromPrivate(privateKey: string): Account;
+    encryptAccount(password: string): EncryptedKeystoreV3Json;
+    decryptAccount(acc: EncryptedKeystoreV3Json, password: string): Account;
+    getAddress(): string;
+    getUsername(): string;
+}

package/dist/toolDbWeb3User.js

@@ -0,0 +1,75 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var web3_1 = __importDefault(require("web3"));
+var tooldb_1 = require("./types/tooldb");
+var randomAnimal_1 = __importDefault(require("./utils/randomAnimal"));
+var ToolDbWeb3User = /** @class */ (function (_super) {
+    __extends(ToolDbWeb3User, _super);
+    function ToolDbWeb3User(db) {
+        var _this = _super.call(this, db) || this;
+        _this.web3 = new web3_1.default(web3_1.default.givenProvider);
+        _this._user = _this.web3.eth.accounts.create();
+        _this._userName = (0, randomAnimal_1.default)();
+        return _this;
+    }
+    ToolDbWeb3User.prototype.anonUser = function () {
+        this._user = this.web3.eth.accounts.create();
+        this._userName = (0, randomAnimal_1.default)();
+    };
+    ToolDbWeb3User.prototype.setUser = function (account, name) {
+        this._user = account;
+        this._userName = name;
+    };
+    ToolDbWeb3User.prototype.signData = function (data) {
+        var signature = this.web3.eth.accounts.sign(data, this._user.privateKey);
+        return signature.signature;
+    };
+    ToolDbWeb3User.prototype.verifySignature = function (message) {
+        if (!message.h || !message.s)
+            return false;
+        var address = this.web3.eth.accounts.recover(message.h, message.s);
+        return address === message.a;
+    };
+    ToolDbWeb3User.prototype.getAccountFromPrivate = function (privateKey) {
+        return this.web3.eth.accounts.privateKeyToAccount(privateKey);
+    };
+    ToolDbWeb3User.prototype.encryptAccount = function (password) {
+        return this._user.encrypt(password);
+    };
+    ToolDbWeb3User.prototype.decryptAccount = function (acc, password) {
+        try {
+            var newAccount = this.web3.eth.accounts.decrypt(acc, password);
+            return newAccount;
+        }
+        catch (e) {
+            throw e;
+        }
+    };
+    ToolDbWeb3User.prototype.getAddress = function () {
+        return this._user.address;
+    };
+    ToolDbWeb3User.prototype.getUsername = function () {
+        return this._userName;
+    };
+    return ToolDbWeb3User;
+}(tooldb_1.ToolDbUserAdapter));
+exports.default = ToolDbWeb3User;
+//# sourceMappingURL=toolDbWeb3User.js.map

package/dist/toolDbWeb3User.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toolDbWeb3User.js","sourceRoot":"","sources":["../src/toolDbWeb3User.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,8CAAsB;AAMtB,yCAAmD;AACnD,sEAAgD;AAEhD;IAA4C,kCAAiB;IAM3D,wBAAY,EAAU;QAAtB,YACE,kBAAM,EAAE,CAAC,SAIV;QAHC,KAAI,CAAC,IAAI,GAAG,IAAI,cAAE,CAAC,cAAE,CAAC,aAAa,CAAC,CAAC;QACrC,KAAI,CAAC,KAAK,GAAG,KAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC7C,KAAI,CAAC,SAAS,GAAG,IAAA,sBAAY,GAAE,CAAC;;IAClC,CAAC;IAEM,iCAAQ,GAAf;QACE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,IAAA,sBAAY,GAAE,CAAC;IAClC,CAAC;IAEM,gCAAO,GAAd,UAAe,OAAgB,EAAE,IAAY;QAC3C,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAEM,iCAAQ,GAAf,UAAgB,IAAY;QAC1B,IAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAE3E,OAAO,SAAS,CAAC,SAAS,CAAC;IAC7B,CAAC;IAEM,wCAAe,GAAtB,UAAuB,OAAuC;QAC5D,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QAE3C,IAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACrE,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC;IAC/B,CAAC;IAEM,8CAAqB,GAA5B,UAA6B,UAAkB;QAC7C,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAChE,CAAC;IAEM,uCAAc,GAArB,UAAsB,QAAgB;QACpC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAEM,uCAAc,GAArB,UAAsB,GAA4B,EAAE,QAAgB;QAClE,IAAI;YACF,IAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACjE,OAAO,UAAU,CAAC;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAEM,mCAAU,GAAjB;QACE,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;IAC5B,CAAC;IAEM,oCAAW,GAAlB;QACE,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IACH,qBAAC;AAAD,CAAC,AA5DD,CAA4C,0BAAiB,GA4D5D"}

package/dist/toolDbWebrtc.d.ts

@@ -1,17 +1,6 @@
-import { ToolDbMessage } from ".";
-import { ToolDbNetworkAdapter, ToolDbOptions } from "./types/tooldb";
 import ToolDb from "./tooldb";
-import WebSocket from "ws";
-export declare type ToolDbWebSocket = WebSocket & {
-    toolDbId?: string;
-    isServer: boolean;
-    origUrl: string;
-};
-interface WebrtcAdapterOptions {
-    wrtc?: any;
-}
+import ToolDbNetworkAdapter from "./toolDbNetworkAdapter";
 export default class toolDbWebrtc extends ToolDbNetworkAdapter {
-    private _tooldb;
     private wnd;
     private wss;
     private sockets;
@@ -19,6 +8,7 @@ export default class toolDbWebrtc extends ToolDbNetworkAdapter {
     private peerMap;
     private connectedPeers;
     private onDisconnect;
+    private peersCheck;
     private announceInterval;
     /**
      * Initialize webrtc peer
@@ -66,10 +56,4 @@ export default class toolDbWebrtc extends ToolDbNetworkAdapter {
     onLeave: () => Promise<void>;
     constructor(db: ToolDb);
     close(clientId: string): void;
-    sendToAll(msg: ToolDbMessage, crossServerOnly?: boolean, isRelay?: boolean): void;
-    sendToClientId(clientId: string, msg: ToolDbMessage): void;
-    get tooldb(): ToolDb & {
-        options: ToolDbOptions & WebrtcAdapterOptions;
-    };
 }
-export {};