Merge branch 'removeUI' of Karl/BBLBTV_DNS into master

working latest bits
dotenv
2021-11-19 09:46:35 -06:00 · 2021-11-19 15:45:10 +00:00 · 2021-11-19 14:44:08 +00:00 · 2021-11-19 14:25:42 +00:00 · 2021-11-19 13:12:48 +00:00 · 2021-11-19 11:52:28 +00:00
63 changed files with 737 additions and 29607 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,3 @@
 node_modules
+test2.js
+.env
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -5,12 +5,22 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "name": "React",
-            "type": "chrome",
+            "name": "Launch Program",
+            "program": "${workspaceFolder}/lib/apache_functions.js",
            "request": "launch",
-            "url": "http://localhost:6969",
-            // "webRoot": "${workspaceRoot}/react-backend/client/src"
-            "port": 9223
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "pwa-node",
+            "env": {
+                "DBHOST": "vps.k-world.me.uk",
+                "DBUSER": "root",
+                "DBPASS": "Grd555269",
+                "DATABASE": "BBLB_DNS",
+                "DBPORT": "3306",
+                "TORSSRV": "localhost",
+                "TORSPWD": "KarlMax",
+            }
        },
        {
            "type": "node",
@ -26,6 +36,8 @@
                "DBPASS": "Grd555269",
                "DATABASE": "BBLB_DNS",
                "DBPORT": "3306",
+                "TORSSRV": "localhost",
+                "TORSPWD": "KarlMax",
            }
        },
        {
@ -42,37 +54,8 @@
                "DBPASS": "Grd555269",
                "DATABASE": "BBLB_DNS",
                "DBPORT": "3306",
-            }
-        },
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "AddAcccount",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${workspaceFolder}/lib/addAccounts.js",
-            "env": {
-                "DBHOST": "vps.k-world.me.uk",
-                "DBUSER": "root",
-                "DBPASS": "Grd555269",
-                "DATABASE": "BBLB_DNS",
-                "DBPORT": "3306",
-            }
-        },
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "password",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${workspaceFolder}/lib/addAccounts.js",
-            "env": {
-                "HOST": "localhost",
-                "DBUSER": "root",
-                "DBPASS": "example",
-                "DATABASE": "BBLB_DNS"
+                "TORSSRV": "localhost",
+                "TORSPWD": "KarlMax",
            }
        }
    ]
