Port project to N-API

Author: DavidRusso

binding.gyp

@@ -4,8 +4,17 @@
       'targets': [
         {
           'target_name': 'conpty',
+      'cflags!': [ '-fno-exceptions' ],
+      'cflags_cc!': [ '-fno-exceptions' ],
+      'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+        'CLANG_CXX_LIBRARY': 'libc++',
+        'MACOSX_DEPLOYMENT_TARGET': '10.7',
+      },
+      'msvs_settings': {
+        'VCCLCompilerTool': { 'ExceptionHandling': 1 },
+      },
           'include_dirs' : [
-            '<!(node -e "require(\'nan\')")'
+            '<!(node -p "require(\'node-addon-api\').include_dir")'
           ],
           'sources' : [
             'src/win/conpty.cc',
@@ -17,17 +26,35 @@
         },
         {
           'target_name': 'conpty_console_list',
+      'cflags!': [ '-fno-exceptions' ],
+      'cflags_cc!': [ '-fno-exceptions' ],
+      'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+        'CLANG_CXX_LIBRARY': 'libc++',
+        'MACOSX_DEPLOYMENT_TARGET': '10.7',
+      },
+      'msvs_settings': {
+        'VCCLCompilerTool': { 'ExceptionHandling': 1 },
+      },
           'include_dirs' : [
-            '<!(node -e "require(\'nan\')")'
+            '<!(node -p "require(\'node-addon-api\').include_dir")'
           ],
           'sources' : [
             'src/win/conpty_console_list.cc'
           ]
         },
         {
           'target_name': 'pty',
+      'cflags!': [ '-fno-exceptions' ],
+      'cflags_cc!': [ '-fno-exceptions' ],
+      'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+        'CLANG_CXX_LIBRARY': 'libc++',
+        'MACOSX_DEPLOYMENT_TARGET': '10.7',
+      },
+      'msvs_settings': {
+        'VCCLCompilerTool': { 'ExceptionHandling': 1 },
+      },
           'include_dirs' : [
-            '<!(node -e "require(\'nan\')")',
+            '<!(node -p "require(\'node-addon-api\').include_dir")',
             'deps/winpty/src/include',
           ],
           # Disabled due to winpty
@@ -48,8 +75,17 @@
     }, { # OS!="win"
       'targets': [{
         'target_name': 'pty',
+      'cflags!': [ '-fno-exceptions' ],
+      'cflags_cc!': [ '-fno-exceptions' ],
+      'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+        'CLANG_CXX_LIBRARY': 'libc++',
+        'MACOSX_DEPLOYMENT_TARGET': '10.7',
+      },
+      'msvs_settings': {
+        'VCCLCompilerTool': { 'ExceptionHandling': 1 },
+      },
         'include_dirs' : [
-          '<!(node -e "require(\'nan\')")'
+          '<!(node -p "require(\'node-addon-api\').include_dir")'
         ],
         'sources': [
           'src/unix/pty.cc'
@@ -67,6 +103,7 @@
             ]
           }],
           ['OS=="mac"', {
+            "cflags+": ["-fvisibility=hidden"],
             "xcode_settings": {
               "OTHER_CPLUSPLUSFLAGS": [
                 "-std=c++11",
@@ -75,7 +112,8 @@
               "OTHER_LDFLAGS": [
                 "-stdlib=libc++"
               ],
-              "MACOSX_DEPLOYMENT_TARGET":"10.7"
+              "MACOSX_DEPLOYMENT_TARGET":"10.7",
+              "GCC_SYMBOLS_PRIVATE_EXTERN": "YES", # -fvisibility=hidden
             }
           }]
         ]

package.json

@@ -44,7 +44,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "nan": "^2.14.0"
+    "node-addon-api": "^3.0.2"
   },
   "devDependencies": {
     "@types/mocha": "^7.0.2",

src/terminal.test.ts

@@ -85,6 +85,7 @@ describe('Terminal', () => {
       assert.equal(pty.handleFlowControl, true);
       assert.equal((pty as any)._flowControlPause, 'abc');
       assert.equal((pty as any)._flowControlResume, '123');
+      pty.kill();
     });
     // TODO: I don't think this test ever worked due to pollUntil being used incorrectly
     // it('should do flow control automatically', async function(): Promise<void> {