- improved error handling

- RR_BROADCAST_URL renamed to RR_BROADCAST_PATH

Author: wolfy-j

access_validator.go

@@ -68,8 +68,7 @@ func (w *accessValidator) Error() string {
 // case of error
 func (w *accessValidator) assertServerAccess(f http.HandlerFunc, r *http.Request) error {
 	if err := attributes.Set(r, "ws:joinServer", true); err != nil {
-		//	return err
-		// todo: need to update it
+		return err
 	}
 
 	defer delete(attributes.All(r), "ws:joinServer")
@@ -87,7 +86,7 @@ func (w *accessValidator) assertServerAccess(f http.HandlerFunc, r *http.Request
 // the decision to authorize user will be based on response code (200).
 func (w *accessValidator) assertTopicsAccess(f http.HandlerFunc, r *http.Request, channels ...string) error {
 	if err := attributes.Set(r, "ws:joinTopics", strings.Join(channels, ",")); err != nil {
-		return w
+		return err
 	}
 
 	defer delete(attributes.All(r), "ws:joinTopics")

service.go

@@ -54,7 +54,7 @@ func (s *Service) Init(
 
 	if env != nil {
 		// ensure that underlying kernel knows what route to handle
-		env.SetEnv("RR_BROADCAST_URL", cfg.Path)
+		env.SetEnv("RR_BROADCAST_PATH", cfg.Path)
 	}
 
 	// init all this stuff
@@ -97,7 +97,11 @@ func (s *Service) middleware(f http.HandlerFunc) http.HandlerFunc {
 		// checking server access
 		if err := newValidator().assertServerAccess(f, r); err != nil {
 			// show the error to the user
-			err.(*accessValidator).copy(w)
+			if av, ok := err.(*accessValidator); ok {
+				av.copy(w)
+			} else {
+				w.WriteHeader(400)
+			}
 			return
 		}
 

tests/worker-ok.php

@@ -10,7 +10,7 @@
 while ($req = $psr7->acceptRequest()) {
     try {
         $resp = new \Zend\Diactoros\Response();
-        $resp->getBody()->write($_SERVER['RR_BROADCAST_URL'] ?? '');
+        $resp->getBody()->write($_SERVER['RR_BROADCAST_PATH'] ?? '');
         $psr7->respond($resp);
     } catch (\Throwable $e) {
         $psr7->getWorker()->error((string)$e);