Skip to content

Commit

Permalink
Merged in staging (pull request #338)
Browse files Browse the repository at this point in the history
Release 2.1.3
  • Loading branch information
dinawee committed Jun 10, 2020
2 parents 0ec229d + f862a79 commit 2769db7
Show file tree
Hide file tree
Showing 674 changed files with 134,946 additions and 186,180 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -62,3 +62,4 @@ node_modules
dist
build
docs
config.js
4 changes: 2 additions & 2 deletions README.md
@@ -1,4 +1,4 @@
# SKYLINK WEB SDK 2.1.2
# SKYLINK WEB SDK 2.1.3
> Temasys SkylinkJS Web SDK is an open-source client-side library for your web-browser that enables any website to easily leverage the capabilities of WebRTC and its direct data streaming powers between peers for audio/video conferencing or file transfer.
You'll need a Temasys Account, and an App key to use this. [Register here to get your App key](https://console.temasys.io).
Expand Down Expand Up @@ -35,7 +35,7 @@ You'll need a Temasys Account, and an App key to use this. [Register here to get
#### Current versions and stability
- We recommend that you always use the latest versions of the Temasys SkylinkJS Web SDK as WebRTC is still evolving and we adapt to changes very frequently.

[Latest version: 2.1.2](https://github.com/Temasys/SkylinkJS/releases/tag/2.1.2)
[Latest version: 2.1.3](https://github.com/Temasys/SkylinkJS/releases/tag/2.1.3)


## How to build your own Temasys SkylinkJS Web SDK
Expand Down
47 changes: 0 additions & 47 deletions demos/collection/config.js

This file was deleted.

23 changes: 18 additions & 5 deletions demos/collection/kitchensink/main.js
Expand Up @@ -392,6 +392,9 @@ SkylinkEventManager.addEventListener(SkylinkConstants.EVENTS.ON_INCOMING_STREAM,
}
} else {
$('#user' + peerId + ' .name').html(peerInfo.userData);
setTimeout(() => {
console.log(Demo.Skylink.getPeersCustomSettings(config.defaultRoom));
}, 5000);
}

if (Demo.ShowStats[peerId]) {
Expand Down Expand Up @@ -466,6 +469,10 @@ SkylinkEventManager.addEventListener(SkylinkConstants.EVENTS.ROOM_LOCK, (evt) =>
Demo.Methods.logToConsoleDOM(`Room is ${(isLocked ? 'locked' : 'unlocked')}`);
});

SkylinkEventManager.addEventListener(SkylinkConstants.EVENTS.ROOM_REJOIN, (evt) => {
Demo.Skylink.joinRoom(joinRoomOptions)
});

// //---------------------------------------------------
// // MESSAGING EVENTS
// //---------------------------------------------------
Expand Down Expand Up @@ -618,15 +625,15 @@ SkylinkEventManager.addEventListener(SkylinkConstants.EVENTS.PEER_CONNECTION_STA
let color = 'red';
switch (state) {
case SkylinkConstants.PEER_CONNECTION_STATE.HAVE_LOCAL_OFFER:
case SkylinkConstants.PEER_CONNECTION_STATE.HAVE_REMOTE_PRANSWER:
case SkylinkConstants.PEER_CONNECTION_STATE.HAVE_REMOTE_OFFER:
case SkylinkConstants.PEER_CONNECTION_STATE.HAVE_LOCAL_PRANSWER:
case SkylinkConstants.PEER_CONNECTION_STATE.CONNECTING:
color = 'orange';
break;
case SkylinkConstants.PEER_CONNECTION_STATE.CLOSED:
color = 'red';
break;
case SkylinkConstants.PEER_CONNECTION_STATE.STABLE:
case SkylinkConstants.PEER_CONNECTION_STATE.CONNECTED:
color = 'green';
break;
}
Expand Down Expand Up @@ -920,8 +927,14 @@ $(document).ready(function() {
};

$("#add_stream_btn").click(function() {
const options = Object.assign({}, joinRoomOptions);
delete options.userData;
// const options = Object.assign({}, joinRoomOptions);
// delete options.userData;
const options = {
audio: true,
video: {
resolution: SkylinkConstants.VIDEO_RESOLUTION.QQVGA,
}
}
Demo.Skylink.sendStream(config.defaultRoom, options)
.then((streams) => {
console.log("added streams", streams);
Expand Down Expand Up @@ -1013,7 +1026,7 @@ $(document).ready(function() {
});
// //---------------------------------------------------
$('#restart_btn').click(function() {
Demo.Skylink.refreshConnection(config.defaultRoom);
Demo.Skylink.refreshConnection(config.defaultRoom, null, true, { bandwidth: SkylinkConstants.VIDEO_QUALITY.SQ});
});
// //---------------------------------------------------
$('#join_room_btn').click(function () {
Expand Down

0 comments on commit 2769db7

Please sign in to comment.