trac-peer 0.0.54 → 0.0.56

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.0.54",
+  "version": "0.0.56",
   "type": "module",
   "dependencies": {
     "autobase": "7.1.1",

package/src/functions.js

@@ -75,7 +75,7 @@ export function restoreManifest(parsedManifest) {
 
     if (Array.isArray(parsedManifest.signers)) {
         parsedManifest.signers = parsedManifest.signers.map(signer => {
-            if(signer.namespace && signer.namespace.data &&signer.publicKey && signer.publicKey.data){ 
+            if(signer.namespace && signer.namespace.data &&signer.publicKey && signer.publicKey.data){
                 return {
                     ...signer,
                     namespace: Buffer.from(signer.namespace.data),
@@ -120,7 +120,7 @@ export async function setWhitelistStatus(input, peer){
 
 export async function enableWhitelist(input, peer){
     const splitted = yargs(input).parse();
-    const value = splitted.enabled;
+    const value = splitted.enabled === 1;
     const nonce = Math.random() + '-' + Date.now();
     const signature = { dispatch : {
             type : 'enableWhitelist',
@@ -197,19 +197,19 @@ export async function postMessage(input, peer){
     const value = splitted.message;
     const nonce = Math.random() + '-' + Date.now();
     const signature = { dispatch : {
-        type : 'msg',
-        msg: value,
-        address : peer.wallet.publicKey,
-        attachments : [],
-        deleted_by : null
-    }};
+            type : 'msg',
+            msg: value,
+            address : peer.wallet.publicKey,
+            attachments : [],
+            deleted_by : null
+        }};
     const hash = peer.wallet.sign(JSON.stringify(signature) + nonce);
     await peer.base.append({type: 'msg', value: signature, hash : hash, nonce: nonce });
 }
 
 export async function setChatStatus(input, peer){
-    const splitted = input.split(' ');
-    const value = splitted[1];
+    const splitted = yargs(input).parse();
+    const value = 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 }
@@ -221,8 +221,8 @@ export async function setChatStatus(input, peer){
 }
 
 export async function setAutoAddWriters(input, peer){
-    const splitted = input.split(' ');
-    const value = splitted[1];
+    const splitted = yargs(input).parse();
+    const value = 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 }
@@ -234,27 +234,28 @@ export async function setAutoAddWriters(input, peer){
 }
 
 export async function addAdmin(input, peer){
-    const splitted = input.split(' ');
-    const publicKey = splitted[1];
+    const splitted = yargs(input).parse();
+    const publicKey = splitted.address;
     await peer.base.append({ type: 'addAdmin', key: publicKey });
 }
 
 export async function addWriter(input, peer){
     const splitted = input.split(' ');
+    const parsed = yargs(input).parse();
     const nonce = Math.random() + '-' + Date.now();
     if(splitted[0] === '/add_indexer'){
-        const msg = { type: 'addIndexer', key: splitted[splitted.length - 1] }
+        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: splitted[splitted.length - 1], value: signature, hash: hash, nonce: 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: splitted[splitted.length - 1] }
+        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: splitted[splitted.length - 1], 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

@@ -611,20 +611,28 @@ export class Peer extends ReadyResource {
         });
 
         console.log('Node started. Available commands:');
-        console.log('- /add_admin: Only once on bootstrap node! Enter a wallet public key to assign admin rights to it.');
-        console.log('- /add_indexer: Only admin. Enter a peer writer key as argument to get included as indexer for this network.');
-        console.log('- /add_writer: Only admin. Enter a peer writer key as argument to get included as writer.');
-        console.log('- /set_auto_add_writers: Only admin. Use "on" or "off" as 2nd parameter to allow/disallow peers automatically being added as writers.');
-        console.log('- /set_chat_status: Only admin. Use "on" or "off" as 2nd parameter to enable/disable the built-in chat system.');
-        console.log('- /post: Post a message like \'/post --message "Hello"\'. Chat must be enabled.');
-        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 like this \'/mute_status --user "<address>" --muted 1\'.');
-        console.log('- /set_mod: Only admin. Set a user as mod like this \'/set_mod --user "<address>" --mod 1\'.');
-        console.log('- /delete_message: Delete a messages like \'/delete_message --id 1\'. Chat must be enabled.');
-        console.log('- /set_whitelist: Only admin. Enable/disable chat whitelists like \'/set_whitelist --status 1\'.');
-        console.log('- /dag: check system properties such as writer key, DAG, etc.');
-        console.log('- /get_keys: prints your public and private keys. Be careful and never share your private key!');
-        console.log('- /exit: Exit the program');
+        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('- /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('- /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('- /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(' ');
+        console.log('- System Commands:');
+        console.log('- /dag | check system properties such as writer key, DAG, etc.');
+        console.log('- /get_keys | prints your public and private keys. Be careful and never share your private key!');
+        console.log('- /exit | Exit the program');
+
         this.protocol_instance.printOptions();
 
         rl.on('line', async (input) => {
@@ -642,30 +650,34 @@ export class Peer extends ReadyResource {
                     console.log("Secret Key: ", this.wallet.secretKey);
                     break;
                 default:
-                    if (input.startsWith('/add_indexer') || input.startsWith('/add_writer')) {
-                        await addWriter(input, this);
-                    } else if (input.startsWith('/add_admin')) {
-                        await addAdmin(input, this);
-                    } else if (input.startsWith('/set_auto_add_writers')) {
-                        await setAutoAddWriters(input, this);
-                    } else if (input.startsWith('/set_chat_status')) {
-                        await setChatStatus(input, this);
-                    } else if (input.startsWith('/post')) {
-                        await postMessage(input, this);
-                    } else if (input.startsWith('/set_nick')) {
-                        await setNick(input, this);
-                    } else if (input.startsWith('/mute_status')) {
-                        await muteStatus(input, this);
-                    } else if (input.startsWith('/set_mod')) {
-                        await setMod(input, this);
-                    } else if (input.startsWith('/delete_message')) {
-                        await deleteMessage(input, this);
-                    } else if (input.startsWith('/set_whitelist')) {
-                        await enableWhitelist(input, this);
-                    } else if (input.startsWith('/set_whitelist_status')) {
-                        await setWhitelistStatus(input, this);
-                    } else {
-                        this.protocol_instance.execute(input);
+                    try {
+                        if (input.startsWith('/add_indexer') || input.startsWith('/add_writer')) {
+                            await addWriter(input, this);
+                        } else if (input.startsWith('/add_admin')) {
+                            await addAdmin(input, this);
+                        } else if (input.startsWith('/set_auto_add_writers')) {
+                            await setAutoAddWriters(input, this);
+                        } else if (input.startsWith('/set_chat_status')) {
+                            await setChatStatus(input, this);
+                        } else if (input.startsWith('/post')) {
+                            await postMessage(input, this);
+                        } else if (input.startsWith('/set_nick')) {
+                            await setNick(input, this);
+                        } else if (input.startsWith('/mute_status')) {
+                            await muteStatus(input, this);
+                        } else if (input.startsWith('/set_mod')) {
+                            await setMod(input, this);
+                        } else if (input.startsWith('/delete_message')) {
+                            await deleteMessage(input, this);
+                        } else if (input.startsWith('/enable_whitelist')) {
+                            await enableWhitelist(input, this);
+                        } else if (input.startsWith('/set_whitelist_status')) {
+                            await setWhitelistStatus(input, this);
+                        } else {
+                            this.protocol_instance.execute(input);
+                        }
+                    } catch(e) {
+                        console.log('Command failed:', e.message);
                     }
             }
             rl.prompt();