From 35553a93b6125e040c1a914b5f9a5930b7f4505f Mon Sep 17 00:00:00 2001
From: Daniel Lugo <danlugo92@gmail.com>
Date: Fri, 17 Jul 2020 14:00:52 -0400
Subject: [PATCH] better dup alias check

---
 config/defaults.js               |  2 --
 services/gunDB/Mediator/index.js | 34 +++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/config/defaults.js b/config/defaults.js
index 4443c21f..37cae17a 100644
--- a/config/defaults.js
+++ b/config/defaults.js
@@ -55,5 +55,3 @@ module.exports = (mainnet = false) => {
     tokenExpirationMS: 4500000
   }; 
 };
-
-module.exports.SHOCK_SUPER_PEER = SHOCK_SUPER_PEER
\ No newline at end of file
diff --git a/services/gunDB/Mediator/index.js b/services/gunDB/Mediator/index.js
index 89f7810b..92f48045 100644
--- a/services/gunDB/Mediator/index.js
+++ b/services/gunDB/Mediator/index.js
@@ -12,10 +12,10 @@ require('gun/lib/open')
 // @ts-ignore
 require('gun/lib/load')
 const debounce = require('lodash/debounce')
+const size = require('lodash/size')
 
 const Encryption = require('../../../utils/encryptionStore')
-const { SHOCK_SUPER_PEER } = require('../../../config/defaults')
-const { PEERS } = require('../config')
+const { DISABLE_PEER_ALIAS_CHECK } = require('../config')
 const Key = require('../contact-api/key')
 
 /** @type {import('../contact-api/SimpleGUN').ISEA} */
@@ -1277,23 +1277,33 @@ const register = async (alias, pass) => {
     )
   }
 
-  const shocknetPeerInUse = PEERS.includes(SHOCK_SUPER_PEER)
-
-  if (shocknetPeerInUse) {
+  if (DISABLE_PEER_ALIAS_CHECK) {
+    logger.warn(`DISABLE_PEER_ALIAS_CHECK true, use only for testing purposes`)
+  } else {
     /**
-     * @type {Record<string, any>}
+     * Peers provided to gun.
      */
-    // @ts-ignore
     const currPeers = gun._.opt.peers
-    // This is a very basic test, only checks that the websocket is there but
-    // doesn't necessarily mean it is connected or that super peer is UP
-    const shocknetPeerConnected = !!currPeers[SHOCK_SUPER_PEER].wire
 
-    if (!shocknetPeerConnected) {
+    if (size(currPeers) === 0) {
+      logger.info(
+        `Unexpected: Duplicate alias check enabled but Gun has no peers set. If you're testing gun without peers set DISABLE_PEER_ALIAS_CHECK to true.`
+      )
       throw new Error(
-        `API Must be connected to super peer to check for duplicate aliases`
+        `Unexpected: Duplicate alias check enabled but Gun has no peers set.`
       )
     }
+
+    /**
+     * Of those, how many are actually connected
+     */
+    const connectedPeers = Object.values(currPeers).filter(p => !!p.wire).length
+
+    if (connectedPeers === 0) {
+      throw new Error(
+        `No connected peers, therefore cannot check for duplicate aliases.`
+      )
+    } // else it's connected to at least one
   }
 
   // this import is done here to avoid circular dependency hell