lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-14 12:30:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve Nexus boot

Browse Source
This commit is contained in:
xiaomlove
2022-04-07 15:44:43 +08:00
parent 25a4cdfafc
commit ebe47b1ba3
4 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/Test.php
View File

@@ -134,8 +134,6 @@ class Test extends Command
// $key = "dddd1";
// $model = \App\Models\TorrentSecret::query()->where('id', 1)->first();
// \Nexus\Database\NexusDB::cache_put($key, $model);
$value = NexusDB::cache_get("tracker_report_authkey_secret:1:10002");
dd($value);
}

2
app/Models/Peer.php
View File

@@ -98,7 +98,7 @@ class Peer extends NexusModel
} else {
$this->connectable = self::CONNECTABLE_NO;
}
Cache::put($cacheKey, $this->connectable, 600);
Cache::put($cacheKey, $this->connectable, 3600);
$log .= ", do check, connectable: " . $this->connectable;
} else {
$log .= ", don't do check";

7
app/Repositories/TrackerRepository.php
View File

@@ -826,19 +826,22 @@ class TrackerRepository extends BaseRepository
private function checkScrapeFields(Request $request): array
{
preg_match_all('/info_hash=([^&]*)/i', urldecode($request->getQueryString()), $info_hash_match);
preg_match_all('/info_hash=([^&]*)/i', $request->getQueryString(), $info_hash_match);
$info_hash_array = $info_hash_match[1];
$info_hash_original = [];
if (count($info_hash_array) < 1) {
throw new TrackerException("key: info_hash is Missing !");
} else {
foreach ($info_hash_array as $item) {
$item = urldecode($item);
if (($length = strlen($item)) != 20) {
throw new TrackerException("Invalid info_hash ! info_hash is not 20 bytes long($length)");
}
$info_hash_original[] = $item;
}
}
return $info_hash_array;
return $info_hash_original;
}
/**

71
nexus/Nexus.php
View File

@@ -1,6 +1,9 @@
<?php
namespace Nexus;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
final class Nexus
{
private string $requestId;
@@ -96,8 +99,8 @@ final class Nexus
{
$schema = $this->retrieveFromServer(['HTTP_X_FORWARDED_PROTO', 'REQUEST_SCHEME', 'HTTP_SCHEME']);
if (empty($schema)) {
$tmp = $this->retrieveFromServer(['HTTPS']);
if ($tmp == 'on') {
$https = $this->retrieveFromServer(['HTTPS']);
if ($https == 'on') {
$schema = 'https';
}
}
@@ -106,24 +109,31 @@ final class Nexus
public function getRequestIp()
{
$ip = $this->retrieveFromServer(['HTTP_CF_CONNECTING_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_REMOTE_ADDR']);
if (empty($ip)) {
$ip = request()->getClientIp();
}
return $ip;
return $this->retrieveFromServer(['HTTP_CF_CONNECTING_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_REMOTE_ADDR', 'REMOTE_ADDR']);
}
private function retrieveFromServer(array $fields)
private function retrieveFromServer(array $fields, bool $includeHeader = false)
{
if ($this->runningInOctane()) {
$servers = request()->server();
$headers = request()->header();
} else {
$servers = $_SERVER;
$headers = getallheaders();
}
foreach ($fields as $field) {
if (!empty($servers[$field])) {
do_log("got from $field");
return $servers[$field];
$result = $servers[$field] ?? null;
if ($result !== null && $result !== '') {
return $result;
}
if ($includeHeader) {
$result = $headers[$field] ?? null;
if (is_array($result)) {
$result = Arr::first($result);
}
if ($result !== null && $result !== '') {
return $result;
}
}
}
}
@@ -169,39 +179,20 @@ final class Nexus
private function setRequestId()
{
$requestId = '';
$names = ['HTTP_X_REQUEST_ID', 'REQUEST_ID', 'Request-Id', 'request-id'];
if ($this->runningInOctane()) {
$request = request();
foreach ($names as $name) {
$requestId = $request->server($name, $request->header($name));
if (!empty($requestId)) {
break;
}
}
} else {
foreach ($names as $name) {
$requestId = $_SERVER[$name] ?? '';
if (!empty($requestId)) {
break;
}
}
}
$requestId = $this->retrieveFromServer(['HTTP_X_REQUEST_ID', 'REQUEST_ID', 'Request-Id', 'request-id'], true);
if (empty($requestId)) {
$requestId = $this->generateRequestId();
}
$this->requestId = $requestId;
$this->requestId = (string)$requestId;
}
private function setScript()
{
if ($this->runningInOctane()) {
$request = request();
$script = $request->header('script_filename', '');
} else {
$script = strstr(basename($_SERVER['SCRIPT_FILENAME']), '.', true);
$script = $this->retrieveFromServer(['SCRIPT_FILENAME', 'SCRIPT_NAME', 'Script', 'script'], true);
if (str_contains($script, '.')) {
$script = strstr(basename($script), '.', true);
}
$this->script = $script;
$this->script = (string)$script;
}
private function setStartTimestamp()
@@ -211,13 +202,7 @@ final class Nexus
private function setPlatform()
{
if ($this->runningInOctane()) {
$request = request();
$platform = $request->header('platform', '');
} else {
$platform = $_SERVER['HTTP_PLATFORM'] ?? '';
}
$this->platform = $platform;
$this->platform = (string)$this->retrieveFromServer(['HTTP_PLATFORM', 'Platform', 'platform'], true);
}
public static function js(string $js, string $position, bool $isFile)