tool-db 1.3.1 → 1.4.3

package/dist/utils/verifyMessage.js

@@ -44,8 +44,7 @@ var message_1 = require("../types/message");
 var decodeKeyString_1 = __importDefault(require("./crypto/decodeKeyString"));
 var importKey_1 = __importDefault(require("./crypto/importKey"));
 var verifyData_1 = __importDefault(require("./crypto/verifyData"));
-var fromBase64_1 = __importDefault(require("./fromBase64"));
-// import sha256 from "./sha256";
+var __1 = require("..");
 /**
  * Verifies a message validity (PoW, pubKey, timestamp, signatures)
  * @param msg AnyMessage
@@ -55,7 +54,8 @@ var fromBase64_1 = __importDefault(require("./fromBase64"));
 function verifyMessage(msg, pow) {
     if (pow === void 0) { pow = 0; }
     return __awaiter(this, void 0, void 0, function () {
-        var strData, publicKeyNamespace, pubKeyString, pubKey, verified;
+        var strData, publicKeyNamespace, key_1, data, pubKeyString, pubKey, verified;
+        var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -67,8 +67,9 @@ function verifyMessage(msg, pow) {
                         msg.s === undefined) {
                         return [2 /*return*/, message_1.VerifyResult.InvalidData];
                     }
