fix(cache): move cache folder and ensure it exists programatically

Author: Superd22

.gitignore

@@ -87,6 +87,6 @@ $RECYCLE.BIN/
 
 app/config.ts
 lib/
-cache/*.json
+src/cache/*.json
 coverage
 .nyc_output

.gitlab-ci.yml

@@ -33,7 +33,6 @@ build:
   stage: build
   before_script:
     - echo "$BOT_CONFIG" > app/config.ts
-    - touch cache/cookie.json
   script:
     - npm run build
   artifacts:

package-lock.json

@@ -1,16 +1,15 @@
 {
     "name": "spectrum-bot",
-    "version": "2.0.0",
-    "description": "A crude API for StarCitizen's SPECTRUM@^0.3.5",
+    "version": "0.0.0",
+    "description": "API for StarCitizen's SPECTRUM & RSI website",
     "main": "index.js",
     "scripts": {
         "test": "jasmine-ts --config=jasmine.json",
         "coverage": "nyc  -r text -e .ts -x \"spec/**.spec.ts\" npm run test",
         "coverage:html": "nyc  -r html -e .ts -x \"spec/**.spec.ts\" npm run test",
         "start": "ts-node app/bot.ts",
         "build": "tsc -d -p src/ --outdir lib/",
-        "prepublishOnly": "node bin/prepublish.js",
-        "prepare": "mkdir -p cache/ && touch cache/cookie.json"
+        "prepublishOnly": "node bin/prepublish.js"
     },
     "author": {
         "name": "David FAIN",
@@ -23,6 +22,7 @@
         "@types/node": "^7.0.12",
         "draft-js": "^0.10.0",
         "draft-js-emoji-plugin": "^2.0.0-rc9",
+        "fs-extra": "^7.0.1",
         "popsicle": "^10.0.1",
         "react": "^16.7.0",
         "react-dom": "^16.7.0",
@@ -44,6 +44,7 @@
         "@semantic-release/release-notes-generator": "^7.1.4",
         "@types/core-js": "^2.5.0",
         "@types/draft-js": "^0.10.16",
+        "@types/fs-extra": "^5.0.4",
         "@types/jasmine": "^3.3.5",
         "@types/node": "^10.12.18",
         "jasmine": "^3.3.1",

package.json

@@ -1,21 +1,70 @@
-import { TestShared } from './_.shared';
-import { RSI } from '../src/';
-import { } from 'jasmine';
-
-
+import { Container } from "typedi";
+import { TestShared } from "./_.shared";
+import { RSI } from "../src/";
+import {} from "jasmine";
+import * as fs from "fs-extra";
 
 interface ThisContext {
     rsi: RSI;
 }
 
-describe("RSI Service", function (this: ThisContext) {
+describe("RSI Service", function(this: ThisContext) {
     TestShared.commonSetUp();
 
     it("should instantiate", () => {
         this.rsi = RSI.getInstance();
         expect(this.rsi instanceof RSI).toBe(true);
     });
 
+    describe("Cookie Jar", () => {
+        beforeEach(() => {
+            Container.set(RSI, new RSI());
+        });
+        it(`Should create cookie jar if file doesn't exist`, async () => {
+            try {
+                await fs.remove("../src/cache/cookie.json");
+            } catch (e) {}
+
+            Container.set(RSI, new RSI());
+            this.rsi = RSI.getInstance();
+            expect(this.rsi instanceof RSI).toBe(true);
+        });
+
+        it(`Should create cookie jar if directory doesn't exist`, async () => {
+            try {
+                await fs.remove("../src/cache");
+            } catch (e) {}
+
+            Container.set(RSI, new RSI());
+            this.rsi = RSI.getInstance();
+            expect(this.rsi instanceof RSI).toBe(true);
+        });
+
+        it(`Should leave cookie jar as is if exists`, async () => {
+            try {
+                await fs.remove("../src/cache");
+                await fs.ensureFile("../src/cache/cookie.json");
+                await fs.writeFile("../src/cache/cookie.json", '{"test":123}');
+            } catch (e) {}
+
+            Container.set(RSI, new RSI());
+            this.rsi = RSI.getInstance();
+            expect(this.rsi instanceof RSI).toBe(true);
+
+            const cookie = await fs.readFile("../src/cache/cookie.json", "utf-8");
+            expect(cookie).toBe('{"test":123}');
+        });
+
+        afterAll(async () => {
+            try {
+                await fs.remove("../src/cache");
+            } catch (e) {}
+
+            Container.set(RSI, new RSI());
+            this.rsi = RSI.getInstance();
+        });
+    });
+
     describe("Should handle login operation", () => {
         it("Should get a base token from RSI", async () => {
             let token = await this.rsi.getBaseToken();
@@ -48,5 +97,4 @@ describe("RSI Service", function (this: ThisContext) {
             expect(login).toBeTruthy();
         });
     });
-
-});
+});

spec/0.rsi.spec.ts

@@ -5,10 +5,12 @@
 import { RSIApiResponse } from "./../interfaces/RSIApiResponse.interface";
 import { ApiResponse } from "./../interfaces/APIResponse.interface";
 import { Container, Service } from "typedi";
+import { CookieJar } from "tough-cookie";
 import * as cookieStore from "tough-cookie-file-store";
 import * as popsicle from "popsicle";
 import * as rl from "readline";
-
+import * as fs from "fs-extra";
+import * as path from "path";
 /**
  * Main API class to handle every call to the RSI-API as well as
  * user-identification.
@@ -25,10 +27,21 @@ export class RSIService {
     /** a collection of tokens */
     private tokens = {};
     /** cookieJar for api calls */
-    private cookieJar = popsicle.jar(new cookieStore(__dirname + "/../../../cache/cookie.json"));
+    private cookieJar: CookieJar;
     private input = rl.createInterface(process.stdin, process.stdout, null);
 
-    constructor() {}
+    constructor() {
+        this.ensureCookieJar();
+    }
+
+    protected async ensureCookieJar() {
+        const path = __dirname + "/../../cache/cookie.json";
+        await fs.ensureFile(path);
+
+        this.cookieJar = popsicle.jar(new cookieStore(path));
+    }
+
+
 
     /**
      * @deprecated use Container.get(RSIService) instead