Skip to content

Commit 940fb34

Browse files
jmillanjmillan
committedMar 18, 2013
Refactored Session
Use the request call_id property Fix typo Put MediaSession into Session Delete Session 'connecting' and Message 'sending' redundant events Add custom empty 'data' object to Message Rename Session by RTCSession and MediaSession by RTCMediaHandler Update the RTCSession LOG_PREFIX Add dialog error handling Renamed Session.js by RTCSession.js Delete redundant line Add some extra comments Do not delegate on Dialog the firing of the Session 'failed' event on Dialog error SIP message originating a 'failure' event in RTCSession can be a request or a response. Changed event data 'request' property by 'message' Do not RTCSession 'failed' event before firing UA 'newRTCSession' event Code clean. - Put RTCSession.sendInitialRequest logic into RTCsession.connect - Clean code in RTCSession.receiveResponse Put RTCSession cancel and reject logic into terminate method Put RTCSession createEarlyDialog and createConfirmedDialog logic into a single createDialog method Delete RTCSession terminateEarlyDialogs and terminateConfirmedDialog methods. - Insert logic in RTCSession.close method Move the logic of RTCSession timers to the corresponding place in the code... ... instead of defining a separate function for each timer logic - Also put all RTCSession timers into a new RTCSession.timers object. Thanks @saghul Enhance RTCSession.RequestSender class Fix some typos Take out RTCSession internal classes from RTCSession.js file - Make use of grunt-include-replace npm (grunt upgrade to 0.4 was required) - Add internal classes into src/RTCSession/ directory Fix typo
·
v0.4.00.3.0
1 parent e1dd5d8 commit 940fb34

12 files changed

+1619
-1630
lines changed
 

‎grunt.js ‎Gruntfile.js

