new kernel, ms bearer

kernel/console/controllers/AdminConsoleController.php

@@ -69,7 +69,7 @@ class AdminConsoleController extends ConsoleController
 
         $this->optionService->createFromParams(
             key: "active_modules",
-            value: "{\"modules\":[\"admin_themes\", \"secure\"]}",
+            value: "{\"modules\":[\"admin_themes\", \"secure\", \"user\", \"menu\"]}",
             label: "Активные модули"
         );
         $this->out->r("create option active_modules", "green");
@@ -82,6 +82,25 @@ class AdminConsoleController extends ConsoleController
         ]);
         $this->out->r("create item menu module", "green");
 
+        $this->menuService->createItem([
+            "label" => "Пользователи",
+            "url" => "#",
+            "slug" => "user",
+        ]);
+        $this->menuService->createItem([
+            "label" => "Список",
+            "url" => "/admin/user",
+            "slug" => "user_list",
+            "parent_slug" => "user",
+        ]);
+        $this->menuService->createItem([
+            "label" => "Создать",
+            "url" => "/admin/user/create",
+            "slug" => "user_create",
+            "parent_slug" => "user",
+        ]);
+        $this->out->r("create item menu user", "green");
+
         $this->menuService->createItem([
             "label" => "Настройки",
             "url" => "#",

kernel/console/controllers/KernelController.php

@@ -4,10 +4,17 @@ namespace kernel\console\controllers;
 
 use kernel\console\ConsoleController;
 use kernel\helpers\Files;
-use kernel\services\KernelService;
+use ZipArchive;
 
 class KernelController extends ConsoleController
 {
+    protected Files $files;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->files = new Files();
+    }
 
     /**
      * @throws \Exception
@@ -19,19 +26,86 @@ class KernelController extends ConsoleController
         }
 
         if (file_exists(ROOT_DIR . $this->argv['path'])) {
-
-            $tmpKernelDirFull = RESOURCES_DIR . '/tmp/ad/kernel/';
-
-            $fileHelper = new Files();
-            $fileHelper->copy_folder(KERNEL_DIR, $tmpKernelDirFull);
-
-            $fileHelper->pack($tmpKernelDirFull, RESOURCES_DIR . '/tmp/kernel/kernel.itguild');
-
-            $fileHelper->recursiveRemoveDir($tmpKernelDirFull);
-            $this->out->r("Ядро заархивировано", 'green');
+            $tmpKernelDirFull = RESOURCES_DIR . '/tmp/ad/kernel/kernel';
+            $this->files->copy_folder(KERNEL_DIR, $tmpKernelDirFull);
+            $this->out->r("Ядро скопировано во временную папку", 'green');
         } else {
             $this->out->r("Ядро не найдено", 'red');
         }
+
+        if (file_exists(ROOT_DIR . '/bootstrap')) {
+            $tmpBootstrapDirFull = RESOURCES_DIR . '/tmp/ad/kernel/bootstrap';
+            $this->files->copy_folder(ROOT_DIR . '/bootstrap', $tmpBootstrapDirFull);
+            $this->out->r("/bootstrap скопирован во временную папку", 'green');
+        } else {
+            $this->out->r("/bootstrap не найден", 'red');
+        }
+
+        if (file_exists(ROOT_DIR . '/.env.example')) {
+            $tmpEnvDirFull = RESOURCES_DIR . '/tmp/ad/kernel/env.example';
+            copy(ROOT_DIR . '/.env.example', $tmpEnvDirFull);
+            $this->out->r("/.env.example скопирован во временную папку", 'green');
+        } else {
+            $this->out->r("/.env.example не найден", 'red');
+        }
+
+        if (file_exists(ROOT_DIR . '/composer.json')) {
+            $tmpComposerDirFull = RESOURCES_DIR . '/tmp/ad/kernel/composer.json';
+            copy(ROOT_DIR . '/composer.json', $tmpComposerDirFull);
+            $this->out->r("/composer.json скопирован во временную папку", 'green');
+        } else {
+            $this->out->r("/composer.json не найден", 'red');
+        }
+
+        if (!is_dir(RESOURCES_DIR . '/tmp/app')) {
+            mkdir(RESOURCES_DIR . '/tmp/app');
+        }
+
+        $this->files->pack(RESOURCES_DIR . '/tmp/ad/kernel/', RESOURCES_DIR . '/tmp/kernel/kernel.igk');
+        $this->files->recursiveRemoveDir(RESOURCES_DIR . '/tmp/ad/kernel/');
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function actionUpdateKernel(): void
+    {
+        if (!isset($this->argv['path'])) {
+            throw new \Exception('Missing kernel path "--path" specified');
+        }
+
+        $zip = new ZipArchive;
+        if (file_exists(ROOT_DIR . $this->argv['path'])) {
+            $tmpKernelDir = md5(time());
+            $res = $zip->open(ROOT_DIR . $this->argv['path']);
+            if ($res === TRUE) {
+                $tmpKernelDirFull = RESOURCES_DIR . '/tmp/kernel/' . $tmpKernelDir . "/";
+                $zip->extractTo($tmpKernelDirFull);
+                $zip->close();
+                $this->files->recursiveRemoveKernelDir();
+                $this->files->copy_folder($tmpKernelDirFull . 'kernel' , ROOT_DIR . "/kernel");
+
+                if (isset($this->argv['bootstrap'])) {
+                    $this->files->recursiveRemoveDir(ROOT_DIR . '/bootstrap');
+                    $this->files->copy_folder($tmpKernelDirFull . 'bootstrap' , ROOT_DIR . '/bootstrap');
+                }
+
+                if (isset($this->argv['env'])) {
+                    copy($tmpKernelDirFull . 'env.example', ROOT_DIR . '/.env.example');
+                }
+
+                if (isset($this->argv['composer'])) {
+                    copy($tmpKernelDirFull . 'composer.json', ROOT_DIR . '/composer.json');
+                }
+
+                $this->files->recursiveRemoveDir($tmpKernelDirFull);
+                $this->out->r('Ядро обновлено.', 'green');
+            } else {
+                $this->out->r('unable to open zip archive', 'red');
+            }
+        } else {
+            $this->out->r("archive not found", 'red');
+        }
     }
 
 }

kernel/console/controllers/SecureController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace kernel\console\controllers;
+
+use kernel\console\ConsoleController;
+use kernel\services\TokenService;
+use Random\RandomException;
+
+class SecureController extends ConsoleController
+{
+
+    /**
+     * @throws RandomException
+     */
+    public function actionCreateSecretKey(): void
+    {
+        $envFile = \EnvEditor\EnvFile::loadFrom(ROOT_DIR . "/.env");
+
+        $envFile->setValue("SECRET_KEY", TokenService::random_bytes(15));
+
+        $envFile->saveTo(ROOT_DIR . "/.env");
+        $this->out->r("Secret key successfully created.", "green");
+    }
+
+}

kernel/console/routs/cli.php

@@ -17,6 +17,10 @@ App::$collector->group(["prefix" => "admin-theme"], callback: function (RouteCol
     App::$collector->console('uninstall', [\kernel\console\controllers\AdminThemeController::class, 'actionUninstallTheme']);
 });
 
+App::$collector->group(["prefix" => "secure"], callback: function (RouteCollector $router){
+    App::$collector->console('create-secret-key', [\kernel\console\controllers\SecureController::class, 'actionCreateSecretKey']);
+});
+
 App::$collector->group(["prefix" => "admin"], callback: function (RouteCollector $router){
     App::$collector->console('init', [\kernel\console\controllers\AdminConsoleController::class, 'actionInit']);
 });