sirn-se · sirn-se · Dec 23, 2025 · Dec 23, 2025
diff --git a/docs/Class_Synopsis.md b/docs/Class_Synopsis.md
@@ -27,7 +27,7 @@ abstract class WebSocket\Message\Message imlements Stringable
     public method setPayload(string $payload = ""): void;
 }
 
-class WebSocket\Client imlements Psr\Log\LoggerAwareInterface, Stringable
+class WebSocket\Client imlements WebSocket\Runtime\IdentityInterface, Psr\Log\LoggerAwareInterface, Stringable
 {
     use WebSocket\Trait\ListenerTrait;
     use WebSocket\Trait\LoggerAwareTrait;
@@ -43,6 +43,7 @@ class WebSocket\Client imlements Psr\Log\LoggerAwareInterface, Stringable
     public method getContext(): Phrity\Net\Context;
     public method getFrameSize(): int;
     public method getHandshakeResponse(): Psr\Http\Message\ResponseInterface|null;
+    public method getIdentity(): string;
     public method getMeta(string $key): mixed;
     public method getName(): string|null;
     public method getRemoteName(): string|null;
@@ -64,7 +65,7 @@ class WebSocket\Client imlements Psr\Log\LoggerAwareInterface, Stringable
     public method stop(): void;
 }
 
-class WebSocket\Connection imlements Psr\Log\LoggerAwareInterface, Stringable
+class WebSocket\Connection imlements WebSocket\Runtime\IdentityInterface, Psr\Log\LoggerAwareInterface, Stringable
 {
     use WebSocket\Trait\LoggerAwareTrait;
     use WebSocket\Trait\SendMethodsTrait;
@@ -81,6 +82,7 @@ class WebSocket\Connection imlements Psr\Log\LoggerAwareInterface, Stringable
     public method getFrameSize(): int;
     public method getHandshakeRequest(): Psr\Http\Message\RequestInterface|null;
     public method getHandshakeResponse(): Psr\Http\Message\ResponseInterface|null;
+    public method getIdentity(): string;
     public method getMeta(string $key): mixed;
     public method getName(): string|null;
     public method getRemoteName(): string|null;
@@ -382,7 +384,7 @@ class WebSocket\Middleware\SubprotocolNegotiation imlements Psr\Log\LoggerAwareI
     public method processHttpOutgoing(WebSocket\Middleware\ProcessHttpStack $stack, WebSocket\Connection $connection, Psr\Http\Message\MessageInterface $message): Psr\Http\Message\MessageInterface;
 }
 
-class WebSocket\Server imlements Psr\Log\LoggerAwareInterface, Stringable
+class WebSocket\Server imlements WebSocket\Runtime\IdentityInterface, Psr\Log\LoggerAwareInterface, Stringable
 {
     use WebSocket\Trait\ListenerTrait;
     use WebSocket\Trait\LoggerAwareTrait;
@@ -397,6 +399,7 @@ class WebSocket\Server imlements Psr\Log\LoggerAwareInterface, Stringable
     public method getConnections(): array;
     public method getContext(): Phrity\Net\Context;
     public method getFrameSize(): int;
+    public method getIdentity(): string;
     public method getPort(): int;
     public method getReadableConnections(): array;
     public method getScheme(): string;
@@ -474,6 +477,11 @@ inteface WebSocket\Middleware\ProcessTickInterface imlements WebSocket\Middlewar
     public method processTick(WebSocket\Middleware\ProcessTickStack $stack, WebSocket\Connection $connection): void;
 }
 
