From f7ff62c01baa8cb891369ad952eb5e43f383dc0a Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 17 Jun 2024 18:33:48 +0930 Subject: [PATCH] Mail bundling and processing performance improvements --- app/Classes/FTN/Packet.php | 35 ++++++------ app/Classes/FTN/Packet/FSC39.php | 66 ++++++++++----------- app/Classes/FTN/Packet/FSC45.php | 46 +++++++-------- app/Classes/FTN/Packet/FSC48.php | 68 +++++++++++----------- app/Classes/FTN/Packet/FTS1.php | 48 +++++++--------- app/Classes/File/Mail.php | 4 +- app/Classes/File/Send.php | 1 + app/Console/Commands/Debug/PacketDump.php | 7 +-- app/Models/Address.php | 70 +++++++++++++++-------- app/Models/Echomail.php | 5 +- app/Models/System.php | 1 + app/Traits/MessageAttributes.php | 2 +- app/helpers.php | 26 ++++++--- 13 files changed, 198 insertions(+), 181 deletions(-) diff --git a/app/Classes/FTN/Packet.php b/app/Classes/FTN/Packet.php index 34ba3f7..74c9871 100644 --- a/app/Classes/FTN/Packet.php +++ b/app/Classes/FTN/Packet.php @@ -52,9 +52,10 @@ abstract class Packet extends FTNBase implements \Iterator, \Countable protected Address $fftn_p; // Address the packet is from (when packing messages) protected Address $tftn_p; // Address the packet is to (when packing messages) protected Collection $messages; // Messages in the Packet + protected string $content; // Outgoing packet data public Collection $errors; // Messages that fail validation protected int $index; // Our array index - protected $pass_p = NULL; // Overwrite the packet password (when packing messages) + protected $pass_p = NULL; // Overwrite the packet password (when packing messages) /* ABSTRACT */ @@ -67,7 +68,7 @@ abstract class Packet extends FTNBase implements \Iterator, \Countable * @return bool */ abstract public static function is_type(string $header): bool; - abstract protected function header(): string; + abstract protected function header(Collection $msgs): string; /* STATIC */ @@ -287,20 +288,7 @@ abstract class Packet extends FTNBase implements \Iterator, \Countable */ public function __toString(): string { - if (empty($this->messages)) - throw new InvalidPacketException('Refusing to make an empty packet'); - - if (empty($this->tftn_p) || empty($this->fftn_p)) - throw new InvalidPacketException('Cannot generate a packet without a destination address'); - - $return = $this->header(); - - foreach ($this->messages as $o) - $return .= self::PACKED_MSG_LEAD.$o->packet($this->tftn_p); - - $return .= "\00\00"; - - return $return; + return $this->content; } /* INTERFACE */ @@ -360,7 +348,20 @@ abstract class Packet extends FTNBase implements \Iterator, \Countable public function mail(Collection $msgs): self { - $this->messages = $msgs; + if (! $msgs->count()) + throw new InvalidPacketException('Refusing to make an empty packet'); + + if (empty($this->tftn_p) || empty($this->fftn_p)) + throw new InvalidPacketException('Cannot generate a packet without a destination address'); + + $this->content = $this->header($msgs); + + foreach ($msgs as $o) + $this->content .= self::PACKED_MSG_LEAD.$o->packet($this->tftn_p); + + $this->content .= "\00\00"; + + $this->messages = $msgs->map(fn($item)=>$item->only(['id','date'])); return $this; } diff --git a/app/Classes/FTN/Packet/FSC39.php b/app/Classes/FTN/Packet/FSC39.php index f1bd77e..783728a 100644 --- a/app/Classes/FTN/Packet/FSC39.php +++ b/app/Classes/FTN/Packet/FSC39.php @@ -3,6 +3,7 @@ namespace App\Classes\FTN\Packet; use Illuminate\Support\Arr; +use Illuminate\Support\Collection; use App\Classes\FTN\Packet; use App\Models\Setup; @@ -62,44 +63,39 @@ final class FSC39 extends Packet /** * Create our message packet header */ - protected function header(): string + protected function header(Collection $msgs): string { $oldest = $this->messages->sortBy('datetime')->last(); - try { - return pack(collect(self::HEADER)->pluck(1)->join(''), - $this->fftn_p->node_id, // Orig Node - $this->tftn_p->node_id, // Dest Node - $oldest->datetime->format('Y'), // Year - $oldest->datetime->format('m')-1, // Month - $oldest->datetime->format('d'), // Day - $oldest->datetime->format('H'), // Hour - $oldest->datetime->format('i'), // Minute - $oldest->datetime->format('s'), // Second - 0, // Baud - 2, // Packet Version (should be 2) - $this->fftn_p->host_id, // Orig Net - $this->tftn_p->host_id, // Dest Net - (Setup::PRODUCT_ID & 0xff), // Product Code Lo - Setup::PRODUCT_VERSION_MAJ, // Product Version Major - $this->pass_p ?: $this->tftn_p->pass_packet, // Packet Password - $this->fftn_p->zone->zone_id, // Orig Zone - $this->tftn_p->zone->zone_id, // Dest Zone - '', // Reserved - static::VERS, // fsc-0039.004 (copy of 0x2c) - ((Setup::PRODUCT_ID >> 8) & 0xff), // Product Code Hi - Setup::PRODUCT_VERSION_MIN, // Product Version Minor - static::VERS, // Capability Word - $this->fftn_p->zone->zone_id, // Orig Zone - $this->tftn_p->zone->zone_id, // Dest Zone - $this->fftn_p->point_id, // Orig Point - $this->tftn_p->point_id, // Dest Point - strtoupper(hexstr(Setup::PRODUCT_ID)), // ProdData - ); - - } catch (\Exception $e) { - return $e->getMessage(); - } + return pack(collect(self::HEADER)->pluck(1)->join(''), + $this->fftn_p->node_id, // Orig Node + $this->tftn_p->node_id, // Dest Node + $oldest->datetime->format('Y'), // Year + $oldest->datetime->format('m')-1, // Month + $oldest->datetime->format('d'), // Day + $oldest->datetime->format('H'), // Hour + $oldest->datetime->format('i'), // Minute + $oldest->datetime->format('s'), // Second + 0, // Baud + 2, // Packet Version (should be 2) + $this->fftn_p->host_id, // Orig Net + $this->tftn_p->host_id, // Dest Net + (Setup::PRODUCT_ID & 0xff), // Product Code Lo + Setup::PRODUCT_VERSION_MAJ, // Product Version Major + $this->pass_p ?: $this->tftn_p->pass_packet, // Packet Password + $this->fftn_p->zone->zone_id, // Orig Zone + $this->tftn_p->zone->zone_id, // Dest Zone + '', // Reserved + static::VERS, // fsc-0039.004 (copy of 0x2c) + ((Setup::PRODUCT_ID >> 8) & 0xff), // Product Code Hi + Setup::PRODUCT_VERSION_MIN, // Product Version Minor + static::VERS, // Capability Word + $this->fftn_p->zone->zone_id, // Orig Zone + $this->tftn_p->zone->zone_id, // Dest Zone + $this->fftn_p->point_id, // Orig Point + $this->tftn_p->point_id, // Dest Point + strtoupper(hexstr(Setup::PRODUCT_ID)), // ProdData + ); } /** diff --git a/app/Classes/FTN/Packet/FSC45.php b/app/Classes/FTN/Packet/FSC45.php index 5560704..9425f1b 100644 --- a/app/Classes/FTN/Packet/FSC45.php +++ b/app/Classes/FTN/Packet/FSC45.php @@ -3,6 +3,7 @@ namespace App\Classes\FTN\Packet; use Illuminate\Support\Arr; +use Illuminate\Support\Collection; use App\Classes\FTN\Packet; use App\Models\Setup; @@ -54,32 +55,27 @@ final class FSC45 extends Packet /** * Create our message packet header */ - protected function header(): string + protected function header(Collection $msgs): string { - try { - return pack(collect(self::HEADER)->pluck(1)->join(''), - $this->fftn_p->node_id, // Orig Node - $this->tftn_p->node_id, // Dest Node - $this->fftn_p->point_id, // Orig Point - $this->tftn_p->point_id, // Dest Point - '', // Reserved - 2, // Sub Version (should be 2) - 2, // Packet Version (should be 2) - $this->fftn_p->host_id, // Orig Net - $this->tftn_p->host_id, // Dest Net - (Setup::PRODUCT_ID & 0xff), // Product Code - Setup::PRODUCT_VERSION_MAJ, // Product Version - $this->pass_p ?: $this->tftn_p->pass_packet, // Packet Password - $this->fftn_p->zone->zone_id, // Orig Zone - $this->tftn_p->zone->zone_id, // Dest Zone - $this->fftn_p->zone->domain->name, // Orig Domain - $this->tftn_p->zone->domain->name, // Dest Domain - strtoupper(hexstr(Setup::PRODUCT_ID)), // ProdData - ); - - } catch (\Exception $e) { - return $e->getMessage(); - } + return pack(collect(self::HEADER)->pluck(1)->join(''), + $this->fftn_p->node_id, // Orig Node + $this->tftn_p->node_id, // Dest Node + $this->fftn_p->point_id, // Orig Point + $this->tftn_p->point_id, // Dest Point + '', // Reserved + 2, // Sub Version (should be 2) + 2, // Packet Version (should be 2) + $this->fftn_p->host_id, // Orig Net + $this->tftn_p->host_id, // Dest Net + (Setup::PRODUCT_ID & 0xff), // Product Code + Setup::PRODUCT_VERSION_MAJ, // Product Version + $this->pass_p ?: $this->tftn_p->pass_packet, // Packet Password + $this->fftn_p->zone->zone_id, // Orig Zone + $this->tftn_p->zone->zone_id, // Dest Zone + $this->fftn_p->zone->domain->name, // Orig Domain + $this->tftn_p->zone->domain->name, // Dest Domain + strtoupper(hexstr(Setup::PRODUCT_ID)), // ProdData + ); } /** diff --git a/app/Classes/FTN/Packet/FSC48.php b/app/Classes/FTN/Packet/FSC48.php index 6fa1b94..09fbe3b 100644 --- a/app/Classes/FTN/Packet/FSC48.php +++ b/app/Classes/FTN/Packet/FSC48.php @@ -3,6 +3,7 @@ namespace App\Classes\FTN\Packet; use Illuminate\Support\Arr; +use Illuminate\Support\Collection; use App\Classes\FTN\Packet; use App\Models\Setup; @@ -62,44 +63,39 @@ final class FSC48 extends Packet /** * Create our message packet header */ - protected function header(): string + protected function header(Collection $msgs): string { - $oldest = $this->messages->sortBy('datetime')->last(); + $oldest = $msgs->sortBy('date')->last(); - try { - return pack(collect(self::HEADER)->pluck(1)->join(''), - $this->fftn_p->node_id, // Orig Node - $this->tftn_p->node_id, // Dest Node - $oldest->datetime->format('Y'), // Year - $oldest->datetime->format('m')-1, // Month - $oldest->datetime->format('d'), // Day - $oldest->datetime->format('H'), // Hour - $oldest->datetime->format('i'), // Minute - $oldest->datetime->format('s'), // Second - 0, // Baud - 2, // Packet Version (should be 2) - $this->fftn_p->point_id ? 0xffff : $this->fftn_p->host_id, // Orig Net (0xFFFF when OrigPoint != 0) - $this->tftn_p->host_id, // Dest Net - (Setup::PRODUCT_ID & 0xff), // Product Code Lo - Setup::PRODUCT_VERSION_MAJ, // Product Version Major - $this->pass_p ?: $this->tftn_p->pass_packet, // Packet Password - $this->fftn_p->zone->zone_id, // Orig Zone - $this->tftn_p->zone->zone_id, // Dest Zone - $this->fftn_p->point_id ? $this->fftn_p->host_id : 0x00, // Aux Net - static::VERS, // fsc-0039.004 (copy of 0x2c) - ((Setup::PRODUCT_ID >> 8) & 0xff), // Product Code Hi - Setup::PRODUCT_VERSION_MIN, // Product Version Minor - static::VERS, // Capability Word - $this->fftn_p->zone->zone_id, // Orig Zone - $this->tftn_p->zone->zone_id, // Dest Zone - $this->fftn_p->point_id, // Orig Point - $this->tftn_p->point_id, // Dest Point - strtoupper(hexstr(Setup::PRODUCT_ID)), // ProdData - ); - - } catch (\Exception $e) { - return $e->getMessage(); - } + return pack(collect(self::HEADER)->pluck(1)->join(''), + $this->fftn_p->node_id, // Orig Node + $this->tftn_p->node_id, // Dest Node + $oldest->datetime->format('Y'), // Year + $oldest->datetime->format('m')-1, // Month + $oldest->datetime->format('d'), // Day + $oldest->datetime->format('H'), // Hour + $oldest->datetime->format('i'), // Minute + $oldest->datetime->format('s'), // Second + 0, // Baud + 2, // Packet Version (should be 2) + $this->fftn_p->point_id ? 0xffff : $this->fftn_p->host_id, // Orig Net (0xFFFF when OrigPoint != 0) + $this->tftn_p->host_id, // Dest Net + (Setup::PRODUCT_ID & 0xff), // Product Code Lo + Setup::PRODUCT_VERSION_MAJ, // Product Version Major + $this->pass_p ?: $this->tftn_p->pass_packet, // Packet Password + $this->fftn_p->zone->zone_id, // Orig Zone + $this->tftn_p->zone->zone_id, // Dest Zone + $this->fftn_p->point_id ? $this->fftn_p->host_id : 0x00, // Aux Net + static::VERS, // fsc-0039.004 (copy of 0x2c) + ((Setup::PRODUCT_ID >> 8) & 0xff), // Product Code Hi + Setup::PRODUCT_VERSION_MIN, // Product Version Minor + static::VERS, // Capability Word + $this->fftn_p->zone->zone_id, // Orig Zone + $this->tftn_p->zone->zone_id, // Dest Zone + $this->fftn_p->point_id, // Orig Point + $this->tftn_p->point_id, // Dest Point + strtoupper(hexstr(Setup::PRODUCT_ID)), // ProdData + ); } /** diff --git a/app/Classes/FTN/Packet/FTS1.php b/app/Classes/FTN/Packet/FTS1.php index 6264ae2..2543159 100644 --- a/app/Classes/FTN/Packet/FTS1.php +++ b/app/Classes/FTN/Packet/FTS1.php @@ -3,6 +3,7 @@ namespace App\Classes\FTN\Packet; use Illuminate\Support\Arr; +use Illuminate\Support\Collection; use App\Classes\FTN\Packet; use App\Models\Setup; @@ -55,35 +56,30 @@ final class FTS1 extends Packet /** * Create our message packet header */ - protected function header(): string + protected function header(Collection $msgs): string { $oldest = $this->messages->sortBy('datetime')->last(); - try { - return pack(collect(self::HEADER)->pluck(1)->join(''), - $this->fftn_p->node_id, // Orig Node - $this->tftn_p->node_id, // Dest Node - $oldest->datetime->format('Y'), // Year - $oldest->datetime->format('m')-1, // Month - $oldest->datetime->format('d'), // Day - $oldest->datetime->format('H'), // Hour - $oldest->datetime->format('i'), // Minute - $oldest->datetime->format('s'), // Second - 0, // Baud - 2, // Packet Version (should be 2) - $this->fftn_p->host_id, // Orig Net - $this->tftn_p->host_id, // Dest Net - (Setup::PRODUCT_ID & 0xff), // Product Code Lo - Setup::PRODUCT_VERSION_MAJ, // Product Version Major - $this->pass_p ?: $this->tftn_p->pass_packet, // Packet Password - $this->fftn_p->zone->zone_id, // Orig Zone - $this->tftn_p->zone->zone_id, // Dest Zone - '', // Reserved - ); - - } catch (\Exception $e) { - return $e->getMessage(); - } + return pack(collect(self::HEADER)->pluck(1)->join(''), + $this->fftn_p->node_id, // Orig Node + $this->tftn_p->node_id, // Dest Node + $oldest->datetime->format('Y'), // Year + $oldest->datetime->format('m')-1, // Month + $oldest->datetime->format('d'), // Day + $oldest->datetime->format('H'), // Hour + $oldest->datetime->format('i'), // Minute + $oldest->datetime->format('s'), // Second + 0, // Baud + 2, // Packet Version (should be 2) + $this->fftn_p->host_id, // Orig Net + $this->tftn_p->host_id, // Dest Net + (Setup::PRODUCT_ID & 0xff), // Product Code Lo + Setup::PRODUCT_VERSION_MAJ, // Product Version Major + $this->pass_p ?: $this->tftn_p->pass_packet, // Packet Password + $this->fftn_p->zone->zone_id, // Orig Zone + $this->tftn_p->zone->zone_id, // Dest Zone + '', // Reserved + ); } /** diff --git a/app/Classes/File/Mail.php b/app/Classes/File/Mail.php index 354eebe..55441a2 100644 --- a/app/Classes/File/Mail.php +++ b/app/Classes/File/Mail.php @@ -44,9 +44,6 @@ final class Mail extends Send case 'mtime': return $this->youngest()->timestamp; - case 'size': - return strlen($this->f); - case 'type': return ($this->ftype&0xff00)>>8; @@ -99,6 +96,7 @@ final class Mail extends Send public function open(string $compress=''): bool { $this->content = (string)$this->f; + $this->size = strlen($this->content); return TRUE; } diff --git a/app/Classes/File/Send.php b/app/Classes/File/Send.php index b0a17cf..2bb7d91 100644 --- a/app/Classes/File/Send.php +++ b/app/Classes/File/Send.php @@ -34,6 +34,7 @@ class Send extends Base public const T_ECHOMAIL = (1<<2); private string $comp_data; + protected int $size = 0; public function __construct() { diff --git a/app/Console/Commands/Debug/PacketDump.php b/app/Console/Commands/Debug/PacketDump.php index 1cf1fb4..a5e8610 100644 --- a/app/Console/Commands/Debug/PacketDump.php +++ b/app/Console/Commands/Debug/PacketDump.php @@ -16,8 +16,7 @@ class PacketDump extends Command protected $signature = 'debug:packet:dump'. ' {type : Type of packet, netmail|echomail }'. ' {ftn : FTN}'. - ' {file? : filename}'. - ' {--dump : Dump packet}'; + ' {file? : filename}'; /** * The console command description. @@ -50,11 +49,11 @@ class PacketDump extends Command throw new \Exception('Unknown type: '.$this->argument('type')); } - if ($this->option('dump')) { + if (! $this->argument('file')) { $this->info('Item Name:'.$pkt->name); $this->info('Item Type:'.get_class($pkt)); $this->info('Dump:'); - echo hex_dump($pkt); + echo hex_dump((string)$pkt); } else { $f = fopen($this->argument('file'),'w+'); diff --git a/app/Models/Address.php b/app/Models/Address.php index c431ad4..f6b37ce 100644 --- a/app/Models/Address.php +++ b/app/Models/Address.php @@ -209,6 +209,7 @@ class Address extends Model $o = $query ->where('region_id',$ftn['n']) ->where('host_id',$ftn['n']) + ->with(['system:id,active']) ->first(); // Look for a normal address @@ -223,15 +224,16 @@ class Address extends Model }) ->orWhere('host_id',$ftn['n']); }) + ->with(['system:id,active']) ->first(); // Check and see if we are a flattened domain, our address might be available with a different zone. // This occurs when we are parsing 2D addresses from SEEN-BY, but we have the zone if (! $o && ($ftn['p'] === 0)) { if ($ftn['d']) - $do = Domain::where(['name'=>$ftn['d']])->single(); + $do = Domain::select('flatten')->where(['name'=>$ftn['d']])->single(); else { - $zo = Zone::where('zone_id',$ftn['z'])->where('default',TRUE)->single(); + $zo = Zone::where('zone_id',$ftn['z'])->where('default',TRUE)->with(['domain:id,flatten'])->single(); $do = $zo?->domain; } @@ -393,8 +395,11 @@ class Address extends Model */ public function scopeFTN($query) { - return $query->select(['addresses.zone_id','host_id','node_id','point_id']) - ->with('zone.domain'); + return $query->select(['id','addresses.zone_id','host_id','node_id','point_id']) + ->with([ + 'zone:zones.id,zone_id', + 'zone.domain:domains.id,name', + ]); } public function scopeFTNOrder($query) @@ -597,9 +602,9 @@ class Address extends Model public function nodes_hub(): HasMany { return $this->hasMany(Address::class,'hub_id','id') + ->FTN() ->active() - ->FTNorder() - ->with(['zone.domain']); + ->FTNorder(); } /** @@ -618,7 +623,7 @@ class Address extends Model ->whereNot('id',$this->id) ->active() ->FTNorder() - ->with(['zone.domain']), + ->with(['zone:id,zone_id']), $this, NULL, ($this->role_id === self::NODE_NC) ? 'id' : NULL) @@ -642,7 +647,7 @@ class Address extends Model ->whereNot('id',$this->id) ->active() ->FTNorder() - ->with(['zone.domain']), + ->with(['zone:id,zone_id']), $this, NULL, ($this->role_id !== self::NODE_POINT) ? 'id' : NULL) @@ -659,7 +664,7 @@ class Address extends Model ->whereNot('id',$this->id) ->active() ->FTNorder() - ->with(['zone.domain']), + ->with(['zone:id,zone_id']), $this, NULL, ($this->role_id === self::NODE_RC) ? 'id' : NULL) @@ -675,7 +680,7 @@ class Address extends Model ->whereNot('id',$this->id) ->active() ->FTNorder() - ->with(['zone.domain']), + ->with(['zone:id,zone_id']), $this, NULL, ($this->role_id === self::NODE_ZC) ? 'id' : NULL) @@ -722,6 +727,9 @@ class Address extends Model */ public function getFTNAttribute(): string { + if (! $this->relationLoaded('zone')) + $this->load(['zone:id,domain_id,zone_id','zone.domain:domains.id,name']); + return sprintf('%s@%s',$this->getFTN4DAttribute(),$this->zone->domain->name); } @@ -732,11 +740,17 @@ class Address extends Model public function getFTN3DAttribute(): string { + if (! $this->relationLoaded('zone')) + $this->load(['zone:id,zone_id']); + return sprintf('%d:%s',$this->zone->zone_id,$this->getFTN2DAttribute()); } public function getFTN4DAttribute(): string { + if (! $this->relationLoaded('zone')) + $this->load(['zone:id,zone_id']); + return sprintf('%s.%d',$this->getFTN3DAttribute(),$this->point_id); } @@ -998,20 +1012,28 @@ class Address extends Model /** * Echomail waiting to be sent to this system * - * @param int|null $max * @return Builder */ - public function echomailWaiting(int $max=NULL): Builder + public function echomailWaiting(): Builder { - $echomails = $this - ->UncollectedEchomail() - ->select('echomails.id') - ->where('addresses.id',$this->id) - ->when($max,function($query) use ($max) { return $query->limit($max); }) - ->groupBy(['echomails.id']) - ->get(); - - return Echomail::whereIn('id',$echomails->pluck('id')); + return Echomail::select('echomails.*') + ->join('echomail_seenby',['echomail_seenby.echomail_id'=>'echomails.id']) + ->where('address_id',$this->id) + ->whereNull('echomails.deleted_at') + ->whereNotNull('export_at') + ->whereNull('sent_at') + ->orderby('id') + ->with([ + 'tagline:id,value', + 'tearline:id,value', + 'origin:id,value', + 'echoarea:id,name,domain_id', + 'echoarea.domain:id,name', + 'fftn:id,zone_id,host_id,node_id,point_id', + 'fftn.zone:id,domain_id,zone_id', + 'fftn.zone.domain:id,name', + ]) + ->dontCache(); } /** @@ -1076,11 +1098,11 @@ class Address extends Model */ public function getEchomail(): ?Packet { - if (($num=$this->echomailWaiting())->count()) { - Log::info(sprintf('%s:= Got [%d] echomails for [%s] for sending',self::LOGKEY,$num->count(),$this->ftn)); + if ($count=($num=$this->echomailWaiting())->count()) { + Log::info(sprintf('%s:= Got [%d] echomails for [%s] for sending',self::LOGKEY,$count,$this->ftn)); // Limit to max messages - if ($num->count() > $this->system->pkt_msgs) + if ($count > $this->system->pkt_msgs) Log::notice(sprintf('%s:= Only sending [%d] echomails for [%s]',self::LOGKEY,$this->system->pkt_msgs,$this->ftn)); return $this->system->packet($this)->mail($num->take($this->system->pkt_msgs)->get()); diff --git a/app/Models/Echomail.php b/app/Models/Echomail.php index fecc9a1..78bf1bb 100644 --- a/app/Models/Echomail.php +++ b/app/Models/Echomail.php @@ -280,12 +280,14 @@ final class Echomail extends Model implements Packet public function echoarea() { - return $this->belongsTo(Echoarea::class); + return $this->belongsTo(Echoarea::class) + ->select('id','name','domain_id'); } public function seenby() { return $this->belongsToMany(Address::class,'echomail_seenby') + ->select(['id','zone_id','host_id','node_id']) ->withPivot(['export_at','sent_at','sent_pkt']) ->FTN2DOrder(); } @@ -293,6 +295,7 @@ final class Echomail extends Model implements Packet public function path() { return $this->belongsToMany(Address::class,'echomail_path') + ->select(['addresses.id','zone_id','host_id','node_id']) ->withPivot(['id','parent_id','recv_pkt','recv_at']) ->orderBy('id','DESC'); } diff --git a/app/Models/System.php b/app/Models/System.php index e844099..62b393c 100644 --- a/app/Models/System.php +++ b/app/Models/System.php @@ -110,6 +110,7 @@ class System extends Model public function sessions() { return $this->belongsToMany(Zone::class) + ->select(['id','zones.zone_id','domain_id','active']) ->withPivot(['sespass','pktpass','ticpass','fixpass','zt_ipv4','zt_ipv6','default']) ->dontCache(); } diff --git a/app/Traits/MessageAttributes.php b/app/Traits/MessageAttributes.php index 94deb69..bc5becd 100644 --- a/app/Traits/MessageAttributes.php +++ b/app/Traits/MessageAttributes.php @@ -160,7 +160,7 @@ trait MessageAttributes */ public function packet(Address $ao): Message { - Log::debug(sprintf('%s:+ Bundling [%s] for [%s]',self::LOGKEY,$this->id,$ao->ftn),['type'=>get_class($this)]); + Log::debug(sprintf('%s:+ Bundling [%s] for [%s]',self::LOGKEY,$this->id,$ao->ftn3d),['type'=>get_class($this)]); // For echomail, our tftn is this address if ($this instanceof Echomail) diff --git a/app/helpers.php b/app/helpers.php index 70fb4c7..54cfc0c 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -98,7 +98,12 @@ function our_address(Domain|Address $o=NULL): Collection|Address|NULL }); $our = Cache::remember(sprintf('%d-akas',$so->system_id),60,function() use ($so) { - $so->load(['system.akas.zone.domain']); + $so->load([ + 'system:id,name', + 'system.akas:addresses.id,addresses.zone_id,host_id,node_id,point_id,addresses.system_id,addresses.active,role', + 'system.akas.zone:id,domain_id,zone_id', + 'system.akas.zone.domain:id,name', + ]); return $so->system->akas; }); @@ -114,16 +119,20 @@ function our_address(Domain|Address $o=NULL): Collection|Address|NULL // We are requesting a list of addresses for a Domain, or a specific Address, and we have more than 1 switch (get_class($o)) { case Address::class: - $filter = $our->filter(function($item) use ($o) { return $item->zone->domain_id === $o->zone->domain_id; })->sortBy('role'); + $filter = $our + ->filter(fn($item)=>$item->zone->domain_id === $o->zone->domain_id) + ->sortBy('role_id'); // If we are looking for a specific address, and there is only 1 result, return it, otherwise return what we have - if (config('fido.strict') && ($x=$filter->filter(function($item) use ($o) { return $item->role_id <= $o->role_id; })->sortBy('role'))->count()) + if (config('fido.strict') && ($x=$filter->filter(fn($item)=>$item->role_id <= $o->role_id)->sortBy('role_id'))->count()) $filter = $x; - return $filter->last(); + return $filter->count() ? $filter->last()->unsetRelation('nodes_hub') : NULL; case Domain::class: - return $our->filter(function($item) use ($o) { return $item->zone->domain_id === $o->id; })->sortBy('role'); + return $our + ->filter(fn($item)=>$item->zone->domain_id === $o->id) + ->sortBy('role_id'); // We shouldnt get here default: @@ -171,11 +180,10 @@ function our_nodes(Domain $do=NULL): Collection { return Address::select(['addresses.id','addresses.zone_id','region_id','host_id','node_id','point_id','addresses.system_id','role']) ->join('system_zone',['system_zone.system_id'=>'addresses.system_id','system_zone.zone_id'=>'addresses.zone_id']) - ->when(! is_null($do),function($query) use ($do) { - return $query + ->when(! is_null($do), + fn($query)=>$query ->join('zones',['zones.id'=>'addresses.zone_id']) - ->where('domain_id',$do->id); - }) + ->where('domain_id',$do->id)) ->active() ->FTNorder() ->get();