0.6.6

Fixes #17

.travis.yml

@@ -3,9 +3,17 @@ node_js:
   - "0.10"
   - "0.12"
   - "iojs"
+  - "4"
 sudo: false
 addons:
   firefox: "34.0"
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
+env:
+  - CXX=g++-4.8
 notifications:
   email:
     on_success: never

lib/worker.js

@@ -3,10 +3,12 @@
  * addon and makes it available for Node.
  */
 
+"use strict";
+
 try {
   module.exports = require("../build/Release/worker");
 } catch(e) {
   // Do nothing for a moment. Everything will work except the functions
-  // that uses worker routines.
+  // that use worker routines.
   // TODO(Kagami) Provide pure JS fallback.
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitmessage",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "JavaScript Bitmessage library",
   "main": "./lib/index.js",
   "browser": {
@@ -50,15 +50,15 @@
     "bn.js": "^3.0.1",
     "bs58": "^2.0.0",
     "buffer-equal": "~0.0.1",
-    "eccrypto": "^1.0.1",
-    "es6-promise": "^2.0.1",
+    "eccrypto": "^1.0.3",
+    "es6-promise": "^3.0.2",
     "hash.js": "^1.0.2",
-    "nan": "^1.4.1",
+    "nan": "^2.1.0",
     "object-assign": "^2.0.0",
     "sha.js": "^2.3.1",
     "webworkify": "^1.0.1"
   },
   "optionalDependencies": {
-    "bignum": "^0.9.0"
+    "bignum": "^0.11.0"
   }
 }

src/pow.cc

@@ -36,12 +36,14 @@ typedef struct {
   PowArgs* pow_args;
 } ThreadArgs;
 
+#ifndef ntohll
 inline uint64_t ntohll(uint64_t x) {
   return (
       ((uint64_t)(ntohl( (unsigned int)((x << 32) >> 32) )) << 32) |
       ntohl( ((unsigned int)(x >> 32)) )
   );
 }
+#endif
 
 // Set POW computation result in a thread-safe way.
 void set_result(PowArgs* pow_args, PowResult res, uint64_t nonce) {

src/worker.cc

@@ -13,13 +13,13 @@ using v8::Number;
 
 static const uint64_t MAX_SAFE_INTEGER = 9007199254740991ULL;
 
-class PowWorker : public NanAsyncWorker {
+class PowWorker : public Nan::AsyncWorker {
  public:
-  PowWorker(NanCallback* callback,
+  PowWorker(Nan::Callback* callback,
             size_t pool_size,
             uint64_t target,
             uint8_t* initial_hash)
-      : NanAsyncWorker(callback),
+      : Nan::AsyncWorker(callback),
         pool_size(pool_size),
         target(target),
         initial_hash(initial_hash) {}
@@ -40,17 +40,16 @@ class PowWorker : public NanAsyncWorker {
   // this function will be run inside the main event loop
   // so it is safe to use V8 again
   void HandleOKCallback () {
-    NanScope();
     if (error) {
       Local<Value> argv[1];
       if (error == -1) {
-        argv[0] = NanError("Max safe integer overflow");
+        argv[0] = Nan::Error("Max safe integer overflow");
       } else {
-        argv[0] = NanError("Internal error");
+        argv[0] = Nan::Error("Internal error");
       }
       callback->Call(1, argv);
     } else {
-      Local<Value> argv[] = {NanNull(), NanNew<Number>(nonce)};
+      Local<Value> argv[] = {Nan::Null(), Nan::New<Number>(nonce)};
       callback->Call(2, argv);
     }
   }
@@ -64,39 +63,35 @@ class PowWorker : public NanAsyncWorker {
 };
 
 NAN_METHOD(PowAsync) {
-  NanScope();
-
-  if (args.Length() != 4 ||
-      !args[0]->IsNumber() ||  // pool_size
-      !args[1]->IsNumber() ||  // target
-      !node::Buffer::HasInstance(args[2]) ||  // initial_hash
-      !args[3]->IsFunction()) {  // cb
-    return NanThrowError("Bad input");
+  if (info.Length() != 4 ||
+      !info[0]->IsNumber() ||  // pool_size
+      !info[1]->IsNumber() ||  // target
+      !node::Buffer::HasInstance(info[2]) ||  // initial_hash
+      !info[3]->IsFunction()) {  // cb
+    return Nan::ThrowError("Bad input");
   }
 
-  size_t pool_size = args[0]->Uint32Value();
-  uint64_t target = args[1]->IntegerValue();
-  char* buf = node::Buffer::Data(args[2]);
-  size_t length = node::Buffer::Length(args[2]);
+  size_t pool_size = info[0]->Uint32Value();
+  uint64_t target = info[1]->IntegerValue();
+  char* buf = node::Buffer::Data(info[2]);
+  size_t length = node::Buffer::Length(info[2]);
   if (pool_size < 1 ||
       pool_size > MAX_POOL_SIZE ||
       buf == NULL ||
       length != HASH_SIZE) {
-    return NanThrowError("Bad input");
+    return Nan::ThrowError("Bad input");
   }
 
-  // TODO(Kagami): Do we need to process `std::bad_alloc`?
   uint8_t* initial_hash = new uint8_t[length];
   memcpy(initial_hash, buf, length);
-  NanCallback* callback = new NanCallback(args[3].As<Function>());
-  NanAsyncQueueWorker(new PowWorker(callback, pool_size, target, initial_hash));
-  NanReturnUndefined();
+  Nan::Callback* callback = new Nan::Callback(info[3].As<Function>());
+  Nan::AsyncQueueWorker(
+    new PowWorker(callback, pool_size, target, initial_hash));
 }
 
-void InitAll(Handle<Object> exports) {
-  exports->Set(
-      NanNew<String>("powAsync"),
-      NanNew<FunctionTemplate>(PowAsync)->GetFunction());
+NAN_MODULE_INIT(InitAll) {
+  Nan::Set(target, Nan::New<String>("powAsync").ToLocalChecked(),
+    Nan::GetFunction(Nan::New<FunctionTemplate>(PowAsync)).ToLocalChecked());
 }
 
 NODE_MODULE(worker, InitAll)

test.js

@@ -1194,9 +1194,10 @@ describe("POW", function() {
         // computed nonces may vary in a big range (since target is
         // simple, there are a lot of valid nonces). Probably because
         // some spawned web workers get blocked for some reason.
-        if (typeof window === "undefined") {
-          expect(nonce).to.equal(21997550);
-        }
+        // FIXME(Kagami): Local runs started to fail here too.
+        // if (typeof window === "undefined") {
+        //   expect(nonce).to.equal(21997550);
+        // }
         expect(POW.check({
           nonce: nonce,
           target: target,