Namespace remaining messages, fix tests broken in #9

Author: danielstjules

lib/client.js

@@ -278,7 +278,7 @@ CrossStorageClient.prototype._installListener = function() {
     }
 
     // Handle initial connection
-    if (message.data === 'cross-storage:ready' && !client._connected) {
+    if (message.data.indexOf('cross-storage:') !== -1 && !client._connected) {
       client._connected = true;
       if (!client._requests.connect) return;
 
@@ -381,7 +381,7 @@ CrossStorageClient.prototype._request = function(method, params) {
 
   req = {
     id:     this._id + ':' + client._count,
-    method: method,
+    method: 'cross-storage:' + method,
     params: params
   };
 

lib/hub.js

@@ -65,7 +65,7 @@ CrossStorageHub._installListener = function() {
  * @param {MessageEvent} message A message to be processed
  */
 CrossStorageHub._listener = function(message) {
-  var uri, available, request, error, result, response;
+  var uri, available, request, method, error, result, response;
 
   // Handle polling for a ready message
   if (message.data === 'cross-storage:poll') {
@@ -74,13 +74,17 @@ CrossStorageHub._listener = function(message) {
 
   // Ignore the ready message when viewing the hub directly
   if (message.data === 'cross-storage:ready') return;
+
   request = JSON.parse(message.data);
+  method = request.method.split('cross-storage:')[1];
 
-  if (!CrossStorageHub._permitted(message.origin, request.method)) {
-    error = 'Invalid permissions for ' + request.method;
+  if (!method) {
+    return;
+  } else if (!CrossStorageHub._permitted(message.origin, method)) {
+    error = 'Invalid permissions for ' + method;
   } else {
     try {
-      result = CrossStorageHub['_' + request.method](request.params);
+      result = CrossStorageHub['_' + method](request.params);
     } catch (err) {
       error = err.message;
     }

test/test.js

@@ -21,7 +21,7 @@ describe('CrossStorageClient', function() {
   before(function(done) {
     var invoked = false;
     var next = function(msg) {
-      if (msg.data !== 'ready' || invoked) return;
+      if (msg.data !== 'cross-storage:ready' || invoked) return;
       invoked = true;
       done();
     };