fix: added websocket notifier in REST controller handlers

- Part of hyperledger-archives#471 Signed-off-by: sudesh.shetty <sudesh.shetty@securekey.com>
sudeshrshetty · Feb 26, 2020 · 3d64347 · 3d64347
1 parent e4d0b76
commit 3d64347
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cmd/aries-js-worker/index.html b/cmd/aries-js-worker/index.html
@@ -106,7 +106,7 @@
             document.getElementById("mode-label").innerHTML = `Running in ${mode} mode`
 
             if (src == "rest"){
-                document.getElementById("opts").innerHTML = `{"assetsPath": "/dist/assets", "agent-rest-url": "http://localhost:8082", "agent-rest-wshook":"ws://localhost:8881"}`
+                document.getElementById("opts").innerHTML = `{"assetsPath": "/dist/assets", "agent-rest-url": "http://localhost:8082", "agent-rest-wshook":"ws://localhost:8082/ws"}`
             } else {
                 document.getElementById("opts").innerHTML = `{"assetsPath": "/dist/assets", "agent-default-label":"dem-js-agent","http-resolver-url":[],"auto-accept":true,"outbound-transport":["ws","http"],"transport-return-route":"all","log-level":"debug"}`
             }

diff --git a/cmd/aries-js-worker/src/worker-impl-rest.js b/cmd/aries-js-worker/src/worker-impl-rest.js
@@ -84,7 +84,7 @@ const wsnotifier = class {
         this.socket.addEventListener('message', function (event) {
             // TODO REST agents are not currently revealing topic information on incoming messages,
             //  Once REST supports this feature, topic value will be dynamic. [Issue #1323]
-            postMsg(newResponse(Math.random().toString(36).slice(2),  event.data, "", "all"));
+            postMsg(newResponse(Math.random().toString(36).slice(2),  JSON.parse(event.data), "", "all"));
         });
     }
     stop(){

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -122,11 +122,16 @@ func GetRESTHandlers(ctx *context.Provider, opts ...Opt) ([]rest.Handler, error)
 	allHandlers = append(allHandlers, routeOp.GetRESTHandlers()...)
 	allHandlers = append(allHandlers, verifiablecmd.GetRESTHandlers()...)
 
+	nhp, ok := notifier.(handlerProvider)
+	if ok {
+		allHandlers = append(allHandlers, nhp.GetRESTHandlers()...)
+	}
+
 	return allHandlers, nil
 }
 
 type handlerProvider interface {
-	GetHandlers() []command.Handler
+	GetRESTHandlers() []rest.Handler
 }
 
 // GetCommandHandlers returns all command handlers provided by controller.
@@ -177,10 +182,5 @@ func GetCommandHandlers(ctx *context.Provider, opts ...Opt) ([]command.Handler,
 	allHandlers = append(allHandlers, routecmd.GetHandlers()...)
 	allHandlers = append(allHandlers, verifiablecmd.GetHandlers()...)
 
-	nhp, ok := notifier.(handlerProvider)
-	if ok {
-		allHandlers = append(allHandlers, nhp.GetHandlers()...)
-	}
-
 	return allHandlers, nil
 }