Remove DMS

index.js

@@ -18,7 +18,6 @@ const { RESTv2 } = require('bfx-api-node-rest')
 module.exports = async ({
   bfxRestURL,
   bfxWSURL,
-  bfxHostedWsUrl,
   bfxMetricsWsUrl,
   os,
   releaseVersion,
@@ -58,7 +57,6 @@ module.exports = async ({
     port: wsServerPort,
     restURL: bfxRestURL,
     wsURL: bfxWSURL,
-    hostedURL: bfxHostedWsUrl,
     metricsServerURL: bfxMetricsWsUrl,
     os,
     releaseVersion,

lib/ws_servers/api/algos/algo_worker.js

@@ -235,12 +235,6 @@ class AlgoWorker {
       this.sendError(error)
     })
 
-    this.host.on('meta:reload', async () => {
-      d('meta reloaded')
-      this.pub(['algo.reload'])
-      await this.sendActiveAlgosForAllModes(false)
-    })
-
     this.host.on('ao:stopped', async (data) => {
       const { mode } = this.settings
       const [gid, serialized] = data

lib/ws_servers/api/index.js

@@ -72,7 +72,6 @@ module.exports = class APIWSServer extends WSServer {
     strategyExecutionDB,
     restURL,
     wsURL,
-    hostedURL,
     metricsServerURL,
     os,
     releaseVersion,
@@ -144,7 +143,6 @@ module.exports = class APIWSServer extends WSServer {
 
     this.wsURL = wsURL
     this.restURL = restURL
-    this.hostedURL = hostedURL
     this.metricsServerURL = metricsServerURL
     this.os = os
     this.releaseVersion = releaseVersion

lib/ws_servers/api/service_hub.js

@@ -4,17 +4,11 @@ class ServiceHub {
   constructor () {
     this.client = null
     this.algoWorker = null
-    this.dmsControl = null
     this.strategyManager = null
     this.metricsClient = null
   }
 
   async close () {
-    if (this.dmsControl) {
-      this.dmsControl.close()
-      this.dmsControl = null
-    }
-
     if (this.client) {
       this.client.close()
       this.client = null

lib/ws_servers/api/session.js

@@ -49,14 +49,6 @@ class Session {
     return this.services[this.mode].algoWorker
   }
 
-  /**
-   * @return {DmsRemoteControl|null}
-   */
-  getDmsControl () {
-    if (!this.mode) return null
-    return this.services[this.mode].dmsControl
-  }
-
   /**
    * @return {StrategyManager|null}
    */
@@ -95,13 +87,6 @@ class Session {
     this.services[this.mode].client = client
   }
 
-  /**
-   * @param {DmsRemoteControl} dmsControl
-   */
-  setDmsControl (dmsControl) {
-    this.services[this.mode].dmsControl = dmsControl
-  }
-
   /**
    * @param {AlgoWorker} algoWorker
    */

lib/ws_servers/api/start_connections.js

@@ -6,7 +6,6 @@ const _isString = require('lodash/isString')
 const { DEFAULT_USER } = require('../../constants')
 const createClient = require('./open_auth_bitfinex_connection')
 const createAlgoWorker = require('./factories/create_algo_worker')
-const createDmsControl = require('./factories/create_dms_control')
 const createFilteredWs = require('./factories/created_filtered_ws')
 const createStrategyManager = require('./factories/create_strategy_manager')
 const createMetricsClient = require('./factories/create_metrics_client')
@@ -43,15 +42,13 @@ class ConnectionManager {
     const settings = await getUserSettings(db)
 
     const results = await Promise.allSettled([
-      this._startDmsControl(server, session, settings),
       this._startAlgoWorker(server, session, wsForMode, settings, hasNewCredentials),
       this._startStrategyManager(server, session, wsForMode, settings),
       this._startBfxClient(server, session, wsForMode, settings, hasNewCredentials),
       this._startMetricsClient(server, session, wsForMode, hasNewCredentials)
     ])
 
     let status = {
-      dmsControl: false,
       algoWorker: false,
       bfxClient: false,
       strategyManager: false,
@@ -85,42 +82,6 @@ class ConnectionManager {
     return { hasNewCredentials }
   }
 
-  /**
-   * @param {APIWSServer} server
-   * @param {Session} session
-   * @param {boolean} dms
-   * @param {string} dmsScope
-   * @returns {Promise<*>}
-   */
-  async updateDms (server, session, dms, dmsScope) {
-    if (!dmsScope) {
-      return { dmsControl: false }
-    }
-
-    let dmsControl = session.getDmsControl()
-
-    if (dmsControl && dmsControl.isOpen) {
-      dmsControl.updateStatus(dms)
-      return { dmsControl: dms }
-    }
-
-    if (!dms) {
-      return { dmsControl: false }
-    }
-
-    dmsControl = createDmsControl(server)
-    session.setDmsControl(dmsControl)
-
-    const { apiKey, apiSecret } = this.credentials[session.mode]
-    await dmsControl.open({
-      apiKey,
-      apiSecret,
-      dmsScope
-    })
-
-    return { dmsControl: true }
-  }
-
   /**
    * @param {APIWSServer} server
    * @param {Session} session
@@ -156,19 +117,6 @@ class ConnectionManager {
     return { metricsClient: true }
   }
 
-  /**
-   * @param {APIWSServer} server
-   * @param {Session} session
-   * @param {Object} settings
-   * @returns {Promise<void>}
-   * @private
-   */
-  async _startDmsControl (server, session, settings) {
-    const { dmsScope } = session
-    const { dms } = settings
-    return this.updateDms(server, session, dms, dmsScope)
-  }
-
   /**
    * @param {APIWSServer} server
    * @param {Session} session

test/unit/lib/ws_servers/api/algos/algo_worker.js

@@ -127,8 +127,7 @@ describe('AlgoWorker', () => {
       })
       // register events
       assert.calledWith(AOHostStub.on.firstCall, 'error')
-      assert.calledWith(AOHostStub.on.secondCall, 'meta:reload')
-      assert.calledWith(AOHostStub.on.thirdCall, 'ao:stopped')
+      assert.calledWith(AOHostStub.on.secondCall, 'ao:stopped')
       // connect
       assert.calledWithExactly(AOHostStub.connect)
       // publish opened event