fix: update cluster api

conf/config.yml

@@ -6,10 +6,6 @@ logLevel: INFO
 # Directory where all plugins reside
 #libDir: ../lib
 
-# Connectivity
-# webfacing URL under which this client is reachable. Used for loadbalancing / failover
-externalUrl: null
-
 # SSL Configuration
 sslKey: null
 sslCert: null

package.json

@@ -63,7 +63,6 @@
     "nexe": "^1",
     "proxyquire": "1.8.0",
     "sinon": "^4.0.1",
-    "ts-node": "^3.3.0",
     "tslint": "^5.8.0",
     "typescript": "^2.5.3",
     "watch": "^1.0.2"

src/cluster/cluster-node.ts

@@ -8,17 +8,17 @@ export default class ClusterNode implements Cluster {
     this.stateRegistries = new Map()
   }
 
-  public sendDirect (serverName: string, message: Message, metaData: any) {}
+  public sendDirect (serverName: string, message: Message, metaData?: any) {}
 
   public sendState () {}
 
-  public send (message: Message, metaData: any) {}
+  public send (stateRegistryTopic: TOPIC, message: Message, metaData?: any) {}
 
-  public subscribe (topic: TOPIC, callback: Function) {}
+  public subscribe (stateRegistryTopic: TOPIC, callback: Function) {}
 
   public isLeader (): boolean { throw new Error('Leader not used in single state') }
 
-  public getStateRegistry (name: TOPIC) {
+  public getStateRegistry (stateRegistryTopic: TOPIC) {
     let stateRegistry = this.stateRegistries.get(name)
     if (!stateRegistry) {
       stateRegistry = new StateRegistry(name, {})

src/deepstream.io.ts

@@ -42,7 +42,7 @@ export class Deepstream extends EventEmitter {
 
   private eventHandler: EventHandler
   private rpcHandler: RpcHandler
-  private recordHandler: any
+  private recordHandler: RecordHandler
   private presenceHandler: PresenceHandler
 
   private stateMachine: any
@@ -196,7 +196,7 @@ export class Deepstream extends EventEmitter {
   private pluginInit (): void {
     this.services.message = new MessageConnector(this.config, this.services, 'deepstream')
 
-    const infoLogger = (message) => this.services.logger.info(EVENT.INFO, message)
+    const infoLogger = message => this.services.logger.info(EVENT.INFO, message)
     infoLogger(`deepstream version: ${pkg.version}`)
 
     // otherwise (no configFile) deepstream was invoked by API
@@ -208,7 +208,7 @@ export class Deepstream extends EventEmitter {
       infoLogger(`library directory set to: ${global.deepstreamLibDir}`)
     }
 
-    this.services.registeredPlugins.forEach((pluginType) => {
+    this.services.registeredPlugins.forEach(pluginType => {
       const plugin = this.services[pluginType]
       const initialiser = new DependencyInitialiser(this, this.config, this.services, plugin, pluginType)
       initialiser.once('ready', () => {
@@ -228,7 +228,7 @@ export class Deepstream extends EventEmitter {
     }
     plugin.isReady = true
 
-    const allPluginsReady = this.services.registeredPlugins.every((type) => this.services[type].isReady)
+    const allPluginsReady = this.services.registeredPlugins.every(type => this.services[type].isReady)
 
     if (allPluginsReady && this.currentState === STATES.PLUGIN_INIT) {
       this.transition('plugins-started')
@@ -325,7 +325,7 @@ export class Deepstream extends EventEmitter {
  */
   private connectionEndpointShutdown (): void {
     const endpoints = this.services.connectionEndpoints
-    endpoints.forEach((endpoint) => {
+    endpoints.forEach(endpoint => {
       process.nextTick(() => endpoint.close())
     })
 
@@ -344,7 +344,7 @@ export class Deepstream extends EventEmitter {
  */
   private pluginShutdown (): void {
     const closeablePlugins: Array<DeepstreamPlugin> = []
-    this.services.registeredPlugins.forEach((pluginType) => {
+    this.services.registeredPlugins.forEach(pluginType => {
       const plugin = this.services[pluginType]
       if (typeof plugin.close === 'function') {
         process.nextTick(() => plugin.close())

src/typings.ts

@@ -137,10 +137,10 @@ interface UserAuthenticationCallback {
 }
 
 interface Cluster {
-  getStateRegistry (stateRegistryName: TOPIC): any,
-  send (message: Message, metaData: any): void,
-  sendDirect (serverName: string, message: Message, metaData: any): void,
-  subscribe (topic: TOPIC, callback: Function): void
+  getStateRegistry (stateRegistryTopic: TOPIC): any,
+  send (stateRegistryTopic: TOPIC, message: Message, metaData?: any): void,
+  sendDirect (serverName: string, message: Message, metaData?: any): void,
+  subscribe (stateRegistryTopic: TOPIC, callback: Function): void
   isLeader (): boolean
   close (callback: Function): void
 }

src/utils/subscription-registry.ts

@@ -25,6 +25,7 @@ export default class SubscriptionRegistry {
   private config: DeepstreamConfig
   private services: DeepstreamServices
   private topic: TOPIC
+  private clusterTopic: TOPIC
   private subscriptionListener: SubscriptionListener
   private constants: SubscriptionActions
   private clusterSubscriptions: StateRegistry
@@ -47,6 +48,7 @@ export default class SubscriptionRegistry {
     this.config = config
     this.services = services
     this.topic = topic
+    this.clusterTopic = clusterTopic
 
     switch (topic) {
       case TOPIC.RECORD:
@@ -150,7 +152,7 @@ export default class SubscriptionRegistry {
    */
   public sendToSubscribers (name: string, message: Message, noDelay: boolean, socket: SocketWrapper | null, isRemote: boolean = false): void {
     if (socket && !isRemote) {
-      this.services.message.send(message, {})
+      this.services.message.send(this.clusterTopic, message)
     }
 
     const subscription = this.subscriptions.get(name)