fixed: startup bug (P2P hangs)

diva-exchange · Mar 30, 2022 · 43289d5 · 43289d5
1 parent 061537f
commit 43289d5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021 diva.exchange
+# Copyright (C) 2021-2022 diva.exchange
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

diff --git a/bin/build.sh b/bin/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2021 diva.exchange
+# Copyright (C) 2021-2022 diva.exchange
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -52,10 +52,10 @@ cp ${PROJECT_PATH}build/version ${PROJECT_PATH}dist/version
 if command_exists pkg; then
   info "Packaging..."
 
-  #leveldown prebuilds
-  [[ -d ${PROJECT_PATH}node_modules/leveldown/prebuilds/ ]] &&
+  #classic-level prebuilds
+  [[ -d ${PROJECT_PATH}node_modules/classic-level/prebuilds/ ]] &&
     mkdir -p ${PROJECT_PATH}build/prebuilds &&
-    cp -r ${PROJECT_PATH}node_modules/leveldown/prebuilds/linux-x64 ${PROJECT_PATH}build/prebuilds/linux-x64
+    cp -r ${PROJECT_PATH}node_modules/classic-level/prebuilds/linux-x64 ${PROJECT_PATH}build/prebuilds/linux-x64
 
   pkg --no-bytecode \
     --public \

diff --git a/src/net/network.ts b/src/net/network.ts
@@ -94,23 +94,30 @@ export class Network extends EventEmitter {
   }
 
   private init() {
+    Logger.info(`P2P starting on ${toB32(this.server.config.udp)}.b32.i2p`);
+
+    let retry = 0;
     let started = false;
     const i = setInterval(() => {
-      const _c = this.server.config;
+      retry++;
+      if (retry > 60) {
+        throw new Error(`P2P failed on ${toB32(this.server.config.udp)}.b32.i2p`);
+      }
 
       if (started) {
         if (this.hasP2PNetwork()) {
           this.emit('ready');
           clearInterval(i);
+          Logger.info(`P2P ready on ${toB32(this.server.config.udp)}.b32.i2p`);
         }
         return;
       }
 
       started = true;
-      Logger.info(`P2P starting on ${toB32(_c.udp)}.b32.i2p`);
       this.p2pNetwork();
 
       (async () => {
+        const _c = this.server.config;
         this.samForward = (
           await createForward({
             sam: {
@@ -134,6 +141,7 @@ export class Network extends EventEmitter {
       })();
 
       (async () => {
+        const _c = this.server.config;
         this.samUDP = (
           await createDatagram({
             sam: {
@@ -191,14 +199,15 @@ export class Network extends EventEmitter {
   }
 
   private p2pNetwork() {
-    this.timeoutP2P = setTimeout(async () => {
+    this.timeoutP2P = setTimeout(() => {
       this.p2pNetwork();
     }, this.server.config.network_p2p_interval_ms);
 
     const aNetwork = [...this.server.getBlockchain().getMapPeer().values()];
-    if (!aNetwork.length || !Object.keys(this.samUDP).length) {
+    if (!aNetwork.length || !Object.keys(this.samForward).length || !Object.keys(this.samUDP).length) {
       return;
     }
+
     this.arrayNetwork = aNetwork;
 
     this.arrayBroadcast = Util.shuffleArray(

diff --git a/src/net/server.ts b/src/net/server.ts
@@ -149,8 +149,6 @@ export class Server {
 
     return new Promise((resolve) => {
       this.network.once('ready', async () => {
-        Logger.info('Network ready');
-
         this.bootstrap = Bootstrap.make(this);
         if (this.config.bootstrap) {
           await this.bootstrap.syncWithNetwork();