Lifetime cookie

composer.json

@@ -18,8 +18,8 @@
     "require": {
         "php": ">=7.0",
         "doctrine/dbal": "^2.6",
-        "laravel/framework": "~5|~6|~7|~8",
-        "pragmarx/support": "~0.6|~0.7|~0.8|~0.9",
+        "laravel/framework": "~5|~6|~7|~8|~9",
+        "pragmarx/support": "dev-master",
         "ramsey/uuid": "^3 || ^4",
         "jenssegers/agent": "~2.1",
         "ua-parser/uap-php" : "~3.4",
@@ -28,6 +28,13 @@
         "jaybizzle/crawler-detect": "~1.0",
         "psr/log": "~1.0"
     },
+
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/ilyutkin/support/"
+        }
+    ],
 
     "suggest": {
         "geoip/geoip": "~1.14",

src/Data/Repositories/Cookie.php

@@ -35,7 +35,7 @@ public function getId()
         if (!$cookie = $this->request->cookie($this->config->get('tracker_cookie_name'))) {
             $cookie = UUID::uuid4()->toString();
 
-            $this->cookieJar->queue($this->config->get('tracker_cookie_name'), $cookie, 0);
+            $this->cookieJar->queue($this->config->get('tracker_cookie_name'), $cookie, $this->config->get('tracker_cookie_lifetime'));
         }
 
         return $this->findOrCreate(['uuid' => $cookie]);

src/Data/Repositories/Session.php

@@ -98,11 +98,22 @@ private function sessionIsKnownOrCreateSession()
         } else {
             $session = $this->find($this->getSessionData('id'));
 
-            $session->updated_at = Carbon::now();
+            if ($this->config->get('tracker_visit_close') &&
+                (is_null($session->user_id)) &&
+                ($session->updated_at < Carbon::now()->subMinutes($this->config->get('tracker_visit_close')))
+            ) {
+                $this->resetSessionUuid();
 
-            $session->save();
+                $this->sessionSetId($this->findOrCreate($this->sessionInfo, ['uuid']));
 
-            $this->sessionInfo['id'] = $this->getSessionData('id');
+                $known = false;
+            } else {
+                $session->updated_at = Carbon::now();
+
+                $session->save();
+
+                $this->sessionInfo['id'] = $this->getSessionData('id');
+            }
         }
 
         return $known;
@@ -282,6 +293,21 @@ public function getCurrent()
         return $this->getModel();
     }
 
+    public function resetSession()
+    {
+        $this->sessionInfo['uuid'] = null;
+
+        $data = $this->sessionInfo;
+
+        unset($data['uuid']);
+
+        $this->putSessionData($data);
+
+        $this->checkSessionUuid();
+
+        return $data;
+    }
+
     public function updateSessionData($data)
     {
         $session = $this->checkIfUserChanged($data, $this->find($this->getSessionData('id')));

src/Support/Exceptions/Handler.php

@@ -44,7 +44,7 @@ public function handleThrowable(Throwable $throwable)
         return call_user_func($this->originalExceptionHandler, $throwable);
     }
 
