binbot-charts 0.1.8 → 0.2.0

package/dist/components/TVChartContainer.js

@@ -9,14 +9,12 @@ exports.default = TVChartContainer;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _charting_library = require("../charting_library/charting_library");
+var _charting_library = require("../charting_library");
 
 var _datafeed = _interopRequireDefault(require("./datafeed"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _chartingLibraryInterfaces = require("./charting-library-interfaces");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -25,9 +23,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function TVChartContainer(_ref) {
   let {
-    apiKey,
-    symbol = "Binance:APE/USDT",
-    interval = "1D",
+    symbol = "APEUSDT",
+    interval = "1h",
     libraryPath = "/charting_library/",
     timescaleMarks = [],
     orderLines = [],
@@ -37,21 +34,27 @@ function TVChartContainer(_ref) {
   (0, _react.useEffect)(() => {
     const widgetOptions = {
       symbol: symbol,
-      datafeed: new _datafeed.default(apiKey, timescaleMarks),
+      datafeed: new _datafeed.default(timescaleMarks),
       interval: interval,
       container: containerRef.current,
       library_path: libraryPath,
       locale: "en",
       fullscreen: false,
       autosize: true,
-      studies_overrides: {}
+      studies_overrides: {},
+      overrides: {
+        volumePaneSize: "small",
+        "mainSeriesProperties.barStyle.dontDrawOpen": false
+      }
     };
     const tvWidget = new _charting_library.widget(widgetOptions);
     tvWidget.onChartReady(() => {
-      orderLines.forEach(order => {
-        tvWidget.chart().createPositionLine().setText(order.text).setTooltip(order.tooltip).setQuantity(order.quantity).setQuantityBackgroundColor(order.color).setQuantityBorderColor(order.color).setLineStyle(0).setLineLength(25).setLineColor(order.color).setBodyBorderColor(order.color).setBodyTextColor(order.color).setPrice(order.price);
-      });
-    }); // returned function will be called on component unmount 
+      if (orderLines.length > 0) {
+        orderLines.forEach(order => {
+          tvWidget.chart().createPositionLine().setText(order.text).setTooltip(order.tooltip).setQuantity(order.quantity).setQuantityBackgroundColor(order.color).setQuantityBorderColor(order.color).setLineStyle(0).setLineLength(25).setLineColor(order.color).setBodyBorderColor(order.color).setBodyTextColor(order.color).setPrice(order.price);
+        });
+      }
+    }); // returned function will be called on component unmount
 
     return () => {
       if (this.tvWidget !== null) {

package/dist/components/datafeed.js

@@ -5,31 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/web.dom-collections.iterator.js");
-
 require("core-js/modules/es.promise.js");
 
-require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 
 var _helpers = require("./helpers.js");
 
 var _streaming = require("./streaming.js");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-const exchange = "Binance";
-const lastBarsCache = new Map();
-
 const getConfigurationData = async () => {
   return {
     supports_marks: true,
     supports_time: true,
     supports_timescale_marks: true,
-    selected_resolution: "m",
+    supported_resolutions: ["1s", "1m", "3m", "5m", "15m", "30m", "1h", "2h", "4h", "6h", "8h", "12h", "1d", "3d", "1w", "1M"],
     exchanges: [{
       value: "Binance",
       name: "Binance",
@@ -43,55 +34,57 @@ const getConfigurationData = async () => {
 };
 
 class Datafeed {
-  constructor(apiKey) {
-    let timescaleMarks = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    let lineOrders = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  constructor() {
+    let timescaleMarks = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    let lineOrders = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    let interval = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "1h";
 
     _defineProperty(this, "onReady", async callback => {
-      this.configurationData = await getConfigurationData(this.apiKey);
+      this.configurationData = await getConfigurationData();
       callback(this.configurationData);
     });
 
     _defineProperty(this, "searchSymbols", async (userInput, exchange, symbolType, onResultReadyCallback) => {
-      console.log("[searchSymbols]: Method call");
-      const symbols = await (0, _helpers.getAllSymbols)(exchange);
-      const newSymbols = symbols.filter(symbol => {
-        const isExchangeValid = exchange === "" || symbol.exchange === exchange;
-        const isFullSymbolContainsInput = symbol.full_name.toLowerCase().indexOf(userInput.toLowerCase()) !== -1;
-        return isExchangeValid && isFullSymbolContainsInput;
-      });
+      console.log("[searchSymbols]: Method call"); // const symbols = await getAllSymbols(exchange);
+      // const newSymbols = symbols.filter((symbol) => {
+      //   const isExchangeValid = exchange === "" || symbol.exchange === exchange;
+      //   if (symbol.replace("/", "") === userInput) {
+      //   }
+      //   const isFullSymbolContainsInput =
+      //     symbol.full_name.toLowerCase().indexOf(userInput.toLowerCase()) !== -1;
+      //   return isExchangeValid && isFullSymbolContainsInput;
+      // });
+
       onResultReadyCallback(newSymbols);
     });
 
     _defineProperty(this, "resolveSymbol", async (symbolName, onSymbolResolvedCallback, onResolveErrorCallback) => {
-      const symbols = await (0, _helpers.getAllSymbols)(exchange);
-      const symbolItem = symbols.find(_ref => {
-        let {
-          full_name
-        } = _ref;
-        return full_name === symbolName;
-      });
-
-      if (!symbolItem) {
-        onResolveErrorCallback("cannot resolve symbol");
-        return;
-      }
-
+      // const symbols = await getAllSymbols(exchange);
+      // const symbolItem = symbols.find(
+      //   ({ full_name }) => full_name === symbolName
+      // );
+      // if (!symbolItem) {
+      //   onResolveErrorCallback("cannot resolve symbol");
+      //   return;
+      // }
       const symbolInfo = {
-        ticker: symbolItem.full_name,
-        name: symbolItem.symbol,
-        description: symbolItem.description,
-        type: symbolItem.type,
+        ticker: symbolName,
+        name: symbolName,
+        ticker: symbolName,
+        description: symbolName,
+        type: "crypto",
         session: "24x7",
         timezone: "Etc/UTC",
-        exchange: symbolItem.exchange,
-        minmov: 1,
-        pricescale: 100,
+        exchange: "Binance",
+        minmov: 100,
+        pricescale: 100000,
         has_intraday: true,
         has_no_volume: false,
-        has_weekly_and_monthly: false,
-        volume_precision: 4,
-        data_status: "streaming"
+        volume: "hundreds",
+        has_weekly_and_monthly: true,
+        volume_precision: 9,
+        data_status: "streaming",
+        resolution: "1h"
       };
       onSymbolResolvedCallback(symbolInfo);
     });
@@ -103,20 +96,19 @@ class Datafeed {
         firstDataRequest
       } = periodParams;
       console.log("[getBars]: Method call");
-      const parsedSymbol = (0, _helpers.parseFullSymbol)(symbolInfo.full_name);
-      const urlParameters = {
-        e: parsedSymbol.exchange,
-        fsym: parsedSymbol.fromSymbol,
-        tsym: parsedSymbol.toSymbol,
-        toTs: to,
-        limit: 2000
+      let urlParameters = {
+        symbol: symbolInfo.name,
+        interval: this.interval,
+        startTime: from * 1000,
+        endTime: to * 1000,
+        limit: 600
       };
       const query = Object.keys(urlParameters).map(name => "".concat(name, "=").concat(encodeURIComponent(urlParameters[name]))).join("&");
 
       try {
-        const data = await (0, _helpers.makeApiRequest)("data/histoday?".concat(query));
+        const data = await (0, _helpers.makeApiRequest)("api/v3/uiKlines?".concat(query));
 
-        if (data.Response && data.Response === "Error" || data.Data.length === 0) {
+        if (data.Response && data.Response === "Error" || data.length === 0) {
           // "noData" should be set if there is no data in the requested period.
           onHistoryCallback([], {
             noData: true
@@ -125,22 +117,18 @@ class Datafeed {
         }
 
         let bars = [];
-        data.Data.forEach(bar => {
-          if (bar.time >= from && bar.time < to) {
+        data.forEach(bar => {
+          if (bar[0] >= from * 1000 && bar[0] < to * 1000) {
             bars = [...bars, {
-              time: bar.time * 1000,
-              low: bar.low,
-              high: bar.high,
-              open: bar.open,
-              close: bar.close
+              time: bar[0],
+              low: bar[3],
+              high: bar[2],
+              open: bar[1],
+              close: bar[4],
+              volume: bar[5]
             }];
           }
         });
-
-        if (firstDataRequest) {
-          lastBarsCache.set(symbolInfo.full_name, _objectSpread({}, bars[bars.length - 1]));
-        }
-
         console.log("[getBars]: returned ".concat(bars.length, " bar(s)"));
         onHistoryCallback(bars, {
           noData: false
@@ -153,17 +141,18 @@ class Datafeed {
 
     _defineProperty(this, "subscribeBars", (symbolInfo, resolution, onRealtimeCallback, subscribeUID, onResetCacheNeededCallback) => {
       console.log('[subscribeBars]: Method call with subscribeUID:', subscribeUID);
-      (0, _streaming.subscribeOnStream)(symbolInfo, resolution, onRealtimeCallback, subscribeUID, onResetCacheNeededCallback, lastBarsCache.get(symbolInfo.full_name));
+      (0, _streaming.subscribeOnStream)(symbolInfo, resolution, onRealtimeCallback, subscribeUID, onResetCacheNeededCallback, this.interval);
     });
 
     _defineProperty(this, "unsubscribeBars", subscriberUID => {
-      console.log('[unsubscribeBars]: Method call with subscriberUID:', subscriberUID);
+      console.log("[unsubscribeBars]: Method call with subscriberUID:", subscriberUID);
       (0, _streaming.unsubscribeFromStream)(subscriberUID);
     });
 
     this.timescaleMarks = timescaleMarks;
     this.lineOrders = lineOrders;
-    this.apiKey = apiKey;
+    this.streaming = null;
+    this.interval = interval;
   }
 
   getTimescaleMarks(symbolInfo, from, to, onDataCallback, resolution) {

package/dist/components/helpers.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = getNextDailyBarTime;
 exports.generateSymbol = generateSymbol;
 exports.getAllSymbols = getAllSymbols;
 exports.makeApiRequest = makeApiRequest;
@@ -19,10 +20,10 @@ require("core-js/modules/web.dom-collections.iterator.js");
 // Make requests to CryptoCompare API
 async function makeApiRequest(path) {
   try {
-    const response = await fetch("https://min-api.cryptocompare.com/".concat(path));
+    const response = await fetch("https://api.binance.com/".concat(path));
     return response.json();
   } catch (error) {
-    throw new Error("CryptoCompare request error: ".concat(error.status));
+    throw new Error("Binance request error: ".concat(error.status));
   }
 } // Generate a symbol ID from a pair of the coins
 
@@ -69,4 +70,10 @@ async function getAllSymbols(exchange) {
   }
 
   return allSymbols;
+}
+
+function getNextDailyBarTime(barTime) {
+  const date = new Date(barTime * 1000);
+  date.setDate(date.getDate() + 1);
+  return date.getTime() / 1000;
 }

package/dist/components/streaming.js

@@ -8,91 +8,67 @@ exports.unsubscribeFromStream = unsubscribeFromStream;
 
 require("core-js/modules/web.dom-collections.iterator.js");
 
-require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.json.stringify.js");
 
-require("core-js/modules/es.string.split.js");
-
-require("core-js/modules/es.parse-int.js");
-
-require("core-js/modules/es.parse-float.js");
-
-var _helpers = require("./helpers.js");
-
-var _socket = _interopRequireDefault(require("socket.io-client"));
+const channelToSubscription = new Map();
+const socket = new WebSocket("wss://stream.binance.com:9443/ws");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+socket.onopen = event => {
+  console.log("[socket] Connected", event);
+};
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+socket.onclose = reason => {
+  console.log("[socket] Disconnected:", reason);
+};
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+socket.onerror = error => {
+  console.log("[socket] Error:", error);
+};
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+socket.onmessage = e => {
+  console.log("[socket] Message:", JSON.parse(e.data));
+  const data = JSON.parse(e.data);
 
-const socket = (0, _socket.default)('wss://streamer.cryptocompare.com');
-const channelToSubscription = new Map();
-socket.on('connect', () => {
-  console.log('[socket] Connected');
-});
-socket.on('disconnect', reason => {
-  console.log('[socket] Disconnected:', reason);
-});
-socket.on('error', error => {
-  console.log('[socket] Error:', error);
-});
-socket.on('m', data => {
-  console.log('[socket] Message:', data);
-  const [eventTypeStr, exchange, fromSymbol, toSymbol,,, tradeTimeStr,, tradePriceStr] = data.split('~');
-
-  if (parseInt(eventTypeStr) !== 0) {
+  if (data.e == undefined) {
     // skip all non-TRADE events
     return;
   }
 
-  const tradePrice = parseFloat(tradePriceStr);
-  const tradeTime = parseInt(tradeTimeStr);
-  const channelString = "0~".concat(exchange, "~").concat(fromSymbol, "~").concat(toSymbol);
+  const {
+    s: symbol,
+    t: startTime,
+    T: closeTime,
+    i: interval,
+    o: open,
+    c: close,
+    h: high,
+    l: low,
+    v: volume,
+    n: trades,
+    q: quoteVolume
+  } = data.k;
+  const channelString = "".concat(symbol.toLowerCase(), "@kline_").concat(interval);
   const subscriptionItem = channelToSubscription.get(channelString);
 
   if (subscriptionItem === undefined) {
     return;
   }
 
-  const lastDailyBar = subscriptionItem.lastDailyBar;
-  const nextDailyBarTime = getNextDailyBarTime(lastDailyBar.time);
-  let bar;
-
-  if (tradeTime >= nextDailyBarTime) {
-    bar = {
-      time: nextDailyBarTime,
-      open: tradePrice,
-      high: tradePrice,
-      low: tradePrice,
-      close: tradePrice
-    };
-    console.log('[socket] Generate new bar', bar);
-  } else {
-    bar = _objectSpread(_objectSpread({}, lastDailyBar), {}, {
-      high: Math.max(lastDailyBar.high, tradePrice),
-      low: Math.min(lastDailyBar.low, tradePrice),
-      close: tradePrice
-    });
-    console.log('[socket] Update the latest bar by price', tradePrice);
-  }
-
-  subscriptionItem.lastDailyBar = bar; // send data to every subscriber of that symbol
+  const bar = {
+    time: startTime,
+    open: open,
+    high: high,
+    low: low,
+    close: close,
+    volume: volume
+  };
+  console.log("[socket] Generate new bar", bar); // send data to every subscriber of that symbol
 
   subscriptionItem.handlers.forEach(handler => handler.callback(bar));
-});
-
-function getNextDailyBarTime(barTime) {
-  const date = new Date(barTime * 1000);
-  date.setDate(date.getDate() + 1);
-  return date.getTime() / 1000;
-}
+};
 
-function subscribeOnStream(symbolInfo, resolution, onRealtimeCallback, subscribeUID, onResetCacheNeededCallback, lastDailyBar) {
-  const parsedSymbol = (0, _helpers.parseFullSymbol)(symbolInfo.full_name);
-  const channelString = "0~".concat(parsedSymbol.exchange, "~").concat(parsedSymbol.fromSymbol, "~").concat(parsedSymbol.toSymbol);
+function subscribeOnStream(symbolInfo, resolution, onRealtimeCallback, subscribeUID, onResetCacheNeededCallback, interval) {
+  const channelString = "".concat(symbolInfo.name.toLowerCase(), "@kline_").concat(interval);
   const handler = {
     id: subscribeUID,
     callback: onRealtimeCallback
@@ -108,14 +84,16 @@ function subscribeOnStream(symbolInfo, resolution, onRealtimeCallback, subscribe
   subscriptionItem = {
     subscribeUID,
     resolution,
-    lastDailyBar,
     handlers: [handler]
   };
+  const subRequest = {
+    method: "SUBSCRIBE",
+    params: [channelString],
+    id: 1
+  };
   channelToSubscription.set(channelString, subscriptionItem);
-  console.log('[subscribeBars]: Subscribe to streaming. Channel:', channelString);
-  socket.emit('SubAdd', {
-    subs: [channelString]
-  });
+  console.log("[subscribeBars]: Subscribe to streaming. Channel:", channelString);
+  socket.send(JSON.stringify(subRequest));
 }
 
 function unsubscribeFromStream(subscriberUID) {
@@ -130,10 +108,13 @@ function unsubscribeFromStream(subscriberUID) {
 
       if (subscriptionItem.handlers.length === 0) {
         // unsubscribe from the channel, if it was the last handler
-        console.log('[unsubscribeBars]: Unsubscribe from streaming. Channel:', channelString);
-        socket.emit('SubRemove', {
-          subs: [channelString]
-        });
+        console.log("[unsubscribeBars]: Unsubscribe from streaming. Channel:", channelString);
+        const subRequest = {
+          method: "UNSUBSCRIBE",
+          params: [channelString],
+          id: 1
+        };
+        socket.send(JSON.stringify(subRequest));
         channelToSubscription.delete(channelString);
         break;
       }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.8",
+  "version": "0.2.0",
   "name": "binbot-charts",
   "dependencies": {
     "@babel/cli": "^7.18.10",