git pu

change.js

 let fs = require('fs')
 var watch = require('node-watch');
 let ai = require('./ai-new')
-let path = 'C:\\yMTa\\Set\\AltSet\\'
+let path = 'C:\\yMTa\\Set\\AltSet2'
 let longSide = 'LONG'
 let shortSide = 'SHORT'
+let bybit=require('./test_bybit')
 let zignaly = require('./zignaly')
 
 let longToken = 'a7d9ab4de89d2717f54182e008f62cd2'
@@ -20,7 +21,7 @@ run()
 async function run() {
     let files = await fs.readdirSync(path)
     for (let i = 0; i < files.length; i++) {
-        if (!files[i].includes('220518212916_O1_ETHUSDT_Lp1_ETH'))
+        if (!files[i].includes('Lp1') || !files[i].includes('Lp2') || !files[i].includes('Lp3') || !files[i].includes('Lp4') || !files[i].includes('Lp5'))
             continue
 
 
@@ -83,7 +84,7 @@ async function checker() {
     let arr = []
     let files = await fs.readdirSync(path)
     for (let i = 0; i < files.length; i++) {
-        if (!files[i].includes('220518212916_O1_ETHUSDT_Lp1_ETH'))
+        if (!files[i].includes('Lp1') || !files[i].includes('Lp2') || !files[i].includes('Lp3') || !files[i].includes('Lp4') || !files[i].includes('Lp5'))
             continue
         arr.push(make(files[i]))
     }
@@ -111,12 +112,24 @@ async function updateVars(name) {
     lastFile = lastFile.split('\n')
     // console.log([lastFile[lastFile.length-2]])
     let lastData = lastFile[lastFile.length - 2]
+    let qty=0
+    if (name.includes('Lp1'))
+        qty=0.01
+    else if (name.includes('Lp2'))
+        qty=0.02
+    else if (name.includes('Lp3'))
+        qty=0.03
+    else if (name.includes('Lp4'))
+        qty=0.04
+    else if (name.includes('Lp4'))
+        qty=0.05
     if (lastData.includes('Buy')) {
-        zignaly.exitAndCanlcelAll(longToken, 'ETHUSDT', longId)
+       bybit.reduceOrder('Buy',qty)
+       // zignaly.exitAndCanlcelAll(longToken, 'ETHUSDT', longId)
         // zignaly.createNewOrderNew(shortToken,'ETH',shortSide,5,shortId)
     } else {
-
-        zignaly.exitAndCanlcelAll(shortToken, 'ETHUSDT', shortId)
+        bybit.reduceOrder('Sell',qty)
+      //  zignaly.exitAndCanlcelAll(shortToken, 'ETHUSDT', shortId)
         //  zignaly.createNewOrderNew(longToken,'ETH',longSide,5,longId)
     }
     let data = grabData([lastData])
@@ -126,12 +139,13 @@ async function updateVars(name) {
     console.log('VarProfitDrawDownZeroProfit :', vars.VarProfitDrawDownZeroProfit)
     if (vars.VarProfitDrawDownZeroProfit < -0.01) {
         if (lastData.includes('Buy')) {
-            //  zignaly.exitAndCanlcelAll(longToken, 'ETHUSDT', longId)
-            zignaly.createNewOrderNew(shortToken, 'ETH', shortSide, 7, shortId)
+            bybit.createNewOrder('Buy',qty)
+          //  zignaly.createNewOrderNew(shortToken, 'ETH', shortSide, 7, shortId)
+
         } else {
 
-            //  zignaly.exitAndCanlcelAll(shortToken, 'ETHUSDT', shortId)
-            zignaly.createNewOrderNew(longToken, 'ETH', longSide, 7, longId)
+            bybit.createNewOrder('Sell',qty)
+          //  zignaly.createNewOrderNew(longToken, 'ETH', longSide, 7, longId)
         }
     }
     // console.log(name,vars)

test_bybit.js

-const { InverseFuturesClient } = require('bybit-api');
+const {LinearClient} = require('bybit-api');
 
 
 const API_KEY = '7iW1muhWWyX8PxuQWx';
 const PRIVATE_KEY = '5Bf4FFISdQNxVJqg5pqyn860CIrgjsXXy3pK';
 const useLivenet = false;
 
-const client = new InverseFuturesClient(
+const client = new LinearClient(
     API_KEY,
     PRIVATE_KEY,
 
@@ -16,18 +16,69 @@ const client = new InverseFuturesClient(
     // requestLibraryOptions
 );
 
-client.getApiKeyInfo()
-    .then(result => {
-        console.log("apiKey result: ", result);
-    })
-    .catch(err => {
-        console.error("apiKey error: ", err);
-    });
-
-client.getOrderBook({ symbol: 'BTCUSDH21' })
-    .then(result => {
-        console.log("getOrderBook inverse futures result: ", result);
-    })
-    .catch(err => {
-        console.error("getOrderBook inverse futures error: ", err);
-    });
+
+
+async function reduceOrder(side,qty) {
+
+
+    const params2 = {
+        side: side,
+        symbol: "ETHUSDT",
+        order_type: 'Market',
+        qty:qty,
+        time_in_force: 'ImmediateOrCancel',
+        close_on_trigger: true,
+        reduce_only: true,
+
+
+    }
+
+    try {
+        let res = await client.placeActiveOrder(params2)
+
+        console.log(res)
+    }
+    catch (e)
+    {
+
+    }
+
+
+}
+
+
+
+async function createNewOrder(side,qty)
+{
+    const params = {
+        side: side,
+        symbol: "ETHUSDT",
+        order_type: 'Market',
+        qty:qty,
+        time_in_force: 'GoodTillCancel',
+        close_on_trigger: false,
+        reduce_only: false,
+
+
+    }
+
+   try {
+       let res = await client.placeActiveOrder(params)
+
+       console.log(res)
+   }
+   catch (e)
+   {
+
+   }
+
+}
+
+module.exports =
+    {
+
+        createNewOrder: createNewOrder,
+        reduceOrder:reduceOrder
+
+
+    }
\ No newline at end of file