From bb0900093d29c5847f67dbc9464157e44a59d743 Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 28 Dec 2024 22:39:20 +0000 Subject: [PATCH 1/9] refactor chdir() call --- bin/jetstream.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/bin/jetstream.php b/bin/jetstream.php index c4075ff652..9764c38e51 100755 --- a/bin/jetstream.php +++ b/bin/jetstream.php @@ -23,16 +23,7 @@ if (php_sapi_name() !== 'cli') { } // Ensure that Jetstream.php is executed from the base path of the installation -if (!file_exists('index.php') && (sizeof((array)$_SERVER['argv']) != 0)) { - $directory = dirname($_SERVER['argv'][0]); - - if (substr($directory, 0, 1) != '/') { - $directory = $_SERVER['PWD'] . '/' . $directory; - } - $directory = realpath($directory . '/..'); - - chdir($directory); -} +chdir(dirname(__DIR__)); require dirname(__DIR__) . '/vendor/autoload.php'; From 24ce6180c45926205340c293dafa0ce13ded75fe Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 28 Dec 2024 22:44:23 +0000 Subject: [PATCH 2/9] require dice dependency --- bin/jetstream.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/jetstream.php b/bin/jetstream.php index 9764c38e51..2a3b5999fa 100755 --- a/bin/jetstream.php +++ b/bin/jetstream.php @@ -27,7 +27,8 @@ chdir(dirname(__DIR__)); require dirname(__DIR__) . '/vendor/autoload.php'; -$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php'); +$dice = (new Dice())->addRules(require(dirname(__DIR__) . '/static/dependencies.config.php')); + /** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */ $addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class); $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); From 6e44d6c7e4cd27da97a1e16151866abe70690fea Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 28 Dec 2024 22:50:49 +0000 Subject: [PATCH 3/9] add shutdown handler as anonymous function --- bin/jetstream.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bin/jetstream.php b/bin/jetstream.php index 2a3b5999fa..eae05b8580 100755 --- a/bin/jetstream.php +++ b/bin/jetstream.php @@ -148,7 +148,10 @@ if (!$foreground) { } // We now are in the child process - register_shutdown_function('shutdown'); + register_shutdown_function(function (): void { + posix_kill(posix_getpid(), SIGTERM); + posix_kill(posix_getpid(), SIGHUP); + }); // Make the child the main process, detach it from the terminal if (posix_setsid() < 0) { @@ -168,9 +171,3 @@ set_time_limit(0); // Now running as a daemon. $jetstream = $dice->create(Jetstream::class); $jetstream->listen(); - -function shutdown() -{ - posix_kill(posix_getpid(), SIGTERM); - posix_kill(posix_getpid(), SIGHUP); -} From 318c57df12e17fd287fefb9ad2303c8442735cbc Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 28 Dec 2024 22:53:54 +0000 Subject: [PATCH 4/9] Inline jetstream.php code into App::processJetstream() --- bin/jetstream.php | 143 +------------------------------------------ src/App.php | 150 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 141 deletions(-) diff --git a/bin/jetstream.php b/bin/jetstream.php index eae05b8580..85889febe0 100755 --- a/bin/jetstream.php +++ b/bin/jetstream.php @@ -29,145 +29,6 @@ require dirname(__DIR__) . '/vendor/autoload.php'; $dice = (new Dice())->addRules(require(dirname(__DIR__) . '/static/dependencies.config.php')); -/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */ -$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class); -$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); -$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capability\LogChannel::DAEMON]]); +$app = \Friendica\App::fromDice($dice); -DI::init($dice); -\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class)); -Addon::loadAddons(); -Hook::loadHooks(); -DI::config()->reload(); - -if (DI::mode()->isInstall()) { - die("Friendica isn't properly installed yet.\n"); -} - -if (empty(DI::config()->get('jetstream', 'pidfile'))) { - die(<< [ - 'pidfile' => '/path/to/jetstream.pid', - ], -TXT); -} - -if (!Addon::isEnabled('bluesky')) { - die("Bluesky has to be enabled.\n"); -} - -$pidfile = DI::config()->get('jetstream', 'pidfile'); - -if (in_array('start', (array)$_SERVER['argv'])) { - $mode = 'start'; -} - -if (in_array('stop', (array)$_SERVER['argv'])) { - $mode = 'stop'; -} - -if (in_array('status', (array)$_SERVER['argv'])) { - $mode = 'status'; -} - -if (!isset($mode)) { - die("Please use either 'start', 'stop' or 'status'.\n"); -} - -// Get options -$shortopts = 'f'; -$longopts = ['foreground']; -$options = getopt($shortopts, $longopts); - -$foreground = array_key_exists('f', $options) || array_key_exists('foreground', $options); - -if (empty($_SERVER['argv'][0])) { - die("Unexpected script behaviour. This message should never occur.\n"); -} - -$pid = null; - -if (is_readable($pidfile)) { - $pid = intval(file_get_contents($pidfile)); -} - -if (empty($pid) && in_array($mode, ['stop', 'status'])) { - die("Pidfile wasn't found. Is jetstream running?\n"); -} - -if ($mode == 'status') { - if (posix_kill($pid, 0)) { - die("Jetstream process $pid is running.\n"); - } - - unlink($pidfile); - - die("Jetstream process $pid isn't running.\n"); -} - -if ($mode == 'stop') { - posix_kill($pid, SIGTERM); - - unlink($pidfile); - - Logger::notice('Jetstream process was killed', ['pid' => $pid]); - - die("Jetstream process $pid was killed.\n"); -} - -if (!empty($pid) && posix_kill($pid, 0)) { - die("Jetstream process $pid is already running.\n"); -} - -Logger::notice('Starting jetstream daemon.', ['pid' => $pid]); - -if (!$foreground) { - echo "Starting jetstream daemon.\n"; - - DBA::disconnect(); - - // Fork a daemon process - $pid = pcntl_fork(); - if ($pid == -1) { - echo "Daemon couldn't be forked.\n"; - Logger::warning('Could not fork daemon'); - exit(1); - } elseif ($pid) { - // The parent process continues here - if (!file_put_contents($pidfile, $pid)) { - echo "Pid file wasn't written.\n"; - Logger::warning('Could not store pid file'); - posix_kill($pid, SIGTERM); - exit(1); - } - echo 'Child process started with pid ' . $pid . ".\n"; - Logger::notice('Child process started', ['pid' => $pid]); - exit(0); - } - - // We now are in the child process - register_shutdown_function(function (): void { - posix_kill(posix_getpid(), SIGTERM); - posix_kill(posix_getpid(), SIGHUP); - }); - - // Make the child the main process, detach it from the terminal - if (posix_setsid() < 0) { - return; - } - - // Closing all existing connections with the outside - fclose(STDIN); - - // And now connect the database again - DBA::connect(); -} - -// Just to be sure that this script really runs endlessly -set_time_limit(0); - -// Now running as a daemon. -$jetstream = $dice->create(Jetstream::class); -$jetstream->listen(); +$app->processJetstream(); diff --git a/src/App.php b/src/App.php index 99a788b8ca..931e6c542c 100644 --- a/src/App.php +++ b/src/App.php @@ -16,7 +16,9 @@ use Friendica\App\Request; use Friendica\App\Router; use Friendica\Capabilities\ICanCreateResponses; use Friendica\Content\Nav; +use Friendica\Core\Addon; use Friendica\Core\Config\Factory\Config; +use Friendica\Core\Hook; use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; use Friendica\Core\Renderer; use Friendica\Core\Session\Capability\IHandleUserSessions; @@ -26,6 +28,7 @@ use Friendica\Database\Definition\DbaDefinition; use Friendica\Database\Definition\ViewDefinition; use Friendica\DI; use Friendica\Module\Maintenance; +use Friendica\Protocol\ATProtocol\Jetstream; use Friendica\Security\Authentication; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; @@ -435,6 +438,153 @@ class App } } + public function processJetstream(): void + { + /** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */ + $addonLoader = $this->container->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class); + $this->container = $this->container->addRules($addonLoader->getActiveAddonConfig('dependencies')); + + $this->container = $this->container->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capability\LogChannel::DAEMON]]); + + DI::init($this->container); + \Friendica\Core\Logger\Handler\ErrorHandler::register($this->container->create(\Psr\Log\LoggerInterface::class)); + Addon::loadAddons(); + Hook::loadHooks(); + DI::config()->reload(); + + if (DI::mode()->isInstall()) { + die("Friendica isn't properly installed yet.\n"); + } + + if (empty(DI::config()->get('jetstream', 'pidfile'))) { + die(<< [ + 'pidfile' => '/path/to/jetstream.pid', + ], + TXT); + } + + if (!Addon::isEnabled('bluesky')) { + die("Bluesky has to be enabled.\n"); + } + + $pidfile = DI::config()->get('jetstream', 'pidfile'); + + if (in_array('start', (array)$_SERVER['argv'])) { + $mode = 'start'; + } + + if (in_array('stop', (array)$_SERVER['argv'])) { + $mode = 'stop'; + } + + if (in_array('status', (array)$_SERVER['argv'])) { + $mode = 'status'; + } + + if (!isset($mode)) { + die("Please use either 'start', 'stop' or 'status'.\n"); + } + + // Get options + $shortopts = 'f'; + $longopts = ['foreground']; + $options = getopt($shortopts, $longopts); + + $foreground = array_key_exists('f', $options) || array_key_exists('foreground', $options); + + if (empty($_SERVER['argv'][0])) { + die("Unexpected script behaviour. This message should never occur.\n"); + } + + $pid = null; + + if (is_readable($pidfile)) { + $pid = intval(file_get_contents($pidfile)); + } + + if (empty($pid) && in_array($mode, ['stop', 'status'])) { + die("Pidfile wasn't found. Is jetstream running?\n"); + } + + if ($mode == 'status') { + if (posix_kill($pid, 0)) { + die("Jetstream process $pid is running.\n"); + } + + unlink($pidfile); + + die("Jetstream process $pid isn't running.\n"); + } + + if ($mode == 'stop') { + posix_kill($pid, SIGTERM); + + unlink($pidfile); + + Logger::notice('Jetstream process was killed', ['pid' => $pid]); + + die("Jetstream process $pid was killed.\n"); + } + + if (!empty($pid) && posix_kill($pid, 0)) { + die("Jetstream process $pid is already running.\n"); + } + + Logger::notice('Starting jetstream daemon.', ['pid' => $pid]); + + if (!$foreground) { + echo "Starting jetstream daemon.\n"; + + DBA::disconnect(); + + // Fork a daemon process + $pid = pcntl_fork(); + if ($pid == -1) { + echo "Daemon couldn't be forked.\n"; + Logger::warning('Could not fork daemon'); + exit(1); + } elseif ($pid) { + // The parent process continues here + if (!file_put_contents($pidfile, $pid)) { + echo "Pid file wasn't written.\n"; + Logger::warning('Could not store pid file'); + posix_kill($pid, SIGTERM); + exit(1); + } + echo 'Child process started with pid ' . $pid . ".\n"; + Logger::notice('Child process started', ['pid' => $pid]); + exit(0); + } + + // We now are in the child process + register_shutdown_function(function (): void { + posix_kill(posix_getpid(), SIGTERM); + posix_kill(posix_getpid(), SIGHUP); + }); + + // Make the child the main process, detach it from the terminal + if (posix_setsid() < 0) { + return; + } + + // Closing all existing connections with the outside + fclose(STDIN); + + // And now connect the database again + DBA::connect(); + } + + // Just to be sure that this script really runs endlessly + set_time_limit(0); + + // Now running as a daemon. + $jetstream = $this->container->create(Jetstream::class); + $jetstream->listen(); + } + public function processWorker(array $options): void { $this->setupContainerForAddons(); From 8fef32b954eb6c3444f66eeec257ea06ccbbca5d Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 28 Dec 2024 22:57:24 +0000 Subject: [PATCH 5/9] run setup functions --- src/App.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/App.php b/src/App.php index 931e6c542c..f16c2f89fd 100644 --- a/src/App.php +++ b/src/App.php @@ -440,14 +440,14 @@ class App public function processJetstream(): void { - /** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */ - $addonLoader = $this->container->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class); - $this->container = $this->container->addRules($addonLoader->getActiveAddonConfig('dependencies')); + $this->setupContainerForAddons(); - $this->container = $this->container->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capability\LogChannel::DAEMON]]); + $this->setupContainerForLogger(LogChannel::DAEMON); + + $this->setupLegacyServiceLocator(); + + $this->registerErrorHandler(); - DI::init($this->container); - \Friendica\Core\Logger\Handler\ErrorHandler::register($this->container->create(\Psr\Log\LoggerInterface::class)); Addon::loadAddons(); Hook::loadHooks(); DI::config()->reload(); From 1bfcd0ac6e0c5d6f8a9d942f14590dc7da9b2f63 Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 28 Dec 2024 23:00:23 +0000 Subject: [PATCH 6/9] refactor App::processJetstream --- src/App.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/App.php b/src/App.php index f16c2f89fd..472a1cd773 100644 --- a/src/App.php +++ b/src/App.php @@ -450,13 +450,20 @@ class App Addon::loadAddons(); Hook::loadHooks(); - DI::config()->reload(); - if (DI::mode()->isInstall()) { + /** @var IManageConfigValues */ + $config = $this->container->create(IManageConfigValues::class); + + $config->reload(); + + /** @var Mode */ + $mode = $this->container->create(Mode::class); + + if ($mode->isInstall()) { die("Friendica isn't properly installed yet.\n"); } - if (empty(DI::config()->get('jetstream', 'pidfile'))) { + if (empty($config->get('jetstream', 'pidfile'))) { die(<<get('jetstream', 'pidfile'); + $pidfile = $config->get('jetstream', 'pidfile'); if (in_array('start', (array)$_SERVER['argv'])) { $mode = 'start'; From 84d7188f0c826d103de2fb59685a3546badb7b97 Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 28 Dec 2024 23:01:22 +0000 Subject: [PATCH 7/9] remove unused use statements --- bin/jetstream.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/bin/jetstream.php b/bin/jetstream.php index 85889febe0..b2df4d38dc 100755 --- a/bin/jetstream.php +++ b/bin/jetstream.php @@ -9,13 +9,6 @@ */ use Dice\Dice; -use Friendica\Core\Addon; -use Friendica\Core\Hook; -use Friendica\Core\Logger; -use Friendica\Database\DBA; -use Friendica\DI; -use Psr\Log\LoggerInterface; -use Friendica\Protocol\ATProtocol\Jetstream; if (php_sapi_name() !== 'cli') { header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden'); From 0fd84f5864ca86c653cc2993a58e149d2e464d9d Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 28 Dec 2024 23:04:50 +0000 Subject: [PATCH 8/9] Let phpstan check the jetstream.php file --- .phpstan.neon | 1 + 1 file changed, 1 insertion(+) diff --git a/.phpstan.neon b/.phpstan.neon index 6f8b9ddf83..8dfd10deae 100644 --- a/.phpstan.neon +++ b/.phpstan.neon @@ -10,6 +10,7 @@ parameters: - bin/auth_ejabberd.php - bin/console.php - bin/daemon.php + - bin/jetstream.php - bin/worker.php - index.php - src/ From 3309bc818a9188a0bd9e8e583eb42024abddeb0a Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 28 Dec 2024 23:36:15 +0000 Subject: [PATCH 9/9] Fix duplicate usage of the $mode variable --- src/App.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/App.php b/src/App.php index 472a1cd773..f163230ce8 100644 --- a/src/App.php +++ b/src/App.php @@ -480,18 +480,18 @@ class App $pidfile = $config->get('jetstream', 'pidfile'); if (in_array('start', (array)$_SERVER['argv'])) { - $mode = 'start'; + $daemonMode = 'start'; } if (in_array('stop', (array)$_SERVER['argv'])) { - $mode = 'stop'; + $daemonMode = 'stop'; } if (in_array('status', (array)$_SERVER['argv'])) { - $mode = 'status'; + $daemonMode = 'status'; } - if (!isset($mode)) { + if (!isset($daemonMode)) { die("Please use either 'start', 'stop' or 'status'.\n"); } @@ -512,11 +512,11 @@ class App $pid = intval(file_get_contents($pidfile)); } - if (empty($pid) && in_array($mode, ['stop', 'status'])) { + if (empty($pid) && in_array($daemonMode, ['stop', 'status'])) { die("Pidfile wasn't found. Is jetstream running?\n"); } - if ($mode == 'status') { + if ($daemonMode == 'status') { if (posix_kill($pid, 0)) { die("Jetstream process $pid is running.\n"); } @@ -526,7 +526,7 @@ class App die("Jetstream process $pid isn't running.\n"); } - if ($mode == 'stop') { + if ($daemonMode == 'stop') { posix_kill($pid, SIGTERM); unlink($pidfile);