@smythos/sre 1.5.4 → 1.5.6

package/src/subsystems/IO/NKV.service/index.ts

@@ -4,9 +4,11 @@ import { ConnectorService, ConnectorServiceProvider } from '@sre/Core/Connectors
 import { TConnectorService } from '@sre/types/SRE.types';
 import { NKVRedis } from './connectors/NKVRedis.class';
 import { NKVRAM } from './connectors/NKVRAM.class';
+import { NKVLocalStorage } from './connectors/NKVLocalStorage.class';
 export class NKVService extends ConnectorServiceProvider {
     public register() {
         ConnectorService.register(TConnectorService.NKV, 'Redis', NKVRedis);
         ConnectorService.register(TConnectorService.NKV, 'RAM', NKVRAM);
+        ConnectorService.register(TConnectorService.NKV, 'LocalStorage', NKVLocalStorage);
     }
 }

package/src/subsystems/IO/Storage.service/connectors/LocalStorage.class.ts

@@ -11,6 +11,7 @@ import { SecureConnector } from '@sre/Security/SecureConnector.class';
 import fs, { existsSync } from 'fs';
 import os from 'os';
 import path from 'path';
+import { findSmythPath } from '../../../..';
 
 const console = Logger('LocalStorage');
 
@@ -35,7 +36,7 @@ export class LocalStorage extends StorageConnector {
         super(_settings);
         //if (!SmythRuntime.Instance) throw new Error('SRE not initialized');
 
-        this.folder = _settings?.folder || path.join(os.homedir(), '.smyth/storage');
+        this.folder = this.findStorageFolder(_settings?.folder);
         this.initialize();
         if (!fs.existsSync(this.folder)) {
             //throw new Error('Invalid folder provided');
@@ -43,6 +44,25 @@ export class LocalStorage extends StorageConnector {
         }
     }
 
+    private findStorageFolder(folder) {
+        let _storageFolder = folder;
+
+        if (fs.existsSync(_storageFolder)) {
+            return _storageFolder;
+        }
+
+        _storageFolder = findSmythPath('storage');
+
+        if (fs.existsSync(_storageFolder)) {
+            console.warn('Using alternative storage folder found in : ', _storageFolder);
+            return _storageFolder;
+        }
+
+        console.warn('!!! All attempts to find an existing storage folder failed !!!');
+        console.warn('!!! I will use this folder: ', _storageFolder);
+        return _storageFolder;
+    }
+
     /**
      * Reads an object from the local storage.
      *

package/src/subsystems/Security/Vault.service/connectors/JSONFileVault.class.ts

@@ -13,6 +13,7 @@ import crypto from 'crypto';
 import fs from 'fs';
 import * as readlineSync from 'readline-sync';
 import path from 'path';
+import { findSmythPath } from '../../../../helpers/Sysconfig.helper';
 
 const console = Logger('JSONFileVault');
 
@@ -57,6 +58,8 @@ export class JSONFileVault extends VaultConnector {
                     this.vaultData = JSON.parse(fs.readFileSync(vaultFile).toString());
                 }
             } catch (e) {
+                console.error('Error parsing vault file:', e);
+                console.error('!!! Vault features might not work properly !!!');
                 this.vaultData = {};
             }
 
@@ -82,24 +85,21 @@ export class JSONFileVault extends VaultConnector {
         if (fs.existsSync(_vaultFile)) {
             return _vaultFile;
         }
-        console.warn('Vault file not found in:', _vaultFile, 'trying to find in local .smyth directory');
+        console.warn('Vault file not found in:', _vaultFile);
 
-        //try local directory
-        _vaultFile = path.join(process.cwd(), '.smyth', '.sre', 'vault.json');
-        if (fs.existsSync(_vaultFile)) {
-            console.warn('Using alternative vault file found in : ', _vaultFile);
-            return _vaultFile;
-        }
+        //try to find the .smyth directory and check if it contains a valid vault
+
+        _vaultFile = findSmythPath('.sre/vault.json', (dir, success, nextDir) => {
+            if (!success) {
+                console.warn('Vault file not found in:', nextDir);
+            }
+        });
 
-        console.warn('Vault file not found in:', _vaultFile, 'trying to find in user home directory');
-        //try to find the vault file in the .smyth directory
-        _vaultFile = path.join(os.homedir(), '.smyth', '.sre', 'vault.json');
         if (fs.existsSync(_vaultFile)) {
             console.warn('Using alternative vault file found in : ', _vaultFile);
             return _vaultFile;
         }
 
-        console.warn('Vault file not found in:', _vaultFile);
         console.warn('!!! All attempts to find the vault file failed !!!');
         console.warn('!!! Will continue without vault !!!');
         console.warn('!!! Many features might not work !!!');