Merge branch 'develop' into main

Author: emilsas

packages/millicast-sdk/src/Director.js

@@ -53,7 +53,7 @@ export default class Director {
    * @returns {Promise<MillicastDirectorResponse>} Promise object which represents the result of getting the publishing connection path.
    * @example const response = await Director.getPublisher(token, streamName)
    * @example
-   * import { Publish, Director } from 'millicast-sdk-js'
+   * import { Publish, Director } from '@millicast/sdk'
    *
    * //Define getPublisher as callback for Publish
    * const streamName = "My Millicast Stream Name"
@@ -98,7 +98,7 @@ export default class Director {
    * @returns {Promise<MillicastDirectorResponse>} Promise object which represents the result of getting the subscribe connection data.
    * @example const response = await Director.getSubscriber(streamName, streamAccountId)
    * @example
-   * import { View, Director } from 'millicast-sdk-js'
+   * import { View, Director } from '@millicast/sdk'
    *
    * //Define getSubscriber as callback for Subscribe
    * const streamName = "My Millicast Stream Name"
@@ -110,10 +110,8 @@ export default class Director {
    * //Create a new instance
    * const millicastView = new View(streamName, tokenGenerator)
    *
-   * //Set new.track event handler.
-   * //Event is from RTCPeerConnection ontrack event which contains the peer stream.
-   * //More information here: {@link https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/ontrack}
-   * millicastView.on('newTrack', (event) => {
+   * //Set track event handler to receive streams from Publisher.
+   * millicastView.on('track', (event) => {
    *   addStreamToYourVideoTag(event.streams[0])
    * })
    *

packages/millicast-sdk/src/Publish.js

@@ -44,7 +44,7 @@ export default class Publish extends BaseWebRTC {
    * @fires PeerConnection#connectionStateChange
    * @example await publish.connect(options)
    * @example
-   * import Publish from 'millicast-sdk-js'
+   * import Publish from '@millicast/sdk'
    *
    * //Define callback for generate new token
    * const tokenGenerator = () => getYourPublisherInformation(token, streamName)
@@ -89,6 +89,7 @@ export default class Publish extends BaseWebRTC {
       throw new Error('Broadcast currently working')
     }
     let publisherData
+    this.options = options
     try {
       publisherData = await this.tokenGenerator()
     } catch (error) {
@@ -99,7 +100,6 @@ export default class Publish extends BaseWebRTC {
       logger.error('Error while broadcasting. Publisher data required')
       throw new Error('Publisher data required')
     }
-    this.options = options
     this.signaling = new Signaling({
       streamName: this.streamName,
       url: `${publisherData.urls[0]}?token=${publisherData.jwt}`

packages/millicast-sdk/src/StreamEvents.js

@@ -52,7 +52,7 @@ export default class StreamEvents {
    * @param {String} streamName - Millicast Stream Name.
    * @param {onUserCountCallback} callback - Callback function executed when a new message is available.
    * @example
-   * import StreamEvents from 'millicast-sdk-js'
+   * import StreamEvents from '@millicast/sdk'
    *
    * //Create a new instance
    * const streamEvents = await StreamEvents.init()

packages/millicast-sdk/src/View.js

@@ -37,7 +37,7 @@ export default class View extends BaseWebRTC {
    * @fires PeerConnection#connectionStateChange
    * @example await millicastView.connect(options)
    * @example
-   * import View from 'millicast-sdk-js'
+   * import View from '@millicast/sdk'
    *
    * //Define callback for generate new token
    * const tokenGenerator = () => getYourSubscriberInformation(accountId, streamName)
@@ -46,7 +46,7 @@ export default class View extends BaseWebRTC {
    * const streamName = "Millicast Stream Name where i want to connect"
    * const millicastView = new View(streamName, tokenGenerator)
    *
-   * //Set track event handler.
+   * //Set track event handler to receive streams from Publisher.
    * millicastView.on('track', (event) => {
    *   addStreamToYourVideoTag(event.streams[0])
    * })
@@ -74,6 +74,7 @@ export default class View extends BaseWebRTC {
       throw new Error('Viewer currently subscribed')
     }
     let subscriberData
+    this.options = options
     try {
       subscriberData = await this.tokenGenerator()
     } catch (error) {
@@ -84,7 +85,6 @@ export default class View extends BaseWebRTC {
       logger.error('Error while subscribing. Subscriber data required')
       throw new Error('Subscriber data required')
     }
-    this.options = options
     this.signaling = new Signaling({
       streamName: this.streamName,
       url: `${subscriberData.urls[0]}?token=${subscriberData.jwt}`

packages/millicast-viewer-demo/src/viewer.js

@@ -54,17 +54,12 @@ let millicastView = null
 
 const newViewer = () => {
   const tokenGenerator = () => Director.getSubscriber(streamId, streamAccountId)
-  const millicastView = new View(streamId, tokenGenerator)
+  const millicastView = new View(streamId, tokenGenerator, autoReconnect)
   millicastView.on("broadcastEvent", (event) => {
     if (!autoReconnect) return;
 
     let layers = event.data["layers"] !== null ? event.data["layers"] : {};
     if (event.name === "layers" && Object.keys(layers).length <= 0) {
-      //call play logic or being reconnect interval
-      close().then(() => {
-        subscribe();
-      });
-      console.error("Feed no longer found.");
     }
   });
 
@@ -154,11 +149,7 @@ const subscribe = async () => {
     await millicastView.connect(options);
   } catch (error) {
     if (!autoReconnect) return;
-
-    close().then(() => {
-      subscribe();
-    });
-    console.error(error);
+    millicastView.reconnect()
   }
 };