browser updates

ealymbaev · Mar 5, 2013 · c1bca65 · c1bca65
1 parent 66f9ca2
commit c1bca65
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 135 deletions.
diff --git a/dist/Call.js b/dist/Call.js
diff --git a/dist/holla.js b/dist/holla.js
diff --git a/dist/shims.js b/dist/shims.js
diff --git a/examples/holla.js b/examples/holla.js
@@ -251,7 +251,7 @@ var err = { type: 'error', data: 'parser error' }
  */
 
 exports.encodePacket = function (packet) {
-  var encoded = packets[packet.type];
+  var encoded = packets[packet.type]
 
   // data fragment is optional
   if (undefined !== packet.data) {
@@ -314,61 +314,62 @@ exports.encodePayload = function (packets) {
 /*
  * Decodes data when a payload is maybe expected.
  *
- * @param {String} data, callback method
- * @return {NaN} 
+ * @param {String} data
+ * @return {Array} packets
  * @api public
  */
 
-exports.decodePayload = function (data, callback) {
-  var packet;
+exports.decodePayload = function (data) {
   if (data == '') {
     // parser error - ignoring payload
-    return callback(err, 0, 1);
+    return [err];
   }
 
-  var length = ''
-    , n, msg;
+  var packets = []
+    , length = ''
+    , n, msg, packet
 
   for (var i = 0, l = data.length; i < l; i++) {
-    var chr = data.charAt(i);
+    var chr = data.charAt(i)
 
     if (':' != chr) {
       length += chr;
     } else {
       if ('' == length || (length != (n = Number(length)))) {
         // parser error - ignoring payload
-        return callback(err, 0, 1);
+        return [err];
       }
 
       msg = data.substr(i + 1, n);
 
       if (length != msg.length) {
         // parser error - ignoring payload
-        return callback(err, 0, 1);
+        return [err];
       }
 
       if (msg.length) {
         packet = exports.decodePacket(msg);
 
         if (err.type == packet.type && err.data == packet.data) {
           // parser error in individual packet - ignoring payload
-          return callback(err, 0, 1);
+          return [err];
         }
 
-        callback(packet, i + n, l);
+        packets.push(packet);
       }
 
       // advance cursor
       i += n;
-      length = '';
+      length = ''
     }
   }
 
   if (length != '') {
     // parser error - ignoring payload
-    return callback(err, 0, 1);
+    return [err];
   }
 
+  return packets;
 };
 
 });
@@ -1716,32 +1717,25 @@ Polling.prototype.poll = function(){
  */
 
 Polling.prototype.onData = function(data){
-  var self = this;
   debug('polling got data %s', data);
   // decode payload
-  parser.decodePayload(data, function(packet, index, total) {self.onDataCallback(packet, index, total)});
-};
+  var packets = parser.decodePayload(data);
 
-/**
- * Callback function for payloads
- * 
- * @api private
- */
-
-Polling.prototype.onDataCallback = function(packet, index, total){
-  // if its the first message we consider the transport open
-  if ('opening' == this.readyState) {
-    this.onOpen();
-  }
+  for (var i = 0, l = packets.length; i < l; i++) {
+    // if its the first message we consider the trnasport open
+    if ('opening' == this.readyState) {
+      this.onOpen();
+    }
 
-  // if its a close packet, we close the ongoing requests
-  if ('close' == packet.type) {
-    this.onClose();
-    return;
-  }
+    // if its a close packet, we close the ongoing requests
+    if ('close' == packets[i].type) {
+      this.onClose();
+      return;
+    }
 
-  // otherwise bypass onData and handle the message
-  this.onPacket(packet);
+    // otherwise bypass onData and handle the message
+    this.onPacket(packets[i]);
+  }
 
   // if we got data we're not polling
   this.polling = false;
@@ -2299,11 +2293,7 @@ JSONPPolling.prototype.doWrite = function (data, fn) {
 
   function initIframe () {
     if (self.iframe) {
-      try {
-        self.form.removeChild(self.iframe);
-      } catch (e) {
-        self.onError('jsonp polling iframe removal error', e);
-      }
+      self.form.removeChild(self.iframe);
     }
 
     try {
@@ -3215,14 +3205,6 @@ Emitter.prototype.off =
 Emitter.prototype.removeListener =
 Emitter.prototype.removeAllListeners = function(event, fn){
   this._callbacks = this._callbacks || {};
-
-  // all
-  if (0 == arguments.length) {
-    this._callbacks = {};
-    return this;
-  }
-
-  // specific event
   var callbacks = this._callbacks[event];
   if (!callbacks) return this;
 
@@ -3288,7 +3270,7 @@ Emitter.prototype.hasListeners = function(event){
 
 });
 require.register("holla/dist/holla.js", function(exports, require, module){
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.6.1
 (function() {
   var Call, ProtoSock, client, holla, shims;
 
@@ -3525,7 +3507,7 @@ require.register("holla/dist/holla.js", function(exports, require, module){
 
 });
 require.register("holla/dist/Call.js", function(exports, require, module){
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.6.1
 (function() {
   var Call, EventEmitter, shims,
     __hasProp = {}.hasOwnProperty,
@@ -3567,6 +3549,10 @@ require.register("holla/dist/Call.js", function(exports, require, module){
       this.parent.on("sdp." + this.user, function(desc) {
         desc.sdp = shims.processSDPIn(desc.sdp);
         _this.pc.setRemoteDescription(new shims.SessionDescription(desc));
+        console.log(desc);
+        if (!_this.isCaller) {
+          _this.initSDP();
+        }
         return _this.emit("sdp");
       });
       this.parent.on("hangup." + this.user, function() {
@@ -3649,7 +3635,6 @@ require.register("holla/dist/Call.js", function(exports, require, module){
           accepted: true
         }
       });
-      this.initSDP();
       return this;
     };
 
@@ -3713,7 +3698,7 @@ require.register("holla/dist/Call.js", function(exports, require, module){
 
 });
 require.register("holla/dist/shims.js", function(exports, require, module){
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.6.1
 (function() {
   var IceCandidate, MediaStream, PeerConnection, SessionDescription, URL, attachStream, browser, extract, getUserMedia, loadBlob, processSDPIn, processSDPOut, recordVideo, removeCN, replaceCodec, saveBlob, shim, supported, useOPUS;
 
@@ -3961,11 +3946,11 @@ require.register("holla/dist/shims.js", function(exports, require, module){
         ]
       };
       mediaConstraints = {
-        mandatory: {
-          OfferToReceiveAudio: true,
-          OfferToReceiveVideo: true,
-          DtlsSrtpKeyAgreement: true
-        }
+        optional: [
+          {
+            DtlsSrtpKeyAgreement: true
+          }
+        ]
       };
       if (!MediaStream.prototype.getVideoTracks) {
         MediaStream.prototype.getVideoTracks = function() {
@@ -4040,7 +4025,6 @@ this.duration)throw"you can't pass a duration if the fps is set";if("undefined"=
 this.frames.push({image:a,duration:b||this.duration})};i.prototype.compile=function(){return new g(this.frames.map(function(a){var b=l(h(atob(a.image.slice(23))));b.duration=a.duration;return b}))};return{Video:i,fromImageArray:function(a,b){return g(a.map(function(a){a=l(h(atob(a.slice(23))));a.duration=1E3/b;return a}))},toWebM:g}}();
 ;
 
-
   module.exports = shim();
 
 }).call(this);