- Rework finished

Signed-off-by: Valery Piashchynski <[email protected]>

11 files changed, 360 insertions, 509 deletions

diff --git a/tests/plugins/broadcast/broadcast_plugin_test.go b/tests/plugins/broadcast/broadcast_plugin_test.go
index 5b195bd0..585a81a9 100644
--- a/tests/plugins/broadcast/broadcast_plugin_test.go
+++ b/tests/plugins/broadcast/broadcast_plugin_test.go
@@ -1,22 +1,13 @@
 package broadcast
 
 import (
-	"net"
-	"net/http"
-	"net/rpc"
-	"net/url"
 	"os"
 	"os/signal"
 	"sync"
 	"syscall"
 	"testing"
-	"time"
 
-	"github.com/fasthttp/websocket"
-	json "github.com/json-iterator/go"
 	endure "github.com/spiral/endure/pkg/container"
-	goridgeRpc "github.com/spiral/goridge/v3/pkg/rpc"
-	websocketsv1 "github.com/spiral/roadrunner/v2/pkg/proto/websockets/v1beta"
 	"github.com/spiral/roadrunner/v2/plugins/broadcast"
 	"github.com/spiral/roadrunner/v2/plugins/config"
 	httpPlugin "github.com/spiral/roadrunner/v2/plugins/http"
@@ -26,7 +17,6 @@ import (
 	rpcPlugin "github.com/spiral/roadrunner/v2/plugins/rpc"
 	"github.com/spiral/roadrunner/v2/plugins/server"
 	"github.com/spiral/roadrunner/v2/plugins/websockets"
-	"github.com/spiral/roadrunner/v2/utils"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -98,109 +88,7 @@ func TestBroadcastInit(t *testing.T) {
 		}
 	}()
 
-	t.Run("TestWSInit", wsInit)
-
 	stopCh <- struct{}{}
 
 	wg.Wait()
 }
-
-func wsInit(t *testing.T) {
-	da := websocket.Dialer{
-		Proxy:            http.ProxyFromEnvironment,
-		HandshakeTimeout: time.Second * 20,
-	}
-
-	connURL := url.URL{Scheme: "ws", Host: "localhost:11111", Path: "/ws"}
-
-	c, resp, err := da.Dial(connURL.String(), nil)
-	assert.NoError(t, err)
-
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-
-	d, err := json.Marshal(messageWS("join", "memory", []byte("hello websockets"), "foo", "foo2"))
-	if err != nil {
-		panic(err)
-	}
-
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
-
-	_, msg, err := c.ReadMessage()
-	retMsg := utils.AsString(msg)
-	assert.NoError(t, err)
-
-	// subscription done
-	assert.Equal(t, `{"topic":"@join","payload":["foo","foo2"]}`, retMsg)
-
-	err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
-	assert.NoError(t, err)
-}
-
-func publishAsync(t *testing.T, command string, broker string, topics ...string) {
-	conn, err := net.Dial("tcp", "127.0.0.1:6001")
-	if err != nil {
-		panic(err)
-	}
-
-	client := rpc.NewClientWithCodec(goridgeRpc.NewClientCodec(conn))
-
-	ret := &websocketsv1.Response{}
-	err = client.Call("websockets.PublishAsync", makeMessage(command, broker, []byte("hello, PHP"), topics...), ret)
-	assert.NoError(t, err)
-	assert.True(t, ret.Ok)
-}
-
-func publishAsync2(t *testing.T, command string, broker string, topics ...string) {
-	conn, err := net.Dial("tcp", "127.0.0.1:6001")
-	if err != nil {
-		panic(err)
-	}
-
-	client := rpc.NewClientWithCodec(goridgeRpc.NewClientCodec(conn))
-
-	ret := &websocketsv1.Response{}
-	err = client.Call("websockets.PublishAsync", makeMessage(command, broker, []byte("hello, PHP2"), topics...), ret)
-	assert.NoError(t, err)
-	assert.True(t, ret.Ok)
-}
-
-func publish2(t *testing.T, command string, broker string, topics ...string) {
-	conn, err := net.Dial("tcp", "127.0.0.1:6001")
-	if err != nil {
-		panic(err)
-	}
-
-	client := rpc.NewClientWithCodec(goridgeRpc.NewClientCodec(conn))
-
-	ret := &websocketsv1.Response{}
-	err = client.Call("websockets.Publish", makeMessage(command, broker, []byte("hello, PHP2"), topics...), ret)
-	assert.NoError(t, err)
-	assert.True(t, ret.Ok)
-}
-
-func messageWS(command string, broker string, payload []byte, topics ...string) *websocketsv1.Message {
-	return &websocketsv1.Message{
-		Topics:  topics,
-		Command: command,
-		//Broker:  broker,
-		Payload: payload,
-	}
-}
-
-func makeMessage(command string, broker string, payload []byte, topics ...string) *websocketsv1.Request {
-	m := &websocketsv1.Request{
-		Messages: []*websocketsv1.Message{
-			{
-				Topics:  topics,
-				Command: command,
-				//Broker:  broker,
-				Payload: payload,
-			},
-		},
-	}
-
-	return m
-}
diff --git a/tests/plugins/broadcast/configs/.rr-broadcast-init.yaml b/tests/plugins/broadcast/configs/.rr-broadcast-init.yaml
index 6962eeb5..8436b65f 100644
--- a/tests/plugins/broadcast/configs/.rr-broadcast-init.yaml
+++ b/tests/plugins/broadcast/configs/.rr-broadcast-init.yaml
@@ -9,7 +9,7 @@ server:
   relay_timeout: "20s"
 
 http:
