@hiero-ledger/sdk 2.73.1 → 2.73.2

package/src/account/AccountId.js

@@ -179,17 +179,15 @@ export default class AccountId {
         if (this.evmAddress === null) {
             throw new Error("field `evmAddress` should not be null");
         }
-        const mirrorUrl = client.mirrorNetwork[0].slice(
-            0,
-            client.mirrorNetwork[0].indexOf(":"),
-        );
+        const mirrorRestApiBaseUrl = client.mirrorRestApiBaseUrl;
+
+        const url = `${mirrorRestApiBaseUrl}/accounts/${this.evmAddress.toString()}`;
 
         await new Promise((resolve) => {
             setTimeout(resolve, 3000);
         });
 
         /* eslint-disable */
-        const url = `https://${mirrorUrl}/api/v1/accounts/${this.evmAddress.toString()}`;
         const response = await fetch(url);
         const data = await response.json();
         const mirrorAccountId = data.account;
@@ -211,17 +209,15 @@ export default class AccountId {
         if (this.num === null) {
             throw new Error("field `num` should not be null");
         }
-        const mirrorUrl = client.mirrorNetwork[0].slice(
-            0,
-            client.mirrorNetwork[0].indexOf(":"),
-        );
+        const mirrorRestApiBaseUrl = client.mirrorRestApiBaseUrl;
+
+        const url = `${mirrorRestApiBaseUrl}/accounts/${this.num.toString()}`;
 
         await new Promise((resolve) => {
             setTimeout(resolve, 3000);
         });
 
         /* eslint-disable */
-        const url = `https://${mirrorUrl}/api/v1/accounts/${this.num.toString()}`;
         const response = await fetch(url);
         const data = await response.json();
         const mirrorAccountId = data.evm_address;

package/src/client/Client.js

@@ -267,6 +267,33 @@ export default class Client {
         return this._mirrorNetwork.network;
     }
 
+    /**
+     * @returns {string}
+     * @throws {Error} When no mirror network is configured or available
+     */
+    get mirrorRestApiBaseUrl() {
+        try {
+            const mirrorNode = this._mirrorNetwork.getNextMirrorNode();
+            const host = mirrorNode.address.address;
+            const port = mirrorNode.address.port;
+
+            if (!host || !port) {
+                throw new Error(
+                    "Mirror node has invalid address configuration",
+                );
+            }
+
+            const scheme = this._getSchemeFromHostAndPort(host, port);
+
+            return `${scheme}://${host}:${port}/api/v1`;
+        } catch (error) {
+            // Re-throw with a more descriptive error message
+            throw new Error(
+                "Client has no mirror network configured or no healthy mirror nodes are available",
+            );
+        }
+    }
+
     /**
      * @returns {boolean}
      */
@@ -805,6 +832,34 @@ export default class Client {
         }, this._networkUpdatePeriod);
     }
 
+    /**
+     * Determines the appropriate scheme (http/https) based on the host and port.
+     *
+     * @private
+     * @param {string} host - The host address
+     * @param {number} port - The port number
+     * @returns {string} - The scheme ('http' or 'https')
+     */
+    _getSchemeFromHostAndPort(host, port) {
+        // For localhost and 127.0.0.1, use HTTP scheme
+        if (host === "localhost" || host === "127.0.0.1") {
+            return "http";
+        }
+
+        // Standard HTTPS ports
+        if (port === 443) {
+            return "https";
+        }
+
+        // Standard HTTP ports
+        if (port === 80) {
+            return "http";
+        }
+
+        // For other ports, assume HTTPS for security
+        return "https";
+    }
+
     /**
      * @returns {boolean}
      */

package/src/query/MirrorNodeContractQuery.js

@@ -217,29 +217,26 @@ export default class MirrorNodeContractQuery {
             throw new Error("Contract ID is not set");
         }
         this._fillEvmAddress();
-        let mirrorNetworkAddress = client.mirrorNetwork[0];
-        const contractCallEndpoint = "/api/v1/contracts/call";
+        let mirrorRestApiBaseUrl = client.mirrorRestApiBaseUrl;
+        const contractCallEndpointPath = "/contracts/call";
 
-        if (!client.ledgerId || client.ledgerId?.isLocalNode()) {
-            const currentMirrorNetworkPort =
-                client.mirrorNetwork[0].split(":")[1];
-            mirrorNetworkAddress = "http://"
-                .concat(
-                    client.mirrorNetwork[0].replace(
-                        currentMirrorNetworkPort,
-                        "8545",
-                    ),
-                )
-                .concat(contractCallEndpoint);
-        } else {
-            let trimmed = client.mirrorNetwork[0].split(":");
-            mirrorNetworkAddress = "https://"
-                .concat(trimmed[0])
-                .concat(contractCallEndpoint);
+        // Check if this is a local environment (localhost or 127.0.0.1)
+        const mirrorNode = client._mirrorNetwork.getNextMirrorNode();
+        const host = mirrorNode.address.address;
+        const isLocalEnvironment = host === "localhost" || host === "127.0.0.1";
+
+        if (isLocalEnvironment) {
+            // For local environments, use HTTP scheme and port 8545
+            const url = new URL(mirrorRestApiBaseUrl);
+            url.protocol = "http:";
+            url.port = "8545";
+            mirrorRestApiBaseUrl = url.toString();
         }
 
+        const contractCallEndpointUrl = `${mirrorRestApiBaseUrl}${contractCallEndpointPath}`;
+
         // eslint-disable-next-line n/no-unsupported-features/node-builtins
-        const response = await fetch(mirrorNetworkAddress, {
+        const response = await fetch(contractCallEndpointUrl, {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",