Initial commit

Author: wigman

Plugin/SectionLoadControllerPlugin.php

@@ -0,0 +1,66 @@
+<?php
+declare(strict_types=1);
+
+namespace IntegerNet\SectionsDataSessionUnblocker\Plugin;
+
+use \Magento\Framework\Session\Generic as GenericSession;
+use \Magento\Customer\Model\Session as CustomerSession;
+use \Magento\Framework\Message\Session as MessageSession;
+use \Magento\Catalog\Model\Session as CatalogSession;
+
+/*
+ * We are writing this plugin to make sure sessions are all loaded before
+ * Magento\Customer\Controller\Section\Load
+ *
+ * Right after initiating all the needed Sessions we close the session,
+ * since we're only reading from the session when requesting sectionData
+ * in the frontend.
+ *
+ * This means every sectionPool that is being loaded does not need to read
+ * from an open session, which means calls to SectionLoad controller are
+ * no longer blocking each other because they are waiting for the request to
+ * finish and the close the session.
+ */
+class SectionLoadControllerPlugin
+{
+    /**
+     * @param GenericSession $genericSession
+     * @param CustomerSession $customerSession
+     * @param MessageSession $messageSession
+     * @param CatalogSession $catalogSession
+     * @param GenericSession $reviewSession
+     *
+     * Disabling 3 PHPCS rules because:
+     * 1 - We are well aware that we normally shouldn't call Sessions without
+     *     proxy, but in this case, we actually want the sessions to be
+     *     initiated directly.
+     * 2 - Also, we don't actually use the Sessions
+     * 3 - Lastly, we normally should not execute operations in a constructor
+     *
+     * phpcs:disable MEQP2.Classes.MutableObjects.MutableObjects
+     * phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.Found
+     * phpcs:disable MEQP2.Classes.ConstructorOperations.CustomOperationsFound
+     */
+    public function __construct(
+        GenericSession $genericSession,
+        CustomerSession $customerSession,
+        MessageSession $messageSession,
+        CatalogSession $catalogSession,
+        GenericSession $reviewSession //virtualType
+    ) {
+        /*
+         * This is earliest moment where we can close the session,
+         * after we initialised all sessions we think will be needed
+         *
+         * Should there ever be an additional Session-type that's needed,
+         * nothing breaks, but the new session-type will open a new session
+         * and therefore block other requests
+         */
+        $genericSession->writeClose();
+    }
+
+    //phpcs:ignore MEQP2.Classes.PublicNonInterfaceMethods.PublicMethodFound
+    public function beforeExecute()
+    {
+    }
+}

composer.json

@@ -0,0 +1,33 @@
+{
+  "name": "integer-net/magento2-session-unblocker",
+  "description": "Module for Magento 2 that prevents session blocking between concurrent AJAX requests",
+  "version": "0.0.1",
+  "authors": [
+    {
+      "name": "Fabian Schmengler",
+      "email": "fs@integer-net.de"
+    },
+    {
+      "name": "Willem Wigman",
+      "email": "ww@integer-net.de"
+    }
+  ],
+  "require": {
+    "magento/framework": "^100.1|^101.0|^102.0",
+    "magento/module-customer": "^101.0.0|^102.0.0",
+    "magento/module-catalog": "^101.0.0|^102.0.0",
+    "php": ">=7.0.0"
+  },
+  "type": "magento2-module",
+  "license": [
+    "OSL-3"
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "IntegerNet\\SessionUnblocker\\": ""
+    }
+  }
+}

etc/di.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Customer\Controller\Section\Load">
+        <plugin name="integernet_session_unblocker" type="IntegerNet\SessionUnblocker\Plugin\SectionLoadControllerPlugin" />
+    </type>
+
+    <type name="IntegerNet\SessionUnblocker\Plugin\SectionLoadControllerPlugin">
+        <arguments>
+            <argument name="reviewSession" xsi:type="object">Magento\Review\Model\Session</argument>
+        </arguments>
+    </type>
+</config>

etc/module.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="IntegerNet_SectionsDataSessionUnblocker" setup_version="0.0.1">
+        <sequence>
+            <module name="Magento_Customer"/>
+        </sequence>
+    </module>
+</config>

registration.php

@@ -0,0 +1,6 @@
+<?php
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'IntegerNet_SessionUnblocker',
+    __DIR__
+);