Merge pull request #321 from Sing-Li/webrtc-tidyup

Tidy up - removed cruft from the webrtc ib stack; moved stream dependency to core
RocketChat · Jul 20, 2015 · c850cc1 · c850cc1
2 parents 77ab707 + 9dc0383
commit c850cc1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 53 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -59,4 +59,5 @@ yasaricli:slugify
 meteorhacks:kadira
 meteorhacks:flow-router
 meteorhacks:flow-layout
+arunoda:streams@0.1.17
 rocketchat:webrtc
diff --git a/packages/rocketchat-webrtc-ib/common.js b/packages/rocketchat-webrtc-ib/common.js
diff --git a/packages/rocketchat-webrtc-ib/package.js b/packages/rocketchat-webrtc-ib/package.js
@@ -10,15 +10,12 @@ Package.onUse(function(api) {
 
 	api.use([
 		'coffeescript',
-		'rocketchat:lib@0.0.1',
-		'arunoda:streams@0.1.17'
+		'rocketchat:lib@0.0.1'
 	]);
 
-	api.addFiles('common.js');
 	api.addFiles('adapter.js', ['client']);
 	api.addFiles('webrtc.js', ['client']);
 	api.addFiles('webrtcmsg.coffee', ['client']);
-	api.addFiles('server.js', ['server']);
 
 	api.export('webrtc')
 });

diff --git a/packages/rocketchat-webrtc-ib/server.js b/packages/rocketchat-webrtc-ib/server.js
diff --git a/packages/rocketchat-webrtc-ib/webrtc.js b/packages/rocketchat-webrtc-ib/webrtc.js
@@ -12,7 +12,6 @@ webrtc = {
 			{url: "stun:stun.l.google.com:19302"}
 		]
 	},
-	stream: stream,
 	send: function(data) {
 		console.log
 		data.to = webrtc.to;
@@ -24,7 +23,6 @@ webrtc = {
 			msg: JSON.stringify(data),
 			rid: webrtc.room
 		});
-		// stream.emit('send', data);
 
 	},
 	stop: function(sendEvent) {

diff --git a/packages/rocketchat-webrtc-ib/webrtcmsg.coffee b/packages/rocketchat-webrtc-ib/webrtcmsg.coffee
@@ -3,29 +3,6 @@ class IncomingRtcMessageProcessor
 		if (message.to == Meteor.userId())
 			if (message.ts > webrtc.lastSeenTimestamp)
 				webrtc.lastSeenTimestamp = message.ts
-				# console.log('RTC ' + JSON.stringify(message))
 				webrtc.processIncomingRtcMessage(JSON.parse(message.msg), message.rid.replace(message.to, ''), message.rid)
 
-
-
-# stream.on(Meteor.userId(), function(data) {
-#	webrtc.log('stream.on', Meteor.userId(), data)
-#	if (data.close == true) {
-#		webrtc.stop(false);
-#	}
-
-#	if (!webrtc.pc)
-#		webrtc.start(false, data.from);
-#
-#	if (data.sdp) {
-#		webrtc.pc.setRemoteDescription(new RTCSessionDescription(data.sdp));
-#	} else {
-#		if( ["closed", "failed", "disconnected", "completed"].indexOf(webrtc.pc.iceConnectionState) === -1) {
-#			webrtc.pc.addIceCandidate(new RTCIceCandidate(data.candidate));
-#		}
-#	}
-#});
-
-
-
 RocketChat.callbacks.add 'renderRtcMessage', IncomingRtcMessageProcessor, RocketChat.callbacks.priority.LOW
diff --git a/packages/rocketchat-webrtc/package.js b/packages/rocketchat-webrtc/package.js
@@ -10,8 +10,7 @@ Package.onUse(function(api) {
 
 	api.use([
 		'coffeescript',
-		'rocketchat:lib@0.0.1',
-		'arunoda:streams@0.1.17'
+		'rocketchat:lib@0.0.1'
 	]);
 
 	api.addFiles('common.js');

diff --git a/server/stream/streamBroadcast.coffee b/server/stream/streamBroadcast.coffee
@@ -49,6 +49,10 @@
 
 
 Meteor.startup ->
-	startStreamBroadcast
-		'webrtc.stream': webrtc.stream
-		'typing': typingStream
+	if webrtc
+		startStreamBroadcast
+			'webrtc.stream': webrtc.stream
+			'typing': typingStream
+	else
+		startStreamBroadcast
+			'typing': typingStream