Skip to content

Update dependencies and improve search method #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+10 −7
Closed

Update dependencies and improve search method #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
},
"require": {
"php": ">=5.3",
"clue/multicast-react": "^1.0 || ^0.2",
"clue/multicast-react": "1.x-dev#f1bd5df0309b9f8b3486b09bf37aedfb042addb6",
"react/event-loop": "^1.2",
"react/promise": "^2.0 || ^1.0"
"react/promise": "^3.2 || ^2.7 || ^1.2.1"
},
"require-dev": {
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
Expand Down
13 changes: 8 additions & 5 deletions src/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ public function search($searchTarget = 'ssdp:all', $mx = 2)
$socket = $this->multicast->createSender();
// TODO: The TTL for the IP packet SHOULD default to 2 and SHOULD be configurable.

$timer = $this->loop->addTimer($mx, function() use ($socket, &$deferred) {
$deferred->resolve();
$socket->close();
});
$messages = array();

$loop = $this->loop;
$deferred = new Deferred(function () use ($socket, &$timer, $loop) {
Expand All @@ -59,9 +56,15 @@ public function search($searchTarget = 'ssdp:all', $mx = 2)
throw new RuntimeException('Cancelled');
});

$timer = $this->loop->addTimer($mx, function() use ($socket, &$deferred, &$messages) {
$deferred->resolve($messages);
$socket->close();
});

$that = $this;
$socket->on('message', function ($data, $remote) use ($deferred, $that) {
$socket->on('message', function ($data, $remote) use (&$messages, $that) {
$message = $that->parseMessage($data, $remote);
$messages[] = $message;

$deferred->progress($message);
});
Expand Down