Add customClientId param to event channel connect()

__tests__/event_manager.test.ts

@@ -29,7 +29,7 @@ describe('Event Handler', function() {
  expect(connectionCount).toBe(0);
  expect(disconnectionCount).toBe(0);
 
- await ain.em.connect(connectionCb, disconnectionCb);
+ await ain.em.connect(connectionCb, disconnectionCb, customClientId);
 
  expect(connectionCount).toBe(1);
  expect(disconnectionCount).toBe(0);
@@ -61,8 +61,7 @@ describe('Event Handler', function() {
  });
 
  describe('Custom client id setting', () => {
- it('setCustomClientId() / getCustomClientId()', async () => {
- await ain.em.setCustomClientId(customClientId);
+ it('getCustomClientId()', async () => {
  expect(ain.em.getCustomClientId()).toBe(customClientId);
  });
  });

src/event-manager/event-channel-client.ts

@@ -57,9 +57,10 @@ export default class EventChannelClient {
  * Opens a new event channel.
  * @param {ConnectionCallback} connectionCallback The connection callback function.
  * @param {DisconnectionCallback} disconnectionCallback The disconnection callback function.
+ * @param {string} customClientId The custom client id to set.
  * @returns {Promise<void>} A promise for the connection success.
  */
- connect(connectionCallback?: ConnectionCallback, disconnectionCallback?: DisconnectionCallback): Promise<any> {
+ connect(connectionCallback?: ConnectionCallback, disconnectionCallback?: DisconnectionCallback, customClientId?: string): Promise<any> {
  return new Promise(async (resolve, reject) => {
  if (this.isConnected) {
  reject(new Error(`Can't connect multiple channels`));
@@ -142,6 +143,10 @@ export default class EventChannelClient {
  }
  // Heartbeat timeout
  this.startHeartbeatTimer(DEFAULT_HEARTBEAT_INTERVAL_MS);
+ // Custom client id
+ if (customClientId) {
+ this.setCustomClientId(customClientId);
+ }
  // Connection callback
  if (connectionCallback) {
  connectionCallback(this._ws);

src/event-manager/index.ts

@@ -47,9 +47,10 @@ export default class EventManager {
  * Opens a new event channel.
  * @param {ConnectionCallback} ConnectionCallback The connection callback function.
  * @param {DisconnectionCallback} disconnectionCallback The disconnection callback function.
+ * @param {string} customClientId The custom client id to set.
  */
- async connect(connectionCallback?: ConnectionCallback, disconnectionCallback?: DisconnectionCallback) {
- await this._eventChannelClient.connect(connectionCallback, disconnectionCallback);
+ async connect(connectionCallback?: ConnectionCallback, disconnectionCallback?: DisconnectionCallback, customClientId?: string) {
+ await this._eventChannelClient.connect(connectionCallback, disconnectionCallback, customClientId);
  }
 
  /**
@@ -59,14 +60,6 @@ export default class EventManager {
  this._eventChannelClient.disconnect();
  }
 
- /**
- * Sets the custom client id of the event channel.
- * @param {string} customClientId The custom client id.
- */
- setCustomClientId(customClientId: string) {
- this._eventChannelClient.setCustomClientId(customClientId);
- }
-
  /**
  * Returns the custom client id of the event channel saved on the client side.
  */