migrate keytar to napi (#268)

atom · May 10, 2020 · 3682c56 · 3682c56
1 parent 2b1a9fa
commit 3682c56
Show file tree

Hide file tree

Showing 7 changed files with 228 additions and 199 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -2,7 +2,16 @@
   'targets': [
     {
       'target_name': 'keytar',
-      'include_dirs': [ '<!(node -e "require(\'nan\')")' ],
+      '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 -p \"require('node-addon-api').include\")" ],
       'sources': [
         'src/async.cc',
         'src/main.cc',

diff --git a/lib/keytar.js b/lib/keytar.js
@@ -6,54 +6,38 @@ function checkRequired(val, name) {
   }
 }
 
-function callbackPromise(callback) {
-  if (typeof callback === 'function') {
-    return new Promise(function(resolve, reject) {
-      callback((err, val) => {
-        if (err) {
-          reject(err)
-        } else {
-          resolve(val)
-        }
-      })
-    })
-  } else {
-    throw new Error('Callback required')
-  }
-}
-
 module.exports = {
   getPassword: function (service, account) {
     checkRequired(service, 'Service')
     checkRequired(account, 'Account')
 
-    return callbackPromise(callback => keytar.getPassword(service, account, callback))
+    return keytar.getPassword(service, account)
   },
 
   setPassword: function (service, account, password) {
     checkRequired(service, 'Service')
     checkRequired(account, 'Account')
     checkRequired(password, 'Password')
 
-    return callbackPromise(callback => keytar.setPassword(service, account, password, callback))
+    return keytar.setPassword(service, account, password)
   },
 
   deletePassword: function (service, account) {
     checkRequired(service, 'Service')
     checkRequired(account, 'Account')
 
-    return callbackPromise(callback => keytar.deletePassword(service, account, callback))
+    return keytar.deletePassword(service, account)
   },
 
   findPassword: function (service) {
     checkRequired(service, 'Service')
 
-    return callbackPromise(callback => keytar.findPassword(service, callback))
+    return keytar.findPassword(service)
   },
 
   findCredentials: function (service) {
     checkRequired(service, 'Service')
 
-    return callbackPromise(callback => keytar.findCredentials(service, callback))
+    return keytar.findCredentials(service)
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "prebuild": "^10.0.0"
   },
   "dependencies": {
-    "nan": "2.14.1",
+    "node-addon-api": "^3.0.0",
     "prebuild-install": "5.3.3"
   }
 }