Error shouldn't cause Client Fail If Actor Non-Existent method called (#422)

* Error shouldn't cause Client Fail If Actor Non-Existent method called

Signed-off-by: Deepanshu Agarwal <[email protected]>

* Add test

Signed-off-by: Deepanshu Agarwal <[email protected]>

* Fix pretty

Signed-off-by: Deepanshu Agarwal <[email protected]>

* Fix test

Signed-off-by: Deepanshu Agarwal <[email protected]>

* Fix test

Signed-off-by: Deepanshu Agarwal <[email protected]>

* Pretty fix

Signed-off-by: Deepanshu Agarwal <[email protected]>

* Incorporate review comments

Signed-off-by: Deepanshu Agarwal <[email protected]>

---------

Signed-off-by: Deepanshu Agarwal <[email protected]>

Author: DeepanshuA

src/implementation/Server/HTTPServer/actor.ts

@@ -22,6 +22,7 @@ import BufferSerializer from "../../../actors/runtime/BufferSerializer";
 import { DaprClient } from "../../..";
 import { Logger } from "../../../logger/Logger";
 import { getRegisteredActorResponse } from "../../../utils/Actors.util";
+import HttpStatusCode from "../../../enum/HttpStatusCode.enum";
 
 // https://docs.dapr.io/reference/api/bindings_api/
 export default class HTTPServerActor implements IServerActor {
@@ -88,6 +89,7 @@ export default class HTTPServerActor implements IServerActor {
   private async handlerDeactivate(req: IRequest, res: IResponse): Promise<IResponse> {
     const { actorTypeName, actorId } = req.params;
     const result = await ActorRuntime.getInstance(this.client.getDaprClient()).deactivate(actorTypeName, actorId);
+    res.statusCode = HttpStatusCode.OK;
     return this.handleResult(res, result);
   }
 
@@ -98,13 +100,21 @@ export default class HTTPServerActor implements IServerActor {
     // @todo: reentrancy id? (https://github.com/dapr/python-sdk/blob/master/ext/flask_dapr/flask_dapr/actor.py#L91)
 
     const dataSerialized = this.serializer.serialize(body);
-    const result = await ActorRuntime.getInstance(this.client.getDaprClient()).invoke(
-      actorTypeName,
-      actorId,
-      methodName,
-      dataSerialized,
-    );
-    return this.handleResult(res, result);
+    try {
+      const result = await ActorRuntime.getInstance(this.client.getDaprClient()).invoke(
+        actorTypeName,
+        actorId,
+        methodName,
+        dataSerialized,
+      );
+      res.statusCode = HttpStatusCode.OK;
+      return this.handleResult(res, result);
+    } catch (err) {
+      if (err instanceof Error) {
+        res.statusCode = HttpStatusCode.INTERNAL_SERVER_ERROR;
+      }
+      return this.handleResult(res, err);
+    }
   }
 
   private async handlerTimer(req: IRequest, res: IResponse): Promise<IResponse> {
@@ -137,10 +147,9 @@ export default class HTTPServerActor implements IServerActor {
 
   private handleResult(res: IResponse, result: any) {
     if (result && typeof result === "object") {
-      return res.status(200).send(result);
+      return res.status(res.statusCode).send(result);
     } else {
-      // @ts-ignore
-      return res.status(200).send(`${result}`);
+      return res.status(res.statusCode).send(`${result}`);
     }
   }
 }

test/e2e/http/actors.test.ts

@@ -133,6 +133,24 @@ describe("http/actors", () => {
     });
   });
 
+  describe("invokeNonExistentMethod", () => {
+    it("should not fail if invoked non-existing method on actor", async () => {
+      const builder = new ActorProxyBuilder<DemoActorCounterInterface>(DemoActorCounterImpl, client);
+      const actorId = ActorId.createRandomId();
+      builder.build(actorId);
+
+      const baseActorUrl = `http://${sidecarHost}:${sidecarPort}/v1.0/actors/DemoActorCounterImpl/${actorId.toString()}/method`;
+
+      const validFunc = await fetch(`${baseActorUrl}/getCounter`);
+      expect(validFunc.status).toBe(200);
+      expect(validFunc.statusText).toBe("OK");
+
+      const nonExistentFunc = await fetch(`${baseActorUrl}/sayHello`);
+      expect(nonExistentFunc.status).toBe(500);
+      expect(nonExistentFunc.statusText).toBe("Internal Server Error");
+    });
+  });
+
   describe("invoke", () => {
     it("should register actors correctly", async () => {
       const actors = await server.actor.getRegisteredActors();