@mathieuc/tradingview 3.4.1 → 3.4.2

package/src/miscRequests.js

@@ -1,31 +1,18 @@
 const os = require('os');
-const https = require('https');
-const request = require('./request');
-const FormData = require('./FormData');
+const axios = require('axios');
 
-const PinePermManager = require('./classes/PinePermManager');
 const PineIndicator = require('./classes/PineIndicator');
 
+const validateStatus = (status) => status < 500;
+
 const indicators = ['Recommend.Other', 'Recommend.All', 'Recommend.MA'];
 const builtInIndicList = [];
 
 async function fetchScanData(tickers = [], type = '', columns = []) {
-  let { data } = await request({
-    method: 'POST',
-    hostname: 'scanner.tradingview.com',
-    path: `/${type}/scan`,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  }, true, JSON.stringify({ symbols: { tickers }, columns }));
-
-  if (!data.startsWith('{')) throw new Error('Wrong screener or symbol');
-
-  try {
-    data = JSON.parse(data);
-  } catch (e) {
-    throw new Error('Can\'t parse server response');
-  }
+  const { data } = await axios.post(`https://scanner.tradingview.com/${type}/scan`, {
+    symbols: { tickers },
+    columns,
+  }, { validateStatus });
 
   return data;
 }
@@ -53,40 +40,40 @@ async function fetchScanData(tickers = [], type = '', columns = []) {
  * }} Periods
  */
 
