using node-fetch instead of request because of request has been depre…

…cated, see request/request#3142
huo-ju · Jan 22, 2022 · 02cb3b5 · 02cb3b5
1 parent abf1e94
commit 02cb3b5
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 84 deletions.
diff --git a/account.mjs b/account.mjs
@@ -4,8 +4,7 @@ import forge from 'node-forge';
 import fs from 'fs';
 import int64Buffer from 'int64-buffer';
 import jwt from 'jsonwebtoken';
-import request from 'request';
-import requestHandler from './requestHandler.mjs';
+import request from './request.mjs';
 
 const { Uint64LE } = int64Buffer;
 const rsa = forge.pki.rsa;
@@ -138,9 +137,7 @@ const ACCOUNT = function(opts) {
           'Content-Type': 'application/json'
         }
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      })
+      request(options, resolve, reject);
     });
   };
 
@@ -224,9 +221,7 @@ const ACCOUNT = function(opts) {
           'Content-Type': 'application/json',
         }
       }
-      request(options, (err, httpResponse, body) => {
-        requestHandler(err, body, resolve, reject);
-      })
+      request(options, resolve, reject);
     });
   };
 
@@ -276,9 +271,7 @@ const ACCOUNT = function(opts) {
           'Content-Type': 'application/json',
         },
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      })
+      request(options, resolve, reject);
     });
   };
 
@@ -366,23 +359,19 @@ const ACCOUNT = function(opts) {
             'Content-Type': 'application/json'
           }
         }
-        request(options, function(err, httpresponse, body) {
-          requestHandler(err, body, () => {
-            var result = {};
-            result.privatekey = key.privatekey;
-            result.publickey = key.publickey;
-            result.data = JSON.parse(body).data;
-            switch ((result.keytype = keytype)) {
-              case 'RSA':
-                result.data.aeskeybase64 = self.decryptRSAOAEP(key.privatekey, result.data.pin_token, result.data.session_id);
-                break;
-              case 'ED25519':
-                result.data.aeskeybase64 = self.signEncryptEd25519PIN(result.data.pin_token, keypair.privateKey);
-                break;
-            }
-            resolve(result);
-          }, reject);
-        });
+        request(options, (result) => {
+          result.privatekey = key.privatekey;
+          result.publickey = key.publickey;
+          switch ((result.keytype = keytype)) {
+            case 'RSA':
+              result.data.aeskeybase64 = self.decryptRSAOAEP(key.privatekey, result.data.pin_token, result.data.session_id);
+              break;
+            case 'ED25519':
+              result.data.aeskeybase64 = self.signEncryptEd25519PIN(result.data.pin_token, keypair.privateKey);
+              break;
+          }
+          resolve(result);
+        }, reject);
       });
     });
   }

diff --git a/index.mjs b/index.mjs
@@ -4,8 +4,7 @@ import crypto from 'crypto';
 import fs from 'fs';
 import int64Buffer from 'int64-buffer';
 import interval from 'interval-promise';
-import request from 'request';
-import requestHandler from './requestHandler.mjs';
+import request from './request.mjs';
 import WebSocket from 'ws';
 import wsreconnect from './ws-reconnect.mjs';
 import zlib from "zlib";
@@ -109,10 +108,7 @@ const MIXINNODE = function(opts) {
           'Content-Type': 'application/json'
         }
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      })
-
+      request(options, resolve, reject);
     });
   }
 
@@ -147,10 +143,7 @@ const MIXINNODE = function(opts) {
           'Content-Type': 'application/json'
         }
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      })
-
+      request(options, resolve, reject);
     });
   }
 
@@ -164,7 +157,6 @@ const MIXINNODE = function(opts) {
         let encrypted_pin = self.encryptPIN();
         let transfer_sig_str = "GET/me";
         let transfer_sig_sha256 = crypto.createHash('sha256').update(transfer_sig_str).digest("hex");
-
         let payload = {
           uid: self.client_id, //bot account id
           sid: self.session_id,
@@ -177,7 +169,6 @@ const MIXINNODE = function(opts) {
       } else {
         token = access_token;
       }
-
       let options = {
         url: url,
         method: "GET",
@@ -186,22 +177,16 @@ const MIXINNODE = function(opts) {
           'Content-Type': 'application/json'
         }
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      });
-
+      request(options, resolve, reject);
     });
   }
 
   self.readNetworkSnapshots = (offset, asset, limit, order) => {
     return new Promise((resolve, reject) => {
       let _order = "DESC";
-      if (order)
-        _order = order;
-
+      if (order) { _order = order };
       let path = `/network/snapshots?limit=${limit}&offset=${offset}&order=${_order}`;
-      if (asset && asset != "")
-        path = path + `&asset=${asset}`;
+      if (asset && asset != "") { path = path + `&asset=${asset}`; }
       let url = self.api_domain + path;
       let token = self.tokenGET(path, "");
       let options = {
@@ -212,9 +197,7 @@ const MIXINNODE = function(opts) {
           'Content-Type': '0'
         }
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      });
+      request(options, resolve, reject);
     });
   };
 
@@ -231,9 +214,7 @@ const MIXINNODE = function(opts) {
           'Content-Type': '0'
         }
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      });
+      request(options, resolve, reject);
     });
   };
 
@@ -250,9 +231,7 @@ const MIXINNODE = function(opts) {
           'Content-Type': '0'
         }
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      });
+      request(options, resolve, reject);
     });
   };
 
@@ -272,9 +251,7 @@ const MIXINNODE = function(opts) {
           'Content-Type': 'application/json'
         }
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      })
+      request(options, resolve, reject);
     });
   }
 
@@ -291,9 +268,7 @@ const MIXINNODE = function(opts) {
           'Content-Type': '0'
         }
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      });
+      request(options, resolve, reject);
     });
   };
 
@@ -310,9 +285,7 @@ const MIXINNODE = function(opts) {
           'Content-Type': '0'
         }
       }
-      request(options, function(err, httpResponse, body) {
-        requestHandler(err, body, resolve, reject);
-      });
+      request(options, resolve, reject);
     });
   };
 
@@ -440,9 +413,7 @@ const MIXINNODE = function(opts) {
               'Content-Type': 'application/json'
             }
           }
-          return request(options, function(err, httpResponse, body) {
-            requestHandler(err, body, resolve, reject);
-          })
+          return request(options, resolve, reject);
         }
 
         self.ws_send(message).then(function() {

diff --git a/package.json b/package.json
@@ -26,8 +26,8 @@
     "int64-buffer": "^1.0.1",
     "interval-promise": "^1.4.0",
     "jsonwebtoken": "^8.5.1",
+    "node-fetch": "^2.6.7",
     "node-forge": "^1.2.1",
-    "request": "^2.85.0",
     "rfc3339nano": "^2.0.2",
     "ws": "^8.4.2"
   },

diff --git a/request.mjs b/request.mjs
@@ -0,0 +1,15 @@
+import fetch from 'node-fetch';
+
+export default function request(options, resolve, reject) {
+  (async () => {
+    try {
+      const data = await fetch(options.url, options).then(res => res.json());
+      if (data?.error) {
+        throw Object.assign(new Error(
+          data.error?.description || 'Error requesting Mixin service.'
+        ), { raw: data.error });
+      }
+      resolve(data);
+    } catch (err) { reject(err); }
+  })();
+};
diff --git a/requestHandler.mjs b/requestHandler.mjs