Remove encrpytion, improve logging and merge interfaces.

src/backend/database/db/index.ts

@@ -1,381 +1,140 @@
 import {drizzle} from 'drizzle-orm/better-sqlite3';
 import Database from 'better-sqlite3';
 import * as schema from './schema.js';
-import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
-import { MigrationManager } from '../migrations/migrator.js';
-
-const dbIconSymbol = '🗄️';
-const getTimeStamp = (): string => chalk.gray(`[${new Date().toLocaleTimeString()}]`);
-const formatMessage = (level: string, colorFn: chalk.Chalk, message: string): string => {
-    return `${getTimeStamp()} ${colorFn(`[${level.toUpperCase()}]`)} ${chalk.hex('#1e3a8a')(`[${dbIconSymbol}]`)} ${message}`;
-};
-const logger = {
-    info: (msg: string): void => {
-        console.log(formatMessage('info', chalk.cyan, msg));
-    },
-    warn: (msg: string): void => {
-        console.warn(formatMessage('warn', chalk.yellow, msg));
-    },
-    error: (msg: string, err?: unknown): void => {
-        console.error(formatMessage('error', chalk.redBright, msg));
-        if (err) console.error(err);
-    },
-    success: (msg: string): void => {
-        console.log(formatMessage('success', chalk.greenBright, msg));
-    },
-    debug: (msg: string): void => {
-        if (process.env.NODE_ENV !== 'production') {
-            console.debug(formatMessage('debug', chalk.magenta, msg));
-        }
-    }
-};
+import { databaseLogger } from '../../utils/logger.js';
 
 const dataDir = process.env.DATA_DIR || './db/data';
 const dbDir = path.resolve(dataDir);
 if (!fs.existsSync(dbDir)) {
+    databaseLogger.info(`Creating database directory`, { operation: 'db_init', path: dbDir });
     fs.mkdirSync(dbDir, {recursive: true});
 }
 
 const dbPath = path.join(dataDir, 'db.sqlite');
