Mirrors/SmartHomePHP
2
0
Fork 0
mirror of https://github.com/CyanoFresh/SmartHomePHP.git synced 2026-02-20 03:11:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Exp: multiple connections by one user; Fixes

Browse Source
This commit is contained in:
Alex Solomaha
2017-04-26 21:25:21 +03:00
parent 4c53cfb565
commit 274d63d1e5
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
models/ItemWidget.php
View File

@@ -54,6 +54,7 @@ class ItemWidget extends ActiveRecord
[['value_type'], 'in', 'range' => self::getValueTypesArray()],
[['name', 'item_id', 'icon', 'type'], 'required'],
[['name', 'html_class', 'icon'], 'string', 'max' => 255],
[['sort_order'], 'default', 'value' => 0],
[['item_id'], 'exist', 'skipOnError' => true, 'targetClass' => Item::className(), 'targetAttribute' => ['item_id' => 'id']],
[['room_id'], 'exist', 'skipOnError' => true, 'targetClass' => Room::className(), 'targetAttribute' => ['room_id' => 'id']],
];

27
servers/CoreServer.php
View File

@@ -160,6 +160,11 @@ class CoreServer implements MessageComponentInterface
if (isset($conn->User)) {
$this->logUserConnection($conn->User, false);
if (isset($this->userConnections[$conn->User->id][$conn->resourceId])
and $this->userConnections[$conn->User->id][$conn->resourceId] instanceof ConnectionInterface) {
unset($this->userConnections[$conn->User->id][$conn->resourceId]);
}
$this->log("User [{$conn->User->id}] disconnected");
} elseif (isset($conn->Board)) {
$boardId = $conn->Board->id;
@@ -210,12 +215,12 @@ class CoreServer implements MessageComponentInterface
}
// Check if it is an API request
$api = $conn->remoteAddress == '127.0.0.1' and $conn->WebSocket->request->getHeader('Origin') == 'origin';
$api = $conn->remoteAddress === '127.0.0.1' and $conn->WebSocket->request->getHeader('Origin') == 'origin';
// Close previous connection if it is not an API connection
if (isset($this->userConnections[$user->id]) and !$api) {
$this->userConnections[$user->id]->close();
}
// if (!$api and isset($this->userConnections[$user->id]) and $this->userConnections[$user->id] instanceof ConnectionInterface) {
// $this->userConnections[$user->id]->close();
// }
// Regenerate auth token
$user->reGenerateAuthToken();
@@ -224,7 +229,7 @@ class CoreServer implements MessageComponentInterface
$conn->User = $user;
$conn->api = $api;
$this->userConnections[$user->id] = $conn;
$this->userConnections[$user->id][$conn->resourceId] = $conn;
// Prepare Items for User
$itemModels = Item::find()->all();
@@ -507,7 +512,6 @@ class CoreServer implements MessageComponentInterface
$this->sendUsers($parameters);
$this->logItemValue($item, serialize($parameters));
VarDumper::dump($parameters);
$this->saveItemValue($item->id, $parameters, $item->type);
break;
@@ -804,8 +808,15 @@ class CoreServer implements MessageComponentInterface
{
$msg = Json::encode($data);
foreach ($this->userConnections as $client) {
$client->send($msg);
foreach ($this->userConnections as $userConnections) {
if (is_array($userConnections)) {
/** @var Connection[] $userConnections */
foreach ($userConnections as $connection) {
$connection->send($msg);
}
} else {
$userConnections->send($msg);
}
}
}