Skip to content

QBWEBSDK-81 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soulfly merged 4 commits into from
Oct 2, 2015
Merged

QBWEBSDK-81 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66f524d
QBWEBSDK-81
dimaspirit Sep 30, 2015
963bf3e
add to gitignore files from *Storm(JetBrains)
Oct 1, 2015
4265cc0
rewrite config.set for iceServers
Oct 1, 2015
edb8e9b
fix unneeded coma
Oct 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
# npm packages
node_modules
npm-debug.log

# *Storm
.idea/
3 changes: 2 additions & 1 deletion js/modules/webrtc/qbWebRTCSession.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,9 @@ WebRTCSession.prototype._createPeer = function(userID, peerConnectionType) {
* RtpDataChannels: true
**********************************************/
var pcConfig = {
iceServers: config.iceServers
iceServers: config.webrtc.iceServers
};

var peer = new RTCPeerConnection(pcConfig);
peer.init(this, userID, this.ID, peerConnectionType);

Expand Down
48 changes: 26 additions & 22 deletions js/qbConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,29 @@ var config = {
websocket: 'wss://chat.quickblox.com:5291', // With SSL
active: 2
},
iceServers: [
{
'url': 'stun:stun.l.google.com:19302'
},
{
'url': 'stun:turn.quickblox.com',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=udp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=tcp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
],
webrtc: {
answerTimeInterval: 60,
dialingTimeInterval: 5,
iceServers: [
{
'url': 'stun:stun.l.google.com:19302'
},
{
'url': 'stun:turn.quickblox.com',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=udp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=tcp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
}
]
},
urls: {
session: 'session',
Expand Down Expand Up @@ -85,7 +85,11 @@ config.set = function(options) {
});
}
}
})

if(key === 'iceServers') {
config.webrtc.iceServers = options[key];
}
});
};

module.exports = config;
module.exports = config;
52 changes: 28 additions & 24 deletions quickblox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* QuickBlox JavaScript SDK - v1.14.0 - 2015-09-30 */
/* QuickBlox JavaScript SDK - v1.14.0 - 2015-10-01 */

(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.QB = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
/*
Expand Down Expand Up @@ -2911,8 +2911,9 @@ WebRTCSession.prototype._createPeer = function(userID, peerConnectionType) {
* RtpDataChannels: true
**********************************************/
var pcConfig = {
iceServers: config.iceServers
iceServers: config.webrtc.iceServers
};

var peer = new RTCPeerConnection(pcConfig);
peer.init(this, userID, this.ID, peerConnectionType);

Expand Down Expand Up @@ -3373,29 +3374,29 @@ var config = {
websocket: 'wss://chat.quickblox.com:5291', // With SSL
active: 2
},
iceServers: [
{
'url': 'stun:stun.l.google.com:19302'
},
{
'url': 'stun:turn.quickblox.com',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=udp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=tcp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
],
webrtc: {
answerTimeInterval: 60,
dialingTimeInterval: 5,
iceServers: [
{
'url': 'stun:stun.l.google.com:19302'
},
{
'url': 'stun:turn.quickblox.com',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=udp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=tcp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
}
]
},
urls: {
session: 'session',
Expand Down Expand Up @@ -3432,11 +3433,14 @@ config.set = function(options) {
});
}
}
})

if(key === 'iceServers') {
config.webrtc.iceServers = options[key];
}
});
};

module.exports = config;

},{}],16:[function(require,module,exports){
/*
* QuickBlox JavaScript SDK
Expand Down
8 changes: 4 additions & 4 deletions quickblox.min.js
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 25 additions & 2 deletions samples/webrtc/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,31 @@ var METER_HEIGHT = 50;
var audioContext = null;
var meter = null;
var canvasContext = null;
var animationRequestID = null

var animationRequestID = null;
var CONFIG = {
webrtc: {
iceServers: [
{
'url': 'stun:stun4.l.google.com:19302'
},
{
'url': 'stun:turn.quickblox.com',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=udp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=tcp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
}
]
}
};

QB.init(QBApp.appId, QBApp.authKey, QBApp.authSecret, CONFIG);

Expand Down
52 changes: 28 additions & 24 deletions samples/webrtc/quickblox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* QuickBlox JavaScript SDK - v1.14.0 - 2015-09-30 */
/* QuickBlox JavaScript SDK - v1.14.0 - 2015-10-01 */

(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.QB = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
/*
Expand Down Expand Up @@ -2911,8 +2911,9 @@ WebRTCSession.prototype._createPeer = function(userID, peerConnectionType) {
* RtpDataChannels: true
**********************************************/
var pcConfig = {
iceServers: config.iceServers
iceServers: config.webrtc.iceServers
};

var peer = new RTCPeerConnection(pcConfig);
peer.init(this, userID, this.ID, peerConnectionType);

Expand Down Expand Up @@ -3373,29 +3374,29 @@ var config = {
websocket: 'wss://chat.quickblox.com:5291', // With SSL
active: 2
},
iceServers: [
{
'url': 'stun:stun.l.google.com:19302'
},
{
'url': 'stun:turn.quickblox.com',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=udp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=tcp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
],
webrtc: {
answerTimeInterval: 60,
dialingTimeInterval: 5,
iceServers: [
{
'url': 'stun:stun.l.google.com:19302'
},
{
'url': 'stun:turn.quickblox.com',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=udp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
},
{
'url': 'turn:turn.quickblox.com:3478?transport=tcp',
'username': 'quickblox',
'credential': 'baccb97ba2d92d71e26eb9886da5f1e0'
}
]
},
urls: {
session: 'session',
Expand Down Expand Up @@ -3432,11 +3433,14 @@ config.set = function(options) {
});
}
}
})

if(key === 'iceServers') {
config.webrtc.iceServers = options[key];
}
});
};

module.exports = config;

},{}],16:[function(require,module,exports){
/*
* QuickBlox JavaScript SDK
Expand Down
32 changes: 17 additions & 15 deletions spec/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,23 @@ var DEFAULTS = {
websocket: 'wss://chat.quickblox.com:5291', // With SSL
active: 1
},
iceServers: [
{
'url': 'stun:stun.l.google.com:19302'
},
{
'url': 'turn:turnservertest.quickblox.com:3478?transport=udp',
'credential': 'testqbtest',
'username': 'testqb'
},
{
'url': 'turn:turnservertest.quickblox.com:3478?transport=tcp',
'credential': 'testqbtest',
'username': 'testqb'
}
],
webrtc: {
iceServers: [
{
'url': 'stun:stun.l.google.com:19302'
},
{
'url': 'turn:turnservertest.quickblox.com:3478?transport=udp',
'credential': 'testqbtest',
'username': 'testqb'
},
{
'url': 'turn:turnservertest.quickblox.com:3478?transport=tcp',
'credential': 'testqbtest',
'username': 'testqb'
}
]
},
urls: {
session: 'session',
login: 'login',
Expand Down