ton-provider-system 0.2.1 → 0.2.2

package/dist/index.cjs

@@ -753,17 +753,43 @@ var OnFinalityProvider = class extends BaseProvider {
     if (normalized.includes("onfinality.io")) {
       try {
         const url = new URL(normalized);
-        const baseUrl = normalized.split("?")[0];
+        const hasQueryParams = normalized.includes("?");
+        const queryString = hasQueryParams ? normalized.split("?")[1] : "";
+        const hasApiKeyInQuery = queryString.includes("apikey=");
         if (!url.pathname || url.pathname === "/") {
           if (this.provider.apiKey) {
-            return baseUrl.replace(/\/?$/, "/rpc");
+            const baseUrl2 = normalized.split("?")[0];
+            if (hasApiKeyInQuery) {
+              return normalized.replace(/\/?$/, "/rpc");
+            }
+            if (hasQueryParams) {
+              return `${baseUrl2.replace(/\/?$/, "/rpc")}?${queryString}&apikey=${encodeURIComponent(this.provider.apiKey)}`;
+            }
+            return `${baseUrl2.replace(/\/?$/, "/rpc")}?apikey=${encodeURIComponent(this.provider.apiKey)}`;
           }
+          const baseUrl = normalized.split("?")[0];
           return baseUrl.replace(/\/?$/, "/public");
         }
         if (url.pathname === "/rpc" || url.pathname === "/public") {
-          return baseUrl;
+          if (url.pathname === "/rpc") {
+            if (hasApiKeyInQuery) {
+              return normalized;
+            }
+            if (this.provider.apiKey) {
+              const baseUrl = normalized.split("?")[0];
+              if (hasQueryParams) {
+                return `${baseUrl}?${queryString}&apikey=${encodeURIComponent(this.provider.apiKey)}`;
+              }
+              return `${baseUrl}?apikey=${encodeURIComponent(this.provider.apiKey)}`;
+            }
+            return normalized;
+          }
+          if (url.pathname === "/public") {
+            return normalized.split("?")[0];
+          }
+          return normalized;
         }
-        return baseUrl;
+        return normalized;
       } catch {
         if (normalized.includes("{key}")) {
           return normalized.split("?")[0].replace(/\/?$/, "/public");
@@ -771,7 +797,7 @@ var OnFinalityProvider = class extends BaseProvider {
         if (!normalized.includes("/rpc") && !normalized.includes("/public")) {
           return normalized.split("?")[0] + "/public";
         }
-        return normalized.split("?")[0];
+        return normalized;
       }
     }
     return normalized;
@@ -780,9 +806,6 @@ var OnFinalityProvider = class extends BaseProvider {
     const headers = {
       "Content-Type": "application/json"
     };
-    if (this.provider.apiKey) {
-      headers["apikey"] = this.provider.apiKey;
-    }
     return headers;
   }
   parseResponse(data) {
@@ -1086,7 +1109,8 @@ var HealthChecker = class {
       } catch (error) {
         if (provider.type === "onfinality" && normalizedEndpoint.includes("/rpc") && provider.apiKey && error.message?.includes("backend error")) {
           this.logger.debug(`OnFinality /rpc failed, retrying with /public endpoint`);
-          const publicEndpoint = normalizedEndpoint.replace("/rpc", "/public");
+          const baseUrl = normalizedEndpoint.split("?")[0];
+          const publicEndpoint = baseUrl.replace("/rpc", "/public");
           const publicProvider = { ...provider, apiKey: void 0 };
           const publicProviderImpl = createProvider(publicProvider);
           info = await this.callGetMasterchainInfo(publicEndpoint, publicProvider, publicProviderImpl);