Merge pull request #500 from yshing/update-ws-endpoint

Change of Websocket Endpoint to ws.bitmex.com

Author: bitmexthomasb

official-ws/nodejs/index.js

@@ -9,9 +9,13 @@ const getStreams = require('./lib/getStreams');
 const DEFAULT_MAX_TABLE_LEN = 10000;
 
 const endpoints = {
-  production: 'wss://www.bitmex.com/realtime',
-  testnet: 'wss://testnet.bitmex.com/realtime'
+  production: 'wss://ws.bitmex.com/realtime',
+  testnet: 'wss://ws.testnet.bitmex.com/realtime'
 };
+const httpEndpoints = {
+  production: 'https://www.bitmex.com/api/v1',
+  testnet: 'https://testnet.bitmex.com/api/v1'
+}
 const noSymbolTables = BitMEXClient.noSymbolTables = [
   'account',
   'affiliate',
@@ -45,6 +49,9 @@ function BitMEXClient(options) {
   if (!options.endpoint) {
     options.endpoint = options.testnet ? endpoints.testnet : endpoints.production;
   }
+  if (!options.httpEndpoint) {
+    options.httpEndpoint = options.testnet ? httpEndpoints.testnet : httpEndpoints.production;
+  }
   if (process.env.BITMEX_ENDPOINT) options.endpoint = process.env.BITMEX_ENDPOINT;
   debug(options)
 
@@ -57,7 +64,7 @@ function BitMEXClient(options) {
   }
 
   // Get valid streams so we can validate our subscriptions.
-  getStreams(options.endpoint, function(err, streams) {
+  getStreams(options.httpEndpoint, function(err, streams) {
     if (err) throw err;
     emitter.initialized = true;
     emitter.streams = streams;

official-ws/nodejs/lib/getStreams.js

@@ -1,16 +1,9 @@
 const superagent = require('superagent');
-const url = require('url');
 const debug = require('debug')('BitMEX:realtime-api:getStreams');
 
-module.exports = function(wsEndpoint, callback) {
-  const parsed = url.parse(wsEndpoint);
-  const httpEndpoint = url.format({
-    protocol: parsed.protocol === 'wss:' ? 'https:' : 'http',
-    host: parsed.host
-  });
-
+module.exports = function(httpEndpoint, callback) {
   superagent
-  .get(httpEndpoint + '/api/v1/schema/websocketHelp')
+  .get(httpEndpoint + '/schema/websocketHelp')
   .end(function(err, res) {
     if (err) return callback(err);
     const streams = res.body.subscriptionSubjects;

official-ws/nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitmex-realtime-api",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "A library for interacting with BitMEX's websocket API.",
   "main": "index.js",
   "repository": "https://github.com/BitMEX/api-connectors.git",

official-ws/python/README.md

@@ -16,7 +16,7 @@ and unauthenticated clients. Some endpoints require credentials, for more info s
 To get started, instantiate a connection:
 
     from bitmex_websocket import BitMEXWebsocket
-    ws = BitMEXWebsocket(endpoint="https://testnet.bitmex.com/api/v1", symbol="XBTUSD", api_key=None, api_secret=None)
+    ws = BitMEXWebsocket(endpoint="wss://ws.testnet.bitmex.com/realtime", symbol="XBTUSD", api_key=None, api_secret=None)
 
 If you want to subscribe to authenticated data streams, [create an API key](https://testnet.bitmex.com/app/apiKeys) and
 supply the corresponding values in `api_key` and `api_secret`. BitMEX has two systems - `testnet` for simulated

official-ws/python/bitmex_websocket.py

@@ -163,8 +163,7 @@ def __get_url(self, subscriptions):
         ), subscriptions)
 
         urlParts = list(urllib.parse.urlparse(self.endpoint))
-        urlParts[0] = urlParts[0].replace('http', 'ws')
-        urlParts[2] = "/realtime?subscribe={}".format(','.join(subscriptions_full))
+        urlParts[2] += "?subscribe={}".format(','.join(subscriptions_full))
         return urllib.parse.urlunparse(urlParts)
 
     def __wait_for_account(self):

official-ws/python/main.py

@@ -8,7 +8,7 @@ def run():
     logger = setup_logger()
 
     # Instantiating the WS will make it connect. Be sure to add your api_key/api_secret.
-    ws = BitMEXWebsocket(endpoint="https://testnet.bitmex.com/api/v1", symbol="XBTUSD",
+    ws = BitMEXWebsocket(endpoint="wss://ws.testnet.bitmex.com/realtime", symbol="XBTUSD",
                          api_key=None, api_secret=None)
 
     logger.info("Instrument data: %s" % ws.get_instrument())

official-ws/python/setup.py

@@ -5,7 +5,7 @@
 here = dirname(__file__)
 
 setup(name='bitmex-ws',
-      version='0.4.0',
+      version='0.5.0',
       description='Sample adapter for connecting to the BitMEX Websocket API.',
       long_description=open(join(here, 'README.md')).read(),
       author='Samuel Reed',