Added call to node::MakeCallback when returning asynchronously Ref #14

Author: waTeim

src/dispatch-v10.cpp

@@ -26,7 +26,7 @@ void doDispatch(uv_async_t *handle,int status)
    {
       HandleScope scope;
 
-      callbackWithResult(scope,binding->target()->cb(),binding->res());
+      callbackWithResult(scope,binding->target()->cb(),binding->res(),true);
    }
 }
 

src/dispatch-v11.cpp

@@ -26,7 +26,7 @@ void doDispatch(uv_async_t *handle)
    {
       HandleScope scope(I);
 
-      callbackWithResult(scope,binding->target()->cb(),binding->res());
+      callbackWithResult(scope,binding->target()->cb(),binding->res(),true);
    }
 }
 

src/nj-v10.cpp

@@ -401,7 +401,7 @@ void raiseException(HandleScope &scope,const shared_ptr<nj::Result> &res)
    ThrowException(ex);
 }
 
-Handle<Value> callbackWithResult(HandleScope &scope,const Local<Function> &cb,const shared_ptr<nj::Result> &res)
+Handle<Value> callbackWithResult(HandleScope &scope,const Local<Function> &cb,const shared_ptr<nj::Result> &res,bool useMakeCallback)
 {
    if(res.get())
    {
@@ -413,7 +413,8 @@ Handle<Value> callbackWithResult(HandleScope &scope,const Local<Function> &cb,co
          Local<Value> *argv = new Local<Value>[argc];
 
          argv[0] = genError(scope,res);
-         return callback(scope,cb,argc,argv);
+         if(useMakeCallback) return node::MakeCallback(Context::GetCurrent()->Global(),cb,argc,argv);
+         else return callback(scope,cb,argc,argv);
       }
       else
       {
@@ -422,7 +423,8 @@ Handle<Value> callbackWithResult(HandleScope &scope,const Local<Function> &cb,co
 
          argv[0] = Local<Value>::New(Null());
          argc = createResponse(scope,res,argc,argv);
-         return callback(scope,cb,argc,argv);
+         if(useMakeCallback) return node::MakeCallback(Context::GetCurrent()->Global(),cb,argc,argv);
+         else return callback(scope,cb,argc,argv);
       }
    }
    else return callback(scope,cb,0,0);

src/nj-v10.h

@@ -8,7 +8,7 @@
 void raiseException(v8::HandleScope &scope,const std::shared_ptr<nj::Result> &res);
 v8::Local<v8::Value> mapResult(v8::HandleScope &scope,std::shared_ptr<nj::Result> &res);
 v8::Local<v8::String> genError(v8::HandleScope &scope,const std::shared_ptr<nj::Result> &res);
-v8::Handle<v8::Value> callbackWithResult(v8::HandleScope &scope,const v8::Local<v8::Function> &cb,const std::shared_ptr<nj::Result> &res);
+v8::Handle<v8::Value> callbackWithResult(v8::HandleScope &scope,const v8::Local<v8::Function> &cb,const std::shared_ptr<nj::Result> &res,bool useMakeCallback);
 v8::Handle<v8::Value> returnResult(v8::HandleScope &scope,std::shared_ptr<nj::Result> &res);
 
 #endif

src/nj-v11.cpp

@@ -442,7 +442,7 @@ void raiseException(HandleScope &scope,const shared_ptr<nj::Result> &res)
    I->ThrowException(ex);
 }
 
-void callbackWithResult(HandleScope &scope,const Local<Function> &cb,const shared_ptr<nj::Result> &res)
+void callbackWithResult(HandleScope &scope,const Local<Function> &cb,const shared_ptr<nj::Result> &res,bool useMakeCallback)
 {
    Isolate *I = Isolate::GetCurrent();
 
@@ -456,7 +456,8 @@ void callbackWithResult(HandleScope &scope,const Local<Function> &cb,const share
          Local<Value> *argv = new Local<Value>[argc];
 
          argv[0] = genError(scope,res);
-         callback(I,cb,argc,argv);
+         if(useMakeCallback) node::MakeCallback(I,I->GetCurrentContext()->Global(),cb,argc,argv);
+         else callback(I,cb,argc,argv);
       }
       else
       {
@@ -465,7 +466,8 @@ void callbackWithResult(HandleScope &scope,const Local<Function> &cb,const share
 
          argv[0] = Null(I);
          (void)createResponse(scope,res,argc,argv);
-         callback(I,cb,argc,argv);
+         if(useMakeCallback) node::MakeCallback(I,I->GetCurrentContext()->Global(),cb,argc,argv);
+         else callback(I,cb,argc,argv);
       }
    }
    else callback(I,cb,0,0);

src/nj-v11.h

@@ -8,7 +8,7 @@
 void raiseException(v8::HandleScope &scope,const std::shared_ptr<nj::Result> &res);
 v8::Local<v8::Value> mapResult(v8::HandleScope &scope,std::shared_ptr<nj::Result> &res);
 v8::Local<v8::String> genError(v8::HandleScope &scope,const std::shared_ptr<nj::Result> &res);
-void callbackWithResult(v8::HandleScope &scope,const v8::Local<v8::Function> &cb,const std::shared_ptr<nj::Result> &res);
+void callbackWithResult(v8::HandleScope &scope,const v8::Local<v8::Function> &cb,const std::shared_ptr<nj::Result> &res,bool useMakeCallback = false);
 void returnResult(const v8::FunctionCallbackInfo<v8::Value> &args,v8::HandleScope &scope,std::shared_ptr<nj::Result> &res);
 
 #endif

test/test.js

@@ -829,6 +829,19 @@ describe('Regression Tests',function()
       expect(x).to.equal(6);
    });
 
+   it('asynchronous call followed by process.nextTick()',function(done)
+   {
+      julia.eval("2+3",function(err,result)
+      {
+         expect(err).to.equal(null);
+         expect(result).to.equal(5);
+      });
+      julia.eval("2+3",function(err,result)
+      {
+         process.nextTick(done);
+      });
+   });
+
 /*
    it('Incremental updates',function()
    {