-  address: 127.0.0.1:11111
+  address: 127.0.0.1:21345
   max_request_size: 1024
   middleware: [ "websockets" ]
   trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
@@ -37,7 +37,7 @@ websockets:
 
 logs:
   mode: development
-  level: debug
+  level: error
 
 endure:
   grace_period: 120s
diff --git a/tests/plugins/kv/storage_plugin_test.go b/tests/plugins/kv/storage_plugin_test.go
index 24b66ae1..1e466e06 100644
--- a/tests/plugins/kv/storage_plugin_test.go
+++ b/tests/plugins/kv/storage_plugin_test.go
@@ -12,7 +12,6 @@ import (
 
 	endure "github.com/spiral/endure/pkg/container"
 	goridgeRpc "github.com/spiral/goridge/v3/pkg/rpc"
-	payload "github.com/spiral/roadrunner/v2/pkg/proto/kv/v1beta"
 	"github.com/spiral/roadrunner/v2/plugins/config"
 	"github.com/spiral/roadrunner/v2/plugins/kv"
 	"github.com/spiral/roadrunner/v2/plugins/kv/drivers/boltdb"
@@ -21,6 +20,7 @@ import (
 	"github.com/spiral/roadrunner/v2/plugins/memory"
 	"github.com/spiral/roadrunner/v2/plugins/redis"
 	rpcPlugin "github.com/spiral/roadrunner/v2/plugins/rpc"
+	payload "github.com/spiral/roadrunner/v2/proto/kv/v1beta"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tests/plugins/websockets/configs/.rr-websockets-memory-allow.yaml b/tests/plugins/websockets/configs/.rr-websockets-allow.yaml
index f81e13e3..e6c43857 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-memory-allow.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-allow.yaml
@@ -9,7 +9,7 @@ server:
   relay_timeout: "20s"
 
 http:
-  address: 127.0.0.1:11113
+  address: 127.0.0.1:41278
   max_request_size: 1024
   middleware: [ "websockets" ]
   trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
diff --git a/tests/plugins/websockets/configs/.rr-websockets-redis-memory-local.yaml b/tests/plugins/websockets/configs/.rr-websockets-allow2.yaml
index a077bf9e..d537a80b 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-redis-memory-local.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-allow2.yaml
@@ -2,14 +2,14 @@ rpc:
   listen: tcp://127.0.0.1:6001
 
 server:
-  command: "php ../../psr-worker-bench.php"
+  command: "php ../../worker-ok.php"
   user: ""
   group: ""
   relay: "pipes"
   relay_timeout: "20s"
 
 http:
-  address: 127.0.0.1:13235
+  address: 127.0.0.1:41270
   max_request_size: 1024
   middleware: [ "websockets" ]
   trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
@@ -19,10 +19,15 @@ http:
     allocate_timeout: 60s
     destroy_timeout: 60s
 
+redis:
+  addrs:
+    - "localhost:6379"
 
 broadcast:
    test:
-  driver: memory
+    driver: redis
+    addrs:
+      - "localhost:6379"
 
 websockets:
   broker: test
@@ -31,7 +36,7 @@ websockets:
 
 logs:
   mode: development
-  level: debug
+  level: error
 
 endure:
   grace_period: 120s
diff --git a/tests/plugins/websockets/configs/.rr-websockets-redis-no-section.yaml b/tests/plugins/websockets/configs/.rr-websockets-broker-no-section.yaml
index d80993f2..ada23845 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-redis-no-section.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-broker-no-section.yaml
@@ -19,6 +19,9 @@ http:
     allocate_timeout: 60s
     destroy_timeout: 60s
 
+broadcast:
+  test1:
+    driver: no
 
 websockets:
   broker: test
diff --git a/tests/plugins/websockets/configs/.rr-websockets-memory-deny.yaml b/tests/plugins/websockets/configs/.rr-websockets-deny.yaml
index decb7dcf..594a746d 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-memory-deny.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-deny.yaml
@@ -9,7 +9,7 @@ server:
   relay_timeout: "20s"
 
 http:
-  address: 127.0.0.1:11112
+  address: 127.0.0.1:15587
   max_request_size: 1024
   middleware: [ "websockets" ]
   trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
diff --git a/tests/plugins/websockets/configs/.rr-websockets-deny2.yaml b/tests/plugins/websockets/configs/.rr-websockets-deny2.yaml
new file mode 100644
index 00000000..4deea30a
--- /dev/null
+++ b/tests/plugins/websockets/configs/.rr-websockets-deny2.yaml
@@ -0,0 +1,40 @@
+rpc:
+  listen: tcp://127.0.0.1:6001
+
+server:
+  command: "php ../../worker-deny.php"
+  user: ""
+  group: ""
+  relay: "pipes"
+  relay_timeout: "20s"
+
+http:
+  address: 127.0.0.1:15588
+  max_request_size: 1024
+  middleware: [ "websockets" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  pool:
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
+
+broadcast:
+  test:
+    driver: redis
+    addrs:
+      - "localhost:6379"
+
+websockets:
+  broker: test
+  allowed_origin: "*"
+  path: "/ws"
+
+logs:
+  mode: development
+  level: error
+
+endure:
+  grace_period: 120s
+  print_graph: false
+  log_level: error
diff --git a/tests/plugins/websockets/configs/.rr-websockets-init.yaml b/tests/plugins/websockets/configs/.rr-websockets-init.yaml
index b6882d84..14472f8a 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-init.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-init.yaml
@@ -25,9 +25,7 @@ redis:
 
 broadcast:
   default:
-    driver: redis
-    addrs:
-      - "localhost:6379"
+    driver: memory
 
 websockets:
   broker: default
diff --git a/tests/plugins/websockets/configs/.rr-websockets-memory-stop.yaml b/tests/plugins/websockets/configs/.rr-websockets-stop.yaml
index 5377aef2..5377aef2 100644
--- a/tests/plugins/websockets/configs/.rr-websockets-memory-stop.yaml
+++ b/tests/plugins/websockets/configs/.rr-websockets-stop.yaml
diff --git a/tests/plugins/websockets/websocket_plugin_test.go b/tests/plugins/websockets/websocket_plugin_test.go
index cb78117f..29bf28be 100644
--- a/tests/plugins/websockets/websocket_plugin_test.go
+++ b/tests/plugins/websockets/websocket_plugin_test.go
@@ -16,7 +16,6 @@ import (
 	json "github.com/json-iterator/go"
 	endure "github.com/spiral/endure/pkg/container"
 	goridgeRpc "github.com/spiral/goridge/v3/pkg/rpc"
-	websocketsv1 "github.com/spiral/roadrunner/v2/pkg/proto/websockets/v1beta"
 	"github.com/spiral/roadrunner/v2/plugins/broadcast"
 	"github.com/spiral/roadrunner/v2/plugins/config"
 	httpPlugin "github.com/spiral/roadrunner/v2/plugins/http"
@@ -26,6 +25,7 @@ import (
 	rpcPlugin "github.com/spiral/roadrunner/v2/plugins/rpc"
 	"github.com/spiral/roadrunner/v2/plugins/server"
 	"github.com/spiral/roadrunner/v2/plugins/websockets"
+	websocketsv1 "github.com/spiral/roadrunner/v2/proto/websockets/v1beta"
 	"github.com/spiral/roadrunner/v2/utils"
 	"github.com/stretchr/testify/assert"
 )
@@ -100,54 +100,20 @@ func TestBroadcastInit(t *testing.T) {
 
 	time.Sleep(time.Second * 1)
 	t.Run("TestWSInit", wsInit)
-	t.Run("RPCWsMemoryPubAsync", RPCWsMemoryPubAsync)
-	t.Run("RPCWsMemory", RPCWsMemory)
+	t.Run("RPCWsMemoryPubAsync", RPCWsPubAsync("11111"))
+	t.Run("RPCWsMemory", RPCWsPub("11111"))
 
 	stopCh <- struct{}{}
 
 	wg.Wait()
 }
 
-func wsInit(t *testing.T) {
-	da := websocket.Dialer{
-		Proxy:            http.ProxyFromEnvironment,
-		HandshakeTimeout: time.Second * 20,
-	}
-
-	connURL := url.URL{Scheme: "ws", Host: "localhost:11111", Path: "/ws"}
-
-	c, resp, err := da.Dial(connURL.String(), nil)
-	assert.NoError(t, err)
-
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-
-	d, err := json.Marshal(messageWS("join", []byte("hello websockets"), "foo", "foo2"))
-	if err != nil {
-		panic(err)
-	}
-
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
-
-	_, msg, err := c.ReadMessage()
-	retMsg := utils.AsString(msg)
-	assert.NoError(t, err)
-
-	// subscription done
-	assert.Equal(t, `{"topic":"@join","payload":["foo","foo2"]}`, retMsg)
-
-	err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
-	assert.NoError(t, err)
-}
-
-func TestWSRedisAndMemory(t *testing.T) {
+func TestWSRedis(t *testing.T) {
 	cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel))
 	assert.NoError(t, err)
 
 	cfg := &config.Viper{
-		Path:   "configs/.rr-websockets-redis-memory.yaml",
+		Path:   "configs/.rr-websockets-redis.yaml",
 		Prefix: "rr",
 	}
 
@@ -159,7 +125,6 @@ func TestWSRedisAndMemory(t *testing.T) {
 		&redis.Plugin{},
 		&websockets.Plugin{},
 		&httpPlugin.Plugin{},
-		&memory.Plugin{},
 		&broadcast.Plugin{},
 	)
 	assert.NoError(t, err)
@@ -210,21 +175,20 @@ func TestWSRedisAndMemory(t *testing.T) {
 	}()
 
 	time.Sleep(time.Second * 1)
-	t.Run("RPCWsMemoryPubAsync", RPCWsMemoryPubAsync)
-	t.Run("RPCWsMemory", RPCWsMemory)
-	t.Run("RPCWsRedis", RPCWsRedis)
+	t.Run("RPCWsRedisPubAsync", RPCWsPubAsync("13235"))
+	t.Run("RPCWsRedisPub", RPCWsPub("13235"))
 
 	stopCh <- struct{}{}
 
 	wg.Wait()
 }
 
-func TestWSRedisAndMemoryGlobal(t *testing.T) {
+func TestWSRedisNoSection(t *testing.T) {
 	cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel))
 	assert.NoError(t, err)
 
 	cfg := &config.Viper{
-		Path:   "configs/.rr-websockets-redis.yaml",
+		Path:   "configs/.rr-websockets-broker-no-section.yaml",
 		Prefix: "rr",
 	}
 
@@ -236,6 +200,35 @@ func TestWSRedisAndMemoryGlobal(t *testing.T) {
 		&redis.Plugin{},
 		&websockets.Plugin{},
 		&httpPlugin.Plugin{},
+		&broadcast.Plugin{},
+	)
+	assert.NoError(t, err)
+
+	err = cont.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = cont.Serve()
+	assert.Error(t, err)
+}
+
+func TestWSDeny(t *testing.T) {
+	cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel))
+	assert.NoError(t, err)
+
+	cfg := &config.Viper{
+		Path:   "configs/.rr-websockets-deny.yaml",
+		Prefix: "rr",
+	}
+
+	err = cont.RegisterAll(
+		cfg,
+		&rpcPlugin.Plugin{},
+		&logger.ZapLogger{},
+		&server.Plugin{},
+		&websockets.Plugin{},
+		&httpPlugin.Plugin{},
 		&memory.Plugin{},
 		&broadcast.Plugin{},
 	)
@@ -287,20 +280,19 @@ func TestWSRedisAndMemoryGlobal(t *testing.T) {
 	}()
 
 	time.Sleep(time.Second * 1)
-
-	t.Run("RPCWsRedis", RPCWsRedis)
+	t.Run("RPCWsMemoryDeny", RPCWsDeny("15587"))
 
 	stopCh <- struct{}{}
 
 	wg.Wait()
 }
 
