Allow waitForResult to be specified

srajko · srajko · commit 2452c40389ae · 2017-02-13T10:36:41.000-07:00
diff --git a/generate/templates/manual/include/callback_wrapper.h b/generate/templates/manual/include/callback_wrapper.h
@@ -14,6 +14,11 @@ class CallbackWrapper {
   int throttle; // in milliseconds - if > 0, calls to the JS callback will be throttled
   uint64_t lastCallTime;
 
+  // false will trigger the callback and not wait for the callback to finish
+  // in this case, the underlying libgit2 function will immediately be given
+  // the default result
+  bool waitForResult;
+
 public:
   CallbackWrapper() {
     jsCallback = NULL;
@@ -33,12 +38,17 @@ class CallbackWrapper {
     return jsCallback;
   }
 
-  void SetCallback(Nan::Callback* callback, int throttle = 0) {
+  void SetCallback(Nan::Callback* callback, int throttle = 0, bool waitForResult = true) {
     if(jsCallback) {
       delete jsCallback;
     }
     jsCallback = callback;
     this->throttle = throttle;
+    this->waitForResult = waitForResult;
+  }
+
+  bool ShouldWaitForResult() {
+    return waitForResult;
   }
 
   bool WillBeThrottled() {
diff --git a/generate/templates/partials/field_accessors.cc b/generate/templates/partials/field_accessors.cc
@@ -48,6 +48,7 @@
       {% elsif field.isCallbackFunction %}
         Nan::Callback *callback = NULL;
         int throttle = {%if field.return.throttle %}{{ field.return.throttle }}{%else%}0{%endif%};
+        bool waitForResult = true;
 
         if (value->IsFunction()) {
           callback = new Nan::Callback(value.As<Function>());
@@ -59,13 +60,20 @@
             Local<Value> objectCallback = maybeObjectCallback.ToLocalChecked();
             if (objectCallback->IsFunction()) {
               callback = new Nan::Callback(objectCallback.As<Function>());
+
               Nan::MaybeLocal<Value> maybeObjectThrottle = Nan::Get(object, Nan::New("throttle").ToLocalChecked());
               if(!maybeObjectThrottle.IsEmpty()) {
                 Local<Value> objectThrottle = maybeObjectThrottle.ToLocalChecked();
                 if (objectThrottle->IsNumber()) {
                   throttle = (int)objectThrottle.As<Number>()->Value();
                 }
               }
+
+              Nan::MaybeLocal<Value> maybeObjectWaitForResult = Nan::Get(object, Nan::New("waitForResult").ToLocalChecked());
+              if(!maybeObjectWaitForResult.IsEmpty()) {
+                Local<Value> objectWaitForResult = maybeObjectWaitForResult.ToLocalChecked();
+                waitForResult = (bool)objectWaitForResult->BooleanValue();
+              }
             }
           }
         }
@@ -74,7 +82,7 @@
             wrapper->raw->{{ field.name }} = ({{ field.cType }}){{ field.name }}_cppCallback;
           }
 
-          wrapper->{{ field.name }}.SetCallback(callback, throttle);
+          wrapper->{{ field.name }}.SetCallback(callback, throttle, waitForResult);
         }
 
       {% elsif field.payloadFor %}

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`{% elsif field.isCallbackFunction %}`
`49`	`49`	`Nan::Callback *callback = NULL;`
`50`	`50`	`int throttle = {%if field.return.throttle %}{{ field.return.throttle }}{%else%}0{%endif%};`
	`51`	`+ bool waitForResult = true;`
`51`	`52`
`52`	`53`	`if (value->IsFunction()) {`
`53`	`54`	`callback = new Nan::Callback(value.As<Function>());`
`@@ -59,13 +60,20 @@`
`59`	`60`	`Local<Value> objectCallback = maybeObjectCallback.ToLocalChecked();`
`60`	`61`	`if (objectCallback->IsFunction()) {`
`61`	`62`	`callback = new Nan::Callback(objectCallback.As<Function>());`
	`63`	`+`
`62`	`64`	`Nan::MaybeLocal<Value> maybeObjectThrottle = Nan::Get(object, Nan::New("throttle").ToLocalChecked());`
`63`	`65`	`if(!maybeObjectThrottle.IsEmpty()) {`
`64`	`66`	`Local<Value> objectThrottle = maybeObjectThrottle.ToLocalChecked();`
`65`	`67`	`if (objectThrottle->IsNumber()) {`
`66`	`68`	`throttle = (int)objectThrottle.As<Number>()->Value();`
`67`	`69`	`}`
`68`	`70`	`}`
	`71`	`+`
	`72`	`+ Nan::MaybeLocal<Value> maybeObjectWaitForResult = Nan::Get(object, Nan::New("waitForResult").ToLocalChecked());`
	`73`	`+ if(!maybeObjectWaitForResult.IsEmpty()) {`
	`74`	`+ Local<Value> objectWaitForResult = maybeObjectWaitForResult.ToLocalChecked();`
	`75`	`+ waitForResult = (bool)objectWaitForResult->BooleanValue();`
	`76`	`+ }`
`69`	`77`	`}`
`70`	`78`	`}`
`71`	`79`	`}`
`@@ -74,7 +82,7 @@`
`74`	`82`	`wrapper->raw->{{ field.name }} = ({{ field.cType }}){{ field.name }}_cppCallback;`
`75`	`83`	`}`
`76`	`84`
`77`		`- wrapper->{{ field.name }}.SetCallback(callback, throttle);`
	`85`	`+ wrapper->{{ field.name }}.SetCallback(callback, throttle, waitForResult);`
`78`	`86`	`}`
`79`	`87`
`80`	`88`	`{% elsif field.payloadFor %}`