Move sessions to subfolder.

Nesting subfolders support.
xtrime-ru · Jan 14, 2020 · a831936 · a831936
1 parent b5672aa
commit a831936
Show file tree

Hide file tree

Showing 8 changed files with 298 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -8,12 +8,16 @@
   "require": {
     "php": ">=7.4.0",
     "ext-json": "*",
+    "ext-mbstring": "*",
     "amphp/http-server": "^2",
     "amphp/http-server-router": "^1",
     "amphp/websocket-server": "^2",
     "vlucas/phpdotenv": "^4",
     "danog/madelineproto":"^5"
   },
+  "require-dev": {
+    "roave/security-advisories": "dev-master"
+  },
   "minimum-stability": "dev",
   "prefer-stable": true,
   "authors": [

diff --git a/composer.lock b/composer.lock
diff --git a/examples/websocket-events.php b/examples/websocket-events.php
@@ -20,7 +20,7 @@
     'url' => $options['url'] ?? $options['u'] ?? 'ws://127.0.0.1:9503/events',
 ];
 
-Amp\Loop::run(function () use($options) {
+Amp\Loop::run(static function () use($options) {
     echo "Connecting to: {$options['url']}" . PHP_EOL;
 
     try {

diff --git a/server.php b/server.php
@@ -1,11 +1,13 @@
 <?php
 
+use TelegramApiServer\Migrations;
+
 chdir(__DIR__);
 
 require_once __DIR__ . '/bootstrap.php';
 
 if (PHP_SAPI !== 'cli') {
-    throw new \RuntimeException('Start in CLI');
+    throw new RuntimeException('Start in CLI');
 }
 
 $shortopts = 'a::p::s::';
@@ -48,6 +50,9 @@
     exit;
 }
 
+Migrations\Sessions::move(__DIR__);
+
+
 $sessionFiles = [];
 foreach ($options['session'] as $session) {
     $session = trim($session);
@@ -58,8 +63,9 @@
         $session = 'session';
     }
 
-    TelegramApiServer\Client::checkOrCreateSessionFolder($session, __DIR__);
     $session = TelegramApiServer\Client::getSessionFile($session);
+    TelegramApiServer\Client::checkOrCreateSessionFolder($session, __DIR__);
+
     $sessionFiles[$session] = null;
 }