merge Issue-2274 with origin/master

Author: agafox

restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/BaseVoiceInterpreter.java

@@ -1797,67 +1797,72 @@ public void execute(final Object message) throws Exception {
             final Recording recording = builder.build();
             final RecordingsDao recordings = storage.getRecordingsDao();
             recordings.addRecording(recording);
-            // Start transcription.
-            URI transcribeCallback = null;
-            Attribute attribute = verb.attribute("transcribeCallback");
-            if (attribute != null) {
-                final String value = attribute.value();
-                if (value != null && !value.isEmpty()) {
-                    try {
-                        transcribeCallback = URI.create(value);
-                    } catch (final Exception exception) {
-                        final Notification notification = notification(ERROR_NOTIFICATION, 11100, transcribeCallback
-                                + " is an invalid URI.");
-                        notifications.addNotification(notification);
-                        sendMail(notification);
-                        final StopInterpreter stop = new StopInterpreter();
-                        source.tell(stop, source);
-                        return;
-                    }
-                }
-            }
-            boolean transcribe = false;
-            if (transcribeCallback != null) {
-                transcribe = true;
-            } else {
-                attribute = verb.attribute("transcribe");
+
+            Attribute attribute = null;
+
+            if (checkAsrService()) {
+                // ASR service is enabled. Start transcription.
+                URI transcribeCallback = null;
+                attribute = verb.attribute("transcribeCallback");
                 if (attribute != null) {
                     final String value = attribute.value();
                     if (value != null && !value.isEmpty()) {
-                        transcribe = Boolean.parseBoolean(value);
+                        try {
+                            transcribeCallback = URI.create(value);
+                        } catch (final Exception exception) {
+                            final Notification notification = notification(ERROR_NOTIFICATION, 11100, transcribeCallback
+                                    + " is an invalid URI.");
+                            notifications.addNotification(notification);
+                            sendMail(notification);
+                            final StopInterpreter stop = new StopInterpreter();
+                            source.tell(stop, source);
+                            return;
+                        }
                     }
                 }
-            }
-            if (transcribe && checkAsrService()) {
-                final Sid sid = Sid.generate(Sid.Type.TRANSCRIPTION);
-                final Transcription.Builder otherBuilder = Transcription.builder();
-                otherBuilder.setSid(sid);
-                otherBuilder.setAccountSid(accountId);
-                otherBuilder.setStatus(Transcription.Status.IN_PROGRESS);
-                otherBuilder.setRecordingSid(recordingSid);
-                otherBuilder.setTranscriptionText("Transcription Text not available");
-                otherBuilder.setDuration(duration);
-                otherBuilder.setPrice(new BigDecimal("0.00"));
-                buffer = new StringBuilder();
-                buffer.append("/").append(version).append("/Accounts/").append(accountId.toString());
-                buffer.append("/Transcriptions/").append(sid.toString());
-                final URI uri = URI.create(buffer.toString());
-                otherBuilder.setUri(uri);
-                final Transcription transcription = otherBuilder.build();
-                final TranscriptionsDao transcriptions = storage.getTranscriptionsDao();
-                transcriptions.addTranscription(transcription);
-                try {
-                    final Map<String, Object> attributes = new HashMap<String, Object>();
-                    attributes.put("callback", transcribeCallback);
-                    attributes.put("transcription", transcription);
-                    getAsrService().tell(new AsrRequest(new File(recordingUri), "en", attributes), source);
-                    outstandingAsrRequests++;
-                } catch (final Exception exception) {
-                    logger.error(exception.getMessage(), exception);
+                boolean transcribe = false;
+                if (transcribeCallback != null) {
+                    transcribe = true;
+                } else {
+                    attribute = verb.attribute("transcribe");
+                    if (attribute != null) {
+                        final String value = attribute.value();
+                        if (value != null && !value.isEmpty()) {
+                            transcribe = Boolean.parseBoolean(value);
+                        }
+                    }
+                }
+                if (transcribe && checkAsrService()) {
+                    final Sid sid = Sid.generate(Sid.Type.TRANSCRIPTION);
+                    final Transcription.Builder otherBuilder = Transcription.builder();
+                    otherBuilder.setSid(sid);
+                    otherBuilder.setAccountSid(accountId);
+                    otherBuilder.setStatus(Transcription.Status.IN_PROGRESS);
+                    otherBuilder.setRecordingSid(recordingSid);
+                    otherBuilder.setTranscriptionText("Transcription Text not available");
+                    otherBuilder.setDuration(duration);
+                    otherBuilder.setPrice(new BigDecimal("0.00"));
+                    buffer = new StringBuilder();
+                    buffer.append("/").append(version).append("/Accounts/").append(accountId.toString());
+                    buffer.append("/Transcriptions/").append(sid.toString());
+                    final URI uri = URI.create(buffer.toString());
+                    otherBuilder.setUri(uri);
+                    final Transcription transcription = otherBuilder.build();
+                    final TranscriptionsDao transcriptions = storage.getTranscriptionsDao();
+                    transcriptions.addTranscription(transcription);
+                    try {
+                        final Map<String, Object> attributes = new HashMap<String, Object>();
+                        attributes.put("callback", transcribeCallback);
+                        attributes.put("transcription", transcription);
+                        getAsrService().tell(new AsrRequest(new File(recordingUri), "en", attributes), source);
+                        outstandingAsrRequests++;
+                    } catch (final Exception exception) {
+                        logger.error(exception.getMessage(), exception);
+                    }
                 }
             } else if(logger.isInfoEnabled()){
-                logger.info("AsrService activated but not properly configured. Please set api-key for AsrService");
-        }
+                logger.info("AsrService is not enabled");
+            }
 
             // If action is present redirect to the action URI.
             String action = null;
@@ -1943,11 +1948,11 @@ public void execute(final Object message) throws Exception {
             if (CallStateChanged.class.equals(klass) ) {
                 if (action == null || action.isEmpty()) {
                     source.tell(new StopInterpreter(), source);
+                } else {
+                    // Ask the parser for the next action to take.
+                    final GetNextVerb next = new GetNextVerb();
+                    parser.tell(next, source);
                 }
-            } else {
-                // Ask the parser for the next action to take.
-                final GetNextVerb next = new GetNextVerb();
-                parser.tell(next, source);
             }
             // A little clean up.
             recordingSid = null;

restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java

@@ -733,6 +733,10 @@ private void onParserFailed(Object message) throws TransitionFailedException, Tr
 
     private void onStopInterpreter(Object message) throws TransitionFailedException, TransitionNotFoundException, TransitionRollbackException {
         this.liveCallModification = ((StopInterpreter) message).isLiveCallModification();
+        if (logger.isInfoEnabled()) {
+            String msg = String.format("Got StopInterpreter, liveCallModification %s, CallState %s", liveCallModification, callState);
+            logger.info(msg);
+        }
         if (CallStateChanged.State.IN_PROGRESS.equals(callState) && !liveCallModification) {
             fsm.transition(message, hangingUp);
         } else {
@@ -834,10 +838,18 @@ else if (is(gathering) || (is(finishGathering) && !super.dtmfReceived)) {
     private void onEndMessage(Object message) throws TransitionFailedException, TransitionNotFoundException, TransitionRollbackException {
         //Because of RMS issue https://github.com/RestComm/mediaserver/issues/158 we cannot have List<URI> for waitUrl
         if (playWaitUrlPending && conferenceWaitUris != null && conferenceWaitUris.size() > 0) {
+            if (logger.isInfoEnabled()) {
+                String msg = String.format("End tag received, playWaitUrlPending is %s, conferenceWaitUris.size() %d",playWaitUrlPending, conferenceWaitUris.size());
+                logger.info(msg);
+            }
             fsm.transition(conferenceWaitUris, conferencing);
             return;
         }
         if (callState.equals(CallStateChanged.State.COMPLETED) || callState.equals(CallStateChanged.State.CANCELED)) {
+            if(logger.isInfoEnabled()) {
+                String msg = String.format("End tag received, Call state %s , VI state %s will move to finished state",callState, fsm.state());
+                logger.info(msg);
+            }
             fsm.transition(message, finished);
         } else {
             if (!isParserFailed) {

restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/MockMediaGateway.java

@@ -454,10 +454,10 @@ protected void notificationResponse(final Object message, final ActorRef sender)
         final int transaction = rqnt.getTransactionHandle();
         response.setTransactionHandle(transaction);
         try {
-            Thread.sleep(sleepTime);
+            Thread.sleep(sleepTime*10);
         } catch (InterruptedException e) {
         }
-        System.out.println(response.toString());
+        logger.info("About to send MockMediaGateway response: "+response.toString());
         sender.tell(response, self);
     }
 

restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Call.java

@@ -374,6 +374,7 @@ public Call(final SipFactory factory, final MediaServerControllerFactory mediaSe
         transitions.add(new Transition(this.inProgress, this.leaving));
         transitions.add(new Transition(this.inProgress, this.failed));
         transitions.add(new Transition(this.inProgress, this.inDialogRequest));
+        transitions.add(new Transition(this.inProgress, this.completed));
         transitions.add(new Transition(this.joining, this.inProgress));
         transitions.add(new Transition(this.joining, this.stopping));
         transitions.add(new Transition(this.joining, this.failed));
@@ -1722,6 +1723,11 @@ public Stopping(final ActorRef source) {
         public void execute(Object message) throws Exception {
             // Stops media operations and closes media session
             msController.tell(new CloseMediaSession(), source);
+            if (fail) {
+                fsm.transition(message, failed);
+            } else {
+                fsm.transition(message, completed);
+            }
         }
     }
 
@@ -1810,6 +1816,10 @@ private void onStopMediaGroup(StopMediaGroup message, ActorRef self, ActorRef se
                 liveCallModification = true;
                 self().tell(new Leave(true), self());
             }
+        } else {
+            if (logger.isDebugEnabled()) {
+                logger.debug("Got StopMediaGroup but Call is already in state: "+fsm.state());
+            }
         }
     }
 
@@ -2191,6 +2201,13 @@ private void onHangup(Hangup message, ActorRef self, ActorRef sender) throws Exc
             logger.debug("Got Hangup: "+message+" for Call, from: "+from+" to: "+to+" state: "+fsm.state()+" conferencing: "+conferencing +" conference: "+conference);
         }
 
+        if (is(completed)) {
+            if (logger.isDebugEnabled()) {
+                logger.debug("Got Hangup but already in completed state");
+            }
+            return;
+        }
+
         // Stop recording if necessary
         if (recording) {
             recording = false;
@@ -2458,11 +2475,15 @@ private void onMediaServerControllerStateChanged(MediaServerControllerStateChang
 
             case INACTIVE:
                 if (is(stopping)) {
-                    if (fail) {
-                        fsm.transition(message, failed);
-                    } else {
-                        fsm.transition(message, completed);
+                    if (logger.isDebugEnabled()) {
+                        String msg = String.format("On MediaServerContollerStateChanged, message: INACTIVE, Call state: %s, Fail: %s", fsm.state(), fail);
+                        logger.debug(msg);
                     }
+//                    if (fail) {
+//                        fsm.transition(message, failed);
+//                    } else {
+//                        fsm.transition(message, completed);
+//                    }
                 } else if (is(canceling)) {
                     fsm.transition(message, canceled);
                 } else if (is(failingBusy)) {