rsibot-utils 1.0.8 → 1.1.1

package/db.js

@@ -1,6 +1,5 @@
 const mongoose = require('mongoose');
 const { DB_USER, DB_PASSWORD } = process.env;
-const utils = require('./index.js');
 
 mongoose.Promise = global.Promise;
 const { Schema } = mongoose;
@@ -34,6 +33,19 @@ const queueSchema = new Schema(
   },
 );
 
+const historicalSchema = new Schema(
+  {
+    symbol: String,
+    logs: String,
+    _errors: String,
+    fees: String,
+    created: { type: Date, default: Date.now },
+  },
+  {
+    versionKey: false,
+  },
+);
+
 mongoose
   .connect(`mongodb+srv://${DB_USER}:${DB_PASSWORD}@rsi-bot.d6kbq.mongodb.net/rsi?retryWrites=true&w=majority`, {
     useNewUrlParser: true,
@@ -49,127 +61,11 @@ mongoose
 const HotCoin = mongoose.model('hot_coins', hotCoinsSchema);
 const ActiveCoin = mongoose.model('active_coins', activeSchema);
 const Queue = mongoose.model('queue_coins', queueSchema);
+const Historical = mongoose.model('historical_coins', historicalSchema);
 
 module.exports = {
-  insertHotCoin: async function ({ symbol }) {
-    try {
-      const newHotCoin = new HotCoin({ symbol });
-      await newHotCoin.save();
-      return symbol;
-    } catch (error) {
-      console.error(error.stack);
-      utils.write(error.stack, true);
-      return false;
-    }
-  },
-  getHotCoins: async function () {
-    try {
-      const results = await HotCoin.find();
-      return results;
-    } catch (error) {
-      console.error(error.stack);
-      utils.write(error.stack, true);
-      return [];
-    }
-  },
-  removeHotCoin: async function (symbol) {
-    try {
-      await HotCoin.deleteOne({ symbol });
-      return symbol;
-    } catch (error) {
-      console.error(error.stack);
-      utils.write(error.stack, true);
-      return false;
-    }
-  },
-
-  getActiveCoins: async function () {
-    try {
-      const results = await ActiveCoin.find();
-      return results;
-    } catch (error) {
-      console.error(error.stack);
-      utils.write(error.stack, true);
-      return [];
-    }
-  },
-  getQueue: async function () {
-    try {
-      const results = await Queue.find();
-      if (results[0]) {
-        return results[0].queue;
-      } else {
-        return [];
-      }
-    } catch (error) {
-      console.error(error.stack);
-      utils.write(error.stack, true);
-      return [];
-    }
-  },
-  setQueue: async function (queue) {
-    if (queue.length > 0) {
-      try {
-        await Queue.deleteOne({ created: { $exists: true } });
-        const newQueue = new Queue({ queue });
-        await newQueue.save();
-      } catch (error) {
-        console.error(error.stack);
-        utils.write(error.stack, true);
-      }
-    }
-  },
-  removeCoin: async function (symbol, queue) {
-    try {
-      await ActiveCoin.deleteOne({ symbol });
-      await Queue.deleteOne({ created: { $exists: true } });
-      const modifiedQueue = queue.filter((q) => q.symbol !== symbol);
-      const newQueue = new Queue({ queue: modifiedQueue });
-      await newQueue.save();
-    } catch (error) {
-      utils.write(error, true);
-    }
-  },
-  initQueueListener: function () {
-    return Queue.watch();
-  },
-  getAbandonedCoins: async function () {
-    try {
-      const abandonedCoins = await ActiveCoin.find({ abandoned: true });
-      return abandonedCoins;
-    } catch (error) {
-      utils.write(error, true);
-      return [];
-    }
-  },
-  createNewHistory: async function (coinObj) {
-    try {
-      const newHistory = new History(coinObj);
-      await newHistory.save();
-    } catch (error) {
-      console.error(error.stack);
-      utils.write(error.stack, true);
-    }
-  },
-  deleteHotCoins: async function () {
-    try {
-      await HotCoin.deleteMany({ symbol: { $exists: true } });
-    } catch (error) {
-      utils.write(error, true);
-    }
-  },
-  deleteActiveCoins: async function () {
-    try {
-      await ActiveCoin.deleteMany({ symbol: { $exists: true } });
-    } catch (error) {
-      utils.write(error, true);
-    }
-  },
-  deleteQueueCoins: async function () {
-    try {
-      await Queue.deleteMany({ created: { $exists: true } });
-    } catch (error) {
-      utils.write(error, true);
-    }
-  },
+  HotCoin,
+  ActiveCoin,
+  Queue,
+  Historical,
 };

package/index.js

@@ -2,38 +2,168 @@ const fs = require('fs');
 const path = require('path');
 const util = require('util');
 const exec = util.promisify(require('child_process').exec);
-const dbUtils = require('./db')
+const { HotCoin, ActiveCoin, Queue, Historical } = require('./db');
 const CNAME = process.env.CNAME;
-const LOGS_PATH = CNAME?`${CNAME}_logs.txt`:"commander_logs.txt";
+const LOGS_PATH = CNAME ? `${CNAME}_logs.txt` : 'commander_logs.txt';
 
-module.exports =  {
-  ...dbUtils,
-  sortByPercent: function (a, b) {
-    return b.percentChange - a.percentChange;
-  },
-  write: function (msg, isError = false) {
-    let dateStr = new Date().toLocaleString('he-IL');
-    let prefixType = isError ? '[ERROR]' : '[LOG]';
+function sortByPercent(a, b) {
+  return b.percentChange - a.percentChange;
+}
+function write(msg, isError = false) {
+  let dateStr = new Date().toLocaleString('he-IL');
+  let prefixType = isError ? '[ERROR]' : '[LOG]';
 
-    fs.appendFileSync(path.resolve(LOGS_PATH), `${dateStr}-${prefixType} ${msg}\n`, 'utf8');
-  },
-  execute: async function (command) {
-    console.log(`$ ${command}`);
+  fs.appendFileSync(path.resolve(LOGS_PATH), `${dateStr}-${prefixType} ${msg}\n`, 'utf8');
+}
+async function execute(command) {
+  write(`$ ${command}`);
+  try {
+    const { error, stdout, stderr } = await exec(command);
+    if (stderr) {
+      write(`${stderr}`);
+      return stderr;
+    }
+    // delete coin and archive data
+    write(`${stdout}`);
+    return stdout;
+  } catch (error) {
+    write(error,true);
+    throw Error(error);
+  }
+}
+function getServiceName(symbol) {
+  return `rsibot_${symbol.slice(0, -4)}_${symbol.slice(-4)}`.toLowerCase();
+}
+async function insertHotCoin({ symbol }) {
+  try {
+    const newHotCoin = new HotCoin({ symbol });
+    await newHotCoin.save();
+    return symbol;
+  } catch (error) {
+    write(error.stack,true);
+    return false;
+  }
+}
+async function getHotCoins() {
+  try {
+    const results = await HotCoin.find();
+    return results;
+  } catch (error) {
+    write(error.stack,true);
+    return [];
+  }
+}
+async function removeHotCoin(symbol) {
+  try {
+    await HotCoin.deleteOne({ symbol });
+    return symbol;
+  } catch (error) {
+    write(error.stack,true);
+    return false;
+  }
+}
+
+async function getActiveCoins() {
+  try {
+    const results = await ActiveCoin.find();
+    return results;
+  } catch (error) {
+    write(error.stack,true);
+    return [];
+  }
+}
+async function getQueue() {
+  try {
+    const results = await Queue.find();
+    if (results[0]) {
+      return results[0].queue;
+    } else {
+      return [];
+    }
+  } catch (error) {
+    write(error.stack,true);
+    return [];
+  }
+}
+async function setQueue(queue) {
+  if (queue.length > 0) {
     try {
-      const { error, stdout, stderr } = await exec(command);
-      if (stderr) {
-        console.log(`${stderr}`);
-        return stderr;
-      }
-      // delete coin and archive data
-      console.log(`${stdout}`);
-      return stdout;
+      await Queue.deleteOne({ created: { $exists: true } });
+      const newQueue = new Queue({ queue });
+      await newQueue.save();
     } catch (error) {
-      console.log(error);
-      throw Error(error);
+      write(error.stack,true);
     }
-  },
-  getServiceName: function (symbol) {
-    return `rsibot_${symbol.slice(0, -4)}_${symbol.slice(-4)}`.toLowerCase();
-  },
+  }
+}
+async function removeCoin(symbol, queue) {
+  try {
+    await ActiveCoin.deleteOne({ symbol });
+    await Queue.deleteOne({ created: { $exists: true } });
+    const modifiedQueue = queue.filter((q) => q.symbol !== symbol);
+    const newQueue = new Queue({ queue: modifiedQueue });
+    await newQueue.save();
+  } catch (error) {
+    write(error.stack,true);
+  }
+}
+function initQueueListener() {
+  return Queue.watch();
+}
+async function getAbandonedCoins() {
+  try {
+    const abandonedCoins = await ActiveCoin.find({ abandoned: true });
+    return abandonedCoins;
+  } catch (error) {
+    write(error.stack,true);
+    return [];
+  }
+}
+async function createNewHistory(coinObj) {
+  try {
+    const newHistory = new Historical(coinObj);
+    await newHistory.save();
+  } catch (error) {
+    write(error.stack,true);
+  }
+}
+async function deleteHotCoins() {
+  try {
+    await HotCoin.deleteMany({ symbol: { $exists: true } });
+  } catch (error) {
+    write(error.stack,true);
+  }
+}
+async function deleteActiveCoins() {
+  try {
+    await ActiveCoin.deleteMany({ symbol: { $exists: true } });
+  } catch (error) {
+    write(error,true);
+  }
+}
+async function deleteQueueCoins() {
+  try {
+    await Queue.deleteMany({ created: { $exists: true } });
+  } catch (error) {
+    write(error.stack,true);
+  }
+}
+module.exports = {
+  sortByPercent,
+  write,
+  execute,
+  getServiceName,
+  insertHotCoin,
+  getHotCoins,
+  removeHotCoin,
+  getActiveCoins,
+  getQueue,
+  setQueue,
+  removeCoin,
+  initQueueListener,
+  getAbandonedCoins,
+  createNewHistory,
+  deleteHotCoins,
+  deleteActiveCoins,
+  deleteQueueCoins,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsibot-utils",
-  "version": "1.0.8",
+  "version": "1.1.1",
   "description": "",
   "main": "index.js",
   "scripts": {