+databaseLogger.info(`Initializing SQLite database`, { operation: 'db_init', path: dbPath });
 const sqlite = new Database(dbPath);
 
 sqlite.exec(`
-    CREATE TABLE IF NOT EXISTS users
-    (
-        id
-        TEXT
-        PRIMARY
-        KEY,
-        username
-        TEXT
-        NOT
-        NULL,
-        password_hash
-        TEXT
-        NOT
-        NULL,
-        is_admin
-        INTEGER
-        NOT
-        NULL
-        DEFAULT
-        0,
-
-        is_oidc
-        INTEGER
-        NOT
-        NULL
-        DEFAULT
-        0,
-        client_id
-        TEXT
-        NOT
-        NULL,
-        client_secret
-        TEXT
-        NOT
-        NULL,
-        issuer_url
-        TEXT
-        NOT
-        NULL,
-        authorization_url
-        TEXT
-        NOT
-        NULL,
-        token_url
-        TEXT
-        NOT
-        NULL,
-        redirect_uri
-        TEXT,
-        identifier_path
-        TEXT
-        NOT
-        NULL,
-        name_path
-        TEXT
-        NOT
-        NULL,
-        scopes
-        TEXT
-        NOT
-        NULL
+    CREATE TABLE IF NOT EXISTS users (
+        id TEXT PRIMARY KEY,
+        username TEXT NOT NULL,
+        password_hash TEXT NOT NULL,
+        is_admin INTEGER NOT NULL DEFAULT 0,
+        is_oidc INTEGER NOT NULL DEFAULT 0,
+        client_id TEXT NOT NULL,
+        client_secret TEXT NOT NULL,
+        issuer_url TEXT NOT NULL,
+        authorization_url TEXT NOT NULL,
+        token_url TEXT NOT NULL,
+        redirect_uri TEXT,
+        identifier_path TEXT NOT NULL,
+        name_path TEXT NOT NULL,
+        scopes TEXT NOT NULL
     );
 
-    CREATE TABLE IF NOT EXISTS settings
-    (
-        key
-        TEXT
-        PRIMARY
-        KEY,
-        value
-        TEXT
-        NOT
-        NULL
+    CREATE TABLE IF NOT EXISTS settings (
+        key TEXT PRIMARY KEY,
+        value TEXT NOT NULL
     );
 
-    CREATE TABLE IF NOT EXISTS ssh_data
-    (
-        id
-        INTEGER
-        PRIMARY
-        KEY
-        AUTOINCREMENT,
-        user_id
-        TEXT
-        NOT
-        NULL,
-        name
-        TEXT,
-        ip
-        TEXT
-        NOT
-        NULL,
-        port
-        INTEGER
-        NOT
-        NULL,
-        username
-        TEXT
-        NOT
-        NULL,
-        folder
-        TEXT,
-        tags
-        TEXT,
-        pin
-        INTEGER
-        NOT
-        NULL
-        DEFAULT
-        0,
-        auth_type
-        TEXT
-        NOT
-        NULL,
-        password
-        TEXT,
-        key
-        TEXT,
-        key_password
-        TEXT,
-        key_type
-        TEXT,
-        enable_terminal
-        INTEGER
-        NOT
-        NULL
-        DEFAULT
-        1,
-        enable_tunnel
-        INTEGER
-        NOT
-        NULL
-        DEFAULT
-        1,
-        tunnel_connections
-        TEXT,
-        enable_file_manager
-        INTEGER
-        NOT
-        NULL
-        DEFAULT
-        1,
-        default_path
-        TEXT,
-        created_at
-        TEXT
-        NOT
-        NULL
-        DEFAULT
-        CURRENT_TIMESTAMP,
-        updated_at
-        TEXT
-        NOT
-        NULL
-        DEFAULT
-        CURRENT_TIMESTAMP,
-        FOREIGN
-        KEY
-    (
-        user_id
-    ) REFERENCES users
-    (
-        id
-    )
-        );
+    CREATE TABLE IF NOT EXISTS ssh_data (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        user_id TEXT NOT NULL,
+        name TEXT,
+        ip TEXT NOT NULL,
+        port INTEGER NOT NULL,
+        username TEXT NOT NULL,
+        folder TEXT,
+        tags TEXT,
+        pin INTEGER NOT NULL DEFAULT 0,
+        auth_type TEXT NOT NULL,
+        password TEXT,
+        key TEXT,
+        key_password TEXT,
+        key_type TEXT,
+        enable_terminal INTEGER NOT NULL DEFAULT 1,
+        enable_tunnel INTEGER NOT NULL DEFAULT 1,
+        tunnel_connections TEXT,
+        enable_file_manager INTEGER NOT NULL DEFAULT 1,
+        default_path TEXT,
+        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (user_id) REFERENCES users (id)
+    );
 
-    CREATE TABLE IF NOT EXISTS file_manager_recent
-    (
-        id
-        INTEGER
-        PRIMARY
-        KEY
-        AUTOINCREMENT,
-        user_id
-        TEXT
-        NOT
-        NULL,
-        host_id
-        INTEGER
-        NOT
-        NULL,
-        name
-        TEXT
-        NOT
-        NULL,
-        path
-        TEXT
-        NOT
-        NULL,
-        last_opened
-        TEXT
-        NOT
-        NULL
-        DEFAULT
-        CURRENT_TIMESTAMP,
-        FOREIGN
-        KEY
-    (
-        user_id
-    ) REFERENCES users
-    (
-        id
-    ),
-        FOREIGN KEY
-    (
-        host_id
-    ) REFERENCES ssh_data
-    (
-        id
-    )
-        );
+    CREATE TABLE IF NOT EXISTS file_manager_recent (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        user_id TEXT NOT NULL,
+        host_id INTEGER NOT NULL,
+        name TEXT NOT NULL,
+        path TEXT NOT NULL,
+        last_opened TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (user_id) REFERENCES users (id),
+        FOREIGN KEY (host_id) REFERENCES ssh_data (id)
+    );
 
-    CREATE TABLE IF NOT EXISTS file_manager_pinned
-    (
-        id
-        INTEGER
-        PRIMARY
-        KEY
-        AUTOINCREMENT,
-        user_id
-        TEXT
-        NOT
-        NULL,
-        host_id
-        INTEGER
-        NOT
-        NULL,
-        name
-        TEXT
-        NOT
-        NULL,
-        path
-        TEXT
-        NOT
-        NULL,
-        pinned_at
-        TEXT
-        NOT
-        NULL
-        DEFAULT
-        CURRENT_TIMESTAMP,
-        FOREIGN
-        KEY
-    (
-        user_id
-    ) REFERENCES users
-    (
-        id
-    ),
-        FOREIGN KEY
-    (
-        host_id
-    ) REFERENCES ssh_data
-    (
-        id
-    )
-        );
+    CREATE TABLE IF NOT EXISTS file_manager_pinned (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        user_id TEXT NOT NULL,
+        host_id INTEGER NOT NULL,
+        name TEXT NOT NULL,
+        path TEXT NOT NULL,
+        pinned_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (user_id) REFERENCES users (id),
+        FOREIGN KEY (host_id) REFERENCES ssh_data (id)
+    );
 
-    CREATE TABLE IF NOT EXISTS file_manager_shortcuts
-    (
-        id
-        INTEGER
-        PRIMARY
-        KEY
-        AUTOINCREMENT,
-        user_id
-        TEXT
-        NOT
-        NULL,
-        host_id
-        INTEGER
-        NOT
-        NULL,
-        name
-        TEXT
-        NOT
-        NULL,
-        path
-        TEXT
-        NOT
-        NULL,
-        created_at
-        TEXT
-        NOT
-        NULL
-        DEFAULT
-        CURRENT_TIMESTAMP,
-        FOREIGN
-        KEY
-    (
-        user_id
-    ) REFERENCES users
-    (
-        id
-    ),
-        FOREIGN KEY
-    (
-        host_id
-    ) REFERENCES ssh_data
-    (
-        id
-    )
-        );
+    CREATE TABLE IF NOT EXISTS file_manager_shortcuts (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        user_id TEXT NOT NULL,
+        host_id INTEGER NOT NULL,
+        name TEXT NOT NULL,
+        path TEXT NOT NULL,
+        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (user_id) REFERENCES users (id),
+        FOREIGN KEY (host_id) REFERENCES ssh_data (id)
+    );
 
-    CREATE TABLE IF NOT EXISTS dismissed_alerts
-    (
-        id
-        INTEGER
-        PRIMARY
-        KEY
-        AUTOINCREMENT,
-        user_id
-        TEXT
-        NOT
-        NULL,
-        alert_id
-        TEXT
-        NOT
-        NULL,
-        dismissed_at
-        TEXT
-        NOT
-        NULL
-        DEFAULT
-        CURRENT_TIMESTAMP,
-        FOREIGN
-        KEY
-    (
-        user_id
-    ) REFERENCES users
-    (
-        id
-    )
-        );
+    CREATE TABLE IF NOT EXISTS dismissed_alerts (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        user_id TEXT NOT NULL,
+        alert_id TEXT NOT NULL,
+        dismissed_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (user_id) REFERENCES users (id)
+    );
+
+    CREATE TABLE IF NOT EXISTS ssh_credentials (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        user_id TEXT NOT NULL,
+        name TEXT NOT NULL,
+        description TEXT,
+        folder TEXT,
+        tags TEXT,
+        auth_type TEXT NOT NULL,
+        username TEXT NOT NULL,
+        password TEXT,
+        key TEXT,
+        key_password TEXT,
+        key_type TEXT,
+        usage_count INTEGER NOT NULL DEFAULT 0,
+        last_used TEXT,
+        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (user_id) REFERENCES users (id)
+    );
+
+    CREATE TABLE IF NOT EXISTS ssh_credential_usage (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        credential_id INTEGER NOT NULL,
+        host_id INTEGER NOT NULL,
+        user_id TEXT NOT NULL,
+        used_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (credential_id) REFERENCES ssh_credentials (id),
+        FOREIGN KEY (host_id) REFERENCES ssh_data (id),
+        FOREIGN KEY (user_id) REFERENCES users (id)
+    );
 `);
 
 const addColumnIfNotExists = (table: string, column: string, definition: string) => {
@@ -384,16 +143,18 @@ const addColumnIfNotExists = (table: string, column: string, definition: string)
                         FROM ${table} LIMIT 1`).get();
     } catch (e) {
         try {
+            databaseLogger.debug(`Adding column ${column} to ${table}`, { operation: 'schema_migration', table, column });
             sqlite.exec(`ALTER TABLE ${table}
                 ADD COLUMN ${column} ${definition};`);
+            databaseLogger.success(`Column ${column} added to ${table}`, { operation: 'schema_migration', table, column });
         } catch (alterError) {
-            logger.warn(`Failed to add column ${column} to ${table}: ${alterError}`);
+            databaseLogger.warn(`Failed to add column ${column} to ${table}`, { operation: 'schema_migration', table, column, error: alterError });
         }
     }
 };
 
 const migrateSchema = () => {
-    logger.info('Checking for schema updates...');
+    databaseLogger.info('Checking for schema updates...', { operation: 'schema_migration' });
 
     addColumnIfNotExists('users', 'is_admin', 'INTEGER NOT NULL DEFAULT 0');
 
@@ -405,8 +166,11 @@ const migrateSchema = () => {
     addColumnIfNotExists('users', 'authorization_url', 'TEXT');
     addColumnIfNotExists('users', 'token_url', 'TEXT');
     try {
+        databaseLogger.debug('Attempting to drop redirect_uri column', { operation: 'schema_migration', table: 'users' });
         sqlite.prepare(`ALTER TABLE users DROP COLUMN redirect_uri`).run();
+        databaseLogger.success('redirect_uri column dropped', { operation: 'schema_migration', table: 'users' });
     } catch (e) {
+        databaseLogger.debug('redirect_uri column does not exist or could not be dropped', { operation: 'schema_migration', table: 'users' });
     }
 
     addColumnIfNotExists('users', 'identifier_path', 'TEXT');
@@ -433,38 +197,37 @@ const migrateSchema = () => {
     addColumnIfNotExists('ssh_data', 'default_path', 'TEXT');
     addColumnIfNotExists('ssh_data', 'created_at', 'TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP');
     addColumnIfNotExists('ssh_data', 'updated_at', 'TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP');
-    
-    // Add credential_id column for SSH credentials management
+
     addColumnIfNotExists('ssh_data', 'credential_id', 'INTEGER REFERENCES ssh_credentials(id)');
 
     addColumnIfNotExists('file_manager_recent', 'host_id', 'INTEGER NOT NULL');
     addColumnIfNotExists('file_manager_pinned', 'host_id', 'INTEGER NOT NULL');
     addColumnIfNotExists('file_manager_shortcuts', 'host_id', 'INTEGER NOT NULL');
 
-    logger.success('Schema migration completed');
+    databaseLogger.success('Schema migration completed', { operation: 'schema_migration' });
 };
 
 const initializeDatabase = async () => {
     migrateSchema();
 
-    // Run new migration system
-    const migrationManager = new MigrationManager(sqlite);
-    await migrationManager.runMigrations();
-
     try {
         const row = sqlite.prepare("SELECT value FROM settings WHERE key = 'allow_registration'").get();
         if (!row) {
+            databaseLogger.info('Initializing default settings', { operation: 'db_init', setting: 'allow_registration' });
             sqlite.prepare("INSERT INTO settings (key, value) VALUES ('allow_registration', 'true')").run();
+            databaseLogger.success('Default settings initialized', { operation: 'db_init' });
+        } else {
+            databaseLogger.debug('Default settings already exist', { operation: 'db_init' });
         }
     } catch (e) {
-        logger.warn('Could not initialize default settings');
+        databaseLogger.warn('Could not initialize default settings', { operation: 'db_init', error: e });
     }
 };
 
-// Initialize database (async)
 initializeDatabase().catch(error => {
-    logger.error('Failed to initialize database:', error);
+    databaseLogger.error('Failed to initialize database', error, { operation: 'db_init' });
     process.exit(1);
 });
 
+databaseLogger.success('Database connection established', { operation: 'db_init', path: dbPath });
 export const db = drizzle(sqlite, {schema});