tool-db 2.2.0 → 2.3.0

package/test-chris/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000150

package/test-chris/LOG

@@ -0,0 +1,6 @@
+2022/06/29-12:40:21.700 29fc Recovering log #149
+2022/06/29-12:40:21.700 29fc Level-0 table #151: started
+2022/06/29-12:40:21.708 29fc Level-0 table #151: 544 bytes OK
+2022/06/29-12:40:21.716 29fc Delete type=0 #149
+2022/06/29-12:40:21.716 29fc Delete type=3 #147
+2022/06/29-12:40:21.719 7e98 Moved #151 to level-1 544 bytes OK: files[ 3 24 0 0 0 0 0 ]

package/test-chris/LOG.old

@@ -0,0 +1,6 @@
+2022/06/27-16:43:05.340 27c4 Recovering log #146
+2022/06/27-16:43:05.340 27c4 Level-0 table #148: started
+2022/06/27-16:43:05.351 27c4 Level-0 table #148: 544 bytes OK
+2022/06/27-16:43:05.358 27c4 Delete type=0 #146
+2022/06/27-16:43:05.359 27c4 Delete type=3 #144
+2022/06/27-16:43:05.360 268c Moved #139 to level-1 544 bytes OK: files[ 3 23 0 0 0 0 0 ]

package/test-node-a/CURRENT

@@ -1 +1 @@
-MANIFEST-000667
+MANIFEST-000176

package/test-node-a/LOG

@@ -1,5 +1,5 @@
-2022/06/23-15:12:48.114 6c20 Recovering log #666
-2022/06/23-15:12:48.114 6c20 Level-0 table #668: started
-2022/06/23-15:12:48.121 6c20 Level-0 table #668: 2192 bytes OK
-2022/06/23-15:12:48.129 6c20 Delete type=0 #666
-2022/06/23-15:12:48.129 6c20 Delete type=3 #664
+2022/06/29-12:40:21.353 29fc Recovering log #174
+2022/06/29-12:40:21.354 29fc Level-0 table #177: started
+2022/06/29-12:40:21.360 29fc Level-0 table #177: 2489 bytes OK
+2022/06/29-12:40:21.367 29fc Delete type=0 #174
+2022/06/29-12:40:21.368 29fc Delete type=3 #172

package/test-node-a/LOG.old

@@ -1,5 +1,14 @@
-2022/06/23-11:48:38.230 6598 Recovering log #662
-2022/06/23-11:48:38.230 6598 Level-0 table #665: started
-2022/06/23-11:48:38.238 6598 Level-0 table #665: 2182 bytes OK
-2022/06/23-11:48:38.246 6598 Delete type=0 #662
-2022/06/23-11:48:38.247 6598 Delete type=3 #660
+2022/06/27-16:43:04.646 27c4 Recovering log #171
+2022/06/27-16:43:04.646 27c4 Level-0 table #173: started
+2022/06/27-16:43:04.659 27c4 Level-0 table #173: 2445 bytes OK
+2022/06/27-16:43:04.670 27c4 Delete type=0 #171
+2022/06/27-16:43:04.671 27c4 Delete type=3 #169
+2022/06/27-16:43:04.674 268c Compacting 4@0 + 1@1 files
+2022/06/27-16:43:04.684 268c Generated table #175@0: 213 keys, 81094 bytes
+2022/06/27-16:43:04.684 268c Compacted 4@0 + 1@1 files => 81094 bytes
+2022/06/27-16:43:04.686 268c compacted to: files[ 0 1 0 0 0 0 0 ]
+2022/06/27-16:43:04.686 268c Delete type=2 #162
+2022/06/27-16:43:04.686 268c Delete type=2 #164
+2022/06/27-16:43:04.686 268c Delete type=2 #167
+2022/06/27-16:43:04.687 268c Delete type=2 #170
+2022/06/27-16:43:04.687 268c Delete type=2 #173

package/test-node-b/CURRENT

@@ -1 +1 @@
-MANIFEST-000667
+MANIFEST-000176

package/test-node-b/LOG