+38-17
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ module.exports = function(grunt) {
1818
'src/RequestSender.js',
1919
'src/InDialogRequestSender.js',
2020
'src/Registrator.js',
21-
'src/Session.js',
22-
'src/MediaSession.js',
21+
'src/RTCSession.js',
2322
'src/Message.js',
2423
'src/UA.js',
2524
'src/Utils.js',
@@ -31,14 +30,10 @@ module.exports = function(grunt) {
3130

3231
// Project configuration.
3332
grunt.initConfig({
34-
pkg: '<json:package.json>',
33+
pkg: grunt.file.readJSON('package.json'),
3534
meta: {
3635
banner: '/*! jsSIP v@<%= pkg.version %> jssip.net | jssip.net/license */'
3736
},
38-
lint: {
39-
dist: 'dist/<%= pkg.name %>-<%= pkg.version %>.js',
40-
devel: 'dist/<%= pkg.name %>-devel.js'
41-
},
4237
concat: {
4338
dist: {
4439
src: srcFiles,
@@ -55,7 +50,7 @@ module.exports = function(grunt) {
5550
],
5651
dest: 'dist/<%= pkg.name %>-<%= pkg.version %>.js'
5752
},
58-
post_min: {
53+
post_uglify: {
5954
src: [
6055
'dist/<%= pkg.name %>-<%= pkg.version %>.min.js',
6156
'src/Grammar/dist/Grammar.min.js'
@@ -70,17 +65,23 @@ module.exports = function(grunt) {
7065
dest: 'dist/<%= pkg.name %>-devel.js'
7166
}
7267
},
73-
min: {
68+
uglify: {
7469
dist: {
75-
src: ['<banner:meta.banner>', '<config:concat.dist.dest>'],
76-
dest: 'dist/<%= pkg.name %>-<%= pkg.version %>.min.js'
70+
files: {
71+
'dist/<%= pkg.name %>-<%= pkg.version %>.min.js': ['dist/<%= pkg.name %>-<%= pkg.version %>.js']
72+
}
73+
},
74+
options: {
75+
banner: '<%= meta.banner %>'
7776
}
7877
},
7978
watch: {
80-
files: '<config:lint.files>',
81-
tasks: 'lint test'
79+
files: '<config:jshint.files>',
80+
tasks: 'jshint test'
8281
},
8382
jshint: {
83+
dist: 'dist/<%= pkg.name %>-<%= pkg.version %>.js',
84+
devel: 'dist/<%= pkg.name %>-devel.js',
8485
options: {
8586
browser: true,
8687
curly: true,
@@ -102,10 +103,29 @@ module.exports = function(grunt) {
102103
qunit: {
103104
noWebRTC: ['test/run-TestNoWebRTC.html']
104105
},
105-
uglify: {}
106+
includereplace: {
107+
dist: {
108+
files: {
109+
'dist': 'dist/<%= pkg.name %>-<%= pkg.version %>.js'
110+
}
111+
},
112+
devel: {
113+
files: {
114+
'dist': 'dist/<%= pkg.name %>-devel.js'
115+
}
116+
}
117+
}
106118
});
107119

108120

121+
// Load Grunt plugins.
122+
grunt.loadNpmTasks('grunt-contrib-concat');
123+
grunt.loadNpmTasks('grunt-contrib-jshint');
124+
grunt.loadNpmTasks('grunt-contrib-uglify');
125+
grunt.loadNpmTasks('grunt-contrib-qunit');
126+
grunt.loadNpmTasks('grunt-contrib-watch');
127+
grunt.loadNpmTasks('grunt-include-replace');
128+
109129
// Task for building JsSIP Grammar.js and Grammar.min.js files.
110130
grunt.registerTask('grammar', function(){
111131
var done = this.async(); // This is an async task.
@@ -143,13 +163,14 @@ module.exports = function(grunt) {
143163
});
144164
});
145165

166+
146167
// Task for building jssip-devel.js (uncompressed), jssip-X.Y.Z.js (uncompressed)
147168
// and jssip-X.Y.Z.min.js (minified).
148169
// Both jssip-devel.js and jssip-X.Y.Z.js are the same file with different name.
149-
grunt.registerTask('build', ['concat:devel', 'lint:devel', 'concat:post_devel', 'concat:dist', 'lint:dist', 'min:dist', 'concat:post', 'concat:post_min']);
170+
grunt.registerTask('build', ['concat:devel', 'includereplace:devel', 'jshint:devel', 'concat:post_devel', 'concat:dist', 'includereplace:dist', 'jshint:dist', 'uglify:dist', 'concat:post', 'concat:post_uglify']);
150171

151172
// Task for building jssip-devel.js (uncompressed).
152-
grunt.registerTask('devel', ['concat:devel', 'lint:devel', 'concat:post_devel']);
173+
grunt.registerTask('devel', ['concat:devel', 'includereplace:devel', 'jshint:devel', 'concat:post_devel']);
153174

154175
// Test tasks.
155176
grunt.registerTask('testNoWebRTC', ['qunit:noWebRTC']);
@@ -162,4 +183,4 @@ module.exports = function(grunt) {
162183
// Default task is an alias for 'build'.
163184
grunt.registerTask('default', ['build']);
164185

165-
};
186+
};

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"library"
2222
],
2323
"devDependencies": {
24-
"grunt": "0.3.17",
24+
"grunt": "~0.4.0",
2525
"pegjs": "0.7.0",
2626
"node-minify": "~0.7.2"
2727
},

‎src/Constants.js

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ JsSIP.C= {
2323
REQUEST_TIMEOUT: 'Request Timeout',
2424
SIP_FAILURE_CODE: 'SIP Failure Code',
2525
INVALID_TARGET: 'Invalid Target',
26+
INTERNAL_ERROR: 'Internal Error',
2627

2728
// SIP error causes
2829
BUSY: 'Busy',
@@ -37,6 +38,7 @@ JsSIP.C= {
3738

3839
// Session error causes
3940
WEBRTC_NOT_SUPPORTED: 'WebRTC Not Supported',
41+
WEBRTC_ERROR: 'WebRTC Error',
4042
CANCELED: 'Canceled',
4143
NO_ANSWER: 'No Answer',
4244
EXPIRES: 'Expires',

‎src/Dialogs.js

+22-25
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @augments JsSIP
77
* @class Class creating a SIP dialog.
88
* @param {JsSIP.Session} session
9-
* @param {JsSIP.IncomingRequest|JsSIP.IncomingResponse} msg
9+
* @param {JsSIP.IncomingRequest|JsSIP.IncomingResponse} message
1010
* @param {Enum} type UAC / UAS
1111
* @param {Enum} state JsSIP.Dialog.C.STATUS_EARLY / JsSIP.Dialog.C.STATUS_CONFIRMED
1212
*/
@@ -20,59 +20,56 @@ var Dialog,
2020
};
2121

2222
// RFC 3261 12.1
23-
Dialog = function(session, msg, type, state) {
23+
Dialog = function(session, message, type, state) {
2424
var contact;
2525

26-
if(msg.countHeader('contact') === 0) {
27-
console.warn(LOG_PREFIX + 'no Contact header field, silently discarded');
26+
if(!message.hasHeader('contact')) {
27+
console.error(LOG_PREFIX +'unable to create a Dialog without Contact header field');
2828
return false;
2929
}
3030

31-
if(msg instanceof JsSIP.IncomingResponse) {
32-
state = (msg.status_code < 200) ? C.STATUS_EARLY : C.STATUS_CONFIRMED;
33-
} else if (msg instanceof JsSIP.IncomingRequest) {
31+
if(message instanceof JsSIP.IncomingResponse) {
32+
state = (message.status_code < 200) ? C.STATUS_EARLY : C.STATUS_CONFIRMED;
33+
} else {
3434
// Create confirmed dialog if state is not defined
3535
state = state || C.STATUS_CONFIRMED;
36-
} else {
37-
console.warn(LOG_PREFIX + 'received message is not a SIP request neither a response, silently discarded');
38-
return false;
3936
}
4037

41-
contact = msg.s('contact');
38+
contact = message.parseHeader('contact');
4239

4340
// RFC 3261 12.1.1
4441
if(type === 'UAS') {
4542
this.id = {
46-
call_id: msg.call_id,
47-
local_tag: msg.to_tag,
48-
remote_tag: msg.from_tag,
43+
call_id: message.call_id,
44+
local_tag: message.to_tag,
45+
remote_tag: message.from_tag,
4946
toString: function() {
5047
return this.call_id + this.local_tag + this.remote_tag;
5148
}
5249
};
5350
this.state = state;
54-
this.remote_seqnum = msg.cseq;
55-
this.local_uri = msg.parseHeader('to').uri;
56-
this.remote_uri = msg.parseHeader('from').uri;
51+
this.remote_seqnum = message.cseq;
52+
this.local_uri = message.parseHeader('to').uri;
53+
this.remote_uri = message.parseHeader('from').uri;
5754
this.remote_target = contact.uri;
58-
this.route_set = msg.getHeaderAll('record-route');
55+
this.route_set = message.getHeaderAll('record-route');
5956
}
6057
// RFC 3261 12.1.2
6158
else if(type === 'UAC') {
6259
this.id = {
63-
call_id: msg.call_id,
64-
local_tag: msg.from_tag,
65-
remote_tag: msg.to_tag,
60+
call_id: message.call_id,
61+
local_tag: message.from_tag,
62+
remote_tag: message.to_tag,
6663
toString: function() {
6764
return this.call_id + this.local_tag + this.remote_tag;
6865
}
6966
};
7067
this.state = state;
71-
this.local_seqnum = msg.cseq;
72-
this.local_uri = msg.parseHeader('from').uri;
73-
this.remote_uri = msg.parseHeader('to').uri;
68+
this.local_seqnum = message.cseq;
69+
this.local_uri = message.parseHeader('from').uri;
70+
this.remote_uri = message.parseHeader('to').uri;
7471
this.remote_target = contact.uri;
75-
this.route_set = msg.getHeaderAll('record-route').reverse();
72+
this.route_set = message.getHeaderAll('record-route').reverse();
7673
}
7774

7875
this.session = session;

‎src/MediaSession.js

-223
This file was deleted.

‎src/Message.js

+4-13
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@ Message = function(ua) {
1515
this.direction = null;
1616
this.local_identity = null;
1717
this.remote_identity = null;
18+
19+
// Custom message empty object for high level use
20+
this.data = {};
1821
};
1922
Message.prototype = new JsSIP.EventEmitter();
2023

2124

2225
Message.prototype.send = function(target, body, options) {
2326
var request_sender, event, contentType, eventHandlers, extraHeaders,
2427
events = [
25-
'sending',
2628
'succeeded',
2729
'failed'
2830
],
@@ -77,11 +79,6 @@ Message.prototype.send = function(target, body, options) {
7779
request: this.request
7880
});
7981

80-
this.emit('sending', this, {
81-
originator: 'local',
82-
request: this.request
83-
});
84-
8582
if (invalidTarget) {
8683
this.emit('failed', this, {
8784
originator: 'local',
@@ -198,20 +195,14 @@ Message.prototype.accept = function(options) {
198195
options = options || {};
199196

200197
var
201-
status_code = options.status_code || 200,
202-
reason_phrase = options.reason_phrase,
203198
extraHeaders = options.extraHeaders || [],
204199
body = options.body;
205200

206201
if (this.direction !== 'incoming') {
207202
throw new TypeError('Invalid method "accept" for an outgoing message');
208203
}
209204

210-
if (status_code < 200 || status_code >= 300) {
211-
throw new TypeError('Invalid status_code: '+ status_code);
212-
}
213-
214-
this.request.reply(status_code, reason_phrase, extraHeaders, body);
205+
this.request.reply(200, null, extraHeaders, body);
215206
};
216207

217208
/**

‎src/RTCSession.js

+1,067
Large diffs are not rendered by default.

‎src/RTCSession/DTMF.js

+197
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,197 @@
1+
/**
2+
* @fileoverview DTMF
3+
*/
4+
5+
/**
6+
* @class DTMF
7+
* @param {JsSIP.RTCSession} session
8+
*/
9+
(function(JsSIP) {
10+
11+
var DTMF,
12+
C = {
13+
MIN_DURATION: 70,
14+
MAX_DURATION: 6000,
15+
DEFAULT_DURATION: 100,
16+
MIN_INTER_TONE_GAP: 50,
17+
DEFAULT_INTER_TONE_GAP: 500
18+
};
19+
20+
DTMF = function(session) {
21+
var events = [
22+
'succeeded',
23+
'failed'
24+
];
25+
26+
this.session = session;
27+
this.direction = null;
28+
this.tone = null;
29+
this.duration = null;
30+
31+
this.initEvents(events);
32+
};
33+
DTMF.prototype = new JsSIP.EventEmitter();
34+
35+
36+
DTMF.prototype.send = function(tone, options) {
37+
var request_sender, event, eventHandlers, extraHeaders;
38+
39+
if (tone === undefined) {
40+
throw new TypeError('Not enough arguments');
41+
}
42+
43+
this.direction = 'outgoing';
44+
45+
// Check RTCSession Status
46+
if (this.session.status !== JsSIP.RTCSession.C.STATUS_CONFIRMED && this.session.status !== JsSIP.RTCSession.C.STATUS_WAITING_FOR_ACK) {
47+
throw new JsSIP.Exceptions.InvalidStateError(this.session.status);
48+
}
49+
50+
// Get DTMF options
51+
options = options || {};
52+
extraHeaders = options.extraHeaders ? options.extraHeaders.slice() : [];
53+
eventHandlers = options.eventHandlers || {};
54+
55+
// Check tone type
56+
if (typeof tone === 'string' ) {
57+
tone = tone.toUpperCase();
58+
} else if (typeof tone === 'number') {
59+
tone = tone.toString();
60+
} else {
61+
throw new TypeError('Invalid tone: '+ tone);
62+
}
63+
64+
// Check tone value
65+
if (!tone.match(/^[0-9A-D#*]$/)) {
66+
throw new TypeError('Invalid tone: '+ tone);
67+
} else {
68+
this.tone = tone;
69+
}
70+
71+
// Check duration
72+
if (options.duration && !JsSIP.Utils.isDecimal(options.duration)) {
73+
throw new TypeError('Invalid tone duration: '+ options.duration);
74+
} else if (!options.duration) {
75+
options.duration = C.DEFAULT_DURATION;
76+
} else if (options.duration < C.MIN_DURATION) {
77+
console.warn(LOG_PREFIX +'"duration" value is lower than the minimum allowed, setting it to '+ C.MIN_DURATION+ ' milliseconds');
78+
options.duration = C.MIN_DURATION;
79+
} else if (options.duration > C.MAX_DURATION) {
80+
console.warn(LOG_PREFIX +'"duration" value is greater than the maximum allowed, setting it to '+ C.MAX_DURATION +' milliseconds');
81+
options.duration = C.MAX_DURATION;
82+
} else {
83+
options.duration = Math.abs(options.duration);
84+
}
85+
this.duration = options.duration;
86+
87+
// Set event handlers
88+
for (event in eventHandlers) {
89+
this.on(event, eventHandlers[event]);
90+
}
91+
92+
extraHeaders.push('Content-Type: application/dtmf-relay');
93+
94+
this.request = this.session.dialog.createRequest(JsSIP.C.INFO, extraHeaders);
95+
96+
this.request.body = "Signal= " + this.tone + "\r\n";
97+
this.request.body += "Duration= " + this.duration;
98+
99+
request_sender = new RequestSender(this);
100+
101+
this.session.emit('newDTMF', this.session, {
102+
originator: 'local',
103+
dtmf: this,
104+
request: this.request
105+
});
106+
107+
request_sender.send();
108+
};
109+
110+
/**
111+
* @private
112+
*/
113+
DTMF.prototype.receiveResponse = function(response) {
114+
var cause;
115+
116+
switch(true) {
117+
case /^1[0-9]{2}$/.test(response.status_code):
118+
// Ignore provisional responses.
119+
break;
120+
121+
case /^2[0-9]{2}$/.test(response.status_code):
122+
this.emit('succeeded', this, {
123+
originator: 'remote',
124+
response: response
125+
});
126+
break;
127+
128+
default:
129+
cause = JsSIP.Utils.sipErrorCause(response.status_code);
130+
this.emit('failed', this, {
131+
originator: 'remote',
132+
response: response,
133+
cause: cause
134+
});
135+
break;
136+
}
137+
};
138+
139+
/**
140+
* @private
141+
*/
142+
DTMF.prototype.onRequestTimeout = function() {
143+
this.emit('failed', this, {
144+
originator: 'system',
145+
cause: JsSIP.C.causes.REQUEST_TIMEOUT
146+
});
147+
};
148+
149+
/**
150+
* @private
151+
*/
152+
DTMF.prototype.onTransportError = function() {
153+
this.emit('failed', this, {
154+
originator: 'system',
155+
cause: JsSIP.C.causes.CONNECTION_ERROR
156+
});
157+
};
158+
159+
/**
160+
* @private
161+
*/
162+
DTMF.prototype.init_incoming = function(request) {
163+
var body,
164+
reg_tone = /^(Signal\s*?=\s*?)([0-9A-D#*]{1})(\s)?.*/,
165+
reg_duration = /^(Duration\s?=\s?)([0-9]{1,4})(\s)?.*/;
166+
167+
this.direction = 'incoming';
168+
this.request = request;
169+
170+
request.reply(200);
171+
172+
if (request.body) {
173+
body = request.body.split('\r\n');
174+
if (body.length === 2) {
175+
if (reg_tone.test(body[0])) {
176+
this.tone = body[0].replace(reg_tone,"$2");
177+
}
178+
if (reg_duration.test(body[1])) {
179+
this.duration = parseInt(body[1].replace(reg_duration,"$2"), 10);
180+
}
181+
}
182+
}
183+
184+
if (!this.tone || !this.duration) {
185+
console.warn(LOG_PREFIX +'invalid INFO DTMF received, discarded');
186+
} else {
187+
this.session.emit('newDTMF', this.session, {
188+
originator: 'remote',
189+
dtmf: this,
190+
request: request
191+
});
192+
}
193+
};
194+
195+
DTMF.C = C;
196+
return DTMF;
197+
}(JsSIP));

‎src/RTCSession/RTCMediaHandler.js

+214
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
1+
/**
2+
* @fileoverview RTCMediaHandler
3+
*/
4+
5+
/* RTCMediaHandler
6+
* @class PeerConnection helper Class.
7+
* @param {JsSIP.RTCSession} session
8+
* @param {Object} [contraints]
9+
*/
10+
(function(JsSIP){
11+
12+
var RTCMediaHandler = function(session, constraints) {
13+
constraints = constraints || {};
14+
15+
this.session = session;
16+
this.localMedia = null;
17+
this.peerConnection = null;
18+
19+
this.init(constraints);
20+
};
21+
22+
RTCMediaHandler.prototype = {
23+
24+
createOffer: function(onSuccess, onFailure) {
25+
var
26+
self = this,
27+
sent = false;
28+
29+
this.onIceCompleted = function() {
30+
if (!sent) {
31+
sent = true;
32+
onSuccess(self.peerConnection.localDescription.sdp);
33+
}
34+
};
35+
36+
this.peerConnection.createOffer(
37+
function(sessionDescription){
38+
self.setLocalDescription(
39+
sessionDescription,
40+
onFailure
41+
);
42+
},
43+
function(e) {
44+
console.error(LOG_PREFIX +'unable to create offer');
45+
console.error(e);
46+
onFailure();
47+
}
48+
);
49+
},
50+
51+
createAnswer: function(onSuccess, onFailure) {
52+
var
53+
self = this,
54+
sent = false;
55+
56+
this.onIceCompleted = function() {
57+
if (!sent) {
58+
sent = true;
59+
onSuccess(self.peerConnection.localDescription.sdp);
60+
}
61+
};
62+
63+
this.peerConnection.createAnswer(
64+
function(sessionDescription){
65+
self.setLocalDescription(
66+
sessionDescription,
67+
onFailure
68+
);
69+
},
70+
function(e) {
71+
console.error(LOG_PREFIX +'unable to create answer');
72+
console.error(e);
73+
onFailure();
74+
}
75+
);
76+
},
77+
78+
setLocalDescription: function(sessionDescription, onFailure) {
79+
this.peerConnection.setLocalDescription(
80+
sessionDescription,
81+
null,
82+
function(e) {
83+
console.error(LOG_PREFIX +'unable to set local description');
84+
console.error(e);
85+
onFailure();
86+
}
87+
);
88+
},
89+
90+
addStream: function(stream, onSuccess, onFailure, constraints) {
91+
try {
92+
this.peerConnection.addStream(stream, constraints);
93+
} catch(e) {
94+
console.error(LOG_PREFIX +'error adding stream');
95+
console.error(e);
96+
onFailure();
97+
return;
98+
}
99+
100+
onSuccess();
101+
},
102+
103+
/**
104+
* peerConnection creation.
105+
* @param {Function} onSuccess Fired when there are no more ICE candidates
106+
*/
107+
init: function(constraints) {
108+
var idx, server, scheme, url,
109+
self = this,
110+
servers = [];
111+
112+
for (idx in this.session.ua.configuration.stun_servers) {
113+
server = this.session.ua.configuration.stun_servers[idx];
114+
servers.push({'url': server});
115+
}
116+
117+
for (idx in this.session.ua.configuration.turn_servers) {
118+
server = this.session.ua.configuration.turn_servers[idx];
119+
url = server.server;
120+
scheme = url.substr(0, url.indexOf(':'));
121+
servers.push({
122+
'url': scheme + ':' + server.username + '@' + url.substr(scheme.length+1),
123+
'credential': server.password
124+
});
125+
}
126+
127+
this.peerConnection = new JsSIP.WebRTC.RTCPeerConnection({'iceServers': servers}, constraints);
128+
129+
this.peerConnection.onaddstream = function(e) {
130+
console.log(LOG_PREFIX +'stream added: '+ e.stream.id);
131+
};
132+
133+
this.peerConnection.onremovestream = function(e) {
134+
console.log(LOG_PREFIX +'stream removed: '+ e.stream.id);
135+
};
136+
137+
this.peerConnection.onicecandidate = function(e) {
138+
if (e.candidate) {
139+
console.log(LOG_PREFIX +'ICE candidate received: '+ e.candidate.candidate);
140+
} else {
141+
self.onIceCompleted();
142+
}
143+
};
144+
145+
// To be deprecated as per https://code.google.com/p/webrtc/issues/detail?id=1393
146+
this.peerConnection.ongatheringchange = function(e) {
147+
if (e.currentTarget.iceGatheringState === 'complete' && this.iceConnectionState !== 'closed') {
148+
self.onIceCompleted();
149+
}
150+
};
151+
152+
this.peerConnection.onicechange = function() {
153+
console.log(LOG_PREFIX +'ICE connection state changed to "'+ this.iceConnectionState +'"');
154+
};
155+
156+
this.peerConnection.onstatechange = function() {
157+
console.log(LOG_PREFIX +'PeerConnection state changed to "'+ this.readyState +'"');
158+
};
159+
},
160+
161+
close: function() {
162+
console.log(LOG_PREFIX + 'closing PeerConnection');
163+
if(this.peerConnection) {
164+
this.peerConnection.close();
165+
166+
if(this.localMedia) {
167+
this.localMedia.stop();
168+
}
169+
}
170+
},
171+
172+
/**
173+
* @param {Object} mediaConstraints
174+
* @param {Function} onSuccess
175+
* @param {Function} onFailure
176+
*/
177+
getUserMedia: function(onSuccess, onFailure, constraints) {
178+
var self = this;
179+
180+
console.log(LOG_PREFIX + 'requesting access to local media');
181+
182+
JsSIP.WebRTC.getUserMedia(constraints,
183+
function(stream) {
184+
console.log(LOG_PREFIX + 'got local media stream');
185+
self.localMedia = stream;
186+
onSuccess(stream);
187+
},
188+
function(e) {
189+
console.error(LOG_PREFIX +'unable to get user media');
190+
console.error(e);
191+
onFailure();
192+
}
193+
);
194+
},
195+
196+
/**
197+
* Message reception.
198+
* @param {String} type
199+
* @param {String} sdp
200+
* @param {Function} onSuccess
201+
* @param {Function} onFailure
202+
*/
203+
onMessage: function(type, body, onSuccess, onFailure) {
204+
this.peerConnection.setRemoteDescription(
205+
new JsSIP.WebRTC.RTCSessionDescription({type: type, sdp:body}),
206+
onSuccess,
207+
onFailure
208+
);
209+
}
210+
};
211+
212+
// Return since it will be assigned to a variable.
213+
return RTCMediaHandler;
214+
}(JsSIP));

‎src/RTCSession/RequestSender.js

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/**
2+
* @fileoverview RequestSender
3+
*/
4+
5+
/**
6+
* @class Session RequestSender
7+
* @param {JsSIP.RTCSession | RTCSession applicant} applicant
8+
* @param {JsSIP.OutgoingRequest} [request]
9+
*/
10+
(function(JsSIP){
11+
12+
var RequestSender = function(applicant, request) {
13+
this.applicant = applicant;
14+
this.request = request || applicant.request;
15+
this.session = (applicant instanceof JsSIP.RTCSession)? applicant : applicant.session;
16+
this.reattempt = false;
17+
this.reatemptTimer = null;
18+
this.request_sender = new JsSIP.InDialogRequestSender(this);
19+
};
20+
21+
RequestSender.prototype = {
22+
receiveResponse: function(response) {
23+
var
24+
self = this,
25+
status_code = response.status_code;
26+
27+
if (response.method === JsSIP.C.INVITE && status_code === 491) {
28+
if (!this.reattempt) {
29+
this.request.cseq.value = this.request.dialog.local_seqnum += 1;
30+
this.reatemptTimer = window.setTimeout(
31+
function() {
32+
if (self.session.status !== JsSIP.RTCSession.C.STATUS_TERMINATED) {
33+
self.reattempt = true;
34+
self.request_sender.send();
35+
}
36+
},
37+
this.getReattemptTimeout()
38+
);
39+
} else {
40+
this.applicant.receiveResponse(response);
41+
}
42+
} else {
43+
this.applicant.receiveResponse(response);
44+
}
45+
},
46+
47+
send: function() {
48+
this.request_sender.send();
49+
},
50+
51+
onRequestTimeout: function() {
52+
this.applicant.onRequestTimeout();
53+
},
54+
55+
onTransportError: function() {
56+
this.applicant.onTransportError();
57+
},
58+
59+
// RFC3261 14.1
60+
getReattemptTimeout: function() {
61+
if(this.session.direction === 'outgoing') {
62+
return (Math.random() * (4 - 2.1) + 2.1).toFixed(2);
63+
} else {
64+
return (Math.random() * 2).toFixed(2);
65+
}
66+
}
67+
};
68+
69+
return RequestSender;
70+
}(JsSIP));

‎src/Session.js

-1,347
This file was deleted.

‎src/UA.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var UA,
2626
* corresponding event handler is set.
2727
*/
2828
EVENT_METHODS: {
29-
'newSession': 'INVITE',
29+
'newRTCSession': 'INVITE',
3030
'newMessage': 'MESSAGE'
3131
},
3232

@@ -55,7 +55,7 @@ UA = function(configuration) {
5555
'registered',
5656
'unregistered',
5757
'registrationFailed',
58-
'newSession',
58+
'newRTCSession',
5959
'newMessage'
6060
];
6161

@@ -171,7 +171,7 @@ UA.prototype.isConnected = function() {
171171
UA.prototype.call = function(target, views, options) {
172172
var session;
173173

174-
session = new JsSIP.Session(this);
174+
session = new JsSIP.RTCSession(this);
175175
session.connect(target, views, options);
176176
};
177177

@@ -448,7 +448,7 @@ UA.prototype.receiveRequest = function(request) {
448448
switch(method) {
449449
case JsSIP.C.INVITE:
450450
if(JsSIP.WebRTC.isSupported) {
451-
session = new JsSIP.Session(this);
451+
session = new JsSIP.RTCSession(this);
452452
session.init_incoming(request);
453453
} else {
454454
console.warn(LOG_PREFIX +'INVITE received but WebRTC is not supported');

0 commit comments

Comments
 (0)
Please sign in to comment.