wip

src/Alisa.php

@@ -6,6 +6,7 @@
 use Alisa\Events\Event;
 use Alisa\Events\Group;
 use Alisa\Events\Scene;
+use Alisa\Support\Asset;
 use Alisa\Support\Collection;
 use Alisa\Support\Storage;
 use Alisa\Yandex\Entities\DatetimeEntity;
@@ -28,7 +29,7 @@ class Alisa
 {
     protected Context $context;
 
-    protected Collection $options;
+    protected Config $config;
 
     protected Storage $storage;
 
@@ -44,12 +45,12 @@ class Alisa
 
     protected Sound $sound;
 
-    public function __construct(array $options = [])
+    public function __construct(array $config = [])
     {
-        $this->options = new Collection($options);
-        $this->context = new Context($this->options->get('payload'));
+        $this->config = new Config($config);
+        $this->context = new Context($this->config->get('payload'));
         $this->dispatcher = new Dispatcher;
-        $this->storage = new Storage($this->options->get('storage'), $this->options->get('skill_id'));
+        $this->storage = new Storage($this->config->get('storage'), $this->config->get('skill_id'));
 
         // https://yandex.ru/dev/dialogs/alice/doc/health-check.html
         if ($this->context->isPing()) {
@@ -75,6 +76,11 @@ public function __construct(array $options = [])
                 default => new Entity($entity, $this->context),
             });
         }
+
+        $this->components($this->config->get('components', []));
+        $this->middleware($this->config->get('middlewares', []));
+
+        Asset::load($this->config->get('assets', []));
     }
 
     public function components(array $components): static
@@ -92,9 +98,9 @@ public function components(array $components): static
         return $this;
     }
 
-    public function options(): Collection
+    public function config(): Config
     {
-        return $this->options;
+        return $this->config;
     }
 
     public function context(): Context

src/Config.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Alisa;
+
+use Alisa\Support\Collection;
+
+class Config extends Collection
+{
+    protected array $items = [
+        'skill_id' => null,
+
+        'oauth' => null,
+
+        'storage' => null,
+
+        'payload' => null,
+
+        'assets' => [],
+
+        'components' => [],
+
+        'middlewares' => [],
+    ];
+
+    public function __construct(array $items = [])
+    {
+        $this->items = array_replace_recursive($this->items, $items);
+    }
+}

src/Support/Asset.php

@@ -6,17 +6,12 @@ class Asset
 {
     protected static array $assets = [];
 
-    public static function set(array $assets): void
+    public static function load(array $assets): void
     {
         self::$assets = $assets;
     }
 
-    public static function append(array $assets): void
-    {
-        self::$assets = [...self::$assets, ...$assets];
-    }
-
-    public static function add(string $alias, string $value): void
+    public static function set(string $alias, string $value): void
     {
         self::$assets[$alias] = $value;
     }

src/Yandex/Image.php

@@ -23,17 +23,17 @@ class Image
 
     public function __construct(protected Alisa $alisa)
     {
-        if (!$this->token = $this->alisa->options()->get('oauth')) {
+        if (!$this->token = $this->alisa->config()->get('oauth')) {
             throw new ImageException('Заполните в конфиге OAuth-токен (token)');
         }
 
-        if (!$this->skillId = $this->alisa->options()->get('skill_id')) {
+        if (!$this->skillId = $this->alisa->config()->get('skill_id')) {
             if (!$this->skillId = $this->alisa->context()->get('session.skill_id')) {
                 throw new ImageException('Заполните в конфиге идентификатор навыка (skill_id)');
             }
         }
 
-        $root = rtrim($this->alisa->options()->get('storage', sys_get_temp_dir() . '/alisa'), '\/');
+        $root = rtrim($this->alisa->config()->get('storage', sys_get_temp_dir() . '/alisa'), '\/');
 
         $this->path = $root . '/' . $this->skillId . '/__images__';
 

src/Yandex/Sound.php

@@ -23,17 +23,17 @@ class Sound
 
     public function __construct(protected Alisa $alisa)
     {
-        if (!$this->token = $this->alisa->options()->get('oauth')) {
+        if (!$this->token = $this->alisa->config()->get('oauth')) {
             throw new SoundException('Заполните в конфиге OAuth-токен (token)');
         }
 
-        if (!$this->skillId = $this->alisa->options()->get('skill_id')) {
+        if (!$this->skillId = $this->alisa->config()->get('skill_id')) {
             if (!$this->skillId = $this->alisa->context()->get('session.skill_id')) {
                 throw new SoundException('Заполните в конфиге идентификатор навыка (skill_id)');
             }
         }
 
-        $root = rtrim($this->alisa->options()->get('storage', sys_get_temp_dir() . '/alisa'), '\/');
+        $root = rtrim($this->alisa->config()->get('storage', sys_get_temp_dir() . '/alisa'), '\/');
 
         $this->path = $root . '/' . $this->skillId . '/__sounds__';