Support methods, getters, and setters on JS proxies.

lib/html/src/Isolates.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 _serialize(var message) {
   return new _JsSerializer().traverse(message);
 }
 
 class JsProxy {
+  SendPortSync _port;
   final _id;
 
-  JsProxy._internal(this._id);
+  JsProxy._internal(this._port, this._id);
+
+  noSuchMethod(method, args) {
+    var result = _port.callSync([_id, method, args]);
+    switch (result[0]) {
+      case 'return': return result[1];
+      case 'exception': throw result[1];
+      case 'none': throw new NoSuchMethodException(this, method, args);
+      default: throw 'Invalid return value';
+    }
+  }
 }
 
 class _JsSerializer extends _Serializer {
 
   visitSendPortSync(SendPortSync x) {
     if (x is _JsSendPortSync) return visitJsSendPortSync(x);
     if (x is _LocalSendPortSync) return visitLocalSendPortSync(x);
     if (x is _RemoteSendPortSync) return visitRemoteSendPortSync(x);
-    throw "Illegal underlying port $x";
+    throw "Unknown port type $x";
   }
 
   visitJsSendPortSync(_JsSendPortSync x) {
     return [ 'sendport', 'nativejs', x._id ];
   }
 
   visitLocalSendPortSync(_LocalSendPortSync x) {
     return [ 'sendport', 'dart',
              ReceivePortSync._isolateId, x._receivePort._portId ];
   }
 
   visitRemoteSendPortSync(_RemoteSendPortSync x) {
     return [ 'sendport', 'dart',
              x._receivePort._isolateId, x._receivePort._portId ];
   }
 
   visitObject(Object x) {
     if (x is Function) return visitFunction(x);
     if (x is JsProxy) return visitJsProxy(x);
 
     // TODO: Handle DOM elements and proxy other objects.
-    var proxyId = _makeDartProxyRef(x);
-    return [ 'objref', 'dart', proxyId ];
+    var proxyId = _dartProxyRegistry._add(x);
+    return [ 'objref', proxyId,
+             visitSendPortSync(_dartProxyRegistry._sendPort) ];
  }
 
   visitFunction(Function func) {
     return [ 'funcref',
-              _makeFunctionRef(func), visitSendPortSync(_sendPort()), null ];
+             _functionRegistry._add(func),
+             visitSendPortSync(_functionRegistry._sendPort), null ];
   }
 
   visitJsProxy(JsProxy proxy) {
-    return [ 'objref', 'nativejs', proxy._id ];
+    return [ 'objref', proxy._id, visitSendPortSync(proxy._port) ];
   }
 }
 
 // Leaking implementation.  Later will be backend specific and hopefully
 // not leaking (at least in most of the cases.)
 // TODO: provide better, backend specific implementation.
 class _Registry<T> {
   final String _name;
   int _nextId;
   final Map<String, T> _registry;
+  final ReceivePortSync _port;
 
-  _Registry(this._name) : _nextId = 0, _registry = <T>{};
+  _Registry(this._name) :
+      _nextId = 0,
+      _registry = <T>{},
+      _port = new ReceivePortSync();
 
   String _add(T x) {
     // TODO(vsm): Cache x and reuse id.
     final id = '$_name-${_nextId++}';
     _registry[id] = x;
     return id;
   }
 
   T _get(String id) {
     return _registry[id];
   }
+
+  get _sendPort => _port.toSendPort();
 }
 
 class _FunctionRegistry extends _Registry<Function> {
-  final ReceivePortSync _port;
-
-  _FunctionRegistry() :
-      super('func-ref'),
-      _port = new ReceivePortSync() {
+  _FunctionRegistry() : super('func-ref') {
     _port.receive((msg) {
       final id = msg[0];
       final args = msg[1];
       final f = _registry[id];
       switch (args.length) {
         case 0: return f();
         case 1: return f(args[0]);
         case 2: return f(args[0], args[1]);
         case 3: return f(args[0], args[1], args[2]);
         case 4: return f(args[0], args[1], args[2], args[3]);
         default: throw 'Unsupported number of arguments.';
       }
     });
   }
-
-  get _sendPort => _port.toSendPort();
 }
 
 _FunctionRegistry __functionRegistry;
 get _functionRegistry {
   if (__functionRegistry === null) __functionRegistry = new _FunctionRegistry();
   return __functionRegistry;
 }
-
-_makeFunctionRef(f) => _functionRegistry._add(f);
-_sendPort() => _functionRegistry._sendPort;
 /// End of function serialization implementation.
 
 /// Object proxy implementation.
 
 class _DartProxyRegistry extends _Registry<Object> {
-  _DartProxyRegistry() : super('dart-ref');
+  _DartProxyRegistry() : super('dart-ref') {
+    _port.receive((msg) {
+      // TODO(vsm): Support a mechanism to register a handler here.
+      throw 'Invocation unsupported on Dart proxies';
+    });
+  }
 }
 
 _DartProxyRegistry __dartProxyRegistry;
 get _dartProxyRegistry {
   if (__dartProxyRegistry === null) {
     __dartProxyRegistry = new _DartProxyRegistry();
   }
   return __dartProxyRegistry;
 }
 
-_makeDartProxyRef(f) => _dartProxyRegistry._add(f);
-_getDartProxyObj(id) => _dartProxyRegistry._get(id);
-
 /// End of object proxy implementation.
 
 _deserialize(var message) {
   return new _JsDeserializer().deserialize(message);
 }
 
 class _JsDeserializer extends _Deserializer {
 
   static final _UNSPECIFIED = const Object();
 
@@ skipping 29 matching lines @@
               arg2 = _UNSPECIFIED, arg3 = _UNSPECIFIED]) {
       var args = [arg0, arg1, arg2, arg3];
       var last = args.indexOf(_UNSPECIFIED);
       if (last >= 0) args = args.getRange(0, last);
       var message = [id, args];
       return port.callSync(message);
     };
   }
 
   deserializeProxy(x) {
-    String tag = x[1];
-    switch (tag) {
-      case 'nativejs':
-        var id = x[2];
-        return new JsProxy._internal(id);
-      case 'dart':
-        var id = x[2];
-        // TODO(vsm): Check for isolate id.  If the isolate isn't the
-        // current isolate, return a DartProxy.
-        return _getDartProxyObj(id);
-      default: throw 'Illegal proxy: $x';
-    }
+    var id = x[1];
+    var port = deserializeSendPort(x[2]);
+    if (port is _JsSendPortSync) return new JsProxy._internal(port, id);
+    if (port is _LocalSendPortSync) return _dartProxyRegistry._get(id);
+    // TODO(vsm): Support this case.
+    if (port is _RemoteSendPortSync) throw 'Remote Dart proxies unsupported';
+    throw 'Illegal proxy: $port';
   }
 }
 
 // The receiver is JS.
 class _JsSendPortSync implements SendPortSync {
 
   num _id;
   _JsSendPortSync(this._id);
 
   callSync(var message) {
@@ skipping 123 matching lines @@
       return new _RemoteSendPortSync(isolateId, portId);
     }
   }
 }
 
 void _dispatchEvent(String receiver, var message) {
   var event = document.$dom_createEvent('TextEvent');
   event.initTextEvent(receiver, false, false, window, JSON.stringify(message));
   window.$dom_dispatchEvent(event);
 }