-                    // Max clock shift allowed is ten seconds
-                    if (msg.t > new Date().getTime() + 10000) {
+                    // Max clock shift allowed is 30 seconds.
+                    // Ten seconds was my original threshold but it failed some times.
+                    if (msg.t > new Date().getTime() + 30000) {
                         // console.warn("Invalid message timestamp.");
                         return [2 /*return*/, message_1.VerifyResult.InvalidTimestamp];
                     }
@@ -76,6 +77,30 @@ function verifyMessage(msg, pow) {
                     if (msg.k.slice(0, 1) == ":") {
                         publicKeyNamespace = msg.k.split(".")[0].slice(1);
                     }
+                    if (!(msg.k.slice(0, 2) == "==")) return [3 /*break*/, 2];
+                    key_1 = msg.k;
+                    return [4 /*yield*/, new Promise(function (resolve) {
+                            _this.store.get(key_1, function (err, data) {
+                                if (data) {
+                                    try {
+                                        var message = JSON.parse(data);
+                                        resolve(message);
+                                    }
+                                    catch (e) {
+                                        resolve(null);
+                                    }
+                                }
+                                else {
+                                    resolve(null);
+                                }
+                            });
+                        })];
+                case 1:
+                    data = _a.sent();
+                    if (data && data.p !== msg.p)
+                        return [2 /*return*/, message_1.VerifyResult.CantOverwrite];
+                    _a.label = 2;
+                case 2:
                     pubKeyString = msg.p;
                     if (publicKeyNamespace && publicKeyNamespace !== pubKeyString) {
                         // console.warn("Provided pub keys do not match");
@@ -87,7 +112,7 @@ function verifyMessage(msg, pow) {
                     // Disabled for now because it is painful on large requests
                     if (pow > 0) {
                         if (msg.h.slice(0, pow) !== new Array(pow).fill("0").join("")) {
-                            console.warn("No valid hash (no pow)");
+                            // console.warn("No valid hash (no pow)");
                             return [2 /*return*/, message_1.VerifyResult.NoProofOfWork];
                         }
                         if ((0, sha256_1.default)("" + strData + pubKeyString + msg.t + msg.n) !== msg.h) {
@@ -96,10 +121,10 @@ function verifyMessage(msg, pow) {
                         }
                     }
                     return [4 /*yield*/, (0, importKey_1.default)((0, decodeKeyString_1.default)(pubKeyString), "spki", "ECDSA", ["verify"])];
-                case 1:
+                case 3:
                     pubKey = _a.sent();
-                    return [4 /*yield*/, (0, verifyData_1.default)(msg.h, (0, fromBase64_1.default)(msg.s), pubKey)];
-                case 2:
+                    return [4 /*yield*/, (0, verifyData_1.default)(msg.h, (0, __1.base64ToArrayBuffer)(msg.s), pubKey)];
+                case 4:
                     verified = _a.sent();
                     // console.warn(`Signature validation: ${verified ? "Sucess" : "Failed"}`);
                     return [2 /*return*/, verified ? message_1.VerifyResult.Verified : message_1.VerifyResult.InvalidSignature];

package/dist/utils/verifyMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyMessage.js","sourceRoot":"","sources":["../../src/utils/verifyMessage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA8B;AAC9B,4CAAkE;AAClE,6EAAuD;AACvD,iEAA2C;AAC3C,mEAA6C;AAC7C,4DAAsC;AACtC,iCAAiC;AAEjC;;;;;GAKG;AACH,SAA8B,aAAa,CACzC,GAAiC,EACjC,GAAO;IAAP,oBAAA,EAAA,OAAO;;;;;;oBAGD,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBAEtC,IACE,GAAG,CAAC,CAAC,KAAK,SAAS;wBACnB,GAAG,CAAC,CAAC,KAAK,SAAS;wBACnB,GAAG,CAAC,CAAC,KAAK,SAAS;wBACnB,GAAG,CAAC,CAAC,KAAK,SAAS;wBACnB,GAAG,CAAC,CAAC,KAAK,SAAS,EACnB;wBACA,sBAAO,sBAAY,CAAC,WAAW,EAAC;qBACjC;oBAED,yCAAyC;oBACzC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,EAAE;wBACxC,8CAA8C;wBAC9C,sBAAO,sBAAY,CAAC,gBAAgB,EAAC;qBACtC;oBAGG,kBAAkB,GAAmB,KAAK,CAAC;oBAC/C,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,EAAE;wBAC5B,kBAAkB,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;qBACnD;oBAEK,YAAY,GAAG,GAAG,CAAC,CAAC,CAAC;oBAE3B,IAAI,kBAAkB,IAAI,kBAAkB,KAAK,YAAY,EAAE;wBAC7D,kDAAkD;wBAClD,sBAAO,sBAAY,CAAC,cAAc,EAAC;qBACpC;oBAED,sEAAsE;oBACtE,0EAA0E;oBAC1E,qEAAqE;oBACrE,2DAA2D;oBAC3D,IAAI,GAAG,GAAG,CAAC,EAAE;wBACX,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;4BAC7D,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;4BACvC,sBAAO,sBAAY,CAAC,aAAa,EAAC;yBACnC;wBAED,IAAI,IAAA,gBAAM,EAAC,KAAG,OAAO,GAAG,YAAY,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAG,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE;4BACjE,gEAAgE;4BAChE,sBAAO,sBAAY,CAAC,gBAAgB,EAAC;yBACtC;qBACF;oBAEc,qBAAM,IAAA,mBAAS,EAC5B,IAAA,yBAAe,EAAC,YAAY,CAAC,EAC7B,MAAM,EACN,OAAO,EACP,CAAC,QAAQ,CAAC,CACX,EAAA;;oBALK,MAAM,GAAG,SAKd;oBAIgB,qBAAM,IAAA,oBAAU,EAAC,GAAG,CAAC,CAAC,EAAE,IAAA,oBAAU,EAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAA;;oBAA7D,QAAQ,GAAG,SAAkD;oBACnE,2EAA2E;oBAE3E,sBAAO,QAAQ,CAAC,CAAC,CAAC,sBAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,sBAAY,CAAC,gBAAgB,EAAC;;;;CACzE;AAjED,gCAiEC"}
+{"version":3,"file":"verifyMessage.js","sourceRoot":"","sources":["../../src/utils/verifyMessage.ts"],"names":[],"mappings":"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"}

package/dist/utils/verifyPeer.js

@@ -6,7 +6,7 @@ function verifyPeer(peer) {
     return (0, __1.importKey)((0, __1.decodeKeyString)(peer.pubkey), "spki", "ECDSA", [
         "verify",
     ]).then(function (pubKey) {
-        return (0, __1.verifyData)((0, __1.sha1)(peer.topic + "-" + peer.timestamp + "-" + peer.host + ":" + peer.port), (0, __1.fromBase64)(peer.sig), pubKey);
+        return (0, __1.verifyData)((0, __1.sha256)(peer.topic + "-" + peer.timestamp + "-" + peer.host + ":" + peer.port), (0, __1.base64ToArrayBuffer)(peer.sig), pubKey, "SHA-1");
     });
 }
 exports.default = verifyPeer;

package/dist/utils/verifyPeer.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyPeer.js","sourceRoot":"","sources":["../../src/utils/verifyPeer.ts"],"names":[],"mappings":";;AAAA,wBAA8E;AAG9E,SAAwB,UAAU,CAAC,IAAU;IAC3C,+BAA+B;IAC/B,OAAO,IAAA,aAAS,EAAC,IAAA,mBAAe,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE;QAC9D,QAAQ;KACT,CAAC,CAAC,IAAI,CAAC,UAAC,MAAM;QACb,OAAA,IAAA,cAAU,EACR,IAAA,QAAI,EAAI,IAAI,CAAC,KAAK,SAAI,IAAI,CAAC,SAAS,SAAI,IAAI,CAAC,IAAI,SAAI,IAAI,CAAC,IAAM,CAAC,EACjE,IAAA,cAAU,EAAC,IAAI,CAAC,GAAG,CAAC,EACpB,MAAM,CACP;IAJD,CAIC,CACF,CAAC;AACJ,CAAC;AAXD,6BAWC"}
+{"version":3,"file":"verifyPeer.js","sourceRoot":"","sources":["../../src/utils/verifyPeer.ts"],"names":[],"mappings":";;AAAA,wBAMY;AAGZ,SAAwB,UAAU,CAAC,IAAU;IAC3C,+BAA+B;IAC/B,OAAO,IAAA,aAAS,EAAC,IAAA,mBAAe,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE;QAC9D,QAAQ;KACT,CAAC,CAAC,IAAI,CAAC,UAAC,MAAM;QACb,OAAA,IAAA,cAAU,EACR,IAAA,UAAM,EAAI,IAAI,CAAC,KAAK,SAAI,IAAI,CAAC,SAAS,SAAI,IAAI,CAAC,IAAI,SAAI,IAAI,CAAC,IAAM,CAAC,EACnE,IAAA,uBAAmB,EAAC,IAAI,CAAC,GAAG,CAAC,EAC7B,MAAM,EACN,OAAO,CACR;IALD,CAKC,CACF,CAAC;AACJ,CAAC;AAZD,6BAYC"}

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "tool-db",
-  "version": "1.3.1",
+  "version": "1.4.3",
   "private": false,
   "description": "A decentralized database model for federated p2p networks.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "eslint:fix": "eslint --fix . --ext .ts",
-    "build": "tsc",
+    "bundle": "browserify ./dist/index.js --standalone XXX > ./bundle.js",
+    "build": "tsc && npm run bundle",
     "publish": "np",
     "prepublish": "npm run build",
-    "test": "jest",
+    "test": "jest --clearCache && jest ./src --detectOpenHandles",
     "test:watch": "jest --watch ./src",
     "server": "npm run build && node dist/server.js"
   },
@@ -22,18 +23,23 @@
     "babel": "^6.23.0",
     "buffer": "^6.0.3",
     "crypto": "^1.0.1",
+    "elliptic": "^6.5.4",
     "level": "^7.0.0",
     "lodash": "^4.17.21",
+    "simple-peer": "^9.11.0",
     "ws": "^7.5.5"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
+    "@types/elliptic": "^6.4.14",
     "@types/jest": "^26.0.24",
     "@types/lodash": "^4.14.172",
     "@types/node": "^15.0.1",
+    "@types/simple-peer": "^9.11.4",
     "@types/ws": "^7.4.7",
     "@typescript-eslint/eslint-plugin": "^4.29.1",
+    "browserify": "^17.0.0",
     "eslint": "^7.32.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-prettier": "^8.3.0",
@@ -49,6 +55,9 @@
     "typescript": "^4.1.2",
     "typescript-eslint": "0.0.1-alpha.0"
   },
+  "engines": {
+    "node": ">=16.0.0"
+  },
   "watch": {
     "build": {
       "patterns": [