yhtx 1.0.2 → 1.0.4

package/index.js

@@ -2,13 +2,14 @@ const crypto = require("crypto");
 const axios = require("axios");
 
 function getSign(queryString, secret, method, path) {
-  // let signString = [method, "api.huobi.pro", path, queryString].join("\n");
   let signString = [
     method,
     path.includes("linear-swap-api") ? "api.hbdm.com" : "api.huobi.pro",
     path,
-    queryString,
-  ].join("\n");
+    queryString || undefined,
+  ]
+    .filter(Boolean)
+    .join("\n");
   return crypto.createHmac("sha256", secret).update(signString).digest("base64");
 }
 
@@ -39,42 +40,32 @@ async function call(path, { apiKey, secret, data, method, recvWindow } = {}) {
   };
 
   let pars = [];
-  for (let k in body) pars.push(k + "=" + encodeURIComponent(body[k]));
+  for (let k in method == "GET" ? body : preBody)
+    pars.push(k + "=" + encodeURIComponent(body[k]));
   let queryString = pars.sort().join("&");
 
-  if (/*payload not yet supported*/ method === "POST") {
+  if (method === "POST") {
     url = origin + path + "?" + queryString;
     sign = getSign(queryString, secret, method, path);
     url += `&Signature=${sign}`;
-    body.Signature = sign;
   } /*GET*/ else {
     url = origin + path + "?" + queryString;
     sign = getSign(queryString, secret, method, path);
     url += `&Signature=${sign}`;
-    body.Signature = sign;
-  }
-
-  var headers = {
-    // "Content-Type": "application/json",
-    // "User-Agent":
-    //   "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36",
-  };
-
-  if (method === "POST") {
-    headers["Content-Type"] = "application/json; charset=utf-8";
   }
 
-  var config = {
+  let headers = { "Content-Type": "application/json" };
+  let config = {
     method,
     url,
     headers,
-    ...body,
+    ...(method == "POST" && { data }), //must be "data" //if GET, don't send
   };
 
   let r = await axios(config)
     .then((r) => {
-      // log(r);
-      if (r.data?.code != 200 /*success*/) console.log(r.data);
+      if (!(r.data?.code == 200 /*success*/ || r.data?.status == "ok"))
+        console.log(r.data); //if not code:200 or status:ok, then log
       let rs = r.data.data;
       return rs;
     })

package/index2.js

@@ -0,0 +1,113 @@
+const crypto = require("crypto");
+const axios = require("axios");
+
+function getSign(queryString, secret, method, path) {
+  let signString = [
+    method,
+    path.includes("linear-swap-api") ? "api.hbdm.com" : "api.huobi.pro",
+    path,
+    queryString,
+  ].join("\n");
+  return crypto.createHmac("sha256", secret).update(signString).digest("base64");
+}
+
+async function call(path, { apiKey, secret, data, method, recvWindow } = {}) {
+  apiKey ||= "";
+  secret ||= "";
+  method ||= "GET";
+  recvWindow ??= 30000;
+  const origin = path.includes("linear-swap-api")
+    ? "https://api.hbdm.com" //UM //for debig:https:api.btcgateway.pro, aws:https://api.hbdm.vn
+    : "https://api.huobi.pro"; //spot //https:api-aws.huobi.pro
+  data ||= {};
+
+  let timestamp = Date.now();
+  let url;
+  let sign;
+
+  timestamp = new Date(timestamp).toISOString().slice(0, 19);
+  let preBody = {
+    AccessKeyId: apiKey,
+    SignatureMethod: "HmacSHA256", //Ed25519
+    SignatureVersion: 2,
+    Timestamp: timestamp,
+  };
+  body = {
+    ...preBody,
+    ...data,
+  };
+
+  let pars = [];
+  for (let k in body) pars.push(k + "=" + encodeURIComponent(body[k]));
+  let queryString = pars.sort().join("&");
+
+  if (/*payload not yet supported*/ method === "POST") {
+    url = origin + path + "?" + queryString;
+    sign = getSign(queryString, secret, method, path);
+    url += `&Signature=${sign}`;
+    body.Signature = sign;
+  } /*GET*/ else {
+    url = origin + path + "?" + queryString;
+    sign = getSign(queryString, secret, method, path);
+    url += `&Signature=${sign}`;
+    body.Signature = sign;
+  }
+
+  var headers = {
+    // "Content-Type": "application/json",
+    // "User-Agent":
+    //   "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36",
+  };
+
+  if (method === "POST") {
+    headers["Content-Type"] = "application/json; charset=utf-8";
+  }
+
+  var config = {
+    method,
+    url,
+    headers,
+    ...body,
+    data,
+  };
+
+  let r = await axios(config)
+    .then((r) => {
+      // log(r);
+      if (r.data?.code != 200 /*success*/) console.log(r.data);
+      let rs = r.data.data;
+      return rs;
+    })
+    .catch(function (e) {
+      console.log(e.response.data);
+    });
+
+  return r;
+}
+
+class api {
+  constructor(apiKey = "", secret = "") {
+    this.apiKey = apiKey;
+    this.secret = secret;
+  }
+  async get(path, pr = {}) {
+    let data = {
+      apiKey: this.apiKey,
+      secret: this.secret,
+      data: pr,
+    };
+    return call(path, data);
+  }
+  async post(path, pr = {}) {
+    let data = {
+      apiKey: this.apiKey,
+      secret: this.secret,
+      method: "POST",
+      data: pr,
+    };
+    return call(path, data);
+  }
+}
+
+module.exports = api;
+module.exports.call = call;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yhtx",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "HTX API",
   "main": "index.js",
   "scripts": {