Merge a81ab03 into 6db6435

src/call_builder.js

@@ -1,10 +1,10 @@
 import {NotFoundError, NetworkError, BadRequestError} from "./errors";
+import HorizonAxiosClient from './horizon_axios_client';
 import forEach from 'lodash/forEach';
 
 let URI = require("urijs");
 let URITemplate = require("urijs/src/URITemplate");
 
-let axios = require("axios");
 var EventSource = (typeof window === 'undefined') ? require('eventsource') : window.EventSource;
 
 /**
@@ -162,7 +162,7 @@ export class CallBuilder {
 
     // Temp fix for: https://github.com/stellar/js-stellar-sdk/issues/15
     url.setQuery('c', Math.random());
-    return axios.get(url.toString())
+    return HorizonAxiosClient.get(url.toString())
       .then(response => response.data)
       .catch(this._handleNetworkError);
   }

src/horizon_axios_client.js

@@ -0,0 +1,9 @@
+let axios = require("axios");
+let version = require('../package.json').version;
+
+export default axios.create({
+  headers: {
+    'X-Client-Name': 'js-stellar-sdk',
+    'X-Client-Version': version,
+  }
+});

src/index.js

@@ -1,9 +1,11 @@
 require('es6-promise').polyfill();
+import HorizonAxiosClient from './horizon_axios_client';
 
 // stellar-sdk classes to expose
 export * from "./errors";
 export {Config} from "./config";
 export {Server} from "./server";
+export {HorizonAxiosClient};
 export {FederationServer, FEDERATION_RESPONSE_MAX_SIZE} from "./federation_server";
 export {StellarTomlResolver, STELLAR_TOML_MAX_SIZE} from "./stellar_toml_resolver";
 

src/server.js

@@ -15,10 +15,10 @@ import {EffectCallBuilder} from "./effect_call_builder";
 import {FriendbotBuilder} from "./friendbot_builder";
 import {AssetsCallBuilder} from "./assets_call_builder";
 import { TradeAggregationCallBuilder } from "./trade_aggregation_call_builder";
+import HorizonAxiosClient from './horizon_axios_client';
 import {xdr} from "stellar-base";
 import isString from "lodash/isString";
 
-let axios = require("axios");
 let URI = require("urijs");
 let URITemplate = require("urijs").URITemplate;
 
@@ -54,7 +54,7 @@ export class Server {
      */
     submitTransaction(transaction) {
         let tx = encodeURIComponent(transaction.toEnvelope().toXDR().toString("base64"));
-        return axios.post(
+        return HorizonAxiosClient.post(
               URI(this.serverURL).segment('transactions').toString(),
               `tx=${tx}`,
               {timeout: SUBMIT_TRANSACTION_TIMEOUT}

test/integration/client_headers_test.js

@@ -0,0 +1,30 @@
+const http = require('http')
+const port = 3000;
+
+describe('integration tests', function() {
+  it("sends client headers", function(done) {
+    if (typeof window !== "undefined") {
+      done();
+      return;
+    }
+
+    var server;
+
+    const requestHandler = (request, response) => {
+      expect(request.headers['x-client-name']).to.be.equal('js-stellar-sdk');
+      expect(request.headers['x-client-version']).to.match(/^[0-9]+\.[0-9]+\.[0-9]+$/);
+      response.end();
+      server.close(() => done());
+    }
+
+    server = http.createServer(requestHandler);
+    server.listen(port, (err) => {
+      if (err) {
+        done(err);
+        return
+      }
+
+      new StellarSdk.Server(`http://localhost:${port}`, {allowHttp: true}).operations().call();
+    })
+  });
+});

test/test-helper.js

@@ -2,6 +2,7 @@ if (typeof window === 'undefined') {
   require("babel-register");
   global.StellarSdk = require('../src/index');
   global.axios = require("axios");
+  global.HorizonAxiosClient = StellarSdk.HorizonAxiosClient;
   var chaiAsPromised = require("chai-as-promised");
   global.chai = require('chai');
   global.chai.should();
@@ -11,4 +12,5 @@ if (typeof window === 'undefined') {
   global.expect = global.chai.expect;
 } else {
   window.axios = StellarSdk.axios;
+  window.HorizonAxiosClient = StellarSdk.HorizonAxiosClient;
 }

test/unit/horizon_path_test.js

@@ -1,7 +1,7 @@
 describe("horizon path tests", function () {
 
   beforeEach(function () {
-    this.axiosMock = sinon.mock(axios);
+    this.axiosMock = sinon.mock(HorizonAxiosClient);
     StellarSdk.Config.setDefault();
     StellarSdk.Network.useTestNetwork();
   });

test/unit/server_test.js

@@ -1,7 +1,7 @@
 describe("server.js tests", function () {
   beforeEach(function () {
     this.server = new StellarSdk.Server('https://horizon-live.stellar.org:1337');
-    this.axiosMock = sinon.mock(axios);
+    this.axiosMock = sinon.mock(HorizonAxiosClient);
     StellarSdk.Config.setDefault();
     StellarSdk.Network.useTestNetwork();
   });