MakeQueueTenantAwareAction seems to break active requests when Queue Connection is sync about laravel-multitenancy HOT 4 CLOSED

<?php

namespace App\MultiTenancy\Actions;

use Illuminate\Bus\ChainedBatch;
use Illuminate\Queue\Events\JobExceptionOccurred;
use Illuminate\Queue\Events\JobProcessed;
use Illuminate\Queue\Events\JobProcessing;
use Illuminate\Queue\Events\JobRetryRequested;
use Illuminate\Queue\Queue;
use Laravel\Horizon\Events\JobFailed;
use Spatie\Multitenancy\Exceptions\CurrentTenantCouldNotBeDeterminedInTenantAwareJob;
use Spatie\Multitenancy\Models\Tenant;

class MakeQueueTenantAwareAction extends \Spatie\Multitenancy\Actions\MakeQueueTenantAwareAction
{
    public function execute(): void
    {
        $this
            ->listenForJobsBeingQueued()
            ->listenForBeforeJobsEvents()
            ->listenForAfterJobsEvents();
    }

    protected function listenForBeforeJobsEvents(): static
    {
        app('events')->listen(JobProcessing::class, function (JobProcessing $event) {
            $this->bindOrForgetCurrentTenant($event);
        });
        app('events')->listen(JobRetryRequested::class, function (JobRetryRequested $event) {
            $this->bindOrForgetCurrentTenant($event);
        });

        return $this;
    }

    protected function listenForAfterJobsEvents(): static
    {
        app('events')->listen(JobProcessed::class, [$this, 'restoreContextTenant']);
        app('events')->listen(JobExceptionOccurred::class, [$this, 'restoreContextTenant']);
        app('events')->listen(JobFailed::class, [$this, 'restoreContextTenant']);

        return $this;
    }

    protected function getEventPayload($event): ?array
    {
        return match (true) {
            $event instanceof JobRetryRequested => $event->payload(),
            $event instanceof JobProcessing, $event instanceof JobProcessed, $event instanceof JobExceptionOccurred, $event instanceof JobFailed => $event->job->payload(),
            default => null,
        };
    }

    protected function findTenant(
        JobProcessing|JobRetryRequested|JobProcessed|JobExceptionOccurred|JobFailed $event
    ): Tenant {
        $tenantId = $this->getEventPayload($event)['tenantId'] ?? null;

        if ( ! $tenantId) {
            $event->job->delete();

            throw CurrentTenantCouldNotBeDeterminedInTenantAwareJob::noIdSet($event);
        }


        /** @var \Spatie\Multitenancy\Models\Tenant $tenant */
        if ( ! $tenant = $this->getTenantModel()::find($tenantId)) {
            $event->job->delete();

            throw CurrentTenantCouldNotBeDeterminedInTenantAwareJob::noTenantFound($event);
        }

        return $tenant;
    }

    protected static array $tenantContexts = [];

    protected function bindOrForgetCurrentTenant(
        JobProcessing|JobRetryRequested|JobProcessed|JobExceptionOccurred|JobFailed $event
    ): void {
        $payload = $this->getEventPayload($event);
        static::$tenantContexts[] = $this->getTenantModel()::current()?->getKey();

        if (array_key_exists('tenantId', $payload)) {
            $this->bindAsCurrentTenant($this->findTenant($event)->makeCurrent());

            return;
        }

        $this->getTenantModel()::forgetCurrent();
    }

    public function restoreContextTenant(
        JobProcessing|JobRetryRequested|JobProcessed|JobExceptionOccurred|JobFailed $event
    ): void {
        $contextTenant = array_pop(static::$tenantContexts);
        if ($contextTenant === null) {
            $this->getTenantModel()::forgetCurrent();
        } else {
            $this->getTenantModel()::find($contextTenant)?->makeCurrent();
        }
    }
}

<?php

namespace App\MultiTenancy\Actions;

use Illuminate\Queue\Events\JobExceptionOccurred;
use Illuminate\Queue\Events\JobProcessed;
use Illuminate\Queue\Events\JobProcessing;
use Illuminate\Queue\Events\JobRetryRequested;
use Spatie\Multitenancy\Exceptions\CurrentTenantCouldNotBeDeterminedInTenantAwareJob;
use Spatie\Multitenancy\Models\Tenant;

class MakeQueueTenantAwareAction extends \Spatie\Multitenancy\Actions\MakeQueueTenantAwareAction
{
    public function execute(): void
    {
        $this
            ->listenForJobsBeingQueued()
            ->listenForBeforeJobsEvents()
            ->listenForAfterJobsEvents();
    }

    protected function listenForBeforeJobsEvents(): static
    {
        app('events')->listen(JobProcessing::class, function (JobProcessing $event) {
            $this->bindOrForgetCurrentTenant($event);
        });
        app('events')->listen(JobRetryRequested::class, function (JobRetryRequested $event) {
            $this->bindOrForgetCurrentTenant($event);
        });

        return $this;
    }

    protected function listenForAfterJobsEvents(): static
    {
        app('events')->listen(JobProcessed::class, function (JobProcessed $event) {
            $this->restoreContextTenant();
        });
        app('events')->listen(JobExceptionOccurred::class, function (JobExceptionOccurred $event) {
            $this->restoreContextTenant();
        });

        return $this;
    }

    protected function getEventPayload($event): ?array
    {
        return match (true) {
            $event instanceof JobRetryRequested => $event->payload(),
            $event instanceof JobProcessing, $event instanceof JobProcessed, $event instanceof JobExceptionOccurred => $event->job->payload(),
            default => null,
        };
    }

    protected function findTenant(JobProcessing|JobRetryRequested|JobProcessed|JobExceptionOccurred $event): Tenant
    {
        $tenantId = $this->getEventPayload($event)['tenantId'] ?? null;

        if ( ! $tenantId) {
            $event->job->delete();

            throw CurrentTenantCouldNotBeDeterminedInTenantAwareJob::noIdSet($event);
        }


        /** @var \Spatie\Multitenancy\Models\Tenant $tenant */
        if ( ! $tenant = $this->getTenantModel()::find($tenantId)) {
            $event->job->delete();

            throw CurrentTenantCouldNotBeDeterminedInTenantAwareJob::noTenantFound($event);
        }

        return $tenant;
    }

    private Tenant|null $contextTenant = null;

    protected function bindOrForgetCurrentTenant(
        JobProcessing|JobRetryRequested|JobProcessed|JobExceptionOccurred $event
    ): void {
        $this->contextTenant = $this->getTenantModel()::current();

        if (array_key_exists('tenantId', $this->getEventPayload($event))) {
            $this->bindAsCurrentTenant($this->findTenant($event)->makeCurrent());

            return;
        }

        $this->getTenantModel()::forgetCurrent();
    }

    protected function restoreContextTenant(): void
    {
        if ($this->contextTenant === null) {
            $this->getTenantModel()::forgetCurrent();
        } else {
            $this->contextTenant->makeCurrent();
        }
    }
}