Use the socket extension when possible
This commit is contained in:
parent
8a93db8f30
commit
38e5b6151a
@ -25,7 +25,8 @@
|
|||||||
"phpdocumentor/reflection-docblock": "^3.1"
|
"phpdocumentor/reflection-docblock": "^3.1"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-libtgvoip": "Install the php-libtgvoip extension to make phone calls (https:/github.com/danog/php-libtgvoip)"
|
"ext-libtgvoip": "Install the php-libtgvoip extension to make phone calls (https:/github.com/danog/php-libtgvoip)",
|
||||||
|
"ext-socket": "Install the socket extension to speed up MadelineProto"
|
||||||
},
|
},
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
|
126
src/Socket.php
126
src/Socket.php
@ -9,16 +9,7 @@ See the GNU Affero General Public License for more details.
|
|||||||
You should have received a copy of the GNU General Public License along with MadelineProto.
|
You should have received a copy of the GNU General Public License along with MadelineProto.
|
||||||
If not, see <http://www.gnu.org/licenses/>.
|
If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
if (!extension_loaded('pthreads')) {
|
class FSocket
|
||||||
if (!extension_loaded('sockets')) {
|
|
||||||
define('AF_INET', 0);
|
|
||||||
define('AF_INET6', 1);
|
|
||||||
define('SOCK_STREAM', 2);
|
|
||||||
define('SOL_SOCKET', 3);
|
|
||||||
define('SO_RCVTIMEO', 4);
|
|
||||||
define('SO_SNDTIMEO', 5);
|
|
||||||
}
|
|
||||||
class Socket
|
|
||||||
{
|
{
|
||||||
private $sock;
|
private $sock;
|
||||||
private $protocol;
|
private $protocol;
|
||||||
@ -125,4 +116,119 @@ if (!extension_loaded('pthreads')) {
|
|||||||
throw new \danog\MadelineProto\Exception('Not supported');
|
throw new \danog\MadelineProto\Exception('Not supported');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!extension_loaded('pthreads')) {
|
||||||
|
if (extension_loaded('sockets')) {
|
||||||
|
class Socket
|
||||||
|
{
|
||||||
|
private $sock;
|
||||||
|
|
||||||
|
public function __construct(int $domain, int $type, int $protocol)
|
||||||
|
{
|
||||||
|
$this->sock = socket_create($domain, $type, $protocol);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function __destruct()
|
||||||
|
{
|
||||||
|
socket_close($this->sock);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setOption(int $level, int $name, $value)
|
||||||
|
{
|
||||||
|
if (in_array($name, [\SO_RCVTIMEO, \SO_SNDTIMEO])) {
|
||||||
|
$value = ['sec' => (int) $value, 'usec' => (int) (($value - (int) $value) * 1000000)];
|
||||||
|
}
|
||||||
|
|
||||||
|
return socket_set_option($this->sock, $level, $name, $value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getOption(int $level, int $name)
|
||||||
|
{
|
||||||
|
return socket_get_option($this->sock, $level, $name);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setBlocking(bool $blocking)
|
||||||
|
{
|
||||||
|
if ($blocking) {
|
||||||
|
return socket_set_block($this->sock);
|
||||||
|
}
|
||||||
|
|
||||||
|
return socket_set_nonblock($this->sock);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function bind(string $address, int $port = 0)
|
||||||
|
{
|
||||||
|
return socket_bind($this->sock, $address, $port);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function listen(int $backlog = 0)
|
||||||
|
{
|
||||||
|
return socket_listen($this->sock, $backlog);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function accept()
|
||||||
|
{
|
||||||
|
return socket_accept($this->sock);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function connect(string $address, int $port = 0)
|
||||||
|
{
|
||||||
|
return socket_connect($this->sock, $address, $port);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function select(array &$read, array &$write, array &$except, int $tv_sec, int $tv_usec = 0)
|
||||||
|
{
|
||||||
|
return socket_select($read, $write, $except, $tv_sec, $tv_usec);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function read(int $length, int $flags = 0)
|
||||||
|
{
|
||||||
|
return socket_read($this->sock, $length, $flags);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function write(string $buffer, int $length = -1)
|
||||||
|
{
|
||||||
|
return $length === -1 ? socket_write($this->sock, $buffer) : socket_write($this->sock, $buffer, $Length);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function send(string $data, int $length, int $flags)
|
||||||
|
{
|
||||||
|
return socket_send($data, $length, $flags);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function close()
|
||||||
|
{
|
||||||
|
return socket_close($this->sock);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getPeerName(bool $port = true)
|
||||||
|
{
|
||||||
|
$address = '';
|
||||||
|
$port = 0;
|
||||||
|
$port ? socket_getpeername($this->sock, $address, $ip) : socket_getpeername($this->sock, $address);
|
||||||
|
|
||||||
|
return $port ? ['host' => $address, 'port' => $port] : ['host' => $address];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getSockName(bool $port = true)
|
||||||
|
{
|
||||||
|
$address = '';
|
||||||
|
$port = 0;
|
||||||
|
$port ? socket_getsockname($this->sock, $address, $ip) : socket_getsockname($this->sock, $address);
|
||||||
|
|
||||||
|
return $port ? ['host' => $address, 'port' => $port] : ['host' => $address];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
define('AF_INET', 0);
|
||||||
|
define('AF_INET6', 1);
|
||||||
|
define('SOCK_STREAM', 2);
|
||||||
|
define('SOL_SOCKET', 3);
|
||||||
|
define('SO_RCVTIMEO', 4);
|
||||||
|
define('SO_SNDTIMEO', 5);
|
||||||
|
|
||||||
|
class Socket extends FSocket
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -161,6 +161,7 @@ class Connection
|
|||||||
if ($this->parsed['host'][0] === '[') {
|
if ($this->parsed['host'][0] === '[') {
|
||||||
$this->parsed['host'] = substr($this->parsed['host'], 1, -1);
|
$this->parsed['host'] = substr($this->parsed['host'], 1, -1);
|
||||||
}
|
}
|
||||||
|
if ($this->protocol === 'https' && $proxy === '\Socket') $proxy = '\FSocket';
|
||||||
$this->sock = new $proxy($ipv6 ? \AF_INET6 : \AF_INET, \SOCK_STREAM, $this->protocol === 'https' ? PHP_INT_MAX : getprotobyname('tcp'));
|
$this->sock = new $proxy($ipv6 ? \AF_INET6 : \AF_INET, \SOCK_STREAM, $this->protocol === 'https' ? PHP_INT_MAX : getprotobyname('tcp'));
|
||||||
if ($has_proxy && $this->extra !== []) {
|
if ($has_proxy && $this->extra !== []) {
|
||||||
$this->sock->setExtra($this->extra);
|
$this->sock->setExtra($this->extra);
|
||||||
|
Loading…
Reference in New Issue
Block a user