getDevices, once, off. SubscriberTokBox, PublisherTokBox

openvidu-browser/src/main/resources/ts/OpenVidu/Session.ts

@@ -208,7 +208,15 @@ export class Session {
     }
 
     addEventListener(eventName, listener) {
-        this.ee.addListener(eventName, listener);
+        this.ee.on(eventName, listener);
+    }
+
+    addOnceEventListener(eventName, listener) {
+        this.ee.once(eventName, listener);
+    }
+
+    removeListener(eventName, listener) {
+        this.ee.off(eventName, listener);
     }
 
     emitEvent(eventName, eventsArray) {
@@ -216,10 +224,14 @@ export class Session {
     }
 
 
-    subscribe( stream ) {
+    subscribe(stream: Stream) {
         stream.subscribe();
     }
 
+    unsuscribe(stream) {
+
+    }
+
     onParticipantPublished(options) {
 
         let participant = new Participant(this.openVidu, false, this, options);

openvidu-browser/src/main/resources/ts/OpenVidu/Stream.ts

@@ -326,11 +326,18 @@ export class Stream {
                 this.wrStream = userStream;
                 this.emitSrcEvent(this.wrStream);
 
+                this.ee.emitEvent('camera-access-changed', [{
+                    accessAllowed: true
+                }]);
+
                 callback(undefined, this);
             })
-            .catch(function (e) {
+            .catch(error => {
-                console.error("Access denied", e);
+                console.error("Access denied", error);
-                callback(e, undefined);
+                this.ee.emitEvent('camera-access-changed', [{
+                    accessAllowed: false
+                }]);
+                callback(error, undefined);
             });
     }
 
@@ -353,7 +360,7 @@ export class Stream {
             } else {
                 this.room.emitEvent('stream-published', [{
                     stream: this
-                }])
+                }]);
                 this.processSdpAnswer(response.sdpAnswer);
             }
         });

openvidu-browser/src/main/resources/ts/OpenViduTokBox/OpenViduTokBox.ts

@@ -65,7 +65,7 @@ export class OpenViduTokBox {
                     }
                 }
             }
-            return new PublisherTokBox(this.openVidu.initPublisherTagged(parentId, cameraOptions, callback));
+            return new PublisherTokBox(this.openVidu.initPublisherTagged(parentId, cameraOptions, callback), parentId);
         } else {
             alert("Browser not supported");
         }
@@ -80,4 +80,13 @@ export class OpenViduTokBox {
             return 1;
         }
     }
+
+    getDevices(callback) {
+        navigator.mediaDevices.enumerateDevices().then((deviceInfos) => {
+            callback(null, deviceInfos);
+        }).catch((error) => {
+            console.log("Error getting devices: " + error);
+            callback(error, null);
+        });
+    }
 }

openvidu-browser/src/main/resources/ts/OpenViduTokBox/PublisherTokBox.ts

@@ -9,12 +9,34 @@ import { Stream, StreamOptions, VideoOptions } from '../OpenVidu/Stream';
 import { OpenViduTokBox } from './OpenViduTokBox';
 import { SessionTokBox } from './SessionTokBox';
 
+import EventEmitter = require('wolfy87-eventemitter');
+
 export class PublisherTokBox {
 
-    stream: Stream;
+    private ee = new EventEmitter();
+
+    accessAllowed = false;
+    element: Element;
+    id: string;
+    stream: Stream;
+    session: SessionTokBox;
+
+    constructor(stream: Stream, parentId: string) {
+        this.accessAllowed = false;
+
+        this.ee.on('camera-access-changed', (event) => {
+            this.accessAllowed = event.accessAllowed;
+            if (this.accessAllowed) {
+                this.ee.emitEvent('accessAllowed');
+            } else {
+                this.ee.emitEvent('accessDenied');
+            }
+        });
 
-    constructor(stream: Stream) {
         this.stream = stream;
+        if (document.getElementById(parentId) != null) {
+            this.element = document.getElementById(parentId)!!;
+        }
     }
 
     publishAudio(value: boolean) {

openvidu-browser/src/main/resources/ts/OpenViduTokBox/SessionTokBox.ts

@@ -27,6 +27,7 @@ export class SessionTokBox {
     }
 
     publish(publisher: PublisherTokBox) {
+        publisher.session = this;
         publisher.stream.publish();
     }
 
@@ -38,10 +39,10 @@ export class SessionTokBox {
         let realEventName = '';
         switch (eventName) {
             case 'streamCreated':
-                realEventName = 'stream-added'
+                realEventName = 'stream-added';
                 break;
             case 'streamDestroyed':
-                realEventName = 'stream-removed'
+                realEventName = 'stream-removed';
                 break;
         }
         if (realEventName != '') {
@@ -53,6 +54,42 @@ export class SessionTokBox {
         }
     }
 
+    once(eventName: string, callback) {
+        let realEventName = '';
+        switch (eventName) {
+            case 'streamCreated':
+                realEventName = 'stream-added';
+                break;
+            case 'streamDestroyed':
+                realEventName = 'stream-removed';
+                break;
+        }
+        if (realEventName != '') {
+            this.session.addOnceEventListener(realEventName, event => {
+                callback(event);
+            });
+        } else {
+            console.warn("That is not a supported event!");
+        }
+    }
+
+    off(eventName: string, eventHandler) {
+        let realEventName = '';
+        switch (eventName) {
+            case 'streamCreated':
+                realEventName = 'stream-added';
+                break;
+            case 'streamDestroyed':
+                realEventName = 'stream-removed';
+                break;
+        }
+        if (realEventName != '') {
+            this.session.removeListener(realEventName, eventHandler);
+        } else {
+            console.warn("That is not a supported event!");
+        }
+    }
+
     subscribe(stream: Stream, htmlId: string, videoOptions: any);
     subscribe(stream: Stream, htmlId: string);
     

openvidu-browser/src/main/resources/ts/OpenViduTokBox/SubscriberTokBox.ts

@@ -0,0 +1,17 @@
+import { Stream, StreamOptions, VideoOptions } from '../OpenVidu/Stream';
+import { OpenViduTokBox } from './OpenViduTokBox';
+import { SessionTokBox } from './SessionTokBox';
+
+export class SubscriberTokBox {
+
+    element: Element;
+    id: string;
+    stream: Stream;
+
+    constructor(stream: Stream, parentId: string) {
+        this.stream = stream;
+        if (document.getElementById(parentId) != null) {
+            this.element = document.getElementById(parentId)!!;
+        }
+    }
+}

openvidu-browser/src/main/resources/ts/OpenViduTokBox/index.ts

@@ -1,3 +1,4 @@
 export * from './OpenViduTokBox';
 export * from './PublisherTokBox';
 export * from './SessionTokBox';
+export * from './SubscriberTokBox';