v1.0.4

- Multiple rcon commands support - Vip time support
Flute-CMS · Jun 1, 2024 · d0ced23 · d0ced23
1 parent b696b33
commit d0ced23
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 68 deletions.
diff --git a/Contracts/DriverInterface.php b/Contracts/DriverInterface.php
@@ -15,7 +15,7 @@ interface DriverInterface
      * 
      * @throws \Exception
      */
-    public function deliver( User $user, Server $server, array $additional = [] ) : bool;
+    public function deliver( User $user, Server $server, array $additional = [], ?int $timeId = null ) : bool;
 
     /**
      * Get the alias name for the system

diff --git a/Give/Drivers/AdminDriver.php b/Give/Drivers/AdminDriver.php
@@ -8,7 +8,7 @@
 
 class AdminDriver implements DriverInterface
 {
-    public function deliver(User $user, Server $server, array $additional = []): bool
+    public function deliver(User $user, Server $server, array $additional = [], ?int $timeId = null): bool
     {
         return true;
     }

diff --git a/Give/Drivers/RconDriver.php b/Give/Drivers/RconDriver.php
@@ -12,18 +12,18 @@
 
 class RconDriver implements DriverInterface
 {
-    public function deliver(User $user, Server $server, array $additional = []): bool
+    public function deliver(User $user, Server $server, array $additional = [], ?int $timeId = null): bool
     {
         if (!$server->rcon)
             throw new BadConfigurationException("Server $server->name rcon empty");
 
         if (!isset($additional['command']))
             throw new BadConfigurationException('command');
 
-        $command = $additional['command'];
+        $commands = explode(';', $additional['command']);
         $steam = false;
 
-        if (preg_match('/{{steam32}}|{{steam64}}|{{accountId}}/i', $command)) {
+        if (preg_match('/{{steam32}}|{{steam64}}|{{accountId}}/i', $additional['command'])) {
             $steam = $user->getSocialNetwork('Steam') ?? $user->getSocialNetwork('HttpsSteam');
 
             if (!$steam)
@@ -32,14 +32,24 @@ public function deliver(User $user, Server $server, array $additional = []): boo
             $steam = $steam->value;
         }
 
-        try {
-            $query = $this->sendCommand($server->ip, $server->port, $server->rcon, $this->replace($command, $steam, $user));
+        $query = new SourceQuery();
 
+        try {
+            $query->Connect($server->ip, $server->port, 3, ($server->mod == 10) ? SourceQuery::GOLDSOURCE : SourceQuery::SOURCE);
+            $query->SetRconPassword($server->rcon);
+
+            foreach ($commands as $command) {
+                $command = trim($command);
+                if (empty($command)) {
+                    continue;
+                }
+                $this->sendCommand($query, $this->replace($command, $steam, $user));
+            }
             return true;
         } catch (\Exception $e) {
             throw new GiveDriverException($e->getMessage());
         } finally {
-            $query['query']->Disconnect();
+            $query->Disconnect();
         }
 
         return false;
@@ -82,19 +92,8 @@ protected function replace(string $command, $steam, User $user): string
         ], $command);
     }
 
-    protected function sendCommand(string $ip, int $port, string $rcon, string $command): array
+    protected function sendCommand(SourceQuery $query, string $command): void
     {
-        $Query = new SourceQuery;
-
-        $Query->Connect($ip, $port);
-        $Query->SetRconPassword($rcon);
-
-        // We don't need a get result from the server
-        $RconResult = $Query->Rcon($command);
-
-        return [
-            'query' => $Query,
-            'rcon' => $RconResult
-        ];
+        $query->Rcon($command);
     }
-}
+}
diff --git a/Give/Drivers/VipDriver.php b/Give/Drivers/VipDriver.php
@@ -11,49 +11,8 @@
 
 class VipDriver extends AbstractDriver
 {
-    private function validateAdditionalParams(array $additional, Server $server): array
-    {
-        if (empty($additional['group'])) {
-            throw new BadConfigurationException('group');
-        }
-
-        $dbConnection = $server->getDbConnection('VIP');
-        if (!$dbConnection) {
-            throw new BadConfigurationException('db connection VIP is not exists');
-        }
-
-        $dbParams = Json::decode($dbConnection->additional);
-        if (empty($dbParams->sid)) {
-            throw new BadConfigurationException("SID {$server->name} for db connection is empty");
-        }
-
-        return [$dbConnection, $dbParams->sid];
-    }
-
-    private function updateOrInsertUser($db, $accountId, $sid, $group, $time, $user, $currentGroup = null)
-    {
-        $expiresTime = ($time === 0) ? 0 : ($currentGroup ? $currentGroup['expires'] + $time : time() + $time);
-        if ($currentGroup) {
-            $db->table('users')
-                ->update(['expires' => $expiresTime])
-                ->where('account_id', $accountId)
-                ->andWhere('sid', $sid)
-                ->run();
-        } else {
-            $db->insert('users')
-                ->values([
-                    'expires' => $expiresTime,
-                    'group' => $group,
-                    'account_id' => $accountId,
-                    'lastvisit' => time(),
-                    'sid' => $sid,
-                    'name' => $user->name,
-                ])
-                ->run();
-        }
-    }
 
-    public function deliver(User $user, Server $server, array $additional = []): bool
+    public function deliver(User $user, Server $server, array $additional = [], ?int $timeId = null): bool
     {
         [$dbConnection, $sid] = $this->validateAdditionalParams($additional, $server);
 
@@ -64,7 +23,7 @@ public function deliver(User $user, Server $server, array $additional = []): boo
 
         $accountId = steam()->steamid($steam->value)->GetAccountID();
         $group = $additional['group'];
-        $time = $additional['time'] ?? 0;
+        $time = !$timeId ? ($additional['time'] ?? 0) : $timeId;
 
         $db = dbal()->database($dbConnection->dbname);
         $dbusers = $db->table("users")->select()
@@ -97,4 +56,46 @@ public function alias(): string
     {
         return 'vip';
     }
+
+    private function validateAdditionalParams(array $additional, Server $server): array
+    {
+        if (empty($additional['group'])) {
+            throw new BadConfigurationException('group');
+        }
+
+        $dbConnection = $server->getDbConnection('VIP');
+        if (!$dbConnection) {
+            throw new BadConfigurationException('db connection VIP is not exists');
+        }
+
+        $dbParams = Json::decode($dbConnection->additional);
+        if (empty($dbParams->sid)) {
+            throw new BadConfigurationException("SID {$server->name} for db connection is empty");
+        }
+
+        return [$dbConnection, $dbParams->sid];
+    }
+
+    private function updateOrInsertUser($db, $accountId, $sid, $group, $time, $user, $currentGroup = null)
+    {
+        $expiresTime = ($time === 0) ? 0 : ($currentGroup ? $currentGroup['expires'] + $time : time() + $time);
+        if ($currentGroup) {
+            $db->table('users')
+                ->update(['expires' => $expiresTime])
+                ->where('account_id', $accountId)
+                ->andWhere('sid', $sid)
+                ->run();
+        } else {
+            $db->insert('users')
+                ->values([
+                    'expires' => $expiresTime,
+                    'group' => $group,
+                    'account_id' => $accountId,
+                    'lastvisit' => time(),
+                    'sid' => $sid,
+                    'name' => $user->name,
+                ])
+                ->run();
+        }
+    }
 }
diff --git a/Give/GiveFactory.php b/Give/GiveFactory.php
@@ -22,12 +22,12 @@ public function getAll(): array
         return $this->drivers;
     }
 
-    public function make(string $name, User $user, Server $server, array $additional = []): bool
+    public function make(string $name, User $user, Server $server, array $additional = [], ?int $timeId = null): bool
     {
         if( !$this->exists($name) )
             throw new \Exception("Driver '$name' is not exists");
 
-        return (new $this->drivers[$name])->deliver($user, $server, $additional);
+        return (new $this->drivers[$name])->deliver($user, $server, $additional, $timeId);
     }
 
     public function add(string $class) : self

diff --git a/module.json b/module.json
@@ -1,6 +1,6 @@
 {
     "name": "GiveCore",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "description": "A core module for what provides a ability to to give privileges",
     "authors": [
         "Flames"