Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / extensions / renderer / resources / serial_custom_bindings.js

diff --git a/src/extensions/renderer/resources/serial_custom_bindings.js b/src/extensions/renderer/resources/serial_custom_bindings.js
index 31f6dae..f0af8da 100644 (file)
--- a/src/extensions/renderer/resources/serial_custom_bindings.js
+++ b/src/extensions/renderer/resources/serial_custom_bindings.js
@@ -12,31 +12,33 @@
  */
 
 var binding = require('binding').Binding.create('serial');
+var context = requireNative('v8_context');
+var eventBindings = require('event_bindings');
+var utils = require('utils');
 
-function createAsyncProxy(targetPromise, functionNames) {
-  var functionProxies = {};
-  $Array.forEach(functionNames, function(name) {
-    functionProxies[name] = function() {
-      var args = arguments;
-      return targetPromise.then(function(target) {
-        return $Function.apply(target[name], target, args);
-      });
-    };
-  });
-  return functionProxies;
-}
+var serialServicePromise = function() {
+  // getBackgroundPage is not available in unit tests so fall back to the
+  // current page's serial_service module.
+  if (!chrome.runtime.getBackgroundPage)
+    return requireAsync('serial_service');
 
-var serialService = createAsyncProxy(requireAsync('serial_service'), [
-  'getDevices',
-  'createConnection',
-  'getConnection',
-  'getConnections',
-]);
+  // Load the serial_service module from the background page if one exists. This
+  // is necessary for serial connections created in one window to be usable
+  // after that window is closed. This is necessary because the Mojo async
+  // waiter only functions while the v8 context remains.
+  return utils.promise(chrome.runtime.getBackgroundPage).then(function(bgPage) {
+    return context.GetModuleSystem(bgPage).requireAsync('serial_service');
+  }).catch(function() {
+    return requireAsync('serial_service');
+  });
+}();
 
 function forwardToConnection(methodName) {
   return function(connectionId) {
     var args = $Array.slice(arguments, 1);
-    return serialService.getConnection(connectionId).then(function(connection) {
+    return serialServicePromise.then(function(serialService) {
+      return serialService.getConnection(connectionId);
+    }).then(function(connection) {
       return $Function.apply(connection[methodName], connection, args);
     });
   };
@@ -44,11 +46,25 @@ function forwardToConnection(methodName) {
 
 binding.registerCustomHook(function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
-  apiFunctions.setHandleRequestWithPromise('getDevices',
-                                           serialService.getDevices);
+  apiFunctions.setHandleRequestWithPromise('getDevices', function() {
+    return serialServicePromise.then(function(serialService) {
+      return serialService.getDevices();
+    });
+  });
 
   apiFunctions.setHandleRequestWithPromise('connect', function(path, options) {
-    return serialService.createConnection(path, options).then(function(result) {
+    return serialServicePromise.then(function(serialService) {
+      return serialService.createConnection(path, options);
+    }).then(function(result) {
+      var id = result.info.connectionId;
+      result.connection.onData = function(data) {
+        eventBindings.dispatchEvent(
+            'serial.onReceive', [{connectionId: id, data: data}]);
+      };
+      result.connection.onError = function(error) {
+        eventBindings.dispatchEvent(
+            'serial.onReceiveError', [{connectionId: id, error: error}]);
+      };
       return result.info;
     }).catch (function(e) {
       throw new Error('Failed to connect to the port.');
@@ -69,9 +85,13 @@ binding.registerCustomHook(function(bindingsAPI) {
       'flush', forwardToConnection('flush'));
   apiFunctions.setHandleRequestWithPromise(
       'setPaused', forwardToConnection('setPaused'));
+  apiFunctions.setHandleRequestWithPromise(
+      'send', forwardToConnection('send'));
 
   apiFunctions.setHandleRequestWithPromise('getConnections', function() {
-    return serialService.getConnections().then(function(connections) {
+    return serialServicePromise.then(function(serialService) {
+      return serialService.getConnections();
+    }).then(function(connections) {
       var promises = [];
       for (var id in connections) {
         promises.push(connections[id].getInfo());