From 8c5fba8788ac2c54f1d69aaaa1b47db46df26e97 Mon Sep 17 00:00:00 2001
From: Karli Udso <projects@supa.ee>
Date: Sun, 24 May 2020 21:10:29 +0300
Subject: [PATCH] removed api part since not needed anymore

---
 src/api/Api.js             | 36 ------------------------------------
 src/components/Scraper.js  |  8 +-------
 src/index.js               |  6 +-----
 src/{api => util}/Cache.js |  2 +-
 src/util/Constants.js      | 24 ++++--------------------
 src/util/Formatter.js      |  3 ---
 6 files changed, 7 insertions(+), 72 deletions(-)
 delete mode 100644 src/api/Api.js
 rename src/{api => util}/Cache.js (93%)
 delete mode 100644 src/util/Formatter.js

diff --git a/src/api/Api.js b/src/api/Api.js
deleted file mode 100644
index ad3766e..0000000
--- a/src/api/Api.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import fetch from 'node-fetch';
-import { BASE_URL, BASE_HEADERS, BASE_PARAMS } from '../util/Constants';
-
-const cookie = {
-  JSESSIONID: "ffu-WeUdcd3ICqoCimutvnpdERv3XONZ-VMxwg4-.eteenindusw-n1",
-  mntClientId: "15QY8LHHIST1C",
-  ROUTEID: ".et1",
-  plumbr_user_tracker: "a71e97ae-1d54-5fce-a758-cbf37e01c093",
-  plumbr_session_tracker_bkae1x: "004aec88-b58e-036b-2c05-ee309bfaa88b|1590327356024"
-};
-
-const formatCookie = 'JSESSIONID=OWbYYl4zGt6GOBW8nHFf9jX836540u0Bi-y5T6hf.eteenindusw-n1; mntClientId=15QY8LHHIST1C; ROUTEID=.et1; eteenindus_lang=en';
-
-class Api {
-  constructor() {}
-  
-  /**
-   * @param {string} plate @TODO implement usage
-   */
-  async fetch(plate = "") {
-    try {
-      console.log(`Fetching data for ${plate}`);
-      return (await fetch(BASE_URL, {
-        "headers": {
-          ...BASE_HEADERS,
-          "Cookie": formatCookie
-        },
-        ...BASE_PARAMS,
-      })).text();
-    } catch (e) {
-      throw Error(`Failed to fetch data, reason: ${e.message}`);
-    }
-  }
-}
-
-export default Api;
diff --git a/src/components/Scraper.js b/src/components/Scraper.js
index 59d977a..f2c6bd0 100644
--- a/src/components/Scraper.js
+++ b/src/components/Scraper.js
@@ -1,17 +1,11 @@
-import jsdom from "jsdom";
+import { JSDOM } from "jsdom";
 import Car from "../model/Car";
 import Selectors from '../util/Selectors';
 
-const {
-  JSDOM
-} = jsdom;
-
 class Scraper {
   document;
   car;
 
-  constructor() {}
-
   setContent(text) {
     const parsedContent = new JSDOM(text).window.document;
     if (parsedContent.querySelector(Selectors.properties.main.container) === null) {
diff --git a/src/index.js b/src/index.js
index 59ed0fe..bb1bbef 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,18 +1,14 @@
-import { BASE_URL, BASE_HEADERS, BASE_PARAMS } from './util/Constants';
 import Car from './model/Car';
-import Api from './api/Api';
-import Cache from './api/Cache';
+import Cache from './util/Cache';
 import Scraper from './components/Scraper';
 import CookieMonster from './cookies/CookieMonster';
 
 class Hack {
-  api;
   scraper;
   cache;
   cookieMonster;
 
   constructor() {
-    this.api = new Api();
     this.scraper = new Scraper();
     this.cache = new Cache();
     this.cookieMonster = new CookieMonster(this.cache);
diff --git a/src/api/Cache.js b/src/util/Cache.js
similarity index 93%
rename from src/api/Cache.js
rename to src/util/Cache.js
index 9057513..5706816 100644
--- a/src/api/Cache.js
+++ b/src/util/Cache.js
@@ -1,5 +1,5 @@
 import Cacheman from 'cacheman';
-import { CACHE } from '../util/Constants';
+import { CACHE } from './Constants';
 
 class Cache {
   manager;
diff --git a/src/util/Constants.js b/src/util/Constants.js
index 6f5b6dd..5eafa69 100644
--- a/src/util/Constants.js
+++ b/src/util/Constants.js
@@ -1,34 +1,18 @@
 export const BASE_URL = 'https://eteenindus.mnt.ee/public/soidukDetailvaadeAvalik.jsf';
 export const SEARCH_URL = 'https://eteenindus.mnt.ee/public/soidukTaustakontroll.jsf';
 
-export const BASE_HEADERS = {
-  'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
-  'Accept-Encoding': 'gzip, deflate, br',
-  'Accept-Language': 'en-US,en;q=0.5',
-  'Connection': 'keep-alive',
-  'Host': 'eteenindus.mnt.ee',
-  'Referrer': BASE_URL,
-  'User-Agent': 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:76.0) Gecko/20100101 Firefox/76.0',
-  'Upgrade-Insecure-Requests': '1',
-};
-
-export const BASE_PARAMS = {
-  'method': 'GET',
-  'mode': 'cors',
-  'credentials': 'include',
-};
-
 export const NAVIGATION_TIMEOUT = 2500;
 
+const TMP_DIR = 'tmp';
 export const CACHE = {
   ttl: 600,
   engine: 'file',
-  directory: 'tmp/cache',
+  directory: `${TMP_DIR}/cache`,
   PREFIX: {
     plate: 'car-',
   },
 };
 
 export const TEMP_DIR = {
-  screenshots: 'tmp/screenshots',
-}
+  screenshots: `${TMP_DIR}/screenshots`,
+};
diff --git a/src/util/Formatter.js b/src/util/Formatter.js
deleted file mode 100644
index c3e6663..0000000
--- a/src/util/Formatter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const formatCookie = Object.entries(cookie)
-  .map(([key, value]) => `${key}=${value}`)
-  .join('; ');