-func TestWSRedisNoSection(t *testing.T) {
+func TestWSDeny2(t *testing.T) {
 	cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel))
 	assert.NoError(t, err)
 
 	cfg := &config.Viper{
-		Path:   "configs/.rr-websockets-redis-no-section.yaml",
+		Path:   "configs/.rr-websockets-deny2.yaml",
 		Prefix: "rr",
 	}
 
@@ -309,10 +301,9 @@ func TestWSRedisNoSection(t *testing.T) {
 		&rpcPlugin.Plugin{},
 		&logger.ZapLogger{},
 		&server.Plugin{},
-		&redis.Plugin{},
 		&websockets.Plugin{},
 		&httpPlugin.Plugin{},
-		&memory.Plugin{},
+		&redis.Plugin{},
 		&broadcast.Plugin{},
 	)
 	assert.NoError(t, err)
@@ -322,234 +313,60 @@ func TestWSRedisNoSection(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, err = cont.Serve()
-	assert.Error(t, err)
-}
-
-func RPCWsMemoryPubAsync(t *testing.T) {
-	da := websocket.Dialer{
-		Proxy:            http.ProxyFromEnvironment,
-		HandshakeTimeout: time.Second * 20,
-	}
-
-	connURL := url.URL{Scheme: "ws", Host: "localhost:11111", Path: "/ws"}
-
-	c, resp, err := da.Dial(connURL.String(), nil)
-	assert.NoError(t, err)
-
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-
-	d, err := json.Marshal(messageWS("join", []byte("hello websockets"), "foo", "foo2"))
-	if err != nil {
-		panic(err)
-	}
-
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
-
-	_, msg, err := c.ReadMessage()
-	retMsg := utils.AsString(msg)
-	assert.NoError(t, err)
-
-	// subscription done
-	assert.Equal(t, `{"topic":"@join","payload":["foo","foo2"]}`, retMsg)
-
-	publishAsync(t, "", "memory", "foo")
-
-	// VERIFY a makeMessage
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
-	assert.Equal(t, "{\"topic\":\"foo\",\"payload\":\"hello, PHP\"}", retMsg)
-
-	// //// LEAVE foo, foo2 /////////
-	d, err = json.Marshal(messageWS("leave", []byte("hello websockets"), "foo"))
+	ch, err := cont.Serve()
 	if err != nil {
-		panic(err)
+		t.Fatal(err)
 	}
 
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
-
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
+	sig := make(chan os.Signal, 1)
+	signal.Notify(sig, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
 
-	// subscription done
-	assert.Equal(t, `{"topic":"@leave","payload":["foo"]}`, retMsg)
+	wg := &sync.WaitGroup{}
+	wg.Add(1)
 
-	// TRY TO PUBLISH TO UNSUBSCRIBED TOPIC
-	publishAsync(t, "", "memory", "foo")
+	stopCh := make(chan struct{}, 1)
 
 	go func() {
-		time.Sleep(time.Second * 5)
-		publishAsync2(t, "", "memory", "foo2")
-	}()
-
-	// should be only makeMessage from the subscribed foo2 topic
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
-	assert.Equal(t, "{\"topic\":\"foo2\",\"payload\":\"hello, PHP\"}", retMsg)
-
-	err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
-	assert.NoError(t, err)
-}
-
-func RPCWsMemory(t *testing.T) {
-	da := websocket.Dialer{
-		Proxy:            http.ProxyFromEnvironment,
-		HandshakeTimeout: time.Second * 20,
-	}
-
-	connURL := url.URL{Scheme: "ws", Host: "localhost:11111", Path: "/ws"}
-
-	c, resp, err := da.Dial(connURL.String(), nil)
-	assert.NoError(t, err)
-
-	defer func() {
-		if resp != nil && resp.Body != nil {
-			_ = resp.Body.Close()
+		defer wg.Done()
+		for {
+			select {
+			case e := <-ch:
+				assert.Fail(t, "error", e.Error.Error())
+				err = cont.Stop()
+				if err != nil {
+					assert.FailNow(t, "error", err.Error())
+				}
+			case <-sig:
+				err = cont.Stop()
+				if err != nil {
+					assert.FailNow(t, "error", err.Error())
+				}
+				return
+			case <-stopCh:
+				// timeout
+				err = cont.Stop()
+				if err != nil {
+					assert.FailNow(t, "error", err.Error())
+				}
+				return
+			}
 		}
 	}()
 
-	d, err := json.Marshal(messageWS("join", []byte("hello websockets"), "foo", "foo2"))
-	if err != nil {
-		panic(err)
-	}
-
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
-
-	_, msg, err := c.ReadMessage()
-	retMsg := utils.AsString(msg)
-	assert.NoError(t, err)
-
-	// subscription done
-	assert.Equal(t, `{"topic":"@join","payload":["foo","foo2"]}`, retMsg)
-
-	publish("", "memory", "foo")
-
-	// VERIFY a makeMessage
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
-	assert.Equal(t, "{\"topic\":\"foo\",\"payload\":\"hello, PHP\"}", retMsg)
-
-	// //// LEAVE foo, foo2 /////////
-	d, err = json.Marshal(messageWS("leave", []byte("hello websockets"), "foo"))
-	if err != nil {
-		panic(err)
-	}
-
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
-
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
-
-	// subscription done
-	assert.Equal(t, `{"topic":"@leave","payload":["foo"]}`, retMsg)
-
-	// TRY TO PUBLISH TO UNSUBSCRIBED TOPIC
-	publish("", "memory", "foo")
-
-	go func() {
-		time.Sleep(time.Second * 5)
-		publish2(t, "", "memory", "foo2")
-	}()
-
-	// should be only makeMessage from the subscribed foo2 topic
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
-	assert.Equal(t, "{\"topic\":\"foo2\",\"payload\":\"hello, PHP2\"}", retMsg)
-
-	err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
-	assert.NoError(t, err)
-}
-
-func RPCWsRedis(t *testing.T) {
-	da := websocket.Dialer{
-		Proxy:            http.ProxyFromEnvironment,
-		HandshakeTimeout: time.Second * 20,
-	}
-
-	connURL := url.URL{Scheme: "ws", Host: "localhost:13235", Path: "/ws"}
-
-	c, resp, err := da.Dial(connURL.String(), nil)
-	assert.NoError(t, err)
-
-	defer func() {
-		_ = resp.Body.Close()
-	}()
-
-	d, err := json.Marshal(messageWS("join", []byte("hello websockets"), "foo", "foo2"))
-	if err != nil {
-		panic(err)
-	}
-
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
-
-	_, msg, err := c.ReadMessage()
-	retMsg := utils.AsString(msg)
-	assert.NoError(t, err)
-
-	// subscription done
-	assert.Equal(t, `{"topic":"@join","payload":["foo","foo2"]}`, retMsg)
-
-	publish("", "redis", "foo")
-
-	// VERIFY a makeMessage
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
-	assert.Equal(t, "{\"topic\":\"foo\",\"payload\":\"hello, PHP\"}", retMsg)
-
-	// //// LEAVE foo, foo2 /////////
-	d, err = json.Marshal(messageWS("leave", []byte("hello websockets"), "foo"))
-	if err != nil {
-		panic(err)
-	}
-
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
-
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
-
-	// subscription done
-	assert.Equal(t, `{"topic":"@leave","payload":["foo"]}`, retMsg)
-
-	// TRY TO PUBLISH TO UNSUBSCRIBED TOPIC
-	publish("", "redis", "foo")
-
-	go func() {
-		time.Sleep(time.Second * 5)
-		publish2(t, "", "redis", "foo2")
-	}()
+	time.Sleep(time.Second * 1)
+	t.Run("RPCWsRedisDeny", RPCWsDeny("15588"))
 
-	// should be only makeMessage from the subscribed foo2 topic
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
-	assert.Equal(t, "{\"topic\":\"foo2\",\"payload\":\"hello, PHP2\"}", retMsg)
+	stopCh <- struct{}{}
 
-	err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
-	assert.NoError(t, err)
+	wg.Wait()
 }
 
-func TestWSMemoryDeny(t *testing.T) {
+func TestWSStop(t *testing.T) {
 	cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel))
 	assert.NoError(t, err)
 
 	cfg := &config.Viper{
-		Path:   "configs/.rr-websockets-memory-deny.yaml",
+		Path:   "configs/.rr-websockets-stop.yaml",
 		Prefix: "rr",
 	}
 
@@ -612,73 +429,40 @@ func TestWSMemoryDeny(t *testing.T) {
 	}()
 
 	time.Sleep(time.Second * 1)
-	t.Run("RPCWsMemoryDeny", RPCWsMemoryDeny)
+	t.Run("RPCWsStop", RPCWsMemoryStop("11114"))
 
 	stopCh <- struct{}{}
 
 	wg.Wait()
 }
 
-func RPCWsMemoryDeny(t *testing.T) {
-	da := websocket.Dialer{
-		Proxy:            http.ProxyFromEnvironment,
-		HandshakeTimeout: time.Second * 20,
-	}
-
-	connURL := url.URL{Scheme: "ws", Host: "localhost:11112", Path: "/ws"}
+func RPCWsMemoryStop(port string) func(t *testing.T) {
+	return func(t *testing.T) {
+		da := websocket.Dialer{
+			Proxy:            http.ProxyFromEnvironment,
+			HandshakeTimeout: time.Second * 20,
+		}
 
-	c, resp, err := da.Dial(connURL.String(), nil)
-	assert.NoError(t, err)
-	assert.NotNil(t, c)
-	assert.Equal(t, http.StatusSwitchingProtocols, resp.StatusCode)
+		connURL := url.URL{Scheme: "ws", Host: "localhost:" + port, Path: "/ws"}
 
-	defer func() {
-		if resp != nil && resp.Body != nil {
+		c, resp, err := da.Dial(connURL.String(), nil)
+		assert.NotNil(t, resp)
+		assert.Error(t, err)
+		assert.Nil(t, c)
+		assert.Equal(t, http.StatusUnauthorized, resp.StatusCode)    //nolint:staticcheck
+		assert.Equal(t, resp.Header.Get("Stop"), "we-dont-like-you") //nolint:staticcheck
+		if resp != nil && resp.Body != nil {                         //nolint:staticcheck
 			_ = resp.Body.Close()
 		}
-	}()
-
-	d, err := json.Marshal(messageWS("join", []byte("hello websockets"), "foo", "foo2"))
-	if err != nil {
-		panic(err)
 	}
-
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
-
-	_, msg, err := c.ReadMessage()
-	retMsg := utils.AsString(msg)
-	assert.NoError(t, err)
-
-	// subscription done
-	assert.Equal(t, `{"topic":"#join","payload":["foo","foo2"]}`, retMsg)
-
-	// //// LEAVE foo, foo2 /////////
-	d, err = json.Marshal(messageWS("leave", []byte("hello websockets"), "foo"))
-	if err != nil {
-		panic(err)
-	}
-
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
-
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
-
-	// subscription done
-	assert.Equal(t, `{"topic":"@leave","payload":["foo"]}`, retMsg)
-
-	err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
-	assert.NoError(t, err)
 }
 
-func TestWSMemoryStop(t *testing.T) {
+func TestWSAllow(t *testing.T) {
 	cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel))
 	assert.NoError(t, err)
 
 	cfg := &config.Viper{
-		Path:   "configs/.rr-websockets-memory-stop.yaml",
+		Path:   "configs/.rr-websockets-allow.yaml",
 		Prefix: "rr",
 	}
 
@@ -741,38 +525,19 @@ func TestWSMemoryStop(t *testing.T) {
 	}()
 
 	time.Sleep(time.Second * 1)
-	t.Run("RPCWsMemoryStop", RPCWsMemoryStop)
+	t.Run("RPCWsMemoryAllow", RPCWsPub("41278"))
 
 	stopCh <- struct{}{}
 
 	wg.Wait()
 }
 
-func RPCWsMemoryStop(t *testing.T) {
-	da := websocket.Dialer{
-		Proxy:            http.ProxyFromEnvironment,
-		HandshakeTimeout: time.Second * 20,
-	}
-
-	connURL := url.URL{Scheme: "ws", Host: "localhost:11114", Path: "/ws"}
-
-	c, resp, err := da.Dial(connURL.String(), nil)
-	assert.NotNil(t, resp)
-	assert.Error(t, err)
-	assert.Nil(t, c)
-	assert.Equal(t, http.StatusUnauthorized, resp.StatusCode)    //nolint:staticcheck
-	assert.Equal(t, resp.Header.Get("Stop"), "we-dont-like-you") //nolint:staticcheck
-	if resp != nil && resp.Body != nil {                         //nolint:staticcheck
-		_ = resp.Body.Close()
-	}
-}
-
-func TestWSMemoryOk(t *testing.T) {
+func TestWSAllow2(t *testing.T) {
 	cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel))
 	assert.NoError(t, err)
 
 	cfg := &config.Viper{
-		Path:   "configs/.rr-websockets-memory-allow.yaml",
+		Path:   "configs/.rr-websockets-allow2.yaml",
 		Prefix: "rr",
 	}
 
@@ -835,30 +600,26 @@ func TestWSMemoryOk(t *testing.T) {
 	}()
 
 	time.Sleep(time.Second * 1)
-	t.Run("RPCWsMemoryAllow", RPCWsMemoryAllow)
+	t.Run("RPCWsMemoryAllow", RPCWsPub("41270"))
 
 	stopCh <- struct{}{}
 
 	wg.Wait()
 }
 
-func RPCWsMemoryAllow(t *testing.T) {
+func wsInit(t *testing.T) {
 	da := websocket.Dialer{
 		Proxy:            http.ProxyFromEnvironment,
 		HandshakeTimeout: time.Second * 20,
 	}
 
-	connURL := url.URL{Scheme: "ws", Host: "localhost:11113", Path: "/ws"}
+	connURL := url.URL{Scheme: "ws", Host: "localhost:11111", Path: "/ws"}
 
 	c, resp, err := da.Dial(connURL.String(), nil)
 	assert.NoError(t, err)
-	assert.NotNil(t, c)
-	assert.Equal(t, http.StatusSwitchingProtocols, resp.StatusCode)
 
 	defer func() {
-		if resp != nil && resp.Body != nil {
-			_ = resp.Body.Close()
-		}
+		_ = resp.Body.Close()
 	}()
 
 	d, err := json.Marshal(messageWS("join", []byte("hello websockets"), "foo", "foo2"))
@@ -876,48 +637,218 @@ func RPCWsMemoryAllow(t *testing.T) {
 	// subscription done
 	assert.Equal(t, `{"topic":"@join","payload":["foo","foo2"]}`, retMsg)
 
-	publish("", "memory", "foo")
-
-	// VERIFY a makeMessage
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
+	err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
 	assert.NoError(t, err)
-	assert.Equal(t, "{\"topic\":\"foo\",\"payload\":\"hello, PHP\"}", retMsg)
+}
 
-	// //// LEAVE foo, foo2 /////////
-	d, err = json.Marshal(messageWS("leave", []byte("hello websockets"), "foo"))
-	if err != nil {
-		panic(err)
+func RPCWsPubAsync(port string) func(t *testing.T) {
+	return func(t *testing.T) {
+		da := websocket.Dialer{
+			Proxy:            http.ProxyFromEnvironment,
+			HandshakeTimeout: time.Second * 18,
+		}
+
+		connURL := url.URL{Scheme: "ws", Host: "localhost:" + port, Path: "/ws"}
+
+		c, resp, err := da.Dial(connURL.String(), nil)
+		assert.NoError(t, err)
+
+		defer func() {
+			_ = resp.Body.Close()
+		}()
+
+		d, err := json.Marshal(messageWS("join", []byte("hello websockets"), "foo", "foo2"))
+		if err != nil {
+			panic(err)
+		}
+
+		err = c.WriteMessage(websocket.BinaryMessage, d)
+		assert.NoError(t, err)
+
+		_, msg, err := c.ReadMessage()
+		retMsg := utils.AsString(msg)
+		assert.NoError(t, err)
+
+		// subscription done
+		assert.Equal(t, `{"topic":"@join","payload":["foo","foo2"]}`, retMsg)
+
+		publishAsync(t, "placeholder", "foo")
+
+		// VERIFY a makeMessage
+		_, msg, err = c.ReadMessage()
+		retMsg = utils.AsString(msg)
+		assert.NoError(t, err)
+		assert.Equal(t, "{\"topic\":\"foo\",\"payload\":\"hello, PHP\"}", retMsg)
+
+		// //// LEAVE foo /////////
+		d, err = json.Marshal(messageWS("leave", []byte("hello websockets"), "foo"))
+		if err != nil {
+			panic(err)
+		}
+
+		err = c.WriteMessage(websocket.BinaryMessage, d)
+		assert.NoError(t, err)
+
+		_, msg, err = c.ReadMessage()
+		retMsg = utils.AsString(msg)
+		assert.NoError(t, err)
+
+		// subscription done
+		assert.Equal(t, `{"topic":"@leave","payload":["foo"]}`, retMsg)
+
+		// TRY TO PUBLISH TO UNSUBSCRIBED TOPIC
+		publishAsync(t, "placeholder", "foo")
+
+		go func() {
+			time.Sleep(time.Second * 3)
+			publishAsync(t, "placeholder", "foo2")
+		}()
+
+		// should be only makeMessage from the subscribed foo0 topic
+		_, msg, err = c.ReadMessage()
+		retMsg = utils.AsString(msg)
+		assert.NoError(t, err)
+		assert.Equal(t, "{\"topic\":\"foo2\",\"payload\":\"hello, PHP\"}", retMsg)
+
+		err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
+		assert.NoError(t, err)
 	}
+}
 
-	err = c.WriteMessage(websocket.BinaryMessage, d)
-	assert.NoError(t, err)
+func RPCWsPub(port string) func(t *testing.T) {
+	return func(t *testing.T) {
+		da := websocket.Dialer{
+			Proxy:            http.ProxyFromEnvironment,
+			HandshakeTimeout: time.Second * 20,
+		}
 
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
+		connURL := url.URL{Scheme: "ws", Host: "localhost:" + port, Path: "/ws"}
 
-	// subscription done
-	assert.Equal(t, `{"topic":"@leave","payload":["foo"]}`, retMsg)
+		c, resp, err := da.Dial(connURL.String(), nil)
+		assert.NoError(t, err)
 
-	// TRY TO PUBLISH TO UNSUBSCRIBED TOPIC
-	publish("", "memory", "foo")
+		defer func() {
+			if resp != nil && resp.Body != nil {
+				_ = resp.Body.Close()
+			}
+		}()
 
-	go func() {
-		time.Sleep(time.Second * 5)
-		publish2(t, "", "memory", "foo2")
-	}()
+		d, err := json.Marshal(messageWS("join", []byte("hello websockets"), "foo", "foo2"))
+		if err != nil {
+			panic(err)
+		}
 
-	// should be only makeMessage from the subscribed foo2 topic
-	_, msg, err = c.ReadMessage()
-	retMsg = utils.AsString(msg)
-	assert.NoError(t, err)
-	assert.Equal(t, "{\"topic\":\"foo2\",\"payload\":\"hello, PHP2\"}", retMsg)
+		err = c.WriteMessage(websocket.BinaryMessage, d)
+		assert.NoError(t, err)
 
-	err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
-	assert.NoError(t, err)
+		_, msg, err := c.ReadMessage()
+		retMsg := utils.AsString(msg)
+		assert.NoError(t, err)
+
+		// subscription done
+		assert.Equal(t, `{"topic":"@join","payload":["foo","foo2"]}`, retMsg)
+
+		publish("", "foo")
+
+		// VERIFY a makeMessage
+		_, msg, err = c.ReadMessage()
+		retMsg = utils.AsString(msg)
+		assert.NoError(t, err)
+		assert.Equal(t, "{\"topic\":\"foo\",\"payload\":\"hello, PHP\"}", retMsg)
+
+		// //// LEAVE foo, foo2 /////////
+		d, err = json.Marshal(messageWS("leave", []byte("hello websockets"), "foo"))
+		if err != nil {
+			panic(err)
+		}
+
+		err = c.WriteMessage(websocket.BinaryMessage, d)
+		assert.NoError(t, err)
+
+		_, msg, err = c.ReadMessage()
+		retMsg = utils.AsString(msg)
+		assert.NoError(t, err)
+
+		// subscription done
+		assert.Equal(t, `{"topic":"@leave","payload":["foo"]}`, retMsg)
+
+		// TRY TO PUBLISH TO UNSUBSCRIBED TOPIC
+		publish("", "foo")
+
+		go func() {
+			time.Sleep(time.Second * 5)
+			publish2(t, "", "foo2")
+		}()
+
+		// should be only makeMessage from the subscribed foo2 topic
+		_, msg, err = c.ReadMessage()
+		retMsg = utils.AsString(msg)
+		assert.NoError(t, err)
+		assert.Equal(t, "{\"topic\":\"foo2\",\"payload\":\"hello, PHP2\"}", retMsg)
+
+		err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
+		assert.NoError(t, err)
+	}
+}
+
+func RPCWsDeny(port string) func(t *testing.T) {
+	return func(t *testing.T) {
+		da := websocket.Dialer{
+			Proxy:            http.ProxyFromEnvironment,
+			HandshakeTimeout: time.Second * 20,
+		}
+
+		connURL := url.URL{Scheme: "ws", Host: "localhost:" + port, Path: "/ws"}
+
+		c, resp, err := da.Dial(connURL.String(), nil)
+		assert.NoError(t, err)
+		assert.NotNil(t, c)
+		assert.Equal(t, http.StatusSwitchingProtocols, resp.StatusCode)
+
+		defer func() {
+			if resp != nil && resp.Body != nil {
+				_ = resp.Body.Close()
+			}
+		}()
+
+		d, err := json.Marshal(messageWS("join", []byte("hello websockets"), "foo", "foo2"))
+		if err != nil {
+			panic(err)
+		}
+
+		err = c.WriteMessage(websocket.BinaryMessage, d)
+		assert.NoError(t, err)
+
+		_, msg, err := c.ReadMessage()
+		retMsg := utils.AsString(msg)
+		assert.NoError(t, err)
+
+		// subscription done
+		assert.Equal(t, `{"topic":"#join","payload":["foo","foo2"]}`, retMsg)
+
+		// //// LEAVE foo, foo2 /////////
+		d, err = json.Marshal(messageWS("leave", []byte("hello websockets"), "foo"))
+		if err != nil {
+			panic(err)
+		}
+
+		err = c.WriteMessage(websocket.BinaryMessage, d)
+		assert.NoError(t, err)
+
+		_, msg, err = c.ReadMessage()
+		retMsg = utils.AsString(msg)
+		assert.NoError(t, err)
+
+		// subscription done
+		assert.Equal(t, `{"topic":"@leave","payload":["foo"]}`, retMsg)
+
+		err = c.WriteControl(websocket.CloseMessage, nil, time.Time{})
+		assert.NoError(t, err)
+	}
 }
 
+// ---------------------------------------------------------------------------------------------------
+
 func publish(command string, topics ...string) {
 	conn, err := net.Dial("tcp", "127.0.0.1:6001")
 	if err != nil {
@@ -947,20 +878,6 @@ func publishAsync(t *testing.T, command string, topics ...string) {
 	assert.True(t, ret.Ok)
 }
 
-func publishAsync2(t *testing.T, command string, topics ...string) {
-	conn, err := net.Dial("tcp", "127.0.0.1:6001")
-	if err != nil {
-		panic(err)
-	}
-
-	client := rpc.NewClientWithCodec(goridgeRpc.NewClientCodec(conn))
-
-	ret := &websocketsv1.Response{}
-	err = client.Call("broadcast.PublishAsync", makeMessage(command, []byte("hello, PHP2"), topics...), ret)
-	assert.NoError(t, err)
-	assert.True(t, ret.Ok)
-}
-
 func publish2(t *testing.T, command string, topics ...string) {
 	conn, err := net.Dial("tcp", "127.0.0.1:6001")
 	if err != nil {