@@ -1,5 +1,5 @@
-2022/06/23-15:12:48.194 64e8 Recovering log #666
-2022/06/23-15:12:48.194 64e8 Level-0 table #668: started
-2022/06/23-15:12:48.201 64e8 Level-0 table #668: 2192 bytes OK
-2022/06/23-15:12:48.208 64e8 Delete type=0 #666
-2022/06/23-15:12:48.209 64e8 Delete type=3 #664
+2022/06/29-12:40:21.422 3fcc Recovering log #174
+2022/06/29-12:40:21.422 3fcc Level-0 table #177: started
+2022/06/29-12:40:21.425 3fcc Level-0 table #177: 2489 bytes OK
+2022/06/29-12:40:21.433 3fcc Delete type=0 #174
+2022/06/29-12:40:21.433 3fcc Delete type=3 #172

package/test-node-b/LOG.old

@@ -1,5 +1,14 @@
-2022/06/23-11:48:38.308 64b8 Recovering log #662
-2022/06/23-11:48:38.308 64b8 Level-0 table #665: started
-2022/06/23-11:48:38.314 64b8 Level-0 table #665: 2182 bytes OK
-2022/06/23-11:48:38.322 64b8 Delete type=0 #662
-2022/06/23-11:48:38.322 64b8 Delete type=3 #660
+2022/06/27-16:43:04.813 3d9c Recovering log #171
+2022/06/27-16:43:04.814 3d9c Level-0 table #173: started
+2022/06/27-16:43:04.819 3d9c Level-0 table #173: 2445 bytes OK
+2022/06/27-16:43:04.828 3d9c Delete type=0 #171
+2022/06/27-16:43:04.828 3d9c Delete type=3 #169
+2022/06/27-16:43:04.828 268c Compacting 4@0 + 1@1 files
+2022/06/27-16:43:04.837 268c Generated table #175@0: 213 keys, 81094 bytes
+2022/06/27-16:43:04.837 268c Compacted 4@0 + 1@1 files => 81094 bytes
+2022/06/27-16:43:04.839 268c compacted to: files[ 0 1 0 0 0 0 0 ]
+2022/06/27-16:43:04.839 268c Delete type=2 #162
+2022/06/27-16:43:04.839 268c Delete type=2 #164
+2022/06/27-16:43:04.840 268c Delete type=2 #167
+2022/06/27-16:43:04.840 268c Delete type=2 #170
+2022/06/27-16:43:04.840 268c Delete type=2 #173

package/test-store/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000036

package/test-store/LOG

@@ -0,0 +1,6 @@
+2022/06/29-12:40:44.082 3fcc Recovering log #35
+2022/06/29-12:40:44.083 3fcc Level-0 table #37: started
+2022/06/29-12:40:44.092 3fcc Level-0 table #37: 222 bytes OK
+2022/06/29-12:40:44.100 3fcc Delete type=0 #35
+2022/06/29-12:40:44.100 3fcc Delete type=3 #33
+2022/06/29-12:40:44.121 7e98 Moved #10 to level-1 222 bytes OK: files[ 3 8 0 0 0 0 0 ]

package/test-store/LOG.old

@@ -0,0 +1,6 @@
+2022/06/27-16:43:04.791 49c0 Recovering log #32
+2022/06/27-16:43:04.791 49c0 Level-0 table #34: started
+2022/06/27-16:43:04.804 49c0 Level-0 table #34: 222 bytes OK
+2022/06/27-16:43:04.812 49c0 Delete type=0 #32
+2022/06/27-16:43:04.813 49c0 Delete type=3 #30
+2022/06/27-16:43:04.819 7304 Moved #19 to level-1 222 bytes OK: files[ 3 7 0 0 0 0 0 ]

package/test-verify-a/CURRENT

@@ -1 +1 @@
-MANIFEST-000249
+MANIFEST-000048

package/test-verify-a/LOG

