feat: session separately + isOnline()

Author: zatziky

README.md

@@ -300,12 +300,21 @@ amioChat.events.onConnectionStateChanged((online) => {
 
 ## Tests
 
+### Tips - quicker testing 
 During development, comment the **lib** import and replace it with **src** one:
 ```js
 // import amioChat from '../lib/amio-chat-sdk-web'
 import {amioChat} from '../src/amio-chat-client'
 ```
 
+### Tips - promises
+Since we can't use `async/await`, always pay attention that every promised base test has this form:
+```js
+it('test', () => {
+  return createPromise() // mocha handles it
+})
+```
+
 ### Execute all tests
 1. Build the code - `npm run build`
 2. Run the test suite - `npm run test`.

src/amio-chat-client.js

@@ -16,6 +16,12 @@ class AmioChatClient {
     return connection.connect(config)
   }
 
+  // TODO to docs
+  isConnected() {
+    return connection.online
+  }
+
+  // TODO to docs
   getSessionId() {
     return session.getId()
   }

src/connection/connection.js

@@ -16,6 +16,8 @@ import {
 class Connection {
 
   constructor() {
+    this.online = false
+
     this.messageReceivedHandler = () => {
     }
     this.messageEchoHandler = () => {
@@ -57,7 +59,10 @@ class Connection {
 
       this.socket.on(SOCKET_CONNECTION_ACCEPTED, data => {
         session.setId(data.session_id)
-        this.connectionStateChangedHandler(true)
+
+        this.online = true
+        this.connectionStateChangedHandler(this.online)
+
         resolve()
       })
 
@@ -75,7 +80,8 @@ class Connection {
       })
 
       this.socket.on(SOCKET_IO_DISCONNECT, () => {
-        this.connectionStateChangedHandler(false)
+        this.online = false
+        this.connectionStateChangedHandler(this.online)
       })
 
       this.socket.on(SOCKET_IO_ERROR, (err) => {
@@ -96,13 +102,9 @@ class Connection {
     })
   }
 
-  isConnected() {
-    return !!this.socket
-  }
-
   emit(event, data) {
     return new Promise((resolve, reject) => {
-      if(!this.isConnected()) {
+      if(!this.socket) {
         reject(ERROR_MESSAGE_NOT_CONNECTED)
         return
       }

src/connection/session.js

@@ -5,14 +5,10 @@ import {
 class Session {
 
   constructor() {
-    this.storage = window.localStorage
-    if(!this.storage) {
-      // for tests
-      this.storage = {}
-      this.storage.getItem = () => {
-      }
-      this.storage.setItem = () => {
-      }
+    if(window.localStorage) {
+      this.storage = window.localStorage
+    } else {
+      this.storage = new TestStorage()
     }
   }
 
@@ -29,4 +25,23 @@ class Session {
   }
 }
 
+class TestStorage {
+
+  constructor() {
+    this.storage = {}
+  }
+
+  getItem(key) {
+    return this.storage[key]
+  }
+
+  setItem(key, value) {
+    this.storage[key] = value
+  }
+
+  removeItem(key) {
+    delete this.storage[key]
+  }
+}
+
 export default new Session()

test/connect.spec.js

@@ -1,31 +1,23 @@
 /* global describe, it, before */
 
 import chai from 'chai'
-import amioChat from '../lib/amio-chat-sdk-web'
-// TODO put back
-// import {amioChat} from '../src/amio-chat-client'
+// import amioChat from '../lib/amio-chat-sdk-web'
+import {amioChat} from '../src/amio-chat-client'
 
 chai.expect()
 const expect = chai.expect
+const CHANNEL_ID = process.env.TEST_AMIO_CHANNEL_ID
+const CHANNEL_ID2 = process.env.TEST_AMIO_CHANNEL_ID2
 
 describe('connect()', () => {
   before(() => {
   })
 
   describe('ERR - wrong configuration - channelId', () => {
     describe('config.channelId', () => {
-      function testConnect(opts, expectedErr) {
-        return amioChat.connect(opts)
-          .then(
-            () => expect.fail(null, null, 'Should have failed'),
-            actualErr => {
-              expect(actualErr).to.eql(expectedErr)
-            })
-      }
-
-      const testChannelIdMissing = opts => testConnect(opts, 'Could not connect: config.channelId is missing.')
+      const testChannelIdMissing = opts => testFailedConnect(opts, 'Could not connect: config.channelId is missing.')
       const testChannelIdIsString = (opts, wrongValue) => {
-        return testConnect(opts, `Could not connect: config.channelId must be a string. The provided value is: ${JSON.stringify(wrongValue)}`)
+        return testFailedConnect(opts, `Could not connect: config.channelId must be a string. The provided value is: ${JSON.stringify(wrongValue)}`)
       }
 
       it('undefined configuration', () => testChannelIdMissing(undefined))
@@ -39,10 +31,58 @@ describe('connect()', () => {
         return testChannelIdIsString({channelId: wrongValue}, wrongValue)
       })
     })
+  })
 
+  it('ERR - channelId not found', () => {
+    const channelId = 'i-do-not-exist'
+    const expectedError = 'Connection rejected from server. ' +
+      'Error: {"error_code":2,"details":{' +
+      `"message":"Channel with channelId ${channelId} doesn't exist"}}`
+    return testFailedConnect({channelId}, expectedError)
   })
 
   it('connection accepted', () => {
+    return amioChat.connect({channelId: CHANNEL_ID})
+      .then(() => {
+        expect(amioChat.getSessionId()).to.not.be.undefined
+      })
+  })
+
+  it('connection accepted - reconnect to an existing session', () => {
+    return amioChat.connect({channelId: CHANNEL_ID})
+      .then(() => {
+        expect(amioChat.getSessionId()).to.not.be.undefined
+        const firstSessionId = amioChat.getSessionId()
 
+        return amioChat.connect({channelId: CHANNEL_ID})
+          .then(() => {
+            expect(amioChat.getSessionId()).to.eql(firstSessionId)
+          })
+      })
+  })
+
+  it('connection accepted - old sessionId is invalidated', () => {
+
+    return amioChat.connect({channelId: CHANNEL_ID})
+      .then(() => {
+        expect(amioChat.getSessionId()).to.not.be.undefined
+        const firstSessionId = amioChat.getSessionId()
+
+        return amioChat.connect({channelId: CHANNEL_ID2})
+          .then(() => {
+            expect(amioChat.getSessionId()).to.not.be.undefined
+            expect(amioChat.getSessionId()).to.not.eql(firstSessionId)
+          })
+      })
   })
 })
+
+function testFailedConnect(opts, expectedErr) {
+  return amioChat.connect(opts)
+    .then(
+      () => expect.fail(null, null, 'Should have failed'),
+      actualErr => {
+        expect(actualErr).to.eql(expectedErr)
+      })
+}
+