Merge pull request #102 from Bitcoin-com/stage

More update from Panda Cash

dist/routes/v2/block.js

@@ -37,24 +37,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
 var express = require("express");
-var router = express.Router();
+var requestUtils = require("./services/requestUtils");
+var bitbox = require("./services/bitbox");
 var axios_1 = require("axios");
+var router = express.Router();
+var BitboxHTTP = bitbox.getInstance();
 var RateLimit = require("express-rate-limit");
-var BitboxHTTP = axios_1.default.create({
-    baseURL: process.env.RPC_BASEURL
-});
-var username = process.env.RPC_USERNAME;
-var password = process.env.RPC_PASSWORD;
-var requestConfig = {
-    method: "post",
-    auth: {
-        username: username,
-        password: password
-    },
-    data: {
-        jsonrpc: "1.0"
-    }
-};
 var config = {
     blockRateLimit1: undefined,
     blockRateLimit2: undefined,
@@ -105,11 +93,12 @@ router.get("/detailsByHash/:hash", config.blockRateLimit2, function (req, res, n
     });
 }); });
 router.get("/detailsByHeight/:height", config.blockRateLimit2, function (req, res, next) { return __awaiter(_this, void 0, void 0, function () {
+    var requestConfig;
     var _this = this;
     return __generator(this, function (_a) {
-        requestConfig.data.id = "getblockhash";
-        requestConfig.data.method = "getblockhash";
-        requestConfig.data.params = [parseInt(req.params.height)];
+        requestConfig = requestUtils.getRequestConfig("getblockhash", [
+            parseInt(req.params.height)
+        ]);
         BitboxHTTP(requestConfig)
             .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
             var rsp, parsed, error_2;

dist/routes/v2/services/bitbox.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var axios_1 = require("axios");
+var BitboxHTTP = axios_1.default.create({
+    baseURL: process.env.RPC_BASEURL
+});
+exports.getInstance = function () { return BitboxHTTP; };

dist/routes/v2/services/requestUtils.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var username = process.env.RPC_USERNAME;
+var password = process.env.RPC_PASSWORD;
+exports.getRequestConfig = function (method, params) {
+    return {
+        method: "post",
+        auth: {
+            username: username,
+            password: password
+        },
+        data: {
+            jsonrpc: "1.0",
+            id: method,
+            method: method,
+            params: params
+        }
+    };
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rest.bitcoin.com",
-  "version": "1.10.4",
+  "version": "1.10.5",
   "description": "REST API for Bitcoin.com's Cloud",
   "author": "Gabriel Cardona @ Bitcoin.com",
   "license": "MIT",

src/routes/v2/block.ts

@@ -1,27 +1,15 @@
 "use strict"
 
 import * as express from "express"
-const router = express.Router()
+import * as requestUtils from "./services/requestUtils"
+import * as bitbox from "./services/bitbox"
+
 import axios from "axios"
-import { IRequestConfig } from "./interfaces/IRequestConfig"
-const RateLimit = require("express-rate-limit")
 
-const BitboxHTTP = axios.create({
-  baseURL: process.env.RPC_BASEURL
-})
-const username = process.env.RPC_USERNAME
-const password = process.env.RPC_PASSWORD
+const router: express.Router = express.Router()
+const BitboxHTTP = bitbox.getInstance()
 
-const requestConfig: IRequestConfig = {
-  method: "post",
-  auth: {
-    username: username,
-    password: password
-  },
-  data: {
-    jsonrpc: "1.0"
-  }
-}
+const RateLimit = require("express-rate-limit")
 
 interface IRLConfig {
   [blockRateLimit1: string]: any
@@ -54,26 +42,14 @@ while (i < 4) {
   i++
 }
 
-router.get(
-  "/",
-  config.blockRateLimit1,
-  async (
-    req: express.Request,
-    res: express.Response,
-    next: express.NextFunction
-  ) => {
-    res.json({ status: "block" })
-  }
-)
+router.get("/", config.blockRateLimit1, async (req, res, next) => {
+  res.json({ status: "block" })
+})
 
 router.get(
   "/detailsByHash/:hash",
   config.blockRateLimit2,
-  async (
-    req: express.Request,
-    res: express.Response,
-    next: express.NextFunction
-  ) => {
+  async (req, res, next) => {
     try {
       const response = await axios.get(
         `${process.env.BITCOINCOM_BASEURL}block/${req.params.hash}`
@@ -90,14 +66,11 @@ router.get(
 router.get(
   "/detailsByHeight/:height",
   config.blockRateLimit2,
-  async (
-    req: express.Request,
-    res: express.Response,
-    next: express.NextFunction
-  ) => {
-    requestConfig.data.id = "getblockhash"
-    requestConfig.data.method = "getblockhash"
-    requestConfig.data.params = [parseInt(req.params.height)]
+  async (req, res, next) => {
+    const requestConfig = requestUtils.getRequestConfig("getblockhash", [
+      parseInt(req.params.height)
+    ])
+
     BitboxHTTP(requestConfig)
       .then(async response => {
         try {

src/routes/v2/services/bitbox.ts

@@ -0,0 +1,7 @@
+import axios from "axios"
+
+const BitboxHTTP = axios.create({
+  baseURL: process.env.RPC_BASEURL
+})
+
+export const getInstance = () => BitboxHTTP

src/routes/v2/services/requestUtils.ts

@@ -0,0 +1,25 @@
+import { IRequestConfig } from "../interfaces/IRequestConfig"
+
+const username = process.env.RPC_USERNAME
+const password = process.env.RPC_PASSWORD
+
+type RPCMethod = "getblockhash"
+
+export const getRequestConfig = (
+  method: RPCMethod,
+  params: (string | number)[]
+): IRequestConfig => {
+  return {
+    method: "post",
+    auth: {
+      username,
+      password
+    },
+    data: {
+      jsonrpc: "1.0",
+      id: method,
+      method,
+      params
+    }
+  }
+}

tsconfig.json

@@ -6,7 +6,7 @@
     "module": "commonjs",
     "target": "es5",
     "allowJs": true,
-    "lib": ["es2015"],
+    "lib": ["es2015", "es2015.symbol", "dom"],
     "typeRoots": ["node_modules/@types/"]
   },
   "include": ["src/**/*"],