Addon Manager

RuriYS · Aug 26, 2024 · 4e6ba09 · 4e6ba09
1 parent 449af4f
commit 4e6ba09
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 26 deletions.
diff --git a/...rs/Api/Client/Servers/AddonController.php → .../Servers/AddonManager/AddonController.php b/...rs/Api/Client/Servers/AddonController.php → .../Servers/AddonManager/AddonController.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
+namespace Pterodactyl\Http\Controllers\Api\Client\Servers\AddonManager;
 
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
 use Pterodactyl\Repositories\Wings\DaemonFileRepository;
+use Illuminate\Support\Facades\Cache;
+use Aternos\Taskmaster\Taskmaster;
 use Pterodactyl\Models\Server;
 use Illuminate\Http\Request;
-use Yosymfony\Toml\Toml;
+use ReadAndParseTask;
 use Http;
 
 class AddonController extends ClientApiController
@@ -40,15 +42,36 @@ public function index(Request $request, Server $server)
             return response()->json(['error' => 'Unsupported egg'], 400);
         }
 
-        $indexDirectory = $serverFileRepo->getDirectory("$addonDirectory.index/");
-        $addons = [];
+        $cacheKey = "server_{$server->id}_addons";
+        $taskmaster = new Taskmaster();
+        $taskmaster->autoDetectWorkers(8);
 
-        foreach ($indexDirectory as $file) {
-            $filename = $file['name'];
-            $content = $serverFileRepo->getContent("$addonDirectory.index/$filename");
-            $addonData = Toml::parse($content);
-            $addons[] = $addonData;
-        }
+        $addons = Cache::remember($cacheKey, now()->addMinutes(30), function () use ($serverFileRepo, $addonDirectory, $taskmaster) {
+            $addons = [];
+            $tasks = [];
+            $indexDirectory = $serverFileRepo->getDirectory("$addonDirectory.index/");
+
+            foreach ($indexDirectory as $file) {
+                $filename = $file['name'];
+                $filePath = "$addonDirectory.index/$filename";
+
+                // Create a new task for each file and run them
+                $task = new ReadAndParseTask($serverFileRepo, $filePath);
+                $tasks[] = $task;
+                $taskmaster->runTask($task);
+            }
+
+            $taskmaster->wait();
+
+            // Collect results from all tasks
+            foreach ($tasks as $task) {
+                $addons[] = $task->getResult();
+            }
+
+            $taskmaster->stop();
+
+            return $addons;
+        });
 
         return response()->json($addons);
     }

diff --git a/app/Http/Controllers/Api/Client/Servers/AddonManager/ReadAndParseTask.php b/app/Http/Controllers/Api/Client/Servers/AddonManager/ReadAndParseTask.php
@@ -0,0 +1,22 @@
+<?php
+
+use Aternos\Taskmaster\Task\Task;
+use Yosymfony\Toml\Toml;
+
+class ReadAndParseTask extends Task
+{
+    protected $serverFileRepo;
+    protected $filePath;
+
+    public function __construct($serverFileRepo, $filePath)
+    {
+        $this->serverFileRepo = $serverFileRepo;
+        $this->filePath = $filePath;
+    }
+
+    public function run(): mixed
+    {
+        $content = $this->serverFileRepo->getContent($this->filePath);
+        return Toml::parse($content);
+    }
+}
diff --git a/composer.json b/composer.json
@@ -24,6 +24,7 @@
         "ext-pdo_mysql": "*",
         "ext-posix": "*",
         "ext-zip": "*",
+        "aternos/taskmaster": "^1.2",
         "aws/aws-sdk-php": "~3.260.1",
         "doctrine/dbal": "~3.6.0",
         "guzzlehttp/guzzle": "~7.5.0",

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/scripts/components/elements/AddonItem.tsx b/resources/scripts/components/elements/AddonItem.tsx
diff --git a/resources/scripts/components/server/addons/AddonsContainer.tsx b/resources/scripts/components/server/addons/AddonsContainer.tsx
@@ -1,7 +1,7 @@
+import { Addon, index as getIndex, search, limit, providers } from '@/api/server/addons';
 import ServerContentBlock from '@/components/elements/ServerContentBlock';
 import AddonItem from '@/components/elements/AddonItem';
 import Spinner from '@/components/elements/Spinner';
-import { Addon, index as getIndex, search, limit, providers } from '@/api/server/addons';
 import React, { useState, useEffect } from 'react';
 import { ServerContext } from '@/state/server';
 import Select from '@/components/elements/Select';
@@ -25,19 +25,23 @@ const AddonContainer = () => {
         const handler = setTimeout(async () => {
             const fetchAddons = async () => {
                 setLoading(true);
-                const searchData = (await search(uuid, searchTerm, pageSize, provider)).data;
-                const indexData = (await getIndex(uuid)).data;
+                try {
+                    const searchData = (await search(uuid, searchTerm, pageSize, provider)).data;
+                    const indexData = (await getIndex(uuid)).data;
 
-                const addonsData = searchData.hits.map((hit) => {
-                    const isInstalled = indexData.some((indexed) => {
-                        if (!indexed.update.modrinth) return false;
-                        return indexed.update.modrinth['mod-id'] === hit.project_id;
-                    });
+                    const addonsData = searchData.hits.map((hit) => {
+                        const isInstalled = indexData.some((indexed) => {
+                            if (!indexed.update.modrinth) return false;
+                            return indexed.update.modrinth['mod-id'] === hit.project_id;
+                        });
 
-                    return { ...hit, isInstalled };
-                });
+                        return { ...hit, isInstalled };
+                    });
 
-                setAddons(addonsData);
+                    setAddons(addonsData);
+                } catch (error) {
+                    console.error(error);
+                }
                 setLoading(false);
             };
 

diff --git a/resources/scripts/components/server/console/Console.tsx b/resources/scripts/components/server/console/Console.tsx
diff --git a/routes/api-client.php b/routes/api-client.php
@@ -91,10 +91,10 @@
     });
 
     Route::group(['prefix' => '/addons'], function () {
-        Route::get('/', [Client\Servers\AddonController::class, 'index']);
-        Route::get('/search', [Client\Servers\AddonController::class, 'search']);
-        Route::get('/download', [Client\Servers\AddonController::class, 'download']);
-        Route::get('/versions', [Client\Servers\AddonController::class, 'getVersions']);
+        Route::get('/', [Client\Servers\AddonManager\AddonController::class, 'index']);
+        Route::get('/search', [Client\Servers\AddonManager\AddonController::class, 'search']);
+        Route::get('/download', [Client\Servers\AddonManager\AddonController::class, 'download']);
+        Route::get('/versions', [Client\Servers\AddonManager\AddonController::class, 'getVersions']);
     });
 
     Route::group(['prefix' => '/schedules'], function () {