Complete rework of packet parsing and packet generation
This commit is contained in:
@@ -1053,6 +1053,8 @@ class Address extends Model
|
||||
if ($passpos > 8)
|
||||
Log::alert(sprintf('%s:! Password would be greater than 8 chars? [%d]',self::LOGKEY,$passpos));
|
||||
|
||||
// @todo Do the strip pass where, if we dont want the password in the netmail
|
||||
|
||||
$pkt = $this->getPacket($x,substr($x->last()->subject,0,$passpos));
|
||||
|
||||
if ($pkt && $pkt->count() && $update)
|
||||
@@ -1091,8 +1093,9 @@ class Address extends Model
|
||||
* @param string|null $passwd Override password used in packet
|
||||
* @return Packet|null
|
||||
* @throws \Exception
|
||||
* @deprecated
|
||||
*/
|
||||
public function getPacket(Collection $msgs,string $passwd=NULL): ?Packet
|
||||
private function getPacket(Collection $msgs,string $passwd=NULL): ?Packet
|
||||
{
|
||||
$s = Setup::findOrFail(config('app.id'));
|
||||
$ao = our_address($this);
|
||||
@@ -1104,7 +1107,7 @@ class Address extends Model
|
||||
}
|
||||
|
||||
// Get packet type
|
||||
$o = $ao->system->packet();
|
||||
$o = $ao->system->packet($this);
|
||||
$o->addressHeader($ao,$this,$passwd);
|
||||
|
||||
// $oo = Netmail/Echomail Model
|
||||
|
@@ -10,54 +10,77 @@ use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
use App\Casts\{CollectionOrNull,CompressedString};
|
||||
use App\Classes\FTN\Message;
|
||||
use App\Interfaces\Packet;
|
||||
use App\Traits\{EncodeUTF8,MsgID,ParseAddresses,QueryCacheableConfig};
|
||||
use App\Traits\{MessageAttributes,MsgID,ParseAddresses,QueryCacheableConfig};
|
||||
|
||||
final class Echomail extends Model implements Packet
|
||||
{
|
||||
use SoftDeletes,EncodeUTF8,MsgID,ParseAddresses,QueryCacheableConfig;
|
||||
use SoftDeletes,MessageAttributes,MsgID,ParseAddresses,QueryCacheableConfig;
|
||||
|
||||
private const LOGKEY = 'ME-';
|
||||
private Collection $set_seenby;
|
||||
private Collection $set_path;
|
||||
private Carbon $set_recvtime;
|
||||
private string $set_pkt;
|
||||
private string $set_sender;
|
||||
private bool $no_export = FALSE;
|
||||
|
||||
private const kludges = [
|
||||
'MSGID:'=>'msgid',
|
||||
'PATH:'=>'set_path',
|
||||
'REPLY:'=>'replyid',
|
||||
'SEEN-BY:'=>'set_seenby',
|
||||
];
|
||||
|
||||
// When generating a packet for this echomail, the packet recipient is our tftn
|
||||
public Address $tftn;
|
||||
|
||||
protected $casts = [
|
||||
'datetime' => 'datetime:Y-m-d H:i:s',
|
||||
'kludges' => CollectionOrNull::class,
|
||||
'msg' => CompressedString::class,
|
||||
'msg_src' => CompressedString::class,
|
||||
'rogue_seenby' => CollectionOrNull::class,
|
||||
'rogue_path' => CollectionOrNull::class,
|
||||
];
|
||||
|
||||
private const cast_utf8 = [
|
||||
'to',
|
||||
'from',
|
||||
'subject',
|
||||
'msg',
|
||||
'msg_src',
|
||||
'origin',
|
||||
'tearline',
|
||||
'tagline',
|
||||
'rogue_path' => CollectionOrNull::class, // @deprecated?
|
||||
];
|
||||
|
||||
public function __set($key,$value)
|
||||
{
|
||||
switch ($key) {
|
||||
case 'kludges':
|
||||
if (! count($value))
|
||||
return;
|
||||
|
||||
if (array_key_exists($value[0],self::kludges)) {
|
||||
$this->{self::kludges[$value[0]]} = $value[1];
|
||||
|
||||
} else {
|
||||
$this->kludges->put($value[0],$value[1]);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 'no_export':
|
||||
case 'set_path':
|
||||
case 'set_pkt':
|
||||
case 'set_sender':
|
||||
case 'set_recvtime':
|
||||
case 'set_seenby':
|
||||
$this->{$key} = $value;
|
||||
break;
|
||||
|
||||
// Values that we pass to boot() to record how we got this echomail
|
||||
case 'set_pkt':
|
||||
case 'set_recvtime':
|
||||
case 'set_sender':
|
||||
// @todo We'll normalise these values when saving the netmail
|
||||
case 'set_tagline':
|
||||
case 'set_tearline':
|
||||
case 'set_origin':
|
||||
// For us to record the echoarea the message is for, if the area isnt defined (eg: packet dump)
|
||||
case 'set_echoarea':
|
||||
$this->set->put($key,$value);
|
||||
break;
|
||||
|
||||
// The path and seenby the echomail went through to get here
|
||||
case 'set_path':
|
||||
case 'set_seenby':
|
||||
if (! $this->set->has($key))
|
||||
$this->set->put($key,collect());
|
||||
|
||||
$this->set->get($key)->push($value);
|
||||
break;
|
||||
|
||||
default:
|
||||
parent::__set($key,$value);
|
||||
}
|
||||
@@ -67,6 +90,12 @@ final class Echomail extends Model implements Packet
|
||||
{
|
||||
parent::boot();
|
||||
|
||||
static::creating(function($model) {
|
||||
if (! is_null($model->errors))
|
||||
throw new \Exception('Cannot save, validation errors exist');
|
||||
});
|
||||
|
||||
// @todo dont save us in the seenby/path, we'll add it dynamically when we send out.
|
||||
// @todo if the message is updated with new SEEN-BY's from another route, we'll delete the pending export for systems (if there is one)
|
||||
static::created(function($model) {
|
||||
$rogue = collect();
|
||||
@@ -74,8 +103,10 @@ final class Echomail extends Model implements Packet
|
||||
$path = collect();
|
||||
|
||||
// Parse PATH
|
||||
if ($model->set_path->count())
|
||||
$path = self::parseAddresses('path',$model->set_path,$model->fftn->zone,$rogue);
|
||||
if ($model->set->has('set_path'))
|
||||
$path = self::parseAddresses('path',$model->set->get('set_path'),$model->fftn->zone,$rogue);
|
||||
|
||||
Log::debug(sprintf('%s:^ Message [%d] from point address is [%d]',self::LOGKEY,$model->id,$model->fftn->point_id));
|
||||
|
||||
// Make sure our sender is first in the path
|
||||
if (! $path->contains($model->fftn_id)) {
|
||||
@@ -84,9 +115,9 @@ final class Echomail extends Model implements Packet
|
||||
}
|
||||
|
||||
// Make sure our pktsrc is last in the path
|
||||
if (isset($model->set_sender) && (! $path->contains($model->set_sender))) {
|
||||
Log::alert(sprintf('%s:? Echomail adding pktsrc to end of PATH [%s].',self::LOGKEY,$model->set_sender));
|
||||
$path->push($model->set_sender);
|
||||
if ($model->set->has('set_sender') && (! $path->contains($model->set->get('set_sender')->id))) {
|
||||
Log::alert(sprintf('%s:? Echomail adding pktsrc to end of PATH [%s].',self::LOGKEY,$model->set->get('set_sender')->ftn));
|
||||
$path->push($model->set->get('set_sender')->id);
|
||||
}
|
||||
|
||||
// Save the Path
|
||||
@@ -105,8 +136,8 @@ final class Echomail extends Model implements Packet
|
||||
|
||||
// @todo move the parseAddress processing into Message::class, and our address to the seenby (and thus no need to add it when we export)
|
||||
// Parse SEEN-BY
|
||||
if ($model->set_seenby->count())
|
||||
$seenby = self::parseAddresses('seenby',$model->set_seenby,$model->fftn->zone,$rogue);
|
||||
if ($model->set->has('set_seenby'))
|
||||
$seenby = self::parseAddresses('seenby',$model->set->get('set_seenby'),$model->fftn->zone,$rogue);
|
||||
|
||||
// Make sure our sender is in the seenby
|
||||
if (! $seenby->contains($model->fftn_id)) {
|
||||
@@ -115,9 +146,9 @@ final class Echomail extends Model implements Packet
|
||||
}
|
||||
|
||||
// Make sure our pktsrc is in the seenby
|
||||
if (isset($model->set_sender) && (! $seenby->contains($model->set_sender))) {
|
||||
Log::alert(sprintf('%s:? Echomail adding pktsrc to SEENBY [%s].',self::LOGKEY,$model->set_sender));
|
||||
$seenby->push($model->set_sender);
|
||||
if ($model->set->has('set_sender') && (! $seenby->contains($model->set->get('set_sender')->id))) {
|
||||
Log::alert(sprintf('%s:? Echomail adding pktsrc to SEENBY [%s].',self::LOGKEY,$model->set->get('set_sender')->ftn));
|
||||
$seenby->push($model->set->get('set_sender')->id);
|
||||
}
|
||||
|
||||
if (count($rogue)) {
|
||||
@@ -129,26 +160,26 @@ final class Echomail extends Model implements Packet
|
||||
$model->seenby()->sync($seenby);
|
||||
|
||||
// Our last node in the path is our sender
|
||||
if (isset($model->set_pkt) && isset($model->set_recvtime)) {
|
||||
if ($model->set->has('set_pkt') && $model->set->has('set_recvtime')) {
|
||||
if ($path->count()) {
|
||||
DB::update('UPDATE echomail_path set recv_pkt=?,recv_at=? where address_id=? and echomail_id=?',[
|
||||
$model->set_pkt,
|
||||
$model->set_recvtime,
|
||||
$model->set->get('set_pkt'),
|
||||
$model->set->get('set_recvtime'),
|
||||
$path->last(),
|
||||
$model->id,
|
||||
]);
|
||||
|
||||
} else {
|
||||
Log::critical(sprintf('%s:! Wasnt able to set packet details for [%d] to [%s] to [%s], no path information',self::LOGKEY,$model->id,$model->set_pkt,$model->set_recvtime));
|
||||
Log::critical(sprintf('%s:! Wasnt able to set packet details for [%d] to [%s] to [%s], no path information',self::LOGKEY,$model->id,$model->set->get('set_pkt'),$model->set->get('set_recvtime')));
|
||||
}
|
||||
}
|
||||
|
||||
// See if we need to export this message.
|
||||
if ($model->echoarea->sec_read) {
|
||||
$exportto = ($x=$model
|
||||
$exportto = $model
|
||||
->echoarea
|
||||
->addresses
|
||||
->filter(function($item) use ($model) { return $model->echoarea->can_read($item->security); }))
|
||||
->filter(function($item) use ($model) { return $model->echoarea->can_read($item->security); })
|
||||
->pluck('id')
|
||||
->diff($seenby);
|
||||
|
||||
@@ -193,90 +224,19 @@ final class Echomail extends Model implements Packet
|
||||
->withPivot(['id','parent_id','recv_pkt','recv_at']);
|
||||
}
|
||||
|
||||
/* METHODS */
|
||||
/* ATTRIBUTES */
|
||||
|
||||
public function init(): void
|
||||
public function getSeenByAttribute(): Collection
|
||||
{
|
||||
$this->set_path = collect();
|
||||
$this->set_seenby = collect();
|
||||
return ((! $this->exists) && $this->set->has('set_seenby'))
|
||||
? $this->set->get('set_seenby')
|
||||
: $this->getRelationValue('seenby');
|
||||
}
|
||||
|
||||
public function jsonSerialize(): array
|
||||
public function getPathAttribute(): Collection
|
||||
{
|
||||
return $this->encode();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return this model as a packet
|
||||
*/
|
||||
public function packet(Address $ao): Message
|
||||
{
|
||||
Log::info(sprintf('%s:+ Bundling [%s]',self::LOGKEY,$this->id));
|
||||
|
||||
$sysaddress = our_address($this->fftn);
|
||||
|
||||
if (! $sysaddress)
|
||||
throw new \Exception(sprintf('%s:! We dont have an address in this network? (%s)',self::LOGKEY,$this->fftn->zone->domain->name));
|
||||
|
||||
// @todo Dont bundle mail to nodes that have been disabled, or addresses that have been deleted
|
||||
$o = new Message;
|
||||
|
||||
$o->header = [
|
||||
'onode' => $sysaddress->node_id,
|
||||
'dnode' => $ao->node_id,
|
||||
'onet' => $sysaddress->host_id,
|
||||
'dnet' => $ao->host_id,
|
||||
'flags' => 0,
|
||||
'cost' => 0,
|
||||
'date'=>$this->datetime->format('d M y H:i:s'),
|
||||
];
|
||||
|
||||
$o->tzutc = $this->datetime->utcOffset($this->tzoffset)->getOffsetString('');
|
||||
$o->user_to = $this->to;
|
||||
$o->user_from = $this->from;
|
||||
$o->subject = $this->subject;
|
||||
$o->echoarea = $this->echoarea->name;
|
||||
$o->flags = $this->flags;
|
||||
|
||||
if ($this->kludges)
|
||||
$o->kludge = collect($this->kludges);
|
||||
|
||||
$o->kludge->put('dbid',$this->id);
|
||||
|
||||
$o->msgid = $this->msgid;
|
||||
if ($this->replyid)
|
||||
$o->replyid = $this->replyid;
|
||||
|
||||
$o->message = $this->msg;
|
||||
|
||||
if ($this->tagline)
|
||||
$o->tagline = $this->tagline;
|
||||
|
||||
if ($this->tearline)
|
||||
$o->tearline = $this->tearline;
|
||||
|
||||
if ($this->origin)
|
||||
$o->origin = $this->origin;
|
||||
|
||||
$o->seenby = $this->seenby->push($sysaddress)->unique()->pluck('ftn2d');
|
||||
|
||||
// Add our address to the path and seenby
|
||||
$o->path = $this->pathorder()->merge($sysaddress->ftn2d);
|
||||
|
||||
$o->packed = TRUE;
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
public function pathorder(string $display='ftn2d',int $start=NULL): Collection
|
||||
{
|
||||
$result = collect();
|
||||
|
||||
if ($x=$this->path->firstWhere('pivot.parent_id',$start)) {
|
||||
$result->push($x->$display);
|
||||
$result->push($this->pathorder($display,$x->pivot->id));
|
||||
}
|
||||
|
||||
return $result->flatten()->filter();
|
||||
return ((! $this->exists) && $this->set->has('set_path'))
|
||||
? $this->set->get('set_path')
|
||||
: $this->getRelationValue('path');
|
||||
}
|
||||
}
|
@@ -10,35 +10,30 @@ use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
use App\Casts\CompressedString;
|
||||
use App\Classes\FTN\Message;
|
||||
use App\Casts\{CollectionOrNull,CompressedString};
|
||||
use App\Interfaces\Packet;
|
||||
use App\Traits\{EncodeUTF8,MsgID};
|
||||
use App\Pivots\ViaPivot;
|
||||
use App\Traits\{MessageAttributes,MsgID};
|
||||
|
||||
final class Netmail extends Model implements Packet
|
||||
{
|
||||
use SoftDeletes,MsgID,MessageAttributes;
|
||||
|
||||
private const LOGKEY = 'MN-';
|
||||
private const PATH_REGEX = '/^([0-9]+:[0-9]+\/[0-9]+(\..*)?)\s+@([0-9.a-zA-Z]+)\s+(.*)$/';
|
||||
|
||||
use SoftDeletes,EncodeUTF8,MsgID;
|
||||
|
||||
private Collection $set_path;
|
||||
private Address $set_sender;
|
||||
private Carbon $set_recvtime;
|
||||
private string $set_pkt;
|
||||
|
||||
private const cast_utf8 = [
|
||||
'to',
|
||||
'from',
|
||||
'subject',
|
||||
'msg',
|
||||
'msg_src',
|
||||
'origin',
|
||||
'tearline',
|
||||
'tagline',
|
||||
/**
|
||||
* Kludges that we absorb in this model
|
||||
*/
|
||||
private const kludges = [
|
||||
'MSGID:'=>'msgid',
|
||||
'REPLY:'=>'replyid',
|
||||
'Via' => 'set_path',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'datetime' => 'datetime:Y-m-d H:i:s',
|
||||
'kludges' => CollectionOrNull::class,
|
||||
'msg' => CompressedString::class,
|
||||
'msg_src' => CompressedString::class,
|
||||
'sent_at' => 'datetime:Y-m-d H:i:s',
|
||||
@@ -47,11 +42,36 @@ final class Netmail extends Model implements Packet
|
||||
public function __set($key,$value)
|
||||
{
|
||||
switch ($key) {
|
||||
case 'set_path':
|
||||
case 'kludges':
|
||||
if (! count($value))
|
||||
return;
|
||||
|
||||
if (array_key_exists($value[0],self::kludges)) {
|
||||
$this->{self::kludges[$value[0]]} = $value[1];
|
||||
|
||||
} else {
|
||||
$this->kludges->put($value[0],$value[1]);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
// Values that we pass to boot() to record how we got this netmail
|
||||
case 'set_pkt':
|
||||
case 'set_recvtime':
|
||||
case 'set_sender':
|
||||
$this->{$key} = $value;
|
||||
// @todo We'll normalise these values when saving the netmail
|
||||
case 'set_tagline':
|
||||
case 'set_tearline':
|
||||
case 'set_origin':
|
||||
$this->set->put($key,$value);
|
||||
break;
|
||||
|
||||
// The path the netmail went through to get here
|
||||
case 'set_path':
|
||||
if (! $this->set->has($key))
|
||||
$this->set->put($key,collect());
|
||||
|
||||
$this->set->get($key)->push($value);
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -63,43 +83,48 @@ final class Netmail extends Model implements Packet
|
||||
{
|
||||
parent::boot();
|
||||
|
||||
static::creating(function($model) {
|
||||
if (! is_null($model->errors))
|
||||
throw new \Exception('Cannot save, validation errors exist');
|
||||
});
|
||||
|
||||
static::created(function($model) {
|
||||
$nodes = collect();
|
||||
|
||||
// Parse PATH
|
||||
// @todo dont save us in the path, we'll add it dynamically when we send out.
|
||||
// <FTN Address> @YYYYMMDD.HHMMSS[.Precise][.Time Zone] <Program Name> <Version> [Serial Number]
|
||||
if (isset($model->set_path)) {
|
||||
if ($model->set_path->count()) {
|
||||
foreach ($model->set_path as $line) {
|
||||
$m = [];
|
||||
if ($model->set->has('set_path')) {
|
||||
foreach ($model->set->get('set_path') as $line) {
|
||||
$m = [];
|
||||
|
||||
if (preg_match('/^([0-9]+:[0-9]+\/[0-9]+(\..*)?)\s+@([0-9.a-zA-Z]+)\s+(.*)$/',$line,$m)) {
|
||||
// Address
|
||||
$ao = Address::findFTN($m[1]);
|
||||
if (preg_match(self::PATH_REGEX,$line,$m)) {
|
||||
// Address
|
||||
// @todo Do we need to add a domain here, since the path line may not include one
|
||||
$ao = Address::findFTN($m[1]);
|
||||
|
||||
// Time
|
||||
$t = [];
|
||||
$datetime = '';
|
||||
// Time
|
||||
$t = [];
|
||||
$datetime = '';
|
||||
|
||||
if (! preg_match('/^([0-9]+\.[0-9]+)(\.?(.*))?$/',$m[3],$t))
|
||||
Log::alert(sprintf('%s:! Unable to determine time from [%s]',self::LOGKEY,$m[3]));
|
||||
else
|
||||
$datetime = Carbon::createFromFormat('Ymd.His',$t[1],$t[3] ?? '');
|
||||
if (! preg_match('/^([0-9]+\.[0-9]+)(\.?(.*))?$/',$m[3],$t))
|
||||
Log::alert(sprintf('%s:! Unable to determine time from [%s]',self::LOGKEY,$m[3]));
|
||||
else
|
||||
$datetime = Carbon::createFromFormat('Ymd.His',$t[1],$t[3] ?? '');
|
||||
|
||||
if (! $ao) {
|
||||
Log::alert(sprintf('%s:! Undefined Node [%s] for Netmail.',self::LOGKEY,$m[1]));
|
||||
//$rogue->push(['node'=>$m[1],'datetime'=>$datetime,'program'=>$m[4]]);
|
||||
if (! $ao) {
|
||||
Log::alert(sprintf('%s:! Undefined Node [%s] in netmail path.',self::LOGKEY,$m[1]));
|
||||
//$rogue->push(['node'=>$m[1],'datetime'=>$datetime,'program'=>$m[4]]);
|
||||
|
||||
} else {
|
||||
$nodes->push(['node'=>$ao,'datetime'=>$datetime,'program'=>$m[4]]);
|
||||
}
|
||||
} else {
|
||||
$nodes->push(['node'=>$ao,'datetime'=>$datetime,'program'=>$m[4]]);
|
||||
}
|
||||
}
|
||||
|
||||
// If there are no details (Mystic), we'll create a blank
|
||||
} else {
|
||||
$nodes->push(['node'=>$model->set_sender,'datetime'=>Carbon::now(),'program'=>'Unknown']);
|
||||
}
|
||||
|
||||
// If there are no details (Mystic), we'll create a blank
|
||||
} else {
|
||||
$nodes->push(['node'=>$model->set->get('set_sender'),'datetime'=>Carbon::now(),'program'=>sprintf('%s (%04X)',Setup::PRODUCT_NAME,Setup::PRODUCT_ID)]);
|
||||
}
|
||||
|
||||
// Save the Path
|
||||
@@ -118,15 +143,25 @@ final class Netmail extends Model implements Packet
|
||||
}
|
||||
|
||||
// Our last node in the path is our sender
|
||||
if ($nodes->count() && isset($model->set_pkt) && isset($model->set_sender) && isset($model->set_recvtime)) {
|
||||
if ($nodes->count() && $model->set->has('set_pkt') && $model->set->has('set_sender') && $model->set->has('set_recvtime')) {
|
||||
DB::update('UPDATE netmail_path set recv_pkt=?,recv_at=?,recv_id=? where address_id=? and netmail_id=?',[
|
||||
$model->set_pkt,
|
||||
$model->set_recvtime,
|
||||
$model->set_sender->id,
|
||||
$model->set->get('set_pkt'),
|
||||
$model->set->get('set_recvtime'),
|
||||
$model->set->get('set_sender')->id,
|
||||
Arr::get($nodes->last(),'node')->id,
|
||||
$model->id,
|
||||
]);
|
||||
}
|
||||
|
||||
// Save our origin, tearline & tagline
|
||||
if ($model->set->has('set_tagline'))
|
||||
$model->tagline = $model->set->get('set_tagline');
|
||||
if ($model->set->has('set_tearline'))
|
||||
$model->tearline = $model->set->get('set_tearline');
|
||||
if ($model->set->has('set_origin'))
|
||||
$model->origin = $model->set->get('set_origin');
|
||||
|
||||
$model->save();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -142,13 +177,8 @@ final class Netmail extends Model implements Packet
|
||||
public function path()
|
||||
{
|
||||
return $this->belongsToMany(Address::class,'netmail_path')
|
||||
->withPivot(['id','parent_id','datetime','program','recv_pkt','recv_id']);
|
||||
}
|
||||
|
||||
public function received()
|
||||
{
|
||||
return $this->belongsToMany(Address::class,'netmail_path','netmail_id','recv_id')
|
||||
->withPivot(['id','parent_id','datetime','program','recv_pkt','recv_id']);
|
||||
->withPivot(['id','parent_id','datetime','program','recv_pkt','recv_id'])
|
||||
->using(ViaPivot::class);
|
||||
}
|
||||
|
||||
public function tftn()
|
||||
@@ -158,89 +188,41 @@ final class Netmail extends Model implements Packet
|
||||
->withTrashed();
|
||||
}
|
||||
|
||||
/* ATTRIBUTES */
|
||||
|
||||
/**
|
||||
* Enable rendering the path even if the model hasnt been saved
|
||||
*
|
||||
* @return Collection
|
||||
*/
|
||||
public function getPathAttribute(): Collection
|
||||
{
|
||||
return ((! $this->exists) && $this->set->has('set_path'))
|
||||
? $this->set->get('set_path')->map(function($item) {
|
||||
$m = [];
|
||||
preg_match(self::PATH_REGEX,$item,$m);
|
||||
return $m[1];
|
||||
})
|
||||
: $this->getRelationValue('path');
|
||||
}
|
||||
|
||||
/* METHODS */
|
||||
|
||||
/**
|
||||
* Return this model as a packet
|
||||
* Render the via line
|
||||
*
|
||||
* @param Address $ao
|
||||
* @return string
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function packet(Address $ao,string $strippass=NULL): Message
|
||||
public function via(Address $ao): string
|
||||
{
|
||||
Log::debug(sprintf('%s:+ Bundling [%s]',self::LOGKEY,$this->id));
|
||||
if (! $ao->pivot)
|
||||
throw new \Exception('Cannot render the via line without an address record without a path pivot');
|
||||
|
||||
// @todo Dont bundle mail to nodes that have been disabled, or addresses that have been deleted
|
||||
$o = new Message;
|
||||
|
||||
try {
|
||||
$o->header = [
|
||||
'onode' => $this->fftn->node_id,
|
||||
'dnode' => $this->tftn->node_id,
|
||||
'onet' => $this->fftn->host_id,
|
||||
'dnet' => $this->tftn->host_id,
|
||||
'opoint' => $this->fftn->point_id,
|
||||
'dpoint' => $this->tftn->point_id,
|
||||
'flags' => 0,
|
||||
'cost' => 0,
|
||||
'date'=>$this->datetime->format('d M y H:i:s'),
|
||||
];
|
||||
|
||||
$o->tzutc = $this->datetime->utcOffset($this->tzoffset)->getOffsetString('');
|
||||
$o->user_to = $this->to;
|
||||
$o->user_from = $this->from;
|
||||
$o->subject = (! is_null($strippass)) ? preg_replace('/^'.$strippass.':/','',$this->subject) : $this->subject;
|
||||
|
||||
// INTL kludge
|
||||
$o->intl = sprintf('%s %s',$this->tftn->ftn3d,$this->fftn->ftn3d);
|
||||
$o->flags = $this->flags;
|
||||
|
||||
$o->msgid = $this->msgid
|
||||
? $this->msgid
|
||||
: sprintf('%s %08x',$this->fftn->ftn4d,timew($this->datetime));
|
||||
|
||||
if ($this->replyid)
|
||||
$o->replyid = $this->replyid;
|
||||
|
||||
$o->kludge->put('dbid',$this->id);
|
||||
|
||||
$o->message = $this->msg;
|
||||
$o->tagline = $this->tagline;
|
||||
$o->tearline = $this->tearline;
|
||||
$o->origin = $this->origin;
|
||||
|
||||
// VIA kludge
|
||||
$via = $this->via ?: collect();
|
||||
// Add our address to the VIA line
|
||||
$via->push(
|
||||
sprintf('%s @%s.UTC %s %d.%d/%s %s',
|
||||
our_address($this->fftn)->ftn3d,
|
||||
Carbon::now()->utc()->format('Ymd.His'),
|
||||
str_replace(' ','_',Setup::PRODUCT_NAME),
|
||||
Setup::PRODUCT_VERSION_MAJ,
|
||||
Setup::PRODUCT_VERSION_MIN,
|
||||
(new Setup)->version,
|
||||
Carbon::now()->format('Y-m-d'),
|
||||
));
|
||||
|
||||
$o->via = $via;
|
||||
|
||||
$o->packed = TRUE;
|
||||
|
||||
} catch (\Exception $e) {
|
||||
Log::error(sprintf('%s:! Error converting netmail [%s] to a message (%d:%s)',self::LOGKEY,$this->id,$e->getLine(),$e->getMessage()));
|
||||
dump($this);
|
||||
}
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
public function pathorder(string $display='ftn2d',int $start=NULL): Collection
|
||||
{
|
||||
$result = collect();
|
||||
|
||||
if ($x=$this->path->firstWhere('pivot.parent_id',$start)) {
|
||||
$result->push($x->$display);
|
||||
$result->push($this->pathorder($display,$x->pivot->id));
|
||||
}
|
||||
|
||||
return $result->flatten()->filter();
|
||||
return sprintf('%s @%s.UTC %s',
|
||||
$ao->ftn3d,
|
||||
$ao->pivot->datetime->format('Ymd.His'),
|
||||
$ao->pivot->program);
|
||||
}
|
||||
}
|
@@ -251,12 +251,15 @@ class System extends Model
|
||||
/**
|
||||
* Return the packet that this system uses
|
||||
*
|
||||
* @param Address $ao
|
||||
* @return Packet
|
||||
*/
|
||||
public function packet(): Packet
|
||||
public function packet(Address $ao): Packet
|
||||
{
|
||||
return new (collect(Packet::PACKET_TYPES)
|
||||
->get($this->pkt_type ?: config('fido.packet_default')));
|
||||
// @todo Check that the address is one of the system's addresses
|
||||
|
||||
return (new (collect(Packet::PACKET_TYPES)
|
||||
->get($this->pkt_type ?: config('fido.packet_default'))))->for($ao);
|
||||
}
|
||||
|
||||
public function poll(): ?Job
|
||||
|
Reference in New Issue
Block a user