trac-peer 0.0.67 → 0.0.69

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.0.67",
+  "version": "0.0.69",
   "type": "module",
   "dependencies": {
     "autobase": "7.0.45",

package/src/check.js

@@ -71,6 +71,7 @@ class Check {
         this._feature = this.compileFeature();
         this._add_writer = this.compileAddWriter();
         this._key = this.compileKey();
+        this._update_admin = this.compileUpdateAdmin();
         this._nick = this.compileNick();
         this._mute = this.compileMute();
         this._delete_message = this.compileDeleteMessage();
@@ -135,7 +136,8 @@ class Check {
                     mod : { type : "boolean" },
                     type : { type : "string", min : 1 },
                     address : { type : "is_hex" },
-                    user : { type : "is_hex" }
+                    user : { type : "is_hex" },
+                    deleted_by : { type : "is_hex" }
                 }
             }
         };
@@ -228,6 +230,28 @@ class Check {
         return res === true;
     }
 
+    compileUpdateAdmin() {
+        const schema = {
+            nonce: { type : "string", min : 1 },
+            hash: { type : "is_hex" },
+            value : {
+                $$type: "object",
+                dispatch : {
+                    $$type : "object",
+                    admin : { type : "is_hex", nullable : true },
+                    type : { type : "string", min : 1 },
+                    address : { type : "is_hex" }
+                }
+            }
+        };
+        return this.validator.compile(schema);
+    }
+
+    updateAdmin(op){
+        const res = this._update_admin(op);
+        return res === true;
+    }
+
     setStatus(op){
         // currently same as addWriter
         return this.addWriter(op);
@@ -293,7 +317,8 @@ class Check {
                     msg : { type : "string", min : 1 },
                     type : { type : "string", min : 1 },
                     address : { type : "is_hex" },
-                    deleted_by : { type : "is_hex", nullable : true }
+                    deleted_by : { type : "is_hex", nullable : true },
+                    reply_to : { type : "number", integer : true, min : 0, nullable : true },
                 }
             }
         };

package/src/contract.js

