Merge pull request #903 from serbinadrian/master

[SPT-328] Added multiple GRPC request handler
singnet · Apr 16, 2024 · cfb1cbb · cfb1cbb
2 parents 2f081c4 + bb37975
commit cfb1cbb
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/utility/sdk.js b/src/utility/sdk.js
@@ -272,22 +272,37 @@ export const createServiceClient = (
     options
   );
 
+  const finishServiceInteraction = () => {
+    if(serviceRequestCompleteHandler) {
+      serviceRequestCompleteHandler();
+      return;
+    }
+  }
+
   const onEnd = props => (...args) => {
     try {
       const { status, statusMessage } = args[0];
       if (status !== 0) {
         serviceRequestErrorHandler(statusMessage);
         return;
       }
-      props.onEnd(...args);
+
+      if(props.onEnd) {
+        props.onEnd(...args);
+      }
+
+      if (props.preventCloseServiceOnEnd) {
+        return;
+      }
+
       if (serviceRequestCompleteHandler) {
         serviceRequestCompleteHandler();
       }
     } catch (error) {
       serviceRequestErrorHandler(error);
     }
   };
-
+ 
   const requestStartHandler = () => {
     if (serviceRequestStartHandler) {
       serviceRequestStartHandler();
@@ -303,6 +318,9 @@ export const createServiceClient = (
         requestStartHandler();
         serviceClient.unary(methodDescriptor, { ...props, onEnd: onEnd(props) });
       },
+      stopService() {
+        finishServiceInteraction();
+      },
       getMethodNames,
     };
   } catch (error) {