Fixup

Author: sirn-se

docs/Migrate_3_4.md

@@ -2,22 +2,22 @@
 
 # Websocket: Migration v3 -> v4
 
-Version 4.x has few changes compared to previous version.
+Version 4.x has few breaking changes compared to previous version.
 
 ## Breaking changes
 
+* Client `setContext()` - no longer accepts array input
+* Server `setContext()` - no longer accepts array input
 
-## Removed deprecated code
+## Removed deprecated methods
 
 * Client `getMeta()` - removed
 * Client `onConnect()` - use `onHandshake()` instead
-* Client `setContext()` - no longer accepts array input
 * Server `onConnect()` - use `onHandshake()` instead
-* Server `setContext()` - no longer accepts array input
 
 ## Configuration management
 
-v4 uses the Configuration class to propagate configurations throughout internal classes.
+`v4` uses the `Configuration` class to propagate configurations throughout internal classes.
 
 This affects the following classes;
 * Connection
@@ -26,7 +26,7 @@ This affects the following classes;
 * MiddlewareHandler
 * All middlewares
 
-He following methods (when applicable) are removed;
+The following methods (when applicable) are removed;
 * `setLogger()`
 * `getTimeout()`
 * `setTimeout()`
@@ -48,3 +48,5 @@ $source->setConfiguration($clonedConfiguration);
 
 ## Extending
 
+Increased modularization affects many internal classes and methods.
+If you rely on using these directly (extending or adapting) your code may be incompatible.

src/Client.php

@@ -540,15 +540,6 @@ public function disconnect(): void
 
     /* ---------- Connection wrapper methods ----------------------------------------------------------------------- */
 
-    public function getIdentity(): string
-    {
-        return sprintf(
-            'client/%s/%s',
-            $this->getName() ?: 'closed',
-            $this->getRemoteName() ?: 'closed',
-        );
-    }
-
     /**
      * Get name of local socket, or null if not connected.
      * @return string|null

src/Cluster.php

@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * Copyright (C) 2014-2025 Textalk and contributors.
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ */
+
+namespace WebSocket;
+
+use Phrity\Net\{
+    Context,
+    StreamFactory,
+};
+use Psr\Log\{
+    LoggerAwareInterface,
+    LoggerInterface,
+};
+use Stringable;
+use Throwable;
+use WebSocket\Exception\{
+    ServerException
+};
+use WebSocket\Http\{
+    DefaultHttpFactory,
+    Response,
+    ServerRequest,
+};
+use WebSocket\Trait\{
+    ConfigurationTrait,
+    StringableTrait
+};
+use WebSocket\Runtime\Watcher;
+
+/**
+ * WebSocket\Server class.
+ * Entry class for WebSocket server.
+ */
+class Cluster implements LoggerAwareInterface, Stringable
+{
+    use ConfigurationTrait;
+    use StringableTrait;
+
+    private StreamFactory $streamFactory;
+    private Watcher $watcher;
+
+    private array $services = [];
+
+
+    /* ---------- Magic methods ------------------------------------------------------------------------------------ */
+
+    /**
+     * @param StreamFactory|null $streamFactory
+     * @param Watcher|null $watcher
+     */
+    public function __construct(
+        StreamFactory|null $streamFactory = null,
+        Watcher|null $watcher = null,
+        Configuration|null $configuration = null,
+    ) {
+        $this->streamFactory = $streamFactory ?? new StreamFactory();
+        $this->watcher = $watcher ?? new Watcher($this->streamFactory->createStreamCollection());
+        $this->initConfiguration($configuration);
+   }
+
+    /**
+     * Get string representation of instance.
+     * @return string String representation
+     */
+    public function __toString(): string
+    {
+        return $this->stringable('');
+    }
+
+
+
+    public function createServer(int $port = 80, bool $ssl = false, string|null $name = null): Server
+    {
+        $name = $name ?? "server:{$port}";
+        if (array_key_exists($name, $this->services)) {
+            throw new ServerException("Server {$name} already attached.");
+        }
+        $server = new Server(
+            port: $port,
+            ssl: $ssl,
+            streamFactory: $this->streamFactory,
+            watcher: $this->watcher,
+            configuration: $this->configuration,
+        );
+        $this->services[$name] = $server;
+        return $server;
+    }
+
+    /**
+     * Set logger.
+     * @param LoggerInterface $logger Logger implementation
+     */
+    public function setLogger(LoggerInterface $logger): void
+    {
+        $this->configuration->setLogger($logger);
+    }
+
+    public function start()
+    {
+        foreach ($this->services as $service) {
+            $service->start();
+        }
+    }
+}

src/Connection.php

@@ -197,15 +197,6 @@ public function closeWrite(): self
 
     /* ---------- Connection state --------------------------------------------------------------------------------- */
 
-    public function getIdentity(): string
-    {
-        return sprintf(
-            'connection/%s/%s',
-            $this->getName() ?: 'closed',
-            $this->getRemoteName() ?: 'closed',
-        );
-    }
-
     /**
      * Get name of local socket, or null if not connected.
      * @return string