trac-msb 0.1.76 → 0.1.77

package/Whitelist/pubkeys.csv

@@ -1 +1 @@
-7a28af069a36ce674ad04718e8ee63fe38c81a7770b144714c7666d085897d1c
+

package/msb.mjs

@@ -4,11 +4,11 @@ const opts = {
     stores_directory : 'stores2/',
     store_name : typeof process !== "undefined" ? process.argv[2] : Pear.config.args[0],
     bootstrap: 'a4951e5f744e2a9ceeb875a7965762481dab0a7bb0531a71568e34bf7abd2c53',
-    channel: '0002tracnetworkmainsettlementbus',
+    channel: '0002tracnetworkmainsettlementbus'
 };
 
 const msb = new MainSettlementBus(opts);
 
-msb.ready().then(() => {
-    msb.interactiveMode();
-});
+msb.ready()
+    .then(() => { msb.interactiveMode(); })
+    .catch(function () { });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.1.76",
+  "version": "0.1.77",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"

package/src/index.js

@@ -15,11 +15,9 @@ import {
     OperationType,
     EventType,
     WHITELIST_SLEEP_INTERVAL,
-    UPDATER_INTERVAL,
     MAX_INDEXERS,
     MIN_INDEXERS,
     WHITELIST_PREFIX,
-    TRAC_NAMESPACE
 } from './utils/constants.js';
 import Network from './network.js';
 import Check from './utils/check.js';
