refactor

Author: peterszombati

src/v2/core/Socket/SocketConnection.ts

@@ -17,12 +17,12 @@ export class SocketConnection {
     private queue: { transaction: Transaction, promise: PromiseObject<any, any> }[] = []
     private queueTimer: Timer = new Timer()
     protected WebSocket: WebSocketWrapper
-    private callListener: (listenerId: string, params?: any[]) => any[]
+    private callListener: (listenerId: string, params?: any[]) => void
     private connectionProgress: Transaction | null = null
     private disconnectionProgress: Transaction | null = null
     private XAPI: XAPI
 
-    constructor(url: string, callListener: (listenerId: string, params?: any[]) => any[], socketId: string, XAPI: XAPI) {
+    constructor(url: string, callListener: (listenerId: string, params?: any[]) => void, socketId: string, XAPI: XAPI) {
         this.socketId = socketId
         this.callListener = callListener
         this.XAPI = XAPI
@@ -51,13 +51,11 @@ export class SocketConnection {
             this.lastReceivedMessage = new Time()
             try {
                 const message = JSON.parse(json.toString().trim())
+                this.XAPI.counter.count(['data', 'SocketConnection', 'incomingData'], json.length)
 
-                try {
-                    this.handleMessage(message, new Time(), json, socketId)
-                } catch (e) {
-                    console.error(e)
-                }
+                this.handleMessage(message, new Time(), json, socketId)
             } catch (e) {
+                this.XAPI.counter.count(['error', 'SocketConnection', 'handleMessage'])
                 this.callListener('handleMessage', [{
                     command: null,
                     error: e,

src/v2/core/Socket/SocketConnections.ts

@@ -36,7 +36,6 @@ export class SocketConnections extends Listener {
                         json: params.json,
                     })
                 } else {
-                    this.XAPI.counter.count(['data', 'SocketConnections', 'incomingData'], params.json.length)
                     elapsedMs !== undefined && this.XAPI.counter.count(['data', 'SocketConnection', 'responseTime', 'handleMessage',
                           transaction.state.command || 'undefined_command'],
                       elapsedMs
@@ -89,7 +88,7 @@ export class SocketConnections extends Listener {
         const socketId = `${new Date().getTime()}${this.socketIdIncrement.id}`
         this.connections[socketId] = new SocketConnection(
           this.url,
-          (listenerId: string, params?: any[]) => this.fetchListener(listenerId, params),
+          (listenerId: string, params?: any[]) => this.callListener(listenerId, params),
           socketId,
           this.XAPI
         )

src/v2/core/Stream/StreamConnection.ts

@@ -15,12 +15,12 @@ export class StreamConnection {
     public streamId: string
     private queue: { transaction: Transaction }[] = []
     private queueTimer: Timer = new Timer()
-    private callListener: (listenerId: string, params?: any[]) => any[]
+    private callListener: (listenerId: string, params?: any[]) => void
     private connectionProgress: Transaction | null = null
     private disconnectionProgress: Transaction | null = null
     private XAPI: XAPI
 
-    constructor(url: string, session: string, callListener: (listenerId: string, params?: any[]) => any[], streamId: string, socketId: string, XAPI: XAPI) {
+    constructor(url: string, session: string, callListener: (listenerId: string, params?: any[]) => void, streamId: string, socketId: string, XAPI: XAPI) {
         this.session = session
         this.socketId = socketId
         this.streamId = streamId
@@ -52,11 +52,7 @@ export class StreamConnection {
                 const message = JSON.parse(json.toString().trim())
                 this.XAPI.counter.count(['data', 'StreamConnection', 'incomingData'], json.length)
 
-                try {
-                    this.callListener(`command_${message.command}`, [message.data, new Time(), json, streamId])
-                } catch (e) {
-                    console.error(e)
-                }
+                this.callListener(`command_${message.command}`, [message.data, new Time(), json, streamId])
             } catch (e) {
                 this.XAPI.counter.count(['error', 'StreamConnection', 'handleMessage'])
                 this.callListener(`handleMessage`, [{error: e, time: new Time(), json, streamId}])

src/v2/core/Stream/StreamConnections.ts

@@ -48,7 +48,7 @@ export class StreamConnections extends Listener {
     streamIdIncrement = new Increment()
     public async connect(timeoutMs: number, session: string, socketId: string): Promise<string> {
         const streamId = `${new Date().getTime()}${this.streamIdIncrement.id}`
-        this.connections[streamId] = new StreamConnection(this.url, session, (listenerId: string, params?: any[]) => this.fetchListener(listenerId, params), streamId, socketId, this.XAPI)
+        this.connections[streamId] = new StreamConnection(this.url, session, (listenerId: string, params?: any[]) => this.callListener(listenerId, params), streamId, socketId, this.XAPI)
         await this.connections[streamId].connect(timeoutMs)
         return streamId
     }