--- a/SQL/build.sql
+++ b/SQL/build.sql
@ -25,39 +25,6 @@ CREATE TABLE `streams`
 (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

-INSERT INTO streams (
-streamName
-, streamURL) VALUES
-('Gold',	'http://SERVER1.cheesywotsit.gq:8090'),
-('Insanity',	'https://trippy.pro:443'),
-('PremiumPlus',	'http://kibb.link:8080'),
-('GunSlinger',	'http://gunslingertv.org:8080'),
-('VIP',	'http://shark.brokenwarrior.xyz:8080'),
-('Technoid',	'http://capoisagod2021.org:8080'),
-('Old Premium',	'https://caporeds.online:443'),
-('New Premium',	'http://fckbrexit.link:8080'),
-('Sol',	'http://tv.realot.xyz:35001'),
-('Bluemoon',	'http://www.tvxclnt.com:8080'),
-('AIRWOLF',	'http://iptv.satplex.co.uk:8080'),
-('Gambler',	'http://37723998.to:2052'),
-('Liveclub',	'http://apkdns.store:8080'),
-('Opplex',	'http://opplex.tv:8080'),
-('DIAZ',	'http://gold.mypsx.net:8880'),
-('USA',	'http://pimptv.dnsabr.com:8080'),
-('VIPER',	'http://tavaratv.xyz:2095'),
-('SUNBED',	'http://cms-tan.media:8880'),
-('Knightrider',	'http://streamknighttv.xyz:8080'),
-('Simple',	'http://covidsucks.xyz:8080'),
-('KDB',	'http://mytv.digital:8080/'),
-('PYTHON',	'http://foxmedia.bounceme.net:8282'),
-('KEANO',	'http://ip365.cx:80'),
-('FODEN',	'http://ac.mustardsubs.tk:8880'),
-('Titan', 'http://titanmedia.tech:8080');
-ON DUPLICATE KEY
-UPDATE `streamName` = VALUES
-(`streamName`), `streamURL` = VALUES
-(`streamURL`);
-
 DROP TABLE IF EXISTS `userAccounts`;
 CREATE TABLE `userAccounts`
 (
--- a/UpdateContainer.sh
+++ b/UpdateContainer.sh
@ -1,4 +1,4 @@
- docker stop bblbtv_dns &&\
- docker rm --force bblbtv_dns &&\
- docker build -t bblbtv_dns . &&\
- docker run  -p 6969:6969 -v ${PWD}/logs:/usr/src/app/logs -d --name bblbtv_dns bblbtv_dns:latest
+ docker stop ktvmanager &\
+ docker rm --force ktvmanager &\
+ docker build -t ktvmanager . &&\
+ docker run  -p 6969:6969 -v ${PWD}/logs:/usr/src/app/logs -d --name kTvManager ktvmanager:latest
--- a/app.js
+++ b/app.js
@ -1,53 +1,31 @@
-var createError = require('http-errors');
 var express = require('express');
-var path = require('path');
-var cookieParser = require('cookie-parser');
-var cors = require('cors')
-var logger = require('morgan');
+const basicAuth = require('express-basic-auth')

 const { getUsers } = require('./lib/getUsers')

 var indexRouter = require('./routes/index');
-var streamsRouter = require('./routes/getStreams');
 var getUserAccounts = require('./routes/getUserAccounts')
 var singleUserCheck = require('./routes/singleCheck')
 var addAccount = require('./routes/addAccount')
 var deleteAccount = require('./routes/deleteAccount')
-var readCookie = require('./routes/readCookie')
-var getStreamNames = require('./routes/getStreamNames')
 var login = require('./routes/login')
 var app = express();
-const basicAuth = require('express-basic-auth')


-// view engine setup
-app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'jade');
-
-app.use(cors({ origin: true, credentials: true, methods: 'GET,PUT,POST,OPTIONS', allowedHeaders: 'Content-Type,Authorization' }));
-app.use(logger('dev'));
-app.use(express.json());
-app.use(express.urlencoded({ extended: false }));
-app.use(cookieParser('82e4e438a0705fabf61f9854e3b575af'));
-app.use(express.static(path.join(__dirname, 'public')));
-
 let usersList = getUsers()

 const users = {
  users: usersList,
  challenge: true
 }
-
+app.use(express.json());
+app.use(express.urlencoded({ extended: false }));
 app.use('/', indexRouter);
 app.use('/login', basicAuth(users), login)
-// app.use('/getStreams', streamsRouter);
 app.use('/getUserAccounts', basicAuth(users), getUserAccounts);
 app.use('/singleCheck', basicAuth(users), singleUserCheck)
 app.use('/addAccount', basicAuth(users), addAccount)
 app.use('/deleteAccount', basicAuth(users), deleteAccount)
-// app.use('/readCookie', readCookie)
-// app.use('/getStreamNames', getStreamNames)
-

 // catch 404 and forward to error handler
 app.use(function (req, res, next) {
--- a/bin/www
+++ b/bin/www
@ -4,6 +4,8 @@
 * Module dependencies.
 */

+require('dotenv').config()
+
 var app = require('../app');
 var debug = require('debug')('react-backend:server');
 var http = require('http');
--- a/client/.dockerfile
+++ b/client/.dockerfile
@ -1,19 +0,0 @@
-FROM node:12-alpine
-
-LABEL version="1.0"
-LABEL description="FRONTEND"
-
-WORKDIR /app
-
-COPY ["package.json", "package-lock.json", "./"]
-
-ENV PORT=6969
-
-# RUN apk --no-cache add curl
-RUN npm install --production
-
-COPY . .
-
-EXPOSE 6969
-
-CMD ["npm", "start"]
--- a/client/.dockerignore
+++ b/client/.dockerignore
@ -1,2 +0,0 @@
-node_modules
-npm-debug.log
--- a/client/.gitignore
+++ b/client/.gitignore
@ -1,23 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
--- a/client/Dockerfile.prod
+++ b/client/Dockerfile.prod
@ -1,18 +0,0 @@
-# stage1 - build react app first 
-FROM node:12-alpine as build
-WORKDIR /app
-ENV PATH /app/node_modules/.bin:$PATH
-COPY ./package.json /app/
-COPY ./yarn.lock /app/
-RUN yarn
-COPY . /app
-RUN yarn build
-
-# stage 2 - build the final image and copy the react build files
-FROM nginx:1.17.8-alpine
-COPY --from=build /app/build /usr/share/nginx/html
-RUN apk --no-cache add curl
-RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx/nginx.conf /etc/nginx/conf.d
-EXPOSE 6969
-CMD ["nginx", "-g", "daemon off;"]
--- a/client/README.md
+++ b/client/README.md
@ -1,70 +0,0 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `yarn start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `yarn build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `yarn eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
-
-### Analyzing the Bundle Size
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
-
-### Making a Progressive Web App
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
-
-### Advanced Configuration
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
-
-### Deployment
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
-
-### `yarn build` fails to minify
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
--- a/client/nginx/nginx.conf
+++ b/client/nginx/nginx.conf
@ -1,21 +0,0 @@
-server {
-
-  listen 6969;
-
-  location / {
-    root   /usr/share/nginx/html;
-    index  index.html index.htm;
-
-    # to redirect all the requests to index.html, 
-    # useful when you are using react-router
-
-    try_files $uri /index.html; 
-  }
-
-  error_page   500 502 503 504  /50x.html;
-
-  location = /50x.html {
-    root   /usr/share/nginx/html;
-  }
-
-}
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@ -1,43 +0,0 @@
-{
-  "name": "client",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@testing-library/react": "^11.1.0",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-dropdown": "^1.9.2",
-    "react-scripts": "4.0.2",
-    "web-vitals": "^1.0.1",
-    "@material-ui/core": "^4.11.3",
-    "@material-ui/icons": "^4.11.2",
-    "axios": "^0.21.1",
-    "material-table": "^1.69.2",
-    "react-router-dom": "^5.2.0"
-  },
-  "scripts": {
-    "start": "set URL=vps.k-world.me.uk && set PORT=6969 && react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "proxy": "http://localhost:3001",
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
-}
--- a/client/public/favicon.ico
+++ b/client/public/favicon.ico
--- a/client/public/index.html
+++ b/client/public/index.html
@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link
-      rel="stylesheet"
-      href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
-    />
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-  </body>
-</html>
--- a/client/public/logo192.png
+++ b/client/public/logo192.png
--- a/client/public/logo512.png
+++ b/client/public/logo512.png
--- a/client/public/manifest.json
+++ b/client/public/manifest.json
@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
--- a/client/public/robots.txt
+++ b/client/public/robots.txt
@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:
--- a/client/src/App.css
+++ b/client/src/App.css
@ -1,53 +0,0 @@
-/* Pen-specific styles */
-* {
-  box-sizing: border-box;
-}
-body {
-  font-size: 1.25rem;
-  font-family: sans-serif;
-  line-height: 150%;
-  text-shadow: 0 2px 2px #1b1917;
-}
-
-section {
-  color: #fff;
-  text-align: center;
-}
-
-div {
-  height: 100%;
-}
-
-article {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 100%;
-  padding: 20px;
-}
-
-h1 {
-  font-size: 1.75rem;
-  margin: 0 0 0.75rem 0;
-}
-
-/* Pattern styles */
-.container {
-  display: table;
-  width: 100%;
-}
-
-.left-half {
-  background-color: #060b4d9f;
-  position: absolute;
-  left: 0px;
-  width: 50%;
-}
-
-.right-half {
-  background-color: #060b4d9f;
-  position: absolute;
-  right: 0px;
-  width: 50%;
-}
--- a/client/src/App.js
+++ b/client/src/App.js
@ -1,21 +0,0 @@
-import React from "react";
-import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
-import { Navigation, Footer, Home, Accounts, ServerList, AddAccount } from "./components";
-function App() {
-  return (
-    <div className="App">
-      <Router>
-        <Navigation />
-        <Switch>
-          <Route path="/" exact component={() => <Home />} />
-          <Route path="/Accounts" exact component={() => <Accounts />} />
-          <Route path="/ServerList" exact component={() => <ServerList />} />
-          <Route path="/AddAccount" exact component={() => <AddAccount />} />
-        </Switch>
-        <Footer />
-      </Router>
-    </div>
-  );
-}
-
-export default App;
--- a/client/src/checkAuth.js
+++ b/client/src/checkAuth.js
@ -1,18 +0,0 @@
-import axios from "axios";
-
-async function readCookie() {
-
-  try {
-    const res = await axios.get("http://vps.k-world.me.uk:3001/readCookie", { withCredentials: true });
-    console.log('IM CHECKING AUTH')
-    if (res.data === "No Cookie Set") {
-      console.log('I CHECKED AUTH')
-      document.location = "/";
-    }
-  } catch (e) {
-    console.log(e);
-  }
-};
-
-export default readCookie;
-
--- a/client/src/components/Accounts.jsx
+++ b/client/src/components/Accounts.jsx
@ -1,15 +0,0 @@
-import React from "react";
-import MTable from "./accountTable";
-import readCookie from "../checkAuth";
-
-function Accounts() {
-  readCookie();
-
-  return (
-    <div style={{ padding: "30px" }}>
-      <MTable />
-    </div>
-  );
-}
-
-export default Accounts;
--- a/client/src/components/AddAccount.jsx
+++ b/client/src/components/AddAccount.jsx
@ -1,136 +0,0 @@
-import React, { Component } from "react";
-import axios from "axios";
-import Dropdown from "react-dropdown";
-import "react-dropdown/style.css";
-import readCookie from "../checkAuth";
-
-let arr = [];
-class AddAccount extends Component {
-  constructor() {
-    // readCookie();
-
-    super();
-    this.state = {
-      username: "",
-      password: "",
-      stream: "",
-    };
-  }
-
-  componentDidMount() {
-    this.fetchOptions();
-  }
-
-  fetchOptions() {
-    try {
-      fetch("http://vps.k-world.me.uk:3001/getStreamNames",
-      { withCredentials: true})
-        .then((res) => {
-          return res.json();
-        })
-        .then((json) => {
-          json.forEach((account) => {
-            arr.push(account.streamName);
-          });
-          this.setState({ options: arr });
-        });
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  _onSelect = (e) => {
-    /*
-      Because we named the inputs to match their
-      corresponding values in state, it's
-      super easy to update the state
-    */
-    this.setState({ stream: e.value });
-  };
-
-  onChange = (e) => {
-    /*
-      Because we named the inputs to match their
-      corresponding values in state, it's
-      super easy to update the state
-    */
-    this.setState({ [e.target.name]: e.target.value });
-  };
-
-  onSubmit = (e) => {
-    e.preventDefault();
-    // get our form data out of state
-    const { username, password, stream } = this.state;
-
-    console.log({ username, password, stream });
-
-    axios
-      .post(
-        "http://vps.k-world.me.uk:3001/addAccount",
-        {
-          username,
-          password,
-          stream,
-        },
-        { withCredentials: true }
-      )
-      .then((res) => {
-        console.log(res);
-        console.log(res.data);
-        if (res.data.includes("Added successfully")) {
-          document.location = "/accounts";
-        } else {
-          document.location = "/AddAccount";
-        }
-      });
-  };
-
-  render() {
-    const { username, password } = this.state;
-
-    return (
-      <section class="container">
-        <div class="left-half">
-          <article>
-            <h1>Add An Account</h1>
-            <p>
-              <form onSubmit={this.onSubmit}>
-                <p>
-                  UserName -
-                  <input
-                    type="text"
-                    name="username"
-                    value={username}
-                    onChange={this.onChange}
-                  />
-                </p>
-                <p>
-                  Password -
-                  <input
-                    type="text"
-                    name="password"
-                    value={password}
-                    onChange={this.onChange}
-                  />
-                </p>
-                <p>
-                  Stream Name -
-                  <Dropdown
-                    options={arr}
-                    onChange={this._onSelect}
-                    // defaultValue={arr[3]}
-                    // value={arr[0]}
-                    placeholder="Select an account"
-                  />
-                </p>
-                <br />
-                <button type="submit">Add Account</button>
-              </form>
-            </p>
-          </article>
-        </div>
-      </section>
-    );
-  }
-}
-export default AddAccount;
--- a/client/src/components/Footer.jsx
+++ b/client/src/components/Footer.jsx
@ -1,17 +0,0 @@
-import React from "react";
-
-function Footer() {
-  return (
-    <div className="footer">
-      <footer class="py-5 bg-dark fixed-bottom">
-        <div class="container">
-          <p class="m-0 text-center text-white">
-            Copyright &copy; 2021
-          </p>
-        </div>
-      </footer>
-    </div>
-  );
-}
-
-export default Footer;
--- a/client/src/components/Home.jsx
+++ b/client/src/components/Home.jsx
@ -1,55 +0,0 @@
-import React, { useState, useEffect } from "react";
-import ReactDOM from "react-dom";
-
-import axios from "axios";
-
-function App() {
-  const deleteCookie = async () => {
-    try {
-      // await axios.get("http://" + process.env.URL + ":3001/readCookie/clear");
-      await axios.get("http://vps.k-world.me.uk:3001/readCookie/clear");
-    
-    } catch (e) {
-      console.log(e);
-    }
-  };
-
-  const [username, setUsername] = useState();
-  const [password, setPassword] = useState();
-
-  const auth = async () => {
-    try {
-      // const res = await axios.get("http://" + process.env.URL + ":3001/login", {
-        const res = await axios.get("http://vps.k-world.me.uk:3001/login", {
-        auth: { username, password },
-      });
-      if (res.data.auth === "Success") {
-        document.location = "/accounts";
-      }
-    } catch (e) {
-      console.log(e);
-    }
-  };
-
-  return (
-    <div className="App">
-      <div>
-        <label>Username: </label>
-        <br />
-        <input type="text" onChange={(e) => setUsername(e.target.value)} />
-        <br />
-        <label>Password: </label>
-        <br />
-        <input type="password" onChange={(e) => setPassword(e.target.value)} />
-        <br />
-        <button onClick={auth}>Login</button> - 
-        <button onClick={deleteCookie}>Logout</button>
-      </div>
-    </div>
-  );
-}
-
-export default App;
-
-const rootElement = document.getElementById("root");
-ReactDOM.render(<App />, rootElement);
--- a/client/src/components/Navigation.jsx
+++ b/client/src/components/Navigation.jsx
@ -1,51 +0,0 @@
-import React from "react";
-import { Link, withRouter } from "react-router-dom";
-
-function Navigation(props) {
-  return (
-    <div className="navigation">
-      <nav className="navbar navbar-expand navbar-dark bg-dark">
-        <div className="container">
-          <Link className="navbar-brand" to="/">
-            BBLB_DNS
-          </Link>
-
-          <div>
-            <ul className="navbar-nav ml-auto">
-              <li
-                className={`nav-item  ${
-                  props.location.pathname === "/" ? "active" : ""
-                }`}
-              >
-                <Link className="nav-link" to="/">
-                  Home
-                  <span className="sr-only">(current)</span>
-                </Link>
-              </li>
-              <li
-                className={`nav-item  ${
-                  props.location.pathname === "/accounts" ? "active" : ""
-                }`}
-              >
-                <Link className="nav-link" to="/accounts">
-                Accounts
-                </Link>
-              </li>
-              <li
-                className={`nav-item  ${
-                  props.location.pathname === "/AddAccount" ? "active" : ""
-                }`}
-              >
-                <Link className="nav-link" to="/AddAccount">
-                Add Account
-                </Link>
-              </li>
-            </ul>
-          </div>
-        </div>
-      </nav>
-    </div>
-  );
-}
-
-export default withRouter(Navigation);
--- a/client/src/components/ServerList.jsx
+++ b/client/src/components/ServerList.jsx
@ -1,56 +0,0 @@
-import React, { Component } from "react";
-
-class ServerList extends Component {
-  constructor() {
-    super();
-    this.state = {
-      fname: "",
-      lname: "",
-      streams: [],
-    };
-  }
-
-  componentDidMount() {
-    fetch("/getStreams")
-      .then((res) => res.json())
-      .then((streams) => this.setState({ streams }));
-  }
-
-  onChange = (e) => {
-    /*
-      Because we named the inputs to match their
-      corresponding values in state, it's
-      super easy to update the state
-    */
-    this.setState({ [e.target.name]: e.target.value });
-  };
-
-  onSubmit = (e) => {
-    e.preventDefault();
-    // get our form data out of state
-    const { fname, lname } = this.state;
-    console.log({ fname, lname });
-  };
-
-  render() {
-    return (
-      <div className="contact">
-        <div class="container">
-          <div class="row align-items-center my-5">
-            <div class="col-lg-7">
-              <h1>Stream Details</h1>
-            </div>
-            <div class="col-lg-5">
-              {this.state.streams.map((stream) => (
-                <div key={stream.StreamName}>
-                  {stream.StreamName} - {stream.StreamURL}
-                </div>
-              ))}
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
-export default ServerList;
--- a/client/src/components/accountDropDown.jsx
+++ b/client/src/components/accountDropDown.jsx
@ -1,70 +0,0 @@
-import React from "react";
-import Dropdown from "react-dropdown";
-import "react-dropdown/style.css";
-
-var values;
-let arr = [];
-class DropDown extends React.Component {
-  constructor() {
-    super();
-    this.state = {
-      options: [],
-    };
-  }
-
-  componentDidMount() {
-    this.fetchOptions();
-  }
-
-  fetchOptions() {
-    fetch("http://vps.k-world.me.uk:3001/getStreamNames")
-      .then((res) => {
-        return res.json();
-      })
-      .then((json) => {
-        values = json;
-
-        values.forEach((element) => {
-          arr.push(element.streamName);
-        });
-        this.setState({ options: arr });
-      });
-  }
-
-  handleChange = (event) => {
-    this.setState({
-      value: event.target.value,
-    });
-  };
-
-  _onSelect = (e) => {
-    /*
-      Because we named the inputs to match their
-      corresponding values in state, it's
-      super easy to update the state
-    */
-    this.setState({ stream: e.value });
-  };
-
-  onChange = (e) => {
-    /*
-      Because we named the inputs to match their
-      corresponding values in state, it's
-      super easy to update the state
-    */
-    this.setState({ [e.target.name]: e.target.value });
-  };
-
-  render() {
-    return (
-      <Dropdown
-        options={arr}
-        onChange={this._onSelect}
-        value={arr[0]}
-        placeholder="Select an option"
-      />
-    );
-  }
-}
-
-export default DropDown;
--- a/client/src/components/accountTable.jsx
+++ b/client/src/components/accountTable.jsx
@ -1,91 +0,0 @@
-import React, { Component } from "react";
-import axios from "axios"; // npm instal axios
-import { forwardRef } from "react";
-import MaterialTable from "material-table";
-import ArrowDownward from "@material-ui/icons/ArrowDownward";
-import ChevronLeft from "@material-ui/icons/ChevronLeft";
-import ChevronRight from "@material-ui/icons/ChevronRight";
-import Clear from "@material-ui/icons/Clear";
-import FilterList from "@material-ui/icons/FilterList";
-import FirstPage from "@material-ui/icons/FirstPage";
-import LastPage from "@material-ui/icons/LastPage";
-import Search from "@material-ui/icons/Search";
-
-const tableIcons = {
-  //   DetailPanel: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
-  Filter: forwardRef((props, ref) => <FilterList {...props} ref={ref} />),
-  FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
-  LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
-  NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
-  PreviousPage: forwardRef((props, ref) => (
-    <ChevronLeft {...props} ref={ref} />
-  )),
-  ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
-  Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
-  SortArrow: forwardRef((props, ref) => <ArrowDownward {...props} ref={ref} />),
-};
-
-export default class MatDataTable extends Component {
-  constructor(props) {
-    super(props);
-    this.state = { person: [] };
-  }
-
-  componentDidMount(prevProps) {
-    const url = "http://vps.k-world.me.uk:3001/getUserAccounts";
-    axios.get(url, { withCredentials: true }).then((results) => {
-      console.log(results);
-      console.log(results.data);
-      this.setState({ person: results.data });
-
-      var newArr = results.data.map(function (val) {
-        let date = new Date(val.expiaryDate * 1000);
-        let d = date.toGMTString();
-        return {
-          username: val.username,
-          streamName: val.streamName,
-          streamURL: val.streamURL,
-          expiaryDate: d,
-        };
-      });
-      console.log(results.data.results);
-      this.setState(
-        {
-          tableArray: newArr, //set state of the weather5days
-        },
-        () => {
-          console.log(this.state.tableArray);
-          console.log("this.tableArray ", this.state.tableArray);
-        }
-      );
-    });
-  }
-
-  render() {
-    return (
-      <div
-        style={{ maxWidth: "100%", marginLeft: "50px", marginRight: "50px" }}
-      >
-        <MaterialTable
-          icons={tableIcons}
-          options={{
-            grouping: false,
-          }}
-          columns={[
-            {
-              title: "Username",
-              field: "username",
-              type: "numeric",
-              align: "left",
-            },
-            { title: "Stream Name", field: "streamName" },
-            { title: "Stream URL", field: "streamURL" },
-            { title: "Expiry Date", field: "expiaryDate", type: "numeric" },
-          ]}
-          data={this.state.tableArray}
-          title="Stream Details"
-        />
-      </div>
-    );
-  }
-}
--- a/client/src/components/index.js
+++ b/client/src/components/index.js
@ -1,7 +0,0 @@
-export { default as Navigation } from "./Navigation";
-export { default as Footer } from "./Footer";
-export { default as Home } from "./Home";
-export { default as Accounts } from "./Accounts";
-export { default as ServerList } from "./ServerList";
-export { default as AddAccount } from "./AddAccount"
-export {default as DropDown } from "./accountDropDown"
--- a/client/src/index.css
+++ b/client/src/index.css
@ -1,13 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}
--- a/client/src/index.js
+++ b/client/src/index.js
@ -1,17 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import './index.css';
-import App from './App';
-import reportWebVitals from './reportWebVitals';
-
-ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-  document.getElementById('root')
-);
-
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
--- a/client/src/old.js
+++ b/client/src/old.js
@ -1,81 +0,0 @@
-import React, { Component } from 'react';
-import axios from 'axios';
-import './App.css';
-class App extends Component {
-  constructor() {
-    super();
-    this.state = {
-      fname: '',
-      lname: '',
-      streams: []
-    };
-  }
-
-
-  componentDidMount() {
-    fetch('/getStreams')
-      .then(res => res.json())
-      .then(streams => this.setState({ streams }));
-  }
-
-
-  onChange = (e) => {
-    /*
-      Because we named the inputs to match their
-      corresponding values in state, it's
-      super easy to update the state
-    */
-    this.setState({ [e.target.name]: e.target.value });
-  }
-
-  onSubmit = (e) => {
-    e.preventDefault();
-    // get our form data out of state
-    const { fname, lname } = this.state;
-    console.log({ fname, lname })
-  }
-
-  render() {
-    const { fname, lname } = this.state;
-    return (
-      <section class="container">
-        <div class="left-half">
-          <article>
-            <h1>User Login</h1>
-            <p>
-              <form onSubmit={this.onSubmit}>
-                <p>UserName 
-                <input
-                  type="text"
-                  name="fname"
-                  value={fname}
-                  onChange={this.onChange}
-                />
-                </p>
-                <p>Password
-                <input
-                  type="text"
-                  name="lname"
-                  value={lname}
-                  onChange={this.onChange}
-                />
-                </p>
-                <br />
-                <button type="submit">Login</button>
-              </form>
-            </p>
-          </article>
-        </div>
-        <div class="right-half">
-          <article>
-            <h1>Stream Details</h1>
-            {this.state.streams.map(stream =>
-              <div key={stream.StreamName}>{stream.StreamName} - {stream.StreamURL}</div>
-            )}
-          </article>
-        </div>
-      </section>
-    );
-  }
-}
-export default App;
--- a/client/src/reportWebVitals.js
+++ b/client/src/reportWebVitals.js
@ -1,13 +0,0 @@
-const reportWebVitals = onPerfEntry => {
-  if (onPerfEntry && onPerfEntry instanceof Function) {
-    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
-      getCLS(onPerfEntry);
-      getFID(onPerfEntry);
-      getFCP(onPerfEntry);
-      getLCP(onPerfEntry);
-      getTTFB(onPerfEntry);
-    });
-  }
-};
-
-export default reportWebVitals;
--- a/client/src/setupTests.js
+++ b/client/src/setupTests.js
@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';
--- a/client/yarn.lock
+++ b/client/yarn.lock
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -5,7 +5,9 @@ services:
    build:
      context: .
      dockerfile: .dockerfile
-    image: "karl0ss/bblbtv_dns-backend"
+    image: "karl0ss/ktvmanager"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
    volumes:
      - ./SQL/:/docker-entrypoint-initdb.d
    ports:
@ -16,6 +18,8 @@ services:
      - DBPASS=Grd555269
      - DATABASE=BBLB_DNS
      - DBPORT=3306
+      - TORSSRV=host.docker.internal
+      - TORSPWD=KarlMax
  # frontend:
  #   build:
  #     context: ./client
--- a/lib/Accounts.js
+++ b/lib/Accounts.js
@ -1,11 +1,12 @@
 const Cryptr = require('cryptr');
 const cryptr = new Cryptr('BBLBTV-DNS-PASSWORDS');

+
 const sql = require('./mysql')

 function storeAccountToDB(accountDetails) {
  const encryptedPassword = cryptr.encrypt(accountDetails.password);
-  const result = sql.query(`INSERT userAccounts (username, password, stream, userID, expiaryDate) VALUES ("${accountDetails.username}", "${encryptedPassword}", "${accountDetails.stream}", ${accountDetails.userId}, 123)`);
+  const result = sql.query(`INSERT userAccounts (username, password, stream, userID, expiaryDate, streamURL, maxConnections) VALUES ("${accountDetails.username}", "${encryptedPassword}", "${accountDetails.streamName}", ${accountDetails.userId}, ${accountDetails.expiryDate}, "${accountDetails.streamURL}", ${accountDetails.maxConnections})`);
  return result
 }

--- a/lib/DNSArray.json
+++ b/lib/DNSArray.json
@ -1,5 +1,5 @@
 [
-    "http://webservgroup.xyz/smarters4567891/api/home.php?action=dns",
-    "http://panelhost.xyz/cli3nts/Funky/Smarters/api/home.php?action=dns",
-    "http://panelhost.xyz/cli3nts/smartersv3/funky/api/home.php?action=dns"
+    "http://apppanel.co.uk/panel/capo/smarters/api//home.php?action=dns",
+    "http://panelhost.xyz/cli3nts/Funky/Smarters/api/home.php?action=dns"
+
 ]
--- a/lib/DNSArray_old.json
+++ b/lib/DNSArray_old.json
@ -0,0 +1,5 @@
+[
+    "http://webservgroup.xyz/smarters4567891/api/home.php?action=dns",
+    "http://panelhost.xyz/cli3nts/Funky/Smarters/api/home.php?action=dns",
+    "http://panelhost.xyz/cli3nts/smartersv3/funky/api/home.php?action=dns"
+]
--- a/lib/apache_functions.js
+++ b/lib/apache_functions.js
@ -0,0 +1,150 @@
+const { configs } = require('apache-api');
+
+const { getStreamsNew } = require('../routes/getStreams')
+const { getURLandStreams } = require('./getStreamNames')
+const { allUserCheck } = require('./checker')
+
+apache_config = 'tv.k-world'
+
+const { exec } = require("child_process");
+
+function restart() {
+    exec("sudo service apache2 reload", (error, stdout, stderr) => {
+        if (error) {
+            console.log(`error: ${error.message}`);
+            return;
+        }
+        if (stderr) {
+            console.log(`stderr: ${stderr}`);
+            return;
+        }
+        console.log(`no issues`);
+    });
+
+}
+
+function makeid() {
+    var result = '';
+    var characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+    var charactersLength = characters.length;
+    for (var i = 0; i < 5; i++) {
+        result += characters.charAt(Math.floor(Math.random() *
+            charactersLength));
+    }
+    return result;
+}
+
+async function get_config() {
+    return await configs.readConfig(apache_config, true, true)
+}
+
+async function split_streams(siteList) {
+    const notUndefined = anyValue => typeof anyValue !== 'undefined'
+
+    final_array = siteList.map(function (item) {
+        if (item.content.includes('Redirect')) {
+            var cleanString = item.content.replace(/^(.*?)\//g, "");
+            cleanString = cleanString.split(' ')
+            cleanString[1] = cleanString[1].replace(/"/g, "")
+            return cleanString
+        }
+    }).filter(notUndefined)
+    return final_array
+}
+
+async function updateStream(updatedStreams) {
+    config = await get_config()
+    updatedStreams.forEach(async stream => {
+        config.children[0].children.map(async function (item) {
+            if (item.content.includes(stream[1])) {
+                return item.content = `Redirect 302 /${stream[0]} "${stream[2]}"`
+            }
+        })
+        try {
+            await configs.saveConfig(apache_config, config, true, true)
+            console.log(stream[0] + ' url updated')
+        } catch (error) {
+            console.log(stream[0] + ' url failed to update')
+            console.log(error)
+        }
+    })
+}
+
+
+
+async function updateStreamCheck(streamsFromKtvDB, streamsFromConfig) {
+    updatedStreams = []
+    streamsFromConfig.forEach(sfc => {
+        streamsFromKtvDB.forEach(sfktv => {
+            if (sfc[0] == sfktv.stream) {
+                sfc[0]
+                sfktv.stream
+                if (sfc[1] != sfktv.streamURL) {
+                    console.log(sfc[0] + ' url changed')
+                    updatedStreams.push([sfc[0], sfc[1], sfktv.streamURL])
+                } else {
+                    // console.log(sfc[0] + ' not updated')
+                }
+            }
+        });
+    });
+    return updatedStreams
+}
+
+
+async function checkExists(fullStreamList, mappedStreams) {
+    newstreams = mappedStreams.map(function (s) {
+        return s[1]
+    })
+    myArray = fullStreamList.filter(function (el) {
+        return newstreams.indexOf(el) < 0;
+    });
+    if (myArray.length == 0) {
+        console.log('No new streams')
+    } else {
+        console.log('New streams ' + myArray)
+    }
+    return myArray
+}
+
+
+async function addNewStreams(config, streamList) {
+    streamList.forEach(stream => {
+        config.children[0].children.push({ "tagName": '$rule', "content": `Redirect 302 /${makeid()} "${stream}"` })
+    })
+    try {
+        await configs.saveConfig(apache_config, config, true, true)
+    } catch (error) {
+        console.log(error)
+    }
+}
+
+async function syncApache() {
+    // console.log('Updating all user account from ktv')
+    // await allUserCheck()
+    // console.log('Update complete')
+    console.log('Comparing streams from ktv and apache')
+    streams = await getStreamsNew()
+    config = await get_config()
+    streamsFromConfig = await split_streams(config.children[0].children)
+
+    streamsFromKtvDB = await getURLandStreams()
+    updatedStreams = await updateStreamCheck(streamsFromKtvDB, streamsFromConfig)
+    await updateStream(updatedStreams)
+    console.log('Complete')
+    console.log('Adding any missing streams to apache')
+    streams = await getStreamsNew()
+    config = await get_config()
+    streamsFromConfig = await split_streams(config.children[0].children)
+    missingStreamsInApache = await checkExists(streams, streamsFromConfig)
+    resultOfAddStreams = await addNewStreams(config, missingStreamsInApache)
+    console.log('Complete')
+    console.log('Restarting Apache')
+    await restart()
+    console.log('Complete')
+}
+
+module.exports = {
+    syncApache
+}
+
--- a/lib/checker.js
+++ b/lib/checker.js
@ -1,23 +1,36 @@
-
-let streamArrays = require('./streamArray.json')
-
-let users = require('./logins.json')
-
 const { getStreamsNew } = require('../routes/getStreams')
-
-const { updateStreamData } = require('./updateStreams')
-
-const { gotRequest } = require('./gotRequest')
-
+const { updateStreamData, updateOtherURLs } = require('./updateStreams')
 const { decryptPassword } = require('./password')
+const { getUserAccountsCheck, getAllUniqueAccounts, getAllUserAccounts, getUserUniqueAccounts } = require('./getUser')
+const { storeAccountToDB } = require('../lib/Accounts')
+const { syncApache } = require('./apache_functions')

-const { getAllUserAccounts, getUserAccountsCheck } = require('./getUser')

-const { setExpired } = require('./setExpired')
+const axios = require('axios')
+const tor_axios = require('tor-axios');
+const tor = tor_axios.torSetup({
+    ip: process.env.TORSSRV,
+    port: 9050,
+    controlPort: 9051,
+    controlPassword: process.env.TORSPWD,
+})

-const { removeAccountFromDB } = require('../lib/Accounts')
+axios.defaults.timeout = 3000;
+tor.defaults.timeout = 3000

-const delay = ms => new Promise(res => setTimeout(res, ms));
+const inst = axios.create({
+    httpAgent: tor.httpAgent(),
+    httpsagent: tor.httpsAgent(),
+});
+
+let axiosOptions = {
+    headers: {
+        'User-Agent': 'IPTV Smarters Pro'
+    }
+}
+
+
+// const delay = ms => new Promise(res => setTimeout(res, ms));


 async function buildURL(streamURL, username, password) {
@ -25,316 +38,199 @@ async function buildURL(streamURL, username, password) {
    return url
 }

-async function singleCheck(username) {
-    let user = users.find(user => user.username === username)
-    for (let index = 0; index < streamArrays.length; index++) {
-        await delay(500);
-        const stream = streamArrays[index];
-        process.stdout.write('.')
-        // let url = stream.StreamURL + "/player_api.php?username=" + user.username + "&password=" + user.password
-        let url = await buildURL(stream.streamURL, user.username, user.password)
-        let t = await gotRequest(url)
-        let body = t.body
-        if (t.statusCode == 200 && body !== "") {
-            body = JSON.parse(body)
-            if (body.user_info.auth) {
-                var date = new Date(body.user_info.exp_date * 1000)
-                process.stdout.write('\n')
-                console.log('Match - ' + user.username + ' - ' + stream.StreamURL + ' - ' + stream.StreamName + ' - Expires - ' + date)
-                stream.username = user.username
-                stream.expiaryDate = date.toLocaleDateString('en-GB')
-                return (stream)
+async function splitURL(url) {
+    try {
+        let extractedURL = url.match(/[^/]*\/\/[^/]*/)[0]
+        let extractedUserPass = url.match(/\/player_api\.php\?username=([\s\S]*)$/)[1]
+        let UserPass = extractedUserPass.split('&password=')
+        return {
+            "extractedUrl": extractedURL,
+            "username": UserPass[0],
+            "password": UserPass[1]
        }
+    } catch {
+
    }
-    }
-    process.stdout.write('\nEnd Of Streams\n\n')
 }

-async function main() {
-    for (let index = 0; index < users.length; index++) {
-        const user = users[index];
-        console.log('Trying ' + user.username)
-        for (let index = 0; index < streamArrays.length; index++) {
-            await delay(500);
-            const stream = streamArrays[index];
-            process.stdout.write('.')
-            let url = await buildURL(stream.streamURL, user.username, user.password)
-            let t = await gotRequest(url)
-            let body = t.body
-            if (t.statusCode == 200 && body !== "") {
+async function updateAccounts(userAccounts, data, url) {
+    let urlData = await splitURL(url)
+
+    let account = userAccounts.filter(account => account.username == urlData.username && account.passwordDecryped == urlData.password)[0]
+
+    await updateStreamData({
+        "username": account.username,
+        "password": account.password,
+        "userId": account.userId
+    }, urlData.extractedUrl, data.user_info.exp_date)
+    console.log(`${urlData.extractedUrl}.`)
+
+    await updateOtherURLs(account.stream, urlData.extractedUrl)
+}
+
+
+async function addNewAccount(userAccount, data, url) {
    try {
-                    body = JSON.parse(body)
-                    if (body.user_info.auth) {
-                        // var date = new Date(body.user_info.exp_date * 1000).toLocaleDateString('en-GB')
-                        process.stdout.write('\n')
-                        console.log('Match - ' + user.username + ' - ' + stream.StreamURL + ' - ' + stream.StreamName + ' - Expires - ' + body.user_info.exp_date)
+        let URL = await splitURL(url)
+
+        await storeAccountToDB({
+            "username": userAccount.username,
+            "password": userAccount.password,
+            "userId": userAccount.userId,
+            "streamName": userAccount.stream,
+            "streamURL": URL.extractedUrl,
+            "expiryDate": data.user_info.exp_date,
+            "maxConnections": data.user_info.max_connections
+        }, URL.extractedUrl, data.user_info.exp_date)
+        var date = new Date(data.user_info.exp_date * 1000).toLocaleDateString(undefined, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' })
+        console.log(`${userAccount.username} -  ${URL.extractedUrl} - Expires ${date}.`)
+    } catch (error) {
+    }
+}
+
+
+async function urlChecker(userAccounts) {
+    let ip = await inst.get('http://api.ipify.org')
+    console.log(ip.data);
+
+    let updateCount = 0
+
+    for (let index = 0; index < userAccounts.length; index++) {
+        const userAccount = userAccounts[index];
+        let count = index + 1
+        console.log(count + ' of ' + userAccounts.length + ' ' + userAccount.username)
+        for (let index2 = 0; index2 < userAccount.urls.length; index2++) {
+            const url = userAccount.urls[index2];
+            // console.log('url ' + index2 + 1 + ' of ' + userAccount.urls.length)
+            // console.log('.')
+            try {
+                let response = await inst.get(url, axiosOptions)
+                if (response.data.user_info.auth) {
+                    await updateAccounts(userAccounts, response.data, url)
+                    updateCount++
                    break
                }
            } catch (error) {
+                try {
+                    if (error.response.status == 403) {
+                        let response2 = await axios.get(url, axiosOptions)
+                        if (response2.data.user_info.auth) {
+                            try {
+                                await updateAccounts(userAccounts, response2.data, url)
+                                updateCount++
+                                break
+                            } catch (error) {
+                                continue
                            }
                        }
                    }
-        process.stdout.write('\nEnd Of Streams\n\n')
+                } catch (error) {
+                    continue
+                }
+            }
+        }
+    }
+    syncApache()
+    return {
+        "updatedCount": updateCount,
+        "totalAccounts": userAccounts.length
    }
-    console.log('Finished')
 }

-async function newCheck() {
+async function userCheck(accountData) {
+    let start = Date.now()
+    console.log(start)
    streamURLS = await getStreamsNew()
-    let userAccounts = await getAllUserAccounts()
-    userAccounts = userAccounts.map(async user => {
+    let userAccounts = await getUserUniqueAccounts(accountData.userId)
+
+    userAccounts = userAccounts.map(user => {
+        user.userId = accountData.userId
        user.passwordDecryped = decryptPassword(user.password)
        return user
    })
-    for (let userAccount of userAccounts) {
-        if (userAccount.expiaryDate != 123 && Math.round(Date.now() / 1000) > userAccount.expiaryDate) {
-            setExpired(userAccount)
-        } else {
-            for (let streamURL of streamURLS) {
-                process.stdout.write('.')
-                let url = await buildURL(streamURL, userAccount.username, userAccount.passwordDecryped)
-                let t = await gotRequest(url)
-                let body = t.body
-                if (t.statusCode == 200 && body !== "") {
-                    try {
-                        body = JSON.parse(body)
-                        if (body.user_info.auth) {
-                            var date = new Date(body.user_info.exp_date * 1000).toLocaleDateString(undefined, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' })
-                            // process.stdout.write('\n')
-                            console.log(`${userAccount.username} - ${userAccount.stream} - ${streamURL} - Expires ${date}.`)
-                            await updateStreamData(userAccount, streamURL, body.user_info.exp_date)
-                            break
-                        }
-                    } catch (error) {
-                    }
+    urlList = []
+
+    for (let index = 0; index < userAccounts.length; index++) {
+        let userAccount = userAccounts[index];
+        userAccount.urls = []
+        for (let index = 0; index < streamURLS.length; index++) {
+            const streamURL = streamURLS[index];
+            userAccount.urls.push(await buildURL(streamURL, userAccount.username, userAccount.passwordDecryped))
+            urlList.push(await buildURL(streamURL, userAccount.username, userAccount.passwordDecryped))
        }
+        userAccount.urls = userAccount.urls.filter(function (e) { return !e.includes('stormtv') && !e.includes('megaott') })
+    }
+
+    values = await urlChecker(userAccounts)
+    if (values.updatedCount > 0) {
+        return {
+            "update": true,
+            "count": values.updatedCount
        }
    }
+    else {
+        return endresponse = false
    }
 }

-async function test(userAccount, streamURLS) {
-    streamURLS.forEach(async streamURL => {
-        process.stdout.write('.')
-        let url = await buildURL(streamURL, userAccount.username, userAccount.passwordDecryped)
-        // console.log('tested url ' + url)
-        let t = await gotRequest(url)
-        let body = t.body
-        if (t.statusCode == 200 && body !== "") {
+async function accountChecker(accountData, urlList) {
+    let ip = await inst.get('http://api.ipify.org')
+    console.log(ip.data);
+
+    for (let index = 0; index < urlList.length; index++) {
+        const url = urlList[index];
+        console.log(index + 1 + ' of ' + urlList.length + ' urls checked')
        try {
-                body = JSON.parse(body)
-                if (body.user_info.auth) {
-                    var date = new Date(body.user_info.exp_date * 1000).toLocaleDateString(undefined, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' })
-                    // process.stdout.write('\n')
-                    console.log(`${userAccount.username} - ${userAccount.stream} - ${streamURL} - Expires ${date}.`)
-                    await updateStreamData(userAccount, streamURL, body.user_info.exp_date)
+            let response = await inst.get(url, axiosOptions)
+            if (response.data.user_info.auth) {
+                addNewAccount(accountData, data, url)
+                console.log('New Account Added')
+                syncApache()
                return true
            }
        } catch (error) {
-                // break
+            try {
+                if (error.response.status == 403) {
+                    let response2 = await axios.get(url, axiosOptions)
+                    if (response2.data.user_info.auth) {
+                        try {
+                            await addNewAccount(accountData, response2.data, url)
+                            console.log('New Account Added')
+                            syncApache()
+                            return true
+                        } catch (error) {
+                            continue
+                        }
+                    }
+                }
+            } catch (error) {
+                continue
+            }
+        }
    }
-        } else {
    return false
-        }
-    })
 }

-async function updateAccountDNS(userAccount, streamURLS) {
-    // return new Promise(async (resolve, reject) => {
-    await Promise.all(streamURLS.map(async (streamURL) => {
-        process.stdout.write('.')
-        let url = await buildURL(streamURL, userAccount.username, userAccount.passwordDecryped)
-        // console.log('tested url ' + url)
-        let t = await gotRequest(url)
-        let body = t.body
-        if (t.statusCode == 200 && body !== "") {
-            try {
-                body = JSON.parse(body)
-                if (body.user_info.auth) {
-                    var date = new Date(body.user_info.exp_date * 1000).toLocaleDateString(undefined, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' })
-                    // process.stdout.write('\n')
-                    console.log(`${userAccount.username} - ${userAccount.stream} - ${streamURL} - Expires ${date}.`)
-                    await updateStreamData(userAccount, streamURL, body.user_info.exp_date)
-                    resolve(true)
-                }
-            } catch (error) {
-            }
-        } else {
-        }
-    }));
-}

-async function updateAccounts(userAccount, streamURLS) {
-    return new Promise(async (resolve, reject) => {
-        await streamURLS.forEach(async streamURL => {
-            process.stdout.write('.')
-            let url = await buildURL(streamURL, userAccount.username, userAccount.passwordDecryped)
-            console.log('tested url ' + url)
-            let t = await gotRequest(url)
-            let body = t.body
-            if (t.statusCode == 200 && body !== "") {
-                try {
-                    body = JSON.parse(body)
-                    if (body.user_info.auth) {
-                        var date = new Date(body.user_info.exp_date * 1000).toLocaleDateString(undefined, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' })
-                        // process.stdout.write('\n')
-                        console.log(`${userAccount.username} - ${userAccount.stream} - ${streamURL} - Expires ${date}.`)
-                        await updateStreamData(userAccount, streamURL, body.user_info.exp_date)
-                        resolve(true)
-                    }
-                } catch (error) {
-                }
-            } else {
-            }
-        })
-        reject(userAccount)
-    })
-}
-
-async function newUserCheck(accountData) {
-    console.log(Date.now())
+async function singleAccountCheck(accountData) {
    streamURLS = await getStreamsNew()
-    let userAccounts = await getUserAccountsCheck(accountData.userId)

-    userAccounts = userAccounts.map(user => {
-        user.userId = accountData.userId
-        user.passwordDecryped = decryptPassword(user.password)
-        return user
-    })
+    urlList = []

-    // try {
-    for (let i = 0; i < userAccounts.length; ++i) {
-        const userAccount = userAccounts[i];
-        if (userAccount.expiaryDate != 123 && Math.round(Date.now() / 1000) > userAccount.expiaryDate) {
-            setExpired(userAccount)
-        } else {
-            await updateAccountDNS(userAccount, streamURLS)
-            //    console.log(a)
+    for (let index = 0; index < streamURLS.length; index++) {
+        const streamURL = streamURLS[index];
+        urlList.push(await buildURL(streamURL, accountData.username, accountData.password))
    }
-    }
-    console.log(Date.now())
-    return true
-    // } catch (error) {
-    //     return true
-    //     console.error(error);
-    // }
+    urlList
+    return await accountChecker(accountData, urlList)
 }


-async function newSingleCheck(accountData) {
-    streamURLS = await getStreamsNew()
-    let userAccounts = await getUserAccountsCheck(accountData.userId)
-    userAccounts = userAccounts.map(user => {
-        user.userId = accountData.userId
-        user.passwordDecryped = decryptPassword(user.password)
-        return user
-    })
-    userAccounts = userAccounts.filter(obj => {
-        return obj.username === accountData.username && obj.passwordDecryped === accountData.password && obj.stream === accountData.stream
-    })

-    try {
-        for (let i = 0; i < userAccounts.length; ++i) {
-            const userAccount = userAccounts[i];
-            if (userAccount.expiaryDate != 123 && Math.round(Date.now() / 1000) > userAccount.expiaryDate) {
-                setExpired(userAccount)
-            } else {
-                await updateAccounts(userAccount, streamURLS)
-            }
-        }
-        console.log(Date.now())
-        return true
-    } catch (userAccount) {
-        console.log('notfoundincatch')
-        // console.error(error);
-        removeAccountFromDB({
-            "user": userAccount.username,
-            "stream": userAccount.stream,
-            "userId": accountData.userId
-        })
-    }
-    // console.log('not found')
-
-    // for (let userAccount of result) {
-    //     if (userAccount.expiaryDate != 123 && Math.round(Date.now() / 1000) > userAccount.expiaryDate) {
-    //         setExpired(userAccount)
-    //     } else {
-    //         for (let streamURL of streamURLS) {
-    //             process.stdout.write('.')
-    //             let url = await buildURL(streamURL, userAccount.username, userAccount.passwordDecryped)
-    //             console.log('trying ' + url)
-    //             let t = await gotRequest(url)
-    //             let body = t.body
-    //             if (t.statusCode == 200 && body !== "") {
-    //                 try {
-    //                     body = JSON.parse(body)
-    //                     if (body.user_info.auth) {
-    //                         var date = new Date(body.user_info.exp_date * 1000).toLocaleDateString(undefined, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' })
-    //                         // process.stdout.write('\n')
-    //                         console.log(`${userAccount.username} - ${userAccount.stream} - ${streamURL} - Expires ${date}.`)
-    //                         await updateStreamData(userAccount, streamURL, body.user_info.exp_date)
-    //                         return true
-    //                     }
-    //                 } catch (error) {
-    //                 }
-    //             }
-    //         }
-    //         removeAccountFromDB({
-    //             "user": userAccount.username,
-    //             "stream": userAccount.stream,
-    //             "userId": accountData.userId
-    //         })
-    //         return false
-    //     }
-    // }
-}
-
-
-// async function newSingleCheck(userData) {
-//     streamURLS = await getStreamsNew()
-//     for (let streamURL of streamURLS) {
-//         process.stdout.write('.')
-//         let url = await buildURL(streamURL, userData.username, userData.password)
-//         // console.log(url)
-//         let t = await gotRequest(url)
-//         let body = t.body
-//         if (t.statusCode == 200 && body !== "") {
-//             try {
-//                 body = JSON.parse(body)
-//                 if (body.user_info.auth) {
-//                     // var date = new Date(body.user_info.exp_date * 1000).toLocaleDateString('en-GB')
-//                     // process.stdout.write('\n')
-//                     await updateStreamData(userAccount, streamURL, body.user_info.exp_date)
-//                     console.log(`Match - ${username} - ${streamURL} - Expires - ${body.user_info.exp_date}`)
-//                     return (`Match - ${username} - ${streamURL} - Expires - ${body.user_info.exp_date}`)
-//                     // break
-//                 }
-//             } catch (error) {
-//             }
-//         }
-//     }
-// }
-// // }
-
-// newSingleCheck
-
-// main()
-// singleCheck('Karl2903')
-// newCheck()
-// newUserCheck({
-//     "username": 'Karl0ss1709',
-//     "password": 'YEfbZskEH2Zu',
-//     "stream": "Badger",
-//     "userId": 5
-// })
-
-
-// newUserCheck(1)

 module.exports = {
-    newCheck,
-    singleCheck,
-    main,
-    newSingleCheck,
-    newUserCheck
+    userCheck,
+    singleAccountCheck,
 }
+
+// singleAccountCheck({ "username": "Karl0ss01", "password": "YqQjYH9Nzw", "userId": 1, "stream": "Badger" })
--- a/lib/getStreamNames.js
+++ b/lib/getStreamNames.js
@ -10,7 +10,19 @@ function getStreamNames() {
    }
 }

-module.exports = {
-    getStreamNames
+
+function getURLandStreams() {
+    let data = sql.query(`SELECT DISTINCT stream, streamURL FROM BBLB_DNS.userAccounts`)
+    // console.log(data)
+    if (data.length == 0) {
+        return 'StreamsFailed'
+    } else {
+        return data
+    }
+}
+
+module.exports = {
+    getStreamNames,
+    getURLandStreams
 }

--- a/lib/getUser.js
+++ b/lib/getUser.js
@ -56,6 +56,30 @@ ORDER BY userAccounts.id DESC
  }
 }

+function getAllUniqueAccounts() {
+  let data = sql.query(`SELECT DISTINCT(userAccounts.stream), userAccounts.username, userAccounts.password, userAccounts.stream FROM userAccounts
+  WHERE userAccounts.expiaryDate != '0'
+  GROUP BY userAccounts.stream;`)
+  if (data.length == 0) {
+    return 'User Not Found'
+  } else {
+    return data
+  }
+}
+
+function getUserUniqueAccounts(userid) {
+  let data = sql.query(`SELECT DISTINCT(userAccounts.streamURL), userAccounts.username, userAccounts.password, userAccounts.stream , userAccounts.streamURL FROM userAccounts
+  WHERE userAccounts.expiaryDate != '0' AND
+  userAccounts.userId = ${userid}
+  GROUP BY userAccounts.stream  
+ORDER BY userAccounts.stream ASC;`)
+  if (data.length == 0) {
+    return 'User Not Found'
+  } else {
+    return data
+  }
+}
+
 function getUserId(user) {
  let data = sql.query(`SELECT id FROM users WHERE userName = '${user}'`)
  // console.log(data)
@ -71,6 +95,8 @@ module.exports = {
  getUserAccounts,
  getAllUserAccounts,
  getUserId,
-  getUserAccountsCheck
+  getUserAccountsCheck,
+  getUserUniqueAccounts,
+  getAllUniqueAccounts
 }

--- a/lib/logins.json
+++ b/lib/logins.json
@ -1,78 +0,0 @@
-[
-    {
-        "username": "Karl2903",
-        "password": "kcshkzex"
-    },
-    {
-        "username": "Karl2404",
-        "password": "pkrcbobqau"
-    },
-    {
-        "username": "Karl2804",
-        "password": "ckazebawsk"
-    },
-    {
-        "username": "Karl2904",
-        "password": "peyofdjtau"
-    },
-    {
-        "username": "Karl150520",
-        "password": "snqqfndtpn"
-    },
-    {
-        "username": "Karl1505",
-        "password": "upfjwtouwc"
-    },
-    {
-        "username": "Karl2802",
-        "password": "hgChnj8Fks"
-    },
-    {
-        "username": "Karl0704",
-        "password": "CJXENz4vxy"
-    },
-    {
-        "username": "Karl24",
-        "password": "3vpfS48hHF"
-    },
-    {
-        "username": "Karl2206",
-        "password": "913TpVzp3F"
-    },
-    {
-        "username": "Darren1706",
-        "password": "IqEoN5RjN5"
-    },
-    {
-        "username": "Dazg3012",
-        "password": "tXrD5tUvZB"
-    },
-    {
-        "username": "Martin1607",
-        "password": "7Fw698gY7b"
-    },
-    {
-        "username": "Martin2204",
-        "password": "jpruheknsf"
-    },
-    {
-        "username": "Darren1607",
-        "password": "x5WJtSygdA"
-    },
-    {
-        "username": "Karloss0403",
-        "password": "dcwbg21naT"
-    },
-    {
-        "username": "Karloss0403",
-        "password": "4V5t4M2DS3"
-    },
-    {
-        "username": "Karl0ss1703",
-        "password": "xSZYpDWHo7"
-    },
-    {
-        "username": "Karl0ss1703",
-        "password": "HTS4QUTV9V"
-    }
-]
--- a/lib/otherURLs.json
+++ b/lib/otherURLs.json
@ -1,7 +1,14 @@
-[
+{
+    "using": [
+     
+
+    ],
+    "notUsing": [
+        "https://blackpud475.xyz",
        "https://trippy.pro:443",
        "https://itty.in:443",
-    "https://tictacs.win",
        "http://sting.ltd:25461",
-    "http://37723998.to:2052"
-]
+        "http://37723998.to:2052",
+        "https://tictacs.win"
+    ]
+}
--- a/lib/streamArray.json
+++ b/lib/streamArray.json
@ -1 +0,0 @@
-[{"StreamName":"Insanity","StreamURL":"https://trippy.pro:443"},{"StreamName":"PremPlus","StreamURL":"https://itty.in:443"},{"StreamName":"GunSlinger","StreamURL":"http://gunslingertv.org:8080"},{"StreamName":"VIP","StreamURL":"http://shark.brokenwarrior.xyz:8080"},{"StreamName":"Technoid","StreamURL":"http://capoisagod2021.org:8080"},{"StreamName":"Old Premium","StreamURL":"https://caporeds.online:443"},{"StreamName":"??","StreamURL":"http://screamstreams.info:8080"},{"StreamName":"Gold","StreamURL":"http://bigbox.me.uk:2086"},{"StreamName":"??","StreamURL":"http://beautifilm.xyz:8080"},{"StreamName":"??","StreamURL":"http://mytv.digital:8080/"},{"StreamName":"??","StreamURL":"http://v2servers.tk:2052"},{"StreamName":"??","StreamURL":"http://ac.mustardsubs.tk:8880"},{"StreamName":"??","StreamURL":"http://ip365.cx:80"},{"StreamName":"??","StreamURL":"http://stream.streamhubtv.xyz:8080"},{"StreamName":"Gold","StreamURL":"http://foxmedia.bounceme.net:8282"},{"StreamName":"??","StreamURL":"http://gold.mypsx.net:8880"},{"StreamName":"??","StreamURL":"http://SERVER1.cheesywotsit.gq:8090"},{"StreamName":"Foden","StreamURL":"http://kibb.link:8080"},{"StreamName":"Shark","StreamURL":"http://pimptv.dnsabr.com:25461"},{"StreamName":"Keano","StreamURL":"http://tavaratv.xyz:2095"},{"StreamName":"??","StreamURL":"http://tanmedia.watch:8880"},{"StreamName":"Python","StreamURL":"http://streamknighttv.xyz:8080"},{"StreamName":"??","StreamURL":"http://covidsucks.xyz:8080"},{"StreamName":"??","StreamURL":"http://fckbrexit.link:8080"},{"StreamName":"??","StreamURL":"http://tv.realot.xyz:35001"},{"StreamName":"??","StreamURL":"http://iptv.satplex.co.uk:8080"},{"StreamName":"??","StreamURL":"http://sting.ltd:25461"},{"StreamName":"??","StreamURL":"http://gold.mypsx.net:8880"},{"StreamName":"??","StreamURL":"http://titanmedia.tech:8080"},{"StreamName":"??"},{"StreamName":"Gambler"},{"StreamName":"??"},{"StreamName":"??"},{"StreamName":"??"}]
--- a/lib/updateStreams.js
+++ b/lib/updateStreams.js
@ -10,7 +10,21 @@ async function updateStreamData(userAccount, streamURL, expiaryDate) {
    }
 }

-module.exports = {
-    updateStreamData
+async function updateOtherURLs(streamName, newUrl) {
+    // let result
+    try {
+        let result = sql.query(`update userAccounts
+        set userAccounts.streamURL = '${newUrl}'
+        WHERE userAccounts.stream ='${streamName}'`);
+        return result
+    } catch (error) {
+        console.log(error)
+    }
+}
+
+
+module.exports = {
+    updateStreamData,
+    updateOtherURLs
 }

--- a/package-lock.json
+++ b/package-lock.json
@ -89,19 +89,6 @@
        "negotiator": "0.6.2"
      }
    },
-    "acorn": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
-      "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc="
-    },
-    "acorn-globals": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
-      "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
-      "requires": {
-        "acorn": "^2.1.0"
-      }
-    },
    "agent-base": {
      "version": "6.0.2",
      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@ -131,26 +118,16 @@
        "uri-js": "^4.2.2"
      }
    },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
-    },
    "ansi-regex": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
    },
+    "apache-api": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/apache-api/-/apache-api-1.2.5.tgz",
+      "integrity": "sha512-kZFt2DkWUzpNmZKJCHuchk3jMDfb+gbd3bN1Bf8UMmTb5Gr38SmAERQjDLxq83MC3VVQV9YjVb7yOwjS0Pvd7w=="
+    },
    "aproba": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
@ -188,11 +165,6 @@
      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
    },
-    "async": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
-      "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="
-    },
    "asynckit": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@ -208,6 +180,22 @@
      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
    },
+    "axios": {
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "requires": {
+        "follow-redirects": "^1.14.0"
+      }
+    },
+    "axios-cookiejar-support": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/axios-cookiejar-support/-/axios-cookiejar-support-2.0.0.tgz",
+      "integrity": "sha512-z3q8j0h051jkLtNRohfAXBTtFEMxWDTTADy8sb4cRl2g0Zmk1/613ioorV132FiSSIHjj3XQnG66ow77qHCrDg==",
+      "requires": {
+        "http-cookie-agent": "^1.0.0"
+      }
+    },
    "babel-runtime": {
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@ -337,71 +325,16 @@
        "responselike": "^2.0.0"
      }
    },
-    "camelcase": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
-    },
    "caseless": {
      "version": "0.12.0",
      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
    },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
-      }
-    },
-    "character-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz",
-      "integrity": "sha1-wN3kqxgnE7kZuXCVmhI+zBow/NY="
-    },
    "chownr": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
    },
-    "clean-css": {
-      "version": "3.4.28",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
-      "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
-      "requires": {
-        "commander": "2.8.x",
-        "source-map": "0.4.x"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.8.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
-          "requires": {
-            "graceful-readlink": ">= 1.0.0"
-          }
-        }
-      }
-    },
-    "cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-      "requires": {
-        "center-align": "^0.1.1",
-        "right-align": "^0.1.1",
-        "wordwrap": "0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
-        }
-      }
-    },
    "clone-response": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
@ -423,11 +356,6 @@
        "delayed-stream": "~1.0.0"
      }
    },
-    "commander": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
-      "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0="
-    },
    "concat-map": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@ -449,14 +377,6 @@
      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
    },
-    "constantinople": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz",
-      "integrity": "sha1-S5RdmTeQe82Y7ldRIsOBdRZUQUE=",
-      "requires": {
-        "acorn": "^2.1.0"
-      }
-    },
    "content-disposition": {
      "version": "0.5.2",
      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
@ -468,18 +388,9 @@
      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
    },
    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-    },
-    "cookie-parser": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.5.tgz",
-      "integrity": "sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw==",
-      "requires": {
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6"
-      }
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
    },
    "cookie-signature": {
      "version": "1.0.6",
@ -491,39 +402,11 @@
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
    },
-    "cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "requires": {
-        "object-assign": "^4",
-        "vary": "^1"
-      }
-    },
    "cryptr": {
      "version": "6.0.2",
      "resolved": "https://registry.npmjs.org/cryptr/-/cryptr-6.0.2.tgz",
      "integrity": "sha512-1TRHI4bmuLIB8WgkH9eeYXzhEg1T4tonO4vVaMBKKde8Dre51J68nAgTVXTwMYXAf7+mV2gBCkm/9wksjSb2sA=="
    },
-    "css": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/css/-/css-1.0.8.tgz",
-      "integrity": "sha1-k4aBHKgrzMnuf7WnMrHioxfIo+c=",
-      "requires": {
-        "css-parse": "1.0.4",
-        "css-stringify": "1.0.5"
-      }
-    },
-    "css-parse": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz",
-      "integrity": "sha1-OLBQP7+dqfVOnB29pg4UXHcRe90="
-    },
-    "css-stringify": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz",
-      "integrity": "sha1-sNBClG2ylTu50pKQCmy19tASIDE="
-    },
    "dashdash": {
      "version": "1.14.1",
      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@ -547,11 +430,6 @@
        }
      }
    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-    },
    "decompress-response": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
@ -567,6 +445,15 @@
        }
      }
    },
+    "deepdash": {
+      "version": "5.3.9",
+      "resolved": "https://registry.npmjs.org/deepdash/-/deepdash-5.3.9.tgz",
+      "integrity": "sha512-GRzJ0q9PDj2T+J2fX+b+TlUa2NlZ11l6vJ8LHNKVGeZ8CfxCuJaCychTq07iDRTvlfO8435jlvVS1QXBrW9kMg==",
+      "requires": {
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21"
+      }
+    },
    "defer-to-connect": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
@ -597,6 +484,11 @@
      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
    },
+    "dotenv": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="
+    },
    "ecc-jsbn": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@ -624,6 +516,19 @@
        "once": "^1.4.0"
      }
    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "requires": {
+        "es6-promise": "^4.0.3"
+      }
+    },
    "escape-html": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@ -720,6 +625,11 @@
        "unpipe": "~1.0.0"
      }
    },
+    "follow-redirects": {
+      "version": "1.14.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
+      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="
+    },
    "forever-agent": {
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@ -825,11 +735,6 @@
        "responselike": "^2.0.0"
      }
    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
-    },
    "har-schema": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@ -854,6 +759,15 @@
      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
    },
+    "http-cookie-agent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/http-cookie-agent/-/http-cookie-agent-1.0.1.tgz",
+      "integrity": "sha512-gde0TzbcynnVRYG38YKBOzJTIZat97FLBJCETHVhwBDe9A5WJS5iKwnHqj3Z+EerRwdADd05ukAT4JBt7XV4BA==",
+      "requires": {
+        "agent-base": "^6.0.2",
+        "cookie": "^0.4.1"
+      }
+    },
    "http-errors": {
      "version": "1.6.3",
      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@ -933,15 +847,20 @@
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+    },
    "ipaddr.js": {
      "version": "1.9.1",
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
    },
    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
    },
    "is-fullwidth-code-point": {
      "version": "1.0.0",
@ -951,11 +870,6 @@
        "number-is-nan": "^1.0.0"
      }
    },
-    "is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
-    },
    "is-typedarray": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@ -971,33 +885,6 @@
      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
    },
-    "jade": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz",
-      "integrity": "sha1-nIDlOMEtP7lcjZu5VZ+gzAQEBf0=",
-      "requires": {
-        "character-parser": "1.2.1",
-        "clean-css": "^3.1.9",
-        "commander": "~2.6.0",
-        "constantinople": "~3.0.1",
-        "jstransformer": "0.0.2",
-        "mkdirp": "~0.5.0",
-        "transformers": "2.1.0",
-        "uglify-js": "^2.4.19",
-        "void-elements": "~2.0.1",
-        "with": "~4.0.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
-      }
-    },
    "jsbn": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
@ -1034,25 +921,6 @@
        "verror": "1.10.0"
      }
    },
-    "jstransformer": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz",
-      "integrity": "sha1-eq4pqQPRls+glz2IXT5HlH7Ndqs=",
-      "requires": {
-        "is-promise": "^2.0.0",
-        "promise": "^6.0.1"
-      },
-      "dependencies": {
-        "promise": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz",
-          "integrity": "sha1-LOcp9rlLRcJoka0GAsXJDgTG7vY=",
-          "requires": {
-            "asap": "~1.0.0"
-          }
-        }
-      }
-    },
    "keyv": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
@ -1061,23 +929,20 @@
        "json-buffer": "3.0.1"
      }
    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "requires": {
-        "is-buffer": "^1.1.5"
-      }
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
    },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
    },
    "lowercase-keys": {
      "version": "2.0.0",
@ -1138,11 +1003,6 @@
        "brace-expansion": "^1.1.7"
      }
    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
    "minipass": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
@ -1165,18 +1025,6 @@
      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
    },
-    "morgan": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz",
-      "integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==",
-      "requires": {
-        "basic-auth": "~2.0.0",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "on-headers": "~1.0.1"
-      }
-    },
    "ms": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@ -1242,6 +1090,14 @@
      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
    },
+    "obj-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/obj-traverse/-/obj-traverse-1.0.0.tgz",
+      "integrity": "sha1-WP7H4jWWHjtpIsWc/Fu4RkgHIUY=",
+      "requires": {
+        "lodash.isequal": "^4.5.0"
+      }
+    },
    "object-assign": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@ -1255,11 +1111,6 @@
        "ee-first": "1.1.1"
      }
    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-    },
    "once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@ -1268,14 +1119,6 @@
        "wrappy": "1"
      }
    },
-    "optimist": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-      "requires": {
-        "wordwrap": "~0.0.2"
-      }
-    },
    "p-cancelable": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz",
@ -1389,11 +1232,6 @@
        "util-deprecate": "~1.0.1"
      }
    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
-    },
    "request": {
      "version": "2.88.2",
      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
@ -1419,6 +1257,17 @@
        "tough-cookie": "~2.5.0",
        "tunnel-agent": "^0.6.0",
        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        }
      }
    },
    "resolve-alpn": {
@ -1434,14 +1283,6 @@
        "lowercase-keys": "^2.0.0"
      }
    },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "requires": {
-        "align-text": "^0.1.1"
-      }
-    },
    "rimraf": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@ -1521,12 +1362,37 @@
      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
    },
-    "source-map": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
+    },
+    "socks": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
+      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
      "requires": {
-        "amdefine": ">=0.0.4"
+        "ip": "1.1.5",
+        "smart-buffer": "^4.1.0"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
+      "requires": {
+        "agent-base": "~4.2.1",
+        "socks": "~2.3.2"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+          "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+          "requires": {
+            "es6-promisify": "^5.0.0"
+          }
+        }
      }
    },
    "sqlstring": {
@ -1623,55 +1489,55 @@
        "promise": "^7.1.1"
      }
    },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+    "tor-axios": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/tor-axios/-/tor-axios-1.0.9.tgz",
+      "integrity": "sha512-JFBkpV7essVA7sB2Xwm5MhfJ5CwA4dLZSyOaQTl14hl9K+Q0wHWEOqtFoME2qPRmYIbIHJIIxZTPVQjB3aV8gw==",
      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
-    "transformers": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz",
-      "integrity": "sha1-XSPLNVYd2F3Gf7hIIwm0fVPM6ac=",
-      "requires": {
-        "css": "~1.0.8",
-        "promise": "~2.0",
-        "uglify-js": "~2.2.5"
+        "axios": "^0.18.1",
+        "socks-proxy-agent": "^4.0.2"
      },
      "dependencies": {
-        "is-promise": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz",
-          "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU="
+        "axios": {
+          "version": "0.18.1",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz",
+          "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
+          "requires": {
+            "follow-redirects": "1.5.10",
+            "is-buffer": "^2.0.2"
+          }
        },
-        "promise": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.5.10",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+          "requires": {
+            "debug": "=3.1.0"
+          }
+        },
+        "ms": {
          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz",
-          "integrity": "sha1-RmSKqdYFr10ucMMCS/WUNtoCuA4=",
-          "requires": {
-            "is-promise": "~1"
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
      }
    },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+    "tough-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
      "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "uglify-js": {
-          "version": "2.2.5",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
-          "integrity": "sha1-puAqcNg5eSuXgEiLe4sYTAlcmcc=",
-          "requires": {
-            "optimist": "~0.3.5",
-            "source-map": "~0.1.7"
-          }
-        }
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
      }
    },
    "tunnel-agent": {
@ -1701,28 +1567,10 @@
      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
    },
-    "uglify-js": {
-      "version": "2.8.29",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-      "requires": {
-        "source-map": "~0.5.1",
-        "uglify-to-browserify": "~1.0.0",
-        "yargs": "~3.10.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        }
-      }
-    },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "optional": true
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
    },
    "unpipe": {
      "version": "1.0.0",
@ -1767,11 +1615,6 @@
        "extsprintf": "^1.2.0"
      }
    },
-    "void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
-    },
    "wide-align": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@ -1780,32 +1623,6 @@
        "string-width": "^1.0.2 || 2"
      }
    },
-    "window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
-    },
-    "with": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/with/-/with-4.0.3.tgz",
-      "integrity": "sha1-7v0VTp550sjTQXtkeo8U2f7M4U4=",
-      "requires": {
-        "acorn": "^1.0.1",
-        "acorn-globals": "^1.0.3"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz",
-          "integrity": "sha1-yM4n3grMdtiW0rH6099YjZ6C8BQ="
-        }
-      }
-    },
-    "wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-    },
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@ -1816,16 +1633,9 @@
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
    },
-    "yargs": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-      "requires": {
-        "camelcase": "^1.0.2",
-        "cliui": "^2.1.0",
-        "decamelize": "^1.0.0",
-        "window-size": "0.1.0"
-      }
+    "yourls": {
+      "version": "git+https://github.com/karl0ss/node-yourls.git#596e6810d34aaf82755ea46af28a61004e0ab0c0",
+      "from": "git+https://github.com/karl0ss/node-yourls.git"
    }
  }
 }
--- a/package.json
+++ b/package.json
@ -6,18 +6,23 @@
    "start": "node ./bin/www"
  },
  "dependencies": {
-    "async": "^3.2.1",
+    "apache-api": "^1.2.5",
+    "axios": "^0.21.4",
+    "axios-cookiejar-support": "^2.0.0",
    "bcrypt": "^5.0.0",
-    "cookie-parser": "^1.4.5",
-    "cors": "^2.8.5",
    "cryptr": "^6.0.2",
+    "deepdash": "^5.3.9",
+    "dotenv": "^10.0.0",
    "express": "~4.16.1",
    "express-basic-auth": "^1.2.0",
    "got": "^11.8.1",
    "http-errors": "~1.6.3",
-    "jade": "^1.11.0",
-    "morgan": "~1.9.1",
+    "lodash": "^4.17.21",
+    "obj-traverse": "^1.0.0",
    "request": "^2.88.2",
-    "sync-mysql": "^3.0.1"
+    "sync-mysql": "^3.0.1",
+    "tor-axios": "^1.0.9",
+    "tough-cookie": "^4.0.0",
+    "yourls": "git+https://github.com/karl0ss/node-yourls.git"
  }
 }
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@ -1,8 +0,0 @@
-body {
-  padding: 50px;
-  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
-}
-
-a {
-  color: #00B7FF;
-}
--- a/routes/addAccount.js
+++ b/routes/addAccount.js
@ -1,9 +1,8 @@
 var express = require('express');
 var router = express.Router();

-const { storeAccountToDB } = require('../lib/Accounts')
 const { getUserId } = require('../lib/getUser')
-const { newSingleCheck } = require('../lib/checker')
+const { singleAccountCheck } = require('../lib/checker')



@ -17,19 +16,13 @@ router.post('/', async function (req, res, next) {
    postData.username = postData.username.replace("O", "0")
  }
  postData.userId = getUserId(req.auth.user)
-  let userName = req.auth.user
-  let result = await storeAccountToDB(postData)
-  console.log(result)
-  if (result.affectedRows < 1) {
-    res.send('Adding account failed')
-  } else {
-    a = await newSingleCheck(postData)
+  a = await singleAccountCheck(postData)
  if (a) {
-      res.send('Account ' + postData.username + ' Added successfully to ' + userName)
+    res.send('Account ' + postData.username + ' Added successfully to ' + req.auth.user)
  } else {
-      res.send(500);
-    }
+    res.sendStatus(500);
  }
+  // }
 });

 module.exports = router;
--- a/routes/deleteAccount.js
+++ b/routes/deleteAccount.js
@ -1,7 +1,7 @@
 var express = require('express');
 var router = express.Router();

-const { removeAccountFromDB} = require('../lib/Accounts')
+const { removeAccountFromDB } = require('../lib/Accounts')
 const { getUserId } = require('../lib/getUser')


@ -13,7 +13,7 @@ router.post('/', async function (req, res, next) {
  let result = await removeAccountFromDB(postData)
  console.log(result)
  if (result.affectedRows < 1) {
-    res.send('Adding account failed')
+    res.sendStatus(500)
  } else {
    res.send('Account ' + postData.username + ' Deleted from ' + userName)
  }
--- a/routes/getStreams.js
+++ b/routes/getStreams.js
@ -3,51 +3,16 @@ var router = express.Router();
 const fs = require('fs');

 let DNSArray = require('../lib/DNSArray.json')
-let streamArrays = require('../lib/streamArray.json')
 const otherURLs = require('../lib/otherURLs.json')

 const { gotRequest } = require('../lib/gotRequest')

-function writeFile(streamArrays) {
-  fs.writeFileSync(__dirname + '/../lib/streamArray.json', JSON.stringify(streamArrays), function (err) {
-    if (err) return console.log(err);
-  });
-}

 function splitToArray(DNS) {
  DNS = DNS.split(',')
  return DNS
 }

-function mapToStream(DNSList) {
-  console.log('---Updated URLS---')
-  DNSList.unshift(...otherDNS)
-  for (let index = 0; index < streamArrays.length; index++) {
-    let element = streamArrays[index];
-    element.StreamURL = DNSList[index]
-    console.log(element.StreamName + ' ' + element.StreamURL)
-  }
-  writeFile(streamArrays)
-  console.log('---Updated URLS---')
-  return streamArrays
-}
-
-async function getStreams() {
-  let requestData
-  let jointArray = []
-  for (let index = 0; index < DNSArray.length; index++) {
-    const url = DNSArray[index];
-    requestData = await gotRequest(url)
-    let DNSList = JSON.parse(requestData.body)
-    DNSList = splitToArray(DNSList.su)
-    DNSList.forEach(url => {
-      jointArray.push(url)
-    });
-  }
-  await mapToStream(jointArray)
-  return streamArrays
-}
-
 async function getStreamsNew() {
  let requestData
  let jointArray = []
@ -59,7 +24,8 @@ async function getStreamsNew() {
      try {
        DNSList = JSON.parse(DNSList)
      } catch (error) {
-        jointArray.unshift(...otherURLs)
+        jointArray.unshift(...otherURLs.using)
+        jointArray = [...new Set(jointArray)]
        return jointArray
      }
    }
@ -68,8 +34,8 @@ async function getStreamsNew() {
      jointArray.push(url)
    });
  }
-  jointArray.unshift(...otherURLs)
-
+  jointArray.unshift(...otherURLs.using)
+  jointArray = [...new Set(jointArray)]
  return jointArray
 }
 /* GET users listing. */
@ -79,5 +45,5 @@ router.get('/', async function (req, res, next) {
 });

 module.exports = {
-  router, getStreams, getStreamsNew
+  router, getStreamsNew
 }
--- a/routes/getUserAccounts.js
+++ b/routes/getUserAccounts.js
@ -2,6 +2,7 @@ var express = require('express');
 var router = express.Router();

 const { getUserAccounts, getUserId } = require('../lib/getUser')
+const { getStreamsNew } = require('../routes/getStreams')
 const { decryptPassword } = require('../lib/password')

 /* POST postUser page. */
@ -16,4 +17,23 @@ router.get('/', async function (req, res, next) {
    res.send(data)
 });

+router.get('/count', async function (req, res, next) {
+    try {
+        let data = await getUserAccounts(await getUserId(req.auth.user))
+        res.json({ "streamCount": data.length })
+    } catch (error) {
+        res.sendStatus(500)
+    }
+});
+
+router.get('/streams', async function (req, res, next) {
+    try {
+        let data = await getStreamsNew()
+        res.json(data)
+    } catch (error) {
+        res.sendStatus(500)
+    }
+});
+
+
 module.exports = router;
--- a/routes/singleCheck.js
+++ b/routes/singleCheck.js
@ -1,22 +1,21 @@
 var express = require('express');
 var router = express.Router();

-const { storeAccountToDB } = require('../lib/Accounts')
 const { getUserId } = require('../lib/getUser')
-const { newUserCheck } = require('../lib/checker')
+const { userCheck } = require('../lib/checker')

 /* POST postUser page. */
 router.get('/', async function (req, res, next) {
  let postData = req.body
  postData.userId = getUserId(req.auth.user)
  // postData.userId = 5
-    a = await newUserCheck(postData)
-    if (a) {
-      res.send(200)
+  let response = await userCheck(postData)
+  console.log(Date.now())
+  if (response.update) {
+    res.json({ "updatedAccounts": response.count })
  } else {
-      res.send(500);
+    res.sendStatus(500);
  }
-//   }
 });

 module.exports = router;
--- a/streamArray.json
+++ b/streamArray.json
@ -1,138 +0,0 @@
-[
-    {
-        "StreamName": "Insanity",
-        "StreamURL": "https://trippy.pro:443"
-    },
-    {
-        "StreamName": "PremPlus",
-        "StreamURL": "https://itty.in:443"
-    },
-    {
-        "StreamName": "GunSlinger",
-        "StreamURL": "http://gunslingertv.org:8080"
-    },
-    {
-        "StreamName": "VIP",
-        "StreamURL": "http://oven-cleaner.com:8080/"
-    },
-    {
-        "StreamName": "Technoid",
-        "StreamURL": "http://capoisagod2021.org:8080"
-    },
-    {
-        "StreamName": "Old Premium",
-        "StreamURL": "https://caporeds.online:443"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://screamstreams.info:8080"
-    },
-    {
-        "StreamName": "Gold",
-        "StreamURL": "http://catenamode.cf:8090"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://sulu.xyz:2086"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://bigbox.me.uk:2086"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://beautifilm.xyz:8080"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "https://hulks.xyz:443"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://mytv.digital:8080/"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://theonlinemedia.network:2052"
-    },
-    {
-        "StreamName": "Gold",
-        "StreamURL": "http://server1.jforbes.club:8090"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://ths.viewdns.net:8080"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://toastthehost.live:8080"
-    },
-    {
-        "StreamName": "Foden",
-        "StreamURL": "http://ac.mustardsubs.tk:8880"
-    },
-    {
-        "StreamName": "Shark",
-        "StreamURL": "http://faithhosting.xyz:25461"
-    },
-    {
-        "StreamName": "Keano",
-        "StreamURL": "http://ip365.cx:80"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://stream.streamhubtv.xyz:8080"
-    },
-    {
-        "StreamName": "Python",
-        "StreamURL": "http://foxmedia.bounceme.net:8282"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://g132.caporeds.online:8080/"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://theonlinemedia.network:2052"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://beautifilm.xyz:8080"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://pimptv.dnsabr.com:8080"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://tavaratv.xyz:2095"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://cms-tan.media:8880"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://streamknighttv.xyz:8080"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://covidsucks.xyz:8080"
-    },
-    {
-        "StreamName": "Gambler",
-        "StreamURL": "http://fckbrexit.link:8080"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://tv.realot.xyz:35001"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://www.tvxclnt.com:8080"
-    },
-    {
-        "StreamName": "??",
-        "StreamURL": "http://iptv.satplex.co.uk:8080"
-    }
-]
--- a/test.js
+++ b/test.js
@ -0,0 +1,21 @@
+const tor_axios = require('tor-axios');
+const tor = tor_axios.torSetup({
+    ip: 'localhost',
+    port: 9050,
+    controlPort: '9051',
+    controlPassword: 'KarlMax',
+})
+
+async function main() {
+    let response = await tor.get('http://api.ipify.org');
+    let ip = response.data;
+    console.log(await tor.get('http://api.ipify.org'));
+
+    await tor.torNewSession(); //change tor ip
+
+    response = await tor.get('http://api.ipify.org');
+    ip = response.data;
+    console.log(ip);
+}
+
+main()
--- a/views/error.jade
+++ b/views/error.jade
@ -1,6 +0,0 @@
-extends layout
-
-block content
-  h1= message
-  h2= error.status
-  pre #{error.stack}
--- a/views/index.jade
+++ b/views/index.jade
@ -1,5 +0,0 @@
-extends layout
-
-block content
-  h1= title
-  p Welcome to #{title}
--- a/views/layout.jade
+++ b/views/layout.jade
@ -1,7 +0,0 @@
-doctype html
-html
-  head
-    title= title
-    link(rel='stylesheet', href='/stylesheets/style.css')
-  body
-    block content
Author	SHA1	Message	Date
Karl	1e6391db2f	Merge branch 'removeUI' of Karl/BBLBTV_DNS into master	2021-11-19 09:46:35 -06:00
Karl	e8a5a1b17e	working latest bits	2021-11-19 15:45:10 +00:00
Karl	bbe88b1d94	dotenv	2021-11-19 14:44:08 +00:00
Karl	185b357010	new working	2021-11-19 14:25:42 +00:00
Karl	e97e8d4462	working but slow new way	2021-11-19 13:12:48 +00:00
Karl	7e4bb69b48	working	2021-11-19 11:52:28 +00:00
Karl	cded4b8c55	working with restart	2021-11-17 10:11:54 +00:00
Karl	cf88b5f3e5	latest update	2021-11-16 17:37:04 +00:00
Karl	a315c3e6b7	working apache logic	2021-11-16 17:36:39 +00:00
Karl	bc63d15636	updates	2021-09-24 11:34:49 +00:00
Karl	334ccf268e	latest	2021-09-23 17:25:44 +00:00
Karl	d2b90240da	working	2021-09-23 15:40:15 +00:00
Karl	b024cacfe8	working with tor	2021-09-23 15:26:24 +00:00
Karl	bd5e0fd4f8	working	2021-09-23 13:54:01 +00:00
Karl	d4a025fadd	update	2021-09-21 15:59:29 +00:00
Karl	340fccdf46	update	2021-09-21 13:37:32 +00:00
Karl	1863addb17	working	2021-09-21 13:26:03 +00:00
Karl	6e235425f9	latest	2021-09-20 19:30:47 +00:00
Karl	51e9d71d72	as it stands "working"	2021-09-20 16:30:41 +00:00
Karl	ee6696dbf8	trytocleanRemoveUI	2021-09-20 16:19:16 +00:00
Karl	49b2fb30f8	Merge branch 'react2' of Karl/BBLBTV_DNS into master	2021-02-27 05:00:55 -06:00
				`@ -1 +0,0 @@`
				[{"StreamName":"Insanity","StreamURL":"https://trippy.pro:443"},{"StreamName":"PremPlus","StreamURL":"https://itty.in:443"},{"StreamName":"GunSlinger","StreamURL":"http://gunslingertv.org:8080"},{"StreamName":"VIP","StreamURL":"http://shark.brokenwarrior.xyz:8080"},{"StreamName":"Technoid","StreamURL":"http://capoisagod2021.org:8080"},{"StreamName":"Old Premium","StreamURL":"https://caporeds.online:443"},{"StreamName":"??","StreamURL":"http://screamstreams.info:8080"},{"StreamName":"Gold","StreamURL":"http://bigbox.me.uk:2086"},{"StreamName":"??","StreamURL":"http://beautifilm.xyz:8080"},{"StreamName":"??","StreamURL":"http://mytv.digital:8080/"},{"StreamName":"??","StreamURL":"http://v2servers.tk:2052"},{"StreamName":"??","StreamURL":"http://ac.mustardsubs.tk:8880"},{"StreamName":"??","StreamURL":"http://ip365.cx:80"},{"StreamName":"??","StreamURL":"http://stream.streamhubtv.xyz:8080"},{"StreamName":"Gold","StreamURL":"http://foxmedia.bounceme.net:8282"},{"StreamName":"??","StreamURL":"http://gold.mypsx.net:8880"},{"StreamName":"??","StreamURL":"http://SERVER1.cheesywotsit.gq:8090"},{"StreamName":"Foden","StreamURL":"http://kibb.link:8080"},{"StreamName":"Shark","StreamURL":"http://pimptv.dnsabr.com:25461"},{"StreamName":"Keano","StreamURL":"http://tavaratv.xyz:2095"},{"StreamName":"??","StreamURL":"http://tanmedia.watch:8880"},{"StreamName":"Python","StreamURL":"http://streamknighttv.xyz:8080"},{"StreamName":"??","StreamURL":"http://covidsucks.xyz:8080"},{"StreamName":"??","StreamURL":"http://fckbrexit.link:8080"},{"StreamName":"??","StreamURL":"http://tv.realot.xyz:35001"},{"StreamName":"??","StreamURL":"http://iptv.satplex.co.uk:8080"},{"StreamName":"??","StreamURL":"http://sting.ltd:25461"},{"StreamName":"??","StreamURL":"http://gold.mypsx.net:8880"},{"StreamName":"??","StreamURL":"http://titanmedia.tech:8080"},{"StreamName":"??"},{"StreamName":"Gambler"},{"StreamName":"??"},{"StreamName":"??"},{"StreamName":"??"}]