@@ -56,6 +54,8 @@ export class MainSettlementBus extends ReadyResource {
     #readline_instance;
     #enable_txlogs;
     #disable_rate_limit;
+    #enableValidatorObserver;
+    #enableRoleRequester;
 
     constructor(options = {}) {
         super();
@@ -65,7 +65,8 @@ export class MainSettlementBus extends ReadyResource {
         this.#boot();
         this.#setupInternalListeners();
         this.#network = new Network(this.#base);
-        this.ready().catch(noop);
+        this.#enableValidatorObserver = options.enableValidatorObserver !== undefined ? options.enableValidatorObserver : true;
+        this.#enableRoleRequester = options.enableRoleRequester !== undefined ? options.enableRoleRequester : true;
     }
 
     #initInternalAttributes(options) {
@@ -454,20 +455,60 @@ export class MainSettlementBus extends ReadyResource {
         this.validatorObserver();
     }
 
-    async close() {
-        console.log('Closing everything...');
-        if (this.#swarm) {
+    async _close() {
+        console.log('Closing everything gracefully... This may take a moment.');
+
+        if (this.#network !== null) {
+            this.#network.stopPool();
+        }
+        await sleep(100);
+
+        if (this.#enableValidatorObserver) {
+            this.stopValidatorObserver();
+        }
+
+        await sleep(5_000); // stopValidatorObserver is using findValidator which is reading from the base, so we need to wait fot it to finish.. Temporary workaround?
+        if (this.#swarm !== null) {
             await this.#swarm.destroy();
         }
-        await this.#base.close();
+        await sleep(100);
+
+        if (this.#base !== null) {
+            await this.#base.close();
+        }
+        await sleep(100);
+        if (this.#bee !== null) {
+            await this.#bee.close();
+        }
+        await sleep(100);
+        if (this.#readline_instance) {
+            
+            const inputClosed = new Promise(resolve => this.#readline_instance.input.once('close', resolve));
+            const outputClosed = new Promise(resolve => this.#readline_instance.output.once('close', resolve));
+
+            this.#readline_instance.close();
+            this.#readline_instance.input.destroy();
+            this.#readline_instance.output.destroy();
+
+            // Do not remove this. Without it, readline may close too quickly and still hang.
+            await Promise.all([inputClosed, outputClosed]).catch(e => console.log("Error during closing readline stream:", e));
+        }
+        await sleep(100);
+
+        if (this.#store !== null) {
+            await this.#store.close();
+        }
+        await sleep(100);
     }
 
     async #setUpRoleAutomatically() {
-        if (!this.#base.writable) {
+        if (!this.#base.writable && this.#enableRoleRequester) {
+            console.log('Requesting writer role... This may take a moment.');
             await this.#requestWriterRole(false)
             setTimeout(async () => {
                 await this.#requestWriterRole(true)
             }, 5_000);
+            await sleep(5_000);
         }
     }
 
@@ -835,9 +876,11 @@ export class MainSettlementBus extends ReadyResource {
         }
     }
     
+    // TODO: AFTER WHILE LOOP SIGNAL TO THE PROCESS THAT VALIDATOR OBSERVER STOPPED OPERATING. 
+    // OS CALLS, ACCUMULATORS, MAYBE THIS IS POSSIBLE TO CHECK I/O QUEUE IF IT COINTAIN IT. FOR NOW WE ARE USING SLEEP.
     async validatorObserver() {
         // Finding writers for admin recovery case
-        while (this.#enable_wallet) {
+        while (this.#enableValidatorObserver && this.#enable_wallet) {
 
             if (this.#dht_node === null || this.#network.validator_stream !== null) {
                 await sleep(1000);
@@ -911,6 +954,10 @@ export class MainSettlementBus extends ReadyResource {
         await this.#banValidator(tracPublicKey);
     }
 
+    stopValidatorObserver() {
+        this.#enableValidatorObserver = false;
+    }
+
     printHelp() {
         console.log('Available commands:');
         console.log('- /add_writer: add yourself as validator to this MSB once whitelisted.');
@@ -938,10 +985,8 @@ export class MainSettlementBus extends ReadyResource {
                     this.printHelp();
                     break;
                 case '/exit':
-                    console.log('Exiting...');
                     rl.close();
                     await this.close();
-                    typeof process !== "undefined" ? process.exit(0) : Pear.exit(0);
                     break;
                 case '/push_writer_add':
                     await this.#requestWriterRole(true)
@@ -1001,5 +1046,4 @@ export class MainSettlementBus extends ReadyResource {
 
 }
 
-function noop() { }
 export default MainSettlementBus;

package/src/network.js

@@ -20,6 +20,7 @@ import c from 'compact-encoding'
 const wakeup = new w();
 
 class Network {
+    #shouldStopPool = false;
     constructor(base) {
         this.tx_pool = [];
         this.pool(base);
@@ -28,7 +29,7 @@ class Network {
         this.admin = null
         this.validator_stream = null
         this.validator = null;
-        this.custom_stream =  null;
+        this.custom_stream = null;
         this.custom_node = null
     }
 
@@ -48,7 +49,7 @@ class Network {
             let clean = Date.now();
             let conns = {};
 
-            swarm = new Hyperswarm({ keyPair, bootstrap : bootstrap, maxPeers: MAX_PEERS, maxParallel: MAX_PARALLEL, maxServerConnections: MAX_SERVER_CONNECTIONS, maxClientConnections :  MAX_CLIENT_CONNECTIONS});
+            swarm = new Hyperswarm({ keyPair, bootstrap: bootstrap, maxPeers: MAX_PEERS, maxParallel: MAX_PARALLEL, maxServerConnections: MAX_SERVER_CONNECTIONS, maxClientConnections: MAX_CLIENT_CONNECTIONS });
 
             console.log(`Channel: ${b4a.toString(channel)}`);
             swarm.on('connection', async (connection) => {
@@ -68,7 +69,7 @@ class Network {
                     encoding: c.json,
                     async onmessage(msg) {
                         try {
-                            
+
                             if (msg === 'get_validator') {
                                 const nonce = Wallet.generateNonce().toString('hex');
                                 const _msg = {
@@ -78,7 +79,7 @@ class Network {
                                     channel: b4a.toString(channel, 'utf8')
                                 };
                                 const sig = wallet.sign(JSON.stringify(_msg) + nonce);
-                                message.send({response: _msg, sig, nonce})
+                                message.send({ response: _msg, sig, nonce })
                                 swarm.leavePeer(connection.remotePublicKey)
                             } else if (msg === 'get_admin') {
                                 const res = await msb.get(EntryType.ADMIN);
@@ -91,10 +92,10 @@ class Network {
                                     channel: b4a.toString(channel, 'utf8')
                                 };
                                 const sig = wallet.sign(JSON.stringify(_msg) + nonce);
-                                message.send({response: _msg, sig, nonce})
+                                message.send({ response: _msg, sig, nonce })
                                 swarm.leavePeer(connection.remotePublicKey)
-                            } else  if (msg === 'get_node') {
-                     
+                            } else if (msg === 'get_node') {
+
                                 const nonce = Wallet.generateNonce().toString('hex');
                                 const _msg = {
                                     op: 'node',
@@ -103,9 +104,9 @@ class Network {
                                     channel: b4a.toString(channel, 'utf8')
                                 };
                                 const sig = wallet.sign(JSON.stringify(_msg) + nonce);
-                                message.send({response: _msg, sig, nonce})
+                                message.send({ response: _msg, sig, nonce })
                                 swarm.leavePeer(connection.remotePublicKey)
-                            
+
                             } else if (msg.response !== undefined && msg.response.op !== undefined && msg.response.op === 'validator') {
                                 const res = await msb.get(msg.response.address);
                                 if (res === null) return;
@@ -127,7 +128,7 @@ class Network {
                                 }
                                 swarm.leavePeer(connection.remotePublicKey)
                             }
-                            else if (msg.response !== undefined && msg.response.op !== undefined && msg.response.op === 'node'){
+                            else if (msg.response !== undefined && msg.response.op !== undefined && msg.response.op === 'node') {
 
                                 const verified = wallet.verify(msg.sig, JSON.stringify(msg.response) + msg.nonce, msg.response.address)
                                 if (verified && msg.response.channel === b4a.toString(channel, 'utf8')) {
@@ -180,7 +181,7 @@ class Network {
                                     }
 
                                     if (conns[peer] === undefined) {
-                                        conns[peer] = {prev: _now, now: 0, tx_cnt: 0}
+                                        conns[peer] = { prev: _now, now: 0, tx_cnt: 0 }
                                     }
 
                                     conns[peer].now = _now;
@@ -227,7 +228,7 @@ class Network {
                                         wp: wallet.publicKey,
                                         wn: nonce
                                     };
-                                    network.tx_pool.push({tx: parsedPreTx.tx, append_tx: append_tx});
+                                    network.tx_pool.push({ tx: parsedPreTx.tx, append_tx: append_tx });
                                 }
 
                                 swarm.leavePeer(connection.remotePublicKey)
@@ -260,6 +261,7 @@ class Network {
 
                 // must be called AFTER the protomux init above
                 const stream = store.replicate(connection);
+                stream.on('error', (error) => { });
                 wakeup.addStream(stream);
 
                 connection.on('error', (error) => { });
@@ -276,7 +278,7 @@ class Network {
     }
 
     async pool(base) {
-        while (true) {
+        while (!this.#shouldStopPool) {
             if (this.tx_pool.length > 0) {
                 const length = this.tx_pool.length;
                 const batch = [];
@@ -290,6 +292,9 @@ class Network {
             await sleep(5);
         }
     }
-}
 
+    stopPool() {
+        this.#shouldStopPool = true;
+    }
+}
 export default Network;

package/stores2/m1/CORESTORE

@@ -0,0 +1,4 @@
+device/platform=darwin
+device/inode=9178292
+device/created=1748134175967
+device/attribute=original

package/stores2/m1/db/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000005

package/stores2/m1/db/IDENTITY

@@ -0,0 +1 @@
+77f84488-ec5a-4c9f-84c5-932fa7f67b28