Move Server to using built-in URL

src/account_call_builder.ts

@@ -10,12 +10,12 @@ import { ServerApi } from "./server_api";
  * @class AccountCallBuilder
  * @extends CallBuilder
  * @constructor
- * @param {string} serverUrl Horizon server URL.
+ * @param {string|URL} serverUrl Horizon server URL.
  */
 export class AccountCallBuilder extends CallBuilder<
   ServerApi.CollectionPage<ServerApi.AccountRecord>
 > {
-  constructor(serverUrl: URI) {
+  constructor(serverUrl: URL | string) {
     super(serverUrl);
     this.segment("accounts");
   }

src/assets_call_builder.ts

@@ -8,12 +8,12 @@ import { ServerApi } from "./server_api";
  * @class AssetsCallBuilder
  * @constructor
  * @extends CallBuilder
- * @param {string} serverUrl Horizon server URL.
+ * @param {string|URL} serverUrl Horizon server URL.
  */
 export class AssetsCallBuilder extends CallBuilder<
   ServerApi.CollectionPage<ServerApi.AssetRecord>
 > {
-  constructor(serverUrl: URI) {
+  constructor(serverUrl: URL | string) {
     super(serverUrl);
     this.segment("assets");
   }

src/call_builder.ts

@@ -1,4 +1,3 @@
-import URI from "urijs";
 import URITemplate from "urijs/src/URITemplate";
 
 import { BadRequestError, NetworkError, NotFoundError } from "./errors";
@@ -45,7 +44,7 @@ export class CallBuilder<
 
   public filter: string[][];
 
-  constructor(serverUrl: URL | URI, neighborRoot: string = "") {
+  constructor(serverUrl: URL | string, neighborRoot: string = "") {
     this.url = new URL(serverUrl.toString());
 
     this.filter = [];

src/claimable_balances_call_builder.ts

@@ -10,12 +10,12 @@ import { ServerApi } from "./server_api";
  * @class ClaimableBalanceCallBuilder
  * @constructor
  * @extends CallBuilder
- * @param {string} serverUrl Horizon server URL.
+ * @param {URL|string} serverUrl Horizon server URL.
  */
 export class ClaimableBalanceCallBuilder extends CallBuilder<
   ServerApi.CollectionPage<ServerApi.ClaimableBalanceRecord>
 > {
-  constructor(serverUrl: URI) {
+  constructor(serverUrl: URL|string) {
     super(serverUrl);
     this.segment("claimable_balances");
   }

src/effect_call_builder.ts

@@ -9,12 +9,12 @@ import { ServerApi } from "./server_api";
  * @extends CallBuilder
  * @see [All Effects](https://developers.stellar.org/api/resources/effects/)
  * @constructor
- * @param {string} serverUrl Horizon server URL.
+ * @param {string|URL} serverUrl Horizon server URL.
  */
 export class EffectCallBuilder extends CallBuilder<
   ServerApi.CollectionPage<ServerApi.EffectRecord>
 > {
-  constructor(serverUrl: URI) {
+  constructor(serverUrl: URL | string) {
     super(serverUrl, "effects");
     this.segment("effects");
   }

src/friendbot_builder.ts

@@ -1,7 +1,7 @@
 import { CallBuilder } from "./call_builder";
 
 export class FriendbotBuilder extends CallBuilder<any> {
-  constructor(serverUrl: URI, address: string) {
+  constructor(serverUrl: URL | string, address: string) {
     super(serverUrl);
     this.segment("friendbot");
     this.url.searchParams.set("addr", address);

src/ledger_call_builder.ts

@@ -9,12 +9,12 @@ import { ServerApi } from "./server_api";
  * @constructor
  * @class LedgerCallBuilder
  * @extends CallBuilder
- * @param {string} serverUrl Horizon server URL.
+ * @param {string|URL} serverUrl Horizon server URL.
  */
 export class LedgerCallBuilder extends CallBuilder<
   ServerApi.CollectionPage<ServerApi.LedgerRecord>
 > {
-  constructor(serverUrl: URI) {
+  constructor(serverUrl: URL | string) {
     super(serverUrl);
     this.segment("ledgers");
   }

src/liquidity_pool_call_builder.ts

@@ -10,12 +10,12 @@ import { ServerApi } from "./server_api";
  * @class LiquidityPoolCallBuilder
  * @extends CallBuilder
  * @constructor
- * @param {string} serverUrl Horizon server URL.
+ * @param {string|URL} serverUrl Horizon server URL.
  */
 export class LiquidityPoolCallBuilder extends CallBuilder<
   ServerApi.CollectionPage<ServerApi.LiquidityPoolRecord>
 > {
-  constructor(serverUrl: URI) {
+  constructor(serverUrl: URL | string) {
     super(serverUrl);
     this.segment("liquidity_pools");
   }

src/offer_call_builder.ts

@@ -10,12 +10,12 @@ import { ServerApi } from "./server_api";
  * @class OfferCallBuilder
  * @constructor
  * @extends CallBuilder
- * @param {string} serverUrl Horizon server URL.
+ * @param {string|URL} serverUrl Horizon server URL.
  */
 export class OfferCallBuilder extends CallBuilder<
   ServerApi.CollectionPage<ServerApi.OfferRecord>
 > {
-  constructor(serverUrl: URI) {
+  constructor(serverUrl: URL | string) {
     super(serverUrl, "offers");
     this.segment("offers");
   }

src/operation_call_builder.ts

@@ -9,12 +9,12 @@ import { ServerApi } from "./server_api";
  * @class OperationCallBuilder
  * @constructor
  * @extends CallBuilder
- * @param {string} serverUrl Horizon server URL.
+ * @param {string|URL} serverUrl Horizon server URL.
  */
 export class OperationCallBuilder extends CallBuilder<
   ServerApi.CollectionPage<ServerApi.OperationRecord>
 > {
-  constructor(serverUrl: URI) {
+  constructor(serverUrl: URL | string) {
     super(serverUrl, "operations");
     this.segment("operations");
   }

src/orderbook_call_builder.ts

@@ -7,12 +7,12 @@ import { ServerApi } from "./server_api";
  *
  * Do not create this object directly, use {@link Server#orderbook}.
  * @see [Orderbook Details](https://developers.stellar.org/api/aggregations/order-books/)
- * @param {string} serverUrl serverUrl Horizon server URL.
+ * @param {string|URL} serverUrl serverUrl Horizon server URL.
  * @param {Asset} selling Asset being sold
  * @param {Asset} buying Asset being bought
  */
 export class OrderbookCallBuilder extends CallBuilder<ServerApi.OrderbookRecord> {
-  constructor(serverUrl: URI, selling: Asset, buying: Asset) {
+  constructor(serverUrl: URL | string, selling: Asset, buying: Asset) {
     super(serverUrl);
     this.segment("order_book");
     if (!selling.isNative()) {

src/path_call_builder.ts

@@ -20,7 +20,7 @@ import { ServerApi } from "./server_api";
  * Do not create this object directly, use {@link Server#paths}.
  * @see [Find Payment Paths](https://developers.stellar.org/api/aggregations/paths/)
  * @extends CallBuilder
- * @param {string} serverUrl Horizon server URL.
+ * @param {string|URL} serverUrl Horizon server URL.
  * @param {string} source The sender's account ID. Any returned path must use a source that the sender can hold.
  * @param {string} destination The destination account ID that any returned path should use.
  * @param {Asset} destinationAsset The destination asset.
@@ -30,7 +30,7 @@ export class PathCallBuilder extends CallBuilder<
   ServerApi.CollectionPage<ServerApi.PaymentPathRecord>
 > {
   constructor(
-    serverUrl: URI,
+    serverUrl: URL | string,
     source: string,
     destination: string,
     destinationAsset: Asset,

src/payment_call_builder.ts

@@ -8,12 +8,12 @@ import { ServerApi } from "./server_api";
  * @see [All Payments](https://developers.stellar.org/api/resources/payments/)
  * @constructor
  * @extends CallBuilder
- * @param {string} serverUrl Horizon server URL.
+ * @param {string|URL} serverUrl Horizon server URL.
  */
 export class PaymentCallBuilder extends CallBuilder<
   ServerApi.CollectionPage<ServerApi.PaymentOperationRecord>
 > {
-  constructor(serverUrl: URI) {
+  constructor(serverUrl: URL | string) {
     super(serverUrl, "payments");
     this.segment("payments");
   }

src/server.ts

@@ -8,7 +8,6 @@ import {
   Transaction,
   xdr,
 } from "stellar-base";
-import URI from "urijs";
 
 import { CallBuilder } from "./call_builder";
 import { Config } from "./config";
@@ -69,10 +68,10 @@ export class Server {
   /**
    * Horizon Server URL (ex. `https://horizon-testnet.stellar.org`).
    */
-  public readonly serverURL: URI;
+  public readonly serverURL: URL;
 
   constructor(serverURL: string | URL, opts: Server.Options = {}) {
-    this.serverURL = URI(serverURL.toString());
+    this.serverURL = new URL(serverURL.toString());
 
     const allowHttp = opts.allowHttp ?? Config.isAllowHttp();
     const customHeaders: Record<string, string> = {};
@@ -96,7 +95,7 @@ export class Server {
       });
     }
 
-    if (this.serverURL.protocol() !== "https" && !allowHttp) {
+    if (this.serverURL.protocol !== "https:" && !allowHttp) {
       throw new Error("Cannot connect to insecure horizon server");
     }
   }
@@ -136,7 +135,7 @@ export class Server {
     _isRetry: boolean = false,
   ): Promise<Server.Timebounds> {
     // HorizonAxiosClient instead of this.ledgers so we can get at them headers
-    const currentTime = getCurrentServerTime(this.serverURL.hostname());
+    const currentTime = getCurrentServerTime(this.serverURL.hostname);
 
     if (currentTime) {
       return {
@@ -155,7 +154,7 @@ export class Server {
 
     // otherwise, retry (by calling the root endpoint)
     // toString automatically adds the trailing slash
-    await HorizonAxiosClient.get(URI(this.serverURL as any).toString());
+    await HorizonAxiosClient.get(this.serverURL.toString());
     return await this.fetchTimebounds(seconds, true);
   }
 
@@ -178,7 +177,7 @@ export class Server {
    */
   public async feeStats(): Promise<Horizon.FeeStatsResponse> {
     const cb = new CallBuilder<Horizon.FeeStatsResponse>(
-      URI(this.serverURL as any),
+      this.serverURL,
     );
     cb.filter.push(["fee_stats"]);
     return cb.call();
@@ -506,28 +505,28 @@ export class Server {
    * @returns {AccountCallBuilder} New {@link AccountCallBuilder} object configured by a current Horizon server configuration.
    */
   public accounts(): AccountCallBuilder {
-    return new AccountCallBuilder(URI(this.serverURL as any));
+    return new AccountCallBuilder(this.serverURL);
   }
 
   /**
    * @returns {ClaimableBalanceCallBuilder} New {@link ClaimableBalanceCallBuilder} object configured by a current Horizon server configuration.
    */
   public claimableBalances(): ClaimableBalanceCallBuilder {
-    return new ClaimableBalanceCallBuilder(URI(this.serverURL as any));
+    return new ClaimableBalanceCallBuilder(this.serverURL);
   }
 
   /**
    * @returns {LedgerCallBuilder} New {@link LedgerCallBuilder} object configured by a current Horizon server configuration.
    */
   public ledgers(): LedgerCallBuilder {
-    return new LedgerCallBuilder(URI(this.serverURL as any));
+    return new LedgerCallBuilder(this.serverURL);
   }
 
   /**
    * @returns {TransactionCallBuilder} New {@link TransactionCallBuilder} object configured by a current Horizon server configuration.
    */
   public transactions(): TransactionCallBuilder {
-    return new TransactionCallBuilder(URI(this.serverURL as any));
+    return new TransactionCallBuilder(this.serverURL);
   }
 
   /**
@@ -545,7 +544,7 @@ export class Server {
    * @returns {OfferCallBuilder} New {@link OfferCallBuilder} object
    */
   public offers(): OfferCallBuilder {
-    return new OfferCallBuilder(URI(this.serverURL as any));
+    return new OfferCallBuilder(this.serverURL);
   }
 
   /**
@@ -555,7 +554,7 @@ export class Server {
    */
   public orderbook(selling: Asset, buying: Asset): OrderbookCallBuilder {
     return new OrderbookCallBuilder(
-      URI(this.serverURL as any),
+      this.serverURL,
       selling,
       buying,
     );
@@ -566,22 +565,22 @@ export class Server {
    * @returns {TradesCallBuilder} New {@link TradesCallBuilder} object configured by a current Horizon server configuration.
    */
   public trades(): TradesCallBuilder {
-    return new TradesCallBuilder(URI(this.serverURL as any));
+    return new TradesCallBuilder(this.serverURL);
   }
 
   /**
    * @returns {OperationCallBuilder} New {@link OperationCallBuilder} object configured by a current Horizon server configuration.
    */
   public operations(): OperationCallBuilder {
-    return new OperationCallBuilder(URI(this.serverURL as any));
+    return new OperationCallBuilder(this.serverURL);
   }
 
   /**
    * @returns {LiquidityPoolCallBuilder} New {@link LiquidityPoolCallBuilder}
    *     object configured to the current Horizon server settings.
    */
   public liquidityPools(): LiquidityPoolCallBuilder {
-    return new LiquidityPoolCallBuilder(URI(this.serverURL));
+    return new LiquidityPoolCallBuilder(this.serverURL);
   }
 
   /**
@@ -616,7 +615,7 @@ export class Server {
     destinationAmount: string,
   ): PathCallBuilder {
     return new StrictReceivePathCallBuilder(
-      URI(this.serverURL as any),
+      this.serverURL,
       source,
       destinationAsset,
       destinationAmount,
@@ -644,7 +643,7 @@ export class Server {
     destination: string | Asset[],
   ): PathCallBuilder {
     return new StrictSendPathCallBuilder(
-      URI(this.serverURL as any),
+      this.serverURL,
       sourceAsset,
       sourceAmount,
       destination,
@@ -656,15 +655,15 @@ export class Server {
    * Horizon server configuration.
    */
   public payments(): PaymentCallBuilder {
-    return new PaymentCallBuilder(URI(this.serverURL as any) as any);
+    return new PaymentCallBuilder(this.serverURL as any);
   }
 
   /**
    * @returns {EffectCallBuilder} New {@link EffectCallBuilder} instance configured with the current
    * Horizon server configuration
    */
   public effects(): EffectCallBuilder {
-    return new EffectCallBuilder(URI(this.serverURL as any) as any);
+    return new EffectCallBuilder(this.serverURL as any);
   }
 
   /**
@@ -674,7 +673,7 @@ export class Server {
    * @private
    */
   public friendbot(address: string): FriendbotBuilder {
-    return new FriendbotBuilder(URI(this.serverURL as any), address);
+    return new FriendbotBuilder(this.serverURL, address);
   }
 
   /**
@@ -683,7 +682,7 @@ export class Server {
    * @returns {AssetsCallBuilder} New AssetsCallBuilder instance
    */
   public assets(): AssetsCallBuilder {
-    return new AssetsCallBuilder(URI(this.serverURL as any));
+    return new AssetsCallBuilder(this.serverURL);
   }
 
   /**
@@ -723,7 +722,7 @@ export class Server {
     offset: number,
   ): TradeAggregationCallBuilder {
     return new TradeAggregationCallBuilder(
-      URI(this.serverURL as any),
+      this.serverURL,
       base,
       counter,
       start_time,