lowdb storage service

src/bw.ts

@@ -1,9 +1,9 @@
 import { AuthService } from 'jslib/services/auth.service';
 
 import { I18nService } from './services/i18n.service';
+import { LowdbStorageService } from './services/lowdbStorage.service';
 import { NodeEnvSecureStorageService } from './services/nodeEnvSecureStorage.service';
 import { NodePlatformUtilsService } from './services/nodePlatformUtils.service';
-import { NodeStorageService } from './services/nodeStorage.service';
 import { NoopMessagingService } from './services/noopMessaging.service';
 
 import { AppIdService } from 'jslib/services/appId.service';
@@ -29,8 +29,8 @@ import { Program } from './program';
 
 export class Main {
     messagingService: NoopMessagingService;
-    storageService: NodeStorageService;
-    secureStorageService: NodeStorageService;
+    storageService: LowdbStorageService;
+    secureStorageService: NodeEnvSecureStorageService;
     i18nService: I18nService;
     platformUtilsService: NodePlatformUtilsService;
     constantsService: ConstantsService;
@@ -58,7 +58,7 @@ export class Main {
         this.i18nService = new I18nService('en', './locales');
         this.platformUtilsService = new NodePlatformUtilsService();
         this.cryptoFunctionService = new NodeCryptoFunctionService();
-        this.storageService = new NodeStorageService('Bitwarden CLI');
+        this.storageService = new LowdbStorageService('Bitwarden CLI');
         this.secureStorageService = new NodeEnvSecureStorageService(this.storageService, () => this.cryptoService);
         this.cryptoService = new CryptoService(this.storageService, this.secureStorageService,
             this.cryptoFunctionService);

src/services/lowdbStorage.service.ts

@@ -0,0 +1,39 @@
+import * as lowdb from 'lowdb';
+import * as FileSync from 'lowdb/adapters/FileSync';
+
+import { StorageService } from 'jslib/abstractions/storage.service';
+import { Utils } from 'jslib/misc/utils';
+
+export class LowdbStorageService implements StorageService {
+    private db: lowdb.LowdbSync<any>;
+
+    constructor(appDirName: string) {
+        let path = null;
+        if (process.platform === 'darwin') {
+            path = process.env.HOME + 'Library/Application Support';
+        } else if (process.platform === 'win32') {
+            path = process.env.APPDATA;
+        } else {
+            path = process.env.HOME + '.config';
+        }
+        path += ('/' + appDirName + '/data.json');
+
+        const adapter = new FileSync(path);
+        this.db = lowdb(adapter);
+    }
+
+    get<T>(key: string): Promise<T> {
+        const val = this.db.get(key).value();
+        return Promise.resolve(val as T);
+    }
+
+    save(key: string, obj: any): Promise<any> {
+        this.db.set(key, obj).write();
+        return Promise.resolve();
+    }
+
+    remove(key: string): Promise<any> {
+        this.db.unset(key).write();
+        return Promise.resolve();
+    }
+}

src/services/nodeStorage.service.ts

@@ -1,51 +0,0 @@
-import { StorageService } from 'jslib/abstractions/storage.service';
-import { Utils } from 'jslib/misc/utils';
-
-let localStorage = Utils.isBrowser ? window.localStorage : null;
-
-export class NodeStorageService implements StorageService {
-    constructor(appDirName: string) {
-        if (Utils.isNode && localStorage == null) {
-            const LocalStorage = require('node-localstorage').LocalStorage;
-            let path = null;
-            if (process.platform === 'darwin') {
-                path = process.env.HOME + 'Library/Application Support';
-            } else if (process.platform === 'win32') {
-                path = process.env.APPDATA;
-            } else {
-                path = process.env.HOME + '.config';
-            }
-            path += ('/' + appDirName + '/data');
-            localStorage = new LocalStorage(path);
-        }
-    }
-
-    get<T>(key: string): Promise<T> {
-        const val = localStorage.getItem(key);
-        if (val != null) {
-            try {
-                const obj = JSON.parse(val);
-                if (obj != null && obj[key] != null) {
-                    return Promise.resolve(obj[key] as T);
-                }
-            } catch { }
-        }
-        return Promise.resolve(null);
-    }
-
-    save(key: string, obj: any): Promise<any> {
-        let val: string = null;
-        if (obj != null) {
-            const o: any = {};
-            o[key] = obj;
-            val = JSON.stringify(o);
-        }
-        localStorage.setItem(key, val);
-        return Promise.resolve();
-    }
-
-    remove(key: string): Promise<any> {
-        localStorage.removeItem(key);
-        return Promise.resolve();
-    }
-}