N-API Support for hiredis-node

.travis.yml

@@ -14,11 +14,13 @@ before_install:
   - node --version | grep -q 'v0.8' && npm install -g npm@2 || true
 
 node_js:
+  - "10"
+  - "9"
+  - "8"
+  - "7"
   - "6"
   - "5"
   - "4"
-  - "0.12"
-  - "0.10"
 
 notifications:
   email: false

appveyor.yml

@@ -3,11 +3,13 @@ init:
 
 environment:
   matrix:
+    - nodejs_version: 10
+    - nodejs_version: 9
+    - nodejs_version: 8
+    - nodejs_version: 7
     - nodejs_version: 6
     - nodejs_version: 5
     - nodejs_version: 4
-    - nodejs_version: 0.12
-    - nodejs_version: 0.10
 
 platform:
   - x86
@@ -16,7 +18,8 @@ platform:
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
   - git submodule update --init --recursive
-  - npm install --msvs_version=2013
+  - 'if "%nodejs_version%" LEQ 5 (npm install -g npm@5) else (npm install -g npm@latest)'
+  - npm install
 
 build: off
 

binding.gyp

@@ -6,8 +6,13 @@
           'src/hiredis.cc'
         , 'src/reader.cc'
       ],
-      'include_dirs': ["<!(node -e \"require('nan')\")"],
+      'cflags!': [ '-fno-exceptions' ],
+      'cflags_cc!': [ '-fno-exceptions' ],
+      'include_dirs' : [
+          "<!@(node -p \"require('node-addon-api').include\")"
+      ], 
       'dependencies': [
+        "<!(node -p \"require('node-addon-api').gyp\")",
         'deps/hiredis.gyp:hiredis-c'
       ],
       'defines': [
@@ -16,6 +21,22 @@
       'cflags': [
           '-Wall',
           '-O3'
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          "msvs_settings": {
+            "VCCLCompilerTool": {
+              "ExceptionHandling": 1
+            }
+          }
+        }],
+        ['OS=="mac"', {
+          "xcode_settings": {
+            "CLANG_CXX_LIBRARY": "libc++",
+            'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+            'MACOSX_DEPLOYMENT_TARGET': '10.7'
+          }
+        }]
       ]
     }
   ]

hiredis.js

@@ -1,5 +1,5 @@
 var net = require("net"),
-    hiredis = require('bindings')('hiredis.node');
+    hiredis = require('bindings')('hiredis');
 
 var bufStar = new Buffer("*", "ascii");
 var bufDollar = new Buffer("$", "ascii");

package.json

@@ -1,22 +1,24 @@
 {
   "name": "hiredis",
   "description": "Wrapper for reply processing code in hiredis",
-  "version": "0.5.0",
+  "version": "0.5.1-napi",
   "homepage": "http://github.com/redis/hiredis-node",
   "author": "Jan-Erik Rediger <janerik@fnordig.de>",
   "contributors": [
     "Pieter Noordhuis <pcnoordhuis@gmail.com>"
   ],
   "main": "hiredis",
   "scripts": {
-    "test": "node test/reader.js && node test/writer.js"
+    "test": "node test/reader.js && node test/writer.js",
+    "install": "node-gyp rebuild"
   },
+  "gypfile": true,
   "dependencies": {
-    "bindings": "^1.2.1",
-    "nan": "^2.3.4"
+    "bindings": "^1.3.0",
+    "node-addon-api": "^1.3.0"
   },
   "engines": {
-    "node": ">= 0.10.0"
+    "node": ">= 4.0.0"
   },
   "repository": {
     "type": "git",

src/hiredis.cc

@@ -1,10 +1,9 @@
+#include <napi.h>
 #include "reader.h"
 
-using namespace v8;
-
-extern "C" {
-    static NAN_MODULE_INIT(init) {
-        hiredis::Reader::Initialize(target);
-    }
-    NODE_MODULE(hiredis, init)
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
+    hiredis::Reader::Initialize(env, exports);
+    return exports;
 }
+
+NODE_API_MODULE(hiredis, Init)