-    public function handleError($err_severity, $err_msg, $err_file, $err_line, array $err_context)
+    public function handleError($err_severity, $err_msg, $err_file, $err_line, array $err_context = [])
     {
         try {
             $error = ExceptionFactory::make($err_severity, $err_msg);

src/Tracker.php

@@ -100,6 +100,11 @@ public function currentSession()
         return $this->dataRepositoryManager->sessionRepository->getCurrent();
     }
 
+    public function resetSession()
+    {
+        return $this->dataRepositoryManager->sessionRepository->resetSession();
+    }
+
     protected function deleteCurrentLog()
     {
         $this->dataRepositoryManager->logRepository->delete();
@@ -169,6 +174,7 @@ public function getLogData()
     {
         return [
             'session_id' => $this->getSessionId(true),
+            'cookie_id'  => $this->getCookieId(),
             'method'     => $this->request->method(),
             'path_id'    => $this->getPathId(),
             'query_id'   => $this->getQueryId(),
@@ -239,6 +245,7 @@ protected function logUntrackable($item)
     protected function makeSessionData()
     {
         $sessionData = [
+            'session_id'   => session_id(),
             'user_id'      => $this->getUserId(),
             'device_id'    => $this->getDeviceId(),
             'client_ip'    => $this->request->getClientIp(),
@@ -273,6 +280,13 @@ public function getUserId()
             : null;
     }
 
+    public function setUserId($user_id)
+    {
+        $session = $this->dataRepositoryManager->sessionRepository->getCurrent();
+        $session->user_id = $user_id;
+        $session->save();
+    }
+
     /**
      * @param \Throwable $throwable
      */

src/Vendor/Laravel/Models/Log.php

@@ -8,6 +8,7 @@ class Log extends Base
 
     protected $fillable = [
         'session_id',
+        'cookie_id',
         'method',
         'path_id',
         'query_id',

src/Vendor/Laravel/Models/Session.php

@@ -8,6 +8,7 @@ class Session extends Base
 
     protected $fillable = [
         'uuid',
+        'session_id',
         'user_id',
         'device_id',
         'language_id',

src/config/config.php

@@ -239,11 +239,21 @@
      */
     'tracker_cookie_name' => 'please_change_this_cookie_name',
 
+    /*
+     * If you are storing cookies, set the lifetime.
+     */
+    'tracker_cookie_lifetime' => 0,
+
     /*
      * Internal tracker session name.
      */
     'tracker_session_name' => 'tracker_session',
 
+    /*
+     * The visit ends when no new events arrive from the visitor for a certain time.
+     */
+    'tracker_visit_close' => 30,
+
     /*
      * ** IMPORTANT **
      * Change the user model to your own.

src/migrations/2021_12_14_311104_add_cookie_id_to_tracker_log.php

@@ -0,0 +1,46 @@
+<?php
+
+use PragmaRX\Tracker\Support\Migration;
+
+class AddCookieIdToTrackerLog extends Migration
+{
+    /**
+     * Table related to this migration.
+     *
+     * @var string
+     */
+    private $table = 'tracker_log';
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function migrateUp()
+    {
+        try {
+            $this->builder->table(
+                $this->table,
+                function ($table) {
+                    $table->bigInteger('cookie_id')->unsigned()->nullable()->index()->after('session_id');
+                }
+            );
+        } catch (\Exception $e) {
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function migrateDown()
+    {
+        $this->builder->table(
+            $this->table,
+            function ($table) {
+                $table->dropColumn('cookie_id');
+            }
+        );
+    }
+}

src/migrations/2021_12_14_311105_add_session_id_to_tracker_sessions.php

@@ -0,0 +1,46 @@
+<?php
+
+use PragmaRX\Tracker\Support\Migration;
+
+class AddSessionIdToTrackerSessions extends Migration
+{
+    /**
+     * Table related to this migration.
+     *
+     * @var string
+     */
+    private $table = 'tracker_sessions';
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function migrateUp()
+    {
+        try {
+            $this->builder->table(
+                $this->table,
+                function ($table) {
+                    $table->string('session_id')->after('uuid');
+                }
+            );
+        } catch (\Exception $e) {
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function migrateDown()
+    {
+        $this->builder->table(
+            $this->table,
+            function ($table) {
+                $table->dropColumn('session_id');
+            }
+        );
+    }
+}

src/migrations/2021_12_14_311106_change_tracker_cookies_uuid_length_512.php

@@ -0,0 +1,40 @@
+<?php
+
+use PragmaRX\Tracker\Support\Migration;
+
+class ChangeTrackerCookiesUuidLength512 extends Migration
+{
+    /**
+     * Table related to this migration.
+     *
+     * @var string
+     */
+    private $table = 'tracker_cookies';
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function migrateUp()
+    {
+        try {
+            $this->builder->table(
+                $this->table,
+                function ($table) {
+                    $table->string('uuid', 512)->change();
+                }
+            );
+        } catch (\Exception $e) {
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function migrateDown()
+    {
+    }
+}