Merge pull request #137 from DIG-Network/release/v0.0.1-alpha.152

Release/v0.0.1 alpha.152

Author: MichaelTaylor3D

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.1-alpha.152](https://github.com/DIG-Network/dig-chia-sdk/compare/v0.0.1-alpha.151...v0.0.1-alpha.152) (2024-10-06)
+
+
+### Features
+
+* support hostnames in publicip env ([96a721b](https://github.com/DIG-Network/dig-chia-sdk/commit/96a721ba1aeba4e1abdfb86874fc340b568b6526))
+
 ### [0.0.1-alpha.151](https://github.com/DIG-Network/dig-chia-sdk/compare/v0.0.1-alpha.150...v0.0.1-alpha.151) (2024-10-06)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignetwork/dig-sdk",
-  "version": "0.0.1-alpha.151",
+  "version": "0.0.1-alpha.152",
   "description": "",
   "type": "commonjs",
   "main": "./dist/index.js",

package.json

@@ -14,7 +14,7 @@ import { NconfManager } from "../utils/NconfManager";
 import { CoinData, ServerCoinData } from "../types";
 import { DataStore } from "./DataStore";
 import NodeCache from "node-cache";
-import { getPublicIpAddress } from "../utils/network";
+import { getPublicHost } from "../utils/network";
 import { Environment } from "../utils/Environment";
 
 const serverCoinCollateral = 300_000_000;
@@ -265,7 +265,7 @@ export class ServerCoin {
     blacklist: string[] = []
   ): Promise<string[]> {
     // We dont want our own IP to be included
-    const myIp = await getPublicIpAddress();
+    const myIp = await getPublicHost();
     if (myIp) {
       blacklist.push(myIp);
     }

src/blockchain/ServerCoin.ts

@@ -53,7 +53,6 @@ export class PeerRanker {
   private async measureLatency(ip: string): Promise<number> {
     const cachedMetrics = peerCache.get<PeerMetrics>(ip);
     if (cachedMetrics && cachedMetrics.latency) {
-      console.log(`Latency for IP ${ip} retrieved from cache.`);
       return cachedMetrics.latency;
     }
 
@@ -97,7 +96,6 @@ export class PeerRanker {
 
       return latency;
     } catch (error: any) {
-      console.error(`Latency measurement failed for IP ${ip}:`, error.message);
       throw new Error(`Latency measurement failed for IP ${ip}`);
     }
   }
@@ -148,7 +146,6 @@ export class PeerRanker {
 
       return bandwidth;
     } catch (error: any) {
-      console.error(`Bandwidth measurement failed for IP ${ip}:`, error.message);
       throw new Error(`Bandwidth measurement failed for IP ${ip}`);
     }
   }

src/utils/PeerRanker.ts

@@ -1,6 +1,3 @@
-/*
- * Stopgap until better solution for finding public IPS found
- */
 import superagent from "superagent";
 import { Environment } from "./Environment";
 
@@ -11,22 +8,27 @@ const RETRY_DELAY = 2000; // in milliseconds
 const ipv4Regex =
   /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
 const ipv6Regex =
-  /^(([0-9a-fA-F]{1,4}:){7}([0-9a-fA-F]{1,4}|:)|(([0-9a-fA-F]{1,4}:){1,7}|:):(([0-9a-fA-F]{1,4}:){1,6}|:):([0-9a-fA-F]{1,4}|:):([0-9a-fA-F]{1,4}|:)|::)$/;
+  /^(([0-9a-fA-F]{1,4}:){7}([0-9a-fA-F]{1,4}|:)|(([0-9a-fA-F]{1,7}|:):){1,7}([0-9a-fA-F]{1,4}|:))$/;
 
-// Helper function to validate the IP address
-const isValidIp = (ip: string): boolean => {
-  return ipv4Regex.test(ip) || ipv6Regex.test(ip);
+// Regular expression for validating hostnames
+const hostnameRegex = /^(([a-zA-Z0-9](-*[a-zA-Z0-9])*)\.)*[a-zA-Z]{2,}$/;
+
+// Helper function to validate the IP address or hostname
+const isValidHost = (host: string): boolean => {
+  return ipv4Regex.test(host) || ipv6Regex.test(host) || hostnameRegex.test(host);
 };
 
-export const getPublicIpAddress = async (): Promise<string | undefined> => {
-  const publicIp = Environment.PUBLIC_IP;
+export const getPublicHost = async (): Promise<string | undefined> => {
+  const publicHost = Environment.PUBLIC_IP;
+
+  if (publicHost) {
+    console.log("Public IP/Hostname from env:", publicHost);
 
-  if (publicIp) {
-    console.log("Public IP address from env:", publicIp);
-    if (isValidIp(publicIp)) {
-      return publicIp;
+    if (isValidHost(publicHost)) {
+      return publicHost;
     }
-    console.error("Invalid public IP address in environment variable");
+
+    console.error("Invalid public IP/Hostname in environment variable");
     return undefined;
   }
 
@@ -41,22 +43,22 @@ export const getPublicIpAddress = async (): Promise<string | undefined> => {
       if (response.body && response.body.success) {
         const ipAddress = response.body.ip_address;
 
-        if (isValidIp(ipAddress)) {
+        if (isValidHost(ipAddress)) {
           return ipAddress;
         }
-        throw new Error("Invalid IP address format received");
+        throw new Error("Invalid IP address or hostname format received");
       }
-      throw new Error("Failed to retrieve public IP address");
+      throw new Error("Failed to retrieve public host");
     } catch (error: any) {
       attempt++;
       console.error(
-        `Error fetching public IP address (Attempt ${attempt}):`,
+        `Error fetching public host (Attempt ${attempt}):`,
         error.message
       );
 
       if (attempt >= MAX_RETRIES) {
         throw new Error(
-          "Could not retrieve public IP address after several attempts"
+          "Could not retrieve public host after several attempts"
         );
       }
 
@@ -65,6 +67,7 @@ export const getPublicIpAddress = async (): Promise<string | undefined> => {
   }
 };
 
+
 // Helper function to wrap IPv6 addresses in brackets
 export const formatHost = (host: string): string => {
   const ipv6Pattern = /^[a-fA-F0-9:]+$/; // Simple regex to match raw IPv6 addresses (without brackets)