Add consistency between proxies

Author: qboot

Tests/RedirectionIOTest.php

@@ -64,8 +64,7 @@ class RedirectionIOTest extends TestCase
         'connections' => [
             [
                 'name' => 'agent',
-                'host' => 'localhost',
-                'port' => 3100,
+                'remote_socket' => 'tcp://localhost:3100',
             ],
         ],
         'doNotRedirectAdmin' => false,
@@ -134,8 +133,7 @@ public function testWhenAgentDown()
             'connections' => [
                 [
                     'name' => 'agent',
-                    'host' => 'unknown-host',
-                    'port' => 80,
+                    'remote_socket' => 'tcp://unknown-host:80',
                 ],
             ],
             'doNotRedirectAdmin' => false,

assets/js/redirectionio.js

@@ -22,7 +22,7 @@ function rioAddConnection(e)
     var id = parseInt(lastInput.name.split(/\[|\]/)[3]);
     var newId = id + 1;
 
-    // clone a table of inputs (name, host and port)
+    // clone a table of inputs (name, remote_address)
     var clone = tables[0].cloneNode(true);
     var cloneInputs = clone.getElementsByTagName('input');
 

composer.json

@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "redirectionio/proxy-sdk": "^1.0"
+        "redirectionio/proxy-sdk": "^0.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.10",
@@ -40,7 +40,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.x-dev"
         }
     }
 }

src/RedirectionIO.php

@@ -40,14 +40,8 @@ public function findRedirect()
             return false;
         }
 
-        foreach ($options['connections'] as $option) {
-            foreach ($option as $key => $val) {
-                if ($key === 'name') {
-                    continue;
-                }
-
-                $connections[$option['name']][$key] = $val;
-            }
+        foreach ($options['connections'] as $connection) {
+            $connections[$connection['name']] = $connection['remote_socket'];
         }
 
         $client = new Client($connections);

src/RedirectionIOSettingsPage.php

@@ -112,8 +112,8 @@ public function registerSettings()
                     case 'remote_socket':
                         $title = __('Agent address', 'redirectionio');
                         $required = true;
-                        $description = __('[Required] Insert here your agent address. Internet Domain socket (AF_INET) and Unix Domain socket (AF_UNIX) are supported.<br/> Examples: 192.168.1.1:20301, agent.my-website.com:10301, /var/run/my-agent.sock', 'redirectionio');
-                        $placeholder = '192.168.1.1:20301';
+                        $description = __('[Required] Insert here your agent address. Internet Domain socket (AF_INET) and Unix Domain socket (AF_UNIX) are supported.<br/> Examples: tcp://192.168.1.1:20301, tcp://agent.my-website.com:10301, unix:///var/run/my-agent.sock', 'redirectionio');
+                        $placeholder = 'tcp://192.168.1.1:20301';
                         break;
                     default:
                         $title = 'unknown';
@@ -247,8 +247,6 @@ public static function isWorkingConnection($connection)
 
         $client = new Client(
             ['checkStatus' => [
-                'host' => $connection['host'],
-                'port' => $connection['port'],
                 'remote_socket' => $connection['remote_socket'],
             ]],
             10000,