Merge branch 'mrk-its-master'

Author: matt

manifest.json

@@ -8,6 +8,13 @@
       "scripts": ["scripts/background/background.js"]
     }
   },
+  "sockets": {
+    "udp": {
+      "send": "*",
+      "bind": "*",
+      "multicastMembership": ""
+    }
+  },
   "permissions": [
     "storage",
     {
@@ -16,4 +23,4 @@
     "http://*/" // Pretty wild but the UPnP discovery URL could be more or less anything
   ],
   "icons": {"128": "images/logo-128.png" }
-}
+}

scripts/ssdp/ssdp.js

@@ -37,41 +37,54 @@ var SSDP = function(config) {
 /**
  *  Initialise the SSDP connection by opening a UDP socket and joining the multicast group.
  */
-SSDP.prototype.init = function() {
+SSDP.prototype.init = function(callback) {
   this.log("Initialising...");
-  
+
   var that = this;
-  chrome.socket.create('udp', function (socket) {
-    var socketId = socket.socketId;
+  var cb = callback || function(){}
 
+  chrome.sockets.udp.create({}, function (socket) {
+    var socketId = socket.socketId;
+    chrome.sockets.udp.onReceive.addListener(function(result) {
+        var data = that.bufferToString(result.data);
+        that.processNotify(data);
+    })
     // House keeping on TTL & loopback
-    chrome.socket.setMulticastTimeToLive(socketId, 12, function (result) {
+    chrome.sockets.udp.setMulticastTimeToLive(socketId, 12, function (result) {
       if (result !== 0) {
         that.log('Error setting multicast TTL' + result);
       }});
 
-    chrome.socket.setMulticastLoopbackMode(socketId, true, function (result) {
+    chrome.sockets.udp.setMulticastLoopbackMode(socketId, true, function (result) {
       if (result !== 0) {
         that.log('Error setting multicast loop-back mode: ' + result);
       }
     });
 
-    chrome.socket.bind(socketId, that.address, that.port, function (result) {
-      if (result !== 0) {
-        that.log('Unable to bind to new socket: ' + result);
-      } else {
-        chrome.socket.joinGroup(socketId, that.multicast, function (result) {
-          if (result !== 0) {
-            that.log('Unable to join multicast group ' + that.multicast + ': ' + result);
-          } else {
-            that.socketId = socketId;            
-            that.pollData();  
-            that.sendDiscover();
-            that.log("Waiting for SSDP broadcasts.");             
-          }
-        });
+    function bind(port, cb) {
+      chrome.sockets.udp.bind(socketId, that.address, port, function (result) {
+        if(result === 0) return cb(result)
+        that.log('Unable to bind to new socket: ' + result + ", trying to bind to random port");
+        chrome.sockets.udp.bind(socketId, that.address, 0, cb)
+      })
+    }
+    bind(that.port, function(result) {
+      if(result !== 0) {
+          that.log('Unable to bind to new socket: ' + result)
+          return cb(result)
       }
-    });
+      chrome.sockets.udp.joinGroup(socketId, that.multicast, function (result) {
+        if (result !== 0) {
+          that.log('Unable to join multicast group ' + that.multicast + ': ' + result);
+        } else {
+          that.socketId = socketId;
+          that.sendDiscover();
+          that.log("Waiting for SSDP broadcasts.");
+        }
+        cb(result);
+      });
+    })
+
   });
 };
 
@@ -84,57 +97,40 @@ SSDP.prototype.sendDiscover = function(config) {
   var that = this;
   var c = config || {};
   var respondDelay = c.delay || 3;
+  var target = c.target || 'ssdp:all'
 
   var search = 'M-SEARCH * HTTP/1.1\r\n' +
     'HOST: 239.255.255.250:1900\r\n' +
-    'MAN: ssdp:discover\r\n' +
+    'MAN: "ssdp:discover"\r\n' +
     'MX: ' + respondDelay + '\r\n' +
-    'ST: ssdp:all\r\n\r\n';
+    'ST: ' + target + '\r\n\r\n'
 
   var buffer = this.stringToBuffer(search);
-  chrome.socket.sendTo(this.socketId, buffer, that.multicast, 
+  chrome.sockets.udp.send(this.socketId, buffer, that.multicast,
     that.port, function(info) {
       that.log("Sent M-SEARCH discovery message...");
     });
 };
 
 
-/**
- * Handles incomming UDP data from the multicast group
- * @private 
- */
-SSDP.prototype.pollData = function() {
-  var that = this;
-  if (that.socketId > -1) {
-    chrome.socket.recvFrom(that.socketId, that.bufferLength, function (result) {
-      if (result.resultCode >= 0) {
-        var data = that.bufferToString(result.data);
-        that.processNotify(data);
-        that.pollData();
-      } else {
-        that.log("Error handling data");
-      }
-    });
-  }
-};
-
 /**
  * Processes the NOTIFY broadcast and stores the service details in the services array
  * @param {string} str Contains the string of the NOTIFY resposne sent by SSDP services.
  * @private 
  */
 SSDP.prototype.processNotify = function(str) {
   var notify = {};
-  if (str.indexOf('NOTIFY') < 0) {
-    // only interested in notify broadcasts
-    return;
-  }
-  str.replace(/([A-Z\-]*){1}:([a-zA-Z\-_0-9\.:=\/ ?]*){1}/gi, 
+
+  str.replace(/([A-Z\-]*){1}:([^\n]*){1}/gi, 
     function (match, m1, m2) {
       var name = m1.toLowerCase().trim();
       name = name.replace('-',''); // remove any hypens, e.g. cache-control
       notify[name] = m2.trim();
     });
+  if(!notify.usn)
+    return;
+
+  console.log('notify packet', notify)
 
   // Check for expiration/max-age
   if (notify.cachecontrol) {
@@ -249,18 +245,11 @@ SSDP.prototype.updateCache = function() {
 
 /**
  * Converts a string to an array buffer
- * @param {string} str String to e converted
+ * @param {string} str String to be converted
  * @private 
  */
 SSDP.prototype.stringToBuffer = function(str) {
-  // courtesy of Renato Mangini / HTML5Rocks
-  // http://updates.html5rocks.com/2012/06/How-to-convert-ArrayBuffer-to-and-from-String
-  var buf = new ArrayBuffer(str.length*2); // 2 bytes for each char
-  var bufView = new Uint8Array(buf);
-  for (var i=0, strLen=str.length; i<strLen; i++) {
-    bufView[i] = str.charCodeAt(i);
-  }
-  return buf;
+  return new TextEncoder().encode(str).buffer;
 };
 
 /**
@@ -269,9 +258,7 @@ SSDP.prototype.stringToBuffer = function(str) {
  * @private
  */
 SSDP.prototype.bufferToString = function(buffer) {
-  // courtesy of Renato Mangini / HTML5Rocks
-  // http://updates.html5rocks.com/2012/06/How-to-convert-ArrayBuffer-to-and-from-String
-  return String.fromCharCode.apply(null, new Uint8Array(buffer));
+  return new TextDecoder().decode(new DataView(buffer))
 };
 
 /**