Updated socketId method to return base64 encoded connectionKey and cl…

…ientId

src/channel/ably/utils.ts

@@ -33,13 +33,20 @@ export const toTokenDetails = (jwtToken: string): TokenDetails | any => {
 
 const isBrowser = typeof window === 'object';
 
-const toText = (base64: string) => {
+export const toText = (base64: string) => {
     if (isBrowser) {
         return atob(base64);
     }
     return Buffer.from(base64, 'base64').toString('binary');
 };
 
+export const toBase64 = (text: string) => {
+    if (isBrowser) {
+        return btoa(text);
+    }
+    return Buffer.from(text, 'binary').toString('base64');
+};
+
 const isAbsoluteUrl = (url: string) => (url && url.indexOf('http://') === 0) || url.indexOf('https://') === 0;
 
 export const fullUrl = (url: string) => {

src/connector/ably-connector.ts

@@ -2,6 +2,7 @@ import { Connector } from './connector';
 
 import { AblyChannel, AblyPrivateChannel, AblyPresenceChannel, AblyAuth } from './../channel';
 import { AblyRealtime, TokenDetails } from '../../typings/ably';
+import { toBase64 } from '../channel/ably/utils';
 
 /**
  * This class creates a connector to Ably.
@@ -118,9 +119,14 @@ export class AblyConnector extends Connector {
 
     /**
      * Get the socket ID for the connection.
+     * For ably, returns base64 encoded json with keys {connectionKey, clientId}
      */
     socketId(): string {
-        return this.ably.connection.key;
+        let socketIdObject = {
+            connectioKey : this.ably.connection.key,
+            clientId : this.ably.auth.clientId,
+        }
+        return toBase64(JSON.stringify(socketIdObject));
     }
 
     /**

src/echo.ts

@@ -117,6 +117,7 @@ export default class Echo {
 
     /**
      * Get the Socket ID for the connection.
+     * For ably, returns base64 encoded json with keys {connectionKey, clientId}
      */
     socketId(): string {
         return this.connector.socketId();