+inteface WebSocket\Runtime\IdentityInterface
+{
+    public method getIdentity(): string;
+}
+
 trait WebSocket\Trait\ListenerTrait
 {
     public method onBinary(Closure $closure): self;

diff --git a/docs/tmp b/docs/tmp
diff --git a/src/Client.php b/src/Client.php
@@ -39,6 +39,7 @@
 use WebSocket\Http\DefaultHttpFactory;
 use WebSocket\Message\Message;
 use WebSocket\Middleware\MiddlewareInterface;
+use WebSocket\Runtime\IdentityInterface;
 use WebSocket\Trait\{
     ListenerTrait,
     LoggerAwareTrait,
@@ -50,7 +51,7 @@
  * WebSocket\Client class.
  * Entry class for WebSocket client.
  */
-class Client implements LoggerAwareInterface, Stringable
+class Client implements IdentityInterface, LoggerAwareInterface, Stringable
 {
     /** @use ListenerTrait<Client> */
     use ListenerTrait;
@@ -77,6 +78,8 @@ class Client implements LoggerAwareInterface, Stringable
     private StreamCollection|null $streams = null;
     private bool $running = false;
     private HttpFactory $httpFactory;
+    /** @var non-empty-string $identity */
+    private string $identity = 'client/<unconnected>';
 
 
     /* ---------- Magic methods ------------------------------------------------------------------------------------ */
@@ -91,6 +94,7 @@ public function __construct(UriInterface|string $uri)
         $this->context = new Context();
         $this->setStreamFactory(new StreamFactory());
         $this->httpFactory = new DefaultHttpFactory();
+        $this->identity = "client/{$this->socketUri->getHost()}";
     }
 
     /**
@@ -105,6 +109,11 @@ public function __toString(): string
 
     /* ---------- Configuration ------------------------------------------------------------------------------------ */
 
+    public function getIdentity(): string
+    {
+        return $this->identity;
+    }
+
     /**
      * Set stream factory to use.
      * @param StreamFactory $streamFactory
@@ -446,15 +455,15 @@ public function connect(): void
             $this->logger->error("[client] {$error}", ['exception' => $e]);
             throw new ClientException($error);
         }
-        $name = $stream->getRemoteName();
-        $this->streams->attach($stream, $name);
         $this->connection = new Connection(
             $stream,
             true,
             false,
             $hostUri->getScheme() === 'ssl',
             $this->httpFactory
         );
+        $this->streams->attach($stream, $this->connection->getIdentity());
+
         $this->connection->setFrameSize($this->frameSize);
         $this->connection->setTimeout($this->timeout);
         $this->connection->setLogger($this->logger);

diff --git a/src/Connection.php b/src/Connection.php
@@ -44,6 +44,7 @@
     MiddlewareHandler,
     MiddlewareInterface
 };
+use WebSocket\Runtime\IdentityInterface;
 use WebSocket\Trait\{
     LoggerAwareTrait,
     SendMethodsTrait,
@@ -54,7 +55,7 @@
  * WebSocket\Connection class.
  * A client/server connection, wrapping socket stream.
  */
-class Connection implements LoggerAwareInterface, Stringable
+class Connection implements IdentityInterface, LoggerAwareInterface, Stringable
 {
     use LoggerAwareTrait;
     use SendMethodsTrait;
@@ -75,6 +76,8 @@ class Connection implements LoggerAwareInterface, Stringable
     /** @var array<string, mixed> $meta */
     private array $meta = [];
     private bool $closed = false;
+    /** @var non-empty-string $identity */
+    private string $identity = '*/connection/<unconnected>';
 
 
     /* ---------- Magic methods ------------------------------------------------------------------------------------ */
@@ -92,6 +95,11 @@ public function __construct(
         $this->middlewareHandler = new MiddlewareHandler($this->messageHandler, $this->httpHandler);
         $this->localName = $this->stream->getLocalName() ?? '<unknown>';
         $this->remoteName = $this->stream->getRemoteName() ?? '<unknown>';
+        $this->identity = sprintf(
+            '*/connection/%s/%s',
+            $this->getIdentityPart($this->localName),
+            $this->getIdentityPart($this->remoteName),
+        );
         $this->initLogger();
     }
 
@@ -110,6 +118,11 @@ public function __toString(): string
 
     /* ---------- Configuration ------------------------------------------------------------------------------------ */
 
+    public function getIdentity(): string
+    {
+        return $this->identity;
+    }
+
     /**
      * Set logger.
      * @param LoggerInterface $logger Logger implementation
@@ -432,4 +445,10 @@ protected function throwException(Throwable $e): never
         $this->logger->error("[connection] {$e->getMessage()}", ['exception' => $e]);
         throw new ConnectionFailureException();
     }
+
+    protected function getIdentityPart(string $source): string
+    {
+        preg_match('/([0-9]+)$/', $source, $result);
+        return empty($result) ? $source : array_shift($result);
+    }
 }
diff --git a/src/Runtime/IdentityInterface.php b/src/Runtime/IdentityInterface.php
@@ -0,0 +1,19 @@
+<?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\Runtime;
+
+/**
+ * WebSocket\Runtime\IdentityInterface interface.
+ */
+interface IdentityInterface
+{
+    /**
+     * @return non-empty-string
+     */
+    public function getIdentity(): string;
+}
diff --git a/src/Server.php b/src/Server.php
@@ -40,6 +40,7 @@
 use WebSocket\Http\DefaultHttpFactory;
 use WebSocket\Message\Message;
 use WebSocket\Middleware\MiddlewareInterface;
+use WebSocket\Runtime\IdentityInterface;
 use WebSocket\Trait\{
     ListenerTrait,
     LoggerAwareTrait,
@@ -51,7 +52,7 @@
  * WebSocket\Server class.
  * Entry class for WebSocket server.
  */
-class Server implements LoggerAwareInterface, Stringable
+class Server implements IdentityInterface, LoggerAwareInterface, Stringable
 {
     /** @use ListenerTrait<Server> */
     use ListenerTrait;
@@ -79,6 +80,8 @@ class Server implements LoggerAwareInterface, Stringable
     private array $middlewares = [];
     private int|null $maxConnections = null;
     private HttpFactory $httpFactory;
+    /** @var non-empty-string $identity */
+    private string $identity;
 
 
     /* ---------- Magic methods ------------------------------------------------------------------------------------ */
@@ -99,6 +102,7 @@ public function __construct(int $port = 80, bool $ssl = false)
         $this->context = new Context();
         $this->httpFactory = new DefaultHttpFactory();
         $this->setStreamFactory(new StreamFactory());
+        $this->identity = "server/{$port}";
     }
 
     /**
@@ -113,6 +117,11 @@ public function __toString(): string
 
     /* ---------- Configuration ------------------------------------------------------------------------------------ */
 
+    public function getIdentity(): string
+    {
+        return $this->identity;
+    }
+
     /**
      * Set stream factory to use.
      * @param StreamFactory $streamFactory
@@ -511,7 +520,7 @@ protected function createSocketServer(): void
             $uri = new Uri("{$this->scheme}://0.0.0.0:{$this->port}");
             $this->server = $this->streamFactory->createSocketServer($uri, $this->context);
             $this->streams = $this->streamFactory->createStreamCollection();
-            $this->streams->attach($this->server, '@server');
+            $this->streams->attach($this->server, $this->identity);
             $this->logger->info("[server] Starting server on {$uri}.");
         } catch (Throwable $e) {
             $error = "Server failed to start: {$e->getMessage()}";
@@ -529,15 +538,14 @@ protected function acceptSocket(SocketServer $socket): void
         try {
             /** @var SocketStream $stream */
             $stream = $socket->accept();
-            $name = $stream->getRemoteName() ?? 'unknown';
-            $this->streams()->attach($stream, $name);
             $connection = new Connection(
                 $stream,
                 false,
                 true,
                 $this->isSsl(),
                 $this->httpFactory
             );
+            $this->streams()->attach($stream, $connection->getIdentity());
         } catch (StreamException $e) {
             throw new ConnectionFailureException("Server failed to accept: {$e->getMessage()}");
         }
@@ -552,8 +560,8 @@ protected function acceptSocket(SocketServer $socket): void
             }
             /** @throws StreamException */
             $request = $this->performHandshake($connection);
-            $this->connections[$name] = $connection;
-            $this->logger->info("[server] Accepted connection from {$name}.");
+            $this->connections[$connection->getIdentity()] = $connection;
+            $this->logger->info("[server] Accepted connection from {$connection->getIdentity()}.");
             $this->dispatch('handshake', [
                 $this,
                 $connection,

diff --git a/tests/mock/MockStreamTrait.php b/tests/mock/MockStreamTrait.php
@@ -89,17 +89,14 @@ private function expectWsClientConnect(
         $this->expectContext()->addAssert(function ($method, $params) {
             $this->assertIsResource($params[0]);
         });
-        $this->expectSocketStreamGetRemoteName()->setReturn(function () use ($host, $port) {
-            return "{$host}:{$port}";
-        });
-        $this->expectStreamCollectionAttach();
         $this->expectSocketStreamGetLocalName()->setReturn(function () use ($local) {
             return "{$local}";
         });
         $this->expectSocketStreamGetRemoteName()->setReturn(function () use ($host, $port) {
             return "{$host}:{$port}";
         });
 
+        $this->expectStreamCollectionAttach();
         $this->expectSocketStreamSetTimeout()->addAssert(function ($method, $params) use ($timeout) {
             $this->assertEquals($timeout, $params[0]);
         });
@@ -179,8 +176,8 @@ private function expectWsServerSetup(string $scheme = 'tcp', int $port = 8000, a
         $this->expectSocketServerGetMetadata();
         $this->expectStreamFactoryCreateStreamCollection();
         $this->expectStreamCollection();
-        $this->expectStreamCollectionAttach()->addAssert(function ($method, $params) {
-            $this->assertEquals('@server', $params[1]);
+        $this->expectStreamCollectionAttach()->addAssert(function ($method, $params) use ($port) {
+            $this->assertEquals("server/{$port}", $params[1]);
         });
     }
 
@@ -190,10 +187,9 @@ private function expectWsServerSetup(string $scheme = 'tcp', int $port = 8000, a
     private function expectWsSelectConnections(array $keys = []): StackItem
     {
         $this->expectStreamCollectionWaitRead()->setReturn(function ($params, $default, $collection) use ($keys) {
-            $keys = array_flip($keys);
             $selected = new StreamCollection();
             foreach ($collection as $key => $stream) {
-                if (array_key_exists($key, $keys)) {
+                if (in_array($key, $keys)) {
                     $selected->attach($stream, $key);
                 }
             }
@@ -206,6 +202,24 @@ private function expectWsSelectConnections(array $keys = []): StackItem
         return $last;
     }
 
+    private function expectWsServerAccept(
+        string $local = 'localhost:8000',
+        string $remote = '127.0.0.1:12345'
+    ): StackItem {
+        $this->expectSocketServerAccept();
+        $this->expectSocketStream();
+        $this->expectSocketStreamGetMetadata();
+        $this->expectContext();
+        $this->expectSocketStreamGetLocalName()->setReturn(function () use ($local) {
+            return $local;
+        });
+        $this->expectSocketStreamGetRemoteName()->setReturn(function () use ($remote) {
+            return $remote;
+        });
+        $this->expectStreamCollectionAttach();
+        return $this->expectSocketStreamSetTimeout();
+    }
+
     /**
      * @param array<mixed> $headers
      */

diff --git a/tests/suites/client/ClientErrorTest.php b/tests/suites/client/ClientErrorTest.php
@@ -82,10 +82,9 @@ public function testFailedConnection(): void
         $this->expectSocketStream();
         $this->expectSocketStreamGetMetadata();
         $this->expectContext();
-        $this->expectSocketStreamGetRemoteName();
-        $this->expectStreamCollectionAttach();
         $this->expectSocketStreamGetLocalName();
         $this->expectSocketStreamGetRemoteName();
+        $this->expectStreamCollectionAttach();
         $this->expectSocketStreamSetTimeout();
         $this->expectSocketStreamIsConnected()->setReturn(function () {
             return false;