@reldens/cms 0.84.0 → 0.86.0

package/bin/reldens-cms.js

@@ -1,138 +1,145 @@
-#!/usr/bin/env node
-
-/**
- *
- * Reldens - CMS - CLI
- *
- */
-
-const { Manager } = require('../index');
-const { Logger } = require('@reldens/utils');
-const { FileHandler } = require('@reldens/server-utils');
-const { PrismaClientLoader } = require('@reldens/storage');
-const readline = require('readline/promises');
-const dotenv = require('dotenv');
-
-let args = process.argv.slice(2);
-let projectRoot = args[0] || process.cwd();
-let indexPath = FileHandler.joinPaths(projectRoot, 'index.js');
-
-async function checkRequiredPackages(projectRoot)
-{
-    let requiredPackages = ['@reldens/cms'];
-    let missingPackages = [];
-    for(let packageName of requiredPackages){
-        if(!FileHandler.exists(FileHandler.joinPaths(projectRoot, 'node_modules', packageName))){
-            missingPackages.push(packageName);
-        }
-    }
-    if(!FileHandler.exists(FileHandler.joinPaths(projectRoot, 'node_modules', '@prisma/client'))){
-        missingPackages.push('@prisma/client');
-    }
-    return missingPackages;
-}
-
-async function promptUserConfirmation(packages)
-{
-    let rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-    });
-    Logger.info('Missing required packages: '+packages.join(', '));
-    Logger.info('These packages are required for the CMS to function properly.');
-    let answer = await rl.question('Would you like to install them automatically? (y/N): ');
-    rl.close();
-    return 'y' === answer.toLowerCase() || 'yes' === answer.toLowerCase();
-}
-
-async function installPackages(packages, projectRoot)
-{
-    try {
-        Logger.info('Installing packages: npm install '+packages.join(' '));
-        let {execSync} = require('child_process');
-        execSync('npm install '+packages.join(' '), {stdio: 'inherit', cwd: projectRoot});
-        Logger.info('Dependencies installed successfully.');
-        return true;
-    } catch(error) {
-        Logger.error('Failed to install dependencies: '+error.message);
-        Logger.error('Please run manually: npm install '+packages.join(' '));
-        return false;
-    }
-}
-
-async function handlePackageInstallation(projectRoot)
-{
-    let missingPackages = await checkRequiredPackages(projectRoot);
-    if(0 === missingPackages.length){
-        return true;
-    }
-    let userConfirmed = await promptUserConfirmation(missingPackages);
-    if(!userConfirmed){
-        Logger.info('Installation cancelled. Please install required packages manually and try again.');
-        return false;
-    }
-    return await installPackages(missingPackages, projectRoot);
-}
-
-async function createPrismaClientIfNeeded(projectRoot)
-{
-    let envFilePath = FileHandler.joinPaths(projectRoot, '.env');
-    dotenv.config({path: envFilePath});
-    let storageDriver = process.env.RELDENS_STORAGE_DRIVER || 'prisma';
-    if('prisma' !== storageDriver){
-        return false;
-    }
-    let clientPath = FileHandler.joinPaths(projectRoot, 'prisma', 'client');
-    if(!FileHandler.exists(clientPath)){
-        return false;
-    }
-    return PrismaClientLoader.load(projectRoot, null, null) || false;
-}
-
-async function main()
-{
-    if(FileHandler.exists(indexPath)){
-        require(indexPath);
-        return;
-    }
-    let packageInstallResult = await handlePackageInstallation(projectRoot);
-    if(!packageInstallResult){
-        process.exit(1);
-    }
-    let managerConfig = {projectRoot};
-    let entitiesPath = FileHandler.joinPaths(
-        projectRoot,
-        'generated-entities',
-        'models',
-        'prisma',
-        'registered-models-prisma.js'
-    );
-    if(FileHandler.exists(entitiesPath)){
-        let entitiesModule = require(entitiesPath);
-        managerConfig.rawRegisteredEntities = entitiesModule.rawRegisteredEntities;
-        managerConfig.entitiesConfig = entitiesModule.entitiesConfig;
-        managerConfig.entitiesTranslations = entitiesModule.entitiesTranslations;
-    }
-    let prismaClient = await createPrismaClientIfNeeded(projectRoot);
-    if(prismaClient){
-        managerConfig.prismaClient = prismaClient;
-    }
-    let manager = new Manager(managerConfig);
-    Logger.debug('Reldens CMS Manager instance created.', {configuration: manager.config});
-    manager.start().then((result) => {
-        if(!result){
-            Logger.info('Reldens CMS started by command failed.');
-            return false;
-        }
-        Logger.info('Reldens CMS started by command.');
-        return true;
-    }).catch((error) => {
-        Logger.critical('Failed to start CMS:', error);
-        process.exit();
-    });
-}
-
-main().catch((error) => {
-    Logger.critical('Failed to handle package installation:', error);
-    process.exit(1);
-});
+#!/usr/bin/env node
+
+/**
+ *
+ * Reldens - CMS - CLI
+ *
+ */
+
+const { Manager } = require('../index');
+const { ManagerConfigLoader } = require('../lib/manager-config-loader');
+const { ManagerServicesInitializer } = require('../lib/manager-services-initializer');
+const { Logger } = require('@reldens/utils');
+const { FileHandler } = require('@reldens/server-utils');
+const readline = require('readline/promises');
+const dotenv = require('dotenv');
+
+let args = process.argv.slice(2);
+let projectRoot = args[0] || process.cwd();
+let indexPath = FileHandler.joinPaths(projectRoot, 'index.js');
+
+async function checkRequiredPackages(projectRoot, databaseConfig)
+{
+    let requiredPackages = ['@reldens/cms'];
+    if('prisma' === databaseConfig.driver){
+        requiredPackages.push('prisma', '@prisma/client', databaseConfig.prismaAdapter);
+    }
+    let missingPackages = [];
+    for(let packageName of requiredPackages){
+        if(!FileHandler.exists(FileHandler.joinPaths(projectRoot, 'node_modules', packageName))){
+            missingPackages.push(packageName);
+        }
+    }
+    return missingPackages;
+}
+
+async function promptUserConfirmation(packages)
+{
+    let rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+    Logger.info('Missing required packages: '+packages.join(', '));
+    Logger.info('These packages are required for the CMS to function properly.');
+    let answer = await rl.question('Would you like to install them automatically? (y/N): ');
+    rl.close();
+    return 'y' === answer.toLowerCase() || 'yes' === answer.toLowerCase();
+}
+
+async function installPackages(packages, projectRoot)
+{
+    try {
+        Logger.info('Installing packages: npm install '+packages.join(' '));
+        let {execSync} = require('child_process');
+        execSync('npm install '+packages.join(' '), {stdio: 'inherit', cwd: projectRoot});
+        Logger.info('Dependencies installed successfully.');
+        return true;
+    } catch(error) {
+        Logger.error('Failed to install dependencies: '+error.message);
+        Logger.error('Please run manually: npm install '+packages.join(' '));
+        return false;
+    }
+}
+
+async function handlePackageInstallation(projectRoot, databaseConfig)
+{
+    let missingPackages = await checkRequiredPackages(projectRoot, databaseConfig);
+    if(0 === missingPackages.length){
+        return true;
+    }
+    let userConfirmed = await promptUserConfirmation(missingPackages);
+    if(!userConfirmed){
+        Logger.info('Installation cancelled. Please install required packages manually and try again.');
+        return false;
+    }
+    return await installPackages(missingPackages, projectRoot);
+}
+
+async function createPrismaClientIfNeeded(projectRoot, databaseConfig)
+{
+    if('prisma' !== databaseConfig.driver){
+        return false;
+    }
+    let clientPath = FileHandler.joinPaths(projectRoot, 'prisma', 'client');
+    if(!FileHandler.exists(clientPath)){
+        return false;
+    }
+    return ManagerServicesInitializer.loadPrismaModules(
+        projectRoot,
+        null,
+        null,
+        databaseConfig.prismaAdapter,
+        databaseConfig.prismaAdapterClass
+    );
+}
+
+async function main()
+{
+    if(FileHandler.exists(indexPath)){
+        require(indexPath);
+        return;
+    }
+    let envFilePath = FileHandler.joinPaths(projectRoot, '.env');
+    dotenv.config({path: envFilePath});
+    let databaseConfig = ManagerConfigLoader.loadFromEnv().database;
+    let packageInstallResult = await handlePackageInstallation(projectRoot, databaseConfig);
+    if(!packageInstallResult){
+        process.exit(1);
+    }
+    let managerConfig = {projectRoot};
+    let entitiesPath = FileHandler.joinPaths(
+        projectRoot,
+        'generated-entities',
+        'models',
+        databaseConfig.driver,
+        'registered-models-'+databaseConfig.driver+'.js'
+    );
+    if(FileHandler.exists(entitiesPath)){
+        let entitiesModule = require(entitiesPath);
+        managerConfig.rawRegisteredEntities = entitiesModule.rawRegisteredEntities;
+        managerConfig.entitiesConfig = entitiesModule.entitiesConfig;
+        managerConfig.entitiesTranslations = entitiesModule.entitiesTranslations;
+    }
+    let prismaModules = await createPrismaClientIfNeeded(projectRoot, databaseConfig);
+    if(prismaModules){
+        managerConfig.prismaModules = prismaModules;
+    }
+    let manager = new Manager(managerConfig);
+    Logger.debug('Reldens CMS Manager instance created.', {configuration: manager.config});
+    manager.start().then((result) => {
+        if(!result){
+            Logger.info('Reldens CMS started by command failed.');
+            return false;
+        }
+        Logger.info('Reldens CMS started by command.');
+        return true;
+    }).catch((error) => {
+        Logger.critical('Failed to start CMS:', error);
+        process.exit();
+    });
+}
+
+main().catch((error) => {
+    Logger.critical('Failed to handle package installation:', error);
+    process.exit(1);
+});

