native bindings compatible with v0.5.x

brianc · brianc · commit b59e0041b3ee · 2011-10-10T22:03:27.000-05:00
diff --git a/lib/native/index.js b/lib/native/index.js
@@ -2,12 +2,25 @@
 var EventEmitter = require('events').EventEmitter;
 var utils = require(__dirname + "/../utils");
 
-var binding = require(__dirname + '/../../build/default/binding');
+var binding;
+
+try{
+  //v0.5.x
+ binding = require(__dirname + '/../../build/Release/binding.node');
+} catch(e) {
+  //v0.4.x
+ binding = require(__dirname + '/../../build/default/binding');
+}
+
 var Connection = binding.Connection;
 var types = require(__dirname + "/../types");
 var NativeQuery = require(__dirname + '/query');
 
+var EventEmitter = require('events').EventEmitter;
 var p = Connection.prototype;
+for(var k in EventEmitter.prototype) {
+  p[k] = EventEmitter.prototype[k];
+}
 
 var nativeConnect = p.connect;
 
diff --git a/src/binding.cc b/src/binding.cc
@@ -1,11 +1,10 @@
 #include <libpq-fe.h>
 #include <node.h>
-#include <node_events.h>
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
 
-#define LOG(msg) printf("%s\n",msg)
+#define LOG(msg) printf("%s\n",msg);
 #define TRACE(msg) //printf("%s\n", msg);
 
 
@@ -14,11 +13,6 @@
 using namespace v8;
 using namespace node;
 
-static Persistent<String> connect_symbol;
-static Persistent<String> error_symbol;
-static Persistent<String> ready_symbol;
-static Persistent<String> row_symbol;
-static Persistent<String> notice_symbol;
 static Persistent<String> severity_symbol;
 static Persistent<String> code_symbol;
 static Persistent<String> detail_symbol;
@@ -35,8 +29,9 @@ static Persistent<String> value_symbol;
 static Persistent<String> type_symbol;
 static Persistent<String> channel_symbol;
 static Persistent<String> payload_symbol;
+static Persistent<String> emit_symbol;
 
-class Connection : public EventEmitter {
+class Connection : public ObjectWrap {
 
 public:
 
@@ -47,15 +42,10 @@ class Connection : public EventEmitter {
     HandleScope scope;
     Local<FunctionTemplate> t = FunctionTemplate::New(New);
 
-    t->Inherit(EventEmitter::constructor_template);
     t->InstanceTemplate()->SetInternalFieldCount(1);
     t->SetClassName(String::NewSymbol("Connection"));
 
-    connect_symbol = NODE_PSYMBOL("connect");
-    error_symbol = NODE_PSYMBOL("_error");
-    ready_symbol = NODE_PSYMBOL("_readyForQuery");
-    notice_symbol = NODE_PSYMBOL("notice");
-    row_symbol = NODE_PSYMBOL("_row");
+    emit_symbol = NODE_PSYMBOL("emit");
     severity_symbol = NODE_PSYMBOL("severity");
     code_symbol = NODE_PSYMBOL("code");
     detail_symbol = NODE_PSYMBOL("detail");
@@ -229,7 +219,7 @@ class Connection : public EventEmitter {
   ev_io write_watcher_;
   PGconn *connection_;
   bool connecting_;
-  Connection () : EventEmitter ()
+  Connection () : ObjectWrap ()
   {
     connection_ = NULL;
     connecting_ = false;
@@ -348,7 +338,7 @@ class Connection : public EventEmitter {
   {
     HandleScope scope;
     Handle<Value> notice = String::New(message);
-    Emit(notice_symbol, 1, &notice);
+    Emit("notice", &notice);
   }
 
   //called to process io_events from libev
@@ -386,7 +376,7 @@ class Connection : public EventEmitter {
         }
         //might have fired from notification
         if(didHandleResult) {
-          Emit(ready_symbol, 0, NULL);
+          Emit("_readyForQuery");
         }
       }
 
@@ -396,7 +386,7 @@ class Connection : public EventEmitter {
         result->Set(channel_symbol, String::New(notify->relname));
         result->Set(payload_symbol, String::New(notify->extra));
         Handle<Value> res = (Handle<Value>)result;
-        Emit((Handle<String>)String::New("notification"), 1, &res);
+        Emit("notification", &res);
         PQfreemem(notify);
       }
 
@@ -464,7 +454,7 @@ class Connection : public EventEmitter {
 
       //not sure about what to dealloc or scope#Close here
       Handle<Value> e = (Handle<Value>)row;
-      Emit(row_symbol, 1, &e);
+      Emit("_row", &e);
     }
   }
 
@@ -487,7 +477,7 @@ class Connection : public EventEmitter {
     AttachErrorField(result, msg, line_symbol, PG_DIAG_SOURCE_LINE);
     AttachErrorField(result, msg, routine_symbol, PG_DIAG_SOURCE_FUNCTION);
     Handle<Value> m = msg;
-    Emit(error_symbol, 1, &m);
+    Emit("_error", &m);
   }
 
   void AttachErrorField(const PGresult *result, const Local<Object> msg, const Persistent<String> symbol, int fieldcode)
@@ -506,6 +496,33 @@ class Connection : public EventEmitter {
   }
 
 private:
+  //EventEmitter was removed from c++ in node v0.5.x
+  void Emit(char* message) {
+    HandleScope scope;
+    Handle<Value> args[1] = { String::New(message) };
+    Emit(1, args);
+  }
+
+  void Emit(char* message, Handle<Value>* arg) {
+    HandleScope scope;
+    Handle<Value> args[2] = { String::New(message), *arg };
+    Emit(2, args);
+  }
+
+  void Emit(int length, Handle<Value> *args) {
+    HandleScope scope;
+
+    Local<Value> emit_v = this->handle_->Get(emit_symbol);
+    assert(emit_v->IsFunction());
+    Local<Function> emit_f = emit_v.As<Function>();
+
+    TryCatch tc;
+    emit_f->Call(this->handle_, length, args);
+    if(tc.HasCaught()) {
+      FatalException(tc);
+    }
+  }
+
   void HandleConnectionIO()
   {
     PostgresPollingStatusType status = PQconnectPoll(connection_);
@@ -530,7 +547,7 @@ class Connection : public EventEmitter {
       TRACE("Polled: PGRES_POLLING_OK");
       connecting_ = false;
       StartRead();
-      Emit(connect_symbol, 0, NULL);
+      Emit("connect");
     default:
       //printf("Unknown polling status: %d\n", status);
       break;
@@ -540,7 +557,7 @@ class Connection : public EventEmitter {
   void EmitError(const char *message)
   {
     Local<Value> exception = Exception::Error(String::New(message));
-    Emit(error_symbol, 1, &exception);
+    Emit("_error", &exception);
   }
 
   void EmitLastError()
@@ -624,8 +641,7 @@ class Connection : public EventEmitter {
 };
 
 
-extern "C" void
-init (Handle<Object> target)
+extern "C" void init (Handle<Object> target)
 {
   HandleScope scope;
   Connection::Init(target);
