Removed beanstalkd stuff for now as it's not necessary; updated the server creation function to actually download the specified server JAR version

This commit is contained in:
2022-10-08 00:02:29 -04:00
parent fdb31eeb00
commit 5c35389ae3
7 changed files with 62 additions and 134 deletions

View File

@ -2,7 +2,6 @@
namespace BitGoblin\MCST\Controllers;
use Pheanstalk\Pheanstalk;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use Slim\Views\Twig;
@ -22,12 +21,6 @@ class HomeController extends Controller {
array_push($minecraftServers, new Server($m));
}
// create pheanstalk object and create a job
$pheanstalk = Pheanstalk::create($config->get('beanstalkd.host'), $config->get('beanstalkd.port'));
$pheanstalk
->useTube('mcst')
->put("refresh-server-downloads", Pheanstalk::DEFAULT_PRIORITY);
$view = Twig::fromRequest($request);
return $view->render($response, 'index.twig', [
'servers' => $minecraftServers,

View File

@ -2,6 +2,7 @@
namespace BitGoblin\MCST\Controllers;
use DiDom\Document;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use Slim\Views\Twig;
@ -26,8 +27,14 @@ class ServerController extends Controller {
$serverDir = join('/', array($config->get('server_directory'), $params['serverName']));
mkdir($serverDir);
// find the server JAR URL for the version
$versionPageLink = 'https://minecraft.fandom.com/wiki/Java_Edition_' . $params['serverVersion'];
$dom = new Document($versionPageLink, true);
$infobox = $dom->find('.notaninfobox')[0];
$serverLinkElem = $infobox->find("a:contains('Server')");
$serverJarUrl = $serverLinkElem[0]->attr('href');
// grab the server JAR file
$serverJarUrl = "https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar";
$serverJarName = "server_" . $params['serverVersion'] . ".jar";
$serverJarPath = join('/', array($serverDir, $serverJarName));
file_put_contents($serverJarPath, file_get_contents($serverJarUrl));
@ -35,7 +42,7 @@ class ServerController extends Controller {
// create the start.sh shell script
$scriptFilePath = join('/', array($serverDir, 'start.sh'));
$scriptFile = fopen($scriptFilePath, 'w');
$scriptContent = "#!/bin/sh\n\ncd " . $serverDir . "\njava -Xmx2048M -Xms2048M -jar server_1.19.2.jar nogui";
$scriptContent = "#!/bin/sh\n\ncd " . $serverDir . "\njava -Xmx2048M -Xms2048M -jar server_" . $params['serverVersion'] . ".jar nogui";
fwrite($scriptFile, $scriptContent);
fclose($scriptFile);
chmod($scriptFilePath, 0755);

View File

@ -1,17 +0,0 @@
<?php
namespace BitGoblin\MCST\Runners;
class RefreshServerDownloads {
protected $config;
public function __construct($config) {
$this->config = $config;
}
public function start() {
echo "Refreshing server download URLs...\n";
}
}

View File

@ -1,45 +0,0 @@
<?php
use Noodlehaus\Config;
use Noodlehaus\Parser\Json;
use Pheanstalk\Pheanstalk;
use BitGoblin\MCST\Runners\RefreshServerDownloads;
require __DIR__ . '/../vendor/autoload.php';
// Load app configuration
$config = Config::load(__DIR__ . '/../conf/defaults.json');
// create pheanstalk object
$pheanstalk = Pheanstalk::create($config->get('beanstalkd.host'), $config->get('beanstalkd.port'));
// we want jobs from 'mcst' tube only.
$pheanstalk->watch('mcst');
while (true) {
echo "Waiting for a new job...\n";
// try to reserve a job
$job = $pheanstalk->reserve();
// check if we actually got a job before trying to do work
if (isset($job)) {
$jobPayload = $job->getData();
switch ($jobPayload) {
case 'refresh-server-downloads':
$rsd = new RefreshServerDownloads($config);
$rsd->start();
break;
default:
echo "Runner command " . $jobPayload . " isn't supported.\n";
break;
}
// remove job
$pheanstalk->delete($job);
}
sleep(60);
}