tool-db 2.1.0 → 2.2.0

package/dist/toolDbNetworkAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toolDbNetworkAdapter.js","sourceRoot":"","sources":["../src/toolDbNetworkAdapter.ts"],"names":[],"mappings":"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"}

package/dist/toolDbPut.js

@@ -21,29 +21,29 @@ 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 signature = _this.userAccount.signData(hash);
+            if (signature && _this.userAccount.getAddress()) {
                 var finalKey = userNamespaced
-                    ? ":" + _this.getAddress() + "." + key
+                    ? ":" + _this.userAccount.getAddress() + "." + key
                     : key;
                 // Compose the message
                 var data = {
                     k: finalKey,
-                    a: _this.getAddress() || "",
+                    a: _this.userAccount.getAddress() || "",
                     n: nonce,
                     t: timestamp,
                     h: hash,
-                    s: signature.signature,
+                    s: signature,
                     v: value,
                     c: null,
                 };

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,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,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,IAAM,SAAS,GAAG,KAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClD,IAAI,SAAS,IAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE;gBAC9C,IAAM,QAAQ,GAAG,cAAc;oBAC7B,CAAC,CAAC,MAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAI,GAAK;oBAC5C,CAAC,CAAC,GAAG,CAAC;gBACR,sBAAsB;gBACtB,IAAM,IAAI,GAAqB;oBAC7B,CAAC,EAAE,QAAQ;oBACX,CAAC,EAAE,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE;oBACtC,CAAC,EAAE,KAAK;oBACR,CAAC,EAAE,SAAS;oBACZ,CAAC,EAAE,IAAI;oBACP,CAAC,EAAE,SAAS;oBACZ,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"}

package/dist/toolDbQueryKeys.js

@@ -24,12 +24,13 @@ 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;
+        var finalKey = userNamespaced ? ":" + user.getAddress() + "." + key : key;
         if (_this.options.debug) {
             console.log("QUERY > " + finalKey);
         }

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,iBAqDC;IAlDC,+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,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;AArDD,kCAqDC"}

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,8 +14,8 @@ function toolDbSignIn(user, password) {
                 return;
             }
             try {
-                var newAccount = _this.web3.eth.accounts.decrypt(_user, (0, sha256_1.default)(password));
-                _this.setUser(newAccount, user || "Anonymous " + (0, randomAnimal_1.default)());
+                var newAccount = _this.userAccount.decryptAccount(_user, (0, sha256_1.default)(password));
+                _this.userAccount.setUser(newAccount, user || "Anonymous " + (0, randomAnimal_1.default)());
                 resolve(newAccount);
             }
             catch (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,iBA2BC;IAtBC,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,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAC/C,KAAK,EACL,IAAA,gBAAM,EAAC,QAAQ,CAAC,CACjB,CAAC;gBACF,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;AA3BD,+BA2BC"}
+{"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,IAAM,UAAU,GAAG,KAAI,CAAC,WAAW,CAAC,cAAc,CAChD,KAAK,EACL,IAAA,gBAAM,EAAC,QAAQ,CAAC,CACjB,CAAC;gBACF,KAAI,CAAC,WAAW,CAAC,OAAO,CACtB,UAAU,EACV,IAAI,IAAI,eAAa,IAAA,sBAAY,GAAI,CACtC,CAAC;gBAEF,OAAO,CAAC,UAAU,CAAC,CAAC;aACrB;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,45 +47,40 @@ function toolDbSignUp(user, password) {
                     _this.getData(userRoot, false, 3000)
                         .then(function (data) {
                         if (data === null) {
-                            var account_1 = _this.web3.eth.accounts.create();
-                            var iv = (0, _1.generateIv)();
-                            (0, _1.encryptWithPass)(account_1.privateKey, password, iv).then(function (encryptedPrivateKey) {
-                                if (encryptedPrivateKey) {
-                                    var userData_1 = account_1.encrypt((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.web3.eth.accounts.sign(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);
+                            var userData_1 = account_1.encryptAccount((0, _1.sha256)(password));
+                            var timestamp_1 = new Date().getTime();
+                            var userDataString = "" + JSON.stringify(userData_1) + account_1.getAddress() + timestamp_1;
+                            (0, _1.proofOfWork)(userDataString, 0)
+                                .then(function (_a) {
+                                var hash = _a.hash, nonce = _a.nonce;
+                                var signature = account_1.signData(hash);
+                                var signupMessage = {
+                                    k: userRoot,
+                                    a: account_1.getAddress() || "",
+                                    n: nonce,
+                                    t: timestamp_1,
+                                    h: hash,
+                                    s: 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);
                         }
                         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,sBAQW;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,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;4BAChD,IAAM,EAAE,GAAG,IAAA,aAAU,GAAE,CAAC;4BACxB,IAAA,kBAAe,EAAC,SAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,CACpD,UAAC,mBAAmB;gCAClB,IAAI,mBAAmB,EAAE;oCACvB,IAAM,UAAQ,GAAG,SAAO,CAAC,OAAO,CAAC,IAAA,SAAM,EAAC,QAAQ,CAAC,CAAC,CAAC;oCAEnD,IAAM,WAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;oCACvC,IAAM,cAAc,GAAG,KAAG,IAAI,CAAC,SAAS,CAAC,UAAQ,CAAC,GAChD,SAAO,CAAC,OAAO,GACd,WAAW,CAAC;oCAEf,IAAA,cAAW,EAAC,cAAc,EAAE,CAAC,CAAC;yCAC3B,IAAI,CAAC,UAAC,EAAe;4CAAb,IAAI,UAAA,EAAE,KAAK,WAAA;wCAClB,IAAM,SAAS,GAAG,KAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAC3C,IAAI,EACJ,SAAO,CAAC,UAAU,CACnB,CAAC;wCAEF,IAAM,aAAa,GACjB;4CACE,CAAC,EAAE,QAAQ;4CACX,CAAC,EAAE,SAAO,CAAC,OAAO;4CAClB,CAAC,EAAE,KAAK;4CACR,CAAC,EAAE,WAAS;4CACZ,CAAC,EAAE,IAAI;4CACP,CAAC,EAAE,SAAS,CAAC,SAAS;4CACtB,CAAC,EAAE,UAAQ;4CACX,CAAC,EAAE,IAAI;yCACR,CAAC;wCAEJ,KAAI,CAAC,KAAK,CAAC,GAAG,CACZ,QAAQ,EACR,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAC7B,UAAC,GAAG,EAAE,IAAI;4CACR,EAAE;wCACJ,CAAC,CACF,CAAC;wCAEF,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;4CACtB,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,QAAQ,EAAE,aAAa,CAAC,CAAC;yCACxD;wCAED,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,OAAO,CAAC,QAAQ,CAAC,CAAC;oCACpB,CAAC,CAAC;yCACD,KAAK,CAAC,MAAM,CAAC,CAAC;iCAClB;4BACH,CAAC,CACF,CAAC;yBACH;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;AA3ED,+BA2EC"}
+{"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,IAAI,KAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAI,CAAC,CAAC;4BACnD,IAAM,UAAQ,GAAG,SAAO,CAAC,cAAc,CAAC,IAAA,SAAM,EAAC,QAAQ,CAAC,CAAC,CAAC;4BAE1D,IAAM,WAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;4BACvC,IAAM,cAAc,GAAG,KAAG,IAAI,CAAC,SAAS,CACtC,UAAQ,CACT,GAAG,SAAO,CAAC,UAAU,EAAE,GAAG,WAAW,CAAC;4BAEvC,IAAA,cAAW,EAAC,cAAc,EAAE,CAAC,CAAC;iCAC3B,IAAI,CAAC,UAAC,EAAe;oCAAb,IAAI,UAAA,EAAE,KAAK,WAAA;gCAClB,IAAM,SAAS,GAAG,SAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gCAEzC,IAAM,aAAa,GAA8C;oCAC/D,CAAC,EAAE,QAAQ;oCACX,CAAC,EAAE,SAAO,CAAC,UAAU,EAAE,IAAI,EAAE;oCAC7B,CAAC,EAAE,KAAK;oCACR,CAAC,EAAE,WAAS;oCACZ,CAAC,EAAE,IAAI;oCACP,CAAC,EAAE,SAAS;oCACZ,CAAC,EAAE,UAAe;oCAClB,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"}

package/dist/toolDbSubscribe.js

@@ -11,11 +11,13 @@ 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;
+        var finalKey = userNamespaced
+            ? ":" + _this.userAccount.getAddress() + "." + key
+            : key;
         if (_this.options.debug) {
             console.log("Subscribe > " + finalKey);
         }

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;;;;;GAKG;AACH,SAAwB,eAAe,CAErC,GAAW,EACX,cAAsB;IAHxB,iBAuCC;IApCC,+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;QACD,IAAM,QAAQ,GAAG,cAAc;YAC7B,CAAC,CAAC,MAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAI,GAAK;YAC5C,CAAC,CAAC,GAAG,CAAC;QACR,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;AAvCD,kCAuCC"}

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,12 @@
-import { ToolDbMessage } from ".";
-import { ToolDbNetworkAdapter, ToolDbOptions } from "./types/tooldb";
 import ToolDb from "./tooldb";
 import WebSocket from "ws";
+import ToolDbNetworkAdapter from "./toolDbNetworkAdapter";
 export declare type ToolDbWebSocket = WebSocket & {
     toolDbId?: string;
     isServer: boolean;
     origUrl: string;
 };
-interface WebrtcAdapterOptions {
-    wrtc?: any;
-}
 export default class toolDbWebrtc extends ToolDbNetworkAdapter {
-    private _tooldb;
     private wnd;
     private wss;
     private sockets;
@@ -19,6 +14,7 @@ export default class toolDbWebrtc extends ToolDbNetworkAdapter {
     private peerMap;
     private connectedPeers;
     private onDisconnect;
+    private peersCheck;
     private announceInterval;
     /**
      * Initialize webrtc peer
@@ -66,10 +62,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 {};

package/dist/toolDbWebrtc.js

@@ -61,24 +61,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var lodash_1 = __importDefault(require("lodash"));
 var simple_peer_1 = __importDefault(require("simple-peer"));
 var _1 = require(".");
-var tooldb_1 = require("./types/tooldb");
 var ws_1 = __importDefault(require("ws"));
+var toolDbNetworkAdapter_1 = __importDefault(require("./toolDbNetworkAdapter"));
 var offerPoolSize = 5;
 var maxPeers = 4;
 var announceSecs = 30;
@@ -120,7 +110,7 @@ var toolDbWebrtc = /** @class */ (function (_super) {
         _this.initPeer = function (initiator, trickle, rtcConfig // RTCConfiguration
         ) {
             var peer = new simple_peer_1.default({
-                wrtc: _this._tooldb.options.wrtc,
+                wrtc: _this.tooldb.options.wrtc,
                 initiator: initiator,
                 trickle: trickle,
                 config: rtcConfig,
@@ -160,27 +150,20 @@ var toolDbWebrtc = /** @class */ (function (_super) {
                 _this.peerMap[id].destroy();
                 delete _this.peerMap[id];
             }
+            var clientId = null;
             // console.log("onPeerConnect", id);
             var onData = function (data) {
                 var str = new TextDecoder().decode(data);
-                try {
-                    var msg = JSON.parse(str);
-                    if (msg.type !== "servers" &&
-                        msg.type !== "join" &&
-                        msg.type !== "pong") {
-                        _this.tooldb.clientOnMessage(msg, id);
-                    }
-                    if (msg.type === "pong" || msg.type === "ping") {
-                        if (_this.tooldb.isConnected) {
-                            _this.tooldb.onConnect();
-                            _this.tooldb.isConnected = true;
-                        }
-                        _this.tooldb.onPeerConnect(id);
-                    }
-                }
-                catch (e) {
-                    //
-                }
+                _this.onClientMessage(str, clientId || "", function (id) {
+                    clientId = id;
+                    // Set this socket's functions on the adapter
+                    _this.isClientConnected[id] = function () {
+                        return peer.connected;
+                    };
+                    _this.clientToSend[id] = function (_msg) {
+                        peer.send(_msg);
+                    };
+                });
             };
             _this.peerMap[id] = peer;
             peer.on("data", onData);
@@ -188,9 +171,9 @@ var toolDbWebrtc = /** @class */ (function (_super) {
             peer.on("error", function (err) { return _this.onDisconnect(id, err); });
             peer.send(JSON.stringify({
                 type: "ping",
-                clientId: _this._tooldb.options.peerAccount.address,
-                to: [_this._tooldb.options.peerAccount.address],
-                isServer: _this._tooldb.options.server,
+                clientId: _this.getClientAddress(),
+                to: [_this.getClientAddress()],
+                isServer: _this.tooldb.options.server,
                 id: (0, _1.textRandom)(10),
             }));
         };
@@ -274,7 +257,7 @@ var toolDbWebrtc = /** @class */ (function (_super) {
                             action: "announce",
                             info_hash: infoHash,
                             numwant: offerPoolSize,
-                            peer_id: this.tooldb.options.peerAccount.address.slice(-20)
+                            peer_id: this.getClientAddress()
                         };
                         return [4 /*yield*/, Promise.all(Object.entries(this.offerPool).map(function (_a) {
                                 var id = _a[0], offerP = _a[1].offerP;
@@ -353,8 +336,7 @@ var toolDbWebrtc = /** @class */ (function (_super) {
                     // console.warn("Info hash mismatch");
                     return [2 /*return*/];
                 }
-                if (val.peer_id &&
-                    val.peer_id === this.tooldb.options.peerAccount.address.slice(-20)) {
+                if (val.peer_id && val.peer_id === this.getClientAddress()) {
                     // console.warn("Peer ids mismatch", val.peer_id, selfId);
                     return [2 /*return*/];
                 }
@@ -378,7 +360,7 @@ var toolDbWebrtc = /** @class */ (function (_super) {
                             answer: answer,
                             action: "announce",
                             info_hash: _this.infoHash,
-                            peer_id: _this.tooldb.options.peerAccount.address.slice(-20),
+                            peer_id: _this.getClientAddress(),
                             to_peer_id: val.peer_id,
                             offer_id: val.offer_id,
                         }));
@@ -424,8 +406,8 @@ var toolDbWebrtc = /** @class */ (function (_super) {
                 return [2 /*return*/];
             });
         }); };
-        _this._tooldb = db;
         _this.announceInterval = setInterval(_this.announceAll, announceSecs * 1000);
+        setInterval(function () { return _this.peersCheck(); }, 100);
         // Stop announcing after maxAnnounceSecs
         var intervalStart = new Date().getTime();
         var checkInterval = setInterval(function () {
@@ -445,80 +427,63 @@ var toolDbWebrtc = /** @class */ (function (_super) {
                 _this.cleanPool();
             }
         }
+        // Basically the same as the WS network adapter
+        if (_this.tooldb.options.server) {
+            var server = new ws_1.default.Server({
+                port: _this.tooldb.options.port,
+                server: _this.tooldb.options.httpServer,
+            });
+            server.on("connection", function (socket) {
+                var clientId = null;
+                socket.on("close", function () {
+                    if (clientId) {
+                        _this.onClientDisconnect(clientId);
+                    }
+                });
+                socket.on("error", function () {
+                    if (clientId) {
+                        _this.onClientDisconnect(clientId);
+                    }
+                });
+                socket.on("message", function (message) {
+                    _this.onClientMessage(message, clientId || "", function (id) {
+                        clientId = id;
+                        _this.isClientConnected[id] = function () {
+                            return socket.readyState === socket.OPEN;
+                        };
+                        _this.clientToSend[id] = function (_msg) {
+                            socket.send(_msg);
+                        };
+                    });
+                });
+            });
+        }
         return _this;
     }
-    toolDbWebrtc.prototype.close = function (clientId) {
-        //
-    };
-    toolDbWebrtc.prototype.sendToAll = function (msg, crossServerOnly, isRelay) {
-        // if (this.tooldb.options.debug) {
-        // console.log("> sendToAll", msg);
-        // }
+    toolDbWebrtc.prototype.peersCheck = function () {
         var _this = this;
-        if (crossServerOnly === void 0) { crossServerOnly = false; }
-        if (isRelay === void 0) { isRelay = false; }
-        var to = lodash_1.default.uniq(__spreadArray(__spreadArray([], msg.to, true), [
-            this.tooldb.options.peerAccount.address.slice(-20),
-        ], false));
-        Object.keys(this.peerMap)
-            .filter(function (id) { return !to.includes(id); })
-            .forEach(function (id) {
-            var peer = _this.peerMap[id];
-            if (peer.connected) {
-                // if (this.tooldb.options.debug) {
-                // console.log("Sent out to: ", id);
-                // console.log("OUT > ", { ...msg, to });
-                // }
-                peer.send(JSON.stringify(__assign(__assign({}, msg), { to: to })));
-            }
-            else {
-                peer.destroy();
-                delete _this.peerMap[id];
-                if (Object.keys(_this.peerMap).length === 0) {
-                    _this.tooldb.isConnected = false;
-                    _this.tooldb.onDisconnect();
+        Object.keys(this.clientToSend).forEach(function (id) {
+            if (!_this.isConnected(id)) {
+                console.log("disconnected from " + id);
+                _this.onClientDisconnect(id);
+                var peer = _this.peerMap[id];
+                if (peer) {
+                    peer.destroy();
                 }
-            }
-        });
-    };
-    toolDbWebrtc.prototype.sendToClientId = function (clientId, msg) {
-        // if (this.tooldb.options.debug) {
-        // console.log("> sendToClientId", clientId, msg);
-        // }
-        var _this = this;
-        var to = lodash_1.default.uniq(__spreadArray(__spreadArray([], [msg.to || []], false), [
-            this.tooldb.options.peerAccount.address.slice(-20),
-        ], false));
-        Object.keys(this.peerMap)
-            .filter(function (id) { return id === clientId; })
-            .filter(function (id) { return !to.includes(id); })
-            .forEach(function (id) {
-            var peer = _this.peerMap[id];
-            if (peer.connected) {
-                // if (this.tooldb.options.debug) {
-                // console.log("Sent out to client ID ", id);
-                // console.log("OUT > ", { ...msg, to });
-                // }
-                peer.send(JSON.stringify(__assign(__assign({}, msg), { to: to })));
-            }
-            else {
-                peer.destroy();
+                if (_this.connectedPeers[id])
+                    delete _this.connectedPeers[id];
                 delete _this.peerMap[id];
-                if (Object.keys(_this.peerMap).length === 0) {
-                    _this.tooldb.isConnected = false;
-                    _this.tooldb.onDisconnect();
-                }
             }
         });
+        if (Object.keys(this.peerMap).length === 0) {
+            this.tooldb.isConnected = false;
+            this.tooldb.onDisconnect();
+        }
+    };
+    toolDbWebrtc.prototype.close = function (clientId) {
+        //
     };
-    Object.defineProperty(toolDbWebrtc.prototype, "tooldb", {
-        get: function () {
-            return this._tooldb;
-        },
-        enumerable: false,
-        configurable: true
-    });
     return toolDbWebrtc;
-}(tooldb_1.ToolDbNetworkAdapter));
+}(toolDbNetworkAdapter_1.default));
 exports.default = toolDbWebrtc;
 //# sourceMappingURL=toolDbWebrtc.js.map