@@ -1,3 +1,3 @@
-2022/06/23-15:12:45.387 3d68 Recovering log #248
-2022/06/23-15:12:45.398 3d68 Delete type=0 #248
-2022/06/23-15:12:45.398 3d68 Delete type=3 #247
+2022/06/29-12:40:19.275 68a4 Recovering log #47
+2022/06/29-12:40:19.287 68a4 Delete type=0 #47
+2022/06/29-12:40:19.287 68a4 Delete type=3 #46

package/test-verify-a/LOG.old

@@ -1,3 +1,3 @@
-2022/06/23-11:48:37.601 4370 Recovering log #246
-2022/06/23-11:48:37.608 4370 Delete type=0 #246
-2022/06/23-11:48:37.608 4370 Delete type=3 #245
+2022/06/27-16:43:04.701 52a0 Recovering log #45
+2022/06/27-16:43:04.711 52a0 Delete type=0 #45
+2022/06/27-16:43:04.711 52a0 Delete type=3 #44

package/toolDbLibP2p.ts

@@ -54,7 +54,7 @@ export default class toolDbLibP2p {
 
     // Listen for new peers
     // node.on("peer:discovery", (peerId) => {
-    //   console.log(`Found peer ${peerId.toB58String()}`);
+    //   this.tooldb.logger(`Found peer ${peerId.toB58String()}`);
     // });
 
     // Listen for new connections to peers
@@ -71,7 +71,7 @@ export default class toolDbLibP2p {
         const pid = peer.id.toB58String();
 
         if (!this.clientSockets[pid]) {
-          console.warn(`Protocol found ${PROTOCOL_VER}`);
+          this.tooldb.logger(`Protocol found ${PROTOCOL_VER}`);
           try {
             const { stream } = await connection.newStream([PROTOCOL_VER]);
             this.clientSockets[pid] = stream;
@@ -83,7 +83,7 @@ export default class toolDbLibP2p {
               id: textRandom(10),
             } as PingMessage);
           } catch (err) {
-            console.info("Could not handshake protocol with peer", err);
+            this.tooldb.logger("Could not handshake protocol with peer", err);
           }
         }
       });
@@ -101,7 +101,6 @@ export default class toolDbLibP2p {
   }
 
   constructor(db: ToolDb) {
-    this._tooldb = db;
     this.options = db.options;
 
     this.createLibP2p();
@@ -135,7 +134,9 @@ export default class toolDbLibP2p {
     try {
       await pipe(stream, async (source) => {
         for await (const message of source) {
-          console.info(`${connection.remotePeer.toB58String()}: ${message}`);
+          this.tooldb.logger(
+            `${connection.remotePeer.toB58String()}: ${message}`
+          );
           try {
             const msg = JSON.parse(`${message}`) as ToolDbMessage;
             this._tooldb.clientOnMessage(
@@ -143,15 +144,15 @@ export default class toolDbLibP2p {
               connection.remotePeer.toB58String()
             );
           } catch (e) {
-            console.log("Got message ERR > ", message);
-            console.log(e);
+            this.tooldb.logger("Got message ERR", message);
+            this.tooldb.logger(e);
           }
         }
       });
       // Replies are done on new streams, so let's close this stream so we don't leak it
       await pipe([], stream);
     } catch (err) {
-      console.error(err);
+      this.tooldb.logger(err);
     }
   }
 
@@ -164,11 +165,11 @@ export default class toolDbLibP2p {
     try {
       await pipe([message], stream, async function (source: any) {
         for await (const message of source) {
-          console.info(`Me: ${message}`);
+          this.tooldb.logger(`Me: ${message}`);
         }
       });
     } catch (err) {
-      console.error(err);
+      this.tooldb.logger(err);
     }
   }
 
@@ -182,7 +183,7 @@ export default class toolDbLibP2p {
     filteredConns.forEach((clientId) => {
       const stream = this._clientSockets[clientId];
       if (!crossServerOnly) {
-        console.log("Sent out to: ", clientId);
+        this.tooldb.logger("Sent out to: ", clientId);
         if (stream) {
           const message = JSON.stringify({ ...msg, to });
           this.toolDbProtocolSend(message, stream);