Change storage implementation

Author: Stigmatoz

src/common/utility.ts

@@ -0,0 +1,8 @@
+export function isEmpty(obj:any): boolean {
+    for (var prop in obj) {
+        if (obj.hasOwnProperty(prop))
+            return false;
+    }
+
+    return JSON.stringify(obj) === JSON.stringify({});
+}

src/compositions/black-list.ts

@@ -4,5 +4,5 @@ import { StorageParams } from "../storage/storage-params";
 export async function isInBlackList(url: string): Promise<boolean>{
     const storage = injecStorage();
     const blackList = await storage.getValue(StorageParams.BLACK_LIST) as string[];
-    return blackList.indexOf(url) != -1 ? true : false;
+    return blackList != undefined && blackList.indexOf(url) != -1 ? true : false;
 }

src/storage/local-storage.ts

@@ -2,6 +2,7 @@ import { IStorage } from "./storage-interface";
 import { StorageParams } from "./storage-params";
 import { Tab } from "../entity/tab";
 import Browser from 'webextension-polyfill';
+import { isEmpty } from "../common/utility";
 
 export class LocalStorage implements IStorage {
     getTabs(): Promise<Tab[]> {
@@ -23,8 +24,12 @@ export class LocalStorage implements IStorage {
         });
     }
 
-    async getValue(name: StorageParams): Promise<any> {
-        const value = await Browser.storage.local.get(name);
+    async getValue(name: StorageParams, defaultValue?: any): Promise<any> {
+        let value = await Browser.storage.local.get(name);
+        if (isEmpty(value) && defaultValue != undefined){
+            await this.saveValue(name, defaultValue);
+            return defaultValue;
+        }
         return value[name];
     }
 }

src/storage/storage-interface.ts

@@ -5,5 +5,5 @@ export interface IStorage {
     getTabs(): Promise<Tab[]>;
     saveTabs(value:Tab[]): Promise<void>;
     saveValue(name:StorageParams, value: any): Promise<void>;
-    getValue(name:StorageParams): Promise<any>;
+    getValue(name:StorageParams, defaultValue?: any): Promise<any>;
 }

src/storage/storage-params.ts

@@ -12,4 +12,36 @@ export enum StorageParams {
     VIEW_TIME_IN_BADGE = 'view_time_in_badge',
     BLOCK_DEFERRAL = 'view_block_deferral',
     SHOW_HINT = 'show_hint',
-}
+}
+
+export enum InactivityInterval {
+    Seconds_30 = 30,
+    Seconds_45 = 45,
+    Min_1 = 60,
+    Min_2 = 120,
+    Min_5 = 300,
+    Min_10 = 600,
+    Min_20 = 1200,
+    Min_30 = 1800
+};
+
+export enum RangeForDays {
+    Days_2 = 'days2',
+    Days_3 = 'days3',
+    Days_4 = 'days4',
+    Days_5 = 'days5',
+    Days_6 = 'days6',
+    Days_7 = 'days7',
+    Month_1 = 'month1',
+    Month_2 = 'month2',
+    Month_3 = 'month3'
+};
+
+export const NOTIFICATION_MESSAGE_DEFAULT = 'You have spent a lot of time on this site';
+export const INTERVAL_INACTIVITY_DEFAULT = InactivityInterval.Seconds_30;
+export const INTERVAL_SAVE_STORAGE_DEFAULT = 5000;
+export const INTERVAL_RANGE_DEFAULT = RangeForDays.Days_7;
+export const DARK_MODE_DEFAULT = false;
+export const VIEW_TIME_IN_BADGE_DEFAULT = true;
+export const BLOCK_DEFERRAL_DEFAULT = true;
+export const SHOW_HINT_DEFAULT = true;