@@ -11,7 +11,7 @@ class Contract {
         this.message_handler = null;
         this.root = null;
 
-        this.enter_execute_schema = this.protocol.peer.check.compile({
+        this.enter_execute_schema = this.protocol.peer.check.validator.compile({
             value : {
                 $$type: "object",
                 dispatch : {
@@ -21,7 +21,7 @@ class Contract {
             }
         });
 
-        this.tx_schema = this.protocol.peer.check.compile({
+        this.tx_schema = this.protocol.peer.check.validator.compile({
             key : { type : "string", hex : null },
             value : {
                 $$type: "object",
@@ -32,7 +32,7 @@ class Contract {
             }
         });
 
-        this.address_schema = this.protocol.peer.check.compile({
+        this.address_schema = this.protocol.peer.check.validator.compile({
             value : {
                 $$type: "object",
                 dispatch : {
@@ -42,7 +42,7 @@ class Contract {
             }
         });
 
-        this.textkey_schema = this.protocol.peer.check.compile({
+        this.textkey_schema = this.protocol.peer.check.validator.compile({
             key : { type : "string", min : 1 }
         });
     }
@@ -64,6 +64,7 @@ class Contract {
 
         this.tx = op.type === 'tx' ? op.key : null;
         this.op = op.value.dispatch;
+        this.value = this.op.value !== undefined ? this.op.value : null;
         this.node = node;
         this.storage = storage;
         this.root = op;
@@ -99,7 +100,7 @@ class Contract {
     }
 
     addSchema(type, schema){
-        this.schemata[type] = this.protocol.peer.check.compile(schema);
+        this.schemata[type] = this.protocol.peer.check.validator.compile(schema);
     }
 
     addFeature(type, func) {
@@ -132,8 +133,9 @@ class Contract {
     async put(key, value){
         if(typeof this.storage === "undefined" || this.storage === null) throw new Error('put(key,value): storage undefined');
         if(key.startsWith('sh/') || key.startsWith('tx/') || key === 'msgl' || key.startsWith('kcin/') || key.startsWith('delm/') ||
-            key.startsWith('msg/') || key === 'admin' || key === 'auto_add_writers' || key.startsWith('nick/') || key.startsWith('mod/') ||
-            key === 'chat_status' || key.startsWith('mtd/') || key === 'delml' || key === 'wlst' || key.startsWith('wl/'))
+            key.startsWith('umsg/') || key.startsWith('umsg/') || key.startsWith('msgl/') || key === 'admin' || key === 'auto_add_writers'
+            || key.startsWith('nick/') || key.startsWith('mod/') || key === 'chat_status' || key.startsWith('mtd/') || key === 'delml' ||
+            key === 'wlst' || key.startsWith('wl/'))
             throw Error('put(key,value): ' + key + 'is reserved');
         return await this.storage.put(key, value);
     }

package/src/functions.js

@@ -105,7 +105,7 @@ export function jsonStringify(value){
 
 export async function setWhitelistStatus(input, peer){
     const splitted = yargs(input).parse();
-    const value = splitted.user;
+    const value = ''+splitted.user;
     const status = parseInt(splitted.status) === 1;
     const nonce = Math.random() + '-' + Date.now();
     const signature = { dispatch : {
@@ -133,7 +133,7 @@ export async function enableWhitelist(input, peer){
 
 export async function deleteMessage(input, peer){
     const splitted = yargs(input).parse();
-    const value = splitted.id;
+    const value = parseInt(splitted.id);
     const nonce = Math.random() + '-' + Date.now();
     const signature = { dispatch : {
             type : 'deleteMessage',
@@ -144,9 +144,22 @@ export async function deleteMessage(input, peer){
     await peer.base.append({type: 'deleteMessage', value: signature, hash : hash, nonce: nonce });
 }
 
+export async function updateAdmin(input, peer){
+    const splitted = yargs(input).parse();
+    const value = ''+splitted.address === 'null' ? null : ''+splitted.address;
+    const nonce = Math.random() + '-' + Date.now();
+    const signature = { dispatch : {
+            type : 'updateAdmin',
+            admin: value,
+            address : peer.wallet.publicKey
+        }};
+    const hash = peer.wallet.sign(JSON.stringify(signature) + nonce);
+    await peer.base.append({type: 'updateAdmin', value: signature, hash : hash, nonce: nonce });
+}
+
 export async function setMod(input, peer){
     const splitted = yargs(input).parse();
-    const value = splitted.user;
+    const value = ''+splitted.user;
     const mod = parseInt(splitted.mod) === 1;
     const nonce = Math.random() + '-' + Date.now();
     const signature = { dispatch : {
@@ -161,7 +174,7 @@ export async function setMod(input, peer){
 
 export async function muteStatus(input, peer){
     const splitted = yargs(input).parse();
-    const value = splitted.user;
+    const value = ''+splitted.user;
     const muted = parseInt(splitted.muted) === 1;
     const nonce = Math.random() + '-' + Date.now();
     const signature = { dispatch : {
@@ -176,10 +189,10 @@ export async function muteStatus(input, peer){
 
 export async function setNick(input, peer){
     const splitted = yargs(input).parse();
-    const value = splitted.nick;
+    const value = ''+splitted.nick;
     let user = null;
     if(splitted.user !== undefined){
-        user = splitted.user;
+        user = ''+splitted.user;
     }
     const nonce = Math.random() + '-' + Date.now();
     const signature = { dispatch : {
@@ -195,6 +208,7 @@ export async function setNick(input, peer){
 export async function postMessage(input, peer){
     const splitted = yargs(input).parse();
     if(typeof splitted.message === "boolean" || splitted.message === undefined) throw new Error('Empty message not allowed');
+    const reply_to = splitted.reply_to !== undefined ? parseInt(splitted.reply_to) : null;
     const value = '' + splitted.message;
     const nonce = Math.random() + '-' + Date.now();
     const signature = { dispatch : {
@@ -202,7 +216,8 @@ export async function postMessage(input, peer){
             msg: value,
             address : peer.wallet.publicKey,
             attachments : [],
-            deleted_by : null
+            deleted_by : null,
+            reply_to : reply_to
         }};
     const hash = peer.wallet.sign(JSON.stringify(signature) + nonce);
     await peer.base.append({type: 'msg', value: signature, hash : hash, nonce: nonce });
@@ -210,7 +225,7 @@ export async function postMessage(input, peer){
 
 export async function setChatStatus(input, peer){
     const splitted = yargs(input).parse();
-    const value = splitted.enabled === 1 ? 'on' : 'off';
+    const value = parseInt(splitted.enabled) === 1 ? 'on' : 'off';
     const nonce = Math.random() + '-' + Date.now();
     if(value !== 'on' && value !== 'off') throw new Error('setChatStatus: use on and off values.');
     const msg = { type: 'setChatStatus', key: value }
@@ -223,7 +238,7 @@ export async function setChatStatus(input, peer){
 
 export async function setAutoAddWriters(input, peer){
     const splitted = yargs(input).parse();
-    const value = splitted.enabled === 1 ? 'on' : 'off';
+    const value = parseInt(splitted.enabled) === 1 ? 'on' : 'off';
     const nonce = Math.random() + '-' + Date.now();
     if(value !== 'on' && value !== 'off') throw new Error('setAutoAddWriters: use on and off values.');
     const msg = { type: 'setAutoAddWriters', key: value }
@@ -236,7 +251,7 @@ export async function setAutoAddWriters(input, peer){
 
 export async function addAdmin(input, peer){
     const splitted = yargs(input).parse();
-    const publicKey = splitted.address;
+    const publicKey = ''+splitted.address;
     await peer.base.append({ type: 'addAdmin', key: publicKey });
 }
 
@@ -245,18 +260,18 @@ export async function addWriter(input, peer){
     const parsed = yargs(input).parse();
     const nonce = Math.random() + '-' + Date.now();
     if(splitted[0] === '/add_indexer'){
-        const msg = { type: 'addIndexer', key: parsed.key }
+        const msg = { type: 'addIndexer', key: ''+parsed.key }
         const signature = {
             msg: msg
         };
         const hash = peer.wallet.sign(JSON.stringify(msg) + nonce);
         peer.emit('announce', { op : 'append_writer', type: 'addIndexer', key: parsed.key, value: signature, hash: hash, nonce: nonce });
     } else if(splitted[0] === '/add_writer') {
-        const msg = { type: 'addWriter', key: parsed.key }
+        const msg = { type: 'addWriter', key: ''+parsed.key }
         const signature = {
             msg: msg
         };
         const hash = peer.wallet.sign(JSON.stringify(msg) + nonce);
-        peer.emit('announce', { op : 'append_writer', type: 'addWriter', key: parsed.key, value: signature, hash: hash, nonce : nonce });
+        peer.emit('announce', { op : 'append_writer', type: 'addWriter', key: ''+parsed.key, value: signature, hash: hash, nonce : nonce });
     }
 }

package/src/index.js

@@ -11,7 +11,7 @@ import w from 'protomux-wakeup';
 const wakeup = new w();
 import {addWriter, addAdmin, setAutoAddWriters, setChatStatus, setMod, deleteMessage,
     enableWhitelist, postMessage, jsonStringify, visibleLength, setNick,
-    muteStatus, setWhitelistStatus} from "./functions.js";
+    muteStatus, setWhitelistStatus, updateAdmin} from "./functions.js";
 import Check from "./check.js";
 export {default as Protocol} from "./protocol.js";
 export {default as Contract} from "./contract.js";
@@ -76,7 +76,7 @@ export class Peer extends ReadyResource {
                 const batch = view.batch();
 
                 for (const node of nodes) {
-                    if(false === await this.check.node(node)) continue;
+                    if(false === this.check.node(node)) continue;
                     const op = node.value;
                     if (op.type === 'tx') {
                         if(false === this.check.tx(op)) continue;
@@ -84,7 +84,7 @@ export class Peer extends ReadyResource {
                         const msb_view_session = _this.msb.base.view.checkout(op.value.msbsl);
                         const post_tx = await msb_view_session.get(op.key);
                         await msb_view_session.close();
-                        if(false === await this.check.postTx(post_tx)) continue;
+                        if(false === this.check.postTx(post_tx)) continue;
                         if (null !== str_dispatch &&
                             null === await batch.get('tx/'+op.key) &&
                             post_tx.value.tx === op.key &&
@@ -94,7 +94,7 @@ export class Peer extends ReadyResource {
                             console.log(`${op.key} appended. Signed length:`, _this.base.view.core.signedLength);
                         }
                     } else if(op.type === 'msg') {
-                        if(false === await this.check.msg(op)) continue;
+                        if(false === this.check.msg(op)) continue;
                         const admin = await batch.get('admin');
                         let muted = false;
                         let whitelisted = true;
@@ -126,15 +126,23 @@ export class Peer extends ReadyResource {
                             } else {
                                 len = len.value;
                             }
+                            let user_len = await batch.get('umsgl/'+op.value.dispatch.address);
+                            if(null === user_len) {
+                                user_len = 0;
+                            } else {
+                                user_len = user_len.value;
+                            }
                             await batch.put('msg/'+len, op.value.dispatch);
+                            await batch.put('umsg/'+user_len, 'msg/'+len);
                             await batch.put('msgl', len + 1);
+                            await batch.put('umsgl/'+op.value.dispatch.address, user_len + 1);
                             await _this.contract_instance.execute(op, node, batch);
                             const nick = await batch.get('nick/'+op.value.dispatch.address);
                             console.log(`#${len + 1} | ${nick !== null ? nick.value : op.value.dispatch.address}: ${op.value.dispatch.msg}`);
                         }
                         await batch.put('sh/'+op.hash, '');
                     } else if (op.type === 'feature') {
-                        if(false === await this.check.feature(op)) continue;
+                        if(false === this.check.feature(op)) continue;
                         const str_dispatch_value = jsonStringify(op.value.dispatch.value);
                         const admin = await batch.get('admin');
                         if(null !== admin &&
@@ -147,7 +155,7 @@ export class Peer extends ReadyResource {
                         }
                         await batch.put('sh/'+op.value.dispatch.hash, '');
                     } else if (op.type === 'addIndexer') {
-                        if(false === await this.check.addIndexer(op)) continue;
+                        if(false === this.check.addIndexer(op)) continue;
                         const str_msg = jsonStringify(op.value.msg);
                         const admin = await batch.get('admin');
                         if(null !== admin &&
@@ -163,7 +171,7 @@ export class Peer extends ReadyResource {
                         }
                         await batch.put('sh/'+op.hash, '');
                     } else if (op.type === 'addWriter') {
-                        if(false === await this.check.addWriter(op)) continue;
+                        if(false === this.check.addWriter(op)) continue;
                         const str_msg = jsonStringify(op.value.msg);
                         const admin = await batch.get('admin');
                         if(null !== admin &&
@@ -179,7 +187,7 @@ export class Peer extends ReadyResource {
                         }
                         await batch.put('sh/'+op.hash, '');
                     } else if (op.type === 'setChatStatus') {
-                        if(false === await this.check.setStatus(op)) continue;
+                        if(false === this.check.setStatus(op)) continue;
                         const str_msg = jsonStringify(op.value.msg);
                         const admin = await batch.get('admin');
                         if(null !== admin && op.value.msg.key === op.key &&
@@ -194,7 +202,7 @@ export class Peer extends ReadyResource {
                         }
                         await batch.put('sh/'+op.hash, '');
                     } else if (op.type === 'setAutoAddWriters') {
-                        if(false === await this.check.setStatus(op)) continue;
+                        if(false === this.check.setStatus(op)) continue;
                         const str_msg = jsonStringify(op.value.msg);
                         const admin = await batch.get('admin');
                         if(null !== admin && op.value.msg.key === op.key &&
@@ -209,7 +217,7 @@ export class Peer extends ReadyResource {
                         }
                         await batch.put('sh/'+op.hash, '');
                     } else if (op.type === 'autoAddWriter') {
-                        if(false === await this.check.key(op)) continue;
+                        if(false === this.check.key(op)) continue;
                         const auto_add_writers = await batch.get('auto_add_writers');
                         if(null !== auto_add_writers && auto_add_writers.value === 'on'){
                             const writerKey = b4a.from(op.key, 'hex');
@@ -217,14 +225,27 @@ export class Peer extends ReadyResource {
                         }
                         console.log(`Writer auto added: ${op.key}`);
                     } else if (op.type === 'addAdmin') {
-                        if(false === await this.check.key(op)) continue;
+                        if(false === this.check.key(op)) continue;
                         const bootstrap = Buffer(node.from.key).toString('hex')
                         if(null === await batch.get('admin') && bootstrap === _this.bootstrap){
                             await batch.put('admin', op.key);
                             console.log(`Admin added: ${op.key}`);
                         }
+                    } else if (op.type === 'updateAdmin') {
+                        if(false === this.check.updateAdmin(op)) continue;
+                        const admin = await batch.get('admin');
+                        const str_value = jsonStringify(op.value);
+                        if(null !== admin && null !== str_value &&
+                            null === await batch.get('sh/'+op.hash)){
+                            const verified = _this.wallet.verify(op.hash, str_value + op.nonce, admin.value);
+                            if(verified) {
+                                await batch.put('admin', op.value.dispatch.admin);
+                                console.log(`Changed admin ${admin.value} to ${op.value.dispatch.admin}`);
+                            }
+                        }
+                        await batch.put('sh/'+op.hash, '');
                     } else if(op.type === 'setNick') {
-                        if(false === await this.check.nick(op)) continue;
+                        if(false === this.check.nick(op)) continue;
                         const taken = await batch.get('kcin/'+op.value.dispatch.nick);
                         const chat_status = await batch.get('chat_status');
                         const str_value = jsonStringify(op.value);
@@ -258,7 +279,7 @@ export class Peer extends ReadyResource {
                         }
                         await batch.put('sh/'+op.hash, '');
                     } else if(op.type === 'muteStatus') {
-                        if(false === await this.check.mute(op)) continue;
+                        if(false === this.check.mute(op)) continue;
                         const admin = await batch.get('admin');
                         const str_value = jsonStringify(op.value);
                         if(null !== admin && null !== str_value &&
@@ -279,7 +300,7 @@ export class Peer extends ReadyResource {
                         }
                         await batch.put('sh/'+op.hash, '');
                     } else if(op.type === 'deleteMessage') {
-                        if(false === await this.check.deleteMessage(op)) continue;
+                        if(false === this.check.deleteMessage(op)) continue;
                         const admin = await batch.get('admin');
                         const str_value = jsonStringify(op.value);
                         if(null !== admin && null !== str_value &&
@@ -316,7 +337,7 @@ export class Peer extends ReadyResource {
                         }
                         await batch.put('sh/'+op.hash, '');
                     } else if(op.type === 'setMod') {
-                        if(false === await this.check.mod(op)) continue;
+                        if(false === this.check.mod(op)) continue;
                         const admin = await batch.get('admin');
                         const str_value = jsonStringify(op.value);
                         if(null !== admin && null !== str_value &&
@@ -329,7 +350,7 @@ export class Peer extends ReadyResource {
                         }
                         await batch.put('sh/'+op.hash, '');
                     } else if(op.type === 'setWhitelistStatus') {
-                        if(false === await this.check.whitelistStatus(op)) continue;
+                        if(false === this.check.whitelistStatus(op)) continue;
                         const admin = await batch.get('admin');
                         const str_value = jsonStringify(op.value);
                         if(null !== admin && null !== str_value &&
@@ -342,7 +363,7 @@ export class Peer extends ReadyResource {
                         }
                         await batch.put('sh/'+op.hash, '');
                     } else if(op.type === 'enableWhitelist') {
-                        if(false === await this.check.enableWhitelist(op)) continue;
+                        if(false === this.check.enableWhitelist(op)) continue;
                         const admin = await batch.get('admin');
                         const str_value = jsonStringify(op.value);
                         if(null !== admin && null !== str_value &&
@@ -563,13 +584,14 @@ export class Peer extends ReadyResource {
         console.log(' ');
         console.log('- Setup Commands:');
         console.log('- /add_admin | Works only once and only on bootstrap node! Enter a wallet address to assign admin rights: \'/add_admin --address "<address>"\'.');
+        console.log('- /update_admin | Existing admins may transfer admin ownership. Enter "null" as address to waive admin rights for this peer entirely: \'/add_admin --address "<address>"\'.');
         console.log('- /add_indexer | Only admin. Enter a peer writer key to get included as indexer for this network: \'/add_indexer --key "<key>"\'.');
         console.log('- /add_writer | Only admin. Enter a peer writer key to get included as writer for this network: \'/add_writer --key "<key>"\'.');
         console.log('- /set_auto_add_writers | Only admin. Allow any peer to join as writer automatically: \'/set_auto_add_writers --enabled 1\'');
         console.log(' ');
         console.log('- Chat Commands:');
         console.log('- /set_chat_status | Only admin. Enable/disable the built-in chat system: \'/set_chat_status --enabled 1\'. The chat system is disabled by default.');
-        console.log('- /post | Post a message: \'/post --message "Hello"\'. Chat must be enabled.');
+        console.log('- /post | Post a message: \'/post --message "Hello"\'. Chat must be enabled. Optionally use \'--reply_to <message id>\' to respond to a desired message.');
         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\'.');
@@ -604,6 +626,8 @@ export class Peer extends ReadyResource {
                             await addWriter(input, this);
                         } else if (input.startsWith('/add_admin')) {
                             await addAdmin(input, this);
+                        } else if (input.startsWith('/update_admin')) {
+                            await updateAdmin(input, this);
                         } else if (input.startsWith('/set_auto_add_writers')) {
                             await setAutoAddWriters(input, this);
                         } else if (input.startsWith('/set_chat_status')) {