Implement __call

This undoes the hack we were using to pass a Buffer to the output stream;
we'll have to reimplement that "properly".

Author: cscott

src/messages.h

@@ -79,70 +79,7 @@ class JsMessageChannel : public ObjectMapper {
     virtual void Send(MessageToJs *m) const = 0;
 };
 
-class JsGetPropertyMsg : public MessageToJs {
-    Value obj_;
-    Value name_;
- public:
-    JsGetPropertyMsg(ObjectMapper *m, zval *obj, zval *name)
-        : MessageToJs(m), obj_(m, obj), name_(m, name) { }
- protected:
-    virtual void InJs(ObjectMapper *m) {
-        Nan::MaybeLocal<v8::Object> o = Nan::To<v8::Object>(obj_.ToJs(m));
-        if (o.IsEmpty()) {
-            return Nan::ThrowTypeError("not an object");
-        }
-        Nan::MaybeLocal<v8::Value> r =
-            Nan::Get(o.ToLocalChecked(), name_.ToJs(m));
-        if (!r.IsEmpty()) {
-            retval_.Set(m, r.ToLocalChecked());
-        }
-    }
-};
-class JsInvokeMethodMsg : public MessageToJs {
-    Value obj_;
-    Value name_;
-    int argc_;
-    Value *argv_;
- public:
-    JsInvokeMethodMsg(ObjectMapper *m, zval *obj, zval *name, int argc, zval **argv)
-        : MessageToJs(m), obj_(m, obj), name_(m, name), argc_(argc), argv_(Value::NewArray(m, argc, argv)) { }
-    JsInvokeMethodMsg(ObjectMapper *m, zval *obj, const char *name, int argc, zval **argv)
-        : MessageToJs(m), obj_(m, obj), name_(), argc_(argc), argv_(Value::NewArray(m, argc, argv)) {
-        name_.SetOwnedString(name, strlen(name));
-    }
-    virtual ~JsInvokeMethodMsg() { delete[] argv_; }
-    // this is a bit of a hack to allow constructing a call with a Buffer
-    // as an argument.
-    Value &Argv(int n) { return argv_[n]; }
- protected:
-    virtual void InJs(ObjectMapper *m) {
-        Nan::MaybeLocal<v8::Object> o = Nan::To<v8::Object>(obj_.ToJs(m));
-        if (o.IsEmpty()) {
-            return Nan::ThrowTypeError("not an object");
-        }
-        Nan::MaybeLocal<v8::Object> method = Nan::To<v8::Object>(
-            Nan::Get(o.ToLocalChecked(), name_.ToJs(m))
-            .FromMaybe<v8::Value>(Nan::Undefined())
-        );
-        if (method.IsEmpty()) {
-            return Nan::ThrowTypeError("method is not an object");
-        }
-        v8::Local<v8::Value> *argv =
-            static_cast<v8::Local<v8::Value>*>
-            (alloca(sizeof(v8::Local<v8::Value>) * argc_));
-        for (int i=0; i<argc_; i++) {
-            new(&argv[i]) v8::Local<v8::Value>;
-            argv[i] = argv_[i].ToJs(m);
-        }
-        Nan::MaybeLocal<v8::Value> result =
-            Nan::CallAsFunction(method.ToLocalChecked(), o.ToLocalChecked(),
-                                argc_, argv);
-        if (!result.IsEmpty()) {
-            retval_.Set(m, result.ToLocalChecked());
-        }
-    }
-};
-
+// example of MessageToPhp
 class PhpGetPropertyMsg : public MessageToPhp {
     Value obj_;
     Value name_;

src/node_php_embed.cc

@@ -1,8 +1,10 @@
 #include <nan.h>
 
+extern "C" {
 #include <sapi/embed/php_embed.h>
 #include <Zend/zend_exceptions.h>
 #include <ext/standard/info.h>
+}
 
 #include "node_php_embed.h"
 #include "node_php_jsobject_class.h"
@@ -113,19 +115,15 @@ static int node_php_embed_ub_write(const char *str, unsigned int str_length TSRM
     AsyncMessageWorker::MessageChannel *messageChannel = NODE_PHP_EMBED_G(messageChannel);
     PhpRequestWorker *worker = (PhpRequestWorker *)
         (messageChannel->GetWorker());
-    ZVal stream{ZEND_FILE_LINE_C};
+    ZVal stream{ZEND_FILE_LINE_C}, buf{ZEND_FILE_LINE_C},
+        retval{ZEND_FILE_LINE_C};
     worker->GetStream().ToPhp(messageChannel, stream TSRMLS_CC);
-    zval buf; INIT_ZVAL(buf); // stack allocate a null zval as a placeholder
-    zval *args[] = { &buf };
-    JsInvokeMethodMsg msg(messageChannel, stream.Ptr(), "write", 1, args);
-    // hack the message to pass a buffer, not a string
-    // (and avoid unnecessary copying by not using an "owned buffer")
-    msg.Argv(0).SetBuffer(str, str_length);
-    messageChannel->Send(&msg);
-    // XXX wait for response
-    msg.WaitForResponse(); // XXX optional?
-    // now return value is in msg.retval_ or msg.exception_ but
-    // we'll ignore that (FIXME?)
+    // use plain zval to avoid allocating copy of method name
+    zval method; ZVAL_STRINGL(&method, "write", 5, 0);
+    // XXX need to pass 'str' as buffer, not a string, and avoid copying.
+    buf.SetString(str, str_length, 1);
+    call_user_function(EG(function_table), stream.PtrPtr(), &method,
+                       retval.Ptr(), 1, buf.PtrPtr() TSRMLS_CC);
     return str_length;
 }
 

src/node_php_jsobject_class.cc

@@ -2,16 +2,17 @@
 
 #include <nan.h>
 extern "C" {
-#include "php.h"
-#include "Zend/zend.h"
-#include "Zend/zend_exceptions.h"
-#include "Zend/zend_types.h"
+#include <main/php.h>
+#include <Zend/zend.h>
+#include <Zend/zend_exceptions.h>
+#include <Zend/zend_types.h>
 }
 
 #include "node_php_jsobject_class.h"
+
+#include "macros.h"
 #include "messages.h"
 #include "values.h"
-#include "macros.h"
 
 #define USE_MAGIC_ISSET 0
 
@@ -248,6 +249,76 @@ PHP_METHOD(JsObject, __unset) {
     msg.retval_.ToPhp(obj->channel, return_value, return_value_ptr TSRMLS_CC);
 }
 
+class JsInvokeMethodMsg : public MessageToJs {
+    Value object_;
+    Value member_;
+    ulong argc_;
+    Value *argv_;
+ public:
+    JsInvokeMethodMsg(ObjectMapper *m, objid_t objId, zval *member, ulong argc, zval **argv)
+        : MessageToJs(m), object_(), member_(m, member), argc_(argc), argv_(Value::NewArray(m, argc, argv)) {
+        object_.SetJsObject(objId);
+    }
+    virtual ~JsInvokeMethodMsg() { delete[] argv_; }
+    // this is a bit of a hack to allow constructing a call with a Buffer
+    // as an argument.
+    Value &Argv(int n) { return argv_[n]; }
+ protected:
+    virtual void InJs(ObjectMapper *m) {
+        Nan::MaybeLocal<v8::Object> jsObj =
+            Nan::To<v8::Object>(object_.ToJs(m));
+        if (jsObj.IsEmpty()) {
+            return Nan::ThrowTypeError("receiver is not an object");
+        }
+
+        Nan::MaybeLocal<v8::Object> method = Nan::To<v8::Object>(
+            Nan::Get(jsObj.ToLocalChecked(), member_.ToJs(m))
+            .FromMaybe<v8::Value>(Nan::Undefined())
+        );
+        if (method.IsEmpty()) {
+            return Nan::ThrowTypeError("method is not an object");
+        }
+        v8::Local<v8::Value> *argv =
+            static_cast<v8::Local<v8::Value>*>
+            (alloca(sizeof(v8::Local<v8::Value>) * argc_));
+        for (ulong i=0; i<argc_; i++) {
+            new(&argv[i]) v8::Local<v8::Value>;
+            argv[i] = argv_[i].ToJs(m);
+        }
+        Nan::MaybeLocal<v8::Value> result =
+            Nan::CallAsFunction(method.ToLocalChecked(), jsObj.ToLocalChecked(),
+                                argc_, argv);
+        if (!result.IsEmpty()) {
+            retval_.Set(m, result.ToLocalChecked());
+        }
+    }
+};
+
+PHP_METHOD(JsObject, __call) {
+    zval *member; zval *args;
+    PARSE_PARAMS(__unset, "z/a", &member, &args);
+    convert_to_string(member);
+    HashTable *arrht = Z_ARRVAL_P(args);
+    ulong argc = zend_hash_next_free_element(arrht); // maximum index
+    zval **argv = static_cast<zval**>(alloca(sizeof(zval*) * argc));
+    for (ulong i=0; i<argc; i++) {
+        zval **z;
+        if (zend_hash_index_find(arrht, i, (void**) &z)==FAILURE) {
+            argv[i] = EG(uninitialized_zval_ptr);
+        } else {
+            argv[i] = *z;
+        }
+    }
+    JsInvokeMethodMsg msg(obj->channel, obj->id, member, argc, argv);
+    obj->channel->Send(&msg);
+    msg.WaitForResponse();
+    THROW_IF_EXCEPTION("JS exception thrown during __call of \"%*s\"",
+                       Z_STRLEN_P(member), Z_STRVAL_P(member));
+    msg.retval_.ToPhp(obj->channel, return_value, return_value_ptr TSRMLS_CC);
+}
+
+
+
 
 /* Use (slightly thunked) versions of the has/read/write property handlers
  * for dimensions as well, so that $obj['foo'] acts like $obj->foo. */
@@ -364,6 +435,10 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(node_php_jsobject_unset_args, 0, 0, 1)
     ZEND_ARG_INFO(0, member)
 ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(node_php_jsobject_call_args, 0, 1/*return by ref*/, 1)
+    ZEND_ARG_INFO(0, member)
+    ZEND_ARG_INFO(0, args)
+ZEND_END_ARG_INFO()
 
 static const zend_function_entry node_php_jsobject_methods[] = {
     PHP_ME(JsObject, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
@@ -375,6 +450,7 @@ static const zend_function_entry node_php_jsobject_methods[] = {
     PHP_ME(JsObject, __get, node_php_jsobject_get_args, ZEND_ACC_PUBLIC)
     PHP_ME(JsObject, __set, node_php_jsobject_set_args, ZEND_ACC_PUBLIC)
     PHP_ME(JsObject, __unset, node_php_jsobject_unset_args, ZEND_ACC_PUBLIC)
+    PHP_ME(JsObject, __call, node_php_jsobject_call_args, ZEND_ACC_PUBLIC)
     ZEND_FE_END
 };