package/install/index.html

@@ -1,132 +1,132 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Reldens CMS - Installation</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="/install-assets/css/installer.css">
-    <script src="/install-assets/js/installer.js"></script>
-</head>
-<body>
-<div class="wrapper">
-    <div class="header">
-        <h1 class="title">
-            <strong>Reldens CMS</strong> - Installation
-        </h1>
-    </div>
-    <div class="content">
-        <div class="forms-container">
-            <div class="row">
-                <form name="install-form" id="install-form" class="install-form" action="/install" method="post">
-                    <h3 class="form-title">Server Configuration</h3>
-                    <div class="input-box app-host">
-                        <label for="app-host">Host</label>
-                        <input type="text" name="app-host" id="app-host" value="{{app-host}}" class="required" required/>
-                    </div>
-                    <div class="input-box app-port">
-                        <label for="app-port">Port</label>
-                        <input type="text" name="app-port" id="app-port" value="{{app-port}}" class="required" required/>
-                    </div>
-                    <div class="input-box app-public-url">
-                        <label for="app-public-url">Public URL (for assets and links)</label>
-                        <input type="text" name="app-public-url" id="app-public-url" value="{{app-public-url}}"/>
-                    </div>
-                    <div class="input-box app-admin-path">
-                        <label for="app-admin-path">Admin Panel Path</label>
-                        <input type="text" name="app-admin-path" id="app-admin-path" value="{{app-admin-path}}"/>
-                    </div>
-                    <div class="input-box app-admin-secret">
-                        <label for="app-admin-secret">Admin Panel Secret</label>
-                        <input type="text" name="app-admin-secret" id="app-admin-secret" value="{{app-admin-secret}}" required/>
-                    </div>
-                    <div class="input-box app-error">
-                        <p class="error installation-process-failed">There was an error during the installation process.</p>
-                    </div>
-                    <h3 class="form-title">Database Configuration</h3>
-                    <div class="input-box db-storage-driver">
-                        <label for="db-storage-driver">Storage Driver</label>
-                        <select name="db-storage-driver" id="db-storage-driver" class="required" required>
-                            <option value="prisma" selected>Prisma</option>
-                            <option value="objection-js">Objection JS</option>
-                        </select>
-                    </div>
-                    <div class="input-box db-client">
-                        <label for="db-client">Client</label>
-                        <input type="text" name="db-client" id="db-client" value="{{db-client}}" class="required" required/>
-                    </div>
-                    <div class="input-box db-host">
-                        <label for="db-host">Host</label>
-                        <input type="text" name="db-host" id="db-host" value="{{db-host}}" class="required" required/>
-                    </div>
-                    <div class="input-box db-port">
-                        <label for="db-port">Port</label>
-                        <input type="text" name="db-port" id="db-port" value="{{db-port}}" class="required" required/>
-                    </div>
-                    <div class="input-box db-name">
-                        <label for="db-name">Database Name</label>
-                        <input type="text" name="db-name" id="db-name" value="{{db-name}}" class="required" required/>
-                    </div>
-                    <div class="input-box db-username">
-                        <label for="db-username">Username</label>
-                        <input type="text" name="db-username" id="db-username" value="{{db-username}}" class="required" required/>
-                    </div>
-                    <div class="input-box db-password">
-                        <label for="db-password">Password</label>
-                        <input type="password" name="db-password" id="db-password" value="{{db-password}}" class="required" required autocomplete="off"/>
-                    </div>
-                    <div class="input-box db-error">
-                        <p class="error connection-failed">Connection failed, please check the database configuration.</p>
-                        <p class="error invalid-driver">Invalid storage driver.</p>
-                        <p class="error raw-query-not-found">Method "rawQuery" not found in the specified storage driver.</p>
-                        <p class="error sql-file-not-found">SQL installation file not found.</p>
-                        <p class="error db-installation-process-failed">There was an error during the installation process.</p>
-                    </div>
-                    <h3 class="form-title">Installation Options</h3>
-                    <div class="input-box input-checkbox install-cms-tables">
-                        <input type="checkbox" name="install-cms-tables" id="install-cms-tables" checked/>
-                        <label for="install-cms-tables">Install default CMS pages tables</label>
-                    </div>
-                    <div class="input-box input-checkbox install-user-auth">
-                        <input type="checkbox" name="install-user-auth" id="install-user-auth" checked/>
-                        <label for="install-user-auth">Install users authentication</label>
-                    </div>
-                    <div class="input-box input-checkbox install-default-user">
-                        <input type="checkbox" name="install-default-user" id="install-default-user" checked/>
-                        <label for="install-default-user">Install default admin user (root@cms-admin.com / root)</label>
-                    </div>
-                    <div class="input-box input-checkbox install-default-homepage">
-                        <input type="checkbox" name="install-default-homepage" id="install-default-homepage" checked/>
-                        <label for="install-default-homepage">Install default homepage</label>
-                    </div>
-                    <div class="input-box input-checkbox install-default-blocks">
-                        <input type="checkbox" name="install-default-blocks" id="install-default-blocks" checked/>
-                        <label for="install-default-blocks">Install default content blocks</label>
-                    </div>
-                    <div class="input-box input-checkbox install-entity-access">
-                        <input type="checkbox" name="install-entity-access" id="install-entity-access" checked/>
-                        <label for="install-entity-access">Install entity access control rules</label>
-                    </div>
-                    <div class="input-box input-checkbox install-dynamic-forms">
-                        <input type="checkbox" name="install-dynamic-forms" id="install-dynamic-forms" checked/>
-                        <label for="install-dynamic-forms">Install dynamic forms system</label>
-                    </div>
-                    <div class="input-box input-checkbox install-seo-files">
-                        <input type="checkbox" name="install-seo-files" id="install-seo-files" checked/>
-                        <label for="install-seo-files">Install default robots.txt and sitemap.xml</label>
-                    </div>
-                    <div class="input-box submit-container">
-                        <input id="install-submit-button" type="submit" value="Install"/>
-                        <img class="install-loading hidden" src="/install-assets/img/loading.gif"/>
-                    </div>
-                    <div class="input-box response-error"></div>
-                </form>
-            </div>
-        </div>
-    </div>
-    <div class="footer">
-        <div class="copyright">
-            &copy; 2025 Reldens CMS
-        </div>
-    </div>
-</div>
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Reldens CMS - Installation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="/install-assets/css/installer.css">
+    <script src="/install-assets/js/installer.js"></script>
+</head>
+<body>
+<div class="wrapper">
+    <div class="header">
+        <h1 class="title">
+            <strong>Reldens CMS</strong> - Installation
+        </h1>
+    </div>
+    <div class="content">
+        <div class="forms-container">
+            <div class="row">
+                <form name="install-form" id="install-form" class="install-form" action="/install" method="post">
+                    <h3 class="form-title">Server Configuration</h3>
+                    <div class="input-box app-host">
+                        <label for="app-host">Host</label>
+                        <input type="text" name="app-host" id="app-host" value="{{app-host}}" class="required" required/>
+                    </div>
+                    <div class="input-box app-port">
+                        <label for="app-port">Port</label>
+                        <input type="text" name="app-port" id="app-port" value="{{app-port}}" class="required" required/>
+                    </div>
+                    <div class="input-box app-public-url">
+                        <label for="app-public-url">Public URL (for assets and links)</label>
+                        <input type="text" name="app-public-url" id="app-public-url" value="{{app-public-url}}"/>
+                    </div>
+                    <div class="input-box app-admin-path">
+                        <label for="app-admin-path">Admin Panel Path</label>
+                        <input type="text" name="app-admin-path" id="app-admin-path" value="{{app-admin-path}}"/>
+                    </div>
+                    <div class="input-box app-admin-secret">
+                        <label for="app-admin-secret">Admin Panel Secret</label>
+                        <input type="text" name="app-admin-secret" id="app-admin-secret" value="{{app-admin-secret}}" required/>
+                    </div>
+                    <div class="input-box app-error">
+                        <p class="error installation-process-failed">There was an error during the installation process.</p>
+                    </div>
+                    <h3 class="form-title">Database Configuration</h3>
+                    <div class="input-box db-storage-driver">
+                        <label for="db-storage-driver">Storage Driver</label>
+                        <select name="db-storage-driver" id="db-storage-driver" class="required" required>
+                            <option value="mikro-orm" selected>Mikro ORM</option>
+                            <option value="objection-js">Objection JS</option>
+                        </select>
+                    </div>
+                    <div class="input-box db-client">
+                        <label for="db-client">Client</label>
+                        <input type="text" name="db-client" id="db-client" value="{{db-client}}" class="required" required/>
+                    </div>
+                    <div class="input-box db-host">
+                        <label for="db-host">Host</label>
+                        <input type="text" name="db-host" id="db-host" value="{{db-host}}" class="required" required/>
+                    </div>
+                    <div class="input-box db-port">
+                        <label for="db-port">Port</label>
+                        <input type="text" name="db-port" id="db-port" value="{{db-port}}" class="required" required/>
+                    </div>
+                    <div class="input-box db-name">
+                        <label for="db-name">Database Name</label>
+                        <input type="text" name="db-name" id="db-name" value="{{db-name}}" class="required" required/>
+                    </div>
+                    <div class="input-box db-username">
+                        <label for="db-username">Username</label>
+                        <input type="text" name="db-username" id="db-username" value="{{db-username}}" class="required" required/>
+                    </div>
+                    <div class="input-box db-password">
+                        <label for="db-password">Password</label>
+                        <input type="password" name="db-password" id="db-password" value="{{db-password}}" class="required" required autocomplete="off"/>
+                    </div>
+                    <div class="input-box db-error">
+                        <p class="error connection-failed">Connection failed, please check the database configuration.</p>
+                        <p class="error invalid-driver">Invalid storage driver.</p>
+                        <p class="error raw-query-not-found">Method "rawQuery" not found in the specified storage driver.</p>
+                        <p class="error sql-file-not-found">SQL installation file not found.</p>
+                        <p class="error db-installation-process-failed">There was an error during the installation process.</p>
+                    </div>
+                    <h3 class="form-title">Installation Options</h3>
+                    <div class="input-box input-checkbox install-cms-tables">
+                        <input type="checkbox" name="install-cms-tables" id="install-cms-tables" checked/>
+                        <label for="install-cms-tables">Install default CMS pages tables</label>
+                    </div>
+                    <div class="input-box input-checkbox install-user-auth">
+                        <input type="checkbox" name="install-user-auth" id="install-user-auth" checked/>
+                        <label for="install-user-auth">Install users authentication</label>
+                    </div>
+                    <div class="input-box input-checkbox install-default-user">
+                        <input type="checkbox" name="install-default-user" id="install-default-user" checked/>
+                        <label for="install-default-user">Install default admin user (root@cms-admin.com / root)</label>
+                    </div>
+                    <div class="input-box input-checkbox install-default-homepage">
+                        <input type="checkbox" name="install-default-homepage" id="install-default-homepage" checked/>
+                        <label for="install-default-homepage">Install default homepage</label>
+                    </div>
+                    <div class="input-box input-checkbox install-default-blocks">
+                        <input type="checkbox" name="install-default-blocks" id="install-default-blocks" checked/>
+                        <label for="install-default-blocks">Install default content blocks</label>
+                    </div>
+                    <div class="input-box input-checkbox install-entity-access">
+                        <input type="checkbox" name="install-entity-access" id="install-entity-access" checked/>
+                        <label for="install-entity-access">Install entity access control rules</label>
+                    </div>
+                    <div class="input-box input-checkbox install-dynamic-forms">
+                        <input type="checkbox" name="install-dynamic-forms" id="install-dynamic-forms" checked/>
+                        <label for="install-dynamic-forms">Install dynamic forms system</label>
+                    </div>
+                    <div class="input-box input-checkbox install-seo-files">
+                        <input type="checkbox" name="install-seo-files" id="install-seo-files" checked/>
+                        <label for="install-seo-files">Install default robots.txt and sitemap.xml</label>
+                    </div>
+                    <div class="input-box submit-container">
+                        <input id="install-submit-button" type="submit" value="Install"/>
+                        <img class="install-loading hidden" src="/install-assets/img/loading.gif"/>
+                    </div>
+                    <div class="input-box response-error"></div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="footer">
+        <div class="copyright">
+            &copy; 2025 Reldens CMS
+        </div>
+    </div>
+</div>
+</body>
+</html>