Skip to content

Commit 940fb34

Browse files
jmillanjmillan
committed
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
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;

0 commit comments

Comments
 (0)