bug fix

Author: CoNETProject

src/App.tsx

@@ -15,7 +15,7 @@ global.Buffer = require('buffer').Buffer;
 
 function App() {
 
-  const { setProfile, setMiningData, allRegions, setClosestRegion } = useDaemonContext();
+  const { setProfile, setMiningData, allRegions, setClosestRegion, setaAllNodes } = useDaemonContext();
 
   useEffect(() => {
     // if (allRegions.length === 0) return
@@ -24,10 +24,11 @@ function App() {
       await createOrGetWallet();
       listenProfileVer(setProfile);
 
-      
-
-      await getAllNodes(allRegions, setClosestRegion, () => {
-		if (!CoNET_Data || !CoNET_Data?.profiles) return
+      await getAllNodes(allRegions, setClosestRegion, (allNodes: nodes_info[]) => {
+		setaAllNodes(allNodes)
+		if (!CoNET_Data || !CoNET_Data?.profiles) {
+			return
+		}
 		startMiningV2(CoNET_Data?.profiles?.[0], allRegions, setMiningData);
 	  });
 

src/components/MiningStatus/index.tsx

@@ -15,15 +15,15 @@ const MiningStatus = () => {
   }, miningData)
 
   return (
-    <div style={{width:"80%"}}>
+    <div style={{width:"90%"}}>
 		<div className="mining-status">
-			<div className="mining">
-			<div className={`circle ${isMiningUp ? "green" : "red"}`}></div>
-			<p>Mining {isMiningUp ? "UP" : "DOWN"}</p>
-			</div>
-			<div className="rate">Rate: {miningData?.rate ? miningData.rate : <Skeleton height="14px" width="45px" />}</div>
+			{/* <div className="mining">
+				<div className={`circle ${isMiningUp ? "green" : "red"}`}></div>
+				<p>Mining {isMiningUp ? "UP" : "DOWN"}</p>
+			</div> */}
+			<div className="rate">Rate: <div className={`circle ${isMiningUp ? "green" : "red"}`}></div><div>{miningData?.rate ? miningData.rate : <Skeleton height="14px" width="45px" />}</div></div>
 			<div className="miners">Miners: {miningData?.online ? miningData.online : <Skeleton height="14px" width="45px" />}</div>
-			<div className="miners">Online VPN Users: {miningData?.totalUsers ? miningData.totalUsers : <Skeleton height="14px" width="45px" />}</div>
+			<div className="miners">VPN Users: {miningData?.totalUsers ? miningData.totalUsers : <Skeleton height="14px" width="45px" />}</div>
 
 		</div>
     </div>

src/pages/Home/index.tsx

@@ -9,13 +9,13 @@ import MiningStatus from '../../components/MiningStatus';
 import BlobWrapper from '../../components/BlobWrapper';
 import Menu from '../../components/Menu';
 import Skeleton from '../../components/Skeleton';
-import { allNodes, closestNodes, maxNodes, currentScanNodeNumber } from '../../services/mining';
+import {maxNodes, currentScanNodeNumber } from '../../services/mining';
 import { CoNET_Data } from '../../utils/globals';
 
 
 
 const Home = () => {
-  const { profile, sRegion, setSRegion, setAllRegions, allRegions, isRandom, setIsRandom} = useDaemonContext();
+  const { profile, sRegion, setSRegion, setAllRegions, allRegions, isRandom, setIsRandom, getAllNodes, closestRegion} = useDaemonContext();
   const [power, setPower] = useState<boolean>(false);
   const [isInitialLoading, setIsInitialLoading] = useState<boolean>(true);
   const [isConnectionLoading, setIsConnectionLoading] = useState<boolean>(false)
@@ -64,8 +64,11 @@ const Home = () => {
       }))).map((regionStr: any) => JSON.parse(regionStr)); // Convert the string back to an object
 
       const unitedStatesIndex = treatedRegions.findIndex((region: any) => region.code === 'US')
-      setSRegion(unitedStatesIndex)
-      setIsRandom(false);
+	  if (sRegion<0) {
+		setSRegion(unitedStatesIndex)
+		setIsRandom(false);
+	  }
+
 
       setAllRegions(treatedRegions);
     };
@@ -75,7 +78,13 @@ const Home = () => {
     _getAllRegions()
 
     // setTimeout(() => setIsInitialLoading(false), 3000);
-  }, [allRegions]);
+  }, []);
+
+//   useEffect(() => {
+// 	if (sRegion > -1) {
+// 		console.log(`sRegion = ${sRegion}`)
+// 	}
+//   },[sRegion])
 
   const toggleMenu = () => {
     setIsMenuVisible(prevState => !prevState);
@@ -109,7 +118,7 @@ type Native_StartVPNObj = {
 		return 
 	}
 
-    try {
+    
       setIsConnectionLoading(true)
       if (sRegion === -1) {
         selectedCountryIndex = Math.floor(Math.random() * allRegions.length)
@@ -118,24 +127,28 @@ type Native_StartVPNObj = {
         selectedCountryIndex = sRegion
       }
 
-      const selectedCountryCode = allRegions[selectedCountryIndex].code
+	  const allNodes = getAllNodes
+	  const exitRegion = allRegions[selectedCountryIndex].code
+	  const exitNodes =  allNodes.filter((n: any) => n.country === exitRegion)
+
+    //   const selectedCountryCode = allRegions[selectedCountryIndex].code
 
-      const nodeListFilteredByClosestRegion = closestNodes
-      const nodeListFilteredBySelectedRegion = allNodes!.filter((n: any) => n.region.endsWith(selectedCountryCode));
+      const entryNodeRegion = closestRegion.node.country
+      const __entryNodes = allNodes.filter((n: any) => n.country === entryNodeRegion);
 
-      const randomNodeIndex = Math.floor(Math.random() * nodeListFilteredBySelectedRegion!.length);
+      const randomExitIndex = Math.floor(Math.random() * (exitNodes.length-1));
 
-      const _exitNode = [nodeListFilteredBySelectedRegion?.[randomNodeIndex]];
+      const _exitNode = [exitNodes[randomExitIndex]]
 
-      let _entryNodes: nodes_info[] = nodeListFilteredByClosestRegion
+	  let _entryNodes = __entryNodes
 
-      if (nodeListFilteredByClosestRegion.length > 5) {
+      if (_entryNodes.length > 5) {
 		_entryNodes = []
         do {
-          const randomNodeIndex = Math.floor(Math.random() * nodeListFilteredByClosestRegion!.length)
-          const choosenNode = nodeListFilteredByClosestRegion[randomNodeIndex]
+          const randomNodeIndex = Math.floor(Math.random() * (__entryNodes.length-1))
+          const choosenNode = __entryNodes[randomNodeIndex]
           _entryNodes.push(choosenNode)
-		  nodeListFilteredByClosestRegion.splice(randomNodeIndex, 1)
+		  __entryNodes.splice(randomNodeIndex, 1)
         } while (_entryNodes.length < 5);
       }
 
@@ -175,9 +188,7 @@ type Native_StartVPNObj = {
       }, 1000)
 
       return
-    } catch (error) {
-      setPower(false);
-    }
+    
   };
 
   const renderButton = () => {

src/providers/DaemonProvider.tsx

@@ -15,6 +15,8 @@ type DaemonContext = {
   setProfile: (profile: any) => void;
   isMiningUp: boolean;
   setIsMiningUp: (val: boolean) => void;
+  setaAllNodes: (data: nodes_info[]) => void
+  getAllNodes: nodes_info[]
 };
 
 type DaemonProps = {
@@ -36,6 +38,8 @@ const defaultContextValue: DaemonContext = {
   setProfile: () => { },
   isMiningUp: false,
   setIsMiningUp: () => { },
+  setaAllNodes: () => {},
+  getAllNodes: []
 };
 
 const Daemon = createContext<DaemonContext>(defaultContextValue);
@@ -53,9 +57,10 @@ export function DaemonProvider({ children }: DaemonProps) {
   const [miningData, setMiningData] = useState<any>(null);
   const [profile, setProfile] = useState<any>(null);
   const [isMiningUp, setIsMiningUp] = useState<boolean>(false);
+  const [getAllNodes, setaAllNodes] = useState<nodes_info[]>([]);
 
   return (
-    <Daemon.Provider value={{ sRegion, setSRegion, allRegions, setAllRegions, closestRegion, setClosestRegion, isRandom, setIsRandom, miningData, setMiningData, profile, setProfile, isMiningUp, setIsMiningUp }}>
+    <Daemon.Provider value={{ sRegion, setSRegion, allRegions, setAllRegions, closestRegion, setClosestRegion, isRandom, setIsRandom, miningData, setMiningData, profile, setProfile, isMiningUp, setIsMiningUp, getAllNodes, setaAllNodes }}>
       {children}
     </Daemon.Provider>
   );

src/services/mining.ts

@@ -66,7 +66,7 @@ const getRandomNodeFromRegion: (region: string) => nodes_info = (
   region: string
 ) => {
   const allNodeInRegion = allNodes.filter((n) => n.region.endsWith(region));
-  const rendomIndex = Math.floor(Math.random() * allNodeInRegion.length - 1);
+  const rendomIndex = Math.floor(Math.random() * (allNodeInRegion.length - 1));
   if (rendomIndex >= allNodeInRegion.length) {
     return allNodeInRegion[0];
   }
@@ -102,7 +102,7 @@ const testClosestRegion = async (callback: () => void) => {
 const getAllNodes = async (
   _allRegions: Region[],
   setClosestRegion: (region: ClosestRegion) => void,
-  callback:()=>void
+  callback:(allnodes: nodes_info[])=>void
 ) => {
   if (getAllNodesProcess) {
 	setClosestRegion(closestRegion[0]);
@@ -159,6 +159,7 @@ const getAllNodes = async (
 		const _country = n.region.split('.')[1]
 		country.set(_country, true)
         n.ip_addr = nodeInfo.ipaddress;
+		n.country = _country;
         n.armoredPublicKey = Buffer.from(nodeInfo.pgp, "base64").toString();
         const pgpKey1 = await readKey({
           armoredKey: n.armoredPublicKey,
@@ -180,7 +181,7 @@ const getAllNodes = async (
   testClosestRegion(() => {
 	maxNodes = currentScanNodeNumber;
 	setClosestRegion(closestRegion[0]);
-	callback();
+	callback(allNodes);
   });
 
 };