Updated daytrading

Author: Artimatic

app.yaml

@@ -1,3 +1,3 @@
-runtime: nodejs12
+runtime: nodejs16
 env_variables:
   CLIENT_ID: "0033"

package.json

@@ -5,19 +5,20 @@
   "main": "server/app.js",
   "scripts": {
     "ng": "ng",
-    "start": "pm2 start ecosystem.config.js",
-    "build": "npm run tslint && npm run lintfix && ng build --aot && npm run build-ts",
-    "serve": "node dist/app.js",
+    "serve": "pm2 start ecosystem.config.js",
+    "build:all": "ng build --aot && npm run build-ts",
+    "build": "npm run build-ts",
+    "start": "node dist/app.js",
     "test-server": "npm run build-ts && node server-tests.js",
     "test": "ng test",
-    "lint": "ng lint",
     "e2e": "ng e2e",
     "postinstall": "npm run build",
     "build-ts": "tsc -p ./server/tsconfig.json",
     "watch-ts": "tsc -p ./server/tsconfig.json -w",
+    "lint": "npm run tslint && npm run lintfix",
     "tslint": "tslint -c tslint.json -p tsconfig.json",
     "lintfix": "tslint --fix -c tslint.json -p tsconfig.json",
-    "deploy": "copyfiles app.yaml dist && cd dist && gcloud app deploy"
+    "deploy": "copyfiles package.json dist && copyfiles app.yaml dist && cd dist && gcloud app deploy"
   },
   "private": true,
   "dependencies": {
@@ -81,7 +82,6 @@
     "tslib": "^1.10.0",
     "tulind": "^0.8.15",
     "twilio": "^3.50.0",
-    "typescript": "4.1.5",
     "websocket-extensions": "^0.1.4",
     "xlsx": "^0.18.5",
     "y18n": "^4.0.1",
@@ -115,10 +115,11 @@
     "nodemon": "^1.14.1",
     "protractor": "^7.0.0",
     "ts-node": "^3.3.0",
-    "tslint": "^6.1.3"
+    "tslint": "^6.1.3",
+    "typescript": "4.1.5"
   },
   "engines": {
-    "node": ">12.18.3"
+    "node": "16.20.0"
   },
   "babel": {
     "presets": [

src/app/autopilot/autopilot.component.ts

@@ -111,15 +111,17 @@ export class AutopilotComponent implements OnInit, OnDestroy {
     Strategy.Short
   ];
 
-  riskCounter = 2;
+  riskCounter = 1;
 
   riskToleranceList = [
     RiskTolerance.None,
     RiskTolerance.ExtremeFear,
     RiskTolerance.Fear,
     RiskTolerance.Neutral,
     RiskTolerance.Greed,
-    RiskTolerance.ExtremeGreed
+    RiskTolerance.ExtremeGreed,
+    RiskTolerance.XLGreed,
+    RiskTolerance.XXLGreed
   ];
 
   backtestBuffer$;
@@ -227,6 +229,12 @@ export class AutopilotComponent implements OnInit, OnDestroy {
       this.cartService.buyOrders.length || this.cartService.otherOrders.length);
   }
 
+  resetBacktested() {
+    setTimeout(() => {
+      this.isBacktested = false;
+    }, 18000000);
+  }
+
   setProfitLoss() {
     const profitObj: ProfitLossRecord = {
       'date': moment().format(),
@@ -251,7 +259,7 @@ export class AutopilotComponent implements OnInit, OnDestroy {
   resetCart() {
     this.executedIndex = 0;
     this.lastOrderListIndex = 0;
-    this.isBacktested = false;
+    this.resetBacktested();
     this.isTradingStarted = false;
     this.buyList = [];
     this.dayTradeList = [];
@@ -292,7 +300,12 @@ export class AutopilotComponent implements OnInit, OnDestroy {
     console.log('developing strategy lastProfitLoss', lastProfitLoss);
     if (lastProfitLoss && lastProfitLoss.profit) {
       if (lastProfitLoss.profit * 1 < 0) {
-        this.decreaseRiskTolerance();
+        if (lastProfitLoss.lastStrategy === Strategy.Daytrade &&
+          this.riskCounter < this.riskToleranceList.length) {
+            this.increaseRiskTolerance();
+        } else {
+          this.decreaseRiskTolerance();
+        }
       } else if (lastProfitLoss.profit * 1 > 0) {
         this.increaseRiskTolerance();
       }
@@ -687,8 +700,8 @@ export class AutopilotComponent implements OnInit, OnDestroy {
         this.aiPicksService.mlNeutralResults.pipe(
           take(data.length)
         ).subscribe(latestMlResult => {
-          console.log('Received results', latestMlResult);
-          const stockSymbol = latestMlResult.label; 
+          console.log('Received results for current holdings', latestMlResult);
+          const stockSymbol = latestMlResult.label;
           const order = this.cartService.buildOrder(stockSymbol);
           const found = this.currentHoldings.find((value) => {
             return value.name === stockSymbol;
@@ -803,7 +816,7 @@ export class AutopilotComponent implements OnInit, OnDestroy {
   checkForStopLoss(holdings: PositionHoldings[]) {
     holdings.forEach(val => {
       const percentLoss = divide(val.pl, val.netLiq);
-      if (percentLoss < -0.051) {
+      if (percentLoss < -0.05) {
         this.portfolioSell(val);
       } else if (percentLoss > 0) {
         this.addBuy(val);
@@ -822,6 +835,9 @@ export class AutopilotComponent implements OnInit, OnDestroy {
       currentHoldings.sort((a, b) => a.pl - b.pl);
       const toBeSold = currentHoldings.slice(currentHoldings.length - 10, currentHoldings.length);
       console.log('too many holdings. selling', toBeSold, 'from', currentHoldings);
+      toBeSold.splice(0, 1).forEach(holdingInfo => {
+        this.portfolioSell(holdingInfo);
+      });
     }
   }
 

station-client.bat

@@ -1,2 +1,2 @@
 echo on
- npm i && npm start
+ npm i && npm run serve