trac-peer 0.0.56 → 0.0.58

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "type": "module",
   "dependencies": {
     "autobase": "7.1.1",
@@ -11,6 +11,7 @@
     "brittle": "3.0.0",
     "corestore": "7.0.23",
     "debounceify": "1.1.0",
+    "fastest-validator": "^1.19.0",
     "hyperbee": "2.23.0",
     "hypercore": "11.0.48",
     "hypercore-crypto": "3.4.0",

package/src/check.js

@@ -0,0 +1,49 @@
+import Validator from 'fastest-validator';
+
+class Check {
+
+    constructor() {
+        this._node = null;
+        this._tx = null;
+        this.validator = new Validator();
+    }
+
+    async compileNode() {
+        const schema = {
+            value: {
+                $$type: "object",
+                type: "string"
+            }
+        };
+        return this.validator.compile(schema);
+    }
+
+    async node(node){
+        if(this._node === null) {
+            this._node = this.compileNode();
+        }
+        return this._node(node);
+    }
+
+    async compileTx() {
+        // if(op.key === undefined || op.value === undefined || op.value.dispatch === undefined) continue;
+        const schema = {
+            key: "hex",
+            value : {
+                $$type : "object",
+                dispatch : "object",
+                msbsl : "integer"
+            }
+        };
+        return this.validator.compile(schema);
+    }
+
+    async tx(op){
+        if(this._tx === null) {
+            this._tx = this.compileTx();
+        }
+        return this._tx(op);
+    }
+}
+
+export default Check;

package/src/index.js

@@ -12,6 +12,7 @@ const wakeup = new w();
 import {addWriter, addAdmin, setAutoAddWriters, setChatStatus, setMod, deleteMessage,
     enableWhitelist, postMessage, jsonStringify, visibleLength, setNick,
     muteStatus, setWhitelistStatus} from "./functions.js";
+import Check from "./check.js";
 export {default as Protocol} from "./protocol.js";
 export {default as Contract} from "./contract.js";
 export {default as Feature} from "./feature.js";
@@ -48,6 +49,7 @@ export class Peer extends ReadyResource {
         this.isStreaming = false;
         this.connectedPeers = new Set();
         this.options = options;
+        this.check = new Check();
 
         this.tx_observer();
         this.nodeListener();
@@ -74,11 +76,10 @@ export class Peer extends ReadyResource {
                 const batch = view.batch();
 
                 for (const node of nodes) {
-                    if(node.value === undefined || node.value.type === undefined) continue;
+                    if(false === await this.check.node(node)) continue;
                     const op = node.value;
                     if (op.type === 'tx') {
-                        if(op.key === undefined || op.value === undefined || op.value.dispatch === undefined) continue;
-
+                        if(false === await this.check.tx(op)) continue;
                         const str_dispatch = jsonStringify(op.value.dispatch);
                         const msb_view_session = _this.msb.base.view.checkout(op.value.msbsl);
                         const post_tx = await msb_view_session.get(op.key);
@@ -86,8 +87,9 @@ export class Peer extends ReadyResource {
                         if (null !== str_dispatch &&
                             null !== post_tx &&
                             null === await batch.get('tx/'+op.key) &&
-                            post_tx.value &&
-                            post_tx.value.tx &&
+                            post_tx.value !== undefined &&
+                            post_tx.value.tx !== undefined &&
+                            post_tx.value.ch !== undefined &&
                             op.key === post_tx.value.tx &&
                             post_tx.value.ch === createHash('sha256').update(str_dispatch).digest('hex')) {
                             await batch.put('tx/'+op.key, op.value);
@@ -468,7 +470,7 @@ export class Peer extends ReadyResource {
             connection.on('error', (error) => { });
 
             _this.on('tx', async (msg) => {
-                if(Object.keys(_this.tx_pool).length < _this.tx_pool_max_size && !_this.tx_pool[msg.tx]){
+                if(Object.keys(_this.tx_pool).length <= _this.tx_pool_max_size && !_this.tx_pool[msg.tx]){
                     await connection.write(JSON.stringify(msg))
                     msg['ts'] = Math.floor(Date.now() / 1000);
                     _this.tx_pool[msg.tx] = msg;
@@ -624,7 +626,7 @@ export class Peer extends ReadyResource {
         console.log('- /set_nick | Change your nickname like this \'/set_nick --nick "Peter"\'. Chat must be enabled. Can be edited by admin and mods using the optional --user <address> flag.');
         console.log('- /mute_status | Only admin and mods. Mute or unmute a user by their address: \'/mute_status --user "<address>" --muted 1\'.');
         console.log('- /set_mod | Only admin. Set a user as mod: \'/set_mod --user "<address>" --mod 1\'.');
-        console.log('- /delete_message | Delete a messages: \'/delete_message --id 1\'. Chat must be enabled.');
+        console.log('- /delete_message | Delete a message: \'/delete_message --id 1\'. Chat must be enabled.');
         console.log('- /enable_whitelist | Only admin. Enable/disable chat whitelists: \'/enable_whitelist --enabled 1\'.');
         console.log('- /set_whitelist_status | Only admin. Add/remove users to/from the chat whitelist: \'/set_whitelist_status --user "<address>" --status 1\'.');
         console.log(' ');