Merge pull request #26 from ndaidong/v2.0.0

v2.0.0rc1

Author: ndaidong

.github/workflows/ci-test.yml

@@ -0,0 +1,43 @@
+# GitHub actions
+# https://docs.github.com/en/free-pro-team@latest/actions
+
+name: ci-test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-20.04
+
+    strategy:
+      matrix:
+        node_version: [10.14.2, 14.x, 15.x]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: setup Node.js v${{ matrix.node_version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node_version }}
+
+    - name: run npm scripts
+      run: |
+        npm install
+        npm run lint
+        npm run build --if-present
+        npm run citest
+
+    - name: sync to coveralls
+      uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: cache node modules
+      uses: actions/cache@v2
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-

.gitignore

@@ -14,3 +14,4 @@ coverage
 yarn.lock
 coverage.lcov
 package-lock.json
+pnpm-lock.yaml

.travis.yml

@@ -2,7 +2,9 @@
 Node.js wrapper for the Paypal Name-Value Pair — NVP
 
 [![NPM](https://badge.fury.io/js/paypal-nvp-api.svg)](https://badge.fury.io/js/paypal-nvp-api)
-[![Build Status](https://travis-ci.org/ndaidong/paypal-nvp-api.svg?branch=master)](https://travis-ci.org/ndaidong/paypal-nvp-api)
+![CI test](https://github.com/ndaidong/paypal-nvp-api/workflows/ci-test/badge.svg)
+[![Coverage Status](https://coveralls.io/repos/github/ndaidong/paypal-nvp-api/badge.svg)](https://coveralls.io/github/ndaidong/paypal-nvp-api)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ndaidong_paypal-nvp-api&metric=alert_status)](https://sonarcloud.io/dashboard?id=ndaidong_paypal-nvp-api)
 
 
 

README.md

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0",
+  "version": "2.0.0rc1",
   "name": "paypal-nvp-api",
   "description": "Node.js wrapper for the Paypal Name-Value Pair — NVP ",
   "homepage": "https://www.npmjs.com/package/paypal-nvp-api",
@@ -10,24 +10,23 @@
   "author": "@ndaidong",
   "main": "./index.js",
   "engines": {
-    "node": ">= 8.6"
+    "node": ">= 10.14.2"
   },
   "scripts": {
-    "lint": "eslint ./src ./test",
+    "lint": "eslint ./src ./tests",
     "pretest": "npm run lint",
-    "test": "tap test/start.js --coverage --reporter=spec",
+    "test": "tap tests/start.js --coverage --reporter=spec --coverage-report=html --no-browser",
+    "citest": "tap tests/start.js --coverage --reporter=spec --coverage-report=lcov --no-browser",
     "reset": "node reset"
   },
   "dependencies": {
-    "bellajs": "^7.5.0",
-    "promise-wtf": "^1.2.4",
-    "request": "^2.86.0"
+    "bellajs": "^9.2.2",
+    "node-fetch": "^2.6.1"
   },
   "devDependencies": {
-    "codecov": "^3.0.1",
-    "eslint-config-goes": "^1.1.6",
-    "nock": "^9.2.5",
-    "tap": "^14.5.0"
+    "eslint-config-goes": "^1.1.8",
+    "nock": "^13.0.4",
+    "tap": "^14.10.8"
   },
   "keywords": [
     "Paypal",

package.json

@@ -3,18 +3,14 @@
  * @ndaidong
  **/
 
-const {
-  decode,
-} = require('bellajs');
-
 const parse = (s) => {
   const d = {};
   const a = s.split('&');
   if (a.length > 0) {
     a.forEach((item) => {
       const b = item.split('=');
       if (b.length === 2) {
-        d[b[0]] = decode(b[1]);
+        d[b[0]] = decodeURIComponent(b[1]);
       }
     });
   }

src/helpers/parse.js

@@ -8,7 +8,6 @@ const {
   isArray,
   isObject,
   hasProperty,
-  encode,
 } = require('bellajs');
 
 const stringify = (data) => {
@@ -21,11 +20,11 @@ const stringify = (data) => {
       if (hasProperty(data, k)) {
         let val = data[k];
         if (isString(val)) {
-          val = encode(val);
+          val = encodeURIComponent(val);
         } else if (isArray(val) || isObject(val)) {
           val = JSON.stringify(val);
         }
-        ar.push(encode(k) + '=' + val);
+        ar.push(encodeURIComponent(k) + '=' + val);
       }
     }
     if (ar.length > 0) {

src/helpers/stringify.js

@@ -10,14 +10,12 @@ const BASE_API_SANDBOX = 'https://api-3t.sandbox.paypal.com/nvp';
 const TRACKING_URL_LIVE = 'https://www.paypal.com';
 const TRACKING_URL_SANDBOX = 'https://www.sandbox.paypal.com';
 
-global.Promise = require('promise-wtf');
-
 const {
   isObject,
   copies,
 } = require('bellajs');
 
-const request = require('request');
+const fetch = require('node-fetch');
 
 const {
   stringify,
@@ -43,39 +41,35 @@ const Paypal = (opts = {}) => {
     VERSION,
   };
 
-  const sendRequest = (method, params = {}) => {
-    return new Promise((resolve, reject) => {
-      if (!isObject(params)) {
-        return reject(new Error('Params must be an object'));
-      }
+  const sendRequest = async (method, params = {}) => {
+    if (!isObject(params)) {
+      return new Error('Params must be an object');
+    }
 
-      const o = copies(payload, params);
-      o.METHOD = method;
+    try {
+      const query = copies(payload, params);
+      query.METHOD = method;
 
-      return request.post({
-        url: baseURL,
+      const res = await fetch(baseURL, {
+        method: 'POST',
         headers: {
-          'X-PAYPAL-SECURITY-USERID': o.USER,
-          'X-PAYPAL-SECURITY-PASSWORD': o.PWD,
-          'X-PAYPAL-SECURITY-SIGNATURE': o.SIGNATURE,
+          'X-PAYPAL-SECURITY-USERID': query.USER,
+          'X-PAYPAL-SECURITY-PASSWORD': query.PWD,
+          'X-PAYPAL-SECURITY-SIGNATURE': query.SIGNATURE,
           'X-PAYPAL-RESPONSE-DATA-FORMAT': 'JSON',
         },
-        body: stringify(params),
-      }, (err, response, body) => {
-        if (err) {
-          return reject(err);
-        }
-        const {
-          statusCode,
-        } = response;
-        if (statusCode !== 200) {
-          return reject(new Error(`Error: Response error with code: ${statusCode}`));
-        }
-        const r = parse(body);
-        return resolve(r);
+        body: stringify(query),
       });
-    });
+      if (!res.ok) {
+        return new Error(`Error: Response error with code: ${res.statusText}`);
+      }
+      const data = await res.text();
+      return parse(data);
+    } catch (err) {
+      return err;
+    }
   };
+
   return {
     request: sendRequest,
     formatCurrency,