-/**
- * @typedef {string | 'forex' | 'crypto'
- * | 'america' | 'australia' | 'canada' | 'egypt'
- * | 'germany' | 'india' | 'israel' | 'italy'
- * | 'luxembourg' | 'poland' | 'sweden' | 'turkey'
- * | 'uk' | 'vietnam'} Screener
- * You can use `getScreener(exchange)` function for non-forex and non-crypto markets.
- */
+// /**
+//  * @typedef {string | 'forex' | 'crypto'
+//  * | 'america' | 'australia' | 'canada' | 'egypt'
+//  * | 'germany' | 'india' | 'israel' | 'italy'
+//  * | 'luxembourg' | 'poland' | 'sweden' | 'turkey'
+//  * | 'uk' | 'vietnam'} Screener
+//  * You can use `getScreener(exchange)` function for non-forex and non-crypto markets.
+//  */
 
 module.exports = {
-  /**
-   * Get a screener from an exchange
-   * @function getScreener
-   * @param {string} exchange Example: BINANCE, EURONEXT, NASDAQ
-   * @returns {Screener}
-  */
-  getScreener(exchange) {
-    const e = exchange.toUpperCase();
-    if (['NASDAQ', 'NYSE', 'NYSE ARCA', 'OTC'].includes(e)) return 'america';
-    if (['ASX'].includes(e)) return 'australia';
-    if (['TSX', 'TSXV', 'CSE', 'NEO'].includes(e)) return 'canada';
-    if (['EGX'].includes(e)) return 'egypt';
-    if (['FWB', 'SWB', 'XETR'].includes(e)) return 'germany';
-    if (['BSE', 'NSE'].includes(e)) return 'india';
-    if (['TASE'].includes(e)) return 'israel';
-    if (['MIL', 'MILSEDEX'].includes(e)) return 'italy';
-    if (['LUXSE'].includes(e)) return 'luxembourg';
-    if (['NEWCONNECT'].includes(e)) return 'poland';
-    if (['NGM'].includes(e)) return 'sweden';
-    if (['BIST'].includes(e)) return 'turkey';
-    if (['LSE', 'LSIN'].includes(e)) return 'uk';
-    if (['HNX'].includes(e)) return 'vietnam';
-    return exchange.toLowerCase();
-  },
+  // /**
+  //  * Get a screener from an exchange
+  //  * @function getScreener
+  //  * @param {string} exchange Example: BINANCE, EURONEXT, NASDAQ
+  //  * @returns {Screener}
+  // */
+  // getScreener(exchange) {
+  //   const e = exchange.toUpperCase();
+  //   if (['NASDAQ', 'NYSE', 'NYSE ARCA', 'OTC'].includes(e)) return 'america';
+  //   if (['ASX'].includes(e)) return 'australia';
+  //   if (['TSX', 'TSXV', 'CSE', 'NEO'].includes(e)) return 'canada';
+  //   if (['EGX'].includes(e)) return 'egypt';
+  //   if (['FWB', 'SWB', 'XETR'].includes(e)) return 'germany';
+  //   if (['BSE', 'NSE'].includes(e)) return 'india';
+  //   if (['TASE'].includes(e)) return 'israel';
+  //   if (['MIL', 'MILSEDEX'].includes(e)) return 'italy';
+  //   if (['LUXSE'].includes(e)) return 'luxembourg';
+  //   if (['NEWCONNECT'].includes(e)) return 'poland';
+  //   if (['NGM'].includes(e)) return 'sweden';
+  //   if (['BIST'].includes(e)) return 'turkey';
+  //   if (['LSE', 'LSIN'].includes(e)) return 'uk';
+  //   if (['HNX'].includes(e)) return 'vietnam';
+  //   return 'global';
+  // },
 
   /**
    * Get technical analysis
@@ -138,20 +125,25 @@ module.exports = {
    * @returns {Promise<SearchMarketResult[]>} Search results
    */
   async searchMarket(search, filter = '') {
-    const { data } = await request({
-      host: 'symbol-search.tradingview.com',
-      path: `/symbol_search/?text=${search.replace(/ /g, '%20')}&type=${filter}`,
-      origin: 'https://www.tradingview.com',
-    });
+    const { data } = await axios.get(
+      `https://symbol-search.tradingview.com/symbol_search/?text=${search.replace(/ /g, '%20')}&type=${filter}`,
+      {
+        validateStatus,
+        headers: {
+          origin: 'https://www.tradingview.com',
+        },
+      },
+    );
 
     return data.map((s) => {
       const exchange = s.exchange.split(' ')[0];
       const id = `${exchange}:${s.symbol}`;
 
-      const screener = (['forex', 'crypto'].includes(s.type)
-        ? s.type
-        : this.getScreener(exchange)
-      );
+      // const screener = (['forex', 'crypto'].includes(s.type)
+      //   ? s.type
+      //   : this.getScreener(exchange)
+      // );
+      const screener = 'global';
 
       return {
         id,
@@ -189,17 +181,18 @@ module.exports = {
   async searchIndicator(search = '') {
     if (!builtInIndicList.length) {
       await Promise.all(['standard', 'candlestick', 'fundamental'].map(async (type) => {
-        builtInIndicList.push(...(await request({
-          host: 'pine-facade.tradingview.com',
-          path: `/pine-facade/list/?filter=${type}`,
-        })).data);
+        const { data } = await axios.get(
+          `https://pine-facade.tradingview.com/pine-facade/list/?filter=${type}`,
+          { validateStatus },
+        );
+        builtInIndicList.push(...data);
       }));
     }
 
-    const { data } = await request({
-      host: 'www.tradingview.com',
-      path: `/pubscripts-suggest-json/?search=${search.replace(/ /g, '%20')}`,
-    });
+    const { data } = await axios.get(
+      `https://www.tradingview.com/pubscripts-suggest-json/?search=${search.replace(/ /g, '%20')}`,
+      { validateStatus },
+    );
 
     function norm(str = '') {
       return str.toUpperCase().replace(/[^A-Z]/g, '');
@@ -255,16 +248,10 @@ module.exports = {
   async getIndicator(id, version = 'last') {
     const indicID = id.replace(/ |%/g, '%25');
 
-    let { data } = await request({
-      host: 'pine-facade.tradingview.com',
-      path: `/pine-facade/translate/${indicID}/${version}`,
-    }, true);
-
-    try {
-      data = JSON.parse(data);
-    } catch (e) {
-      throw new Error(`Inexistent or unsupported indicator: '${id}'`);
-    }
+    const { data } = await axios.get(
+      `https://pine-facade.tradingview.com/pine-facade/translate/${indicID}/${version}`,
+      { validateStatus },
+    );
 
     if (!data.success || !data.result.metaInfo || !data.result.metaInfo.inputs) {
       throw new Error(`Inexistent or unsupported indicator: "${data.reason}"`);
@@ -342,6 +329,7 @@ module.exports = {
    * @prop {number} notifications.following Notification from following accounts
    * @prop {string} session User session
    * @prop {string} sessionHash User session hash
+   * @prop {string} signature User session signature
    * @prop {string} privateChannel User private channel
    * @prop {string} authToken User auth token
    * @prop {Date} joinDate Account creation date
@@ -357,21 +345,20 @@ module.exports = {
    * @returns {Promise<User>} Token
    */
   async loginUser(username, password, remember = true, UA = 'TWAPI/3.0') {
-    const formData = new FormData();
-    formData.append('username', username);
-    formData.append('password', password);
-    if (remember) formData.append('remember', 'on');
-
-    const { data, cookies } = await request({
-      method: 'POST',
-      host: 'www.tradingview.com',
-      path: '/accounts/signin/',
-      headers: {
-        referer: 'https://www.tradingview.com',
-        'Content-Type': `multipart/form-data; boundary=${formData.boundary}`,
-        'User-agent': `${UA} (${os.version()}; ${os.platform()}; ${os.arch()})`,
+    const { data, headers } = await axios.post(
+      'https://www.tradingview.com/accounts/signin/',
+      `username=${username}&password=${password}${remember ? '&remember=on' : ''}`,
+      {
+        validateStatus,
+        headers: {
+          referer: 'https://www.tradingview.com',
+          'Content-Type': 'application/x-www-form-urlencoded',
+          'User-agent': `${UA} (${os.version()}; ${os.platform()}; ${os.arch()})`,
+        },
       },
-    }, false, formData.toString());
+    );
+
+    const cookies = headers['set-cookie'];
 
     if (data.error) throw new Error(data.error);
 
@@ -408,43 +395,36 @@ module.exports = {
    * @returns {Promise<User>} Token
    */
   async getUser(session, signature = '', location = 'https://www.tradingview.com/') {
-    return new Promise((cb, err) => {
-      https.get(location, {
-        headers: { cookie: `sessionid=${session}${signature ? `;sessionid_sign=${signature};` : ''}` },
-      }, (res) => {
-        let rs = '';
-        res.on('data', (d) => { rs += d; });
-        res.on('end', async () => {
-          if (res.headers.location && location !== res.headers.location) {
-            cb(await module.exports.getUser(session, signature, res.headers.location));
-            return;
-          }
-          if (rs.includes('auth_token')) {
-            cb({
-              id: /"id":([0-9]{1,10}),/.exec(rs)[1],
-              username: /"username":"(.*?)"/.exec(rs)[1],
-              firstName: /"first_name":"(.*?)"/.exec(rs)[1],
-              lastName: /"last_name":"(.*?)"/.exec(rs)[1],
-              reputation: parseFloat(/"reputation":(.*?),/.exec(rs)[1] || 0),
-              following: parseFloat(/,"following":([0-9]*?),/.exec(rs)[1] || 0),
-              followers: parseFloat(/,"followers":([0-9]*?),/.exec(rs)[1] || 0),
-              notifications: {
-                following: parseFloat(/"notification_count":\{"following":([0-9]*),/.exec(rs)[1] || 0),
-                user: parseFloat(/"notification_count":\{"following":[0-9]*,"user":([0-9]*)/.exec(rs)[1] || 0),
-              },
-              session,
-              signature,
-              sessionHash: /"session_hash":"(.*?)"/.exec(rs)[1],
-              privateChannel: /"private_channel":"(.*?)"/.exec(rs)[1],
-              authToken: /"auth_token":"(.*?)"/.exec(rs)[1],
-              joinDate: new Date(/"date_joined":"(.*?)"/.exec(rs)[1] || 0),
-            });
-          } else err(new Error('Wrong or expired sessionid/signature'));
-        });
-
-        res.on('error', err);
-      }).end();
+    const { data } = await axios.get(location, {
+      validateStatus,
+      headers: {
+        cookie: `sessionid=${session}${signature ? `;sessionid_sign=${signature};` : ''}`,
+      },
     });
+
+    if (data.includes('auth_token')) {
+      return {
+        id: /"id":([0-9]{1,10}),/.exec(data)?.[1],
+        username: /"username":"(.*?)"/.exec(data)?.[1],
+        firstName: /"first_name":"(.*?)"/.exec(data)?.[1],
+        lastName: /"last_name":"(.*?)"/.exec(data)?.[1],
+        reputation: parseFloat(/"reputation":(.*?),/.exec(data)?.[1] || 0),
+        following: parseFloat(/,"following":([0-9]*?),/.exec(data)?.[1] || 0),
+        followers: parseFloat(/,"followers":([0-9]*?),/.exec(data)?.[1] || 0),
+        notifications: {
+          following: parseFloat(/"notification_count":\{"following":([0-9]*),/.exec(data)?.[1] || 0),
+          user: parseFloat(/"notification_count":\{"following":[0-9]*,"user":([0-9]*)/.exec(data)?.[1] || 0),
+        },
+        session,
+        signature,
+        sessionHash: /"session_hash":"(.*?)"/.exec(data)?.[1],
+        privateChannel: /"private_channel":"(.*?)"/.exec(data)?.[1],
+        authToken: /"auth_token":"(.*?)"/.exec(data)?.[1],
+        joinDate: new Date(/"date_joined":"(.*?)"/.exec(data)?.[1] || 0),
+      };
+    }
+
+    throw new Error('Wrong or expired sessionid/signature');
   },
 
   /**
@@ -455,44 +435,29 @@ module.exports = {
    * @returns {Promise<SearchIndicatorResult[]>} Search results
    */
   async getPrivateIndicators(session, signature = '') {
-    return new Promise((cb, err) => {
-      https.get('https://pine-facade.tradingview.com/pine-facade/list?filter=saved', {
-        headers: { cookie: `sessionid=${session}${signature ? `;sessionid_sign=${signature};` : ''}` },
-      }, (res) => {
-        let rs = '';
-        res.on('data', (d) => { rs += d; });
-        res.on('end', async () => {
-          try {
-            rs = JSON.parse(rs);
-          } catch (error) {
-            err(new Error('Can\'t parse private indicator list'));
-            return;
-          }
-
-          cb(rs.map((ind) => ({
-            id: ind.scriptIdPart,
-            version: ind.version,
-            name: ind.scriptName,
-            author: {
-              id: -1,
-              username: '@ME@',
-            },
-            image: ind.imageUrl,
-            access: 'private',
-            source: ind.scriptSource,
-            type: (ind.extra && ind.extra.kind) ? ind.extra.kind : 'study',
-            get() {
-              return module.exports.getIndicator(ind.scriptIdPart, ind.version);
-            },
-            getManager() {
-              return new PinePermManager(ind.scriptIdPart);
-            },
-          })));
-        });
-
-        res.on('error', err);
-      }).end();
+    const { data } = await axios.get('https://pine-facade.tradingview.com/pine-facade/list?filter=saved', {
+      validateStatus,
+      headers: {
+        cookie: `sessionid=${session}${signature ? `;sessionid_sign=${signature};` : ''}`,
+      },
     });
+
+    return data.map((ind) => ({
+      id: ind.scriptIdPart,
+      version: ind.version,
+      name: ind.scriptName,
+      author: {
+        id: -1,
+        username: '@ME@',
+      },
+      image: ind.imageUrl,
+      access: 'private',
+      source: ind.scriptSource,
+      type: (ind.extra && ind.extra.kind) ? ind.extra.kind : 'study',
+      get() {
+        return module.exports.getIndicator(ind.scriptIdPart, ind.version);
+      },
+    }));
   },
 
   /**
@@ -500,6 +465,7 @@ module.exports = {
    * @typedef {Object} UserCredentials
    * @prop {number} id User ID
    * @prop {string} session User session ('sessionid' cookie)
+   * @prop {string} [signature] User session signature ('sessionid_sign' cookie)
    */
 
   /**
@@ -510,16 +476,23 @@ module.exports = {
    * @returns {Promise<string>} Token
    */
   async getChartToken(layout, credentials = {}) {
-    const creds = credentials.id && credentials.session;
-    const userID = creds ? credentials.id : -1;
-    const session = creds ? credentials.session : null;
-    const signature = creds ? credentials.signature : null;
-
-    const { data } = await request({
-      host: 'www.tradingview.com',
-      path: `/chart-token/?image_url=${layout}&user_id=${userID}`,
-      headers: { cookie: session ? `sessionid=${session}${signature ? `;sessionid_sign=${signature};` : ''}` : '' },
-    });
+    const { id, session, signature } = (
+      credentials.id && credentials.session
+        ? credentials
+        : { id: -1, session: null, signature: null }
+    );
+
+    const { data } = await axios.get(
+      `https://www.tradingview.com/chart-token/?image_url=${layout}&user_id=${id}`,
+      {
+        validateStatus,
+        headers: {
+          cookie: session
+            ? `sessionid=${session}${signature ? `;sessionid_sign=${signature};` : ''}`
+            : '',
+        },
+      },
+    );
 
     if (!data.token) throw new Error('Wrong layout or credentials');
 
@@ -557,18 +530,21 @@ module.exports = {
    * @param {number} [chartID] Chart ID
    * @returns {Promise<Drawing[]>} Drawings
    */
-  async getDrawings(layout, symbol = '', credentials = {}, chartID = 1) {
+  async getDrawings(layout, symbol = '', credentials = {}, chartID = '_shared') {
     const chartToken = await module.exports.getChartToken(layout, credentials);
-    const creds = credentials.id && credentials.session;
-    const session = creds ? credentials.session : null;
-    const signature = creds ? credentials.signature : null;
-
-    const { data } = await request({
-      host: 'charts-storage.tradingview.com',
-      path: `/charts-storage/layout/${layout}/sources?chart_id=${chartID
-      }&jwt=${chartToken}${symbol ? `&symbol=${symbol}` : ''}`,
-      headers: { cookie: session ? `sessionid=${session}${signature ? `;sessionid_sign=${signature};` : ''}` : '' },
-    });
+
+    const { data } = await axios.get(
+      `https://charts-storage.tradingview.com/charts-storage/get/layout/${
+        layout
+      }/sources?chart_id=${
+        chartID
+      }&jwt=${
+        chartToken
+      }${
+        (symbol ? `&symbol=${symbol}` : '')
+      }`,
+      { validateStatus },
+    );
 
     if (!data.payload) throw new Error('Wrong layout, user credentials, or chart id.');
 

package/vite.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  test: {
+    testTimeout: 10000,
+    setupFiles: 'dotenv/config',
+  },
+};

package/src/FormData.js

@@ -1,36 +0,0 @@
-/** @class */
-class FormData {
-  #string = '';
-
-  #boundary = '';
-
-  get boundary() {
-    return this.#boundary;
-  }
-
-  constructor() {
-    const random = (Math.random() * 10 ** 20).toString(36);
-    this.#boundary = `${random}`;
-    this.#string = `--${this.boundary}`;
-  }
-
-  /**
-   * Adds a property to the FormData object
-   * @param {string} key Property key
-   * @param {string} value Property value
-   */
-  append(key, value) {
-    this.#string += `\r\nContent-Disposition: form-data; name="${key}"`;
-    this.#string += `\r\n\r\n${value}`;
-    this.#string += `\r\n--${this.boundary}`;
-  }
-
-  /**
-   * @returns {string}
-   */
-  toString() {
-    return `${this.#string}--`;
-  }
-}
-
-module.exports = FormData;

package/src/request.js

@@ -1,37 +0,0 @@
-const https = require('https');
-
-/**
- * @param {https.RequestOptions} options HTTPS Request options
- * @param {boolean} [raw] Get raw or JSON data
- * @param {string} [content] Request body content
- * @returns {Promise<{ data: (string | object | array), cookies: string[] }>} Result
- */
-function request(options = {}, raw = false, content = '') {
-  return new Promise((cb, err) => {
-    const req = https.request(options, (res) => {
-      let data = '';
-      res.on('data', (c) => { data += c; });
-      res.on('end', () => {
-        if (raw) {
-          cb({ data, cookies: res.headers['set-cookie'] });
-          return;
-        }
-
-        try {
-          data = JSON.parse(data);
-        } catch (error) {
-          console.log(data);
-          err(new Error('Can\'t parse server response'));
-          return;
-        }
-
-        cb({ data, cookies: res.headers['set-cookie'] });
-      });
-    });
-
-    req.on('error', err);
-    req.end(content);
-  });
-}
-
-module.exports = request;

package/test.js

@@ -1,70 +0,0 @@
-/* eslint-disable no-continue */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable import/no-dynamic-require */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable global-require */
-
-const fs = require('fs');
-require('@mathieuc/console')(
-  '§', // Character you want to use (defaut: '§')
-  true, // Active timestamp (defaut: false)
-);
-
-const TESTS = {};
-
-function err(name) {
-  return (...msg) => {
-    TESTS[name].errors += 1;
-    console.error('§30§101 > §0', ...msg);
-  };
-}
-
-function warn(name) {
-  return (...msg) => {
-    TESTS[name].warnings += 1;
-    console.warn('§30§103 > §0', ...msg);
-  };
-}
-
-function log() {
-  return (...msg) => console.log('§30§107 > §0', ...msg);
-}
-
-function success() {
-  return (...msg) => console.info('§30§102 > §0', ...msg);
-}
-
-(async () => {
-  console.info('§90§30§104 ==== Starting tests ==== §0');
-
-  for (const file of fs.readdirSync('./tests').filter((f) => f.endsWith('.js'))) {
-    if (process.argv[2] && !file.startsWith(process.argv[2])) continue;
-    const test = require(`./tests/${file}`);
-    const name = file.replace(/\.js/g, '');
-    TESTS[name] = { errors: 0, warnings: 0 };
-    console.log(`§90§30§107 ${name}`);
-    await new Promise((cb) => test(log(), success(), warn(name), err(name), cb));
-  }
-
-  console.info('§90§30§104 ==== ALL TESTS DONE ==== §0\n');
-
-  let errored = false;
-
-  Object.keys(TESTS).forEach((t) => {
-    let color = '2';
-    if (TESTS[t].warnings) color = '3';
-    if (TESTS[t].errors) {
-      color = '1';
-      errored = true;
-    }
-
-    console.info(`§90§30§10${color} ${t} §0 §91E§0: ${TESTS[t].errors}§0 §93W§0: ${TESTS[t].warnings}`);
-  });
-
-  process.exit(errored ? 1 : 0);
-})();
-
-setTimeout(() => {
-  console.log('§30§101 TIMEOUT §0');
-  throw new Error('Timeout');
-}, 60000);

package/tests/01. Search.js

@@ -1,17 +0,0 @@
-const TradingView = require('../main');
-
-module.exports = async (log, success, warn, err, cb) => {
-  log('Searching market: \'BINANCE:\'');
-  const markets = await TradingView.searchMarket('BINANCE:');
-  success('Found', markets.length, 'markets');
-
-  log('Searching indicator: \'RSI\'');
-  const indicators = await TradingView.searchIndicator('RSI');
-  success('Found', indicators.length, 'indicators');
-
-  if (markets.length < 10 || indicators.length < 10) {
-    err('Not enough results');
-  }
-
-  cb();
-};

package/tests/02. QuoteSession.js

@@ -1,51 +0,0 @@
-const TradingView = require('../main');
-
-module.exports = (log, success, warn, err, cb) => {
-  const client = new TradingView.Client();
-
-  client.onError((...error) => {
-    err('Client error', ...error);
-  });
-
-  const quoteSession = new client.Session.Quote({
-    fields: 'all',
-  });
-
-  const BTC = new quoteSession.Market('BTCEUR');
-
-  BTC.onLoaded(() => {
-    success('BTCEUR LOADED');
-  });
-
-  const keys = [
-    'volume', 'update_mode', 'type', 'timezone',
-    'short_name', 'rtc_time', 'rtc', 'rchp', 'ch',
-    'rch', 'provider_id', 'pro_name', 'pricescale',
-    'prev_close_price', 'original_name', 'lp',
-    'open_price', 'minmove2', 'minmov', 'lp_time',
-    'low_price', 'is_tradable', 'high_price',
-    'fractional', 'exchange', 'description',
-    'current_session', 'currency_code', 'chp',
-    'currency-logoid', 'base-currency-logoid',
-  ];
-
-  BTC.onData(async (data) => {
-    const rsKeys = Object.keys(data);
-    success('BTCEUR DATA');
-    if (rsKeys.length <= 2) return;
-
-    keys.forEach((k) => {
-      if (!rsKeys.includes(k)) {
-        err(`Missing '${k}' key in`, rsKeys);
-      }
-    });
-
-    quoteSession.delete();
-    await client.end();
-    cb();
-  });
-
-  BTC.onError((...error) => {
-    err('BTCEUR ERROR:', error);
-  });
-};