@dignetwork/dig-sdk 0.0.1-alpha.151 → 0.0.1-alpha.152

package/dist/blockchain/ServerCoin.js

@@ -143,7 +143,7 @@ class ServerCoin {
     // Sample server coins by epoch
     async sampleServerCoinsByEpoch(epoch, sampleSize = 5, blacklist = []) {
         // We dont want our own IP to be included
-        const myIp = await (0, network_1.getPublicIpAddress)();
+        const myIp = await (0, network_1.getPublicHost)();
         if (myIp) {
             blacklist.push(myIp);
         }

package/dist/utils/PeerRanker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PeerRanker.d.ts","sourceRoot":"","sources":["../../src/utils/PeerRanker.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,WAAW,CAAW;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAS;IAChC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAS;IAC/B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAS;IAG/B,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,YAAY,CAAa;IAEjC;;;OAGG;gBACS,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,MAAa,EAAE,cAAc,GAAE,MAAoB;IAW/F;;;;;;OAMG;YACW,cAAc;IAoD5B;;;;;OAKG;YACW,gBAAgB;IA6C9B;;;;;OAKG;IACU,SAAS,CAAC,QAAQ,GAAE,MAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAmCtE;;;;OAIG;IACI,eAAe,IAAI,WAAW,GAAG,IAAI;IAW5C;;OAEG;IACI,aAAa,IAAI,IAAI;CAG7B"}
+{"version":3,"file":"PeerRanker.d.ts","sourceRoot":"","sources":["../../src/utils/PeerRanker.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,WAAW,CAAW;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAS;IAChC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAS;IAC/B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAS;IAG/B,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,YAAY,CAAa;IAEjC;;;OAGG;gBACS,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,MAAa,EAAE,cAAc,GAAE,MAAoB;IAW/F;;;;;;OAMG;YACW,cAAc;IAkD5B;;;;;OAKG;YACW,gBAAgB;IA4C9B;;;;;OAKG;IACU,SAAS,CAAC,QAAQ,GAAE,MAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAmCtE;;;;OAIG;IACI,eAAe,IAAI,WAAW,GAAG,IAAI;IAW5C;;OAEG;IACI,aAAa,IAAI,IAAI;CAG7B"}

package/dist/utils/PeerRanker.js

@@ -42,7 +42,6 @@ class PeerRanker {
     async measureLatency(ip) {
         const cachedMetrics = peerCache.get(ip);
         if (cachedMetrics && cachedMetrics.latency) {
-            console.log(`Latency for IP ${ip} retrieved from cache.`);
             return cachedMetrics.latency;
         }
         const url = `https://${ip}:4159/diagnostics/ping`;
@@ -83,7 +82,6 @@ class PeerRanker {
             return latency;
         }
         catch (error) {
-            console.error(`Latency measurement failed for IP ${ip}:`, error.message);
             throw new Error(`Latency measurement failed for IP ${ip}`);
         }
     }
@@ -128,7 +126,6 @@ class PeerRanker {
             return bandwidth;
         }
         catch (error) {
-            console.error(`Bandwidth measurement failed for IP ${ip}:`, error.message);
             throw new Error(`Bandwidth measurement failed for IP ${ip}`);
         }
     }

package/dist/utils/network.d.ts

@@ -1,3 +1,3 @@
-export declare const getPublicIpAddress: () => Promise<string | undefined>;
+export declare const getPublicHost: () => Promise<string | undefined>;
 export declare const formatHost: (host: string) => string;
 //# sourceMappingURL=network.d.ts.map

package/dist/utils/network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/utils/network.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CA6CrE,CAAC;AAGF,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,MAUzC,CAAC"}
+{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/utils/network.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CA+ChE,CAAC;AAIF,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,MAUzC,CAAC"}

package/dist/utils/network.js

@@ -3,29 +3,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatHost = exports.getPublicIpAddress = void 0;
-/*
- * Stopgap until better solution for finding public IPS found
- */
+exports.formatHost = exports.getPublicHost = void 0;
 const superagent_1 = __importDefault(require("superagent"));
 const Environment_1 = require("./Environment");
 const MAX_RETRIES = 5;
 const RETRY_DELAY = 2000; // in milliseconds
 // Regular expression for validating both IPv4 and IPv6 addresses
 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}|:)|::)$/;
-// Helper function to validate the IP address
-const isValidIp = (ip) => {
-    return ipv4Regex.test(ip) || ipv6Regex.test(ip);
+const ipv6Regex = /^(([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}|:))$/;
+// 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) => {
+    return ipv4Regex.test(host) || ipv6Regex.test(host) || hostnameRegex.test(host);
 };
-const getPublicIpAddress = async () => {
-    const publicIp = Environment_1.Environment.PUBLIC_IP;
-    if (publicIp) {
-        console.log("Public IP address from env:", publicIp);
-        if (isValidIp(publicIp)) {
-            return publicIp;
+const getPublicHost = async () => {
+    const publicHost = Environment_1.Environment.PUBLIC_IP;
+    if (publicHost) {
+        console.log("Public IP/Hostname from env:", publicHost);
+        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;
     }
     let attempt = 0;
@@ -34,24 +33,24 @@ const getPublicIpAddress = async () => {
             const response = await superagent_1.default.get("https://api.datalayer.storage/user/v1/get_user_ip");
             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) {
             attempt++;
-            console.error(`Error fetching public IP address (Attempt ${attempt}):`, error.message);
+            console.error(`Error fetching public host (Attempt ${attempt}):`, error.message);
             if (attempt >= MAX_RETRIES) {
-                throw new Error("Could not retrieve public IP address after several attempts");
+                throw new Error("Could not retrieve public host after several attempts");
             }
             await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY));
         }
     }
 };
-exports.getPublicIpAddress = getPublicIpAddress;
+exports.getPublicHost = getPublicHost;
 // Helper function to wrap IPv6 addresses in brackets
 const formatHost = (host) => {
     const ipv6Pattern = /^[a-fA-F0-9:]+$/; // Simple regex to match raw IPv6 addresses (without brackets)

package/package.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",